From 181fd7af409b18cef0a9307afbd8cba3a8529fac Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Wed, 20 Apr 2022 04:26:23 +0000 Subject: [PATCH] Merge pull request #1649 from GriffinRichards/clean-trainer --- pokeemerald.sym | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 7eafa15a1e..f2d2586984 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -703,7 +703,7 @@ 0203cf4c l 00000004 sMailboxList 0203cf50 l 00000001 sGrassSpriteId 0203cf54 l 00000004 sHillData -0203cf58 l 00000004 sRoomTrainers +0203cf58 l 00000004 sFloorTrainers 0203cf5c g 00000004 gTrainerHillVBlankCounter 0203cf60 l 00000004 sRayScene 02040000 l 00000000 EWRAM_END @@ -16688,7 +16688,7 @@ 081d6518 l 0000001c ClearGameSaved 081d6534 g 00000032 OnTrainerHillEReaderChallengeFloor 081d6568 l 00000038 GetChallengeWon -081d65a0 l 00000048 TrainerHillSetTag +081d65a0 l 00000048 TrainerHillSetMode 081d65e8 l 00000058 GetPrizeListId 081d6640 l 000000e0 GetPrizeItemId 081d6720 g 00000054 DoRayquazaScene @@ -58818,16 +58818,16 @@ 08625b54 l 00000018 sLvlUpStatStrings 08625b6c l 00000520 sTrainerHillTrainerTemplates_JP 0862608c l 00000010 sFarawayIslandRockCoords -0862609c l 00000008 sDataTagJPDefault -086260a4 l 00000770 sDataTagJPDefault_Floors -08626814 l 00000008 sDataTagNormal -0862681c l 00000ee0 sDataTagNormal_Floors -086276fc l 00000008 sDataTagVariety -08627704 l 00000ee0 sDataTagVariety_Floors -086285e4 l 00000008 sDataTagUnique -086285ec l 00000ee0 sDataTagUnique_Floors -086294cc l 00000008 sDataTagExpert -086294d4 l 00000ee0 sDataTagExpert_Floors +0862609c l 00000008 sChallenge_JPDefault +086260a4 l 00000770 sFloors_JPDefault +08626814 l 00000008 sChallenge_Normal +0862681c l 00000ee0 sFloors_Normal +086276fc l 00000008 sChallenge_Variety +08627704 l 00000ee0 sFloors_Variety +086285e4 l 00000008 sChallenge_Unique +086285ec l 00000ee0 sFloors_Unique +086294cc l 00000008 sChallenge_Expert +086294d4 l 00000ee0 sFloors_Expert 0862a3b4 l 000000d8 sTrainerClassesAndMusic 0862a48c l 0000000c sPrizeListRareCandy1 0862a498 l 0000000c sPrizeListLuxuryBall1 @@ -58854,10 +58854,10 @@ 0862a5cc l 00000008 sPrizeListSets 0862a5d4 l 00000020 sEReader_Pal 0862a5f4 l 00000003 sRecordWinColors -0862a5f8 l 00000010 sDataPerTag +0862a5f8 l 00000010 sChallengeData 0862a608 l 00000010 sFloorStrings 0862a618 l 00000048 sHillFunctions -0862a660 l 00000010 sTagMatchStrings +0862a660 l 00000010 sModeStrings 0862a670 l 00000018 sTrainerObjectEventTemplate 0862a688 l 00000010 sNextFloorMapNum 0862a698 l 00000006 sTrainerPartySlots