From a3d01252a45ad70c25a390f5568d88710986c12b Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sun, 17 Oct 2021 15:37:24 +0000 Subject: [PATCH] Merge pull request #1512 from GriffinRichards/minor-constants --- pokeemerald.sym | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 43cddd475f..aae064e355 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -6793,7 +6793,7 @@ 080a92f4 l 00000000 .gcc2_compiled. 080a92f8 g 00000044 ReshowBattleScreenAfterMenu 080a933c l 000002b8 CB2_ReshowBattleScreenAfterMenu -080a95f4 l 00000020 sub_80A95F4 +080a95f4 l 00000020 ClearBattleBgCntBaseBlocks 080a9614 l 000000f4 LoadBattlerSpriteGfx 080a9708 l 000003d4 CreateBattlerSprite 080a9adc l 00000194 CreateHealthboxSprite @@ -7266,7 +7266,7 @@ 080b4808 g 000000b0 PlayerFaceTrainerAfterBattle 080b48b8 g 0000000c DisableWildEncounters 080b48b8 l 00000000 .gcc2_compiled. -080b48c4 l 000000c0 GetRoute119WaterTileNum +080b48c4 l 000000c0 GetFeebasFishingSpotId 080b4984 l 00000114 CheckFeebas 080b4a98 l 00000020 FeebasRandom 080b4ab8 l 00000010 FeebasSeedRng @@ -47946,8 +47946,8 @@ 085539dc g 00000030 gBattlePike_4_LandMons 08553a0c g 00000008 gBattlePike_4_LandMonsInfo 08553a14 g 00000064 gBattlePikeWildMonHeaders -08553a78 g 00000004 gWildFeebasRoute119Data -08553a7c g 00000012 gRoute119WaterTileData +08553a78 l 00000004 sWildFeebas +08553a7c l 00000012 sRoute119WaterTileData 08553a90 l 00000800 sNewGameBirch_Gfx 08554290 l 000066c0 sUnusedBirchBeauty 0855a950 l 00000020 sNewGameBirch_Pal