From 963b4b54ba23e669fe88cd8e7dbf27e4e81fedf7 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 8 Jun 2026 01:38:04 +0000 Subject: [PATCH] Remove the spurious `WEATHER_*_END` constants These were probably a mistake from confusing two consecutive pointer tables, `.WeatherMessages` and `.WeatherEndedMessages`, with one long table --- pokegold.map | 82 ++++++++++++++++++++++---------------------- pokegold.sym | 80 +++++++++++++++++++++--------------------- pokegold_debug.map | 82 ++++++++++++++++++++++---------------------- pokegold_debug.sym | 80 +++++++++++++++++++++--------------------- pokegold_vc.map | 80 +++++++++++++++++++++--------------------- pokegold_vc.sym | 80 +++++++++++++++++++++--------------------- pokesilver.map | 82 ++++++++++++++++++++++---------------------- pokesilver.sym | 80 +++++++++++++++++++++--------------------- pokesilver_debug.map | 82 ++++++++++++++++++++++---------------------- pokesilver_debug.sym | 80 +++++++++++++++++++++--------------------- pokesilver_vc.map | 80 +++++++++++++++++++++--------------------- pokesilver_vc.sym | 80 +++++++++++++++++++++--------------------- 12 files changed, 484 insertions(+), 484 deletions(-) diff --git a/pokegold.map b/pokegold.map index 0ddf8b2b..34ede9dc 100644 --- a/pokegold.map +++ b/pokegold.map @@ -11522,31 +11522,31 @@ ROMX bank #35: $402d = SaveMenu_CopyTilemapAtOnce.wait2 $403b = SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack $404c = SaveMenu_CopyTilemapAtOnce.loop - $404d = SaveMenu_CopyTilemapAtOnce.loop_u70 - $4056 = SaveMenu_CopyTilemapAtOnce.loop_u71 - $405f = SaveMenu_CopyTilemapAtOnce.loop_u72 - $4068 = SaveMenu_CopyTilemapAtOnce.loop_u73 - $4071 = SaveMenu_CopyTilemapAtOnce.loop_u74 - $407a = SaveMenu_CopyTilemapAtOnce.loop_u75 - $4083 = SaveMenu_CopyTilemapAtOnce.loop_u76 - $408c = SaveMenu_CopyTilemapAtOnce.loop_u77 - $4095 = SaveMenu_CopyTilemapAtOnce.loop_u78 - $409e = SaveMenu_CopyTilemapAtOnce.loop_u79 + $404d = SaveMenu_CopyTilemapAtOnce.loop_u72 + $4056 = SaveMenu_CopyTilemapAtOnce.loop_u73 + $405f = SaveMenu_CopyTilemapAtOnce.loop_u74 + $4068 = SaveMenu_CopyTilemapAtOnce.loop_u75 + $4071 = SaveMenu_CopyTilemapAtOnce.loop_u76 + $407a = SaveMenu_CopyTilemapAtOnce.loop_u77 + $4083 = SaveMenu_CopyTilemapAtOnce.loop_u78 + $408c = SaveMenu_CopyTilemapAtOnce.loop_u79 + $4095 = SaveMenu_CopyTilemapAtOnce.loop_u80 + $409e = SaveMenu_CopyTilemapAtOnce.loop_u81 $40b9 = PhoneRing_CopyTilemapAtOnce $40d3 = PhoneRing_CopyTilemapAtOnce.wait $40ee = PhoneRing_CopyTilemapAtOnce.wait2 $40fc = PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack $410d = PhoneRing_CopyTilemapAtOnce.loop - $410e = PhoneRing_CopyTilemapAtOnce.loop_u80 - $4117 = PhoneRing_CopyTilemapAtOnce.loop_u81 - $4120 = PhoneRing_CopyTilemapAtOnce.loop_u82 - $4129 = PhoneRing_CopyTilemapAtOnce.loop_u83 - $4132 = PhoneRing_CopyTilemapAtOnce.loop_u84 - $413b = PhoneRing_CopyTilemapAtOnce.loop_u85 - $4144 = PhoneRing_CopyTilemapAtOnce.loop_u86 - $414d = PhoneRing_CopyTilemapAtOnce.loop_u87 - $4156 = PhoneRing_CopyTilemapAtOnce.loop_u88 - $415f = PhoneRing_CopyTilemapAtOnce.loop_u89 + $410e = PhoneRing_CopyTilemapAtOnce.loop_u82 + $4117 = PhoneRing_CopyTilemapAtOnce.loop_u83 + $4120 = PhoneRing_CopyTilemapAtOnce.loop_u84 + $4129 = PhoneRing_CopyTilemapAtOnce.loop_u85 + $4132 = PhoneRing_CopyTilemapAtOnce.loop_u86 + $413b = PhoneRing_CopyTilemapAtOnce.loop_u87 + $4144 = PhoneRing_CopyTilemapAtOnce.loop_u88 + $414d = PhoneRing_CopyTilemapAtOnce.loop_u89 + $4156 = PhoneRing_CopyTilemapAtOnce.loop_u90 + $415f = PhoneRing_CopyTilemapAtOnce.loop_u91 $417a = _ResetClock $41bb = _ResetClock.wrongpassword $41c2 = _ResetClock.PasswordAskResetText @@ -11683,11 +11683,11 @@ ROMX bank #35: $4979 = WipeLYOverrides.wipe $497c = WipeLYOverrides.loop $4981 = StartTrainerBattle_DrawSineWave - $498c = StartTrainerBattle_DrawSineWave.negative_u90 - $4996 = StartTrainerBattle_DrawSineWave.apply_u90 - $49a5 = StartTrainerBattle_DrawSineWave.multiply_u90 - $49aa = StartTrainerBattle_DrawSineWave.even_u90 - $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u90 + $498c = StartTrainerBattle_DrawSineWave.negative_u92 + $4996 = StartTrainerBattle_DrawSineWave.apply_u92 + $49a5 = StartTrainerBattle_DrawSineWave.multiply_u92 + $49aa = StartTrainerBattle_DrawSineWave.even_u92 + $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u92 $49f2 = StartTrainerBattle_ZoomToBlack $49fb = StartTrainerBattle_ZoomToBlack.loop $4a16 = StartTrainerBattle_ZoomToBlack.done @@ -12057,11 +12057,11 @@ ROMX bank #35: $668a = Sprites_Cosine $668a = UnusedSpriteAnimGFX.DeletedGFX $668c = Sprites_Sine - $6697 = Sprites_Sine.negative_u95 - $66a1 = Sprites_Sine.apply_u95 - $66b0 = Sprites_Sine.multiply_u95 - $66b5 = Sprites_Sine.even_u95 - $66bd = Sprites_Sine.sinetable_u95 + $6697 = Sprites_Sine.negative_u97 + $66a1 = Sprites_Sine.apply_u97 + $66b0 = Sprites_Sine.multiply_u97 + $66b5 = Sprites_Sine.even_u97 + $66bd = Sprites_Sine.sinetable_u97 $66fd = AnimateEndOfExpBar $6708 = AnimateEndOfExpBar.load $6715 = AnimateEndOfExpBar.loop @@ -16270,10 +16270,10 @@ ROMX bank #51: $6671 = BattleAnim_IncAnonJumptableIndex $6677 = BattleAnim_Cosine $6679 = BattleAnim_Sine - $6684 = BattleAnim_Sine.negative_u121 - $668e = BattleAnim_Sine.apply_u121 - $669d = BattleAnim_Sine.multiply_u121 - $66a2 = BattleAnim_Sine.even_u121 + $6684 = BattleAnim_Sine.negative_u123 + $668e = BattleAnim_Sine.apply_u123 + $669d = BattleAnim_Sine.multiply_u123 + $66a2 = BattleAnim_Sine.even_u123 $66aa = BattleAnim_Sine_e $66b0 = BattleAnim_Cosine_e $66b6 = BattleAnim_AbsSinePrecise @@ -17119,14 +17119,14 @@ ROMX bank #56: $7511 = BillsPC_RefreshTextboxes.placeholder_string $7518 = BillsPC_RefreshTextboxes.Placeholder $751e = CopyBoxmonSpecies - $7545 = CopyBoxmonSpecies.loop_u125 - $7567 = CopyBoxmonSpecies.done_u125 + $7545 = CopyBoxmonSpecies.loop_u127 + $7567 = CopyBoxmonSpecies.done_u127 $7575 = CopyBoxmonSpecies.party - $7578 = CopyBoxmonSpecies.loop_u126 - $759a = CopyBoxmonSpecies.done_u126 + $7578 = CopyBoxmonSpecies.loop_u128 + $759a = CopyBoxmonSpecies.done_u128 $75a5 = CopyBoxmonSpecies.sBox - $75ad = CopyBoxmonSpecies.loop_u127 - $75cf = CopyBoxmonSpecies.done_u127 + $75ad = CopyBoxmonSpecies.loop_u129 + $75cf = CopyBoxmonSpecies.done_u129 $75dd = BillsPC_GetSelectedPokemonSpecies $75ef = BillsPC_UpdateSelectionCursor $75f9 = BillsPC_UpdateSelectionCursor.place_cursor @@ -41059,8 +41059,8 @@ WRAM0 bank #0: $ce64 = wMomBankDigitCursorPosition $ce64 = wTrainerCardBadgeFrameCounter $ce64 = wCreditsBorderFrame - $ce64 = wNamingScreenLetterCase $ce64 = wCardFlipCursorY + $ce64 = wNamingScreenLetterCase $ce64 = wPrevDexEntryJumptableIndex $ce64 = wPokegearCard $ce64 = wPackJumptableIndex diff --git a/pokegold.sym b/pokegold.sym index 6feb38c7..d969157e 100644 --- a/pokegold.sym +++ b/pokegold.sym @@ -11310,31 +11310,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_u70 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_u71 -23:405f SaveMenu_CopyTilemapAtOnce.loop_u72 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_u73 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_u74 -23:407a SaveMenu_CopyTilemapAtOnce.loop_u75 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_u76 -23:408c SaveMenu_CopyTilemapAtOnce.loop_u77 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_u78 -23:409e SaveMenu_CopyTilemapAtOnce.loop_u79 +23:404d SaveMenu_CopyTilemapAtOnce.loop_u72 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_u73 +23:405f SaveMenu_CopyTilemapAtOnce.loop_u74 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_u75 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_u76 +23:407a SaveMenu_CopyTilemapAtOnce.loop_u77 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_u78 +23:408c SaveMenu_CopyTilemapAtOnce.loop_u79 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_u80 +23:409e SaveMenu_CopyTilemapAtOnce.loop_u81 23:40b9 PhoneRing_CopyTilemapAtOnce 23:40d3 PhoneRing_CopyTilemapAtOnce.wait 23:40ee PhoneRing_CopyTilemapAtOnce.wait2 23:40fc PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack 23:410d PhoneRing_CopyTilemapAtOnce.loop -23:410e PhoneRing_CopyTilemapAtOnce.loop_u80 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_u81 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_u82 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_u83 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_u84 -23:413b PhoneRing_CopyTilemapAtOnce.loop_u85 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_u86 -23:414d PhoneRing_CopyTilemapAtOnce.loop_u87 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_u88 -23:415f PhoneRing_CopyTilemapAtOnce.loop_u89 +23:410e PhoneRing_CopyTilemapAtOnce.loop_u82 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_u83 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_u84 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_u85 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_u86 +23:413b PhoneRing_CopyTilemapAtOnce.loop_u87 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_u88 +23:414d PhoneRing_CopyTilemapAtOnce.loop_u89 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_u90 +23:415f PhoneRing_CopyTilemapAtOnce.loop_u91 23:417a _ResetClock 23:41bb _ResetClock.wrongpassword 23:41c2 _ResetClock.PasswordAskResetText @@ -11471,11 +11471,11 @@ 23:4979 WipeLYOverrides.wipe 23:497c WipeLYOverrides.loop 23:4981 StartTrainerBattle_DrawSineWave -23:498c StartTrainerBattle_DrawSineWave.negative_u90 -23:4996 StartTrainerBattle_DrawSineWave.apply_u90 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_u90 -23:49aa StartTrainerBattle_DrawSineWave.even_u90 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u90 +23:498c StartTrainerBattle_DrawSineWave.negative_u92 +23:4996 StartTrainerBattle_DrawSineWave.apply_u92 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_u92 +23:49aa StartTrainerBattle_DrawSineWave.even_u92 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u92 23:49f2 StartTrainerBattle_ZoomToBlack 23:49fb StartTrainerBattle_ZoomToBlack.loop 23:4a16 StartTrainerBattle_ZoomToBlack.done @@ -11845,11 +11845,11 @@ 23:668a Sprites_Cosine 23:668a UnusedSpriteAnimGFX.DeletedGFX 23:668c Sprites_Sine -23:6697 Sprites_Sine.negative_u95 -23:66a1 Sprites_Sine.apply_u95 -23:66b0 Sprites_Sine.multiply_u95 -23:66b5 Sprites_Sine.even_u95 -23:66bd Sprites_Sine.sinetable_u95 +23:6697 Sprites_Sine.negative_u97 +23:66a1 Sprites_Sine.apply_u97 +23:66b0 Sprites_Sine.multiply_u97 +23:66b5 Sprites_Sine.even_u97 +23:66bd Sprites_Sine.sinetable_u97 23:66fd AnimateEndOfExpBar 23:6708 AnimateEndOfExpBar.load 23:6715 AnimateEndOfExpBar.loop @@ -15985,10 +15985,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_u121 -33:668e BattleAnim_Sine.apply_u121 -33:669d BattleAnim_Sine.multiply_u121 -33:66a2 BattleAnim_Sine.even_u121 +33:6684 BattleAnim_Sine.negative_u123 +33:668e BattleAnim_Sine.apply_u123 +33:669d BattleAnim_Sine.multiply_u123 +33:66a2 BattleAnim_Sine.even_u123 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16811,14 +16811,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_u125 -38:7567 CopyBoxmonSpecies.done_u125 +38:7545 CopyBoxmonSpecies.loop_u127 +38:7567 CopyBoxmonSpecies.done_u127 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_u126 -38:759a CopyBoxmonSpecies.done_u126 +38:7578 CopyBoxmonSpecies.loop_u128 +38:759a CopyBoxmonSpecies.done_u128 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_u127 -38:75cf CopyBoxmonSpecies.done_u127 +38:75ad CopyBoxmonSpecies.loop_u129 +38:75cf CopyBoxmonSpecies.done_u129 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokegold_debug.map b/pokegold_debug.map index 2b938128..df1b3f40 100644 --- a/pokegold_debug.map +++ b/pokegold_debug.map @@ -11523,31 +11523,31 @@ ROMX bank #35: $402d = SaveMenu_CopyTilemapAtOnce.wait2 $403b = SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack $404c = SaveMenu_CopyTilemapAtOnce.loop - $404d = SaveMenu_CopyTilemapAtOnce.loop_u70 - $4056 = SaveMenu_CopyTilemapAtOnce.loop_u71 - $405f = SaveMenu_CopyTilemapAtOnce.loop_u72 - $4068 = SaveMenu_CopyTilemapAtOnce.loop_u73 - $4071 = SaveMenu_CopyTilemapAtOnce.loop_u74 - $407a = SaveMenu_CopyTilemapAtOnce.loop_u75 - $4083 = SaveMenu_CopyTilemapAtOnce.loop_u76 - $408c = SaveMenu_CopyTilemapAtOnce.loop_u77 - $4095 = SaveMenu_CopyTilemapAtOnce.loop_u78 - $409e = SaveMenu_CopyTilemapAtOnce.loop_u79 + $404d = SaveMenu_CopyTilemapAtOnce.loop_u72 + $4056 = SaveMenu_CopyTilemapAtOnce.loop_u73 + $405f = SaveMenu_CopyTilemapAtOnce.loop_u74 + $4068 = SaveMenu_CopyTilemapAtOnce.loop_u75 + $4071 = SaveMenu_CopyTilemapAtOnce.loop_u76 + $407a = SaveMenu_CopyTilemapAtOnce.loop_u77 + $4083 = SaveMenu_CopyTilemapAtOnce.loop_u78 + $408c = SaveMenu_CopyTilemapAtOnce.loop_u79 + $4095 = SaveMenu_CopyTilemapAtOnce.loop_u80 + $409e = SaveMenu_CopyTilemapAtOnce.loop_u81 $40b9 = PhoneRing_CopyTilemapAtOnce $40d3 = PhoneRing_CopyTilemapAtOnce.wait $40ee = PhoneRing_CopyTilemapAtOnce.wait2 $40fc = PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack $410d = PhoneRing_CopyTilemapAtOnce.loop - $410e = PhoneRing_CopyTilemapAtOnce.loop_u80 - $4117 = PhoneRing_CopyTilemapAtOnce.loop_u81 - $4120 = PhoneRing_CopyTilemapAtOnce.loop_u82 - $4129 = PhoneRing_CopyTilemapAtOnce.loop_u83 - $4132 = PhoneRing_CopyTilemapAtOnce.loop_u84 - $413b = PhoneRing_CopyTilemapAtOnce.loop_u85 - $4144 = PhoneRing_CopyTilemapAtOnce.loop_u86 - $414d = PhoneRing_CopyTilemapAtOnce.loop_u87 - $4156 = PhoneRing_CopyTilemapAtOnce.loop_u88 - $415f = PhoneRing_CopyTilemapAtOnce.loop_u89 + $410e = PhoneRing_CopyTilemapAtOnce.loop_u82 + $4117 = PhoneRing_CopyTilemapAtOnce.loop_u83 + $4120 = PhoneRing_CopyTilemapAtOnce.loop_u84 + $4129 = PhoneRing_CopyTilemapAtOnce.loop_u85 + $4132 = PhoneRing_CopyTilemapAtOnce.loop_u86 + $413b = PhoneRing_CopyTilemapAtOnce.loop_u87 + $4144 = PhoneRing_CopyTilemapAtOnce.loop_u88 + $414d = PhoneRing_CopyTilemapAtOnce.loop_u89 + $4156 = PhoneRing_CopyTilemapAtOnce.loop_u90 + $415f = PhoneRing_CopyTilemapAtOnce.loop_u91 $417a = _ResetClock $41bb = _ResetClock.wrongpassword $41c2 = _ResetClock.PasswordAskResetText @@ -11684,11 +11684,11 @@ ROMX bank #35: $4979 = WipeLYOverrides.wipe $497c = WipeLYOverrides.loop $4981 = StartTrainerBattle_DrawSineWave - $498c = StartTrainerBattle_DrawSineWave.negative_u90 - $4996 = StartTrainerBattle_DrawSineWave.apply_u90 - $49a5 = StartTrainerBattle_DrawSineWave.multiply_u90 - $49aa = StartTrainerBattle_DrawSineWave.even_u90 - $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u90 + $498c = StartTrainerBattle_DrawSineWave.negative_u92 + $4996 = StartTrainerBattle_DrawSineWave.apply_u92 + $49a5 = StartTrainerBattle_DrawSineWave.multiply_u92 + $49aa = StartTrainerBattle_DrawSineWave.even_u92 + $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u92 $49f2 = StartTrainerBattle_ZoomToBlack $49fb = StartTrainerBattle_ZoomToBlack.loop $4a16 = StartTrainerBattle_ZoomToBlack.done @@ -12058,11 +12058,11 @@ ROMX bank #35: $668a = Sprites_Cosine $668a = UnusedSpriteAnimGFX.DeletedGFX $668c = Sprites_Sine - $6697 = Sprites_Sine.negative_u95 - $66a1 = Sprites_Sine.apply_u95 - $66b0 = Sprites_Sine.multiply_u95 - $66b5 = Sprites_Sine.even_u95 - $66bd = Sprites_Sine.sinetable_u95 + $6697 = Sprites_Sine.negative_u97 + $66a1 = Sprites_Sine.apply_u97 + $66b0 = Sprites_Sine.multiply_u97 + $66b5 = Sprites_Sine.even_u97 + $66bd = Sprites_Sine.sinetable_u97 $66fd = AnimateEndOfExpBar $6708 = AnimateEndOfExpBar.load $6715 = AnimateEndOfExpBar.loop @@ -16271,10 +16271,10 @@ ROMX bank #51: $6671 = BattleAnim_IncAnonJumptableIndex $6677 = BattleAnim_Cosine $6679 = BattleAnim_Sine - $6684 = BattleAnim_Sine.negative_u121 - $668e = BattleAnim_Sine.apply_u121 - $669d = BattleAnim_Sine.multiply_u121 - $66a2 = BattleAnim_Sine.even_u121 + $6684 = BattleAnim_Sine.negative_u123 + $668e = BattleAnim_Sine.apply_u123 + $669d = BattleAnim_Sine.multiply_u123 + $66a2 = BattleAnim_Sine.even_u123 $66aa = BattleAnim_Sine_e $66b0 = BattleAnim_Cosine_e $66b6 = BattleAnim_AbsSinePrecise @@ -17120,14 +17120,14 @@ ROMX bank #56: $7511 = BillsPC_RefreshTextboxes.placeholder_string $7518 = BillsPC_RefreshTextboxes.Placeholder $751e = CopyBoxmonSpecies - $7545 = CopyBoxmonSpecies.loop_u125 - $7567 = CopyBoxmonSpecies.done_u125 + $7545 = CopyBoxmonSpecies.loop_u127 + $7567 = CopyBoxmonSpecies.done_u127 $7575 = CopyBoxmonSpecies.party - $7578 = CopyBoxmonSpecies.loop_u126 - $759a = CopyBoxmonSpecies.done_u126 + $7578 = CopyBoxmonSpecies.loop_u128 + $759a = CopyBoxmonSpecies.done_u128 $75a5 = CopyBoxmonSpecies.sBox - $75ad = CopyBoxmonSpecies.loop_u127 - $75cf = CopyBoxmonSpecies.done_u127 + $75ad = CopyBoxmonSpecies.loop_u129 + $75cf = CopyBoxmonSpecies.done_u129 $75dd = BillsPC_GetSelectedPokemonSpecies $75ef = BillsPC_UpdateSelectionCursor $75f9 = BillsPC_UpdateSelectionCursor.place_cursor @@ -33500,9 +33500,9 @@ SRAM bank #2: $a4e3 = sBox2Mon4Unused1 $a4e4 = sBox2Mon4Unused2 $a4e5 = sBox2Mon4Level - $a4e6 = sBox2Mon5 $a4e6 = sBox2Mon4BoxEnd $a4e6 = sBox2Mon5Species + $a4e6 = sBox2Mon5 $a4e7 = sBox2Mon5Item $a4e8 = sBox2Mon5Moves $a4ec = sBox2Mon5ID diff --git a/pokegold_debug.sym b/pokegold_debug.sym index 74a4a28d..b20986f4 100644 --- a/pokegold_debug.sym +++ b/pokegold_debug.sym @@ -11311,31 +11311,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_u70 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_u71 -23:405f SaveMenu_CopyTilemapAtOnce.loop_u72 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_u73 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_u74 -23:407a SaveMenu_CopyTilemapAtOnce.loop_u75 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_u76 -23:408c SaveMenu_CopyTilemapAtOnce.loop_u77 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_u78 -23:409e SaveMenu_CopyTilemapAtOnce.loop_u79 +23:404d SaveMenu_CopyTilemapAtOnce.loop_u72 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_u73 +23:405f SaveMenu_CopyTilemapAtOnce.loop_u74 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_u75 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_u76 +23:407a SaveMenu_CopyTilemapAtOnce.loop_u77 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_u78 +23:408c SaveMenu_CopyTilemapAtOnce.loop_u79 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_u80 +23:409e SaveMenu_CopyTilemapAtOnce.loop_u81 23:40b9 PhoneRing_CopyTilemapAtOnce 23:40d3 PhoneRing_CopyTilemapAtOnce.wait 23:40ee PhoneRing_CopyTilemapAtOnce.wait2 23:40fc PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack 23:410d PhoneRing_CopyTilemapAtOnce.loop -23:410e PhoneRing_CopyTilemapAtOnce.loop_u80 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_u81 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_u82 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_u83 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_u84 -23:413b PhoneRing_CopyTilemapAtOnce.loop_u85 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_u86 -23:414d PhoneRing_CopyTilemapAtOnce.loop_u87 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_u88 -23:415f PhoneRing_CopyTilemapAtOnce.loop_u89 +23:410e PhoneRing_CopyTilemapAtOnce.loop_u82 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_u83 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_u84 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_u85 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_u86 +23:413b PhoneRing_CopyTilemapAtOnce.loop_u87 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_u88 +23:414d PhoneRing_CopyTilemapAtOnce.loop_u89 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_u90 +23:415f PhoneRing_CopyTilemapAtOnce.loop_u91 23:417a _ResetClock 23:41bb _ResetClock.wrongpassword 23:41c2 _ResetClock.PasswordAskResetText @@ -11472,11 +11472,11 @@ 23:4979 WipeLYOverrides.wipe 23:497c WipeLYOverrides.loop 23:4981 StartTrainerBattle_DrawSineWave -23:498c StartTrainerBattle_DrawSineWave.negative_u90 -23:4996 StartTrainerBattle_DrawSineWave.apply_u90 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_u90 -23:49aa StartTrainerBattle_DrawSineWave.even_u90 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u90 +23:498c StartTrainerBattle_DrawSineWave.negative_u92 +23:4996 StartTrainerBattle_DrawSineWave.apply_u92 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_u92 +23:49aa StartTrainerBattle_DrawSineWave.even_u92 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u92 23:49f2 StartTrainerBattle_ZoomToBlack 23:49fb StartTrainerBattle_ZoomToBlack.loop 23:4a16 StartTrainerBattle_ZoomToBlack.done @@ -11846,11 +11846,11 @@ 23:668a Sprites_Cosine 23:668a UnusedSpriteAnimGFX.DeletedGFX 23:668c Sprites_Sine -23:6697 Sprites_Sine.negative_u95 -23:66a1 Sprites_Sine.apply_u95 -23:66b0 Sprites_Sine.multiply_u95 -23:66b5 Sprites_Sine.even_u95 -23:66bd Sprites_Sine.sinetable_u95 +23:6697 Sprites_Sine.negative_u97 +23:66a1 Sprites_Sine.apply_u97 +23:66b0 Sprites_Sine.multiply_u97 +23:66b5 Sprites_Sine.even_u97 +23:66bd Sprites_Sine.sinetable_u97 23:66fd AnimateEndOfExpBar 23:6708 AnimateEndOfExpBar.load 23:6715 AnimateEndOfExpBar.loop @@ -15986,10 +15986,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_u121 -33:668e BattleAnim_Sine.apply_u121 -33:669d BattleAnim_Sine.multiply_u121 -33:66a2 BattleAnim_Sine.even_u121 +33:6684 BattleAnim_Sine.negative_u123 +33:668e BattleAnim_Sine.apply_u123 +33:669d BattleAnim_Sine.multiply_u123 +33:66a2 BattleAnim_Sine.even_u123 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16812,14 +16812,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_u125 -38:7567 CopyBoxmonSpecies.done_u125 +38:7545 CopyBoxmonSpecies.loop_u127 +38:7567 CopyBoxmonSpecies.done_u127 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_u126 -38:759a CopyBoxmonSpecies.done_u126 +38:7578 CopyBoxmonSpecies.loop_u128 +38:759a CopyBoxmonSpecies.done_u128 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_u127 -38:75cf CopyBoxmonSpecies.done_u127 +38:75ad CopyBoxmonSpecies.loop_u129 +38:75cf CopyBoxmonSpecies.done_u129 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokegold_vc.map b/pokegold_vc.map index 903b0be6..34b4700c 100644 --- a/pokegold_vc.map +++ b/pokegold_vc.map @@ -11581,31 +11581,31 @@ ROMX bank #35: $402d = SaveMenu_CopyTilemapAtOnce.wait2 $403b = SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack $404c = SaveMenu_CopyTilemapAtOnce.loop - $404d = SaveMenu_CopyTilemapAtOnce.loop_u70 - $4056 = SaveMenu_CopyTilemapAtOnce.loop_u71 - $405f = SaveMenu_CopyTilemapAtOnce.loop_u72 - $4068 = SaveMenu_CopyTilemapAtOnce.loop_u73 - $4071 = SaveMenu_CopyTilemapAtOnce.loop_u74 - $407a = SaveMenu_CopyTilemapAtOnce.loop_u75 - $4083 = SaveMenu_CopyTilemapAtOnce.loop_u76 - $408c = SaveMenu_CopyTilemapAtOnce.loop_u77 - $4095 = SaveMenu_CopyTilemapAtOnce.loop_u78 - $409e = SaveMenu_CopyTilemapAtOnce.loop_u79 + $404d = SaveMenu_CopyTilemapAtOnce.loop_u72 + $4056 = SaveMenu_CopyTilemapAtOnce.loop_u73 + $405f = SaveMenu_CopyTilemapAtOnce.loop_u74 + $4068 = SaveMenu_CopyTilemapAtOnce.loop_u75 + $4071 = SaveMenu_CopyTilemapAtOnce.loop_u76 + $407a = SaveMenu_CopyTilemapAtOnce.loop_u77 + $4083 = SaveMenu_CopyTilemapAtOnce.loop_u78 + $408c = SaveMenu_CopyTilemapAtOnce.loop_u79 + $4095 = SaveMenu_CopyTilemapAtOnce.loop_u80 + $409e = SaveMenu_CopyTilemapAtOnce.loop_u81 $40b9 = PhoneRing_CopyTilemapAtOnce $40d3 = PhoneRing_CopyTilemapAtOnce.wait $40ee = PhoneRing_CopyTilemapAtOnce.wait2 $40fc = PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack $410d = PhoneRing_CopyTilemapAtOnce.loop - $410e = PhoneRing_CopyTilemapAtOnce.loop_u80 - $4117 = PhoneRing_CopyTilemapAtOnce.loop_u81 - $4120 = PhoneRing_CopyTilemapAtOnce.loop_u82 - $4129 = PhoneRing_CopyTilemapAtOnce.loop_u83 - $4132 = PhoneRing_CopyTilemapAtOnce.loop_u84 - $413b = PhoneRing_CopyTilemapAtOnce.loop_u85 - $4144 = PhoneRing_CopyTilemapAtOnce.loop_u86 - $414d = PhoneRing_CopyTilemapAtOnce.loop_u87 - $4156 = PhoneRing_CopyTilemapAtOnce.loop_u88 - $415f = PhoneRing_CopyTilemapAtOnce.loop_u89 + $410e = PhoneRing_CopyTilemapAtOnce.loop_u82 + $4117 = PhoneRing_CopyTilemapAtOnce.loop_u83 + $4120 = PhoneRing_CopyTilemapAtOnce.loop_u84 + $4129 = PhoneRing_CopyTilemapAtOnce.loop_u85 + $4132 = PhoneRing_CopyTilemapAtOnce.loop_u86 + $413b = PhoneRing_CopyTilemapAtOnce.loop_u87 + $4144 = PhoneRing_CopyTilemapAtOnce.loop_u88 + $414d = PhoneRing_CopyTilemapAtOnce.loop_u89 + $4156 = PhoneRing_CopyTilemapAtOnce.loop_u90 + $415f = PhoneRing_CopyTilemapAtOnce.loop_u91 $417a = _ResetClock $41bb = _ResetClock.wrongpassword $41c2 = _ResetClock.PasswordAskResetText @@ -11747,11 +11747,11 @@ ROMX bank #35: $4979 = WipeLYOverrides.wipe $497c = WipeLYOverrides.loop $4981 = StartTrainerBattle_DrawSineWave - $498c = StartTrainerBattle_DrawSineWave.negative_u90 - $4996 = StartTrainerBattle_DrawSineWave.apply_u90 - $49a5 = StartTrainerBattle_DrawSineWave.multiply_u90 - $49aa = StartTrainerBattle_DrawSineWave.even_u90 - $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u90 + $498c = StartTrainerBattle_DrawSineWave.negative_u92 + $4996 = StartTrainerBattle_DrawSineWave.apply_u92 + $49a5 = StartTrainerBattle_DrawSineWave.multiply_u92 + $49aa = StartTrainerBattle_DrawSineWave.even_u92 + $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u92 $49f2 = StartTrainerBattle_ZoomToBlack $49f2 = StartTrainerBattle_ZoomToBlack.VC_Stop_reducing_battle_transition_flashing_ZoomToBlack $49fb = StartTrainerBattle_ZoomToBlack.loop @@ -12122,11 +12122,11 @@ ROMX bank #35: $668a = Sprites_Cosine $668a = UnusedSpriteAnimGFX.DeletedGFX $668c = Sprites_Sine - $6697 = Sprites_Sine.negative_u95 - $66a1 = Sprites_Sine.apply_u95 - $66b0 = Sprites_Sine.multiply_u95 - $66b5 = Sprites_Sine.even_u95 - $66bd = Sprites_Sine.sinetable_u95 + $6697 = Sprites_Sine.negative_u97 + $66a1 = Sprites_Sine.apply_u97 + $66b0 = Sprites_Sine.multiply_u97 + $66b5 = Sprites_Sine.even_u97 + $66bd = Sprites_Sine.sinetable_u97 $66fd = AnimateEndOfExpBar $6708 = AnimateEndOfExpBar.load $6715 = AnimateEndOfExpBar.loop @@ -16341,10 +16341,10 @@ ROMX bank #51: $6671 = BattleAnim_IncAnonJumptableIndex $6677 = BattleAnim_Cosine $6679 = BattleAnim_Sine - $6684 = BattleAnim_Sine.negative_u121 - $668e = BattleAnim_Sine.apply_u121 - $669d = BattleAnim_Sine.multiply_u121 - $66a2 = BattleAnim_Sine.even_u121 + $6684 = BattleAnim_Sine.negative_u123 + $668e = BattleAnim_Sine.apply_u123 + $669d = BattleAnim_Sine.multiply_u123 + $66a2 = BattleAnim_Sine.even_u123 $66aa = BattleAnim_Sine_e $66b0 = BattleAnim_Cosine_e $66b6 = BattleAnim_AbsSinePrecise @@ -17190,14 +17190,14 @@ ROMX bank #56: $7511 = BillsPC_RefreshTextboxes.placeholder_string $7518 = BillsPC_RefreshTextboxes.Placeholder $751e = CopyBoxmonSpecies - $7545 = CopyBoxmonSpecies.loop_u125 - $7567 = CopyBoxmonSpecies.done_u125 + $7545 = CopyBoxmonSpecies.loop_u127 + $7567 = CopyBoxmonSpecies.done_u127 $7575 = CopyBoxmonSpecies.party - $7578 = CopyBoxmonSpecies.loop_u126 - $759a = CopyBoxmonSpecies.done_u126 + $7578 = CopyBoxmonSpecies.loop_u128 + $759a = CopyBoxmonSpecies.done_u128 $75a5 = CopyBoxmonSpecies.sBox - $75ad = CopyBoxmonSpecies.loop_u127 - $75cf = CopyBoxmonSpecies.done_u127 + $75ad = CopyBoxmonSpecies.loop_u129 + $75cf = CopyBoxmonSpecies.done_u129 $75dd = BillsPC_GetSelectedPokemonSpecies $75ef = BillsPC_UpdateSelectionCursor $75f9 = BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokegold_vc.sym b/pokegold_vc.sym index c47b66c8..a04bdaed 100644 --- a/pokegold_vc.sym +++ b/pokegold_vc.sym @@ -11369,31 +11369,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_u70 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_u71 -23:405f SaveMenu_CopyTilemapAtOnce.loop_u72 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_u73 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_u74 -23:407a SaveMenu_CopyTilemapAtOnce.loop_u75 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_u76 -23:408c SaveMenu_CopyTilemapAtOnce.loop_u77 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_u78 -23:409e SaveMenu_CopyTilemapAtOnce.loop_u79 +23:404d SaveMenu_CopyTilemapAtOnce.loop_u72 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_u73 +23:405f SaveMenu_CopyTilemapAtOnce.loop_u74 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_u75 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_u76 +23:407a SaveMenu_CopyTilemapAtOnce.loop_u77 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_u78 +23:408c SaveMenu_CopyTilemapAtOnce.loop_u79 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_u80 +23:409e SaveMenu_CopyTilemapAtOnce.loop_u81 23:40b9 PhoneRing_CopyTilemapAtOnce 23:40d3 PhoneRing_CopyTilemapAtOnce.wait 23:40ee PhoneRing_CopyTilemapAtOnce.wait2 23:40fc PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack 23:410d PhoneRing_CopyTilemapAtOnce.loop -23:410e PhoneRing_CopyTilemapAtOnce.loop_u80 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_u81 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_u82 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_u83 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_u84 -23:413b PhoneRing_CopyTilemapAtOnce.loop_u85 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_u86 -23:414d PhoneRing_CopyTilemapAtOnce.loop_u87 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_u88 -23:415f PhoneRing_CopyTilemapAtOnce.loop_u89 +23:410e PhoneRing_CopyTilemapAtOnce.loop_u82 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_u83 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_u84 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_u85 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_u86 +23:413b PhoneRing_CopyTilemapAtOnce.loop_u87 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_u88 +23:414d PhoneRing_CopyTilemapAtOnce.loop_u89 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_u90 +23:415f PhoneRing_CopyTilemapAtOnce.loop_u91 23:417a _ResetClock 23:41bb _ResetClock.wrongpassword 23:41c2 _ResetClock.PasswordAskResetText @@ -11535,11 +11535,11 @@ 23:4979 WipeLYOverrides.wipe 23:497c WipeLYOverrides.loop 23:4981 StartTrainerBattle_DrawSineWave -23:498c StartTrainerBattle_DrawSineWave.negative_u90 -23:4996 StartTrainerBattle_DrawSineWave.apply_u90 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_u90 -23:49aa StartTrainerBattle_DrawSineWave.even_u90 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u90 +23:498c StartTrainerBattle_DrawSineWave.negative_u92 +23:4996 StartTrainerBattle_DrawSineWave.apply_u92 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_u92 +23:49aa StartTrainerBattle_DrawSineWave.even_u92 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u92 23:49f2 StartTrainerBattle_ZoomToBlack 23:49f2 StartTrainerBattle_ZoomToBlack.VC_Stop_reducing_battle_transition_flashing_ZoomToBlack 23:49fb StartTrainerBattle_ZoomToBlack.loop @@ -11910,11 +11910,11 @@ 23:668a Sprites_Cosine 23:668a UnusedSpriteAnimGFX.DeletedGFX 23:668c Sprites_Sine -23:6697 Sprites_Sine.negative_u95 -23:66a1 Sprites_Sine.apply_u95 -23:66b0 Sprites_Sine.multiply_u95 -23:66b5 Sprites_Sine.even_u95 -23:66bd Sprites_Sine.sinetable_u95 +23:6697 Sprites_Sine.negative_u97 +23:66a1 Sprites_Sine.apply_u97 +23:66b0 Sprites_Sine.multiply_u97 +23:66b5 Sprites_Sine.even_u97 +23:66bd Sprites_Sine.sinetable_u97 23:66fd AnimateEndOfExpBar 23:6708 AnimateEndOfExpBar.load 23:6715 AnimateEndOfExpBar.loop @@ -16056,10 +16056,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_u121 -33:668e BattleAnim_Sine.apply_u121 -33:669d BattleAnim_Sine.multiply_u121 -33:66a2 BattleAnim_Sine.even_u121 +33:6684 BattleAnim_Sine.negative_u123 +33:668e BattleAnim_Sine.apply_u123 +33:669d BattleAnim_Sine.multiply_u123 +33:66a2 BattleAnim_Sine.even_u123 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16882,14 +16882,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_u125 -38:7567 CopyBoxmonSpecies.done_u125 +38:7545 CopyBoxmonSpecies.loop_u127 +38:7567 CopyBoxmonSpecies.done_u127 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_u126 -38:759a CopyBoxmonSpecies.done_u126 +38:7578 CopyBoxmonSpecies.loop_u128 +38:759a CopyBoxmonSpecies.done_u128 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_u127 -38:75cf CopyBoxmonSpecies.done_u127 +38:75ad CopyBoxmonSpecies.loop_u129 +38:75cf CopyBoxmonSpecies.done_u129 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokesilver.map b/pokesilver.map index 72674aac..697be973 100644 --- a/pokesilver.map +++ b/pokesilver.map @@ -11522,31 +11522,31 @@ ROMX bank #35: $402d = SaveMenu_CopyTilemapAtOnce.wait2 $403b = SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack $404c = SaveMenu_CopyTilemapAtOnce.loop - $404d = SaveMenu_CopyTilemapAtOnce.loop_u70 - $4056 = SaveMenu_CopyTilemapAtOnce.loop_u71 - $405f = SaveMenu_CopyTilemapAtOnce.loop_u72 - $4068 = SaveMenu_CopyTilemapAtOnce.loop_u73 - $4071 = SaveMenu_CopyTilemapAtOnce.loop_u74 - $407a = SaveMenu_CopyTilemapAtOnce.loop_u75 - $4083 = SaveMenu_CopyTilemapAtOnce.loop_u76 - $408c = SaveMenu_CopyTilemapAtOnce.loop_u77 - $4095 = SaveMenu_CopyTilemapAtOnce.loop_u78 - $409e = SaveMenu_CopyTilemapAtOnce.loop_u79 + $404d = SaveMenu_CopyTilemapAtOnce.loop_u72 + $4056 = SaveMenu_CopyTilemapAtOnce.loop_u73 + $405f = SaveMenu_CopyTilemapAtOnce.loop_u74 + $4068 = SaveMenu_CopyTilemapAtOnce.loop_u75 + $4071 = SaveMenu_CopyTilemapAtOnce.loop_u76 + $407a = SaveMenu_CopyTilemapAtOnce.loop_u77 + $4083 = SaveMenu_CopyTilemapAtOnce.loop_u78 + $408c = SaveMenu_CopyTilemapAtOnce.loop_u79 + $4095 = SaveMenu_CopyTilemapAtOnce.loop_u80 + $409e = SaveMenu_CopyTilemapAtOnce.loop_u81 $40b9 = PhoneRing_CopyTilemapAtOnce $40d3 = PhoneRing_CopyTilemapAtOnce.wait $40ee = PhoneRing_CopyTilemapAtOnce.wait2 $40fc = PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack $410d = PhoneRing_CopyTilemapAtOnce.loop - $410e = PhoneRing_CopyTilemapAtOnce.loop_u80 - $4117 = PhoneRing_CopyTilemapAtOnce.loop_u81 - $4120 = PhoneRing_CopyTilemapAtOnce.loop_u82 - $4129 = PhoneRing_CopyTilemapAtOnce.loop_u83 - $4132 = PhoneRing_CopyTilemapAtOnce.loop_u84 - $413b = PhoneRing_CopyTilemapAtOnce.loop_u85 - $4144 = PhoneRing_CopyTilemapAtOnce.loop_u86 - $414d = PhoneRing_CopyTilemapAtOnce.loop_u87 - $4156 = PhoneRing_CopyTilemapAtOnce.loop_u88 - $415f = PhoneRing_CopyTilemapAtOnce.loop_u89 + $410e = PhoneRing_CopyTilemapAtOnce.loop_u82 + $4117 = PhoneRing_CopyTilemapAtOnce.loop_u83 + $4120 = PhoneRing_CopyTilemapAtOnce.loop_u84 + $4129 = PhoneRing_CopyTilemapAtOnce.loop_u85 + $4132 = PhoneRing_CopyTilemapAtOnce.loop_u86 + $413b = PhoneRing_CopyTilemapAtOnce.loop_u87 + $4144 = PhoneRing_CopyTilemapAtOnce.loop_u88 + $414d = PhoneRing_CopyTilemapAtOnce.loop_u89 + $4156 = PhoneRing_CopyTilemapAtOnce.loop_u90 + $415f = PhoneRing_CopyTilemapAtOnce.loop_u91 $417a = _ResetClock $41bb = _ResetClock.wrongpassword $41c2 = _ResetClock.PasswordAskResetText @@ -11683,11 +11683,11 @@ ROMX bank #35: $4979 = WipeLYOverrides.wipe $497c = WipeLYOverrides.loop $4981 = StartTrainerBattle_DrawSineWave - $498c = StartTrainerBattle_DrawSineWave.negative_u90 - $4996 = StartTrainerBattle_DrawSineWave.apply_u90 - $49a5 = StartTrainerBattle_DrawSineWave.multiply_u90 - $49aa = StartTrainerBattle_DrawSineWave.even_u90 - $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u90 + $498c = StartTrainerBattle_DrawSineWave.negative_u92 + $4996 = StartTrainerBattle_DrawSineWave.apply_u92 + $49a5 = StartTrainerBattle_DrawSineWave.multiply_u92 + $49aa = StartTrainerBattle_DrawSineWave.even_u92 + $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u92 $49f2 = StartTrainerBattle_ZoomToBlack $49fb = StartTrainerBattle_ZoomToBlack.loop $4a16 = StartTrainerBattle_ZoomToBlack.done @@ -12057,11 +12057,11 @@ ROMX bank #35: $6670 = Sprites_Cosine $6670 = UnusedSpriteAnimGFX.DeletedGFX $6672 = Sprites_Sine - $667d = Sprites_Sine.negative_u95 - $6687 = Sprites_Sine.apply_u95 - $6696 = Sprites_Sine.multiply_u95 - $669b = Sprites_Sine.even_u95 - $66a3 = Sprites_Sine.sinetable_u95 + $667d = Sprites_Sine.negative_u97 + $6687 = Sprites_Sine.apply_u97 + $6696 = Sprites_Sine.multiply_u97 + $669b = Sprites_Sine.even_u97 + $66a3 = Sprites_Sine.sinetable_u97 $66e3 = AnimateEndOfExpBar $66ee = AnimateEndOfExpBar.load $66fb = AnimateEndOfExpBar.loop @@ -16271,10 +16271,10 @@ ROMX bank #51: $6671 = BattleAnim_IncAnonJumptableIndex $6677 = BattleAnim_Cosine $6679 = BattleAnim_Sine - $6684 = BattleAnim_Sine.negative_u121 - $668e = BattleAnim_Sine.apply_u121 - $669d = BattleAnim_Sine.multiply_u121 - $66a2 = BattleAnim_Sine.even_u121 + $6684 = BattleAnim_Sine.negative_u123 + $668e = BattleAnim_Sine.apply_u123 + $669d = BattleAnim_Sine.multiply_u123 + $66a2 = BattleAnim_Sine.even_u123 $66aa = BattleAnim_Sine_e $66b0 = BattleAnim_Cosine_e $66b6 = BattleAnim_AbsSinePrecise @@ -17120,14 +17120,14 @@ ROMX bank #56: $7511 = BillsPC_RefreshTextboxes.placeholder_string $7518 = BillsPC_RefreshTextboxes.Placeholder $751e = CopyBoxmonSpecies - $7545 = CopyBoxmonSpecies.loop_u125 - $7567 = CopyBoxmonSpecies.done_u125 + $7545 = CopyBoxmonSpecies.loop_u127 + $7567 = CopyBoxmonSpecies.done_u127 $7575 = CopyBoxmonSpecies.party - $7578 = CopyBoxmonSpecies.loop_u126 - $759a = CopyBoxmonSpecies.done_u126 + $7578 = CopyBoxmonSpecies.loop_u128 + $759a = CopyBoxmonSpecies.done_u128 $75a5 = CopyBoxmonSpecies.sBox - $75ad = CopyBoxmonSpecies.loop_u127 - $75cf = CopyBoxmonSpecies.done_u127 + $75ad = CopyBoxmonSpecies.loop_u129 + $75cf = CopyBoxmonSpecies.done_u129 $75dd = BillsPC_GetSelectedPokemonSpecies $75ef = BillsPC_UpdateSelectionCursor $75f9 = BillsPC_UpdateSelectionCursor.place_cursor @@ -41060,8 +41060,8 @@ WRAM0 bank #0: $ce64 = wMomBankDigitCursorPosition $ce64 = wTrainerCardBadgeFrameCounter $ce64 = wCreditsBorderFrame - $ce64 = wNamingScreenLetterCase $ce64 = wCardFlipCursorY + $ce64 = wNamingScreenLetterCase $ce64 = wPrevDexEntryJumptableIndex $ce64 = wPokegearCard $ce64 = wPackJumptableIndex diff --git a/pokesilver.sym b/pokesilver.sym index b46b9c05..becd9fab 100644 --- a/pokesilver.sym +++ b/pokesilver.sym @@ -11308,31 +11308,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_u70 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_u71 -23:405f SaveMenu_CopyTilemapAtOnce.loop_u72 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_u73 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_u74 -23:407a SaveMenu_CopyTilemapAtOnce.loop_u75 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_u76 -23:408c SaveMenu_CopyTilemapAtOnce.loop_u77 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_u78 -23:409e SaveMenu_CopyTilemapAtOnce.loop_u79 +23:404d SaveMenu_CopyTilemapAtOnce.loop_u72 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_u73 +23:405f SaveMenu_CopyTilemapAtOnce.loop_u74 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_u75 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_u76 +23:407a SaveMenu_CopyTilemapAtOnce.loop_u77 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_u78 +23:408c SaveMenu_CopyTilemapAtOnce.loop_u79 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_u80 +23:409e SaveMenu_CopyTilemapAtOnce.loop_u81 23:40b9 PhoneRing_CopyTilemapAtOnce 23:40d3 PhoneRing_CopyTilemapAtOnce.wait 23:40ee PhoneRing_CopyTilemapAtOnce.wait2 23:40fc PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack 23:410d PhoneRing_CopyTilemapAtOnce.loop -23:410e PhoneRing_CopyTilemapAtOnce.loop_u80 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_u81 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_u82 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_u83 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_u84 -23:413b PhoneRing_CopyTilemapAtOnce.loop_u85 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_u86 -23:414d PhoneRing_CopyTilemapAtOnce.loop_u87 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_u88 -23:415f PhoneRing_CopyTilemapAtOnce.loop_u89 +23:410e PhoneRing_CopyTilemapAtOnce.loop_u82 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_u83 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_u84 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_u85 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_u86 +23:413b PhoneRing_CopyTilemapAtOnce.loop_u87 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_u88 +23:414d PhoneRing_CopyTilemapAtOnce.loop_u89 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_u90 +23:415f PhoneRing_CopyTilemapAtOnce.loop_u91 23:417a _ResetClock 23:41bb _ResetClock.wrongpassword 23:41c2 _ResetClock.PasswordAskResetText @@ -11469,11 +11469,11 @@ 23:4979 WipeLYOverrides.wipe 23:497c WipeLYOverrides.loop 23:4981 StartTrainerBattle_DrawSineWave -23:498c StartTrainerBattle_DrawSineWave.negative_u90 -23:4996 StartTrainerBattle_DrawSineWave.apply_u90 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_u90 -23:49aa StartTrainerBattle_DrawSineWave.even_u90 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u90 +23:498c StartTrainerBattle_DrawSineWave.negative_u92 +23:4996 StartTrainerBattle_DrawSineWave.apply_u92 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_u92 +23:49aa StartTrainerBattle_DrawSineWave.even_u92 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u92 23:49f2 StartTrainerBattle_ZoomToBlack 23:49fb StartTrainerBattle_ZoomToBlack.loop 23:4a16 StartTrainerBattle_ZoomToBlack.done @@ -11843,11 +11843,11 @@ 23:6670 Sprites_Cosine 23:6670 UnusedSpriteAnimGFX.DeletedGFX 23:6672 Sprites_Sine -23:667d Sprites_Sine.negative_u95 -23:6687 Sprites_Sine.apply_u95 -23:6696 Sprites_Sine.multiply_u95 -23:669b Sprites_Sine.even_u95 -23:66a3 Sprites_Sine.sinetable_u95 +23:667d Sprites_Sine.negative_u97 +23:6687 Sprites_Sine.apply_u97 +23:6696 Sprites_Sine.multiply_u97 +23:669b Sprites_Sine.even_u97 +23:66a3 Sprites_Sine.sinetable_u97 23:66e3 AnimateEndOfExpBar 23:66ee AnimateEndOfExpBar.load 23:66fb AnimateEndOfExpBar.loop @@ -15984,10 +15984,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_u121 -33:668e BattleAnim_Sine.apply_u121 -33:669d BattleAnim_Sine.multiply_u121 -33:66a2 BattleAnim_Sine.even_u121 +33:6684 BattleAnim_Sine.negative_u123 +33:668e BattleAnim_Sine.apply_u123 +33:669d BattleAnim_Sine.multiply_u123 +33:66a2 BattleAnim_Sine.even_u123 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16810,14 +16810,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_u125 -38:7567 CopyBoxmonSpecies.done_u125 +38:7545 CopyBoxmonSpecies.loop_u127 +38:7567 CopyBoxmonSpecies.done_u127 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_u126 -38:759a CopyBoxmonSpecies.done_u126 +38:7578 CopyBoxmonSpecies.loop_u128 +38:759a CopyBoxmonSpecies.done_u128 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_u127 -38:75cf CopyBoxmonSpecies.done_u127 +38:75ad CopyBoxmonSpecies.loop_u129 +38:75cf CopyBoxmonSpecies.done_u129 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokesilver_debug.map b/pokesilver_debug.map index 2928ce05..9b63778d 100644 --- a/pokesilver_debug.map +++ b/pokesilver_debug.map @@ -11523,31 +11523,31 @@ ROMX bank #35: $402d = SaveMenu_CopyTilemapAtOnce.wait2 $403b = SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack $404c = SaveMenu_CopyTilemapAtOnce.loop - $404d = SaveMenu_CopyTilemapAtOnce.loop_u70 - $4056 = SaveMenu_CopyTilemapAtOnce.loop_u71 - $405f = SaveMenu_CopyTilemapAtOnce.loop_u72 - $4068 = SaveMenu_CopyTilemapAtOnce.loop_u73 - $4071 = SaveMenu_CopyTilemapAtOnce.loop_u74 - $407a = SaveMenu_CopyTilemapAtOnce.loop_u75 - $4083 = SaveMenu_CopyTilemapAtOnce.loop_u76 - $408c = SaveMenu_CopyTilemapAtOnce.loop_u77 - $4095 = SaveMenu_CopyTilemapAtOnce.loop_u78 - $409e = SaveMenu_CopyTilemapAtOnce.loop_u79 + $404d = SaveMenu_CopyTilemapAtOnce.loop_u72 + $4056 = SaveMenu_CopyTilemapAtOnce.loop_u73 + $405f = SaveMenu_CopyTilemapAtOnce.loop_u74 + $4068 = SaveMenu_CopyTilemapAtOnce.loop_u75 + $4071 = SaveMenu_CopyTilemapAtOnce.loop_u76 + $407a = SaveMenu_CopyTilemapAtOnce.loop_u77 + $4083 = SaveMenu_CopyTilemapAtOnce.loop_u78 + $408c = SaveMenu_CopyTilemapAtOnce.loop_u79 + $4095 = SaveMenu_CopyTilemapAtOnce.loop_u80 + $409e = SaveMenu_CopyTilemapAtOnce.loop_u81 $40b9 = PhoneRing_CopyTilemapAtOnce $40d3 = PhoneRing_CopyTilemapAtOnce.wait $40ee = PhoneRing_CopyTilemapAtOnce.wait2 $40fc = PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack $410d = PhoneRing_CopyTilemapAtOnce.loop - $410e = PhoneRing_CopyTilemapAtOnce.loop_u80 - $4117 = PhoneRing_CopyTilemapAtOnce.loop_u81 - $4120 = PhoneRing_CopyTilemapAtOnce.loop_u82 - $4129 = PhoneRing_CopyTilemapAtOnce.loop_u83 - $4132 = PhoneRing_CopyTilemapAtOnce.loop_u84 - $413b = PhoneRing_CopyTilemapAtOnce.loop_u85 - $4144 = PhoneRing_CopyTilemapAtOnce.loop_u86 - $414d = PhoneRing_CopyTilemapAtOnce.loop_u87 - $4156 = PhoneRing_CopyTilemapAtOnce.loop_u88 - $415f = PhoneRing_CopyTilemapAtOnce.loop_u89 + $410e = PhoneRing_CopyTilemapAtOnce.loop_u82 + $4117 = PhoneRing_CopyTilemapAtOnce.loop_u83 + $4120 = PhoneRing_CopyTilemapAtOnce.loop_u84 + $4129 = PhoneRing_CopyTilemapAtOnce.loop_u85 + $4132 = PhoneRing_CopyTilemapAtOnce.loop_u86 + $413b = PhoneRing_CopyTilemapAtOnce.loop_u87 + $4144 = PhoneRing_CopyTilemapAtOnce.loop_u88 + $414d = PhoneRing_CopyTilemapAtOnce.loop_u89 + $4156 = PhoneRing_CopyTilemapAtOnce.loop_u90 + $415f = PhoneRing_CopyTilemapAtOnce.loop_u91 $417a = _ResetClock $41bb = _ResetClock.wrongpassword $41c2 = _ResetClock.PasswordAskResetText @@ -11684,11 +11684,11 @@ ROMX bank #35: $4979 = WipeLYOverrides.wipe $497c = WipeLYOverrides.loop $4981 = StartTrainerBattle_DrawSineWave - $498c = StartTrainerBattle_DrawSineWave.negative_u90 - $4996 = StartTrainerBattle_DrawSineWave.apply_u90 - $49a5 = StartTrainerBattle_DrawSineWave.multiply_u90 - $49aa = StartTrainerBattle_DrawSineWave.even_u90 - $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u90 + $498c = StartTrainerBattle_DrawSineWave.negative_u92 + $4996 = StartTrainerBattle_DrawSineWave.apply_u92 + $49a5 = StartTrainerBattle_DrawSineWave.multiply_u92 + $49aa = StartTrainerBattle_DrawSineWave.even_u92 + $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u92 $49f2 = StartTrainerBattle_ZoomToBlack $49fb = StartTrainerBattle_ZoomToBlack.loop $4a16 = StartTrainerBattle_ZoomToBlack.done @@ -12058,11 +12058,11 @@ ROMX bank #35: $6670 = Sprites_Cosine $6670 = UnusedSpriteAnimGFX.DeletedGFX $6672 = Sprites_Sine - $667d = Sprites_Sine.negative_u95 - $6687 = Sprites_Sine.apply_u95 - $6696 = Sprites_Sine.multiply_u95 - $669b = Sprites_Sine.even_u95 - $66a3 = Sprites_Sine.sinetable_u95 + $667d = Sprites_Sine.negative_u97 + $6687 = Sprites_Sine.apply_u97 + $6696 = Sprites_Sine.multiply_u97 + $669b = Sprites_Sine.even_u97 + $66a3 = Sprites_Sine.sinetable_u97 $66e3 = AnimateEndOfExpBar $66ee = AnimateEndOfExpBar.load $66fb = AnimateEndOfExpBar.loop @@ -16272,10 +16272,10 @@ ROMX bank #51: $6671 = BattleAnim_IncAnonJumptableIndex $6677 = BattleAnim_Cosine $6679 = BattleAnim_Sine - $6684 = BattleAnim_Sine.negative_u121 - $668e = BattleAnim_Sine.apply_u121 - $669d = BattleAnim_Sine.multiply_u121 - $66a2 = BattleAnim_Sine.even_u121 + $6684 = BattleAnim_Sine.negative_u123 + $668e = BattleAnim_Sine.apply_u123 + $669d = BattleAnim_Sine.multiply_u123 + $66a2 = BattleAnim_Sine.even_u123 $66aa = BattleAnim_Sine_e $66b0 = BattleAnim_Cosine_e $66b6 = BattleAnim_AbsSinePrecise @@ -17121,14 +17121,14 @@ ROMX bank #56: $7511 = BillsPC_RefreshTextboxes.placeholder_string $7518 = BillsPC_RefreshTextboxes.Placeholder $751e = CopyBoxmonSpecies - $7545 = CopyBoxmonSpecies.loop_u125 - $7567 = CopyBoxmonSpecies.done_u125 + $7545 = CopyBoxmonSpecies.loop_u127 + $7567 = CopyBoxmonSpecies.done_u127 $7575 = CopyBoxmonSpecies.party - $7578 = CopyBoxmonSpecies.loop_u126 - $759a = CopyBoxmonSpecies.done_u126 + $7578 = CopyBoxmonSpecies.loop_u128 + $759a = CopyBoxmonSpecies.done_u128 $75a5 = CopyBoxmonSpecies.sBox - $75ad = CopyBoxmonSpecies.loop_u127 - $75cf = CopyBoxmonSpecies.done_u127 + $75ad = CopyBoxmonSpecies.loop_u129 + $75cf = CopyBoxmonSpecies.done_u129 $75dd = BillsPC_GetSelectedPokemonSpecies $75ef = BillsPC_UpdateSelectionCursor $75f9 = BillsPC_UpdateSelectionCursor.place_cursor @@ -33501,9 +33501,9 @@ SRAM bank #2: $a4e3 = sBox2Mon4Unused1 $a4e4 = sBox2Mon4Unused2 $a4e5 = sBox2Mon4Level - $a4e6 = sBox2Mon5 $a4e6 = sBox2Mon4BoxEnd $a4e6 = sBox2Mon5Species + $a4e6 = sBox2Mon5 $a4e7 = sBox2Mon5Item $a4e8 = sBox2Mon5Moves $a4ec = sBox2Mon5ID diff --git a/pokesilver_debug.sym b/pokesilver_debug.sym index 228a7cd4..dd479286 100644 --- a/pokesilver_debug.sym +++ b/pokesilver_debug.sym @@ -11309,31 +11309,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_u70 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_u71 -23:405f SaveMenu_CopyTilemapAtOnce.loop_u72 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_u73 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_u74 -23:407a SaveMenu_CopyTilemapAtOnce.loop_u75 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_u76 -23:408c SaveMenu_CopyTilemapAtOnce.loop_u77 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_u78 -23:409e SaveMenu_CopyTilemapAtOnce.loop_u79 +23:404d SaveMenu_CopyTilemapAtOnce.loop_u72 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_u73 +23:405f SaveMenu_CopyTilemapAtOnce.loop_u74 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_u75 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_u76 +23:407a SaveMenu_CopyTilemapAtOnce.loop_u77 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_u78 +23:408c SaveMenu_CopyTilemapAtOnce.loop_u79 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_u80 +23:409e SaveMenu_CopyTilemapAtOnce.loop_u81 23:40b9 PhoneRing_CopyTilemapAtOnce 23:40d3 PhoneRing_CopyTilemapAtOnce.wait 23:40ee PhoneRing_CopyTilemapAtOnce.wait2 23:40fc PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack 23:410d PhoneRing_CopyTilemapAtOnce.loop -23:410e PhoneRing_CopyTilemapAtOnce.loop_u80 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_u81 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_u82 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_u83 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_u84 -23:413b PhoneRing_CopyTilemapAtOnce.loop_u85 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_u86 -23:414d PhoneRing_CopyTilemapAtOnce.loop_u87 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_u88 -23:415f PhoneRing_CopyTilemapAtOnce.loop_u89 +23:410e PhoneRing_CopyTilemapAtOnce.loop_u82 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_u83 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_u84 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_u85 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_u86 +23:413b PhoneRing_CopyTilemapAtOnce.loop_u87 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_u88 +23:414d PhoneRing_CopyTilemapAtOnce.loop_u89 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_u90 +23:415f PhoneRing_CopyTilemapAtOnce.loop_u91 23:417a _ResetClock 23:41bb _ResetClock.wrongpassword 23:41c2 _ResetClock.PasswordAskResetText @@ -11470,11 +11470,11 @@ 23:4979 WipeLYOverrides.wipe 23:497c WipeLYOverrides.loop 23:4981 StartTrainerBattle_DrawSineWave -23:498c StartTrainerBattle_DrawSineWave.negative_u90 -23:4996 StartTrainerBattle_DrawSineWave.apply_u90 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_u90 -23:49aa StartTrainerBattle_DrawSineWave.even_u90 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u90 +23:498c StartTrainerBattle_DrawSineWave.negative_u92 +23:4996 StartTrainerBattle_DrawSineWave.apply_u92 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_u92 +23:49aa StartTrainerBattle_DrawSineWave.even_u92 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u92 23:49f2 StartTrainerBattle_ZoomToBlack 23:49fb StartTrainerBattle_ZoomToBlack.loop 23:4a16 StartTrainerBattle_ZoomToBlack.done @@ -11844,11 +11844,11 @@ 23:6670 Sprites_Cosine 23:6670 UnusedSpriteAnimGFX.DeletedGFX 23:6672 Sprites_Sine -23:667d Sprites_Sine.negative_u95 -23:6687 Sprites_Sine.apply_u95 -23:6696 Sprites_Sine.multiply_u95 -23:669b Sprites_Sine.even_u95 -23:66a3 Sprites_Sine.sinetable_u95 +23:667d Sprites_Sine.negative_u97 +23:6687 Sprites_Sine.apply_u97 +23:6696 Sprites_Sine.multiply_u97 +23:669b Sprites_Sine.even_u97 +23:66a3 Sprites_Sine.sinetable_u97 23:66e3 AnimateEndOfExpBar 23:66ee AnimateEndOfExpBar.load 23:66fb AnimateEndOfExpBar.loop @@ -15985,10 +15985,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_u121 -33:668e BattleAnim_Sine.apply_u121 -33:669d BattleAnim_Sine.multiply_u121 -33:66a2 BattleAnim_Sine.even_u121 +33:6684 BattleAnim_Sine.negative_u123 +33:668e BattleAnim_Sine.apply_u123 +33:669d BattleAnim_Sine.multiply_u123 +33:66a2 BattleAnim_Sine.even_u123 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16811,14 +16811,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_u125 -38:7567 CopyBoxmonSpecies.done_u125 +38:7545 CopyBoxmonSpecies.loop_u127 +38:7567 CopyBoxmonSpecies.done_u127 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_u126 -38:759a CopyBoxmonSpecies.done_u126 +38:7578 CopyBoxmonSpecies.loop_u128 +38:759a CopyBoxmonSpecies.done_u128 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_u127 -38:75cf CopyBoxmonSpecies.done_u127 +38:75ad CopyBoxmonSpecies.loop_u129 +38:75cf CopyBoxmonSpecies.done_u129 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokesilver_vc.map b/pokesilver_vc.map index 3d873955..bc9e8c10 100644 --- a/pokesilver_vc.map +++ b/pokesilver_vc.map @@ -11581,31 +11581,31 @@ ROMX bank #35: $402d = SaveMenu_CopyTilemapAtOnce.wait2 $403b = SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack $404c = SaveMenu_CopyTilemapAtOnce.loop - $404d = SaveMenu_CopyTilemapAtOnce.loop_u70 - $4056 = SaveMenu_CopyTilemapAtOnce.loop_u71 - $405f = SaveMenu_CopyTilemapAtOnce.loop_u72 - $4068 = SaveMenu_CopyTilemapAtOnce.loop_u73 - $4071 = SaveMenu_CopyTilemapAtOnce.loop_u74 - $407a = SaveMenu_CopyTilemapAtOnce.loop_u75 - $4083 = SaveMenu_CopyTilemapAtOnce.loop_u76 - $408c = SaveMenu_CopyTilemapAtOnce.loop_u77 - $4095 = SaveMenu_CopyTilemapAtOnce.loop_u78 - $409e = SaveMenu_CopyTilemapAtOnce.loop_u79 + $404d = SaveMenu_CopyTilemapAtOnce.loop_u72 + $4056 = SaveMenu_CopyTilemapAtOnce.loop_u73 + $405f = SaveMenu_CopyTilemapAtOnce.loop_u74 + $4068 = SaveMenu_CopyTilemapAtOnce.loop_u75 + $4071 = SaveMenu_CopyTilemapAtOnce.loop_u76 + $407a = SaveMenu_CopyTilemapAtOnce.loop_u77 + $4083 = SaveMenu_CopyTilemapAtOnce.loop_u78 + $408c = SaveMenu_CopyTilemapAtOnce.loop_u79 + $4095 = SaveMenu_CopyTilemapAtOnce.loop_u80 + $409e = SaveMenu_CopyTilemapAtOnce.loop_u81 $40b9 = PhoneRing_CopyTilemapAtOnce $40d3 = PhoneRing_CopyTilemapAtOnce.wait $40ee = PhoneRing_CopyTilemapAtOnce.wait2 $40fc = PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack $410d = PhoneRing_CopyTilemapAtOnce.loop - $410e = PhoneRing_CopyTilemapAtOnce.loop_u80 - $4117 = PhoneRing_CopyTilemapAtOnce.loop_u81 - $4120 = PhoneRing_CopyTilemapAtOnce.loop_u82 - $4129 = PhoneRing_CopyTilemapAtOnce.loop_u83 - $4132 = PhoneRing_CopyTilemapAtOnce.loop_u84 - $413b = PhoneRing_CopyTilemapAtOnce.loop_u85 - $4144 = PhoneRing_CopyTilemapAtOnce.loop_u86 - $414d = PhoneRing_CopyTilemapAtOnce.loop_u87 - $4156 = PhoneRing_CopyTilemapAtOnce.loop_u88 - $415f = PhoneRing_CopyTilemapAtOnce.loop_u89 + $410e = PhoneRing_CopyTilemapAtOnce.loop_u82 + $4117 = PhoneRing_CopyTilemapAtOnce.loop_u83 + $4120 = PhoneRing_CopyTilemapAtOnce.loop_u84 + $4129 = PhoneRing_CopyTilemapAtOnce.loop_u85 + $4132 = PhoneRing_CopyTilemapAtOnce.loop_u86 + $413b = PhoneRing_CopyTilemapAtOnce.loop_u87 + $4144 = PhoneRing_CopyTilemapAtOnce.loop_u88 + $414d = PhoneRing_CopyTilemapAtOnce.loop_u89 + $4156 = PhoneRing_CopyTilemapAtOnce.loop_u90 + $415f = PhoneRing_CopyTilemapAtOnce.loop_u91 $417a = _ResetClock $41bb = _ResetClock.wrongpassword $41c2 = _ResetClock.PasswordAskResetText @@ -11747,11 +11747,11 @@ ROMX bank #35: $4979 = WipeLYOverrides.wipe $497c = WipeLYOverrides.loop $4981 = StartTrainerBattle_DrawSineWave - $498c = StartTrainerBattle_DrawSineWave.negative_u90 - $4996 = StartTrainerBattle_DrawSineWave.apply_u90 - $49a5 = StartTrainerBattle_DrawSineWave.multiply_u90 - $49aa = StartTrainerBattle_DrawSineWave.even_u90 - $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u90 + $498c = StartTrainerBattle_DrawSineWave.negative_u92 + $4996 = StartTrainerBattle_DrawSineWave.apply_u92 + $49a5 = StartTrainerBattle_DrawSineWave.multiply_u92 + $49aa = StartTrainerBattle_DrawSineWave.even_u92 + $49b2 = StartTrainerBattle_DrawSineWave.sinetable_u92 $49f2 = StartTrainerBattle_ZoomToBlack $49f2 = StartTrainerBattle_ZoomToBlack.VC_Stop_reducing_battle_transition_flashing_ZoomToBlack $49fb = StartTrainerBattle_ZoomToBlack.loop @@ -12122,11 +12122,11 @@ ROMX bank #35: $6670 = Sprites_Cosine $6670 = UnusedSpriteAnimGFX.DeletedGFX $6672 = Sprites_Sine - $667d = Sprites_Sine.negative_u95 - $6687 = Sprites_Sine.apply_u95 - $6696 = Sprites_Sine.multiply_u95 - $669b = Sprites_Sine.even_u95 - $66a3 = Sprites_Sine.sinetable_u95 + $667d = Sprites_Sine.negative_u97 + $6687 = Sprites_Sine.apply_u97 + $6696 = Sprites_Sine.multiply_u97 + $669b = Sprites_Sine.even_u97 + $66a3 = Sprites_Sine.sinetable_u97 $66e3 = AnimateEndOfExpBar $66ee = AnimateEndOfExpBar.load $66fb = AnimateEndOfExpBar.loop @@ -16342,10 +16342,10 @@ ROMX bank #51: $6671 = BattleAnim_IncAnonJumptableIndex $6677 = BattleAnim_Cosine $6679 = BattleAnim_Sine - $6684 = BattleAnim_Sine.negative_u121 - $668e = BattleAnim_Sine.apply_u121 - $669d = BattleAnim_Sine.multiply_u121 - $66a2 = BattleAnim_Sine.even_u121 + $6684 = BattleAnim_Sine.negative_u123 + $668e = BattleAnim_Sine.apply_u123 + $669d = BattleAnim_Sine.multiply_u123 + $66a2 = BattleAnim_Sine.even_u123 $66aa = BattleAnim_Sine_e $66b0 = BattleAnim_Cosine_e $66b6 = BattleAnim_AbsSinePrecise @@ -17191,14 +17191,14 @@ ROMX bank #56: $7511 = BillsPC_RefreshTextboxes.placeholder_string $7518 = BillsPC_RefreshTextboxes.Placeholder $751e = CopyBoxmonSpecies - $7545 = CopyBoxmonSpecies.loop_u125 - $7567 = CopyBoxmonSpecies.done_u125 + $7545 = CopyBoxmonSpecies.loop_u127 + $7567 = CopyBoxmonSpecies.done_u127 $7575 = CopyBoxmonSpecies.party - $7578 = CopyBoxmonSpecies.loop_u126 - $759a = CopyBoxmonSpecies.done_u126 + $7578 = CopyBoxmonSpecies.loop_u128 + $759a = CopyBoxmonSpecies.done_u128 $75a5 = CopyBoxmonSpecies.sBox - $75ad = CopyBoxmonSpecies.loop_u127 - $75cf = CopyBoxmonSpecies.done_u127 + $75ad = CopyBoxmonSpecies.loop_u129 + $75cf = CopyBoxmonSpecies.done_u129 $75dd = BillsPC_GetSelectedPokemonSpecies $75ef = BillsPC_UpdateSelectionCursor $75f9 = BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokesilver_vc.sym b/pokesilver_vc.sym index 88dd7363..1c40a2c2 100644 --- a/pokesilver_vc.sym +++ b/pokesilver_vc.sym @@ -11367,31 +11367,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_u70 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_u71 -23:405f SaveMenu_CopyTilemapAtOnce.loop_u72 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_u73 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_u74 -23:407a SaveMenu_CopyTilemapAtOnce.loop_u75 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_u76 -23:408c SaveMenu_CopyTilemapAtOnce.loop_u77 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_u78 -23:409e SaveMenu_CopyTilemapAtOnce.loop_u79 +23:404d SaveMenu_CopyTilemapAtOnce.loop_u72 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_u73 +23:405f SaveMenu_CopyTilemapAtOnce.loop_u74 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_u75 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_u76 +23:407a SaveMenu_CopyTilemapAtOnce.loop_u77 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_u78 +23:408c SaveMenu_CopyTilemapAtOnce.loop_u79 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_u80 +23:409e SaveMenu_CopyTilemapAtOnce.loop_u81 23:40b9 PhoneRing_CopyTilemapAtOnce 23:40d3 PhoneRing_CopyTilemapAtOnce.wait 23:40ee PhoneRing_CopyTilemapAtOnce.wait2 23:40fc PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack 23:410d PhoneRing_CopyTilemapAtOnce.loop -23:410e PhoneRing_CopyTilemapAtOnce.loop_u80 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_u81 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_u82 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_u83 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_u84 -23:413b PhoneRing_CopyTilemapAtOnce.loop_u85 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_u86 -23:414d PhoneRing_CopyTilemapAtOnce.loop_u87 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_u88 -23:415f PhoneRing_CopyTilemapAtOnce.loop_u89 +23:410e PhoneRing_CopyTilemapAtOnce.loop_u82 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_u83 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_u84 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_u85 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_u86 +23:413b PhoneRing_CopyTilemapAtOnce.loop_u87 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_u88 +23:414d PhoneRing_CopyTilemapAtOnce.loop_u89 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_u90 +23:415f PhoneRing_CopyTilemapAtOnce.loop_u91 23:417a _ResetClock 23:41bb _ResetClock.wrongpassword 23:41c2 _ResetClock.PasswordAskResetText @@ -11533,11 +11533,11 @@ 23:4979 WipeLYOverrides.wipe 23:497c WipeLYOverrides.loop 23:4981 StartTrainerBattle_DrawSineWave -23:498c StartTrainerBattle_DrawSineWave.negative_u90 -23:4996 StartTrainerBattle_DrawSineWave.apply_u90 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_u90 -23:49aa StartTrainerBattle_DrawSineWave.even_u90 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u90 +23:498c StartTrainerBattle_DrawSineWave.negative_u92 +23:4996 StartTrainerBattle_DrawSineWave.apply_u92 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_u92 +23:49aa StartTrainerBattle_DrawSineWave.even_u92 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_u92 23:49f2 StartTrainerBattle_ZoomToBlack 23:49f2 StartTrainerBattle_ZoomToBlack.VC_Stop_reducing_battle_transition_flashing_ZoomToBlack 23:49fb StartTrainerBattle_ZoomToBlack.loop @@ -11908,11 +11908,11 @@ 23:6670 Sprites_Cosine 23:6670 UnusedSpriteAnimGFX.DeletedGFX 23:6672 Sprites_Sine -23:667d Sprites_Sine.negative_u95 -23:6687 Sprites_Sine.apply_u95 -23:6696 Sprites_Sine.multiply_u95 -23:669b Sprites_Sine.even_u95 -23:66a3 Sprites_Sine.sinetable_u95 +23:667d Sprites_Sine.negative_u97 +23:6687 Sprites_Sine.apply_u97 +23:6696 Sprites_Sine.multiply_u97 +23:669b Sprites_Sine.even_u97 +23:66a3 Sprites_Sine.sinetable_u97 23:66e3 AnimateEndOfExpBar 23:66ee AnimateEndOfExpBar.load 23:66fb AnimateEndOfExpBar.loop @@ -16055,10 +16055,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_u121 -33:668e BattleAnim_Sine.apply_u121 -33:669d BattleAnim_Sine.multiply_u121 -33:66a2 BattleAnim_Sine.even_u121 +33:6684 BattleAnim_Sine.negative_u123 +33:668e BattleAnim_Sine.apply_u123 +33:669d BattleAnim_Sine.multiply_u123 +33:66a2 BattleAnim_Sine.even_u123 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16881,14 +16881,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_u125 -38:7567 CopyBoxmonSpecies.done_u125 +38:7545 CopyBoxmonSpecies.loop_u127 +38:7567 CopyBoxmonSpecies.done_u127 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_u126 -38:759a CopyBoxmonSpecies.done_u126 +38:7578 CopyBoxmonSpecies.loop_u128 +38:759a CopyBoxmonSpecies.done_u128 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_u127 -38:75cf CopyBoxmonSpecies.done_u127 +38:75ad CopyBoxmonSpecies.loop_u129 +38:75cf CopyBoxmonSpecies.done_u129 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor