From 413c7c534fe03d85fa38298f954aa4ee1f1cb3a7 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sun, 4 Sep 2022 14:57:14 +0000 Subject: [PATCH] Merge pull request #547 from cbt6/field-moves --- pokefirered.sym | 24 ++++++++++++------------ pokefirered_rev1.sym | 24 ++++++++++++------------ pokeleafgreen.sym | 24 ++++++++++++------------ pokeleafgreen_rev1.sym | 24 ++++++++++++------------ 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index 4e4b0d40e..1fff0c2d5 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -8191,14 +8191,14 @@ 080c98fc l 000000a4 Task_FieldEffectShowMon_WaitFldeff 080c99a0 l 00000038 Task_FieldEffectShowMon_Cleanup 080c99d8 g 00000038 SetUpFieldMove_RockSmash -080c9a10 l 00000020 sub_80C9A10 +080c9a10 l 00000020 FieldCallback_UseRockSmash 080c9a30 g 00000030 FldEff_UseRockSmash -080c9a60 l 00000016 sub_80C9A60 +080c9a60 l 00000016 StartRockSmashFieldEffect 080c9a78 g 00000034 SetUpFieldMove_Dig 080c9a78 l 00000000 .gcc2_compiled. 080c9aac l 00000020 FieldCallback_Dig 080c9acc g 00000030 FldEff_UseDig -080c9afc l 00000030 sub_80C9AFC +080c9afc l 00000030 StartDigFieldEffect 080c9b2c g 00000046 SetUpFieldMove_Flash 080c9b2c l 00000000 .gcc2_compiled. 080c9b74 l 0000003c FieldCallback_Flash @@ -9092,11 +9092,11 @@ 080e5684 l 00000000 .gcc2_compiled. 080e56dc g 00000048 ChooseMonForSoftboiled 080e5724 g 000000c4 Task_TryUseSoftboiledOnPartyMon -080e57e8 l 00000054 sub_80E57E8 -080e583c l 00000064 sub_80E583C -080e58a0 l 00000060 sub_80E58A0 -080e5900 l 00000034 sub_80E5900 -080e5934 l 0000003c sub_80E5934 +080e57e8 l 00000054 Task_SoftboiledRestoreHealth +080e583c l 00000064 Task_DisplayHPRestoredMessage +080e58a0 l 00000060 Task_FinishSoftboiled +080e5900 l 00000034 Task_ChooseNewMonForSoftboiled +080e5934 l 0000003c CantUseSoftboiledOnMon 080e5970 g 000000c8 BattleTowerMapScript2 080e5970 l 00000000 .gcc2_compiled. 080e5a38 l 00000038 ResetBattleTowerStreak @@ -30052,9 +30052,9 @@ 083980a8 g 00000080 gFieldEffectObjectPic_ShadowLarge 08398128 g 00000400 gFieldEffectObjectPic_ShadowExtraLarge 08398528 g 00000120 filler_8398188 -08398648 g 00000020 gUnknown_8398648 -08398668 g 00000020 gUnknown_8398668 -08398688 g 00000020 gUnknown_8398688 +08398648 g 00000020 gFieldEffectObjectPic_CutGrass +08398668 g 00000020 gFieldEffectObjectPic_CutGrass2 +08398688 g 00000020 gFieldEffectPal_CutGrass 083986a8 g 00000280 gFieldEffectObjectPic_Ripple 08398928 g 00000280 gFieldEffectObjectPic_Ash 08398ba8 g 00000400 gFieldEffectObjectPic_Arrow @@ -37765,7 +37765,7 @@ 084169d8 g 00000001 gUnknown_84169D8 084169d9 g 00000003 gText_PauseUntilPress 084169dc g 0000001c gText_WontHaveEffect -084169f8 g 00000026 gUnknown_84169F8 +084169f8 g 00000026 gText_CantBeUsedOnPkmn 08416a1e g 0000001c gText_PkmnCantSwitchOut 08416a3a g 0000001b gText_PkmnAlreadyInBattle 08416a55 g 00000020 gText_PkmnAlreadySelected diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 0d7bd5942..2b0326db6 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -8191,14 +8191,14 @@ 080c9910 l 000000a4 Task_FieldEffectShowMon_WaitFldeff 080c99b4 l 00000038 Task_FieldEffectShowMon_Cleanup 080c99ec g 00000038 SetUpFieldMove_RockSmash -080c9a24 l 00000020 sub_80C9A10 +080c9a24 l 00000020 FieldCallback_UseRockSmash 080c9a44 g 00000030 FldEff_UseRockSmash -080c9a74 l 00000016 sub_80C9A60 +080c9a74 l 00000016 StartRockSmashFieldEffect 080c9a8c g 00000034 SetUpFieldMove_Dig 080c9a8c l 00000000 .gcc2_compiled. 080c9ac0 l 00000020 FieldCallback_Dig 080c9ae0 g 00000030 FldEff_UseDig -080c9b10 l 00000030 sub_80C9AFC +080c9b10 l 00000030 StartDigFieldEffect 080c9b40 g 00000046 SetUpFieldMove_Flash 080c9b40 l 00000000 .gcc2_compiled. 080c9b88 l 0000003c FieldCallback_Flash @@ -9092,11 +9092,11 @@ 080e5698 l 00000000 .gcc2_compiled. 080e56f0 g 00000048 ChooseMonForSoftboiled 080e5738 g 000000c4 Task_TryUseSoftboiledOnPartyMon -080e57fc l 00000054 sub_80E57E8 -080e5850 l 00000064 sub_80E583C -080e58b4 l 00000060 sub_80E58A0 -080e5914 l 00000034 sub_80E5900 -080e5948 l 0000003c sub_80E5934 +080e57fc l 00000054 Task_SoftboiledRestoreHealth +080e5850 l 00000064 Task_DisplayHPRestoredMessage +080e58b4 l 00000060 Task_FinishSoftboiled +080e5914 l 00000034 Task_ChooseNewMonForSoftboiled +080e5948 l 0000003c CantUseSoftboiledOnMon 080e5984 g 000000c8 BattleTowerMapScript2 080e5984 l 00000000 .gcc2_compiled. 080e5a4c l 00000038 ResetBattleTowerStreak @@ -30053,9 +30053,9 @@ 08398118 g 00000080 gFieldEffectObjectPic_ShadowLarge 08398198 g 00000400 gFieldEffectObjectPic_ShadowExtraLarge 08398598 g 00000120 filler_8398188 -083986b8 g 00000020 gUnknown_8398648 -083986d8 g 00000020 gUnknown_8398668 -083986f8 g 00000020 gUnknown_8398688 +083986b8 g 00000020 gFieldEffectObjectPic_CutGrass +083986d8 g 00000020 gFieldEffectObjectPic_CutGrass2 +083986f8 g 00000020 gFieldEffectPal_CutGrass 08398718 g 00000280 gFieldEffectObjectPic_Ripple 08398998 g 00000280 gFieldEffectObjectPic_Ash 08398c18 g 00000400 gFieldEffectObjectPic_Arrow @@ -37766,7 +37766,7 @@ 08416a48 g 00000001 gUnknown_84169D8 08416a49 g 00000003 gText_PauseUntilPress 08416a4c g 0000001c gText_WontHaveEffect -08416a68 g 00000026 gUnknown_84169F8 +08416a68 g 00000026 gText_CantBeUsedOnPkmn 08416a8e g 0000001c gText_PkmnCantSwitchOut 08416aaa g 0000001b gText_PkmnAlreadyInBattle 08416ac5 g 00000020 gText_PkmnAlreadySelected diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index c5034c4de..a9d854b8b 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -8193,14 +8193,14 @@ 080c98d0 l 000000a4 Task_FieldEffectShowMon_WaitFldeff 080c9974 l 00000038 Task_FieldEffectShowMon_Cleanup 080c99ac g 00000038 SetUpFieldMove_RockSmash -080c99e4 l 00000020 sub_80C9A10 +080c99e4 l 00000020 FieldCallback_UseRockSmash 080c9a04 g 00000030 FldEff_UseRockSmash -080c9a34 l 00000016 sub_80C9A60 +080c9a34 l 00000016 StartRockSmashFieldEffect 080c9a4c g 00000034 SetUpFieldMove_Dig 080c9a4c l 00000000 .gcc2_compiled. 080c9a80 l 00000020 FieldCallback_Dig 080c9aa0 g 00000030 FldEff_UseDig -080c9ad0 l 00000030 sub_80C9AFC +080c9ad0 l 00000030 StartDigFieldEffect 080c9b00 g 00000046 SetUpFieldMove_Flash 080c9b00 l 00000000 .gcc2_compiled. 080c9b48 l 0000003c FieldCallback_Flash @@ -9094,11 +9094,11 @@ 080e565c l 00000000 .gcc2_compiled. 080e56b4 g 00000048 ChooseMonForSoftboiled 080e56fc g 000000c4 Task_TryUseSoftboiledOnPartyMon -080e57c0 l 00000054 sub_80E57E8 -080e5814 l 00000064 sub_80E583C -080e5878 l 00000060 sub_80E58A0 -080e58d8 l 00000034 sub_80E5900 -080e590c l 0000003c sub_80E5934 +080e57c0 l 00000054 Task_SoftboiledRestoreHealth +080e5814 l 00000064 Task_DisplayHPRestoredMessage +080e5878 l 00000060 Task_FinishSoftboiled +080e58d8 l 00000034 Task_ChooseNewMonForSoftboiled +080e590c l 0000003c CantUseSoftboiledOnMon 080e5948 g 000000c8 BattleTowerMapScript2 080e5948 l 00000000 .gcc2_compiled. 080e5a10 l 00000038 ResetBattleTowerStreak @@ -30054,9 +30054,9 @@ 08398088 g 00000080 gFieldEffectObjectPic_ShadowLarge 08398108 g 00000400 gFieldEffectObjectPic_ShadowExtraLarge 08398508 g 00000120 filler_8398188 -08398628 g 00000020 gUnknown_8398648 -08398648 g 00000020 gUnknown_8398668 -08398668 g 00000020 gUnknown_8398688 +08398628 g 00000020 gFieldEffectObjectPic_CutGrass +08398648 g 00000020 gFieldEffectObjectPic_CutGrass2 +08398668 g 00000020 gFieldEffectPal_CutGrass 08398688 g 00000280 gFieldEffectObjectPic_Ripple 08398908 g 00000280 gFieldEffectObjectPic_Ash 08398b88 g 00000400 gFieldEffectObjectPic_Arrow @@ -37767,7 +37767,7 @@ 08416814 g 00000001 gUnknown_84169D8 08416815 g 00000003 gText_PauseUntilPress 08416818 g 0000001c gText_WontHaveEffect -08416834 g 00000026 gUnknown_84169F8 +08416834 g 00000026 gText_CantBeUsedOnPkmn 0841685a g 0000001c gText_PkmnCantSwitchOut 08416876 g 0000001b gText_PkmnAlreadyInBattle 08416891 g 00000020 gText_PkmnAlreadySelected diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 7c583b181..43e530d18 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -8193,14 +8193,14 @@ 080c98e4 l 000000a4 Task_FieldEffectShowMon_WaitFldeff 080c9988 l 00000038 Task_FieldEffectShowMon_Cleanup 080c99c0 g 00000038 SetUpFieldMove_RockSmash -080c99f8 l 00000020 sub_80C9A10 +080c99f8 l 00000020 FieldCallback_UseRockSmash 080c9a18 g 00000030 FldEff_UseRockSmash -080c9a48 l 00000016 sub_80C9A60 +080c9a48 l 00000016 StartRockSmashFieldEffect 080c9a60 g 00000034 SetUpFieldMove_Dig 080c9a60 l 00000000 .gcc2_compiled. 080c9a94 l 00000020 FieldCallback_Dig 080c9ab4 g 00000030 FldEff_UseDig -080c9ae4 l 00000030 sub_80C9AFC +080c9ae4 l 00000030 StartDigFieldEffect 080c9b14 g 00000046 SetUpFieldMove_Flash 080c9b14 l 00000000 .gcc2_compiled. 080c9b5c l 0000003c FieldCallback_Flash @@ -9094,11 +9094,11 @@ 080e5670 l 00000000 .gcc2_compiled. 080e56c8 g 00000048 ChooseMonForSoftboiled 080e5710 g 000000c4 Task_TryUseSoftboiledOnPartyMon -080e57d4 l 00000054 sub_80E57E8 -080e5828 l 00000064 sub_80E583C -080e588c l 00000060 sub_80E58A0 -080e58ec l 00000034 sub_80E5900 -080e5920 l 0000003c sub_80E5934 +080e57d4 l 00000054 Task_SoftboiledRestoreHealth +080e5828 l 00000064 Task_DisplayHPRestoredMessage +080e588c l 00000060 Task_FinishSoftboiled +080e58ec l 00000034 Task_ChooseNewMonForSoftboiled +080e5920 l 0000003c CantUseSoftboiledOnMon 080e595c g 000000c8 BattleTowerMapScript2 080e595c l 00000000 .gcc2_compiled. 080e5a24 l 00000038 ResetBattleTowerStreak @@ -30055,9 +30055,9 @@ 083980f8 g 00000080 gFieldEffectObjectPic_ShadowLarge 08398178 g 00000400 gFieldEffectObjectPic_ShadowExtraLarge 08398578 g 00000120 filler_8398188 -08398698 g 00000020 gUnknown_8398648 -083986b8 g 00000020 gUnknown_8398668 -083986d8 g 00000020 gUnknown_8398688 +08398698 g 00000020 gFieldEffectObjectPic_CutGrass +083986b8 g 00000020 gFieldEffectObjectPic_CutGrass2 +083986d8 g 00000020 gFieldEffectPal_CutGrass 083986f8 g 00000280 gFieldEffectObjectPic_Ripple 08398978 g 00000280 gFieldEffectObjectPic_Ash 08398bf8 g 00000400 gFieldEffectObjectPic_Arrow @@ -37768,7 +37768,7 @@ 08416884 g 00000001 gUnknown_84169D8 08416885 g 00000003 gText_PauseUntilPress 08416888 g 0000001c gText_WontHaveEffect -084168a4 g 00000026 gUnknown_84169F8 +084168a4 g 00000026 gText_CantBeUsedOnPkmn 084168ca g 0000001c gText_PkmnCantSwitchOut 084168e6 g 0000001b gText_PkmnAlreadyInBattle 08416901 g 00000020 gText_PkmnAlreadySelected