From c441f40afe7e3145c770c52fa731f86a5c74354b Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Wed, 3 Jan 2024 15:59:56 +0000 Subject: [PATCH] Update to RGBDS 0.7.0 (#1101) --- pokecrystal.map | 18 +++++----- pokecrystal.sym | 74 +++++++++++++++++++------------------- pokecrystal11.map | 18 +++++----- pokecrystal11.sym | 74 +++++++++++++++++++------------------- pokecrystal11_debug.map | 18 +++++----- pokecrystal11_debug.sym | 78 ++++++++++++++++++++--------------------- pokecrystal11_vc.map | 18 +++++----- pokecrystal11_vc.sym | 76 +++++++++++++++++++-------------------- pokecrystal_au.map | 18 +++++----- pokecrystal_au.sym | 74 +++++++++++++++++++------------------- pokecrystal_debug.map | 18 +++++----- pokecrystal_debug.sym | 78 ++++++++++++++++++++--------------------- 12 files changed, 281 insertions(+), 281 deletions(-) diff --git a/pokecrystal.map b/pokecrystal.map index c92d5bbb9e8..c9ef28f2f4e 100644 --- a/pokecrystal.map +++ b/pokecrystal.map @@ -1,3 +1,11 @@ +SUMMARY: + ROM0: 16095 bytes used / 289 free + ROMX: 1625834 bytes used / 454934 free in 127 banks + SRAM: 48188 bytes used / 17348 free in 8 banks + WRAM0: 4043 bytes used / 53 free + WRAMX: 22978 bytes used / 5694 free in 7 banks + HRAM: 127 bytes used / 0 free + ROM0 bank #0: SECTION: $0000 (0 bytes) ["NULL"] $0000 = NULL @@ -1261,7 +1269,7 @@ ROMX bank #1: $4031 = WriteOAMDMACodeToHRAM $4038 = WriteOAMDMACodeToHRAM.copy $403f = OAMDMACode - $4049 = OAMDMACodeEnd + $4049 = OAMDMACode.End $4049 = Facings $408b = FacingStepDown0 $408b = FacingStepDown2 @@ -59264,11 +59272,3 @@ HRAM bank #0: $ffea = hSystemBooted $ffeb = hClockResetTrigger TOTAL EMPTY: $0000 bytes - -SUMMARY: - ROM0: 16095 bytes used / 289 free - ROMX: 1625834 bytes used / 454934 free in 127 banks - SRAM: 48188 bytes used / 17348 free in 8 banks - WRAM0: 4043 bytes used / 53 free - WRAMX: 22978 bytes used / 5694 free in 7 banks - HRAM: 127 bytes used / 0 free diff --git a/pokecrystal.sym b/pokecrystal.sym index 91415693205..e2ef7394002 100644 --- a/pokecrystal.sym +++ b/pokecrystal.sym @@ -168,8 +168,8 @@ 00:0a7a JoyTextDelay.restartframedelay 00:0a80 WaitPressAorB_BlinkCursor 00:0a8d WaitPressAorB_BlinkCursor.loop -00:0aa5 SimpleWaitPressAorB.loop 00:0aa5 SimpleWaitPressAorB +00:0aa5 SimpleWaitPressAorB.loop 00:0aaf PromptButton 00:0ac1 PromptButton.link 00:0ac6 PromptButton.wait_input @@ -263,8 +263,8 @@ 00:0f9d Get1bpp 00:0fa4 Copy1bpp 00:0fb6 ClearBox -00:0fb8 FillBoxWithByte.row 00:0fb8 FillBoxWithByte +00:0fb8 FillBoxWithByte.row 00:0fba FillBoxWithByte.col 00:0fc8 ClearTilemap 00:0fdb ClearScreen @@ -907,8 +907,8 @@ 00:30b4 SafeLoadTempTilemapToTilemap 00:30bf LoadTempTilemapToTilemap 00:30d6 CopyName1 -00:30d9 CopyName2.loop 00:30d9 CopyName2 +00:30d9 CopyName2.loop 00:30e1 IsInArray 00:30e4 IsInArray.loop 00:30f0 IsInArray.NotInArray @@ -1229,7 +1229,7 @@ 01:4031 WriteOAMDMACodeToHRAM 01:4038 WriteOAMDMACodeToHRAM.copy 01:403f OAMDMACode -01:4049 OAMDMACodeEnd +01:4049 OAMDMACode.End 01:4049 Facings 01:408b FacingStepDown0 01:408b FacingStepDown2 @@ -1472,8 +1472,8 @@ 01:4f77 StepFunction_16 01:4f7a StepFunction_17 01:4f7d StepFunction_17.anon_dw -01:4f83 StepFunction_SkyfallTop 01:4f83 StepFunction_17.null +01:4f83 StepFunction_SkyfallTop 01:4f86 StepFunction_SkyfallTop.anon_dw 01:4f8a StepFunction_SkyfallTop.Init 01:4f99 StepFunction_SkyfallTop.Run @@ -1791,8 +1791,8 @@ 01:616a Intro_RotatePalettesLeftFrontpic 01:616f Intro_RotatePalettesLeftFrontpic.loop 01:617c IntroFadePalettes -01:6182 Intro_WipeInFrontpic 01:6182 IntroFadePalettes.End +01:6182 Intro_WipeInFrontpic 01:618e Intro_WipeInFrontpic.loop 01:619c Intro_PrepTrainerPic 01:61b4 ShrinkFrame @@ -4664,8 +4664,8 @@ 05:4f46 TryLoadSaveData.backup 05:4f6c TryLoadSaveData.corrupt 05:4f7c DefaultOptions -05:4f84 CheckPrimarySaveFile 05:4f84 DefaultOptions.End +05:4f84 CheckPrimarySaveFile 05:4fab CheckPrimarySaveFile.nope 05:4faf CheckBackupSaveFile 05:4fd3 CheckBackupSaveFile.nope @@ -5698,8 +5698,8 @@ 09:45a3 CheckObjectFlag.masked 09:45a7 GetObjectTimeMask 09:45af _InitScrollingMenu -09:45cb _ScrollingMenu.loop 09:45cb _ScrollingMenu +09:45cb _ScrollingMenu.loop 09:45d6 _ScrollingMenu.exit 09:45e1 _ScrollingMenu.zero 09:45f1 ScrollingMenu_InitDisplay @@ -6990,14 +6990,14 @@ 0b:408e StageBallTilesData.load 0b:4095 DrawPlayerHUDBorder 0b:40a9 DrawPlayerHUDBorder.tiles -0b:40ad DrawPlayerPartyIconHUDBorder 0b:40ad DrawPlayerHUDBorder.tiles_end +0b:40ad DrawPlayerPartyIconHUDBorder 0b:40c1 DrawPlayerPartyIconHUDBorder.tiles -0b:40c5 DrawEnemyHUDBorder 0b:40c5 DrawPlayerPartyIconHUDBorder.tiles_end +0b:40c5 DrawEnemyHUDBorder 0b:40ed DrawEnemyHUDBorder.tiles -0b:40f1 PlaceHUDBorderTiles 0b:40f1 DrawEnemyHUDBorder.tiles_end +0b:40f1 PlaceHUDBorderTiles 0b:40ff PlaceHUDBorderTiles.loop 0b:410d LinkBattle_TrainerHuds 0b:4143 LoadTrainerHudOAM @@ -7073,8 +7073,8 @@ 0b:4725 MysteryGiftItems 0b:474a MysteryGiftItems.End 0b:474a MysteryGiftDecos -0b:476f TMHMPocket 0b:476f MysteryGiftDecos.End +0b:476f TMHMPocket 0b:4798 TMHMPocket.ConvertItemToTMHMNumber 0b:47a7 ConvertCurItemIntoCurTMHM 0b:47b6 GetTMHMItemMove @@ -11250,8 +11250,8 @@ 13:695d MaleTrainers 13:6976 MaleTrainers.End 13:6976 FemaleTrainers -13:6980 BattleIntroSlidingPics 13:6980 FemaleTrainers.End +13:6980 BattleIntroSlidingPics 13:6998 BattleIntroSlidingPics.subfunction1 13:69ab BattleIntroSlidingPics.subfunction2 13:69b2 BattleIntroSlidingPics.loop1 @@ -11572,8 +11572,8 @@ 14:4c7a ListMovePP.loop 14:4cc8 ListMovePP.done 14:4cc9 ListMovePP.load_loop -14:4cd0 BrokenPlacePPUnits.loop 14:4cd0 BrokenPlacePPUnits +14:4cd0 BrokenPlacePPUnits.loop 14:4cdb Unused_PlaceEnemyHPLevel 14:4d09 Unused_PlaceEnemyHPLevel.egg 14:4d0a PlaceStatusString @@ -17580,8 +17580,8 @@ 23:6680 SpriteAnimOAMData.OAMData_GameFreakLogo1_3 23:66a5 SpriteAnimOAMData.OAMData_GameFreakLogo4_11 23:6706 UnusedSpriteAnimGFX -23:672a Sprites_Cosine 23:672a UnusedSpriteAnimGFX.DeletedGFX +23:672a Sprites_Cosine 23:672c Sprites_Sine 23:6737 Sprites_Sine.negative_u24 23:6741 Sprites_Sine.apply_u24 @@ -18016,8 +18016,8 @@ 24:564e AnimateTuningKnob.TuningKnob 24:565c AnimateTuningKnob.down 24:5666 AnimateTuningKnob.up -24:566f UpdateRadioStation 24:566f AnimateTuningKnob.update +24:566f UpdateRadioStation 24:5676 UpdateRadioStation.loop 24:5682 UpdateRadioStation.nostation 24:5686 UpdateRadioStation.foundstation @@ -19111,8 +19111,8 @@ 25:73c7 Script_earthquake 25:73e6 Script_earthquake.script 25:73eb EarthquakeMovement -25:73f0 Script_loadpikachudata 25:73f0 EarthquakeMovement.End +25:73f0 Script_loadpikachudata 25:73fb Script_randomwildmon 25:7400 Script_loadtemptrainer 25:7412 Script_loadwildmon @@ -19172,8 +19172,8 @@ 25:76ae Script_getmonname 25:76b7 Script_getmonname.gotit 25:76c0 GetStringBuffer -25:76c8 CopyConvertedText 25:76c8 GetStringBuffer.ok +25:76c8 CopyConvertedText 25:76d5 Script_getitemname 25:76de Script_getitemname.ok 25:76e9 Script_getcurlandmarkname @@ -21108,8 +21108,8 @@ 2e:47a9 OaksPKMNTalk4.loop3 2e:47ec OaksPKMNTalk4.overflow 2e:47f2 OaksPKMNTalkRoutes -2e:4810 OaksPKMNTalk5 2e:4810 OaksPKMNTalkRoutes.End +2e:4810 OaksPKMNTalk5 2e:4818 OaksPKMNTalk6 2e:4820 OPT_IntroText1 2e:4825 OPT_IntroText2 @@ -29148,9 +29148,9 @@ 3c:72e7 Cry_Natu_Ch5 3c:72e9 Cry_Natu_Ch5.body1 3c:72f5 Cry_Natu_Ch5.body2 +3c:7302 Cry_Sunflora_Ch6.body1 3c:7302 Cry_Natu_Ch6 3c:7302 Cry_Sunflora_Ch6 -3c:7302 Cry_Sunflora_Ch6.body1 3c:7310 Cry_Sunflora_Ch6.body2 3c:731d Cry_Natu_Ch8 3c:731d Cry_Sunflora_Ch8 @@ -30198,8 +30198,8 @@ 3f:512b GetItemFromMom.ok 3f:512e GetItemFromMom.GetFromList1 3f:5136 MomItems_1 -3f:515e MomItems_2 3f:515e MomItems_1.End +3f:515e MomItems_2 3f:51ae MomItems_2.End 3f:51b1 MomHiHowAreYouText 3f:51b6 MomFoundAnItemText @@ -31077,8 +31077,8 @@ 41:426f PadMapForHDMATransfer.loop2 41:4279 PadMapForHDMATransfer.loop3 41:4284 HDMATransfer2bpp -41:42b2 HDMATransfer1bpp.loop 41:42b2 HDMATransfer1bpp +41:42b2 HDMATransfer1bpp.loop 41:42d6 HDMATransfer1bpp.bankswitch 41:4303 HDMATransfer_OnlyTopFourRows 41:4309 HDMATransfer_OnlyTopFourRows.Function @@ -31975,14 +31975,14 @@ 44:4fad URIPrefix 44:4fb4 URIPrefix.End 44:4fb4 HTTPDownloadURL -44:4fd9 HTTPUploadURL 44:4fd9 HTTPDownloadURL.End +44:4fd9 HTTPUploadURL 44:4ffc HTTPUploadURL.End 44:4ffc HTTPUtilityURL -44:5020 HTTPRankingURL 44:5020 HTTPUtilityURL.End -44:5044 Function111044 +44:5020 HTTPRankingURL 44:5044 HTTPRankingURL.End +44:5044 Function111044 44:50ac Function111044.asm_1110ac 44:50eb Function111044.asm_1110eb 44:5144 Function111044.asm_111144 @@ -32211,34 +32211,34 @@ 44:6001 MobilePacket_BeginSession 44:6013 MobilePacket_BeginSession.End 44:6013 MobilePacket_EndSession -44:601d MobilePacket_DialTelephone 44:601d MobilePacket_EndSession.End +44:601d MobilePacket_DialTelephone 44:6023 MobilePacket_DialTelephone.End 44:6023 MobilePacket_HangUpTelephone -44:602d MobilePacket_TelephoneStatus 44:602d MobilePacket_HangUpTelephone.End -44:6037 MobilePacket_ISPLogin +44:602d MobilePacket_TelephoneStatus 44:6037 MobilePacket_TelephoneStatus.End +44:6037 MobilePacket_ISPLogin 44:603c MobilePacket_ISPLogin.End 44:603c MobilePacket_ISPLogout -44:6046 MobilePacket_ReadConfigurationDataPart1 44:6046 MobilePacket_ISPLogout.End -44:6052 MobilePacket_ReadConfigurationDataPart2 +44:6046 MobilePacket_ReadConfigurationDataPart1 44:6052 MobilePacket_ReadConfigurationDataPart1.End -44:605e MobilePacket_WriteConfigurationData +44:6052 MobilePacket_ReadConfigurationDataPart2 44:605e MobilePacket_ReadConfigurationDataPart2.End +44:605e MobilePacket_WriteConfigurationData 44:6063 MobilePacket_WriteConfigurationData.End 44:6063 MobilePacket_DNSQuery 44:6068 MobilePacket_DNSQuery.End 44:6068 MobilePacket_WaitForTelephoneCall -44:6072 MobilePacket_TransferData 44:6072 MobilePacket_WaitForTelephoneCall.End -44:607d MobilePacket_OpenTCPConnection +44:6072 MobilePacket_TransferData 44:607d MobilePacket_TransferData.End +44:607d MobilePacket_OpenTCPConnection 44:6083 MobilePacket_OpenTCPConnection.End 44:6083 MobilePacket_CloseTCPConnection -44:6089 Unknown_112089 44:6089 MobilePacket_CloseTCPConnection.End +44:6089 Unknown_112089 44:609e Unknown_11209e 44:60a4 Unknown_1120a4 44:60b0 Unknown_1120b0 @@ -34017,8 +34017,8 @@ 46:71ed Function11b175.asm_11b1ed 46:71ef Function11b175.asm_11b1ef 46:71f7 FillScreenWithTile32 -46:7203 CopyDataUntilFF.loop 46:7203 CopyDataUntilFF +46:7203 CopyDataUntilFF.loop 46:720b Function11b20b 46:721e CheckCaughtMemMon 46:722a CheckSeenMemMon @@ -34491,8 +34491,8 @@ 47:7100 MobileEZChatCategoryPointers.ThisAndThat 47:7220 MobileEZChatData_WordAndPageCounts 47:723c EZChat_SortedWords -47:72f0 BTTrainerClassGenders 47:72f0 EZChat_SortedWords.End +47:72f0 BTTrainerClassGenders 47:7332 BTMaleTrainerTexts 47:7338 BTMaleTrainerTexts.Greetings 47:736a BTMaleTrainerTexts.PlayerLost @@ -36008,8 +36008,8 @@ 5f:51a6 Mobile_CopyDefaultNickname.DefaultNickname 5f:51ab Mobile_CopyDefaultMail 5f:51c3 Mobile_CopyDefaultMail.DefaultMessage -5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51c9 Mobile_CopyDefaultMail.DefaultMessageEnd +5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51e1 CheckStringContainsLessThanBNextCharacters 5f:51e1 CheckStringContainsLessThanBNextCharacters.loop 5f:51ea CheckStringContainsLessThanBNextCharacters.next_char diff --git a/pokecrystal11.map b/pokecrystal11.map index 733666fc798..3b519e39350 100644 --- a/pokecrystal11.map +++ b/pokecrystal11.map @@ -1,3 +1,11 @@ +SUMMARY: + ROM0: 16095 bytes used / 289 free + ROMX: 1625847 bytes used / 454921 free in 127 banks + SRAM: 48188 bytes used / 17348 free in 8 banks + WRAM0: 4043 bytes used / 53 free + WRAMX: 22978 bytes used / 5694 free in 7 banks + HRAM: 127 bytes used / 0 free + ROM0 bank #0: SECTION: $0000 (0 bytes) ["NULL"] $0000 = NULL @@ -1261,7 +1269,7 @@ ROMX bank #1: $4031 = WriteOAMDMACodeToHRAM $4038 = WriteOAMDMACodeToHRAM.copy $403f = OAMDMACode - $4049 = OAMDMACodeEnd + $4049 = OAMDMACode.End $4049 = Facings $408b = FacingStepDown0 $408b = FacingStepDown2 @@ -59264,11 +59272,3 @@ HRAM bank #0: $ffea = hSystemBooted $ffeb = hClockResetTrigger TOTAL EMPTY: $0000 bytes - -SUMMARY: - ROM0: 16095 bytes used / 289 free - ROMX: 1625847 bytes used / 454921 free in 127 banks - SRAM: 48188 bytes used / 17348 free in 8 banks - WRAM0: 4043 bytes used / 53 free - WRAMX: 22978 bytes used / 5694 free in 7 banks - HRAM: 127 bytes used / 0 free diff --git a/pokecrystal11.sym b/pokecrystal11.sym index 34960587189..07b046c8102 100644 --- a/pokecrystal11.sym +++ b/pokecrystal11.sym @@ -168,8 +168,8 @@ 00:0a7a JoyTextDelay.restartframedelay 00:0a80 WaitPressAorB_BlinkCursor 00:0a8d WaitPressAorB_BlinkCursor.loop -00:0aa5 SimpleWaitPressAorB.loop 00:0aa5 SimpleWaitPressAorB +00:0aa5 SimpleWaitPressAorB.loop 00:0aaf PromptButton 00:0ac1 PromptButton.link 00:0ac6 PromptButton.wait_input @@ -263,8 +263,8 @@ 00:0f9d Get1bpp 00:0fa4 Copy1bpp 00:0fb6 ClearBox -00:0fb8 FillBoxWithByte.row 00:0fb8 FillBoxWithByte +00:0fb8 FillBoxWithByte.row 00:0fba FillBoxWithByte.col 00:0fc8 ClearTilemap 00:0fdb ClearScreen @@ -907,8 +907,8 @@ 00:30b4 SafeLoadTempTilemapToTilemap 00:30bf LoadTempTilemapToTilemap 00:30d6 CopyName1 -00:30d9 CopyName2.loop 00:30d9 CopyName2 +00:30d9 CopyName2.loop 00:30e1 IsInArray 00:30e4 IsInArray.loop 00:30f0 IsInArray.NotInArray @@ -1229,7 +1229,7 @@ 01:4031 WriteOAMDMACodeToHRAM 01:4038 WriteOAMDMACodeToHRAM.copy 01:403f OAMDMACode -01:4049 OAMDMACodeEnd +01:4049 OAMDMACode.End 01:4049 Facings 01:408b FacingStepDown0 01:408b FacingStepDown2 @@ -1472,8 +1472,8 @@ 01:4f77 StepFunction_16 01:4f7a StepFunction_17 01:4f7d StepFunction_17.anon_dw -01:4f83 StepFunction_SkyfallTop 01:4f83 StepFunction_17.null +01:4f83 StepFunction_SkyfallTop 01:4f86 StepFunction_SkyfallTop.anon_dw 01:4f8a StepFunction_SkyfallTop.Init 01:4f99 StepFunction_SkyfallTop.Run @@ -1791,8 +1791,8 @@ 01:616a Intro_RotatePalettesLeftFrontpic 01:616f Intro_RotatePalettesLeftFrontpic.loop 01:617c IntroFadePalettes -01:6182 Intro_WipeInFrontpic 01:6182 IntroFadePalettes.End +01:6182 Intro_WipeInFrontpic 01:618e Intro_WipeInFrontpic.loop 01:619c Intro_PrepTrainerPic 01:61b4 ShrinkFrame @@ -4664,8 +4664,8 @@ 05:4f46 TryLoadSaveData.backup 05:4f6c TryLoadSaveData.corrupt 05:4f7c DefaultOptions -05:4f84 CheckPrimarySaveFile 05:4f84 DefaultOptions.End +05:4f84 CheckPrimarySaveFile 05:4fab CheckPrimarySaveFile.nope 05:4faf CheckBackupSaveFile 05:4fd3 CheckBackupSaveFile.nope @@ -5698,8 +5698,8 @@ 09:45a3 CheckObjectFlag.masked 09:45a7 GetObjectTimeMask 09:45af _InitScrollingMenu -09:45cb _ScrollingMenu.loop 09:45cb _ScrollingMenu +09:45cb _ScrollingMenu.loop 09:45d6 _ScrollingMenu.exit 09:45e1 _ScrollingMenu.zero 09:45f1 ScrollingMenu_InitDisplay @@ -6990,14 +6990,14 @@ 0b:408e StageBallTilesData.load 0b:4095 DrawPlayerHUDBorder 0b:40a9 DrawPlayerHUDBorder.tiles -0b:40ad DrawPlayerPartyIconHUDBorder 0b:40ad DrawPlayerHUDBorder.tiles_end +0b:40ad DrawPlayerPartyIconHUDBorder 0b:40c1 DrawPlayerPartyIconHUDBorder.tiles -0b:40c5 DrawEnemyHUDBorder 0b:40c5 DrawPlayerPartyIconHUDBorder.tiles_end +0b:40c5 DrawEnemyHUDBorder 0b:40ed DrawEnemyHUDBorder.tiles -0b:40f1 PlaceHUDBorderTiles 0b:40f1 DrawEnemyHUDBorder.tiles_end +0b:40f1 PlaceHUDBorderTiles 0b:40ff PlaceHUDBorderTiles.loop 0b:410d LinkBattle_TrainerHuds 0b:4143 LoadTrainerHudOAM @@ -7073,8 +7073,8 @@ 0b:4725 MysteryGiftItems 0b:474a MysteryGiftItems.End 0b:474a MysteryGiftDecos -0b:476f TMHMPocket 0b:476f MysteryGiftDecos.End +0b:476f TMHMPocket 0b:4798 TMHMPocket.ConvertItemToTMHMNumber 0b:47a7 ConvertCurItemIntoCurTMHM 0b:47b6 GetTMHMItemMove @@ -11250,8 +11250,8 @@ 13:695d MaleTrainers 13:6976 MaleTrainers.End 13:6976 FemaleTrainers -13:6980 BattleIntroSlidingPics 13:6980 FemaleTrainers.End +13:6980 BattleIntroSlidingPics 13:6998 BattleIntroSlidingPics.subfunction1 13:69ab BattleIntroSlidingPics.subfunction2 13:69b2 BattleIntroSlidingPics.loop1 @@ -11572,8 +11572,8 @@ 14:4c7a ListMovePP.loop 14:4cc8 ListMovePP.done 14:4cc9 ListMovePP.load_loop -14:4cd0 BrokenPlacePPUnits.loop 14:4cd0 BrokenPlacePPUnits +14:4cd0 BrokenPlacePPUnits.loop 14:4cdb Unused_PlaceEnemyHPLevel 14:4d09 Unused_PlaceEnemyHPLevel.egg 14:4d0a PlaceStatusString @@ -17580,8 +17580,8 @@ 23:6680 SpriteAnimOAMData.OAMData_GameFreakLogo1_3 23:66a5 SpriteAnimOAMData.OAMData_GameFreakLogo4_11 23:6706 UnusedSpriteAnimGFX -23:672a Sprites_Cosine 23:672a UnusedSpriteAnimGFX.DeletedGFX +23:672a Sprites_Cosine 23:672c Sprites_Sine 23:6737 Sprites_Sine.negative_u24 23:6741 Sprites_Sine.apply_u24 @@ -18016,8 +18016,8 @@ 24:564e AnimateTuningKnob.TuningKnob 24:565c AnimateTuningKnob.down 24:5666 AnimateTuningKnob.up -24:566f UpdateRadioStation 24:566f AnimateTuningKnob.update +24:566f UpdateRadioStation 24:5676 UpdateRadioStation.loop 24:5682 UpdateRadioStation.nostation 24:5686 UpdateRadioStation.foundstation @@ -19111,8 +19111,8 @@ 25:73c7 Script_earthquake 25:73e6 Script_earthquake.script 25:73eb EarthquakeMovement -25:73f0 Script_loadpikachudata 25:73f0 EarthquakeMovement.End +25:73f0 Script_loadpikachudata 25:73fb Script_randomwildmon 25:7400 Script_loadtemptrainer 25:7412 Script_loadwildmon @@ -19172,8 +19172,8 @@ 25:76ae Script_getmonname 25:76b7 Script_getmonname.gotit 25:76c0 GetStringBuffer -25:76c8 CopyConvertedText 25:76c8 GetStringBuffer.ok +25:76c8 CopyConvertedText 25:76d5 Script_getitemname 25:76de Script_getitemname.ok 25:76e9 Script_getcurlandmarkname @@ -21108,8 +21108,8 @@ 2e:47a9 OaksPKMNTalk4.loop3 2e:47ec OaksPKMNTalk4.overflow 2e:47f2 OaksPKMNTalkRoutes -2e:4810 OaksPKMNTalk5 2e:4810 OaksPKMNTalkRoutes.End +2e:4810 OaksPKMNTalk5 2e:4818 OaksPKMNTalk6 2e:4820 OPT_IntroText1 2e:4825 OPT_IntroText2 @@ -29148,9 +29148,9 @@ 3c:72e7 Cry_Natu_Ch5 3c:72e9 Cry_Natu_Ch5.body1 3c:72f5 Cry_Natu_Ch5.body2 +3c:7302 Cry_Sunflora_Ch6.body1 3c:7302 Cry_Natu_Ch6 3c:7302 Cry_Sunflora_Ch6 -3c:7302 Cry_Sunflora_Ch6.body1 3c:7310 Cry_Sunflora_Ch6.body2 3c:731d Cry_Natu_Ch8 3c:731d Cry_Sunflora_Ch8 @@ -30198,8 +30198,8 @@ 3f:512b GetItemFromMom.ok 3f:512e GetItemFromMom.GetFromList1 3f:5136 MomItems_1 -3f:515e MomItems_2 3f:515e MomItems_1.End +3f:515e MomItems_2 3f:51ae MomItems_2.End 3f:51b1 MomHiHowAreYouText 3f:51b6 MomFoundAnItemText @@ -31077,8 +31077,8 @@ 41:426f PadMapForHDMATransfer.loop2 41:4279 PadMapForHDMATransfer.loop3 41:4284 HDMATransfer2bpp -41:42b2 HDMATransfer1bpp.loop 41:42b2 HDMATransfer1bpp +41:42b2 HDMATransfer1bpp.loop 41:42d6 HDMATransfer1bpp.bankswitch 41:4303 HDMATransfer_OnlyTopFourRows 41:4309 HDMATransfer_OnlyTopFourRows.Function @@ -31975,14 +31975,14 @@ 44:4fad URIPrefix 44:4fb4 URIPrefix.End 44:4fb4 HTTPDownloadURL -44:4fd9 HTTPUploadURL 44:4fd9 HTTPDownloadURL.End +44:4fd9 HTTPUploadURL 44:4ffc HTTPUploadURL.End 44:4ffc HTTPUtilityURL -44:5020 HTTPRankingURL 44:5020 HTTPUtilityURL.End -44:5044 Function111044 +44:5020 HTTPRankingURL 44:5044 HTTPRankingURL.End +44:5044 Function111044 44:50ac Function111044.asm_1110ac 44:50eb Function111044.asm_1110eb 44:5144 Function111044.asm_111144 @@ -32211,34 +32211,34 @@ 44:6001 MobilePacket_BeginSession 44:6013 MobilePacket_BeginSession.End 44:6013 MobilePacket_EndSession -44:601d MobilePacket_DialTelephone 44:601d MobilePacket_EndSession.End +44:601d MobilePacket_DialTelephone 44:6023 MobilePacket_DialTelephone.End 44:6023 MobilePacket_HangUpTelephone -44:602d MobilePacket_TelephoneStatus 44:602d MobilePacket_HangUpTelephone.End -44:6037 MobilePacket_ISPLogin +44:602d MobilePacket_TelephoneStatus 44:6037 MobilePacket_TelephoneStatus.End +44:6037 MobilePacket_ISPLogin 44:603c MobilePacket_ISPLogin.End 44:603c MobilePacket_ISPLogout -44:6046 MobilePacket_ReadConfigurationDataPart1 44:6046 MobilePacket_ISPLogout.End -44:6052 MobilePacket_ReadConfigurationDataPart2 +44:6046 MobilePacket_ReadConfigurationDataPart1 44:6052 MobilePacket_ReadConfigurationDataPart1.End -44:605e MobilePacket_WriteConfigurationData +44:6052 MobilePacket_ReadConfigurationDataPart2 44:605e MobilePacket_ReadConfigurationDataPart2.End +44:605e MobilePacket_WriteConfigurationData 44:6063 MobilePacket_WriteConfigurationData.End 44:6063 MobilePacket_DNSQuery 44:6068 MobilePacket_DNSQuery.End 44:6068 MobilePacket_WaitForTelephoneCall -44:6072 MobilePacket_TransferData 44:6072 MobilePacket_WaitForTelephoneCall.End -44:607d MobilePacket_OpenTCPConnection +44:6072 MobilePacket_TransferData 44:607d MobilePacket_TransferData.End +44:607d MobilePacket_OpenTCPConnection 44:6083 MobilePacket_OpenTCPConnection.End 44:6083 MobilePacket_CloseTCPConnection -44:6089 Unknown_112089 44:6089 MobilePacket_CloseTCPConnection.End +44:6089 Unknown_112089 44:609e Unknown_11209e 44:60a4 Unknown_1120a4 44:60b0 Unknown_1120b0 @@ -34017,8 +34017,8 @@ 46:71ed Function11b175.asm_11b1ed 46:71ef Function11b175.asm_11b1ef 46:71f7 FillScreenWithTile32 -46:7203 CopyDataUntilFF.loop 46:7203 CopyDataUntilFF +46:7203 CopyDataUntilFF.loop 46:720b Function11b20b 46:721e CheckCaughtMemMon 46:722a CheckSeenMemMon @@ -34491,8 +34491,8 @@ 47:7100 MobileEZChatCategoryPointers.ThisAndThat 47:7220 MobileEZChatData_WordAndPageCounts 47:723c EZChat_SortedWords -47:72f0 BTTrainerClassGenders 47:72f0 EZChat_SortedWords.End +47:72f0 BTTrainerClassGenders 47:7332 BTMaleTrainerTexts 47:7338 BTMaleTrainerTexts.Greetings 47:736a BTMaleTrainerTexts.PlayerLost @@ -36008,8 +36008,8 @@ 5f:51a6 Mobile_CopyDefaultNickname.DefaultNickname 5f:51ab Mobile_CopyDefaultMail 5f:51c3 Mobile_CopyDefaultMail.DefaultMessage -5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51c9 Mobile_CopyDefaultMail.DefaultMessageEnd +5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51e1 CheckStringContainsLessThanBNextCharacters 5f:51e1 CheckStringContainsLessThanBNextCharacters.loop 5f:51ea CheckStringContainsLessThanBNextCharacters.next_char diff --git a/pokecrystal11_debug.map b/pokecrystal11_debug.map index ce703499724..dd21c0256ca 100644 --- a/pokecrystal11_debug.map +++ b/pokecrystal11_debug.map @@ -1,3 +1,11 @@ +SUMMARY: + ROM0: 16141 bytes used / 243 free + ROMX: 1629823 bytes used / 450945 free in 127 banks + SRAM: 48194 bytes used / 17342 free in 8 banks + WRAM0: 4043 bytes used / 53 free + WRAMX: 22978 bytes used / 5694 free in 7 banks + HRAM: 127 bytes used / 0 free + ROM0 bank #0: SECTION: $0000 (0 bytes) ["NULL"] $0000 = NULL @@ -1264,7 +1272,7 @@ ROMX bank #1: $4031 = WriteOAMDMACodeToHRAM $4038 = WriteOAMDMACodeToHRAM.copy $403f = OAMDMACode - $4049 = OAMDMACodeEnd + $4049 = OAMDMACode.End $4049 = Facings $408b = FacingStepDown0 $408b = FacingStepDown2 @@ -59535,11 +59543,3 @@ HRAM bank #0: $ffeb = hClockResetTrigger $ffeb = hDebugRoomMenuPage TOTAL EMPTY: $0000 bytes - -SUMMARY: - ROM0: 16141 bytes used / 243 free - ROMX: 1629823 bytes used / 450945 free in 127 banks - SRAM: 48194 bytes used / 17342 free in 8 banks - WRAM0: 4043 bytes used / 53 free - WRAMX: 22978 bytes used / 5694 free in 7 banks - HRAM: 127 bytes used / 0 free diff --git a/pokecrystal11_debug.sym b/pokecrystal11_debug.sym index a0ebca4a3e2..3dcdb76a2da 100644 --- a/pokecrystal11_debug.sym +++ b/pokecrystal11_debug.sym @@ -168,8 +168,8 @@ 00:0a7a JoyTextDelay.restartframedelay 00:0a80 WaitPressAorB_BlinkCursor 00:0a8d WaitPressAorB_BlinkCursor.loop -00:0aa5 SimpleWaitPressAorB.loop 00:0aa5 SimpleWaitPressAorB +00:0aa5 SimpleWaitPressAorB.loop 00:0aaf PromptButton 00:0ac1 PromptButton.link 00:0ac6 PromptButton.wait_input @@ -263,8 +263,8 @@ 00:0f9d Get1bpp 00:0fa4 Copy1bpp 00:0fb6 ClearBox -00:0fb8 FillBoxWithByte.row 00:0fb8 FillBoxWithByte +00:0fb8 FillBoxWithByte.row 00:0fba FillBoxWithByte.col 00:0fc8 ClearTilemap 00:0fdb ClearScreen @@ -692,9 +692,9 @@ 00:25d5 FillSouthConnectionStrip.y 00:25da FillSouthConnectionStrip.x 00:25f2 FillSouthConnectionStrip.okay +00:25f6 FillEastConnectionStrip.loop 00:25f6 FillWestConnectionStrip 00:25f6 FillEastConnectionStrip -00:25f6 FillEastConnectionStrip.loop 00:2617 FillEastConnectionStrip.okay 00:261b LoadMapStatus 00:261f CallScript @@ -910,8 +910,8 @@ 00:30e2 SafeLoadTempTilemapToTilemap 00:30ed LoadTempTilemapToTilemap 00:3104 CopyName1 -00:3107 CopyName2.loop 00:3107 CopyName2 +00:3107 CopyName2.loop 00:310f IsInArray 00:3112 IsInArray.loop 00:311e IsInArray.NotInArray @@ -1232,7 +1232,7 @@ 01:4031 WriteOAMDMACodeToHRAM 01:4038 WriteOAMDMACodeToHRAM.copy 01:403f OAMDMACode -01:4049 OAMDMACodeEnd +01:4049 OAMDMACode.End 01:4049 Facings 01:408b FacingStepDown0 01:408b FacingStepDown2 @@ -1475,8 +1475,8 @@ 01:4f77 StepFunction_16 01:4f7a StepFunction_17 01:4f7d StepFunction_17.anon_dw -01:4f83 StepFunction_SkyfallTop 01:4f83 StepFunction_17.null +01:4f83 StepFunction_SkyfallTop 01:4f86 StepFunction_SkyfallTop.anon_dw 01:4f8a StepFunction_SkyfallTop.Init 01:4f99 StepFunction_SkyfallTop.Run @@ -1795,8 +1795,8 @@ 01:6171 Intro_RotatePalettesLeftFrontpic 01:6176 Intro_RotatePalettesLeftFrontpic.loop 01:6183 IntroFadePalettes -01:6189 Intro_WipeInFrontpic 01:6189 IntroFadePalettes.End +01:6189 Intro_WipeInFrontpic 01:6195 Intro_WipeInFrontpic.loop 01:61a3 Intro_PrepTrainerPic 01:61bb ShrinkFrame @@ -4669,8 +4669,8 @@ 05:4f46 TryLoadSaveData.backup 05:4f6c TryLoadSaveData.corrupt 05:4f7c DefaultOptions -05:4f84 CheckPrimarySaveFile 05:4f84 DefaultOptions.End +05:4f84 CheckPrimarySaveFile 05:4fab CheckPrimarySaveFile.nope 05:4faf CheckBackupSaveFile 05:4fd3 CheckBackupSaveFile.nope @@ -5703,8 +5703,8 @@ 09:45a3 CheckObjectFlag.masked 09:45a7 GetObjectTimeMask 09:45af _InitScrollingMenu -09:45cb _ScrollingMenu.loop 09:45cb _ScrollingMenu +09:45cb _ScrollingMenu.loop 09:45d6 _ScrollingMenu.exit 09:45e1 _ScrollingMenu.zero 09:45f1 ScrollingMenu_InitDisplay @@ -6995,14 +6995,14 @@ 0b:408e StageBallTilesData.load 0b:4095 DrawPlayerHUDBorder 0b:40a9 DrawPlayerHUDBorder.tiles -0b:40ad DrawPlayerPartyIconHUDBorder 0b:40ad DrawPlayerHUDBorder.tiles_end +0b:40ad DrawPlayerPartyIconHUDBorder 0b:40c1 DrawPlayerPartyIconHUDBorder.tiles -0b:40c5 DrawEnemyHUDBorder 0b:40c5 DrawPlayerPartyIconHUDBorder.tiles_end +0b:40c5 DrawEnemyHUDBorder 0b:40ed DrawEnemyHUDBorder.tiles -0b:40f1 PlaceHUDBorderTiles 0b:40f1 DrawEnemyHUDBorder.tiles_end +0b:40f1 PlaceHUDBorderTiles 0b:40ff PlaceHUDBorderTiles.loop 0b:410d LinkBattle_TrainerHuds 0b:4143 LoadTrainerHudOAM @@ -7078,8 +7078,8 @@ 0b:4725 MysteryGiftItems 0b:474a MysteryGiftItems.End 0b:474a MysteryGiftDecos -0b:476f TMHMPocket 0b:476f MysteryGiftDecos.End +0b:476f TMHMPocket 0b:4798 TMHMPocket.ConvertItemToTMHMNumber 0b:47a7 ConvertCurItemIntoCurTMHM 0b:47b6 GetTMHMItemMove @@ -11262,8 +11262,8 @@ 13:69bc MaleTrainers 13:69d5 MaleTrainers.End 13:69d5 FemaleTrainers -13:69df BattleIntroSlidingPics 13:69df FemaleTrainers.End +13:69df BattleIntroSlidingPics 13:69f7 BattleIntroSlidingPics.subfunction1 13:6a0a BattleIntroSlidingPics.subfunction2 13:6a11 BattleIntroSlidingPics.loop1 @@ -11584,8 +11584,8 @@ 14:4c7a ListMovePP.loop 14:4cc8 ListMovePP.done 14:4cc9 ListMovePP.load_loop -14:4cd0 BrokenPlacePPUnits.loop 14:4cd0 BrokenPlacePPUnits +14:4cd0 BrokenPlacePPUnits.loop 14:4cdb Unused_PlaceEnemyHPLevel 14:4d09 Unused_PlaceEnemyHPLevel.egg 14:4d0a PlaceStatusString @@ -17592,8 +17592,8 @@ 23:6680 SpriteAnimOAMData.OAMData_GameFreakLogo1_3 23:66a5 SpriteAnimOAMData.OAMData_GameFreakLogo4_11 23:6706 UnusedSpriteAnimGFX -23:672a Sprites_Cosine 23:672a UnusedSpriteAnimGFX.DeletedGFX +23:672a Sprites_Cosine 23:672c Sprites_Sine 23:6737 Sprites_Sine.negative_u24 23:6741 Sprites_Sine.apply_u24 @@ -18028,8 +18028,8 @@ 24:564e AnimateTuningKnob.TuningKnob 24:565c AnimateTuningKnob.down 24:5666 AnimateTuningKnob.up -24:566f UpdateRadioStation 24:566f AnimateTuningKnob.update +24:566f UpdateRadioStation 24:5676 UpdateRadioStation.loop 24:5682 UpdateRadioStation.nostation 24:5686 UpdateRadioStation.foundstation @@ -19123,8 +19123,8 @@ 25:73c7 Script_earthquake 25:73e6 Script_earthquake.script 25:73eb EarthquakeMovement -25:73f0 Script_loadpikachudata 25:73f0 EarthquakeMovement.End +25:73f0 Script_loadpikachudata 25:73fb Script_randomwildmon 25:7400 Script_loadtemptrainer 25:7412 Script_loadwildmon @@ -19184,8 +19184,8 @@ 25:76ae Script_getmonname 25:76b7 Script_getmonname.gotit 25:76c0 GetStringBuffer -25:76c8 CopyConvertedText 25:76c8 GetStringBuffer.ok +25:76c8 CopyConvertedText 25:76d5 Script_getitemname 25:76de Script_getitemname.ok 25:76e9 Script_getcurlandmarkname @@ -21120,8 +21120,8 @@ 2e:47a9 OaksPKMNTalk4.loop3 2e:47ec OaksPKMNTalk4.overflow 2e:47f2 OaksPKMNTalkRoutes -2e:4810 OaksPKMNTalk5 2e:4810 OaksPKMNTalkRoutes.End +2e:4810 OaksPKMNTalk5 2e:4818 OaksPKMNTalk6 2e:4820 OPT_IntroText1 2e:4825 OPT_IntroText2 @@ -29160,9 +29160,9 @@ 3c:72e7 Cry_Natu_Ch5 3c:72e9 Cry_Natu_Ch5.body1 3c:72f5 Cry_Natu_Ch5.body2 +3c:7302 Cry_Sunflora_Ch6.body1 3c:7302 Cry_Natu_Ch6 3c:7302 Cry_Sunflora_Ch6 -3c:7302 Cry_Sunflora_Ch6.body1 3c:7310 Cry_Sunflora_Ch6.body2 3c:731d Cry_Natu_Ch8 3c:731d Cry_Sunflora_Ch8 @@ -30210,8 +30210,8 @@ 3f:512b GetItemFromMom.ok 3f:512e GetItemFromMom.GetFromList1 3f:5136 MomItems_1 -3f:515e MomItems_2 3f:515e MomItems_1.End +3f:515e MomItems_2 3f:51ae MomItems_2.End 3f:51b1 MomHiHowAreYouText 3f:51b6 MomFoundAnItemText @@ -31089,8 +31089,8 @@ 41:426f PadMapForHDMATransfer.loop2 41:4279 PadMapForHDMATransfer.loop3 41:4284 HDMATransfer2bpp -41:42b2 HDMATransfer1bpp.loop 41:42b2 HDMATransfer1bpp +41:42b2 HDMATransfer1bpp.loop 41:42d6 HDMATransfer1bpp.bankswitch 41:4303 HDMATransfer_OnlyTopFourRows 41:4309 HDMATransfer_OnlyTopFourRows.Function @@ -31987,14 +31987,14 @@ 44:4fad URIPrefix 44:4fb4 URIPrefix.End 44:4fb4 HTTPDownloadURL -44:4fd9 HTTPUploadURL 44:4fd9 HTTPDownloadURL.End +44:4fd9 HTTPUploadURL 44:4ffc HTTPUploadURL.End 44:4ffc HTTPUtilityURL -44:5020 HTTPRankingURL 44:5020 HTTPUtilityURL.End -44:5044 Function111044 +44:5020 HTTPRankingURL 44:5044 HTTPRankingURL.End +44:5044 Function111044 44:50ac Function111044.asm_1110ac 44:50eb Function111044.asm_1110eb 44:5144 Function111044.asm_111144 @@ -32223,34 +32223,34 @@ 44:6001 MobilePacket_BeginSession 44:6013 MobilePacket_BeginSession.End 44:6013 MobilePacket_EndSession -44:601d MobilePacket_DialTelephone 44:601d MobilePacket_EndSession.End +44:601d MobilePacket_DialTelephone 44:6023 MobilePacket_DialTelephone.End 44:6023 MobilePacket_HangUpTelephone -44:602d MobilePacket_TelephoneStatus 44:602d MobilePacket_HangUpTelephone.End -44:6037 MobilePacket_ISPLogin +44:602d MobilePacket_TelephoneStatus 44:6037 MobilePacket_TelephoneStatus.End +44:6037 MobilePacket_ISPLogin 44:603c MobilePacket_ISPLogin.End 44:603c MobilePacket_ISPLogout -44:6046 MobilePacket_ReadConfigurationDataPart1 44:6046 MobilePacket_ISPLogout.End -44:6052 MobilePacket_ReadConfigurationDataPart2 +44:6046 MobilePacket_ReadConfigurationDataPart1 44:6052 MobilePacket_ReadConfigurationDataPart1.End -44:605e MobilePacket_WriteConfigurationData +44:6052 MobilePacket_ReadConfigurationDataPart2 44:605e MobilePacket_ReadConfigurationDataPart2.End +44:605e MobilePacket_WriteConfigurationData 44:6063 MobilePacket_WriteConfigurationData.End 44:6063 MobilePacket_DNSQuery 44:6068 MobilePacket_DNSQuery.End 44:6068 MobilePacket_WaitForTelephoneCall -44:6072 MobilePacket_TransferData 44:6072 MobilePacket_WaitForTelephoneCall.End -44:607d MobilePacket_OpenTCPConnection +44:6072 MobilePacket_TransferData 44:607d MobilePacket_TransferData.End +44:607d MobilePacket_OpenTCPConnection 44:6083 MobilePacket_OpenTCPConnection.End 44:6083 MobilePacket_CloseTCPConnection -44:6089 Unknown_112089 44:6089 MobilePacket_CloseTCPConnection.End +44:6089 Unknown_112089 44:609e Unknown_11209e 44:60a4 Unknown_1120a4 44:60b0 Unknown_1120b0 @@ -34029,8 +34029,8 @@ 46:71ed Function11b175.asm_11b1ed 46:71ef Function11b175.asm_11b1ef 46:71f7 FillScreenWithTile32 -46:7203 CopyDataUntilFF.loop 46:7203 CopyDataUntilFF +46:7203 CopyDataUntilFF.loop 46:720b Function11b20b 46:721e CheckCaughtMemMon 46:722a CheckSeenMemMon @@ -34503,8 +34503,8 @@ 47:7100 MobileEZChatCategoryPointers.ThisAndThat 47:7220 MobileEZChatData_WordAndPageCounts 47:723c EZChat_SortedWords -47:72f0 BTTrainerClassGenders 47:72f0 EZChat_SortedWords.End +47:72f0 BTTrainerClassGenders 47:7332 BTMaleTrainerTexts 47:7338 BTMaleTrainerTexts.Greetings 47:736a BTMaleTrainerTexts.PlayerLost @@ -36020,8 +36020,8 @@ 5f:51a6 Mobile_CopyDefaultNickname.DefaultNickname 5f:51ab Mobile_CopyDefaultMail 5f:51c3 Mobile_CopyDefaultMail.DefaultMessage -5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51c9 Mobile_CopyDefaultMail.DefaultMessageEnd +5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51e1 CheckStringContainsLessThanBNextCharacters 5f:51e1 CheckStringContainsLessThanBNextCharacters.loop 5f:51ea CheckStringContainsLessThanBNextCharacters.next_char @@ -42875,8 +42875,8 @@ 78:492a DebugRoomMenu_PokemonGet_Page2Values 78:497b DebugRoomMenu_PokemonGet_Page3Values 78:49cc DebugRoomMenu_PokemonGet_Page4Values -78:4a09 DebugRoom_BoxStructStrings.Pokemon 78:4a09 DebugRoom_BoxStructStrings +78:4a09 DebugRoom_BoxStructStrings.Pokemon 78:4a0e DebugRoom_BoxStructStrings.Item 78:4a13 DebugRoom_BoxStructStrings.Move1 78:4a1a DebugRoom_BoxStructStrings.Move2 diff --git a/pokecrystal11_vc.map b/pokecrystal11_vc.map index 2921d21e1b9..07dae07f4d4 100644 --- a/pokecrystal11_vc.map +++ b/pokecrystal11_vc.map @@ -1,3 +1,11 @@ +SUMMARY: + ROM0: 16095 bytes used / 289 free + ROMX: 1625847 bytes used / 454921 free in 127 banks + SRAM: 48188 bytes used / 17348 free in 8 banks + WRAM0: 4043 bytes used / 53 free + WRAMX: 22978 bytes used / 5694 free in 7 banks + HRAM: 127 bytes used / 0 free + ROM0 bank #0: SECTION: $0000 (0 bytes) ["NULL"] $0000 = NULL @@ -1267,7 +1275,7 @@ ROMX bank #1: $4031 = WriteOAMDMACodeToHRAM $4038 = WriteOAMDMACodeToHRAM.copy $403f = OAMDMACode - $4049 = OAMDMACodeEnd + $4049 = OAMDMACode.End $4049 = Facings $408b = FacingStepDown0 $408b = FacingStepDown2 @@ -59335,11 +59343,3 @@ HRAM bank #0: $ffea = hSystemBooted $ffeb = hClockResetTrigger TOTAL EMPTY: $0000 bytes - -SUMMARY: - ROM0: 16095 bytes used / 289 free - ROMX: 1625847 bytes used / 454921 free in 127 banks - SRAM: 48188 bytes used / 17348 free in 8 banks - WRAM0: 4043 bytes used / 53 free - WRAMX: 22978 bytes used / 5694 free in 7 banks - HRAM: 127 bytes used / 0 free diff --git a/pokecrystal11_vc.sym b/pokecrystal11_vc.sym index 07bb78ee20e..52b0dba6db3 100644 --- a/pokecrystal11_vc.sym +++ b/pokecrystal11_vc.sym @@ -174,8 +174,8 @@ 00:0a7a JoyTextDelay.restartframedelay 00:0a80 WaitPressAorB_BlinkCursor 00:0a8d WaitPressAorB_BlinkCursor.loop -00:0aa5 SimpleWaitPressAorB.loop 00:0aa5 SimpleWaitPressAorB +00:0aa5 SimpleWaitPressAorB.loop 00:0aaf PromptButton 00:0ac1 PromptButton.link 00:0ac6 PromptButton.wait_input @@ -269,8 +269,8 @@ 00:0f9d Get1bpp 00:0fa4 Copy1bpp 00:0fb6 ClearBox -00:0fb8 FillBoxWithByte.row 00:0fb8 FillBoxWithByte +00:0fb8 FillBoxWithByte.row 00:0fba FillBoxWithByte.col 00:0fc8 ClearTilemap 00:0fdb ClearScreen @@ -698,9 +698,9 @@ 00:25d5 FillSouthConnectionStrip.y 00:25da FillSouthConnectionStrip.x 00:25f2 FillSouthConnectionStrip.okay +00:25f6 FillEastConnectionStrip.loop 00:25f6 FillWestConnectionStrip 00:25f6 FillEastConnectionStrip -00:25f6 FillEastConnectionStrip.loop 00:2617 FillEastConnectionStrip.okay 00:261b LoadMapStatus 00:261f CallScript @@ -913,8 +913,8 @@ 00:30b4 SafeLoadTempTilemapToTilemap 00:30bf LoadTempTilemapToTilemap 00:30d6 CopyName1 -00:30d9 CopyName2.loop 00:30d9 CopyName2 +00:30d9 CopyName2.loop 00:30e1 IsInArray 00:30e4 IsInArray.loop 00:30f0 IsInArray.NotInArray @@ -1235,7 +1235,7 @@ 01:4031 WriteOAMDMACodeToHRAM 01:4038 WriteOAMDMACodeToHRAM.copy 01:403f OAMDMACode -01:4049 OAMDMACodeEnd +01:4049 OAMDMACode.End 01:4049 Facings 01:408b FacingStepDown0 01:408b FacingStepDown2 @@ -1478,8 +1478,8 @@ 01:4f77 StepFunction_16 01:4f7a StepFunction_17 01:4f7d StepFunction_17.anon_dw -01:4f83 StepFunction_SkyfallTop 01:4f83 StepFunction_17.null +01:4f83 StepFunction_SkyfallTop 01:4f86 StepFunction_SkyfallTop.anon_dw 01:4f8a StepFunction_SkyfallTop.Init 01:4f99 StepFunction_SkyfallTop.Run @@ -1797,8 +1797,8 @@ 01:616a Intro_RotatePalettesLeftFrontpic 01:616f Intro_RotatePalettesLeftFrontpic.loop 01:617c IntroFadePalettes -01:6182 Intro_WipeInFrontpic 01:6182 IntroFadePalettes.End +01:6182 Intro_WipeInFrontpic 01:618e Intro_WipeInFrontpic.loop 01:619c Intro_PrepTrainerPic 01:61b4 ShrinkFrame @@ -4672,8 +4672,8 @@ 05:4f46 TryLoadSaveData.backup 05:4f6c TryLoadSaveData.corrupt 05:4f7c DefaultOptions -05:4f84 CheckPrimarySaveFile 05:4f84 DefaultOptions.End +05:4f84 CheckPrimarySaveFile 05:4fab CheckPrimarySaveFile.nope 05:4faf CheckBackupSaveFile 05:4fd3 CheckBackupSaveFile.nope @@ -5710,8 +5710,8 @@ 09:45a3 CheckObjectFlag.masked 09:45a7 GetObjectTimeMask 09:45af _InitScrollingMenu -09:45cb _ScrollingMenu.loop 09:45cb _ScrollingMenu +09:45cb _ScrollingMenu.loop 09:45d6 _ScrollingMenu.exit 09:45e1 _ScrollingMenu.zero 09:45f1 ScrollingMenu_InitDisplay @@ -7031,14 +7031,14 @@ 0b:408e StageBallTilesData.load 0b:4095 DrawPlayerHUDBorder 0b:40a9 DrawPlayerHUDBorder.tiles -0b:40ad DrawPlayerPartyIconHUDBorder 0b:40ad DrawPlayerHUDBorder.tiles_end +0b:40ad DrawPlayerPartyIconHUDBorder 0b:40c1 DrawPlayerPartyIconHUDBorder.tiles -0b:40c5 DrawEnemyHUDBorder 0b:40c5 DrawPlayerPartyIconHUDBorder.tiles_end +0b:40c5 DrawEnemyHUDBorder 0b:40ed DrawEnemyHUDBorder.tiles -0b:40f1 PlaceHUDBorderTiles 0b:40f1 DrawEnemyHUDBorder.tiles_end +0b:40f1 PlaceHUDBorderTiles 0b:40ff PlaceHUDBorderTiles.loop 0b:410d LinkBattle_TrainerHuds 0b:4143 LoadTrainerHudOAM @@ -7114,8 +7114,8 @@ 0b:4725 MysteryGiftItems 0b:474a MysteryGiftItems.End 0b:474a MysteryGiftDecos -0b:476f TMHMPocket 0b:476f MysteryGiftDecos.End +0b:476f TMHMPocket 0b:4798 TMHMPocket.ConvertItemToTMHMNumber 0b:47a7 ConvertCurItemIntoCurTMHM 0b:47b6 GetTMHMItemMove @@ -11293,8 +11293,8 @@ 13:695d MaleTrainers 13:6976 MaleTrainers.End 13:6976 FemaleTrainers -13:6980 BattleIntroSlidingPics 13:6980 FemaleTrainers.End +13:6980 BattleIntroSlidingPics 13:6998 BattleIntroSlidingPics.subfunction1 13:69ab BattleIntroSlidingPics.subfunction2 13:69b2 BattleIntroSlidingPics.loop1 @@ -11615,8 +11615,8 @@ 14:4c7a ListMovePP.loop 14:4cc8 ListMovePP.done 14:4cc9 ListMovePP.load_loop -14:4cd0 BrokenPlacePPUnits.loop 14:4cd0 BrokenPlacePPUnits +14:4cd0 BrokenPlacePPUnits.loop 14:4cdb Unused_PlaceEnemyHPLevel 14:4d09 Unused_PlaceEnemyHPLevel.egg 14:4d0a PlaceStatusString @@ -17629,8 +17629,8 @@ 23:6680 SpriteAnimOAMData.OAMData_GameFreakLogo1_3 23:66a5 SpriteAnimOAMData.OAMData_GameFreakLogo4_11 23:6706 UnusedSpriteAnimGFX -23:672a Sprites_Cosine 23:672a UnusedSpriteAnimGFX.DeletedGFX +23:672a Sprites_Cosine 23:672c Sprites_Sine 23:6737 Sprites_Sine.negative_u24 23:6741 Sprites_Sine.apply_u24 @@ -18065,8 +18065,8 @@ 24:564e AnimateTuningKnob.TuningKnob 24:565c AnimateTuningKnob.down 24:5666 AnimateTuningKnob.up -24:566f UpdateRadioStation 24:566f AnimateTuningKnob.update +24:566f UpdateRadioStation 24:5676 UpdateRadioStation.loop 24:5682 UpdateRadioStation.nostation 24:5686 UpdateRadioStation.foundstation @@ -19161,8 +19161,8 @@ 25:73c7 Script_earthquake 25:73e6 Script_earthquake.script 25:73eb EarthquakeMovement -25:73f0 Script_loadpikachudata 25:73f0 EarthquakeMovement.End +25:73f0 Script_loadpikachudata 25:73fb Script_randomwildmon 25:7400 Script_loadtemptrainer 25:7412 Script_loadwildmon @@ -19222,8 +19222,8 @@ 25:76ae Script_getmonname 25:76b7 Script_getmonname.gotit 25:76c0 GetStringBuffer -25:76c8 CopyConvertedText 25:76c8 GetStringBuffer.ok +25:76c8 CopyConvertedText 25:76d5 Script_getitemname 25:76de Script_getitemname.ok 25:76e9 Script_getcurlandmarkname @@ -21158,8 +21158,8 @@ 2e:47a9 OaksPKMNTalk4.loop3 2e:47ec OaksPKMNTalk4.overflow 2e:47f2 OaksPKMNTalkRoutes -2e:4810 OaksPKMNTalk5 2e:4810 OaksPKMNTalkRoutes.End +2e:4810 OaksPKMNTalk5 2e:4818 OaksPKMNTalk6 2e:4820 OPT_IntroText1 2e:4825 OPT_IntroText2 @@ -29203,9 +29203,9 @@ 3c:72e7 Cry_Natu_Ch5 3c:72e9 Cry_Natu_Ch5.body1 3c:72f5 Cry_Natu_Ch5.body2 +3c:7302 Cry_Sunflora_Ch6.body1 3c:7302 Cry_Natu_Ch6 3c:7302 Cry_Sunflora_Ch6 -3c:7302 Cry_Sunflora_Ch6.body1 3c:7310 Cry_Sunflora_Ch6.body2 3c:731d Cry_Natu_Ch8 3c:731d Cry_Sunflora_Ch8 @@ -30253,8 +30253,8 @@ 3f:512b GetItemFromMom.ok 3f:512e GetItemFromMom.GetFromList1 3f:5136 MomItems_1 -3f:515e MomItems_2 3f:515e MomItems_1.End +3f:515e MomItems_2 3f:51ae MomItems_2.End 3f:51b1 MomHiHowAreYouText 3f:51b6 MomFoundAnItemText @@ -31140,8 +31140,8 @@ 41:426f PadMapForHDMATransfer.loop2 41:4279 PadMapForHDMATransfer.loop3 41:4284 HDMATransfer2bpp -41:42b2 HDMATransfer1bpp.loop 41:42b2 HDMATransfer1bpp +41:42b2 HDMATransfer1bpp.loop 41:42d6 HDMATransfer1bpp.bankswitch 41:4303 HDMATransfer_OnlyTopFourRows 41:4309 HDMATransfer_OnlyTopFourRows.Function @@ -32046,14 +32046,14 @@ 44:4fad URIPrefix 44:4fb4 URIPrefix.End 44:4fb4 HTTPDownloadURL -44:4fd9 HTTPUploadURL 44:4fd9 HTTPDownloadURL.End +44:4fd9 HTTPUploadURL 44:4ffc HTTPUploadURL.End 44:4ffc HTTPUtilityURL -44:5020 HTTPRankingURL 44:5020 HTTPUtilityURL.End -44:5044 Function111044 +44:5020 HTTPRankingURL 44:5044 HTTPRankingURL.End +44:5044 Function111044 44:50ac Function111044.asm_1110ac 44:50eb Function111044.asm_1110eb 44:5144 Function111044.asm_111144 @@ -32282,34 +32282,34 @@ 44:6001 MobilePacket_BeginSession 44:6013 MobilePacket_BeginSession.End 44:6013 MobilePacket_EndSession -44:601d MobilePacket_DialTelephone 44:601d MobilePacket_EndSession.End +44:601d MobilePacket_DialTelephone 44:6023 MobilePacket_DialTelephone.End 44:6023 MobilePacket_HangUpTelephone -44:602d MobilePacket_TelephoneStatus 44:602d MobilePacket_HangUpTelephone.End -44:6037 MobilePacket_ISPLogin +44:602d MobilePacket_TelephoneStatus 44:6037 MobilePacket_TelephoneStatus.End +44:6037 MobilePacket_ISPLogin 44:603c MobilePacket_ISPLogin.End 44:603c MobilePacket_ISPLogout -44:6046 MobilePacket_ReadConfigurationDataPart1 44:6046 MobilePacket_ISPLogout.End -44:6052 MobilePacket_ReadConfigurationDataPart2 +44:6046 MobilePacket_ReadConfigurationDataPart1 44:6052 MobilePacket_ReadConfigurationDataPart1.End -44:605e MobilePacket_WriteConfigurationData +44:6052 MobilePacket_ReadConfigurationDataPart2 44:605e MobilePacket_ReadConfigurationDataPart2.End +44:605e MobilePacket_WriteConfigurationData 44:6063 MobilePacket_WriteConfigurationData.End 44:6063 MobilePacket_DNSQuery 44:6068 MobilePacket_DNSQuery.End 44:6068 MobilePacket_WaitForTelephoneCall -44:6072 MobilePacket_TransferData 44:6072 MobilePacket_WaitForTelephoneCall.End -44:607d MobilePacket_OpenTCPConnection +44:6072 MobilePacket_TransferData 44:607d MobilePacket_TransferData.End +44:607d MobilePacket_OpenTCPConnection 44:6083 MobilePacket_OpenTCPConnection.End 44:6083 MobilePacket_CloseTCPConnection -44:6089 Unknown_112089 44:6089 MobilePacket_CloseTCPConnection.End +44:6089 Unknown_112089 44:609e Unknown_11209e 44:60a4 Unknown_1120a4 44:60b0 Unknown_1120b0 @@ -34088,8 +34088,8 @@ 46:71ed Function11b175.asm_11b1ed 46:71ef Function11b175.asm_11b1ef 46:71f7 FillScreenWithTile32 -46:7203 CopyDataUntilFF.loop 46:7203 CopyDataUntilFF +46:7203 CopyDataUntilFF.loop 46:720b Function11b20b 46:721e CheckCaughtMemMon 46:722a CheckSeenMemMon @@ -34562,8 +34562,8 @@ 47:7100 MobileEZChatCategoryPointers.ThisAndThat 47:7220 MobileEZChatData_WordAndPageCounts 47:723c EZChat_SortedWords -47:72f0 BTTrainerClassGenders 47:72f0 EZChat_SortedWords.End +47:72f0 BTTrainerClassGenders 47:7332 BTMaleTrainerTexts 47:7338 BTMaleTrainerTexts.Greetings 47:736a BTMaleTrainerTexts.PlayerLost @@ -36079,8 +36079,8 @@ 5f:51a6 Mobile_CopyDefaultNickname.DefaultNickname 5f:51ab Mobile_CopyDefaultMail 5f:51c3 Mobile_CopyDefaultMail.DefaultMessage -5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51c9 Mobile_CopyDefaultMail.DefaultMessageEnd +5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51e1 CheckStringContainsLessThanBNextCharacters 5f:51e1 CheckStringContainsLessThanBNextCharacters.loop 5f:51ea CheckStringContainsLessThanBNextCharacters.next_char diff --git a/pokecrystal_au.map b/pokecrystal_au.map index 29a8b1d8c18..eff458c38ea 100644 --- a/pokecrystal_au.map +++ b/pokecrystal_au.map @@ -1,3 +1,11 @@ +SUMMARY: + ROM0: 16095 bytes used / 289 free + ROMX: 1625263 bytes used / 455505 free in 127 banks + SRAM: 48188 bytes used / 17348 free in 8 banks + WRAM0: 4043 bytes used / 53 free + WRAMX: 22978 bytes used / 5694 free in 7 banks + HRAM: 127 bytes used / 0 free + ROM0 bank #0: SECTION: $0000 (0 bytes) ["NULL"] $0000 = NULL @@ -1261,7 +1269,7 @@ ROMX bank #1: $4031 = WriteOAMDMACodeToHRAM $4038 = WriteOAMDMACodeToHRAM.copy $403f = OAMDMACode - $4049 = OAMDMACodeEnd + $4049 = OAMDMACode.End $4049 = Facings $408b = FacingStepDown0 $408b = FacingStepDown2 @@ -59264,11 +59272,3 @@ HRAM bank #0: $ffea = hSystemBooted $ffeb = hClockResetTrigger TOTAL EMPTY: $0000 bytes - -SUMMARY: - ROM0: 16095 bytes used / 289 free - ROMX: 1625263 bytes used / 455505 free in 127 banks - SRAM: 48188 bytes used / 17348 free in 8 banks - WRAM0: 4043 bytes used / 53 free - WRAMX: 22978 bytes used / 5694 free in 7 banks - HRAM: 127 bytes used / 0 free diff --git a/pokecrystal_au.sym b/pokecrystal_au.sym index 7ba16b1f4a5..d59cc694787 100644 --- a/pokecrystal_au.sym +++ b/pokecrystal_au.sym @@ -168,8 +168,8 @@ 00:0a7a JoyTextDelay.restartframedelay 00:0a80 WaitPressAorB_BlinkCursor 00:0a8d WaitPressAorB_BlinkCursor.loop -00:0aa5 SimpleWaitPressAorB.loop 00:0aa5 SimpleWaitPressAorB +00:0aa5 SimpleWaitPressAorB.loop 00:0aaf PromptButton 00:0ac1 PromptButton.link 00:0ac6 PromptButton.wait_input @@ -263,8 +263,8 @@ 00:0f9d Get1bpp 00:0fa4 Copy1bpp 00:0fb6 ClearBox -00:0fb8 FillBoxWithByte.row 00:0fb8 FillBoxWithByte +00:0fb8 FillBoxWithByte.row 00:0fba FillBoxWithByte.col 00:0fc8 ClearTilemap 00:0fdb ClearScreen @@ -907,8 +907,8 @@ 00:30b4 SafeLoadTempTilemapToTilemap 00:30bf LoadTempTilemapToTilemap 00:30d6 CopyName1 -00:30d9 CopyName2.loop 00:30d9 CopyName2 +00:30d9 CopyName2.loop 00:30e1 IsInArray 00:30e4 IsInArray.loop 00:30f0 IsInArray.NotInArray @@ -1229,7 +1229,7 @@ 01:4031 WriteOAMDMACodeToHRAM 01:4038 WriteOAMDMACodeToHRAM.copy 01:403f OAMDMACode -01:4049 OAMDMACodeEnd +01:4049 OAMDMACode.End 01:4049 Facings 01:408b FacingStepDown0 01:408b FacingStepDown2 @@ -1472,8 +1472,8 @@ 01:4f77 StepFunction_16 01:4f7a StepFunction_17 01:4f7d StepFunction_17.anon_dw -01:4f83 StepFunction_SkyfallTop 01:4f83 StepFunction_17.null +01:4f83 StepFunction_SkyfallTop 01:4f86 StepFunction_SkyfallTop.anon_dw 01:4f8a StepFunction_SkyfallTop.Init 01:4f99 StepFunction_SkyfallTop.Run @@ -1791,8 +1791,8 @@ 01:616a Intro_RotatePalettesLeftFrontpic 01:616f Intro_RotatePalettesLeftFrontpic.loop 01:617c IntroFadePalettes -01:6182 Intro_WipeInFrontpic 01:6182 IntroFadePalettes.End +01:6182 Intro_WipeInFrontpic 01:618e Intro_WipeInFrontpic.loop 01:619c Intro_PrepTrainerPic 01:61b4 ShrinkFrame @@ -4664,8 +4664,8 @@ 05:4f46 TryLoadSaveData.backup 05:4f6c TryLoadSaveData.corrupt 05:4f7c DefaultOptions -05:4f84 CheckPrimarySaveFile 05:4f84 DefaultOptions.End +05:4f84 CheckPrimarySaveFile 05:4fab CheckPrimarySaveFile.nope 05:4faf CheckBackupSaveFile 05:4fd3 CheckBackupSaveFile.nope @@ -5698,8 +5698,8 @@ 09:45a3 CheckObjectFlag.masked 09:45a7 GetObjectTimeMask 09:45af _InitScrollingMenu -09:45cb _ScrollingMenu.loop 09:45cb _ScrollingMenu +09:45cb _ScrollingMenu.loop 09:45d6 _ScrollingMenu.exit 09:45e1 _ScrollingMenu.zero 09:45f1 ScrollingMenu_InitDisplay @@ -6990,14 +6990,14 @@ 0b:408e StageBallTilesData.load 0b:4095 DrawPlayerHUDBorder 0b:40a9 DrawPlayerHUDBorder.tiles -0b:40ad DrawPlayerPartyIconHUDBorder 0b:40ad DrawPlayerHUDBorder.tiles_end +0b:40ad DrawPlayerPartyIconHUDBorder 0b:40c1 DrawPlayerPartyIconHUDBorder.tiles -0b:40c5 DrawEnemyHUDBorder 0b:40c5 DrawPlayerPartyIconHUDBorder.tiles_end +0b:40c5 DrawEnemyHUDBorder 0b:40ed DrawEnemyHUDBorder.tiles -0b:40f1 PlaceHUDBorderTiles 0b:40f1 DrawEnemyHUDBorder.tiles_end +0b:40f1 PlaceHUDBorderTiles 0b:40ff PlaceHUDBorderTiles.loop 0b:410d LinkBattle_TrainerHuds 0b:4143 LoadTrainerHudOAM @@ -7073,8 +7073,8 @@ 0b:4725 MysteryGiftItems 0b:474a MysteryGiftItems.End 0b:474a MysteryGiftDecos -0b:476f TMHMPocket 0b:476f MysteryGiftDecos.End +0b:476f TMHMPocket 0b:4798 TMHMPocket.ConvertItemToTMHMNumber 0b:47a7 ConvertCurItemIntoCurTMHM 0b:47b6 GetTMHMItemMove @@ -11250,8 +11250,8 @@ 13:695d MaleTrainers 13:6976 MaleTrainers.End 13:6976 FemaleTrainers -13:6980 BattleIntroSlidingPics 13:6980 FemaleTrainers.End +13:6980 BattleIntroSlidingPics 13:6998 BattleIntroSlidingPics.subfunction1 13:69ab BattleIntroSlidingPics.subfunction2 13:69b2 BattleIntroSlidingPics.loop1 @@ -11572,8 +11572,8 @@ 14:4c7a ListMovePP.loop 14:4cc8 ListMovePP.done 14:4cc9 ListMovePP.load_loop -14:4cd0 BrokenPlacePPUnits.loop 14:4cd0 BrokenPlacePPUnits +14:4cd0 BrokenPlacePPUnits.loop 14:4cdb Unused_PlaceEnemyHPLevel 14:4d09 Unused_PlaceEnemyHPLevel.egg 14:4d0a PlaceStatusString @@ -17580,8 +17580,8 @@ 23:6680 SpriteAnimOAMData.OAMData_GameFreakLogo1_3 23:66a5 SpriteAnimOAMData.OAMData_GameFreakLogo4_11 23:6706 UnusedSpriteAnimGFX -23:672a Sprites_Cosine 23:672a UnusedSpriteAnimGFX.DeletedGFX +23:672a Sprites_Cosine 23:672c Sprites_Sine 23:6737 Sprites_Sine.negative_u24 23:6741 Sprites_Sine.apply_u24 @@ -18016,8 +18016,8 @@ 24:564e AnimateTuningKnob.TuningKnob 24:565c AnimateTuningKnob.down 24:5666 AnimateTuningKnob.up -24:566f UpdateRadioStation 24:566f AnimateTuningKnob.update +24:566f UpdateRadioStation 24:5676 UpdateRadioStation.loop 24:5682 UpdateRadioStation.nostation 24:5686 UpdateRadioStation.foundstation @@ -19111,8 +19111,8 @@ 25:73c7 Script_earthquake 25:73e6 Script_earthquake.script 25:73eb EarthquakeMovement -25:73f0 Script_loadpikachudata 25:73f0 EarthquakeMovement.End +25:73f0 Script_loadpikachudata 25:73fb Script_randomwildmon 25:7400 Script_loadtemptrainer 25:7412 Script_loadwildmon @@ -19172,8 +19172,8 @@ 25:76ae Script_getmonname 25:76b7 Script_getmonname.gotit 25:76c0 GetStringBuffer -25:76c8 CopyConvertedText 25:76c8 GetStringBuffer.ok +25:76c8 CopyConvertedText 25:76d5 Script_getitemname 25:76de Script_getitemname.ok 25:76e9 Script_getcurlandmarkname @@ -21108,8 +21108,8 @@ 2e:47a9 OaksPKMNTalk4.loop3 2e:47ec OaksPKMNTalk4.overflow 2e:47f2 OaksPKMNTalkRoutes -2e:4810 OaksPKMNTalk5 2e:4810 OaksPKMNTalkRoutes.End +2e:4810 OaksPKMNTalk5 2e:4818 OaksPKMNTalk6 2e:4820 OPT_IntroText1 2e:4825 OPT_IntroText2 @@ -29148,9 +29148,9 @@ 3c:72e7 Cry_Natu_Ch5 3c:72e9 Cry_Natu_Ch5.body1 3c:72f5 Cry_Natu_Ch5.body2 +3c:7302 Cry_Sunflora_Ch6.body1 3c:7302 Cry_Natu_Ch6 3c:7302 Cry_Sunflora_Ch6 -3c:7302 Cry_Sunflora_Ch6.body1 3c:7310 Cry_Sunflora_Ch6.body2 3c:731d Cry_Natu_Ch8 3c:731d Cry_Sunflora_Ch8 @@ -30198,8 +30198,8 @@ 3f:512b GetItemFromMom.ok 3f:512e GetItemFromMom.GetFromList1 3f:5136 MomItems_1 -3f:515e MomItems_2 3f:515e MomItems_1.End +3f:515e MomItems_2 3f:51ae MomItems_2.End 3f:51b1 MomHiHowAreYouText 3f:51b6 MomFoundAnItemText @@ -31077,8 +31077,8 @@ 41:426f PadMapForHDMATransfer.loop2 41:4279 PadMapForHDMATransfer.loop3 41:4284 HDMATransfer2bpp -41:42b2 HDMATransfer1bpp.loop 41:42b2 HDMATransfer1bpp +41:42b2 HDMATransfer1bpp.loop 41:42d6 HDMATransfer1bpp.bankswitch 41:4303 HDMATransfer_OnlyTopFourRows 41:4309 HDMATransfer_OnlyTopFourRows.Function @@ -31975,14 +31975,14 @@ 44:4fad URIPrefix 44:4fb4 URIPrefix.End 44:4fb4 HTTPDownloadURL -44:4fd9 HTTPUploadURL 44:4fd9 HTTPDownloadURL.End +44:4fd9 HTTPUploadURL 44:4ffc HTTPUploadURL.End 44:4ffc HTTPUtilityURL -44:5020 HTTPRankingURL 44:5020 HTTPUtilityURL.End -44:5044 Function111044 +44:5020 HTTPRankingURL 44:5044 HTTPRankingURL.End +44:5044 Function111044 44:50ac Function111044.asm_1110ac 44:50eb Function111044.asm_1110eb 44:5144 Function111044.asm_111144 @@ -32211,34 +32211,34 @@ 44:6001 MobilePacket_BeginSession 44:6013 MobilePacket_BeginSession.End 44:6013 MobilePacket_EndSession -44:601d MobilePacket_DialTelephone 44:601d MobilePacket_EndSession.End +44:601d MobilePacket_DialTelephone 44:6023 MobilePacket_DialTelephone.End 44:6023 MobilePacket_HangUpTelephone -44:602d MobilePacket_TelephoneStatus 44:602d MobilePacket_HangUpTelephone.End -44:6037 MobilePacket_ISPLogin +44:602d MobilePacket_TelephoneStatus 44:6037 MobilePacket_TelephoneStatus.End +44:6037 MobilePacket_ISPLogin 44:603c MobilePacket_ISPLogin.End 44:603c MobilePacket_ISPLogout -44:6046 MobilePacket_ReadConfigurationDataPart1 44:6046 MobilePacket_ISPLogout.End -44:6052 MobilePacket_ReadConfigurationDataPart2 +44:6046 MobilePacket_ReadConfigurationDataPart1 44:6052 MobilePacket_ReadConfigurationDataPart1.End -44:605e MobilePacket_WriteConfigurationData +44:6052 MobilePacket_ReadConfigurationDataPart2 44:605e MobilePacket_ReadConfigurationDataPart2.End +44:605e MobilePacket_WriteConfigurationData 44:6063 MobilePacket_WriteConfigurationData.End 44:6063 MobilePacket_DNSQuery 44:6068 MobilePacket_DNSQuery.End 44:6068 MobilePacket_WaitForTelephoneCall -44:6072 MobilePacket_TransferData 44:6072 MobilePacket_WaitForTelephoneCall.End -44:607d MobilePacket_OpenTCPConnection +44:6072 MobilePacket_TransferData 44:607d MobilePacket_TransferData.End +44:607d MobilePacket_OpenTCPConnection 44:6083 MobilePacket_OpenTCPConnection.End 44:6083 MobilePacket_CloseTCPConnection -44:6089 Unknown_112089 44:6089 MobilePacket_CloseTCPConnection.End +44:6089 Unknown_112089 44:609e Unknown_11209e 44:60a4 Unknown_1120a4 44:60b0 Unknown_1120b0 @@ -34017,8 +34017,8 @@ 46:71ed Function11b175.asm_11b1ed 46:71ef Function11b175.asm_11b1ef 46:71f7 FillScreenWithTile32 -46:7203 CopyDataUntilFF.loop 46:7203 CopyDataUntilFF +46:7203 CopyDataUntilFF.loop 46:720b Function11b20b 46:721e CheckCaughtMemMon 46:722a CheckSeenMemMon @@ -34491,8 +34491,8 @@ 47:7100 MobileEZChatCategoryPointers.ThisAndThat 47:7220 MobileEZChatData_WordAndPageCounts 47:723c EZChat_SortedWords -47:72f0 BTTrainerClassGenders 47:72f0 EZChat_SortedWords.End +47:72f0 BTTrainerClassGenders 47:7332 BTMaleTrainerTexts 47:7338 BTMaleTrainerTexts.Greetings 47:736a BTMaleTrainerTexts.PlayerLost @@ -36008,8 +36008,8 @@ 5f:51a6 Mobile_CopyDefaultNickname.DefaultNickname 5f:51ab Mobile_CopyDefaultMail 5f:51c3 Mobile_CopyDefaultMail.DefaultMessage -5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51c9 Mobile_CopyDefaultMail.DefaultMessageEnd +5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51e1 CheckStringContainsLessThanBNextCharacters 5f:51e1 CheckStringContainsLessThanBNextCharacters.loop 5f:51ea CheckStringContainsLessThanBNextCharacters.next_char diff --git a/pokecrystal_debug.map b/pokecrystal_debug.map index d4fbb7868bd..ef88ef066d0 100644 --- a/pokecrystal_debug.map +++ b/pokecrystal_debug.map @@ -1,3 +1,11 @@ +SUMMARY: + ROM0: 16141 bytes used / 243 free + ROMX: 1629810 bytes used / 450958 free in 127 banks + SRAM: 48194 bytes used / 17342 free in 8 banks + WRAM0: 4043 bytes used / 53 free + WRAMX: 22978 bytes used / 5694 free in 7 banks + HRAM: 127 bytes used / 0 free + ROM0 bank #0: SECTION: $0000 (0 bytes) ["NULL"] $0000 = NULL @@ -1264,7 +1272,7 @@ ROMX bank #1: $4031 = WriteOAMDMACodeToHRAM $4038 = WriteOAMDMACodeToHRAM.copy $403f = OAMDMACode - $4049 = OAMDMACodeEnd + $4049 = OAMDMACode.End $4049 = Facings $408b = FacingStepDown0 $408b = FacingStepDown2 @@ -59535,11 +59543,3 @@ HRAM bank #0: $ffeb = hClockResetTrigger $ffeb = hDebugRoomMenuPage TOTAL EMPTY: $0000 bytes - -SUMMARY: - ROM0: 16141 bytes used / 243 free - ROMX: 1629810 bytes used / 450958 free in 127 banks - SRAM: 48194 bytes used / 17342 free in 8 banks - WRAM0: 4043 bytes used / 53 free - WRAMX: 22978 bytes used / 5694 free in 7 banks - HRAM: 127 bytes used / 0 free diff --git a/pokecrystal_debug.sym b/pokecrystal_debug.sym index 943d43eff37..6b5db533ae2 100644 --- a/pokecrystal_debug.sym +++ b/pokecrystal_debug.sym @@ -168,8 +168,8 @@ 00:0a7a JoyTextDelay.restartframedelay 00:0a80 WaitPressAorB_BlinkCursor 00:0a8d WaitPressAorB_BlinkCursor.loop -00:0aa5 SimpleWaitPressAorB.loop 00:0aa5 SimpleWaitPressAorB +00:0aa5 SimpleWaitPressAorB.loop 00:0aaf PromptButton 00:0ac1 PromptButton.link 00:0ac6 PromptButton.wait_input @@ -263,8 +263,8 @@ 00:0f9d Get1bpp 00:0fa4 Copy1bpp 00:0fb6 ClearBox -00:0fb8 FillBoxWithByte.row 00:0fb8 FillBoxWithByte +00:0fb8 FillBoxWithByte.row 00:0fba FillBoxWithByte.col 00:0fc8 ClearTilemap 00:0fdb ClearScreen @@ -692,9 +692,9 @@ 00:25d5 FillSouthConnectionStrip.y 00:25da FillSouthConnectionStrip.x 00:25f2 FillSouthConnectionStrip.okay +00:25f6 FillEastConnectionStrip.loop 00:25f6 FillWestConnectionStrip 00:25f6 FillEastConnectionStrip -00:25f6 FillEastConnectionStrip.loop 00:2617 FillEastConnectionStrip.okay 00:261b LoadMapStatus 00:261f CallScript @@ -910,8 +910,8 @@ 00:30e2 SafeLoadTempTilemapToTilemap 00:30ed LoadTempTilemapToTilemap 00:3104 CopyName1 -00:3107 CopyName2.loop 00:3107 CopyName2 +00:3107 CopyName2.loop 00:310f IsInArray 00:3112 IsInArray.loop 00:311e IsInArray.NotInArray @@ -1232,7 +1232,7 @@ 01:4031 WriteOAMDMACodeToHRAM 01:4038 WriteOAMDMACodeToHRAM.copy 01:403f OAMDMACode -01:4049 OAMDMACodeEnd +01:4049 OAMDMACode.End 01:4049 Facings 01:408b FacingStepDown0 01:408b FacingStepDown2 @@ -1475,8 +1475,8 @@ 01:4f77 StepFunction_16 01:4f7a StepFunction_17 01:4f7d StepFunction_17.anon_dw -01:4f83 StepFunction_SkyfallTop 01:4f83 StepFunction_17.null +01:4f83 StepFunction_SkyfallTop 01:4f86 StepFunction_SkyfallTop.anon_dw 01:4f8a StepFunction_SkyfallTop.Init 01:4f99 StepFunction_SkyfallTop.Run @@ -1795,8 +1795,8 @@ 01:6171 Intro_RotatePalettesLeftFrontpic 01:6176 Intro_RotatePalettesLeftFrontpic.loop 01:6183 IntroFadePalettes -01:6189 Intro_WipeInFrontpic 01:6189 IntroFadePalettes.End +01:6189 Intro_WipeInFrontpic 01:6195 Intro_WipeInFrontpic.loop 01:61a3 Intro_PrepTrainerPic 01:61bb ShrinkFrame @@ -4669,8 +4669,8 @@ 05:4f46 TryLoadSaveData.backup 05:4f6c TryLoadSaveData.corrupt 05:4f7c DefaultOptions -05:4f84 CheckPrimarySaveFile 05:4f84 DefaultOptions.End +05:4f84 CheckPrimarySaveFile 05:4fab CheckPrimarySaveFile.nope 05:4faf CheckBackupSaveFile 05:4fd3 CheckBackupSaveFile.nope @@ -5703,8 +5703,8 @@ 09:45a3 CheckObjectFlag.masked 09:45a7 GetObjectTimeMask 09:45af _InitScrollingMenu -09:45cb _ScrollingMenu.loop 09:45cb _ScrollingMenu +09:45cb _ScrollingMenu.loop 09:45d6 _ScrollingMenu.exit 09:45e1 _ScrollingMenu.zero 09:45f1 ScrollingMenu_InitDisplay @@ -6995,14 +6995,14 @@ 0b:408e StageBallTilesData.load 0b:4095 DrawPlayerHUDBorder 0b:40a9 DrawPlayerHUDBorder.tiles -0b:40ad DrawPlayerPartyIconHUDBorder 0b:40ad DrawPlayerHUDBorder.tiles_end +0b:40ad DrawPlayerPartyIconHUDBorder 0b:40c1 DrawPlayerPartyIconHUDBorder.tiles -0b:40c5 DrawEnemyHUDBorder 0b:40c5 DrawPlayerPartyIconHUDBorder.tiles_end +0b:40c5 DrawEnemyHUDBorder 0b:40ed DrawEnemyHUDBorder.tiles -0b:40f1 PlaceHUDBorderTiles 0b:40f1 DrawEnemyHUDBorder.tiles_end +0b:40f1 PlaceHUDBorderTiles 0b:40ff PlaceHUDBorderTiles.loop 0b:410d LinkBattle_TrainerHuds 0b:4143 LoadTrainerHudOAM @@ -7078,8 +7078,8 @@ 0b:4725 MysteryGiftItems 0b:474a MysteryGiftItems.End 0b:474a MysteryGiftDecos -0b:476f TMHMPocket 0b:476f MysteryGiftDecos.End +0b:476f TMHMPocket 0b:4798 TMHMPocket.ConvertItemToTMHMNumber 0b:47a7 ConvertCurItemIntoCurTMHM 0b:47b6 GetTMHMItemMove @@ -11262,8 +11262,8 @@ 13:69bc MaleTrainers 13:69d5 MaleTrainers.End 13:69d5 FemaleTrainers -13:69df BattleIntroSlidingPics 13:69df FemaleTrainers.End +13:69df BattleIntroSlidingPics 13:69f7 BattleIntroSlidingPics.subfunction1 13:6a0a BattleIntroSlidingPics.subfunction2 13:6a11 BattleIntroSlidingPics.loop1 @@ -11584,8 +11584,8 @@ 14:4c7a ListMovePP.loop 14:4cc8 ListMovePP.done 14:4cc9 ListMovePP.load_loop -14:4cd0 BrokenPlacePPUnits.loop 14:4cd0 BrokenPlacePPUnits +14:4cd0 BrokenPlacePPUnits.loop 14:4cdb Unused_PlaceEnemyHPLevel 14:4d09 Unused_PlaceEnemyHPLevel.egg 14:4d0a PlaceStatusString @@ -17592,8 +17592,8 @@ 23:6680 SpriteAnimOAMData.OAMData_GameFreakLogo1_3 23:66a5 SpriteAnimOAMData.OAMData_GameFreakLogo4_11 23:6706 UnusedSpriteAnimGFX -23:672a Sprites_Cosine 23:672a UnusedSpriteAnimGFX.DeletedGFX +23:672a Sprites_Cosine 23:672c Sprites_Sine 23:6737 Sprites_Sine.negative_u24 23:6741 Sprites_Sine.apply_u24 @@ -18028,8 +18028,8 @@ 24:564e AnimateTuningKnob.TuningKnob 24:565c AnimateTuningKnob.down 24:5666 AnimateTuningKnob.up -24:566f UpdateRadioStation 24:566f AnimateTuningKnob.update +24:566f UpdateRadioStation 24:5676 UpdateRadioStation.loop 24:5682 UpdateRadioStation.nostation 24:5686 UpdateRadioStation.foundstation @@ -19123,8 +19123,8 @@ 25:73c7 Script_earthquake 25:73e6 Script_earthquake.script 25:73eb EarthquakeMovement -25:73f0 Script_loadpikachudata 25:73f0 EarthquakeMovement.End +25:73f0 Script_loadpikachudata 25:73fb Script_randomwildmon 25:7400 Script_loadtemptrainer 25:7412 Script_loadwildmon @@ -19184,8 +19184,8 @@ 25:76ae Script_getmonname 25:76b7 Script_getmonname.gotit 25:76c0 GetStringBuffer -25:76c8 CopyConvertedText 25:76c8 GetStringBuffer.ok +25:76c8 CopyConvertedText 25:76d5 Script_getitemname 25:76de Script_getitemname.ok 25:76e9 Script_getcurlandmarkname @@ -21120,8 +21120,8 @@ 2e:47a9 OaksPKMNTalk4.loop3 2e:47ec OaksPKMNTalk4.overflow 2e:47f2 OaksPKMNTalkRoutes -2e:4810 OaksPKMNTalk5 2e:4810 OaksPKMNTalkRoutes.End +2e:4810 OaksPKMNTalk5 2e:4818 OaksPKMNTalk6 2e:4820 OPT_IntroText1 2e:4825 OPT_IntroText2 @@ -29160,9 +29160,9 @@ 3c:72e7 Cry_Natu_Ch5 3c:72e9 Cry_Natu_Ch5.body1 3c:72f5 Cry_Natu_Ch5.body2 +3c:7302 Cry_Sunflora_Ch6.body1 3c:7302 Cry_Natu_Ch6 3c:7302 Cry_Sunflora_Ch6 -3c:7302 Cry_Sunflora_Ch6.body1 3c:7310 Cry_Sunflora_Ch6.body2 3c:731d Cry_Natu_Ch8 3c:731d Cry_Sunflora_Ch8 @@ -30210,8 +30210,8 @@ 3f:512b GetItemFromMom.ok 3f:512e GetItemFromMom.GetFromList1 3f:5136 MomItems_1 -3f:515e MomItems_2 3f:515e MomItems_1.End +3f:515e MomItems_2 3f:51ae MomItems_2.End 3f:51b1 MomHiHowAreYouText 3f:51b6 MomFoundAnItemText @@ -31089,8 +31089,8 @@ 41:426f PadMapForHDMATransfer.loop2 41:4279 PadMapForHDMATransfer.loop3 41:4284 HDMATransfer2bpp -41:42b2 HDMATransfer1bpp.loop 41:42b2 HDMATransfer1bpp +41:42b2 HDMATransfer1bpp.loop 41:42d6 HDMATransfer1bpp.bankswitch 41:4303 HDMATransfer_OnlyTopFourRows 41:4309 HDMATransfer_OnlyTopFourRows.Function @@ -31987,14 +31987,14 @@ 44:4fad URIPrefix 44:4fb4 URIPrefix.End 44:4fb4 HTTPDownloadURL -44:4fd9 HTTPUploadURL 44:4fd9 HTTPDownloadURL.End +44:4fd9 HTTPUploadURL 44:4ffc HTTPUploadURL.End 44:4ffc HTTPUtilityURL -44:5020 HTTPRankingURL 44:5020 HTTPUtilityURL.End -44:5044 Function111044 +44:5020 HTTPRankingURL 44:5044 HTTPRankingURL.End +44:5044 Function111044 44:50ac Function111044.asm_1110ac 44:50eb Function111044.asm_1110eb 44:5144 Function111044.asm_111144 @@ -32223,34 +32223,34 @@ 44:6001 MobilePacket_BeginSession 44:6013 MobilePacket_BeginSession.End 44:6013 MobilePacket_EndSession -44:601d MobilePacket_DialTelephone 44:601d MobilePacket_EndSession.End +44:601d MobilePacket_DialTelephone 44:6023 MobilePacket_DialTelephone.End 44:6023 MobilePacket_HangUpTelephone -44:602d MobilePacket_TelephoneStatus 44:602d MobilePacket_HangUpTelephone.End -44:6037 MobilePacket_ISPLogin +44:602d MobilePacket_TelephoneStatus 44:6037 MobilePacket_TelephoneStatus.End +44:6037 MobilePacket_ISPLogin 44:603c MobilePacket_ISPLogin.End 44:603c MobilePacket_ISPLogout -44:6046 MobilePacket_ReadConfigurationDataPart1 44:6046 MobilePacket_ISPLogout.End -44:6052 MobilePacket_ReadConfigurationDataPart2 +44:6046 MobilePacket_ReadConfigurationDataPart1 44:6052 MobilePacket_ReadConfigurationDataPart1.End -44:605e MobilePacket_WriteConfigurationData +44:6052 MobilePacket_ReadConfigurationDataPart2 44:605e MobilePacket_ReadConfigurationDataPart2.End +44:605e MobilePacket_WriteConfigurationData 44:6063 MobilePacket_WriteConfigurationData.End 44:6063 MobilePacket_DNSQuery 44:6068 MobilePacket_DNSQuery.End 44:6068 MobilePacket_WaitForTelephoneCall -44:6072 MobilePacket_TransferData 44:6072 MobilePacket_WaitForTelephoneCall.End -44:607d MobilePacket_OpenTCPConnection +44:6072 MobilePacket_TransferData 44:607d MobilePacket_TransferData.End +44:607d MobilePacket_OpenTCPConnection 44:6083 MobilePacket_OpenTCPConnection.End 44:6083 MobilePacket_CloseTCPConnection -44:6089 Unknown_112089 44:6089 MobilePacket_CloseTCPConnection.End +44:6089 Unknown_112089 44:609e Unknown_11209e 44:60a4 Unknown_1120a4 44:60b0 Unknown_1120b0 @@ -34029,8 +34029,8 @@ 46:71ed Function11b175.asm_11b1ed 46:71ef Function11b175.asm_11b1ef 46:71f7 FillScreenWithTile32 -46:7203 CopyDataUntilFF.loop 46:7203 CopyDataUntilFF +46:7203 CopyDataUntilFF.loop 46:720b Function11b20b 46:721e CheckCaughtMemMon 46:722a CheckSeenMemMon @@ -34503,8 +34503,8 @@ 47:7100 MobileEZChatCategoryPointers.ThisAndThat 47:7220 MobileEZChatData_WordAndPageCounts 47:723c EZChat_SortedWords -47:72f0 BTTrainerClassGenders 47:72f0 EZChat_SortedWords.End +47:72f0 BTTrainerClassGenders 47:7332 BTMaleTrainerTexts 47:7338 BTMaleTrainerTexts.Greetings 47:736a BTMaleTrainerTexts.PlayerLost @@ -36020,8 +36020,8 @@ 5f:51a6 Mobile_CopyDefaultNickname.DefaultNickname 5f:51ab Mobile_CopyDefaultMail 5f:51c3 Mobile_CopyDefaultMail.DefaultMessage -5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51c9 Mobile_CopyDefaultMail.DefaultMessageEnd +5f:51c9 Mobile_CopyDefaultMailAuthor 5f:51e1 CheckStringContainsLessThanBNextCharacters 5f:51e1 CheckStringContainsLessThanBNextCharacters.loop 5f:51ea CheckStringContainsLessThanBNextCharacters.next_char @@ -42875,8 +42875,8 @@ 78:492a DebugRoomMenu_PokemonGet_Page2Values 78:497b DebugRoomMenu_PokemonGet_Page3Values 78:49cc DebugRoomMenu_PokemonGet_Page4Values -78:4a09 DebugRoom_BoxStructStrings.Pokemon 78:4a09 DebugRoom_BoxStructStrings +78:4a09 DebugRoom_BoxStructStrings.Pokemon 78:4a0e DebugRoom_BoxStructStrings.Item 78:4a13 DebugRoom_BoxStructStrings.Move1 78:4a1a DebugRoom_BoxStructStrings.Move2