diff --git a/pokegold.sym b/pokegold.sym index 3835cc23..c45bd240 100644 --- a/pokegold.sym +++ b/pokegold.sym @@ -271,7 +271,7 @@ 00:0f7e DummyChar 00:0f7f NextChar 00:0f83 CheckDict -00:1014 CheckDict.__7947 +00:1014 CheckDict.__7948 00:1030 CheckDict.diacritic 00:1037 CheckDict.not_diacritic 00:1047 CheckDict.hiragana_dakuten @@ -596,9 +596,9 @@ 00:1ff3 LoadMetatiles.row 00:1ff7 LoadMetatiles.col 00:2000 LoadMetatiles.ok -00:2026 LoadMetatiles.next_8134 -00:2039 LoadMetatiles.next_8139 -00:204c LoadMetatiles.next_8144 +00:2026 LoadMetatiles.next_8135 +00:2039 LoadMetatiles.next_8140 +00:204c LoadMetatiles.next_8145 00:2073 LoadMetatiles.ok2 00:2078 ReturnToMapFromSubmenu 00:2086 HandleNewMap @@ -989,16 +989,16 @@ 00:34ba CopyTilemapAtOnce.wait2 00:34c8 CopyTilemapAtOnce.CopyBGMapViaStack 00:34d9 CopyTilemapAtOnce.loop -00:34da CopyTilemapAtOnce.loop_8226 -00:34e3 CopyTilemapAtOnce.loop_8227 -00:34ec CopyTilemapAtOnce.loop_8228 -00:34f5 CopyTilemapAtOnce.loop_8229 -00:34fe CopyTilemapAtOnce.loop_8230 -00:3507 CopyTilemapAtOnce.loop_8231 -00:3510 CopyTilemapAtOnce.loop_8232 -00:3519 CopyTilemapAtOnce.loop_8233 -00:3522 CopyTilemapAtOnce.loop_8234 -00:352b CopyTilemapAtOnce.loop_8235 +00:34da CopyTilemapAtOnce.loop_8227 +00:34e3 CopyTilemapAtOnce.loop_8228 +00:34ec CopyTilemapAtOnce.loop_8229 +00:34f5 CopyTilemapAtOnce.loop_8230 +00:34fe CopyTilemapAtOnce.loop_8231 +00:3507 CopyTilemapAtOnce.loop_8232 +00:3510 CopyTilemapAtOnce.loop_8233 +00:3519 CopyTilemapAtOnce.loop_8234 +00:3522 CopyTilemapAtOnce.loop_8235 +00:352b CopyTilemapAtOnce.loop_8236 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -2084,11 +2084,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13213 -02:4adf _Sine.apply_13213 -02:4aee _Sine.multiply_13213 -02:4af3 _Sine.even_13213 -02:4afb _Sine.sinetable_13213 +02:4ad5 _Sine.negative_13214 +02:4adf _Sine.apply_13214 +02:4aee _Sine.multiply_13214 +02:4af3 _Sine.even_13214 +02:4afb _Sine.sinetable_13214 02:4b3b GetPredefPointer 02:4b5b PredefPointers 02:4b5b LearnMovePredef @@ -11310,31 +11310,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_42000 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_42001 -23:405f SaveMenu_CopyTilemapAtOnce.loop_42002 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_42003 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_42004 -23:407a SaveMenu_CopyTilemapAtOnce.loop_42005 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_42006 -23:408c SaveMenu_CopyTilemapAtOnce.loop_42007 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_42008 -23:409e SaveMenu_CopyTilemapAtOnce.loop_42009 +23:404d SaveMenu_CopyTilemapAtOnce.loop_42050 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_42051 +23:405f SaveMenu_CopyTilemapAtOnce.loop_42052 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_42053 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_42054 +23:407a SaveMenu_CopyTilemapAtOnce.loop_42055 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_42056 +23:408c SaveMenu_CopyTilemapAtOnce.loop_42057 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_42058 +23:409e SaveMenu_CopyTilemapAtOnce.loop_42059 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_42012 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_42013 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_42014 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_42015 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_42016 -23:413b PhoneRing_CopyTilemapAtOnce.loop_42017 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_42018 -23:414d PhoneRing_CopyTilemapAtOnce.loop_42019 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_42020 -23:415f PhoneRing_CopyTilemapAtOnce.loop_42021 +23:410e PhoneRing_CopyTilemapAtOnce.loop_42062 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_42063 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_42064 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_42065 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_42066 +23:413b PhoneRing_CopyTilemapAtOnce.loop_42067 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_42068 +23:414d PhoneRing_CopyTilemapAtOnce.loop_42069 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_42070 +23:415f PhoneRing_CopyTilemapAtOnce.loop_42071 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_42441 -23:4996 StartTrainerBattle_DrawSineWave.apply_42441 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_42441 -23:49aa StartTrainerBattle_DrawSineWave.even_42441 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42441 +23:498c StartTrainerBattle_DrawSineWave.negative_42491 +23:4996 StartTrainerBattle_DrawSineWave.apply_42491 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_42491 +23:49aa StartTrainerBattle_DrawSineWave.even_42491 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42491 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_43407 -23:66a1 Sprites_Sine.apply_43407 -23:66b0 Sprites_Sine.multiply_43407 -23:66b5 Sprites_Sine.even_43407 -23:66bd Sprites_Sine.sinetable_43407 +23:6697 Sprites_Sine.negative_43457 +23:66a1 Sprites_Sine.apply_43457 +23:66b0 Sprites_Sine.multiply_43457 +23:66b5 Sprites_Sine.even_43457 +23:66bd Sprites_Sine.sinetable_43457 23:66fd AnimateEndOfExpBar 23:6708 AnimateEndOfExpBar.load 23:6715 AnimateEndOfExpBar.loop @@ -15988,10 +15988,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_49332 -33:668e BattleAnim_Sine.apply_49332 -33:669d BattleAnim_Sine.multiply_49332 -33:66a2 BattleAnim_Sine.even_49332 +33:6684 BattleAnim_Sine.negative_49382 +33:668e BattleAnim_Sine.apply_49382 +33:669d BattleAnim_Sine.multiply_49382 +33:66a2 BattleAnim_Sine.even_49382 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16814,14 +16814,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_52180 -38:7567 CopyBoxmonSpecies.done_52180 +38:7545 CopyBoxmonSpecies.loop_52230 +38:7567 CopyBoxmonSpecies.done_52230 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_52181 -38:759a CopyBoxmonSpecies.done_52181 +38:7578 CopyBoxmonSpecies.loop_52231 +38:759a CopyBoxmonSpecies.done_52231 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_52182 -38:75cf CopyBoxmonSpecies.done_52182 +38:75ad CopyBoxmonSpecies.loop_52232 +38:75cf CopyBoxmonSpecies.done_52232 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokegold_debug.sym b/pokegold_debug.sym index 9d8ade12..ff540bbd 100644 --- a/pokegold_debug.sym +++ b/pokegold_debug.sym @@ -271,7 +271,7 @@ 00:0f7e DummyChar 00:0f7f NextChar 00:0f83 CheckDict -00:1014 CheckDict.__7947 +00:1014 CheckDict.__7948 00:1030 CheckDict.diacritic 00:1037 CheckDict.not_diacritic 00:1047 CheckDict.hiragana_dakuten @@ -596,9 +596,9 @@ 00:1ff3 LoadMetatiles.row 00:1ff7 LoadMetatiles.col 00:2000 LoadMetatiles.ok -00:2026 LoadMetatiles.next_8134 -00:2039 LoadMetatiles.next_8139 -00:204c LoadMetatiles.next_8144 +00:2026 LoadMetatiles.next_8135 +00:2039 LoadMetatiles.next_8140 +00:204c LoadMetatiles.next_8145 00:2073 LoadMetatiles.ok2 00:2078 ReturnToMapFromSubmenu 00:2086 HandleNewMap @@ -989,16 +989,16 @@ 00:34ba CopyTilemapAtOnce.wait2 00:34c8 CopyTilemapAtOnce.CopyBGMapViaStack 00:34d9 CopyTilemapAtOnce.loop -00:34da CopyTilemapAtOnce.loop_8226 -00:34e3 CopyTilemapAtOnce.loop_8227 -00:34ec CopyTilemapAtOnce.loop_8228 -00:34f5 CopyTilemapAtOnce.loop_8229 -00:34fe CopyTilemapAtOnce.loop_8230 -00:3507 CopyTilemapAtOnce.loop_8231 -00:3510 CopyTilemapAtOnce.loop_8232 -00:3519 CopyTilemapAtOnce.loop_8233 -00:3522 CopyTilemapAtOnce.loop_8234 -00:352b CopyTilemapAtOnce.loop_8235 +00:34da CopyTilemapAtOnce.loop_8227 +00:34e3 CopyTilemapAtOnce.loop_8228 +00:34ec CopyTilemapAtOnce.loop_8229 +00:34f5 CopyTilemapAtOnce.loop_8230 +00:34fe CopyTilemapAtOnce.loop_8231 +00:3507 CopyTilemapAtOnce.loop_8232 +00:3510 CopyTilemapAtOnce.loop_8233 +00:3519 CopyTilemapAtOnce.loop_8234 +00:3522 CopyTilemapAtOnce.loop_8235 +00:352b CopyTilemapAtOnce.loop_8236 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -2085,11 +2085,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13215 -02:4adf _Sine.apply_13215 -02:4aee _Sine.multiply_13215 -02:4af3 _Sine.even_13215 -02:4afb _Sine.sinetable_13215 +02:4ad5 _Sine.negative_13216 +02:4adf _Sine.apply_13216 +02:4aee _Sine.multiply_13216 +02:4af3 _Sine.even_13216 +02:4afb _Sine.sinetable_13216 02:4b3b GetPredefPointer 02:4b5b PredefPointers 02:4b5b LearnMovePredef @@ -11311,31 +11311,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_42002 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_42003 -23:405f SaveMenu_CopyTilemapAtOnce.loop_42004 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_42005 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_42006 -23:407a SaveMenu_CopyTilemapAtOnce.loop_42007 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_42008 -23:408c SaveMenu_CopyTilemapAtOnce.loop_42009 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_42010 -23:409e SaveMenu_CopyTilemapAtOnce.loop_42011 +23:404d SaveMenu_CopyTilemapAtOnce.loop_42052 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_42053 +23:405f SaveMenu_CopyTilemapAtOnce.loop_42054 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_42055 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_42056 +23:407a SaveMenu_CopyTilemapAtOnce.loop_42057 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_42058 +23:408c SaveMenu_CopyTilemapAtOnce.loop_42059 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_42060 +23:409e SaveMenu_CopyTilemapAtOnce.loop_42061 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_42014 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_42015 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_42016 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_42017 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_42018 -23:413b PhoneRing_CopyTilemapAtOnce.loop_42019 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_42020 -23:414d PhoneRing_CopyTilemapAtOnce.loop_42021 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_42022 -23:415f PhoneRing_CopyTilemapAtOnce.loop_42023 +23:410e PhoneRing_CopyTilemapAtOnce.loop_42064 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_42065 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_42066 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_42067 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_42068 +23:413b PhoneRing_CopyTilemapAtOnce.loop_42069 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_42070 +23:414d PhoneRing_CopyTilemapAtOnce.loop_42071 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_42072 +23:415f PhoneRing_CopyTilemapAtOnce.loop_42073 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_42443 -23:4996 StartTrainerBattle_DrawSineWave.apply_42443 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_42443 -23:49aa StartTrainerBattle_DrawSineWave.even_42443 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42443 +23:498c StartTrainerBattle_DrawSineWave.negative_42493 +23:4996 StartTrainerBattle_DrawSineWave.apply_42493 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_42493 +23:49aa StartTrainerBattle_DrawSineWave.even_42493 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42493 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_43409 -23:66a1 Sprites_Sine.apply_43409 -23:66b0 Sprites_Sine.multiply_43409 -23:66b5 Sprites_Sine.even_43409 -23:66bd Sprites_Sine.sinetable_43409 +23:6697 Sprites_Sine.negative_43459 +23:66a1 Sprites_Sine.apply_43459 +23:66b0 Sprites_Sine.multiply_43459 +23:66b5 Sprites_Sine.even_43459 +23:66bd Sprites_Sine.sinetable_43459 23:66fd AnimateEndOfExpBar 23:6708 AnimateEndOfExpBar.load 23:6715 AnimateEndOfExpBar.loop @@ -15989,10 +15989,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_49334 -33:668e BattleAnim_Sine.apply_49334 -33:669d BattleAnim_Sine.multiply_49334 -33:66a2 BattleAnim_Sine.even_49334 +33:6684 BattleAnim_Sine.negative_49384 +33:668e BattleAnim_Sine.apply_49384 +33:669d BattleAnim_Sine.multiply_49384 +33:66a2 BattleAnim_Sine.even_49384 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16815,14 +16815,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_52182 -38:7567 CopyBoxmonSpecies.done_52182 +38:7545 CopyBoxmonSpecies.loop_52232 +38:7567 CopyBoxmonSpecies.done_52232 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_52183 -38:759a CopyBoxmonSpecies.done_52183 +38:7578 CopyBoxmonSpecies.loop_52233 +38:759a CopyBoxmonSpecies.done_52233 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_52184 -38:75cf CopyBoxmonSpecies.done_52184 +38:75ad CopyBoxmonSpecies.loop_52234 +38:75cf CopyBoxmonSpecies.done_52234 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokesilver.sym b/pokesilver.sym index 8c2df6cb..2d2fdc42 100644 --- a/pokesilver.sym +++ b/pokesilver.sym @@ -271,7 +271,7 @@ 00:0f7e DummyChar 00:0f7f NextChar 00:0f83 CheckDict -00:1014 CheckDict.__7947 +00:1014 CheckDict.__7948 00:1030 CheckDict.diacritic 00:1037 CheckDict.not_diacritic 00:1047 CheckDict.hiragana_dakuten @@ -596,9 +596,9 @@ 00:1ff3 LoadMetatiles.row 00:1ff7 LoadMetatiles.col 00:2000 LoadMetatiles.ok -00:2026 LoadMetatiles.next_8134 -00:2039 LoadMetatiles.next_8139 -00:204c LoadMetatiles.next_8144 +00:2026 LoadMetatiles.next_8135 +00:2039 LoadMetatiles.next_8140 +00:204c LoadMetatiles.next_8145 00:2073 LoadMetatiles.ok2 00:2078 ReturnToMapFromSubmenu 00:2086 HandleNewMap @@ -989,16 +989,16 @@ 00:34ba CopyTilemapAtOnce.wait2 00:34c8 CopyTilemapAtOnce.CopyBGMapViaStack 00:34d9 CopyTilemapAtOnce.loop -00:34da CopyTilemapAtOnce.loop_8226 -00:34e3 CopyTilemapAtOnce.loop_8227 -00:34ec CopyTilemapAtOnce.loop_8228 -00:34f5 CopyTilemapAtOnce.loop_8229 -00:34fe CopyTilemapAtOnce.loop_8230 -00:3507 CopyTilemapAtOnce.loop_8231 -00:3510 CopyTilemapAtOnce.loop_8232 -00:3519 CopyTilemapAtOnce.loop_8233 -00:3522 CopyTilemapAtOnce.loop_8234 -00:352b CopyTilemapAtOnce.loop_8235 +00:34da CopyTilemapAtOnce.loop_8227 +00:34e3 CopyTilemapAtOnce.loop_8228 +00:34ec CopyTilemapAtOnce.loop_8229 +00:34f5 CopyTilemapAtOnce.loop_8230 +00:34fe CopyTilemapAtOnce.loop_8231 +00:3507 CopyTilemapAtOnce.loop_8232 +00:3510 CopyTilemapAtOnce.loop_8233 +00:3519 CopyTilemapAtOnce.loop_8234 +00:3522 CopyTilemapAtOnce.loop_8235 +00:352b CopyTilemapAtOnce.loop_8236 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -2083,11 +2083,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13185 -02:4adf _Sine.apply_13185 -02:4aee _Sine.multiply_13185 -02:4af3 _Sine.even_13185 -02:4afb _Sine.sinetable_13185 +02:4ad5 _Sine.negative_13186 +02:4adf _Sine.apply_13186 +02:4aee _Sine.multiply_13186 +02:4af3 _Sine.even_13186 +02:4afb _Sine.sinetable_13186 02:4b3b GetPredefPointer 02:4b5b PredefPointers 02:4b5b LearnMovePredef @@ -11308,31 +11308,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_41972 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_41973 -23:405f SaveMenu_CopyTilemapAtOnce.loop_41974 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_41975 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_41976 -23:407a SaveMenu_CopyTilemapAtOnce.loop_41977 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_41978 -23:408c SaveMenu_CopyTilemapAtOnce.loop_41979 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_41980 -23:409e SaveMenu_CopyTilemapAtOnce.loop_41981 +23:404d SaveMenu_CopyTilemapAtOnce.loop_42022 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_42023 +23:405f SaveMenu_CopyTilemapAtOnce.loop_42024 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_42025 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_42026 +23:407a SaveMenu_CopyTilemapAtOnce.loop_42027 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_42028 +23:408c SaveMenu_CopyTilemapAtOnce.loop_42029 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_42030 +23:409e SaveMenu_CopyTilemapAtOnce.loop_42031 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_41984 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_41985 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_41986 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_41987 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_41988 -23:413b PhoneRing_CopyTilemapAtOnce.loop_41989 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_41990 -23:414d PhoneRing_CopyTilemapAtOnce.loop_41991 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_41992 -23:415f PhoneRing_CopyTilemapAtOnce.loop_41993 +23:410e PhoneRing_CopyTilemapAtOnce.loop_42034 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_42035 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_42036 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_42037 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_42038 +23:413b PhoneRing_CopyTilemapAtOnce.loop_42039 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_42040 +23:414d PhoneRing_CopyTilemapAtOnce.loop_42041 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_42042 +23:415f PhoneRing_CopyTilemapAtOnce.loop_42043 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_42413 -23:4996 StartTrainerBattle_DrawSineWave.apply_42413 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_42413 -23:49aa StartTrainerBattle_DrawSineWave.even_42413 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42413 +23:498c StartTrainerBattle_DrawSineWave.negative_42463 +23:4996 StartTrainerBattle_DrawSineWave.apply_42463 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_42463 +23:49aa StartTrainerBattle_DrawSineWave.even_42463 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42463 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_43381 -23:6687 Sprites_Sine.apply_43381 -23:6696 Sprites_Sine.multiply_43381 -23:669b Sprites_Sine.even_43381 -23:66a3 Sprites_Sine.sinetable_43381 +23:667d Sprites_Sine.negative_43431 +23:6687 Sprites_Sine.apply_43431 +23:6696 Sprites_Sine.multiply_43431 +23:669b Sprites_Sine.even_43431 +23:66a3 Sprites_Sine.sinetable_43431 23:66e3 AnimateEndOfExpBar 23:66ee AnimateEndOfExpBar.load 23:66fb AnimateEndOfExpBar.loop @@ -15987,10 +15987,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_49306 -33:668e BattleAnim_Sine.apply_49306 -33:669d BattleAnim_Sine.multiply_49306 -33:66a2 BattleAnim_Sine.even_49306 +33:6684 BattleAnim_Sine.negative_49356 +33:668e BattleAnim_Sine.apply_49356 +33:669d BattleAnim_Sine.multiply_49356 +33:66a2 BattleAnim_Sine.even_49356 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16813,14 +16813,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_52154 -38:7567 CopyBoxmonSpecies.done_52154 +38:7545 CopyBoxmonSpecies.loop_52204 +38:7567 CopyBoxmonSpecies.done_52204 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_52155 -38:759a CopyBoxmonSpecies.done_52155 +38:7578 CopyBoxmonSpecies.loop_52205 +38:759a CopyBoxmonSpecies.done_52205 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_52156 -38:75cf CopyBoxmonSpecies.done_52156 +38:75ad CopyBoxmonSpecies.loop_52206 +38:75cf CopyBoxmonSpecies.done_52206 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokesilver_debug.sym b/pokesilver_debug.sym index b0ab828d..090455bc 100644 --- a/pokesilver_debug.sym +++ b/pokesilver_debug.sym @@ -271,7 +271,7 @@ 00:0f7e DummyChar 00:0f7f NextChar 00:0f83 CheckDict -00:1014 CheckDict.__7947 +00:1014 CheckDict.__7948 00:1030 CheckDict.diacritic 00:1037 CheckDict.not_diacritic 00:1047 CheckDict.hiragana_dakuten @@ -596,9 +596,9 @@ 00:1ff3 LoadMetatiles.row 00:1ff7 LoadMetatiles.col 00:2000 LoadMetatiles.ok -00:2026 LoadMetatiles.next_8134 -00:2039 LoadMetatiles.next_8139 -00:204c LoadMetatiles.next_8144 +00:2026 LoadMetatiles.next_8135 +00:2039 LoadMetatiles.next_8140 +00:204c LoadMetatiles.next_8145 00:2073 LoadMetatiles.ok2 00:2078 ReturnToMapFromSubmenu 00:2086 HandleNewMap @@ -989,16 +989,16 @@ 00:34ba CopyTilemapAtOnce.wait2 00:34c8 CopyTilemapAtOnce.CopyBGMapViaStack 00:34d9 CopyTilemapAtOnce.loop -00:34da CopyTilemapAtOnce.loop_8226 -00:34e3 CopyTilemapAtOnce.loop_8227 -00:34ec CopyTilemapAtOnce.loop_8228 -00:34f5 CopyTilemapAtOnce.loop_8229 -00:34fe CopyTilemapAtOnce.loop_8230 -00:3507 CopyTilemapAtOnce.loop_8231 -00:3510 CopyTilemapAtOnce.loop_8232 -00:3519 CopyTilemapAtOnce.loop_8233 -00:3522 CopyTilemapAtOnce.loop_8234 -00:352b CopyTilemapAtOnce.loop_8235 +00:34da CopyTilemapAtOnce.loop_8227 +00:34e3 CopyTilemapAtOnce.loop_8228 +00:34ec CopyTilemapAtOnce.loop_8229 +00:34f5 CopyTilemapAtOnce.loop_8230 +00:34fe CopyTilemapAtOnce.loop_8231 +00:3507 CopyTilemapAtOnce.loop_8232 +00:3510 CopyTilemapAtOnce.loop_8233 +00:3519 CopyTilemapAtOnce.loop_8234 +00:3522 CopyTilemapAtOnce.loop_8235 +00:352b CopyTilemapAtOnce.loop_8236 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -2084,11 +2084,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13187 -02:4adf _Sine.apply_13187 -02:4aee _Sine.multiply_13187 -02:4af3 _Sine.even_13187 -02:4afb _Sine.sinetable_13187 +02:4ad5 _Sine.negative_13188 +02:4adf _Sine.apply_13188 +02:4aee _Sine.multiply_13188 +02:4af3 _Sine.even_13188 +02:4afb _Sine.sinetable_13188 02:4b3b GetPredefPointer 02:4b5b PredefPointers 02:4b5b LearnMovePredef @@ -11309,31 +11309,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_41974 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_41975 -23:405f SaveMenu_CopyTilemapAtOnce.loop_41976 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_41977 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_41978 -23:407a SaveMenu_CopyTilemapAtOnce.loop_41979 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_41980 -23:408c SaveMenu_CopyTilemapAtOnce.loop_41981 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_41982 -23:409e SaveMenu_CopyTilemapAtOnce.loop_41983 +23:404d SaveMenu_CopyTilemapAtOnce.loop_42024 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_42025 +23:405f SaveMenu_CopyTilemapAtOnce.loop_42026 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_42027 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_42028 +23:407a SaveMenu_CopyTilemapAtOnce.loop_42029 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_42030 +23:408c SaveMenu_CopyTilemapAtOnce.loop_42031 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_42032 +23:409e SaveMenu_CopyTilemapAtOnce.loop_42033 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_41986 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_41987 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_41988 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_41989 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_41990 -23:413b PhoneRing_CopyTilemapAtOnce.loop_41991 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_41992 -23:414d PhoneRing_CopyTilemapAtOnce.loop_41993 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_41994 -23:415f PhoneRing_CopyTilemapAtOnce.loop_41995 +23:410e PhoneRing_CopyTilemapAtOnce.loop_42036 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_42037 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_42038 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_42039 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_42040 +23:413b PhoneRing_CopyTilemapAtOnce.loop_42041 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_42042 +23:414d PhoneRing_CopyTilemapAtOnce.loop_42043 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_42044 +23:415f PhoneRing_CopyTilemapAtOnce.loop_42045 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_42415 -23:4996 StartTrainerBattle_DrawSineWave.apply_42415 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_42415 -23:49aa StartTrainerBattle_DrawSineWave.even_42415 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42415 +23:498c StartTrainerBattle_DrawSineWave.negative_42465 +23:4996 StartTrainerBattle_DrawSineWave.apply_42465 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_42465 +23:49aa StartTrainerBattle_DrawSineWave.even_42465 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42465 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_43383 -23:6687 Sprites_Sine.apply_43383 -23:6696 Sprites_Sine.multiply_43383 -23:669b Sprites_Sine.even_43383 -23:66a3 Sprites_Sine.sinetable_43383 +23:667d Sprites_Sine.negative_43433 +23:6687 Sprites_Sine.apply_43433 +23:6696 Sprites_Sine.multiply_43433 +23:669b Sprites_Sine.even_43433 +23:66a3 Sprites_Sine.sinetable_43433 23:66e3 AnimateEndOfExpBar 23:66ee AnimateEndOfExpBar.load 23:66fb AnimateEndOfExpBar.loop @@ -15988,10 +15988,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_49308 -33:668e BattleAnim_Sine.apply_49308 -33:669d BattleAnim_Sine.multiply_49308 -33:66a2 BattleAnim_Sine.even_49308 +33:6684 BattleAnim_Sine.negative_49358 +33:668e BattleAnim_Sine.apply_49358 +33:669d BattleAnim_Sine.multiply_49358 +33:66a2 BattleAnim_Sine.even_49358 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16814,14 +16814,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_52156 -38:7567 CopyBoxmonSpecies.done_52156 +38:7545 CopyBoxmonSpecies.loop_52206 +38:7567 CopyBoxmonSpecies.done_52206 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_52157 -38:759a CopyBoxmonSpecies.done_52157 +38:7578 CopyBoxmonSpecies.loop_52207 +38:759a CopyBoxmonSpecies.done_52207 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_52158 -38:75cf CopyBoxmonSpecies.done_52158 +38:75ad CopyBoxmonSpecies.loop_52208 +38:75cf CopyBoxmonSpecies.done_52208 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor