From 9df97a3cba7d1ad3d19ec419e15cc5637182a5ff Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Wed, 24 Jun 2026 03:17:40 +0000 Subject: [PATCH] Merge pull request #2324 from mrgriffin/pret-pp --- pokeemerald.sym | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 6c30e163c8..e965f2473f 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -3404,8 +3404,8 @@ 08059958 l 0000007c DoHitAnimBlinkSpriteEffect 080599d4 l 000000d8 PlayerHandleYesNoInput 08059aac l 0000006c MoveSelectionDisplayMoveNames -08059b18 l 00000024 MoveSelectionDisplayPpString -08059b3c l 00000074 MoveSelectionDisplayPpNumber +08059b18 l 00000024 MoveSelectionDisplayPPString +08059b3c l 00000074 MoveSelectionDisplayPPNumber 08059bb0 l 00000078 MoveSelectionDisplayMoveType 08059c28 l 00000048 MoveSelectionCreateCursorAt 08059c70 l 00000044 MoveSelectionDestroyCursorAt @@ -12338,8 +12338,8 @@ 0814f8f8 l 00000058 ChooseMoveUsedParticle 0814f950 l 0000009c ChooseTypeOfMoveUsedString 0814f9ec g 000001be BattlePutTextOnWindow -0814fbac g 00000074 SetPpNumbersPaletteInMoveSelection -0814fc20 g 0000004e GetCurrentPpToMaxPpState +0814fbac g 00000074 SetPPNumbersPaletteInMoveSelection +0814fc20 g 0000004e GetCurrentPPToMaxPPState 0814fc70 l 00000000 .gcc2_compiled. 0814fc70 l 0000002c Task_LoadCableCar 0814fc9c g 0000002c CableCar @@ -35053,7 +35053,7 @@ 082d9efb g 00000000 BattleScript_AlreadyAtFullHp 082d9f09 g 00000000 BattleScript_EffectFakeOut 082d9f1a g 00000000 BattleScript_FailedFromAtkString -082d9f1b g 00000000 BattleScript_FailedFromPpReduce +082d9f1b g 00000000 BattleScript_FailedFromPPReduce 082d9f1c g 00000000 BattleScript_ButItFailed 082d9f2e g 00000000 BattleScript_NotAffected 082d9f40 g 00000000 BattleScript_EffectUproar @@ -35283,7 +35283,7 @@ 082db176 g 00000000 BattleScript_MoveUsedIsImprisoned 082db181 g 00000000 BattleScript_SelectingImprisonedMove 082db185 g 00000000 BattleScript_SelectingImprisonedMoveInPalace -082db18d g 00000000 BattleScript_GrudgeTakesPp +082db18d g 00000000 BattleScript_GrudgeTakesPP 082db194 g 00000000 BattleScript_MagicCoatBounce 082db1ac g 00000000 BattleScript_SnatchedMove 082db1c7 g 00000000 BattleScript_EnduredMsg @@ -53712,7 +53712,7 @@ 085cca54 g 0000001b gText_SafariZoneMenu 085cca6f g 00000004 gText_MoveInterfacePP 085cca73 g 00000006 gText_MoveInterfaceType -085cca79 g 00000011 gText_MoveInterfacePpType +085cca79 g 00000011 gText_MoveInterfacePPType 085cca8a g 00000009 gText_MoveInterfaceDynamicColors 085cca93 g 00000028 gText_WhichMoveToForget4 085ccabb g 0000000f gText_BattleYesNoChoice @@ -55413,7 +55413,7 @@ 085e9ee9 g 00000018 gText_AlreadySurfing 085e9f01 g 00000015 gText_CantUseHere 085e9f16 g 00000014 gText_RestoreWhichMove -085e9f2a g 00000018 gText_BoostPp +085e9f2a g 00000018 gText_BoostPP 085e9f42 g 00000016 gText_DoWhatWithItem 085e9f58 g 00000017 gText_NoPokemonForBattle 085e9f6f g 00000012 gText_ChoosePokemon2