From da503db5cab5df97a771c90b2f69b8297988c679 Mon Sep 17 00:00:00 2001 From: travis Date: Fri, 17 Jul 2020 21:00:15 +0000 Subject: [PATCH] Fix newlines --- pokegold.sym | 160 +++++++++++++++++++++++++++---------------- pokegold_debug.sym | 160 +++++++++++++++++++++++++++---------------- pokesilver.sym | 160 +++++++++++++++++++++++++++---------------- pokesilver_debug.sym | 160 +++++++++++++++++++++++++++---------------- 4 files changed, 404 insertions(+), 236 deletions(-) diff --git a/pokegold.sym b/pokegold.sym index 3a6b7845..6c114058 100644 --- a/pokegold.sym +++ b/pokegold.sym @@ -272,7 +272,7 @@ 00:0f75 PlaceNextChar 00:0f7f NextChar 00:0f83 CheckDict -00:1014 CheckDict.__8034 +00:1014 CheckDict.__8003 00:1030 CheckDict.diacritic 00:1037 CheckDict.not_diacritic 00:103f CheckDict.dakuten @@ -596,9 +596,9 @@ 00:1ff3 LoadMetatiles.row 00:1ff7 LoadMetatiles.col 00:2000 LoadMetatiles.ok -00:2026 LoadMetatiles.next_8219 -00:2039 LoadMetatiles.next_8224 -00:204c LoadMetatiles.next_8229 +00:2026 LoadMetatiles.next_8188 +00:2039 LoadMetatiles.next_8193 +00:204c LoadMetatiles.next_8198 00:2073 LoadMetatiles.ok2 00:2078 ReturnToMapFromSubmenu 00:2086 HandleNewMap @@ -990,16 +990,16 @@ 00:34ba CopyTilemapAtOnce.wait2 00:34c8 CopyTilemapAtOnce.CopyBGMapViaStack 00:34d9 CopyTilemapAtOnce.loop -00:34da CopyTilemapAtOnce.loop_8311 -00:34e3 CopyTilemapAtOnce.loop_8312 -00:34ec CopyTilemapAtOnce.loop_8313 -00:34f5 CopyTilemapAtOnce.loop_8314 -00:34fe CopyTilemapAtOnce.loop_8315 -00:3507 CopyTilemapAtOnce.loop_8316 -00:3510 CopyTilemapAtOnce.loop_8317 -00:3519 CopyTilemapAtOnce.loop_8318 -00:3522 CopyTilemapAtOnce.loop_8319 -00:352b CopyTilemapAtOnce.loop_8320 +00:34da CopyTilemapAtOnce.loop_8280 +00:34e3 CopyTilemapAtOnce.loop_8281 +00:34ec CopyTilemapAtOnce.loop_8282 +00:34f5 CopyTilemapAtOnce.loop_8283 +00:34fe CopyTilemapAtOnce.loop_8284 +00:3507 CopyTilemapAtOnce.loop_8285 +00:3510 CopyTilemapAtOnce.loop_8286 +00:3519 CopyTilemapAtOnce.loop_8287 +00:3522 CopyTilemapAtOnce.loop_8288 +00:352b CopyTilemapAtOnce.loop_8289 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -2076,11 +2076,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13245 -02:4adf _Sine.apply_13245 -02:4aee _Sine.multiply_13245 -02:4af3 _Sine.even_13245 -02:4afb _Sine.sinetable_13245 +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 @@ -6388,6 +6388,48 @@ 0a:4f48 DoTradeAnimation.finished 0a:4f4d DoTradeAnimation.DoTradeAnimCommand 0a:4f5c DoTradeAnimation.JumpTable +0a:4f5c TradeAnim_AdvanceScriptPointer_TradeCmd +0a:4f5e TradeAnim_ShowGivemonData_TradeCmd +0a:4f60 TradeAnim_ShowGetmonData_TradeCmd +0a:4f62 TradeAnim_EnterLinkTube1_TradeCmd +0a:4f64 TradeAnim_EnterLinkTube2_TradeCmd +0a:4f66 TradeAnim_ExitLinkTube_TradeCmd +0a:4f68 TradeAnim_TubeToOT1_TradeCmd +0a:4f6a TradeAnim_TubeToOT2_TradeCmd +0a:4f6c TradeAnim_TubeToOT3_TradeCmd +0a:4f6e TradeAnim_TubeToOT4_TradeCmd +0a:4f70 TradeAnim_TubeToOT5_TradeCmd +0a:4f72 TradeAnim_TubeToOT6_TradeCmd +0a:4f74 TradeAnim_TubeToOT7_TradeCmd +0a:4f76 TradeAnim_TubeToOT8_TradeCmd +0a:4f78 TradeAnim_TubeToPlayer1_TradeCmd +0a:4f7a TradeAnim_TubeToPlayer2_TradeCmd +0a:4f7c TradeAnim_TubeToPlayer3_TradeCmd +0a:4f7e TradeAnim_TubeToPlayer4_TradeCmd +0a:4f80 TradeAnim_TubeToPlayer5_TradeCmd +0a:4f82 TradeAnim_TubeToPlayer6_TradeCmd +0a:4f84 TradeAnim_TubeToPlayer7_TradeCmd +0a:4f86 TradeAnim_TubeToPlayer8_TradeCmd +0a:4f88 TradeAnim_SentToOTText_TradeCmd +0a:4f8a TradeAnim_OTBidsFarewell_TradeCmd +0a:4f8c TradeAnim_TakeCareOfText_TradeCmd +0a:4f8e TradeAnim_OTSendsText1_TradeCmd +0a:4f90 TradeAnim_OTSendsText2_TradeCmd +0a:4f92 TradeAnim_SetupGivemonScroll_TradeCmd +0a:4f94 TradeAnim_DoGivemonScroll_TradeCmd +0a:4f96 TradeAnim_FrontpicScrollStart_TradeCmd +0a:4f98 TradeAnim_TextboxScrollStart_TradeCmd +0a:4f9a TradeAnim_ScrollOutRight_TradeCmd +0a:4f9c TradeAnim_ScrollOutRight2_TradeCmd +0a:4f9e TradeAnim_Wait80_TradeCmd +0a:4fa0 TradeAnim_RockingBall_TradeCmd +0a:4fa2 TradeAnim_DropBall_TradeCmd +0a:4fa4 TradeAnim_WaitAnim_TradeCmd +0a:4fa6 TradeAnim_Poof_TradeCmd +0a:4fa8 TradeAnim_BulgeThroughTube_TradeCmd +0a:4faa TradeAnim_GiveTrademonSFX_TradeCmd +0a:4fac TradeAnim_GetTrademonSFX_TradeCmd +0a:4fae TradeAnim_End_TradeCmd 0a:4fb0 TradeAnim_IncrementJumptableIndex 0a:4fb5 TradeAnim_AdvanceScriptPointer 0a:4fc4 TradeAnim_End @@ -11076,31 +11118,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_32638 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_32639 -23:405f SaveMenu_CopyTilemapAtOnce.loop_32640 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_32641 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_32642 -23:407a SaveMenu_CopyTilemapAtOnce.loop_32643 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_32644 -23:408c SaveMenu_CopyTilemapAtOnce.loop_32645 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_32646 -23:409e SaveMenu_CopyTilemapAtOnce.loop_32647 +23:404d SaveMenu_CopyTilemapAtOnce.loop_32649 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_32650 +23:405f SaveMenu_CopyTilemapAtOnce.loop_32651 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_32652 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_32653 +23:407a SaveMenu_CopyTilemapAtOnce.loop_32654 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_32655 +23:408c SaveMenu_CopyTilemapAtOnce.loop_32656 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_32657 +23:409e SaveMenu_CopyTilemapAtOnce.loop_32658 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_32650 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_32651 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_32652 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_32653 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_32654 -23:413b PhoneRing_CopyTilemapAtOnce.loop_32655 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_32656 -23:414d PhoneRing_CopyTilemapAtOnce.loop_32657 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_32658 -23:415f PhoneRing_CopyTilemapAtOnce.loop_32659 +23:410e PhoneRing_CopyTilemapAtOnce.loop_32661 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_32662 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_32663 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_32664 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_32665 +23:413b PhoneRing_CopyTilemapAtOnce.loop_32666 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_32667 +23:414d PhoneRing_CopyTilemapAtOnce.loop_32668 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_32669 +23:415f PhoneRing_CopyTilemapAtOnce.loop_32670 23:417a _ResetClock 23:41bb _ResetClock.wrongpassword 23:41c2 _ResetClock.PasswordAskResetText @@ -11237,11 +11279,11 @@ 23:4979 WipeLYOverrides.wipe 23:497c WipeLYOverrides.loop 23:4981 StartTrainerBattle_DrawSineWave -23:498c StartTrainerBattle_DrawSineWave.negative_33038 -23:4996 StartTrainerBattle_DrawSineWave.apply_33038 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_33038 -23:49aa StartTrainerBattle_DrawSineWave.even_33038 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_33038 +23:498c StartTrainerBattle_DrawSineWave.negative_33049 +23:4996 StartTrainerBattle_DrawSineWave.apply_33049 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_33049 +23:49aa StartTrainerBattle_DrawSineWave.even_33049 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_33049 23:49f2 StartTrainerBattle_ZoomToBlack 23:49fb StartTrainerBattle_ZoomToBlack.loop 23:4a16 StartTrainerBattle_ZoomToBlack.done @@ -11588,11 +11630,11 @@ 23:668a Sprites_Cosine 23:668a BrokenStdGFXPointers.deleted 23:668c Sprites_Sine -23:6697 Sprites_Sine.negative_33991 -23:66a1 Sprites_Sine.apply_33991 -23:66b0 Sprites_Sine.multiply_33991 -23:66b5 Sprites_Sine.even_33991 -23:66bd Sprites_Sine.sinetable_33991 +23:6697 Sprites_Sine.negative_34002 +23:66a1 Sprites_Sine.apply_34002 +23:66b0 Sprites_Sine.multiply_34002 +23:66b5 Sprites_Sine.even_34002 +23:66bd Sprites_Sine.sinetable_34002 23:66fd AnimateEndOfExpBar 23:6708 AnimateEndOfExpBar.load 23:6715 AnimateEndOfExpBar.loop @@ -15723,10 +15765,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_39862 -33:668e BattleAnim_Sine.apply_39862 -33:669d BattleAnim_Sine.multiply_39862 -33:66a2 BattleAnim_Sine.even_39862 +33:6684 BattleAnim_Sine.negative_39873 +33:668e BattleAnim_Sine.apply_39873 +33:669d BattleAnim_Sine.multiply_39873 +33:66a2 BattleAnim_Sine.even_39873 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16548,14 +16590,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_42560 -38:7567 CopyBoxmonSpecies.done_42560 +38:7545 CopyBoxmonSpecies.loop_42571 +38:7567 CopyBoxmonSpecies.done_42571 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_42561 -38:759a CopyBoxmonSpecies.done_42561 +38:7578 CopyBoxmonSpecies.loop_42572 +38:759a CopyBoxmonSpecies.done_42572 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_42562 -38:75cf CopyBoxmonSpecies.done_42562 +38:75ad CopyBoxmonSpecies.loop_42573 +38:75cf CopyBoxmonSpecies.done_42573 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 0b94d7f0..5683fe70 100644 --- a/pokegold_debug.sym +++ b/pokegold_debug.sym @@ -272,7 +272,7 @@ 00:0f75 PlaceNextChar 00:0f7f NextChar 00:0f83 CheckDict -00:1014 CheckDict.__8034 +00:1014 CheckDict.__8003 00:1030 CheckDict.diacritic 00:1037 CheckDict.not_diacritic 00:103f CheckDict.dakuten @@ -596,9 +596,9 @@ 00:1ff3 LoadMetatiles.row 00:1ff7 LoadMetatiles.col 00:2000 LoadMetatiles.ok -00:2026 LoadMetatiles.next_8219 -00:2039 LoadMetatiles.next_8224 -00:204c LoadMetatiles.next_8229 +00:2026 LoadMetatiles.next_8188 +00:2039 LoadMetatiles.next_8193 +00:204c LoadMetatiles.next_8198 00:2073 LoadMetatiles.ok2 00:2078 ReturnToMapFromSubmenu 00:2086 HandleNewMap @@ -990,16 +990,16 @@ 00:34ba CopyTilemapAtOnce.wait2 00:34c8 CopyTilemapAtOnce.CopyBGMapViaStack 00:34d9 CopyTilemapAtOnce.loop -00:34da CopyTilemapAtOnce.loop_8311 -00:34e3 CopyTilemapAtOnce.loop_8312 -00:34ec CopyTilemapAtOnce.loop_8313 -00:34f5 CopyTilemapAtOnce.loop_8314 -00:34fe CopyTilemapAtOnce.loop_8315 -00:3507 CopyTilemapAtOnce.loop_8316 -00:3510 CopyTilemapAtOnce.loop_8317 -00:3519 CopyTilemapAtOnce.loop_8318 -00:3522 CopyTilemapAtOnce.loop_8319 -00:352b CopyTilemapAtOnce.loop_8320 +00:34da CopyTilemapAtOnce.loop_8280 +00:34e3 CopyTilemapAtOnce.loop_8281 +00:34ec CopyTilemapAtOnce.loop_8282 +00:34f5 CopyTilemapAtOnce.loop_8283 +00:34fe CopyTilemapAtOnce.loop_8284 +00:3507 CopyTilemapAtOnce.loop_8285 +00:3510 CopyTilemapAtOnce.loop_8286 +00:3519 CopyTilemapAtOnce.loop_8287 +00:3522 CopyTilemapAtOnce.loop_8288 +00:352b CopyTilemapAtOnce.loop_8289 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -2077,11 +2077,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13247 -02:4adf _Sine.apply_13247 -02:4aee _Sine.multiply_13247 -02:4af3 _Sine.even_13247 -02:4afb _Sine.sinetable_13247 +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 @@ -6389,6 +6389,48 @@ 0a:4f48 DoTradeAnimation.finished 0a:4f4d DoTradeAnimation.DoTradeAnimCommand 0a:4f5c DoTradeAnimation.JumpTable +0a:4f5c TradeAnim_AdvanceScriptPointer_TradeCmd +0a:4f5e TradeAnim_ShowGivemonData_TradeCmd +0a:4f60 TradeAnim_ShowGetmonData_TradeCmd +0a:4f62 TradeAnim_EnterLinkTube1_TradeCmd +0a:4f64 TradeAnim_EnterLinkTube2_TradeCmd +0a:4f66 TradeAnim_ExitLinkTube_TradeCmd +0a:4f68 TradeAnim_TubeToOT1_TradeCmd +0a:4f6a TradeAnim_TubeToOT2_TradeCmd +0a:4f6c TradeAnim_TubeToOT3_TradeCmd +0a:4f6e TradeAnim_TubeToOT4_TradeCmd +0a:4f70 TradeAnim_TubeToOT5_TradeCmd +0a:4f72 TradeAnim_TubeToOT6_TradeCmd +0a:4f74 TradeAnim_TubeToOT7_TradeCmd +0a:4f76 TradeAnim_TubeToOT8_TradeCmd +0a:4f78 TradeAnim_TubeToPlayer1_TradeCmd +0a:4f7a TradeAnim_TubeToPlayer2_TradeCmd +0a:4f7c TradeAnim_TubeToPlayer3_TradeCmd +0a:4f7e TradeAnim_TubeToPlayer4_TradeCmd +0a:4f80 TradeAnim_TubeToPlayer5_TradeCmd +0a:4f82 TradeAnim_TubeToPlayer6_TradeCmd +0a:4f84 TradeAnim_TubeToPlayer7_TradeCmd +0a:4f86 TradeAnim_TubeToPlayer8_TradeCmd +0a:4f88 TradeAnim_SentToOTText_TradeCmd +0a:4f8a TradeAnim_OTBidsFarewell_TradeCmd +0a:4f8c TradeAnim_TakeCareOfText_TradeCmd +0a:4f8e TradeAnim_OTSendsText1_TradeCmd +0a:4f90 TradeAnim_OTSendsText2_TradeCmd +0a:4f92 TradeAnim_SetupGivemonScroll_TradeCmd +0a:4f94 TradeAnim_DoGivemonScroll_TradeCmd +0a:4f96 TradeAnim_FrontpicScrollStart_TradeCmd +0a:4f98 TradeAnim_TextboxScrollStart_TradeCmd +0a:4f9a TradeAnim_ScrollOutRight_TradeCmd +0a:4f9c TradeAnim_ScrollOutRight2_TradeCmd +0a:4f9e TradeAnim_Wait80_TradeCmd +0a:4fa0 TradeAnim_RockingBall_TradeCmd +0a:4fa2 TradeAnim_DropBall_TradeCmd +0a:4fa4 TradeAnim_WaitAnim_TradeCmd +0a:4fa6 TradeAnim_Poof_TradeCmd +0a:4fa8 TradeAnim_BulgeThroughTube_TradeCmd +0a:4faa TradeAnim_GiveTrademonSFX_TradeCmd +0a:4fac TradeAnim_GetTrademonSFX_TradeCmd +0a:4fae TradeAnim_End_TradeCmd 0a:4fb0 TradeAnim_IncrementJumptableIndex 0a:4fb5 TradeAnim_AdvanceScriptPointer 0a:4fc4 TradeAnim_End @@ -11077,31 +11119,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_32640 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_32641 -23:405f SaveMenu_CopyTilemapAtOnce.loop_32642 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_32643 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_32644 -23:407a SaveMenu_CopyTilemapAtOnce.loop_32645 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_32646 -23:408c SaveMenu_CopyTilemapAtOnce.loop_32647 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_32648 -23:409e SaveMenu_CopyTilemapAtOnce.loop_32649 +23:404d SaveMenu_CopyTilemapAtOnce.loop_32651 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_32652 +23:405f SaveMenu_CopyTilemapAtOnce.loop_32653 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_32654 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_32655 +23:407a SaveMenu_CopyTilemapAtOnce.loop_32656 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_32657 +23:408c SaveMenu_CopyTilemapAtOnce.loop_32658 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_32659 +23:409e SaveMenu_CopyTilemapAtOnce.loop_32660 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_32652 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_32653 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_32654 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_32655 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_32656 -23:413b PhoneRing_CopyTilemapAtOnce.loop_32657 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_32658 -23:414d PhoneRing_CopyTilemapAtOnce.loop_32659 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_32660 -23:415f PhoneRing_CopyTilemapAtOnce.loop_32661 +23:410e PhoneRing_CopyTilemapAtOnce.loop_32663 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_32664 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_32665 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_32666 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_32667 +23:413b PhoneRing_CopyTilemapAtOnce.loop_32668 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_32669 +23:414d PhoneRing_CopyTilemapAtOnce.loop_32670 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_32671 +23:415f PhoneRing_CopyTilemapAtOnce.loop_32672 23:417a _ResetClock 23:41bb _ResetClock.wrongpassword 23:41c2 _ResetClock.PasswordAskResetText @@ -11238,11 +11280,11 @@ 23:4979 WipeLYOverrides.wipe 23:497c WipeLYOverrides.loop 23:4981 StartTrainerBattle_DrawSineWave -23:498c StartTrainerBattle_DrawSineWave.negative_33040 -23:4996 StartTrainerBattle_DrawSineWave.apply_33040 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_33040 -23:49aa StartTrainerBattle_DrawSineWave.even_33040 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_33040 +23:498c StartTrainerBattle_DrawSineWave.negative_33051 +23:4996 StartTrainerBattle_DrawSineWave.apply_33051 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_33051 +23:49aa StartTrainerBattle_DrawSineWave.even_33051 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_33051 23:49f2 StartTrainerBattle_ZoomToBlack 23:49fb StartTrainerBattle_ZoomToBlack.loop 23:4a16 StartTrainerBattle_ZoomToBlack.done @@ -11589,11 +11631,11 @@ 23:668a Sprites_Cosine 23:668a BrokenStdGFXPointers.deleted 23:668c Sprites_Sine -23:6697 Sprites_Sine.negative_33993 -23:66a1 Sprites_Sine.apply_33993 -23:66b0 Sprites_Sine.multiply_33993 -23:66b5 Sprites_Sine.even_33993 -23:66bd Sprites_Sine.sinetable_33993 +23:6697 Sprites_Sine.negative_34004 +23:66a1 Sprites_Sine.apply_34004 +23:66b0 Sprites_Sine.multiply_34004 +23:66b5 Sprites_Sine.even_34004 +23:66bd Sprites_Sine.sinetable_34004 23:66fd AnimateEndOfExpBar 23:6708 AnimateEndOfExpBar.load 23:6715 AnimateEndOfExpBar.loop @@ -15724,10 +15766,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_39864 -33:668e BattleAnim_Sine.apply_39864 -33:669d BattleAnim_Sine.multiply_39864 -33:66a2 BattleAnim_Sine.even_39864 +33:6684 BattleAnim_Sine.negative_39875 +33:668e BattleAnim_Sine.apply_39875 +33:669d BattleAnim_Sine.multiply_39875 +33:66a2 BattleAnim_Sine.even_39875 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16549,14 +16591,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_42562 -38:7567 CopyBoxmonSpecies.done_42562 +38:7545 CopyBoxmonSpecies.loop_42573 +38:7567 CopyBoxmonSpecies.done_42573 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_42563 -38:759a CopyBoxmonSpecies.done_42563 +38:7578 CopyBoxmonSpecies.loop_42574 +38:759a CopyBoxmonSpecies.done_42574 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_42564 -38:75cf CopyBoxmonSpecies.done_42564 +38:75ad CopyBoxmonSpecies.loop_42575 +38:75cf CopyBoxmonSpecies.done_42575 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor diff --git a/pokesilver.sym b/pokesilver.sym index c061274d..cff44c5f 100644 --- a/pokesilver.sym +++ b/pokesilver.sym @@ -272,7 +272,7 @@ 00:0f75 PlaceNextChar 00:0f7f NextChar 00:0f83 CheckDict -00:1014 CheckDict.__8034 +00:1014 CheckDict.__8003 00:1030 CheckDict.diacritic 00:1037 CheckDict.not_diacritic 00:103f CheckDict.dakuten @@ -596,9 +596,9 @@ 00:1ff3 LoadMetatiles.row 00:1ff7 LoadMetatiles.col 00:2000 LoadMetatiles.ok -00:2026 LoadMetatiles.next_8219 -00:2039 LoadMetatiles.next_8224 -00:204c LoadMetatiles.next_8229 +00:2026 LoadMetatiles.next_8188 +00:2039 LoadMetatiles.next_8193 +00:204c LoadMetatiles.next_8198 00:2073 LoadMetatiles.ok2 00:2078 ReturnToMapFromSubmenu 00:2086 HandleNewMap @@ -990,16 +990,16 @@ 00:34ba CopyTilemapAtOnce.wait2 00:34c8 CopyTilemapAtOnce.CopyBGMapViaStack 00:34d9 CopyTilemapAtOnce.loop -00:34da CopyTilemapAtOnce.loop_8311 -00:34e3 CopyTilemapAtOnce.loop_8312 -00:34ec CopyTilemapAtOnce.loop_8313 -00:34f5 CopyTilemapAtOnce.loop_8314 -00:34fe CopyTilemapAtOnce.loop_8315 -00:3507 CopyTilemapAtOnce.loop_8316 -00:3510 CopyTilemapAtOnce.loop_8317 -00:3519 CopyTilemapAtOnce.loop_8318 -00:3522 CopyTilemapAtOnce.loop_8319 -00:352b CopyTilemapAtOnce.loop_8320 +00:34da CopyTilemapAtOnce.loop_8280 +00:34e3 CopyTilemapAtOnce.loop_8281 +00:34ec CopyTilemapAtOnce.loop_8282 +00:34f5 CopyTilemapAtOnce.loop_8283 +00:34fe CopyTilemapAtOnce.loop_8284 +00:3507 CopyTilemapAtOnce.loop_8285 +00:3510 CopyTilemapAtOnce.loop_8286 +00:3519 CopyTilemapAtOnce.loop_8287 +00:3522 CopyTilemapAtOnce.loop_8288 +00:352b CopyTilemapAtOnce.loop_8289 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -2075,11 +2075,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13247 -02:4adf _Sine.apply_13247 -02:4aee _Sine.multiply_13247 -02:4af3 _Sine.even_13247 -02:4afb _Sine.sinetable_13247 +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 @@ -6387,6 +6387,48 @@ 0a:4f48 DoTradeAnimation.finished 0a:4f4d DoTradeAnimation.DoTradeAnimCommand 0a:4f5c DoTradeAnimation.JumpTable +0a:4f5c TradeAnim_AdvanceScriptPointer_TradeCmd +0a:4f5e TradeAnim_ShowGivemonData_TradeCmd +0a:4f60 TradeAnim_ShowGetmonData_TradeCmd +0a:4f62 TradeAnim_EnterLinkTube1_TradeCmd +0a:4f64 TradeAnim_EnterLinkTube2_TradeCmd +0a:4f66 TradeAnim_ExitLinkTube_TradeCmd +0a:4f68 TradeAnim_TubeToOT1_TradeCmd +0a:4f6a TradeAnim_TubeToOT2_TradeCmd +0a:4f6c TradeAnim_TubeToOT3_TradeCmd +0a:4f6e TradeAnim_TubeToOT4_TradeCmd +0a:4f70 TradeAnim_TubeToOT5_TradeCmd +0a:4f72 TradeAnim_TubeToOT6_TradeCmd +0a:4f74 TradeAnim_TubeToOT7_TradeCmd +0a:4f76 TradeAnim_TubeToOT8_TradeCmd +0a:4f78 TradeAnim_TubeToPlayer1_TradeCmd +0a:4f7a TradeAnim_TubeToPlayer2_TradeCmd +0a:4f7c TradeAnim_TubeToPlayer3_TradeCmd +0a:4f7e TradeAnim_TubeToPlayer4_TradeCmd +0a:4f80 TradeAnim_TubeToPlayer5_TradeCmd +0a:4f82 TradeAnim_TubeToPlayer6_TradeCmd +0a:4f84 TradeAnim_TubeToPlayer7_TradeCmd +0a:4f86 TradeAnim_TubeToPlayer8_TradeCmd +0a:4f88 TradeAnim_SentToOTText_TradeCmd +0a:4f8a TradeAnim_OTBidsFarewell_TradeCmd +0a:4f8c TradeAnim_TakeCareOfText_TradeCmd +0a:4f8e TradeAnim_OTSendsText1_TradeCmd +0a:4f90 TradeAnim_OTSendsText2_TradeCmd +0a:4f92 TradeAnim_SetupGivemonScroll_TradeCmd +0a:4f94 TradeAnim_DoGivemonScroll_TradeCmd +0a:4f96 TradeAnim_FrontpicScrollStart_TradeCmd +0a:4f98 TradeAnim_TextboxScrollStart_TradeCmd +0a:4f9a TradeAnim_ScrollOutRight_TradeCmd +0a:4f9c TradeAnim_ScrollOutRight2_TradeCmd +0a:4f9e TradeAnim_Wait80_TradeCmd +0a:4fa0 TradeAnim_RockingBall_TradeCmd +0a:4fa2 TradeAnim_DropBall_TradeCmd +0a:4fa4 TradeAnim_WaitAnim_TradeCmd +0a:4fa6 TradeAnim_Poof_TradeCmd +0a:4fa8 TradeAnim_BulgeThroughTube_TradeCmd +0a:4faa TradeAnim_GiveTrademonSFX_TradeCmd +0a:4fac TradeAnim_GetTrademonSFX_TradeCmd +0a:4fae TradeAnim_End_TradeCmd 0a:4fb0 TradeAnim_IncrementJumptableIndex 0a:4fb5 TradeAnim_AdvanceScriptPointer 0a:4fc4 TradeAnim_End @@ -11074,31 +11116,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_32640 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_32641 -23:405f SaveMenu_CopyTilemapAtOnce.loop_32642 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_32643 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_32644 -23:407a SaveMenu_CopyTilemapAtOnce.loop_32645 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_32646 -23:408c SaveMenu_CopyTilemapAtOnce.loop_32647 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_32648 -23:409e SaveMenu_CopyTilemapAtOnce.loop_32649 +23:404d SaveMenu_CopyTilemapAtOnce.loop_32651 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_32652 +23:405f SaveMenu_CopyTilemapAtOnce.loop_32653 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_32654 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_32655 +23:407a SaveMenu_CopyTilemapAtOnce.loop_32656 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_32657 +23:408c SaveMenu_CopyTilemapAtOnce.loop_32658 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_32659 +23:409e SaveMenu_CopyTilemapAtOnce.loop_32660 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_32652 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_32653 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_32654 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_32655 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_32656 -23:413b PhoneRing_CopyTilemapAtOnce.loop_32657 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_32658 -23:414d PhoneRing_CopyTilemapAtOnce.loop_32659 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_32660 -23:415f PhoneRing_CopyTilemapAtOnce.loop_32661 +23:410e PhoneRing_CopyTilemapAtOnce.loop_32663 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_32664 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_32665 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_32666 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_32667 +23:413b PhoneRing_CopyTilemapAtOnce.loop_32668 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_32669 +23:414d PhoneRing_CopyTilemapAtOnce.loop_32670 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_32671 +23:415f PhoneRing_CopyTilemapAtOnce.loop_32672 23:417a _ResetClock 23:41bb _ResetClock.wrongpassword 23:41c2 _ResetClock.PasswordAskResetText @@ -11235,11 +11277,11 @@ 23:4979 WipeLYOverrides.wipe 23:497c WipeLYOverrides.loop 23:4981 StartTrainerBattle_DrawSineWave -23:498c StartTrainerBattle_DrawSineWave.negative_33040 -23:4996 StartTrainerBattle_DrawSineWave.apply_33040 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_33040 -23:49aa StartTrainerBattle_DrawSineWave.even_33040 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_33040 +23:498c StartTrainerBattle_DrawSineWave.negative_33051 +23:4996 StartTrainerBattle_DrawSineWave.apply_33051 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_33051 +23:49aa StartTrainerBattle_DrawSineWave.even_33051 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_33051 23:49f2 StartTrainerBattle_ZoomToBlack 23:49fb StartTrainerBattle_ZoomToBlack.loop 23:4a16 StartTrainerBattle_ZoomToBlack.done @@ -11586,11 +11628,11 @@ 23:6670 Sprites_Cosine 23:6670 BrokenStdGFXPointers.deleted 23:6672 Sprites_Sine -23:667d Sprites_Sine.negative_33995 -23:6687 Sprites_Sine.apply_33995 -23:6696 Sprites_Sine.multiply_33995 -23:669b Sprites_Sine.even_33995 -23:66a3 Sprites_Sine.sinetable_33995 +23:667d Sprites_Sine.negative_34006 +23:6687 Sprites_Sine.apply_34006 +23:6696 Sprites_Sine.multiply_34006 +23:669b Sprites_Sine.even_34006 +23:66a3 Sprites_Sine.sinetable_34006 23:66e3 AnimateEndOfExpBar 23:66ee AnimateEndOfExpBar.load 23:66fb AnimateEndOfExpBar.loop @@ -15722,10 +15764,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_39866 -33:668e BattleAnim_Sine.apply_39866 -33:669d BattleAnim_Sine.multiply_39866 -33:66a2 BattleAnim_Sine.even_39866 +33:6684 BattleAnim_Sine.negative_39877 +33:668e BattleAnim_Sine.apply_39877 +33:669d BattleAnim_Sine.multiply_39877 +33:66a2 BattleAnim_Sine.even_39877 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16547,14 +16589,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_42564 -38:7567 CopyBoxmonSpecies.done_42564 +38:7545 CopyBoxmonSpecies.loop_42575 +38:7567 CopyBoxmonSpecies.done_42575 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_42565 -38:759a CopyBoxmonSpecies.done_42565 +38:7578 CopyBoxmonSpecies.loop_42576 +38:759a CopyBoxmonSpecies.done_42576 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_42566 -38:75cf CopyBoxmonSpecies.done_42566 +38:75ad CopyBoxmonSpecies.loop_42577 +38:75cf CopyBoxmonSpecies.done_42577 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 a8dbd93e..c0a4694b 100644 --- a/pokesilver_debug.sym +++ b/pokesilver_debug.sym @@ -272,7 +272,7 @@ 00:0f75 PlaceNextChar 00:0f7f NextChar 00:0f83 CheckDict -00:1014 CheckDict.__8034 +00:1014 CheckDict.__8003 00:1030 CheckDict.diacritic 00:1037 CheckDict.not_diacritic 00:103f CheckDict.dakuten @@ -596,9 +596,9 @@ 00:1ff3 LoadMetatiles.row 00:1ff7 LoadMetatiles.col 00:2000 LoadMetatiles.ok -00:2026 LoadMetatiles.next_8219 -00:2039 LoadMetatiles.next_8224 -00:204c LoadMetatiles.next_8229 +00:2026 LoadMetatiles.next_8188 +00:2039 LoadMetatiles.next_8193 +00:204c LoadMetatiles.next_8198 00:2073 LoadMetatiles.ok2 00:2078 ReturnToMapFromSubmenu 00:2086 HandleNewMap @@ -990,16 +990,16 @@ 00:34ba CopyTilemapAtOnce.wait2 00:34c8 CopyTilemapAtOnce.CopyBGMapViaStack 00:34d9 CopyTilemapAtOnce.loop -00:34da CopyTilemapAtOnce.loop_8311 -00:34e3 CopyTilemapAtOnce.loop_8312 -00:34ec CopyTilemapAtOnce.loop_8313 -00:34f5 CopyTilemapAtOnce.loop_8314 -00:34fe CopyTilemapAtOnce.loop_8315 -00:3507 CopyTilemapAtOnce.loop_8316 -00:3510 CopyTilemapAtOnce.loop_8317 -00:3519 CopyTilemapAtOnce.loop_8318 -00:3522 CopyTilemapAtOnce.loop_8319 -00:352b CopyTilemapAtOnce.loop_8320 +00:34da CopyTilemapAtOnce.loop_8280 +00:34e3 CopyTilemapAtOnce.loop_8281 +00:34ec CopyTilemapAtOnce.loop_8282 +00:34f5 CopyTilemapAtOnce.loop_8283 +00:34fe CopyTilemapAtOnce.loop_8284 +00:3507 CopyTilemapAtOnce.loop_8285 +00:3510 CopyTilemapAtOnce.loop_8286 +00:3519 CopyTilemapAtOnce.loop_8287 +00:3522 CopyTilemapAtOnce.loop_8288 +00:352b CopyTilemapAtOnce.loop_8289 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -2076,11 +2076,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13249 -02:4adf _Sine.apply_13249 -02:4aee _Sine.multiply_13249 -02:4af3 _Sine.even_13249 -02:4afb _Sine.sinetable_13249 +02:4ad5 _Sine.negative_13218 +02:4adf _Sine.apply_13218 +02:4aee _Sine.multiply_13218 +02:4af3 _Sine.even_13218 +02:4afb _Sine.sinetable_13218 02:4b3b GetPredefPointer 02:4b5b PredefPointers 02:4b5b LearnMovePredef @@ -6388,6 +6388,48 @@ 0a:4f48 DoTradeAnimation.finished 0a:4f4d DoTradeAnimation.DoTradeAnimCommand 0a:4f5c DoTradeAnimation.JumpTable +0a:4f5c TradeAnim_AdvanceScriptPointer_TradeCmd +0a:4f5e TradeAnim_ShowGivemonData_TradeCmd +0a:4f60 TradeAnim_ShowGetmonData_TradeCmd +0a:4f62 TradeAnim_EnterLinkTube1_TradeCmd +0a:4f64 TradeAnim_EnterLinkTube2_TradeCmd +0a:4f66 TradeAnim_ExitLinkTube_TradeCmd +0a:4f68 TradeAnim_TubeToOT1_TradeCmd +0a:4f6a TradeAnim_TubeToOT2_TradeCmd +0a:4f6c TradeAnim_TubeToOT3_TradeCmd +0a:4f6e TradeAnim_TubeToOT4_TradeCmd +0a:4f70 TradeAnim_TubeToOT5_TradeCmd +0a:4f72 TradeAnim_TubeToOT6_TradeCmd +0a:4f74 TradeAnim_TubeToOT7_TradeCmd +0a:4f76 TradeAnim_TubeToOT8_TradeCmd +0a:4f78 TradeAnim_TubeToPlayer1_TradeCmd +0a:4f7a TradeAnim_TubeToPlayer2_TradeCmd +0a:4f7c TradeAnim_TubeToPlayer3_TradeCmd +0a:4f7e TradeAnim_TubeToPlayer4_TradeCmd +0a:4f80 TradeAnim_TubeToPlayer5_TradeCmd +0a:4f82 TradeAnim_TubeToPlayer6_TradeCmd +0a:4f84 TradeAnim_TubeToPlayer7_TradeCmd +0a:4f86 TradeAnim_TubeToPlayer8_TradeCmd +0a:4f88 TradeAnim_SentToOTText_TradeCmd +0a:4f8a TradeAnim_OTBidsFarewell_TradeCmd +0a:4f8c TradeAnim_TakeCareOfText_TradeCmd +0a:4f8e TradeAnim_OTSendsText1_TradeCmd +0a:4f90 TradeAnim_OTSendsText2_TradeCmd +0a:4f92 TradeAnim_SetupGivemonScroll_TradeCmd +0a:4f94 TradeAnim_DoGivemonScroll_TradeCmd +0a:4f96 TradeAnim_FrontpicScrollStart_TradeCmd +0a:4f98 TradeAnim_TextboxScrollStart_TradeCmd +0a:4f9a TradeAnim_ScrollOutRight_TradeCmd +0a:4f9c TradeAnim_ScrollOutRight2_TradeCmd +0a:4f9e TradeAnim_Wait80_TradeCmd +0a:4fa0 TradeAnim_RockingBall_TradeCmd +0a:4fa2 TradeAnim_DropBall_TradeCmd +0a:4fa4 TradeAnim_WaitAnim_TradeCmd +0a:4fa6 TradeAnim_Poof_TradeCmd +0a:4fa8 TradeAnim_BulgeThroughTube_TradeCmd +0a:4faa TradeAnim_GiveTrademonSFX_TradeCmd +0a:4fac TradeAnim_GetTrademonSFX_TradeCmd +0a:4fae TradeAnim_End_TradeCmd 0a:4fb0 TradeAnim_IncrementJumptableIndex 0a:4fb5 TradeAnim_AdvanceScriptPointer 0a:4fc4 TradeAnim_End @@ -11075,31 +11117,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_32642 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_32643 -23:405f SaveMenu_CopyTilemapAtOnce.loop_32644 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_32645 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_32646 -23:407a SaveMenu_CopyTilemapAtOnce.loop_32647 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_32648 -23:408c SaveMenu_CopyTilemapAtOnce.loop_32649 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_32650 -23:409e SaveMenu_CopyTilemapAtOnce.loop_32651 +23:404d SaveMenu_CopyTilemapAtOnce.loop_32653 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_32654 +23:405f SaveMenu_CopyTilemapAtOnce.loop_32655 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_32656 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_32657 +23:407a SaveMenu_CopyTilemapAtOnce.loop_32658 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_32659 +23:408c SaveMenu_CopyTilemapAtOnce.loop_32660 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_32661 +23:409e SaveMenu_CopyTilemapAtOnce.loop_32662 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_32654 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_32655 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_32656 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_32657 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_32658 -23:413b PhoneRing_CopyTilemapAtOnce.loop_32659 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_32660 -23:414d PhoneRing_CopyTilemapAtOnce.loop_32661 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_32662 -23:415f PhoneRing_CopyTilemapAtOnce.loop_32663 +23:410e PhoneRing_CopyTilemapAtOnce.loop_32665 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_32666 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_32667 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_32668 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_32669 +23:413b PhoneRing_CopyTilemapAtOnce.loop_32670 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_32671 +23:414d PhoneRing_CopyTilemapAtOnce.loop_32672 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_32673 +23:415f PhoneRing_CopyTilemapAtOnce.loop_32674 23:417a _ResetClock 23:41bb _ResetClock.wrongpassword 23:41c2 _ResetClock.PasswordAskResetText @@ -11236,11 +11278,11 @@ 23:4979 WipeLYOverrides.wipe 23:497c WipeLYOverrides.loop 23:4981 StartTrainerBattle_DrawSineWave -23:498c StartTrainerBattle_DrawSineWave.negative_33042 -23:4996 StartTrainerBattle_DrawSineWave.apply_33042 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_33042 -23:49aa StartTrainerBattle_DrawSineWave.even_33042 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_33042 +23:498c StartTrainerBattle_DrawSineWave.negative_33053 +23:4996 StartTrainerBattle_DrawSineWave.apply_33053 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_33053 +23:49aa StartTrainerBattle_DrawSineWave.even_33053 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_33053 23:49f2 StartTrainerBattle_ZoomToBlack 23:49fb StartTrainerBattle_ZoomToBlack.loop 23:4a16 StartTrainerBattle_ZoomToBlack.done @@ -11587,11 +11629,11 @@ 23:6670 Sprites_Cosine 23:6670 BrokenStdGFXPointers.deleted 23:6672 Sprites_Sine -23:667d Sprites_Sine.negative_33997 -23:6687 Sprites_Sine.apply_33997 -23:6696 Sprites_Sine.multiply_33997 -23:669b Sprites_Sine.even_33997 -23:66a3 Sprites_Sine.sinetable_33997 +23:667d Sprites_Sine.negative_34008 +23:6687 Sprites_Sine.apply_34008 +23:6696 Sprites_Sine.multiply_34008 +23:669b Sprites_Sine.even_34008 +23:66a3 Sprites_Sine.sinetable_34008 23:66e3 AnimateEndOfExpBar 23:66ee AnimateEndOfExpBar.load 23:66fb AnimateEndOfExpBar.loop @@ -15723,10 +15765,10 @@ 33:6671 BattleAnim_IncAnonJumptableIndex 33:6677 BattleAnim_Cosine 33:6679 BattleAnim_Sine -33:6684 BattleAnim_Sine.negative_39868 -33:668e BattleAnim_Sine.apply_39868 -33:669d BattleAnim_Sine.multiply_39868 -33:66a2 BattleAnim_Sine.even_39868 +33:6684 BattleAnim_Sine.negative_39879 +33:668e BattleAnim_Sine.apply_39879 +33:669d BattleAnim_Sine.multiply_39879 +33:66a2 BattleAnim_Sine.even_39879 33:66aa BattleAnim_Sine_e 33:66b0 BattleAnim_Cosine_e 33:66b6 BattleAnim_AbsSinePrecise @@ -16548,14 +16590,14 @@ 38:7511 BillsPC_RefreshTextboxes.placeholder_string 38:7518 BillsPC_RefreshTextboxes.Placeholder 38:751e CopyBoxmonSpecies -38:7545 CopyBoxmonSpecies.loop_42566 -38:7567 CopyBoxmonSpecies.done_42566 +38:7545 CopyBoxmonSpecies.loop_42577 +38:7567 CopyBoxmonSpecies.done_42577 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_42567 -38:759a CopyBoxmonSpecies.done_42567 +38:7578 CopyBoxmonSpecies.loop_42578 +38:759a CopyBoxmonSpecies.done_42578 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_42568 -38:75cf CopyBoxmonSpecies.done_42568 +38:75ad CopyBoxmonSpecies.loop_42579 +38:75cf CopyBoxmonSpecies.done_42579 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor