From 208c5447a8cfbc25a37f6ee0f9dfd7112d4e8a2b Mon Sep 17 00:00:00 2001 From: travis Date: Wed, 17 Mar 2021 20:45:05 +0000 Subject: [PATCH] Consistent labels for each nickname in RAM --- pokegold.sym | 337 +++++++++++++++++++++++++------------------ pokegold_debug.sym | 337 +++++++++++++++++++++++++------------------ pokesilver.sym | 337 +++++++++++++++++++++++++------------------ pokesilver_debug.sym | 337 +++++++++++++++++++++++++------------------ 4 files changed, 780 insertions(+), 568 deletions(-) diff --git a/pokegold.sym b/pokegold.sym index 5c762bd2..814b1d09 100644 --- a/pokegold.sym +++ b/pokegold.sym @@ -271,7 +271,7 @@ 00:0f7e DummyChar 00:0f7f NextChar 00:0f83 CheckDict -00:1014 CheckDict.__7889 +00:1014 CheckDict.__7890 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_8076 -00:2039 LoadMetatiles.next_8081 -00:204c LoadMetatiles.next_8086 +00:2026 LoadMetatiles.next_8077 +00:2039 LoadMetatiles.next_8082 +00:204c LoadMetatiles.next_8087 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_8168 -00:34e3 CopyTilemapAtOnce.loop_8169 -00:34ec CopyTilemapAtOnce.loop_8170 -00:34f5 CopyTilemapAtOnce.loop_8171 -00:34fe CopyTilemapAtOnce.loop_8172 -00:3507 CopyTilemapAtOnce.loop_8173 -00:3510 CopyTilemapAtOnce.loop_8174 -00:3519 CopyTilemapAtOnce.loop_8175 -00:3522 CopyTilemapAtOnce.loop_8176 -00:352b CopyTilemapAtOnce.loop_8177 +00:34da CopyTilemapAtOnce.loop_8169 +00:34e3 CopyTilemapAtOnce.loop_8170 +00:34ec CopyTilemapAtOnce.loop_8171 +00:34f5 CopyTilemapAtOnce.loop_8172 +00:34fe CopyTilemapAtOnce.loop_8173 +00:3507 CopyTilemapAtOnce.loop_8174 +00:3510 CopyTilemapAtOnce.loop_8175 +00:3519 CopyTilemapAtOnce.loop_8176 +00:3522 CopyTilemapAtOnce.loop_8177 +00:352b CopyTilemapAtOnce.loop_8178 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -1109,8 +1109,8 @@ 00:3a79 GetBaseData 00:3a9e GetBaseData.egg 00:3ab3 GetBaseData.end -00:3abf GetCurNick -00:3ac5 GetNick +00:3abf GetCurNickname +00:3ac5 GetNickname 00:3ade PrintBCDNumber 00:3af0 PrintBCDNumber.loop 00:3b07 PrintBCDNumber.skipLeftAlignmentAdjustment @@ -1954,7 +1954,7 @@ 01:73e1 GiveShuckle 01:743f GiveShuckle.NotGiven 01:7444 SpecialShuckleOT -01:744a SpecialShuckleNick +01:744a SpecialShuckleNickname 01:7452 ReturnShuckie 01:7483 ReturnShuckie.CheckOT 01:748f ReturnShuckie.done @@ -2084,11 +2084,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13155 -02:4adf _Sine.apply_13155 -02:4aee _Sine.multiply_13155 -02:4af3 _Sine.even_13155 -02:4afb _Sine.sinetable_13155 +02:4ad5 _Sine.negative_13156 +02:4adf _Sine.apply_13156 +02:4aee _Sine.multiply_13156 +02:4af3 _Sine.even_13156 +02:4afb _Sine.sinetable_13156 02:4b3b GetPredefPointer 02:4b5b PredefPointers 02:4b5b LearnMovePredef @@ -2682,7 +2682,7 @@ 03:472f FieldMoveJumptableReset 03:473a FieldMoveJumptable 03:4747 FieldMoveJumptable.okay -03:474b GetPartyNick +03:474b GetPartyNickname 03:4766 CheckEngineFlag 03:4774 CheckEngineFlag.isset 03:4776 CheckBadge @@ -11310,31 +11310,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_41935 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_41936 -23:405f SaveMenu_CopyTilemapAtOnce.loop_41937 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_41938 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_41939 -23:407a SaveMenu_CopyTilemapAtOnce.loop_41940 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_41941 -23:408c SaveMenu_CopyTilemapAtOnce.loop_41942 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_41943 -23:409e SaveMenu_CopyTilemapAtOnce.loop_41944 +23:404d SaveMenu_CopyTilemapAtOnce.loop_41936 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_41937 +23:405f SaveMenu_CopyTilemapAtOnce.loop_41938 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_41939 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_41940 +23:407a SaveMenu_CopyTilemapAtOnce.loop_41941 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_41942 +23:408c SaveMenu_CopyTilemapAtOnce.loop_41943 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_41944 +23:409e SaveMenu_CopyTilemapAtOnce.loop_41945 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_41947 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_41948 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_41949 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_41950 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_41951 -23:413b PhoneRing_CopyTilemapAtOnce.loop_41952 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_41953 -23:414d PhoneRing_CopyTilemapAtOnce.loop_41954 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_41955 -23:415f PhoneRing_CopyTilemapAtOnce.loop_41956 +23:410e PhoneRing_CopyTilemapAtOnce.loop_41948 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_41949 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_41950 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_41951 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_41952 +23:413b PhoneRing_CopyTilemapAtOnce.loop_41953 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_41954 +23:414d PhoneRing_CopyTilemapAtOnce.loop_41955 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_41956 +23:415f PhoneRing_CopyTilemapAtOnce.loop_41957 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_42376 -23:4996 StartTrainerBattle_DrawSineWave.apply_42376 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_42376 -23:49aa StartTrainerBattle_DrawSineWave.even_42376 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42376 +23:498c StartTrainerBattle_DrawSineWave.negative_42377 +23:4996 StartTrainerBattle_DrawSineWave.apply_42377 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_42377 +23:49aa StartTrainerBattle_DrawSineWave.even_42377 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42377 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_43342 -23:66a1 Sprites_Sine.apply_43342 -23:66b0 Sprites_Sine.multiply_43342 -23:66b5 Sprites_Sine.even_43342 -23:66bd Sprites_Sine.sinetable_43342 +23:6697 Sprites_Sine.negative_43343 +23:66a1 Sprites_Sine.apply_43343 +23:66b0 Sprites_Sine.multiply_43343 +23:66b5 Sprites_Sine.even_43343 +23:66bd Sprites_Sine.sinetable_43343 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_49278 -33:668e BattleAnim_Sine.apply_49278 -33:669d BattleAnim_Sine.multiply_49278 -33:66a2 BattleAnim_Sine.even_49278 +33:6684 BattleAnim_Sine.negative_49279 +33:668e BattleAnim_Sine.apply_49279 +33:669d BattleAnim_Sine.multiply_49279 +33:66a2 BattleAnim_Sine.even_49279 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_52126 -38:7567 CopyBoxmonSpecies.done_52126 +38:7545 CopyBoxmonSpecies.loop_52127 +38:7567 CopyBoxmonSpecies.done_52127 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_52127 -38:759a CopyBoxmonSpecies.done_52127 +38:7578 CopyBoxmonSpecies.loop_52128 +38:759a CopyBoxmonSpecies.done_52128 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_52128 -38:75cf CopyBoxmonSpecies.done_52128 +38:75ad CopyBoxmonSpecies.loop_52129 +38:75cf CopyBoxmonSpecies.done_52129 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor @@ -30005,7 +30005,7 @@ 00:a600 sPartyMon1Mail 00:a620 sPartyMon1MailMessageEnd 00:a621 sPartyMon1MailAuthor -00:a629 sPartyMon1MailAuthorNationality +00:a629 sPartyMon1MailNationality 00:a62b sPartyMon1MailAuthorID 00:a62d sPartyMon1MailSpecies 00:a62e sPartyMon1MailType @@ -30014,7 +30014,7 @@ 00:a62f sPartyMon1MailEnd 00:a64f sPartyMon2MailMessageEnd 00:a650 sPartyMon2MailAuthor -00:a658 sPartyMon2MailAuthorNationality +00:a658 sPartyMon2MailNationality 00:a65a sPartyMon2MailAuthorID 00:a65c sPartyMon2MailSpecies 00:a65d sPartyMon2MailType @@ -30023,7 +30023,7 @@ 00:a65e sPartyMon3Mail 00:a67e sPartyMon3MailMessageEnd 00:a67f sPartyMon3MailAuthor -00:a687 sPartyMon3MailAuthorNationality +00:a687 sPartyMon3MailNationality 00:a689 sPartyMon3MailAuthorID 00:a68b sPartyMon3MailSpecies 00:a68c sPartyMon3MailType @@ -30032,7 +30032,7 @@ 00:a68d sPartyMon4MailMessage 00:a6ad sPartyMon4MailMessageEnd 00:a6ae sPartyMon4MailAuthor -00:a6b6 sPartyMon4MailAuthorNationality +00:a6b6 sPartyMon4MailNationality 00:a6b8 sPartyMon4MailAuthorID 00:a6ba sPartyMon4MailSpecies 00:a6bb sPartyMon4MailType @@ -30041,7 +30041,7 @@ 00:a6bc sPartyMon5MailMessage 00:a6dc sPartyMon5MailMessageEnd 00:a6dd sPartyMon5MailAuthor -00:a6e5 sPartyMon5MailAuthorNationality +00:a6e5 sPartyMon5MailNationality 00:a6e7 sPartyMon5MailAuthorID 00:a6e9 sPartyMon5MailSpecies 00:a6ea sPartyMon5MailType @@ -30050,7 +30050,7 @@ 00:a6eb sPartyMon6Mail 00:a70b sPartyMon6MailMessageEnd 00:a70c sPartyMon6MailAuthor -00:a714 sPartyMon6MailAuthorNationality +00:a714 sPartyMon6MailNationality 00:a716 sPartyMon6MailAuthorID 00:a718 sPartyMon6MailSpecies 00:a719 sPartyMon6MailType @@ -30060,7 +30060,7 @@ 00:a71a sPartyMon6MailEnd 00:a73a sPartyMon1MailBackupMessageEnd 00:a73b sPartyMon1MailBackupAuthor -00:a743 sPartyMon1MailBackupAuthorNationality +00:a743 sPartyMon1MailBackupNationality 00:a745 sPartyMon1MailBackupAuthorID 00:a747 sPartyMon1MailBackupSpecies 00:a748 sPartyMon1MailBackupType @@ -30069,7 +30069,7 @@ 00:a749 sPartyMon1MailBackupEnd 00:a769 sPartyMon2MailBackupMessageEnd 00:a76a sPartyMon2MailBackupAuthor -00:a772 sPartyMon2MailBackupAuthorNationality +00:a772 sPartyMon2MailBackupNationality 00:a774 sPartyMon2MailBackupAuthorID 00:a776 sPartyMon2MailBackupSpecies 00:a777 sPartyMon2MailBackupType @@ -30078,7 +30078,7 @@ 00:a778 sPartyMon2MailBackupEnd 00:a798 sPartyMon3MailBackupMessageEnd 00:a799 sPartyMon3MailBackupAuthor -00:a7a1 sPartyMon3MailBackupAuthorNationality +00:a7a1 sPartyMon3MailBackupNationality 00:a7a3 sPartyMon3MailBackupAuthorID 00:a7a5 sPartyMon3MailBackupSpecies 00:a7a6 sPartyMon3MailBackupType @@ -30087,7 +30087,7 @@ 00:a7a7 sPartyMon4MailBackupMessage 00:a7c7 sPartyMon4MailBackupMessageEnd 00:a7c8 sPartyMon4MailBackupAuthor -00:a7d0 sPartyMon4MailBackupAuthorNationality +00:a7d0 sPartyMon4MailBackupNationality 00:a7d2 sPartyMon4MailBackupAuthorID 00:a7d4 sPartyMon4MailBackupSpecies 00:a7d5 sPartyMon4MailBackupType @@ -30096,7 +30096,7 @@ 00:a7d6 sPartyMon5MailBackup 00:a7f6 sPartyMon5MailBackupMessageEnd 00:a7f7 sPartyMon5MailBackupAuthor -00:a7ff sPartyMon5MailBackupAuthorNationality +00:a7ff sPartyMon5MailBackupNationality 00:a801 sPartyMon5MailBackupAuthorID 00:a803 sPartyMon5MailBackupSpecies 00:a804 sPartyMon5MailBackupType @@ -30105,7 +30105,7 @@ 00:a805 sPartyMon6MailBackup 00:a825 sPartyMon6MailBackupMessageEnd 00:a826 sPartyMon6MailBackupAuthor -00:a82e sPartyMon6MailBackupAuthorNationality +00:a82e sPartyMon6MailBackupNationality 00:a830 sPartyMon6MailBackupAuthorID 00:a832 sPartyMon6MailBackupSpecies 00:a833 sPartyMon6MailBackupType @@ -30116,7 +30116,7 @@ 00:a835 sMailboxes 00:a855 sMailbox1MessageEnd 00:a856 sMailbox1Author -00:a85e sMailbox1AuthorNationality +00:a85e sMailbox1Nationality 00:a860 sMailbox1AuthorID 00:a862 sMailbox1Species 00:a863 sMailbox1Type @@ -30125,7 +30125,7 @@ 00:a864 sMailbox2Message 00:a884 sMailbox2MessageEnd 00:a885 sMailbox2Author -00:a88d sMailbox2AuthorNationality +00:a88d sMailbox2Nationality 00:a88f sMailbox2AuthorID 00:a891 sMailbox2Species 00:a892 sMailbox2Type @@ -30134,7 +30134,7 @@ 00:a893 sMailbox2End 00:a8b3 sMailbox3MessageEnd 00:a8b4 sMailbox3Author -00:a8bc sMailbox3AuthorNationality +00:a8bc sMailbox3Nationality 00:a8be sMailbox3AuthorID 00:a8c0 sMailbox3Species 00:a8c1 sMailbox3Type @@ -30143,7 +30143,7 @@ 00:a8c2 sMailbox3End 00:a8e2 sMailbox4MessageEnd 00:a8e3 sMailbox4Author -00:a8eb sMailbox4AuthorNationality +00:a8eb sMailbox4Nationality 00:a8ed sMailbox4AuthorID 00:a8ef sMailbox4Species 00:a8f0 sMailbox4Type @@ -30152,7 +30152,7 @@ 00:a8f1 sMailbox5Message 00:a911 sMailbox5MessageEnd 00:a912 sMailbox5Author -00:a91a sMailbox5AuthorNationality +00:a91a sMailbox5Nationality 00:a91c sMailbox5AuthorID 00:a91e sMailbox5Species 00:a91f sMailbox5Type @@ -30161,7 +30161,7 @@ 00:a920 sMailbox5End 00:a940 sMailbox6MessageEnd 00:a941 sMailbox6Author -00:a949 sMailbox6AuthorNationality +00:a949 sMailbox6Nationality 00:a94b sMailbox6AuthorID 00:a94d sMailbox6Species 00:a94e sMailbox6Type @@ -30170,7 +30170,7 @@ 00:a94f sMailbox7Message 00:a96f sMailbox7MessageEnd 00:a970 sMailbox7Author -00:a978 sMailbox7AuthorNationality +00:a978 sMailbox7Nationality 00:a97a sMailbox7AuthorID 00:a97c sMailbox7Species 00:a97d sMailbox7Type @@ -30179,7 +30179,7 @@ 00:a97e sMailbox7End 00:a99e sMailbox8MessageEnd 00:a99f sMailbox8Author -00:a9a7 sMailbox8AuthorNationality +00:a9a7 sMailbox8Nationality 00:a9a9 sMailbox8AuthorID 00:a9ab sMailbox8Species 00:a9ac sMailbox8Type @@ -30188,7 +30188,7 @@ 00:a9ad sMailbox8End 00:a9cd sMailbox9MessageEnd 00:a9ce sMailbox9Author -00:a9d6 sMailbox9AuthorNationality +00:a9d6 sMailbox9Nationality 00:a9d8 sMailbox9AuthorID 00:a9da sMailbox9Species 00:a9db sMailbox9Type @@ -30197,7 +30197,7 @@ 00:a9dc sMailbox9End 00:a9fc sMailbox10MessageEnd 00:a9fd sMailbox10Author -00:aa05 sMailbox10AuthorNationality +00:aa05 sMailbox10Nationality 00:aa07 sMailbox10AuthorID 00:aa09 sMailbox10Species 00:aa0a sMailbox10Type @@ -30208,7 +30208,7 @@ 00:aa0c sMailbox1Backup 00:aa2c sMailbox1BackupMessageEnd 00:aa2d sMailbox1BackupAuthor -00:aa35 sMailbox1BackupAuthorNationality +00:aa35 sMailbox1BackupNationality 00:aa37 sMailbox1BackupAuthorID 00:aa39 sMailbox1BackupSpecies 00:aa3a sMailbox1BackupType @@ -30217,7 +30217,7 @@ 00:aa3b sMailbox1BackupEnd 00:aa5b sMailbox2BackupMessageEnd 00:aa5c sMailbox2BackupAuthor -00:aa64 sMailbox2BackupAuthorNationality +00:aa64 sMailbox2BackupNationality 00:aa66 sMailbox2BackupAuthorID 00:aa68 sMailbox2BackupSpecies 00:aa69 sMailbox2BackupType @@ -30226,7 +30226,7 @@ 00:aa6a sMailbox2BackupEnd 00:aa8a sMailbox3BackupMessageEnd 00:aa8b sMailbox3BackupAuthor -00:aa93 sMailbox3BackupAuthorNationality +00:aa93 sMailbox3BackupNationality 00:aa95 sMailbox3BackupAuthorID 00:aa97 sMailbox3BackupSpecies 00:aa98 sMailbox3BackupType @@ -30235,7 +30235,7 @@ 00:aa99 sMailbox3BackupEnd 00:aab9 sMailbox4BackupMessageEnd 00:aaba sMailbox4BackupAuthor -00:aac2 sMailbox4BackupAuthorNationality +00:aac2 sMailbox4BackupNationality 00:aac4 sMailbox4BackupAuthorID 00:aac6 sMailbox4BackupSpecies 00:aac7 sMailbox4BackupType @@ -30244,7 +30244,7 @@ 00:aac8 sMailbox4BackupEnd 00:aae8 sMailbox5BackupMessageEnd 00:aae9 sMailbox5BackupAuthor -00:aaf1 sMailbox5BackupAuthorNationality +00:aaf1 sMailbox5BackupNationality 00:aaf3 sMailbox5BackupAuthorID 00:aaf5 sMailbox5BackupSpecies 00:aaf6 sMailbox5BackupType @@ -30253,7 +30253,7 @@ 00:aaf7 sMailbox6Backup 00:ab17 sMailbox6BackupMessageEnd 00:ab18 sMailbox6BackupAuthor -00:ab20 sMailbox6BackupAuthorNationality +00:ab20 sMailbox6BackupNationality 00:ab22 sMailbox6BackupAuthorID 00:ab24 sMailbox6BackupSpecies 00:ab25 sMailbox6BackupType @@ -30262,7 +30262,7 @@ 00:ab26 sMailbox7BackupMessage 00:ab46 sMailbox7BackupMessageEnd 00:ab47 sMailbox7BackupAuthor -00:ab4f sMailbox7BackupAuthorNationality +00:ab4f sMailbox7BackupNationality 00:ab51 sMailbox7BackupAuthorID 00:ab53 sMailbox7BackupSpecies 00:ab54 sMailbox7BackupType @@ -30271,7 +30271,7 @@ 00:ab55 sMailbox7BackupEnd 00:ab75 sMailbox8BackupMessageEnd 00:ab76 sMailbox8BackupAuthor -00:ab7e sMailbox8BackupAuthorNationality +00:ab7e sMailbox8BackupNationality 00:ab80 sMailbox8BackupAuthorID 00:ab82 sMailbox8BackupSpecies 00:ab83 sMailbox8BackupType @@ -30280,7 +30280,7 @@ 00:ab84 sMailbox9BackupMessage 00:aba4 sMailbox9BackupMessageEnd 00:aba5 sMailbox9BackupAuthor -00:abad sMailbox9BackupAuthorNationality +00:abad sMailbox9BackupNationality 00:abaf sMailbox9BackupAuthorID 00:abb1 sMailbox9BackupSpecies 00:abb2 sMailbox9BackupType @@ -30289,7 +30289,7 @@ 00:abb3 sMailbox10BackupMessage 00:abd3 sMailbox10BackupMessageEnd 00:abd4 sMailbox10BackupAuthor -00:abdc sMailbox10BackupAuthorNationality +00:abdc sMailbox10BackupNationality 00:abde sMailbox10BackupAuthorID 00:abe0 sMailbox10BackupSpecies 00:abe1 sMailbox10BackupType @@ -30354,7 +30354,7 @@ 01:ada1 sBoxMon1Level 01:ada2 sBoxMon1BoxEnd 01:ada2 sBoxMon2 -01:b002 sBoxMonOT +01:b002 sBoxMonOTs 01:b0de sBoxMonNicknames 01:b1ba sBoxMonNicknamesEnd 01:b1ba sBoxEnd @@ -31777,7 +31777,7 @@ 02:a035 sBox1Mon1Level 02:a036 sBox1Mon2 02:a036 sBox1Mon1BoxEnd -02:a296 sBox1MonOT +02:a296 sBox1MonOTs 02:a372 sBox1MonNicknames 02:a44e sBox1End 02:a44e sBox1MonNicknamesEnd @@ -31806,7 +31806,7 @@ 02:a485 sBox2Mon1Level 02:a486 sBox2Mon1BoxEnd 02:a486 sBox2Mon2 -02:a6e6 sBox2MonOT +02:a6e6 sBox2MonOTs 02:a7c2 sBox2MonNicknames 02:a89e sBox2End 02:a89e sBox2MonNicknamesEnd @@ -31835,7 +31835,7 @@ 02:a8d5 sBox3Mon1Level 02:a8d6 sBox3Mon1BoxEnd 02:a8d6 sBox3Mon2 -02:ab36 sBox3MonOT +02:ab36 sBox3MonOTs 02:ac12 sBox3MonNicknames 02:acee sBox3End 02:acee sBox3MonNicknamesEnd @@ -31864,7 +31864,7 @@ 02:ad25 sBox4Mon1Level 02:ad26 sBox4Mon2 02:ad26 sBox4Mon1BoxEnd -02:af86 sBox4MonOT +02:af86 sBox4MonOTs 02:b062 sBox4MonNicknames 02:b13e sBox4End 02:b13e sBox4MonNicknamesEnd @@ -31893,7 +31893,7 @@ 02:b175 sBox5Mon1Level 02:b176 sBox5Mon2 02:b176 sBox5Mon1BoxEnd -02:b3d6 sBox5MonOT +02:b3d6 sBox5MonOTs 02:b4b2 sBox5MonNicknames 02:b58e sBox5MonNicknamesEnd 02:b58e sBox5End @@ -31922,7 +31922,7 @@ 02:b5c5 sBox6Mon1Level 02:b5c6 sBox6Mon2 02:b5c6 sBox6Mon1BoxEnd -02:b826 sBox6MonOT +02:b826 sBox6MonOTs 02:b902 sBox6MonNicknames 02:b9de sBox6End 02:b9de sBox6MonNicknamesEnd @@ -31951,7 +31951,7 @@ 02:ba15 sBox7Mon1Level 02:ba16 sBox7Mon2 02:ba16 sBox7Mon1BoxEnd -02:bc76 sBox7MonOT +02:bc76 sBox7MonOTs 02:bd52 sBox7MonNicknames 02:be2e sBox7End 02:be2e sBox7MonNicknamesEnd @@ -31980,7 +31980,7 @@ 03:a035 sBox8Mon1Level 03:a036 sBox8Mon1BoxEnd 03:a036 sBox8Mon2 -03:a296 sBox8MonOT +03:a296 sBox8MonOTs 03:a372 sBox8MonNicknames 03:a44e sBox8MonNicknamesEnd 03:a44e sBox8End @@ -32009,7 +32009,7 @@ 03:a485 sBox9Mon1Level 03:a486 sBox9Mon2 03:a486 sBox9Mon1BoxEnd -03:a6e6 sBox9MonOT +03:a6e6 sBox9MonOTs 03:a7c2 sBox9MonNicknames 03:a89e sBox9MonNicknamesEnd 03:a89e sBox9End @@ -32038,7 +32038,7 @@ 03:a8d5 sBox10Mon1Level 03:a8d6 sBox10Mon1BoxEnd 03:a8d6 sBox10Mon2 -03:ab36 sBox10MonOT +03:ab36 sBox10MonOTs 03:ac12 sBox10MonNicknames 03:acee sBox10MonNicknamesEnd 03:acee sBox10End @@ -32067,7 +32067,7 @@ 03:ad25 sBox11Mon1Level 03:ad26 sBox11Mon1BoxEnd 03:ad26 sBox11Mon2 -03:af86 sBox11MonOT +03:af86 sBox11MonOTs 03:b062 sBox11MonNicknames 03:b13e sBox11End 03:b13e sBox11MonNicknamesEnd @@ -32096,7 +32096,7 @@ 03:b175 sBox12Mon1Level 03:b176 sBox12Mon2 03:b176 sBox12Mon1BoxEnd -03:b3d6 sBox12MonOT +03:b3d6 sBox12MonOTs 03:b4b2 sBox12MonNicknames 03:b58e sBox12End 03:b58e sBox12MonNicknamesEnd @@ -32125,7 +32125,7 @@ 03:b5c5 sBox13Mon1Level 03:b5c6 sBox13Mon1BoxEnd 03:b5c6 sBox13Mon2 -03:b826 sBox13MonOT +03:b826 sBox13MonOTs 03:b902 sBox13MonNicknames 03:b9de sBox13MonNicknamesEnd 03:b9de sBox13End @@ -32154,7 +32154,7 @@ 03:ba15 sBox14Mon1Level 03:ba16 sBox14Mon1BoxEnd 03:ba16 sBox14Mon2 -03:bc76 sBox14MonOT +03:bc76 sBox14MonOTs 03:bd52 sBox14MonNicknames 03:be2e sBox14MonNicknamesEnd 03:be2e sBox14End @@ -33190,7 +33190,7 @@ 00:c71b wTimeCapsulePartyMon1Moves 00:c71e wLinkPlayerPartyMon1StatExp 00:c71e wLinkPlayerPartyMon1HPExp -00:c71f wTimeCapsulePartyMon1OTID +00:c71f wTimeCapsulePartyMon1ID 00:c720 wLinkPlayerPartyMon1AtkExp 00:c721 wTimeCapsulePartyMon1Exp 00:c721 wHallOfFamePokemonListMon2End @@ -33266,7 +33266,7 @@ 00:c747 wTimeCapsulePartyMon2Moves 00:c749 wLinkPlayerPartyMon2ID 00:c74b wLinkPlayerPartyMon2Exp -00:c74b wTimeCapsulePartyMon2OTID +00:c74b wTimeCapsulePartyMon2ID 00:c74d wTimeCapsulePartyMon2Exp 00:c74e wLinkPlayerPartyMon2HPExp 00:c74e wLinkPlayerPartyMon2StatExp @@ -33332,7 +33332,7 @@ 00:c774 wLinkPlayerPartyMon3Item 00:c775 wLinkPlayerPartyMon3Moves 00:c776 wMysteryGiftTrainerEnd -00:c777 wTimeCapsulePartyMon3OTID +00:c777 wTimeCapsulePartyMon3ID 00:c779 wTimeCapsulePartyMon3Exp 00:c779 wLinkPlayerPartyMon3ID 00:c77b wLinkPlayerPartyMon3Exp @@ -33387,9 +33387,9 @@ 00:c7a0 wLYOverrides2 00:c7a1 wLinkPlayerPartyMon3SpclDef 00:c7a3 wLinkPlayerPartyMon4Species +00:c7a3 wTimeCapsulePartyMon4ID 00:c7a3 wLinkPlayerPartyMon3StructEnd 00:c7a3 wLinkPlayerPartyMon4 -00:c7a3 wTimeCapsulePartyMon4OTID 00:c7a4 wLinkPlayerPartyMon4Item 00:c7a5 wLinkPlayerPartyMon4Moves 00:c7a5 wTimeCapsulePartyMon4Exp @@ -33442,7 +33442,7 @@ 00:c7cb wLinkPlayerPartyMon4Defense 00:c7cd wLinkPlayerPartyMon4Speed 00:c7cf wLinkPlayerPartyMon4SpclAtk -00:c7cf wTimeCapsulePartyMon5OTID +00:c7cf wTimeCapsulePartyMon5ID 00:c7d1 wLinkPlayerPartyMon4SpclDef 00:c7d1 wTimeCapsulePartyMon5Exp 00:c7d3 wLinkPlayerPartyMon5Species @@ -33497,7 +33497,7 @@ 00:c7f9 wLinkPlayerPartyMon5Attack 00:c7f9 wLinkPlayerPartyMon5Stats 00:c7fb wLinkPlayerPartyMon5Defense -00:c7fb wTimeCapsulePartyMon6OTID +00:c7fb wTimeCapsulePartyMon6ID 00:c7fd wTimeCapsulePartyMon6Exp 00:c7fd wLinkPlayerPartyMon5Speed 00:c7ff wLinkPlayerPartyMon5SpclAtk @@ -33543,7 +33543,8 @@ 00:c818 wLinkPlayerPartyMon6DVs 00:c819 wTimeCapsulePartyMon6Special 00:c81a wLinkPlayerPartyMon6PP -00:c81b wTimeCapsulePartyMonOTNames +00:c81b wTimeCapsulePartyMonOTs +00:c81b wTimeCapsulePartyMon1OT 00:c81e wLinkPlayerPartyMon6Happiness 00:c81f wLinkPlayerPartyMon6PokerusStatus 00:c820 wLinkPlayerPartyMon6Unused1 @@ -33553,6 +33554,7 @@ 00:c823 wLinkPlayerPartyMon6BoxEnd 00:c824 wLinkPlayerPartyMon6Unused 00:c825 wLinkPlayerPartyMon6HP +00:c826 wTimeCapsulePartyMon2OT 00:c827 wLinkPlayerPartyMon6MaxHP 00:c829 wLinkPlayerPartyMon6Stats 00:c829 wLinkPlayerPartyMon6Attack @@ -33560,21 +33562,43 @@ 00:c82d wLinkPlayerPartyMon6Speed 00:c82f wLinkPlayerPartyMon6SpclAtk 00:c830 wLYOverrides2End +00:c831 wTimeCapsulePartyMon3OT 00:c831 wLinkPlayerPartyMon6SpclDef -00:c833 wLinkPlayerPartyMonOTNames +00:c833 wLinkPlayerPartyMon1OT +00:c833 wLinkPlayerPartyMonOTs 00:c833 wLinkPlayerPartyMon6StructEnd +00:c83c wTimeCapsulePartyMon4OT +00:c83e wLinkPlayerPartyMon2OT +00:c847 wTimeCapsulePartyMon5OT +00:c849 wLinkPlayerPartyMon3OT 00:c850 wMysteryGiftPlayerData 00:c851 wMysteryGiftPlayerID +00:c852 wTimeCapsulePartyMon6OT 00:c853 wMysteryGiftPlayerName -00:c85d wTimeCapsulePartyMonNicks +00:c854 wLinkPlayerPartyMon4OT +00:c85d wTimeCapsulePartyMonNicknames +00:c85d wTimeCapsulePartyMon1Nickname 00:c85e wMysteryGiftPlayerDexCaught 00:c85f wMysteryGiftPlayerSentDeco +00:c85f wLinkPlayerPartyMon5OT 00:c860 wMysteryGiftPlayerWhichItem 00:c861 wMysteryGiftPlayerWhichDeco 00:c862 wMysteryGiftPlayerBackupItem 00:c864 wMysteryGiftPlayerDataEnd -00:c875 wLinkPlayerPartyMonNicks +00:c868 wTimeCapsulePartyMon2Nickname +00:c86a wLinkPlayerPartyMon6OT +00:c873 wTimeCapsulePartyMon3Nickname +00:c875 wLinkPlayerPartyMonNicknames +00:c875 wLinkPlayerPartyMon1Nickname +00:c87e wTimeCapsulePartyMon4Nickname +00:c880 wLinkPlayerPartyMon2Nickname +00:c889 wTimeCapsulePartyMon5Nickname +00:c88b wLinkPlayerPartyMon3Nickname 00:c890 wLYOverridesBackupEnd +00:c894 wTimeCapsulePartyMon6Nickname +00:c896 wLinkPlayerPartyMon4Nickname +00:c8a1 wLinkPlayerPartyMon5Nickname +00:c8ac wLinkPlayerPartyMon6Nickname 00:c8f4 wLinkPlayerMail 00:c8f4 wLinkReceivedMail 00:c8f4 wLinkPlayerMailPreamble @@ -33588,7 +33612,7 @@ 00:c90a wActiveAnimObjects 00:c90a wAnimObject01 00:c90b wAnimObject01OAMFlags -00:c90c wAnimObject01Field02 +00:c90c wAnimObject01FixY 00:c90d wAnimObject01FramesetID 00:c90e wAnimObject01Function 00:c90f wAnimObject01Palette @@ -33606,7 +33630,7 @@ 00:c922 wAnimObject02Index 00:c922 wAnimObject02 00:c923 wAnimObject02OAMFlags -00:c924 wAnimObject02Field02 +00:c924 wAnimObject02FixY 00:c925 wAnimObject02FramesetID 00:c926 wAnimObject02Function 00:c927 wAnimObject02Palette @@ -33624,7 +33648,7 @@ 00:c93a wAnimObject03Index 00:c93a wAnimObject03 00:c93b wAnimObject03OAMFlags -00:c93c wAnimObject03Field02 +00:c93c wAnimObject03FixY 00:c93d wAnimObject03FramesetID 00:c93e wAnimObject03Function 00:c93f wAnimObject03Palette @@ -33642,7 +33666,7 @@ 00:c952 wAnimObject04 00:c952 wAnimObject04Index 00:c953 wAnimObject04OAMFlags -00:c954 wAnimObject04Field02 +00:c954 wAnimObject04FixY 00:c955 wAnimObject04FramesetID 00:c956 wAnimObject04Function 00:c957 wAnimObject04Palette @@ -33660,7 +33684,7 @@ 00:c96a wAnimObject05Index 00:c96a wAnimObject05 00:c96b wAnimObject05OAMFlags -00:c96c wAnimObject05Field02 +00:c96c wAnimObject05FixY 00:c96d wAnimObject05FramesetID 00:c96e wAnimObject05Function 00:c96f wAnimObject05Palette @@ -33682,7 +33706,7 @@ 00:c982 wAnimObject06 00:c982 wPrinterData 00:c983 wAnimObject06OAMFlags -00:c984 wAnimObject06Field02 +00:c984 wAnimObject06FixY 00:c985 wAnimObject06FramesetID 00:c986 wAnimObject06Function 00:c986 wPrinterChecksum @@ -33708,7 +33732,7 @@ 00:c99a wAnimObject07Index 00:c99a wAnimObject07 00:c99b wAnimObject07OAMFlags -00:c99c wAnimObject07Field02 +00:c99c wAnimObject07FixY 00:c99d wAnimObject07FramesetID 00:c99e wAnimObject07Function 00:c99f wAnimObject07Palette @@ -33726,7 +33750,7 @@ 00:c9b2 wAnimObject08Index 00:c9b2 wAnimObject08 00:c9b3 wAnimObject08OAMFlags -00:c9b4 wAnimObject08Field02 +00:c9b4 wAnimObject08FixY 00:c9b5 wAnimObject08FramesetID 00:c9b6 wAnimObject08Function 00:c9b7 wAnimObject08Palette @@ -33745,7 +33769,7 @@ 00:c9ca wAnimObject09 00:c9ca wAnimObject09Index 00:c9cb wAnimObject09OAMFlags -00:c9cc wAnimObject09Field02 +00:c9cc wAnimObject09FixY 00:c9cd wAnimObject09FramesetID 00:c9ce wAnimObject09Function 00:c9cf wAnimObject09Palette @@ -33763,7 +33787,7 @@ 00:c9e2 wAnimObject10Index 00:c9e2 wAnimObject10 00:c9e3 wAnimObject10OAMFlags -00:c9e4 wAnimObject10Field02 +00:c9e4 wAnimObject10FixY 00:c9e5 wAnimObject10FramesetID 00:c9e6 wAnimObject10Function 00:c9e7 wAnimObject10Palette @@ -33864,23 +33888,29 @@ 00:cae9 wEnemyMoveStructEffect 00:caea wEnemyMoveStructPower 00:caea wLinkOTPartyMonTypes +00:caea wLinkOTPartyMon1Type 00:caeb wEnemyMoveStructType +00:caec wLinkOTPartyMon2Type 00:caec wEnemyMoveStructAccuracy 00:caed wEnemyMoveStructPP 00:caee wEnemyMoveStructEffectChance +00:caee wLinkOTPartyMon3Type 00:caef wPlayerMoveStructAnimation 00:caef wPlayerMoveStruct 00:caf0 wPlayerMoveStructEffect +00:caf0 wLinkOTPartyMon4Type 00:caf1 wPlayerMoveStructPower 00:caf2 wPlayerMoveStructType +00:caf2 wLinkOTPartyMon5Type 00:caf3 wPlayerMoveStructAccuracy 00:caf4 wPlayerMoveStructPP +00:caf4 wLinkOTPartyMon6Type 00:caf5 wPlayerMoveStructEffectChance -00:caf6 wEnemyMonNick +00:caf6 wEnemyMonNickname 00:caf8 wPrinterStatus 00:cafa wPrinterMargins 00:cafb wPrinterExposureTime -00:cb01 wBattleMonNick +00:cb01 wBattleMonNickname 00:cb0c wBattleMonSpecies 00:cb0c wGameboyPrinterRAMEnd 00:cb0c wBattleMon @@ -34235,7 +34265,6 @@ 00:ceed wLuckyNumberDigitsBuffer 00:ceed wEarthquakeMovementDataBuffer 00:ceed wMonMailMessageBuffer -00:ceed wBufferMonNick 00:ceed wLinkBattleRecordBuffer 00:ceed wPokeFluteCuredSleep 00:ceed wDebugColorIsTrainer @@ -34267,6 +34296,7 @@ 00:ceed wNumOwnedDecoCategories 00:ceed wMartItem1BCD 00:ceed wTownMapPlayerIconLandmark +00:ceed wBufferMonNickname 00:ceee wPlaceBallsDirection 00:ceee wMovementBufferObject 00:ceee wNextRadioLine @@ -34281,10 +34311,10 @@ 00:ceee wTempPokedexCaughtCount 00:ceee wMagnetTrainInitPosition 00:ceee wTownMapCursorCoordinates +00:ceef wBufferTrademonNickname 00:ceef wRadioTextDelay 00:ceef wDebugColorCurTMHM 00:ceef wBugContestFirstPlaceScore -00:ceef wBufferTrademonNick 00:ceef wTownMapCursorObjectPointer 00:ceef wTrainerHUDTiles 00:ceef wBillsPCTempBoxCount @@ -34342,7 +34372,7 @@ 00:cf12 wBufferMonDefExp 00:cf14 wBufferMonSpdExp 00:cf16 wBufferMonSpcExp -00:cf16 wTempMailAuthorNationality +00:cf16 wTempMailNationality 00:cf18 wTempMailAuthorID 00:cf18 wBufferMonDVs 00:cf1a wTempMailSpecies @@ -35880,8 +35910,20 @@ 01:db46 wPartyMon6SpclAtk 01:db48 wPartyMon6SpclDef 01:db4a wPartyMon6StructEnd -01:db4a wPartyMonOT +01:db4a wPartyMon1OT +01:db4a wPartyMonOTs +01:db55 wPartyMon2OT +01:db60 wPartyMon3OT +01:db6b wPartyMon4OT +01:db76 wPartyMon5OT +01:db81 wPartyMon6OT 01:db8c wPartyMonNicknames +01:db8c wPartyMon1Nickname +01:db97 wPartyMon2Nickname +01:dba2 wPartyMon3Nickname +01:dbad wPartyMon4Nickname +01:dbb8 wPartyMon5Nickname +01:dbc3 wPartyMon6Nickname 01:dbce wPartyMonNicknamesEnd 01:dbe4 wPokedexCaught 01:dc04 wEndPokedexCaught @@ -35891,7 +35933,7 @@ 01:dc3e wUnlockedUnowns 01:dc3f wFirstUnownSeen 01:dc40 wDayCareMan -01:dc41 wBreedMon1Nick +01:dc41 wBreedMon1Nickname 01:dc4c wBreedMon1OT 01:dc57 wBreedMon1 01:dc57 wBreedMon1Species @@ -35916,7 +35958,7 @@ 01:dc77 wBreedMon1BoxEnd 01:dc78 wStepsToEgg 01:dc79 wBreedMotherOrNonDitto -01:dc7a wBreedMon2Nick +01:dc7a wBreedMon2Nickname 01:dc85 wBreedMon2OT 01:dc90 wBreedMon2Species 01:dc90 wBreedMon2 @@ -35937,9 +35979,9 @@ 01:dcad wBreedMon2Unused1 01:dcae wBreedMon2Unused2 01:dcaf wBreedMon2Level -01:dcb0 wEggNick +01:dcb0 wEggMonNickname 01:dcb0 wBreedMon2BoxEnd -01:dcbb wEggOT +01:dcbb wEggMonOT 01:dcc6 wEggMonSpecies 01:dcc6 wEggMon 01:dcc7 wEggMonItem @@ -36224,10 +36266,21 @@ 01:de77 wOTPartyMon6Speed 01:de79 wOTPartyMon6SpclAtk 01:de7b wOTPartyMon6SpclDef -01:de7d wOTPartyMonsEnd -01:de7d wOTPartyMonOT +01:de7d wOTPartyMonOTs +01:de7d wOTPartyMon1OT 01:de7d wOTPartyMon6StructEnd +01:de88 wOTPartyMon2OT +01:de93 wOTPartyMon3OT +01:de9e wOTPartyMon4OT +01:dea9 wOTPartyMon5OT +01:deb4 wOTPartyMon6OT 01:debf wOTPartyMonNicknames +01:debf wOTPartyMon1Nickname +01:deca wOTPartyMon2Nickname +01:ded5 wOTPartyMon3Nickname +01:dee0 wOTPartyMon4Nickname +01:deeb wOTPartyMon5Nickname +01:def6 wOTPartyMon6Nickname 01:df01 wGameDataEnd 01:df01 wPokemonDataEnd 01:df01 wOTPartyDataEnd diff --git a/pokegold_debug.sym b/pokegold_debug.sym index d1ac638f..37d25ed5 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.__7889 +00:1014 CheckDict.__7890 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_8076 -00:2039 LoadMetatiles.next_8081 -00:204c LoadMetatiles.next_8086 +00:2026 LoadMetatiles.next_8077 +00:2039 LoadMetatiles.next_8082 +00:204c LoadMetatiles.next_8087 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_8168 -00:34e3 CopyTilemapAtOnce.loop_8169 -00:34ec CopyTilemapAtOnce.loop_8170 -00:34f5 CopyTilemapAtOnce.loop_8171 -00:34fe CopyTilemapAtOnce.loop_8172 -00:3507 CopyTilemapAtOnce.loop_8173 -00:3510 CopyTilemapAtOnce.loop_8174 -00:3519 CopyTilemapAtOnce.loop_8175 -00:3522 CopyTilemapAtOnce.loop_8176 -00:352b CopyTilemapAtOnce.loop_8177 +00:34da CopyTilemapAtOnce.loop_8169 +00:34e3 CopyTilemapAtOnce.loop_8170 +00:34ec CopyTilemapAtOnce.loop_8171 +00:34f5 CopyTilemapAtOnce.loop_8172 +00:34fe CopyTilemapAtOnce.loop_8173 +00:3507 CopyTilemapAtOnce.loop_8174 +00:3510 CopyTilemapAtOnce.loop_8175 +00:3519 CopyTilemapAtOnce.loop_8176 +00:3522 CopyTilemapAtOnce.loop_8177 +00:352b CopyTilemapAtOnce.loop_8178 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -1109,8 +1109,8 @@ 00:3a79 GetBaseData 00:3a9e GetBaseData.egg 00:3ab3 GetBaseData.end -00:3abf GetCurNick -00:3ac5 GetNick +00:3abf GetCurNickname +00:3ac5 GetNickname 00:3ade PrintBCDNumber 00:3af0 PrintBCDNumber.loop 00:3b07 PrintBCDNumber.skipLeftAlignmentAdjustment @@ -1955,7 +1955,7 @@ 01:73f7 GiveShuckle 01:7455 GiveShuckle.NotGiven 01:745a SpecialShuckleOT -01:7460 SpecialShuckleNick +01:7460 SpecialShuckleNickname 01:7468 ReturnShuckie 01:7499 ReturnShuckie.CheckOT 01:74a5 ReturnShuckie.done @@ -2085,11 +2085,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13157 -02:4adf _Sine.apply_13157 -02:4aee _Sine.multiply_13157 -02:4af3 _Sine.even_13157 -02:4afb _Sine.sinetable_13157 +02:4ad5 _Sine.negative_13158 +02:4adf _Sine.apply_13158 +02:4aee _Sine.multiply_13158 +02:4af3 _Sine.even_13158 +02:4afb _Sine.sinetable_13158 02:4b3b GetPredefPointer 02:4b5b PredefPointers 02:4b5b LearnMovePredef @@ -2683,7 +2683,7 @@ 03:472f FieldMoveJumptableReset 03:473a FieldMoveJumptable 03:4747 FieldMoveJumptable.okay -03:474b GetPartyNick +03:474b GetPartyNickname 03:4766 CheckEngineFlag 03:4774 CheckEngineFlag.isset 03:4776 CheckBadge @@ -11311,31 +11311,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_41937 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_41938 -23:405f SaveMenu_CopyTilemapAtOnce.loop_41939 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_41940 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_41941 -23:407a SaveMenu_CopyTilemapAtOnce.loop_41942 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_41943 -23:408c SaveMenu_CopyTilemapAtOnce.loop_41944 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_41945 -23:409e SaveMenu_CopyTilemapAtOnce.loop_41946 +23:404d SaveMenu_CopyTilemapAtOnce.loop_41938 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_41939 +23:405f SaveMenu_CopyTilemapAtOnce.loop_41940 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_41941 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_41942 +23:407a SaveMenu_CopyTilemapAtOnce.loop_41943 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_41944 +23:408c SaveMenu_CopyTilemapAtOnce.loop_41945 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_41946 +23:409e SaveMenu_CopyTilemapAtOnce.loop_41947 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_41949 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_41950 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_41951 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_41952 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_41953 -23:413b PhoneRing_CopyTilemapAtOnce.loop_41954 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_41955 -23:414d PhoneRing_CopyTilemapAtOnce.loop_41956 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_41957 -23:415f PhoneRing_CopyTilemapAtOnce.loop_41958 +23:410e PhoneRing_CopyTilemapAtOnce.loop_41950 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_41951 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_41952 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_41953 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_41954 +23:413b PhoneRing_CopyTilemapAtOnce.loop_41955 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_41956 +23:414d PhoneRing_CopyTilemapAtOnce.loop_41957 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_41958 +23:415f PhoneRing_CopyTilemapAtOnce.loop_41959 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_42378 -23:4996 StartTrainerBattle_DrawSineWave.apply_42378 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_42378 -23:49aa StartTrainerBattle_DrawSineWave.even_42378 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42378 +23:498c StartTrainerBattle_DrawSineWave.negative_42379 +23:4996 StartTrainerBattle_DrawSineWave.apply_42379 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_42379 +23:49aa StartTrainerBattle_DrawSineWave.even_42379 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42379 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_43344 -23:66a1 Sprites_Sine.apply_43344 -23:66b0 Sprites_Sine.multiply_43344 -23:66b5 Sprites_Sine.even_43344 -23:66bd Sprites_Sine.sinetable_43344 +23:6697 Sprites_Sine.negative_43345 +23:66a1 Sprites_Sine.apply_43345 +23:66b0 Sprites_Sine.multiply_43345 +23:66b5 Sprites_Sine.even_43345 +23:66bd Sprites_Sine.sinetable_43345 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_49280 -33:668e BattleAnim_Sine.apply_49280 -33:669d BattleAnim_Sine.multiply_49280 -33:66a2 BattleAnim_Sine.even_49280 +33:6684 BattleAnim_Sine.negative_49281 +33:668e BattleAnim_Sine.apply_49281 +33:669d BattleAnim_Sine.multiply_49281 +33:66a2 BattleAnim_Sine.even_49281 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_52128 -38:7567 CopyBoxmonSpecies.done_52128 +38:7545 CopyBoxmonSpecies.loop_52129 +38:7567 CopyBoxmonSpecies.done_52129 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_52129 -38:759a CopyBoxmonSpecies.done_52129 +38:7578 CopyBoxmonSpecies.loop_52130 +38:759a CopyBoxmonSpecies.done_52130 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_52130 -38:75cf CopyBoxmonSpecies.done_52130 +38:75ad CopyBoxmonSpecies.loop_52131 +38:75cf CopyBoxmonSpecies.done_52131 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor @@ -30169,7 +30169,7 @@ 00:a600 sPartyMon1Mail 00:a620 sPartyMon1MailMessageEnd 00:a621 sPartyMon1MailAuthor -00:a629 sPartyMon1MailAuthorNationality +00:a629 sPartyMon1MailNationality 00:a62b sPartyMon1MailAuthorID 00:a62d sPartyMon1MailSpecies 00:a62e sPartyMon1MailType @@ -30178,7 +30178,7 @@ 00:a62f sPartyMon1MailEnd 00:a64f sPartyMon2MailMessageEnd 00:a650 sPartyMon2MailAuthor -00:a658 sPartyMon2MailAuthorNationality +00:a658 sPartyMon2MailNationality 00:a65a sPartyMon2MailAuthorID 00:a65c sPartyMon2MailSpecies 00:a65d sPartyMon2MailType @@ -30187,7 +30187,7 @@ 00:a65e sPartyMon3Mail 00:a67e sPartyMon3MailMessageEnd 00:a67f sPartyMon3MailAuthor -00:a687 sPartyMon3MailAuthorNationality +00:a687 sPartyMon3MailNationality 00:a689 sPartyMon3MailAuthorID 00:a68b sPartyMon3MailSpecies 00:a68c sPartyMon3MailType @@ -30196,7 +30196,7 @@ 00:a68d sPartyMon4MailMessage 00:a6ad sPartyMon4MailMessageEnd 00:a6ae sPartyMon4MailAuthor -00:a6b6 sPartyMon4MailAuthorNationality +00:a6b6 sPartyMon4MailNationality 00:a6b8 sPartyMon4MailAuthorID 00:a6ba sPartyMon4MailSpecies 00:a6bb sPartyMon4MailType @@ -30205,7 +30205,7 @@ 00:a6bc sPartyMon5MailMessage 00:a6dc sPartyMon5MailMessageEnd 00:a6dd sPartyMon5MailAuthor -00:a6e5 sPartyMon5MailAuthorNationality +00:a6e5 sPartyMon5MailNationality 00:a6e7 sPartyMon5MailAuthorID 00:a6e9 sPartyMon5MailSpecies 00:a6ea sPartyMon5MailType @@ -30214,7 +30214,7 @@ 00:a6eb sPartyMon6Mail 00:a70b sPartyMon6MailMessageEnd 00:a70c sPartyMon6MailAuthor -00:a714 sPartyMon6MailAuthorNationality +00:a714 sPartyMon6MailNationality 00:a716 sPartyMon6MailAuthorID 00:a718 sPartyMon6MailSpecies 00:a719 sPartyMon6MailType @@ -30224,7 +30224,7 @@ 00:a71a sPartyMon6MailEnd 00:a73a sPartyMon1MailBackupMessageEnd 00:a73b sPartyMon1MailBackupAuthor -00:a743 sPartyMon1MailBackupAuthorNationality +00:a743 sPartyMon1MailBackupNationality 00:a745 sPartyMon1MailBackupAuthorID 00:a747 sPartyMon1MailBackupSpecies 00:a748 sPartyMon1MailBackupType @@ -30233,7 +30233,7 @@ 00:a749 sPartyMon1MailBackupEnd 00:a769 sPartyMon2MailBackupMessageEnd 00:a76a sPartyMon2MailBackupAuthor -00:a772 sPartyMon2MailBackupAuthorNationality +00:a772 sPartyMon2MailBackupNationality 00:a774 sPartyMon2MailBackupAuthorID 00:a776 sPartyMon2MailBackupSpecies 00:a777 sPartyMon2MailBackupType @@ -30242,7 +30242,7 @@ 00:a778 sPartyMon2MailBackupEnd 00:a798 sPartyMon3MailBackupMessageEnd 00:a799 sPartyMon3MailBackupAuthor -00:a7a1 sPartyMon3MailBackupAuthorNationality +00:a7a1 sPartyMon3MailBackupNationality 00:a7a3 sPartyMon3MailBackupAuthorID 00:a7a5 sPartyMon3MailBackupSpecies 00:a7a6 sPartyMon3MailBackupType @@ -30251,7 +30251,7 @@ 00:a7a7 sPartyMon4MailBackupMessage 00:a7c7 sPartyMon4MailBackupMessageEnd 00:a7c8 sPartyMon4MailBackupAuthor -00:a7d0 sPartyMon4MailBackupAuthorNationality +00:a7d0 sPartyMon4MailBackupNationality 00:a7d2 sPartyMon4MailBackupAuthorID 00:a7d4 sPartyMon4MailBackupSpecies 00:a7d5 sPartyMon4MailBackupType @@ -30260,7 +30260,7 @@ 00:a7d6 sPartyMon5MailBackup 00:a7f6 sPartyMon5MailBackupMessageEnd 00:a7f7 sPartyMon5MailBackupAuthor -00:a7ff sPartyMon5MailBackupAuthorNationality +00:a7ff sPartyMon5MailBackupNationality 00:a801 sPartyMon5MailBackupAuthorID 00:a803 sPartyMon5MailBackupSpecies 00:a804 sPartyMon5MailBackupType @@ -30269,7 +30269,7 @@ 00:a805 sPartyMon6MailBackup 00:a825 sPartyMon6MailBackupMessageEnd 00:a826 sPartyMon6MailBackupAuthor -00:a82e sPartyMon6MailBackupAuthorNationality +00:a82e sPartyMon6MailBackupNationality 00:a830 sPartyMon6MailBackupAuthorID 00:a832 sPartyMon6MailBackupSpecies 00:a833 sPartyMon6MailBackupType @@ -30280,7 +30280,7 @@ 00:a835 sMailboxes 00:a855 sMailbox1MessageEnd 00:a856 sMailbox1Author -00:a85e sMailbox1AuthorNationality +00:a85e sMailbox1Nationality 00:a860 sMailbox1AuthorID 00:a862 sMailbox1Species 00:a863 sMailbox1Type @@ -30289,7 +30289,7 @@ 00:a864 sMailbox2Message 00:a884 sMailbox2MessageEnd 00:a885 sMailbox2Author -00:a88d sMailbox2AuthorNationality +00:a88d sMailbox2Nationality 00:a88f sMailbox2AuthorID 00:a891 sMailbox2Species 00:a892 sMailbox2Type @@ -30298,7 +30298,7 @@ 00:a893 sMailbox2End 00:a8b3 sMailbox3MessageEnd 00:a8b4 sMailbox3Author -00:a8bc sMailbox3AuthorNationality +00:a8bc sMailbox3Nationality 00:a8be sMailbox3AuthorID 00:a8c0 sMailbox3Species 00:a8c1 sMailbox3Type @@ -30307,7 +30307,7 @@ 00:a8c2 sMailbox3End 00:a8e2 sMailbox4MessageEnd 00:a8e3 sMailbox4Author -00:a8eb sMailbox4AuthorNationality +00:a8eb sMailbox4Nationality 00:a8ed sMailbox4AuthorID 00:a8ef sMailbox4Species 00:a8f0 sMailbox4Type @@ -30316,7 +30316,7 @@ 00:a8f1 sMailbox5Message 00:a911 sMailbox5MessageEnd 00:a912 sMailbox5Author -00:a91a sMailbox5AuthorNationality +00:a91a sMailbox5Nationality 00:a91c sMailbox5AuthorID 00:a91e sMailbox5Species 00:a91f sMailbox5Type @@ -30325,7 +30325,7 @@ 00:a920 sMailbox5End 00:a940 sMailbox6MessageEnd 00:a941 sMailbox6Author -00:a949 sMailbox6AuthorNationality +00:a949 sMailbox6Nationality 00:a94b sMailbox6AuthorID 00:a94d sMailbox6Species 00:a94e sMailbox6Type @@ -30334,7 +30334,7 @@ 00:a94f sMailbox7Message 00:a96f sMailbox7MessageEnd 00:a970 sMailbox7Author -00:a978 sMailbox7AuthorNationality +00:a978 sMailbox7Nationality 00:a97a sMailbox7AuthorID 00:a97c sMailbox7Species 00:a97d sMailbox7Type @@ -30343,7 +30343,7 @@ 00:a97e sMailbox7End 00:a99e sMailbox8MessageEnd 00:a99f sMailbox8Author -00:a9a7 sMailbox8AuthorNationality +00:a9a7 sMailbox8Nationality 00:a9a9 sMailbox8AuthorID 00:a9ab sMailbox8Species 00:a9ac sMailbox8Type @@ -30352,7 +30352,7 @@ 00:a9ad sMailbox8End 00:a9cd sMailbox9MessageEnd 00:a9ce sMailbox9Author -00:a9d6 sMailbox9AuthorNationality +00:a9d6 sMailbox9Nationality 00:a9d8 sMailbox9AuthorID 00:a9da sMailbox9Species 00:a9db sMailbox9Type @@ -30361,7 +30361,7 @@ 00:a9dc sMailbox9End 00:a9fc sMailbox10MessageEnd 00:a9fd sMailbox10Author -00:aa05 sMailbox10AuthorNationality +00:aa05 sMailbox10Nationality 00:aa07 sMailbox10AuthorID 00:aa09 sMailbox10Species 00:aa0a sMailbox10Type @@ -30372,7 +30372,7 @@ 00:aa0c sMailbox1Backup 00:aa2c sMailbox1BackupMessageEnd 00:aa2d sMailbox1BackupAuthor -00:aa35 sMailbox1BackupAuthorNationality +00:aa35 sMailbox1BackupNationality 00:aa37 sMailbox1BackupAuthorID 00:aa39 sMailbox1BackupSpecies 00:aa3a sMailbox1BackupType @@ -30381,7 +30381,7 @@ 00:aa3b sMailbox1BackupEnd 00:aa5b sMailbox2BackupMessageEnd 00:aa5c sMailbox2BackupAuthor -00:aa64 sMailbox2BackupAuthorNationality +00:aa64 sMailbox2BackupNationality 00:aa66 sMailbox2BackupAuthorID 00:aa68 sMailbox2BackupSpecies 00:aa69 sMailbox2BackupType @@ -30390,7 +30390,7 @@ 00:aa6a sMailbox2BackupEnd 00:aa8a sMailbox3BackupMessageEnd 00:aa8b sMailbox3BackupAuthor -00:aa93 sMailbox3BackupAuthorNationality +00:aa93 sMailbox3BackupNationality 00:aa95 sMailbox3BackupAuthorID 00:aa97 sMailbox3BackupSpecies 00:aa98 sMailbox3BackupType @@ -30399,7 +30399,7 @@ 00:aa99 sMailbox3BackupEnd 00:aab9 sMailbox4BackupMessageEnd 00:aaba sMailbox4BackupAuthor -00:aac2 sMailbox4BackupAuthorNationality +00:aac2 sMailbox4BackupNationality 00:aac4 sMailbox4BackupAuthorID 00:aac6 sMailbox4BackupSpecies 00:aac7 sMailbox4BackupType @@ -30408,7 +30408,7 @@ 00:aac8 sMailbox4BackupEnd 00:aae8 sMailbox5BackupMessageEnd 00:aae9 sMailbox5BackupAuthor -00:aaf1 sMailbox5BackupAuthorNationality +00:aaf1 sMailbox5BackupNationality 00:aaf3 sMailbox5BackupAuthorID 00:aaf5 sMailbox5BackupSpecies 00:aaf6 sMailbox5BackupType @@ -30417,7 +30417,7 @@ 00:aaf7 sMailbox6Backup 00:ab17 sMailbox6BackupMessageEnd 00:ab18 sMailbox6BackupAuthor -00:ab20 sMailbox6BackupAuthorNationality +00:ab20 sMailbox6BackupNationality 00:ab22 sMailbox6BackupAuthorID 00:ab24 sMailbox6BackupSpecies 00:ab25 sMailbox6BackupType @@ -30426,7 +30426,7 @@ 00:ab26 sMailbox7BackupMessage 00:ab46 sMailbox7BackupMessageEnd 00:ab47 sMailbox7BackupAuthor -00:ab4f sMailbox7BackupAuthorNationality +00:ab4f sMailbox7BackupNationality 00:ab51 sMailbox7BackupAuthorID 00:ab53 sMailbox7BackupSpecies 00:ab54 sMailbox7BackupType @@ -30435,7 +30435,7 @@ 00:ab55 sMailbox7BackupEnd 00:ab75 sMailbox8BackupMessageEnd 00:ab76 sMailbox8BackupAuthor -00:ab7e sMailbox8BackupAuthorNationality +00:ab7e sMailbox8BackupNationality 00:ab80 sMailbox8BackupAuthorID 00:ab82 sMailbox8BackupSpecies 00:ab83 sMailbox8BackupType @@ -30444,7 +30444,7 @@ 00:ab84 sMailbox9BackupMessage 00:aba4 sMailbox9BackupMessageEnd 00:aba5 sMailbox9BackupAuthor -00:abad sMailbox9BackupAuthorNationality +00:abad sMailbox9BackupNationality 00:abaf sMailbox9BackupAuthorID 00:abb1 sMailbox9BackupSpecies 00:abb2 sMailbox9BackupType @@ -30453,7 +30453,7 @@ 00:abb3 sMailbox10BackupMessage 00:abd3 sMailbox10BackupMessageEnd 00:abd4 sMailbox10BackupAuthor -00:abdc sMailbox10BackupAuthorNationality +00:abdc sMailbox10BackupNationality 00:abde sMailbox10BackupAuthorID 00:abe0 sMailbox10BackupSpecies 00:abe1 sMailbox10BackupType @@ -30518,7 +30518,7 @@ 01:ada1 sBoxMon1Level 01:ada2 sBoxMon1BoxEnd 01:ada2 sBoxMon2 -01:b002 sBoxMonOT +01:b002 sBoxMonOTs 01:b0de sBoxMonNicknames 01:b1ba sBoxMonNicknamesEnd 01:b1ba sBoxEnd @@ -31941,7 +31941,7 @@ 02:a035 sBox1Mon1Level 02:a036 sBox1Mon2 02:a036 sBox1Mon1BoxEnd -02:a296 sBox1MonOT +02:a296 sBox1MonOTs 02:a372 sBox1MonNicknames 02:a44e sBox1End 02:a44e sBox1MonNicknamesEnd @@ -31970,7 +31970,7 @@ 02:a485 sBox2Mon1Level 02:a486 sBox2Mon1BoxEnd 02:a486 sBox2Mon2 -02:a6e6 sBox2MonOT +02:a6e6 sBox2MonOTs 02:a7c2 sBox2MonNicknames 02:a89e sBox2End 02:a89e sBox2MonNicknamesEnd @@ -31999,7 +31999,7 @@ 02:a8d5 sBox3Mon1Level 02:a8d6 sBox3Mon1BoxEnd 02:a8d6 sBox3Mon2 -02:ab36 sBox3MonOT +02:ab36 sBox3MonOTs 02:ac12 sBox3MonNicknames 02:acee sBox3End 02:acee sBox3MonNicknamesEnd @@ -32028,7 +32028,7 @@ 02:ad25 sBox4Mon1Level 02:ad26 sBox4Mon2 02:ad26 sBox4Mon1BoxEnd -02:af86 sBox4MonOT +02:af86 sBox4MonOTs 02:b062 sBox4MonNicknames 02:b13e sBox4End 02:b13e sBox4MonNicknamesEnd @@ -32057,7 +32057,7 @@ 02:b175 sBox5Mon1Level 02:b176 sBox5Mon2 02:b176 sBox5Mon1BoxEnd -02:b3d6 sBox5MonOT +02:b3d6 sBox5MonOTs 02:b4b2 sBox5MonNicknames 02:b58e sBox5MonNicknamesEnd 02:b58e sBox5End @@ -32086,7 +32086,7 @@ 02:b5c5 sBox6Mon1Level 02:b5c6 sBox6Mon2 02:b5c6 sBox6Mon1BoxEnd -02:b826 sBox6MonOT +02:b826 sBox6MonOTs 02:b902 sBox6MonNicknames 02:b9de sBox6End 02:b9de sBox6MonNicknamesEnd @@ -32115,7 +32115,7 @@ 02:ba15 sBox7Mon1Level 02:ba16 sBox7Mon2 02:ba16 sBox7Mon1BoxEnd -02:bc76 sBox7MonOT +02:bc76 sBox7MonOTs 02:bd52 sBox7MonNicknames 02:be2e sBox7End 02:be2e sBox7MonNicknamesEnd @@ -32144,7 +32144,7 @@ 03:a035 sBox8Mon1Level 03:a036 sBox8Mon1BoxEnd 03:a036 sBox8Mon2 -03:a296 sBox8MonOT +03:a296 sBox8MonOTs 03:a372 sBox8MonNicknames 03:a44e sBox8MonNicknamesEnd 03:a44e sBox8End @@ -32173,7 +32173,7 @@ 03:a485 sBox9Mon1Level 03:a486 sBox9Mon2 03:a486 sBox9Mon1BoxEnd -03:a6e6 sBox9MonOT +03:a6e6 sBox9MonOTs 03:a7c2 sBox9MonNicknames 03:a89e sBox9MonNicknamesEnd 03:a89e sBox9End @@ -32202,7 +32202,7 @@ 03:a8d5 sBox10Mon1Level 03:a8d6 sBox10Mon1BoxEnd 03:a8d6 sBox10Mon2 -03:ab36 sBox10MonOT +03:ab36 sBox10MonOTs 03:ac12 sBox10MonNicknames 03:acee sBox10MonNicknamesEnd 03:acee sBox10End @@ -32231,7 +32231,7 @@ 03:ad25 sBox11Mon1Level 03:ad26 sBox11Mon1BoxEnd 03:ad26 sBox11Mon2 -03:af86 sBox11MonOT +03:af86 sBox11MonOTs 03:b062 sBox11MonNicknames 03:b13e sBox11End 03:b13e sBox11MonNicknamesEnd @@ -32260,7 +32260,7 @@ 03:b175 sBox12Mon1Level 03:b176 sBox12Mon2 03:b176 sBox12Mon1BoxEnd -03:b3d6 sBox12MonOT +03:b3d6 sBox12MonOTs 03:b4b2 sBox12MonNicknames 03:b58e sBox12End 03:b58e sBox12MonNicknamesEnd @@ -32289,7 +32289,7 @@ 03:b5c5 sBox13Mon1Level 03:b5c6 sBox13Mon1BoxEnd 03:b5c6 sBox13Mon2 -03:b826 sBox13MonOT +03:b826 sBox13MonOTs 03:b902 sBox13MonNicknames 03:b9de sBox13MonNicknamesEnd 03:b9de sBox13End @@ -32318,7 +32318,7 @@ 03:ba15 sBox14Mon1Level 03:ba16 sBox14Mon1BoxEnd 03:ba16 sBox14Mon2 -03:bc76 sBox14MonOT +03:bc76 sBox14MonOTs 03:bd52 sBox14MonNicknames 03:be2e sBox14MonNicknamesEnd 03:be2e sBox14End @@ -33383,7 +33383,7 @@ 00:c71e wDebugRoomMonUnused2 00:c71e wLinkPlayerPartyMon1StatExp 00:c71e wLinkPlayerPartyMon1HPExp -00:c71f wTimeCapsulePartyMon1OTID +00:c71f wTimeCapsulePartyMon1ID 00:c71f wDebugRoomMonLevel 00:c720 wLinkPlayerPartyMon1AtkExp 00:c720 wDebugRoomMonBoxEnd @@ -33462,7 +33462,7 @@ 00:c747 wTimeCapsulePartyMon2Moves 00:c749 wLinkPlayerPartyMon2ID 00:c74b wLinkPlayerPartyMon2Exp -00:c74b wTimeCapsulePartyMon2OTID +00:c74b wTimeCapsulePartyMon2ID 00:c74d wTimeCapsulePartyMon2Exp 00:c74e wLinkPlayerPartyMon2HPExp 00:c74e wLinkPlayerPartyMon2StatExp @@ -33528,7 +33528,7 @@ 00:c774 wLinkPlayerPartyMon3Item 00:c775 wLinkPlayerPartyMon3Moves 00:c776 wMysteryGiftTrainerEnd -00:c777 wTimeCapsulePartyMon3OTID +00:c777 wTimeCapsulePartyMon3ID 00:c779 wTimeCapsulePartyMon3Exp 00:c779 wLinkPlayerPartyMon3ID 00:c77b wLinkPlayerPartyMon3Exp @@ -33583,9 +33583,9 @@ 00:c7a0 wLYOverrides2 00:c7a1 wLinkPlayerPartyMon3SpclDef 00:c7a3 wLinkPlayerPartyMon4Species +00:c7a3 wTimeCapsulePartyMon4ID 00:c7a3 wLinkPlayerPartyMon3StructEnd 00:c7a3 wLinkPlayerPartyMon4 -00:c7a3 wTimeCapsulePartyMon4OTID 00:c7a4 wLinkPlayerPartyMon4Item 00:c7a5 wLinkPlayerPartyMon4Moves 00:c7a5 wTimeCapsulePartyMon4Exp @@ -33638,7 +33638,7 @@ 00:c7cb wLinkPlayerPartyMon4Defense 00:c7cd wLinkPlayerPartyMon4Speed 00:c7cf wLinkPlayerPartyMon4SpclAtk -00:c7cf wTimeCapsulePartyMon5OTID +00:c7cf wTimeCapsulePartyMon5ID 00:c7d1 wLinkPlayerPartyMon4SpclDef 00:c7d1 wTimeCapsulePartyMon5Exp 00:c7d3 wLinkPlayerPartyMon5Species @@ -33693,7 +33693,7 @@ 00:c7f9 wLinkPlayerPartyMon5Attack 00:c7f9 wLinkPlayerPartyMon5Stats 00:c7fb wLinkPlayerPartyMon5Defense -00:c7fb wTimeCapsulePartyMon6OTID +00:c7fb wTimeCapsulePartyMon6ID 00:c7fd wTimeCapsulePartyMon6Exp 00:c7fd wLinkPlayerPartyMon5Speed 00:c7ff wLinkPlayerPartyMon5SpclAtk @@ -33739,7 +33739,8 @@ 00:c818 wLinkPlayerPartyMon6DVs 00:c819 wTimeCapsulePartyMon6Special 00:c81a wLinkPlayerPartyMon6PP -00:c81b wTimeCapsulePartyMonOTNames +00:c81b wTimeCapsulePartyMonOTs +00:c81b wTimeCapsulePartyMon1OT 00:c81e wLinkPlayerPartyMon6Happiness 00:c81f wLinkPlayerPartyMon6PokerusStatus 00:c820 wLinkPlayerPartyMon6Unused1 @@ -33749,6 +33750,7 @@ 00:c823 wLinkPlayerPartyMon6BoxEnd 00:c824 wLinkPlayerPartyMon6Unused 00:c825 wLinkPlayerPartyMon6HP +00:c826 wTimeCapsulePartyMon2OT 00:c827 wLinkPlayerPartyMon6MaxHP 00:c829 wLinkPlayerPartyMon6Stats 00:c829 wLinkPlayerPartyMon6Attack @@ -33756,21 +33758,43 @@ 00:c82d wLinkPlayerPartyMon6Speed 00:c82f wLinkPlayerPartyMon6SpclAtk 00:c830 wLYOverrides2End +00:c831 wTimeCapsulePartyMon3OT 00:c831 wLinkPlayerPartyMon6SpclDef -00:c833 wLinkPlayerPartyMonOTNames +00:c833 wLinkPlayerPartyMon1OT +00:c833 wLinkPlayerPartyMonOTs 00:c833 wLinkPlayerPartyMon6StructEnd +00:c83c wTimeCapsulePartyMon4OT +00:c83e wLinkPlayerPartyMon2OT +00:c847 wTimeCapsulePartyMon5OT +00:c849 wLinkPlayerPartyMon3OT 00:c850 wMysteryGiftPlayerData 00:c851 wMysteryGiftPlayerID +00:c852 wTimeCapsulePartyMon6OT 00:c853 wMysteryGiftPlayerName -00:c85d wTimeCapsulePartyMonNicks +00:c854 wLinkPlayerPartyMon4OT +00:c85d wTimeCapsulePartyMonNicknames +00:c85d wTimeCapsulePartyMon1Nickname 00:c85e wMysteryGiftPlayerDexCaught 00:c85f wMysteryGiftPlayerSentDeco +00:c85f wLinkPlayerPartyMon5OT 00:c860 wMysteryGiftPlayerWhichItem 00:c861 wMysteryGiftPlayerWhichDeco 00:c862 wMysteryGiftPlayerBackupItem 00:c864 wMysteryGiftPlayerDataEnd -00:c875 wLinkPlayerPartyMonNicks +00:c868 wTimeCapsulePartyMon2Nickname +00:c86a wLinkPlayerPartyMon6OT +00:c873 wTimeCapsulePartyMon3Nickname +00:c875 wLinkPlayerPartyMonNicknames +00:c875 wLinkPlayerPartyMon1Nickname +00:c87e wTimeCapsulePartyMon4Nickname +00:c880 wLinkPlayerPartyMon2Nickname +00:c889 wTimeCapsulePartyMon5Nickname +00:c88b wLinkPlayerPartyMon3Nickname 00:c890 wLYOverridesBackupEnd +00:c894 wTimeCapsulePartyMon6Nickname +00:c896 wLinkPlayerPartyMon4Nickname +00:c8a1 wLinkPlayerPartyMon5Nickname +00:c8ac wLinkPlayerPartyMon6Nickname 00:c8f4 wLinkPlayerMail 00:c8f4 wLinkReceivedMail 00:c8f4 wLinkPlayerMailPreamble @@ -33784,7 +33808,7 @@ 00:c90a wActiveAnimObjects 00:c90a wAnimObject01 00:c90b wAnimObject01OAMFlags -00:c90c wAnimObject01Field02 +00:c90c wAnimObject01FixY 00:c90d wAnimObject01FramesetID 00:c90e wAnimObject01Function 00:c90f wAnimObject01Palette @@ -33802,7 +33826,7 @@ 00:c922 wAnimObject02Index 00:c922 wAnimObject02 00:c923 wAnimObject02OAMFlags -00:c924 wAnimObject02Field02 +00:c924 wAnimObject02FixY 00:c925 wAnimObject02FramesetID 00:c926 wAnimObject02Function 00:c927 wAnimObject02Palette @@ -33820,7 +33844,7 @@ 00:c93a wAnimObject03Index 00:c93a wAnimObject03 00:c93b wAnimObject03OAMFlags -00:c93c wAnimObject03Field02 +00:c93c wAnimObject03FixY 00:c93d wAnimObject03FramesetID 00:c93e wAnimObject03Function 00:c93f wAnimObject03Palette @@ -33838,7 +33862,7 @@ 00:c952 wAnimObject04 00:c952 wAnimObject04Index 00:c953 wAnimObject04OAMFlags -00:c954 wAnimObject04Field02 +00:c954 wAnimObject04FixY 00:c955 wAnimObject04FramesetID 00:c956 wAnimObject04Function 00:c957 wAnimObject04Palette @@ -33856,7 +33880,7 @@ 00:c96a wAnimObject05Index 00:c96a wAnimObject05 00:c96b wAnimObject05OAMFlags -00:c96c wAnimObject05Field02 +00:c96c wAnimObject05FixY 00:c96d wAnimObject05FramesetID 00:c96e wAnimObject05Function 00:c96f wAnimObject05Palette @@ -33878,7 +33902,7 @@ 00:c982 wAnimObject06 00:c982 wPrinterData 00:c983 wAnimObject06OAMFlags -00:c984 wAnimObject06Field02 +00:c984 wAnimObject06FixY 00:c985 wAnimObject06FramesetID 00:c986 wAnimObject06Function 00:c986 wPrinterChecksum @@ -33904,7 +33928,7 @@ 00:c99a wAnimObject07Index 00:c99a wAnimObject07 00:c99b wAnimObject07OAMFlags -00:c99c wAnimObject07Field02 +00:c99c wAnimObject07FixY 00:c99d wAnimObject07FramesetID 00:c99e wAnimObject07Function 00:c99f wAnimObject07Palette @@ -33922,7 +33946,7 @@ 00:c9b2 wAnimObject08Index 00:c9b2 wAnimObject08 00:c9b3 wAnimObject08OAMFlags -00:c9b4 wAnimObject08Field02 +00:c9b4 wAnimObject08FixY 00:c9b5 wAnimObject08FramesetID 00:c9b6 wAnimObject08Function 00:c9b7 wAnimObject08Palette @@ -33941,7 +33965,7 @@ 00:c9ca wAnimObject09 00:c9ca wAnimObject09Index 00:c9cb wAnimObject09OAMFlags -00:c9cc wAnimObject09Field02 +00:c9cc wAnimObject09FixY 00:c9cd wAnimObject09FramesetID 00:c9ce wAnimObject09Function 00:c9cf wAnimObject09Palette @@ -33959,7 +33983,7 @@ 00:c9e2 wAnimObject10Index 00:c9e2 wAnimObject10 00:c9e3 wAnimObject10OAMFlags -00:c9e4 wAnimObject10Field02 +00:c9e4 wAnimObject10FixY 00:c9e5 wAnimObject10FramesetID 00:c9e6 wAnimObject10Function 00:c9e7 wAnimObject10Palette @@ -34060,23 +34084,29 @@ 00:cae9 wEnemyMoveStructEffect 00:caea wEnemyMoveStructPower 00:caea wLinkOTPartyMonTypes +00:caea wLinkOTPartyMon1Type 00:caeb wEnemyMoveStructType +00:caec wLinkOTPartyMon2Type 00:caec wEnemyMoveStructAccuracy 00:caed wEnemyMoveStructPP 00:caee wEnemyMoveStructEffectChance +00:caee wLinkOTPartyMon3Type 00:caef wPlayerMoveStructAnimation 00:caef wPlayerMoveStruct 00:caf0 wPlayerMoveStructEffect +00:caf0 wLinkOTPartyMon4Type 00:caf1 wPlayerMoveStructPower 00:caf2 wPlayerMoveStructType +00:caf2 wLinkOTPartyMon5Type 00:caf3 wPlayerMoveStructAccuracy 00:caf4 wPlayerMoveStructPP +00:caf4 wLinkOTPartyMon6Type 00:caf5 wPlayerMoveStructEffectChance -00:caf6 wEnemyMonNick +00:caf6 wEnemyMonNickname 00:caf8 wPrinterStatus 00:cafa wPrinterMargins 00:cafb wPrinterExposureTime -00:cb01 wBattleMonNick +00:cb01 wBattleMonNickname 00:cb0c wBattleMonSpecies 00:cb0c wGameboyPrinterRAMEnd 00:cb0c wBattleMon @@ -34431,7 +34461,6 @@ 00:ceed wLuckyNumberDigitsBuffer 00:ceed wEarthquakeMovementDataBuffer 00:ceed wMonMailMessageBuffer -00:ceed wBufferMonNick 00:ceed wLinkBattleRecordBuffer 00:ceed wPokeFluteCuredSleep 00:ceed wDebugColorIsTrainer @@ -34464,6 +34493,7 @@ 00:ceed wNumOwnedDecoCategories 00:ceed wMartItem1BCD 00:ceed wTownMapPlayerIconLandmark +00:ceed wBufferMonNickname 00:ceee wPlaceBallsDirection 00:ceee wMovementBufferObject 00:ceee wDebugRoomCurValue @@ -34479,10 +34509,10 @@ 00:ceee wTempPokedexCaughtCount 00:ceee wMagnetTrainInitPosition 00:ceee wTownMapCursorCoordinates +00:ceef wBufferTrademonNickname 00:ceef wRadioTextDelay 00:ceef wDebugColorCurTMHM 00:ceef wBugContestFirstPlaceScore -00:ceef wBufferTrademonNick 00:ceef wTownMapCursorObjectPointer 00:ceef wTrainerHUDTiles 00:ceef wBillsPCTempBoxCount @@ -34546,7 +34576,7 @@ 00:cf12 wBufferMonDefExp 00:cf14 wBufferMonSpdExp 00:cf16 wBufferMonSpcExp -00:cf16 wTempMailAuthorNationality +00:cf16 wTempMailNationality 00:cf18 wTempMailAuthorID 00:cf18 wBufferMonDVs 00:cf1a wTempMailSpecies @@ -36084,8 +36114,20 @@ 01:db46 wPartyMon6SpclAtk 01:db48 wPartyMon6SpclDef 01:db4a wPartyMon6StructEnd -01:db4a wPartyMonOT +01:db4a wPartyMon1OT +01:db4a wPartyMonOTs +01:db55 wPartyMon2OT +01:db60 wPartyMon3OT +01:db6b wPartyMon4OT +01:db76 wPartyMon5OT +01:db81 wPartyMon6OT 01:db8c wPartyMonNicknames +01:db8c wPartyMon1Nickname +01:db97 wPartyMon2Nickname +01:dba2 wPartyMon3Nickname +01:dbad wPartyMon4Nickname +01:dbb8 wPartyMon5Nickname +01:dbc3 wPartyMon6Nickname 01:dbce wPartyMonNicknamesEnd 01:dbe4 wPokedexCaught 01:dc04 wEndPokedexCaught @@ -36095,7 +36137,7 @@ 01:dc3e wUnlockedUnowns 01:dc3f wFirstUnownSeen 01:dc40 wDayCareMan -01:dc41 wBreedMon1Nick +01:dc41 wBreedMon1Nickname 01:dc4c wBreedMon1OT 01:dc57 wBreedMon1 01:dc57 wBreedMon1Species @@ -36120,7 +36162,7 @@ 01:dc77 wBreedMon1BoxEnd 01:dc78 wStepsToEgg 01:dc79 wBreedMotherOrNonDitto -01:dc7a wBreedMon2Nick +01:dc7a wBreedMon2Nickname 01:dc85 wBreedMon2OT 01:dc90 wBreedMon2Species 01:dc90 wBreedMon2 @@ -36141,9 +36183,9 @@ 01:dcad wBreedMon2Unused1 01:dcae wBreedMon2Unused2 01:dcaf wBreedMon2Level -01:dcb0 wEggNick +01:dcb0 wEggMonNickname 01:dcb0 wBreedMon2BoxEnd -01:dcbb wEggOT +01:dcbb wEggMonOT 01:dcc6 wEggMonSpecies 01:dcc6 wEggMon 01:dcc7 wEggMonItem @@ -36428,10 +36470,21 @@ 01:de77 wOTPartyMon6Speed 01:de79 wOTPartyMon6SpclAtk 01:de7b wOTPartyMon6SpclDef -01:de7d wOTPartyMonsEnd -01:de7d wOTPartyMonOT +01:de7d wOTPartyMonOTs +01:de7d wOTPartyMon1OT 01:de7d wOTPartyMon6StructEnd +01:de88 wOTPartyMon2OT +01:de93 wOTPartyMon3OT +01:de9e wOTPartyMon4OT +01:dea9 wOTPartyMon5OT +01:deb4 wOTPartyMon6OT 01:debf wOTPartyMonNicknames +01:debf wOTPartyMon1Nickname +01:deca wOTPartyMon2Nickname +01:ded5 wOTPartyMon3Nickname +01:dee0 wOTPartyMon4Nickname +01:deeb wOTPartyMon5Nickname +01:def6 wOTPartyMon6Nickname 01:df01 wGameDataEnd 01:df01 wPokemonDataEnd 01:df01 wOTPartyDataEnd diff --git a/pokesilver.sym b/pokesilver.sym index cce1b08b..aeedc2a9 100644 --- a/pokesilver.sym +++ b/pokesilver.sym @@ -271,7 +271,7 @@ 00:0f7e DummyChar 00:0f7f NextChar 00:0f83 CheckDict -00:1014 CheckDict.__7889 +00:1014 CheckDict.__7890 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_8076 -00:2039 LoadMetatiles.next_8081 -00:204c LoadMetatiles.next_8086 +00:2026 LoadMetatiles.next_8077 +00:2039 LoadMetatiles.next_8082 +00:204c LoadMetatiles.next_8087 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_8168 -00:34e3 CopyTilemapAtOnce.loop_8169 -00:34ec CopyTilemapAtOnce.loop_8170 -00:34f5 CopyTilemapAtOnce.loop_8171 -00:34fe CopyTilemapAtOnce.loop_8172 -00:3507 CopyTilemapAtOnce.loop_8173 -00:3510 CopyTilemapAtOnce.loop_8174 -00:3519 CopyTilemapAtOnce.loop_8175 -00:3522 CopyTilemapAtOnce.loop_8176 -00:352b CopyTilemapAtOnce.loop_8177 +00:34da CopyTilemapAtOnce.loop_8169 +00:34e3 CopyTilemapAtOnce.loop_8170 +00:34ec CopyTilemapAtOnce.loop_8171 +00:34f5 CopyTilemapAtOnce.loop_8172 +00:34fe CopyTilemapAtOnce.loop_8173 +00:3507 CopyTilemapAtOnce.loop_8174 +00:3510 CopyTilemapAtOnce.loop_8175 +00:3519 CopyTilemapAtOnce.loop_8176 +00:3522 CopyTilemapAtOnce.loop_8177 +00:352b CopyTilemapAtOnce.loop_8178 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -1109,8 +1109,8 @@ 00:3a79 GetBaseData 00:3a9e GetBaseData.egg 00:3ab3 GetBaseData.end -00:3abf GetCurNick -00:3ac5 GetNick +00:3abf GetCurNickname +00:3ac5 GetNickname 00:3ade PrintBCDNumber 00:3af0 PrintBCDNumber.loop 00:3b07 PrintBCDNumber.skipLeftAlignmentAdjustment @@ -1953,7 +1953,7 @@ 01:73a7 GiveShuckle 01:7405 GiveShuckle.NotGiven 01:740a SpecialShuckleOT -01:7410 SpecialShuckleNick +01:7410 SpecialShuckleNickname 01:7418 ReturnShuckie 01:7449 ReturnShuckie.CheckOT 01:7455 ReturnShuckie.done @@ -2083,11 +2083,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13127 -02:4adf _Sine.apply_13127 -02:4aee _Sine.multiply_13127 -02:4af3 _Sine.even_13127 -02:4afb _Sine.sinetable_13127 +02:4ad5 _Sine.negative_13128 +02:4adf _Sine.apply_13128 +02:4aee _Sine.multiply_13128 +02:4af3 _Sine.even_13128 +02:4afb _Sine.sinetable_13128 02:4b3b GetPredefPointer 02:4b5b PredefPointers 02:4b5b LearnMovePredef @@ -2681,7 +2681,7 @@ 03:472d FieldMoveJumptableReset 03:4738 FieldMoveJumptable 03:4745 FieldMoveJumptable.okay -03:4749 GetPartyNick +03:4749 GetPartyNickname 03:4764 CheckEngineFlag 03:4772 CheckEngineFlag.isset 03:4774 CheckBadge @@ -11308,31 +11308,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_41907 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_41908 -23:405f SaveMenu_CopyTilemapAtOnce.loop_41909 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_41910 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_41911 -23:407a SaveMenu_CopyTilemapAtOnce.loop_41912 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_41913 -23:408c SaveMenu_CopyTilemapAtOnce.loop_41914 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_41915 -23:409e SaveMenu_CopyTilemapAtOnce.loop_41916 +23:404d SaveMenu_CopyTilemapAtOnce.loop_41908 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_41909 +23:405f SaveMenu_CopyTilemapAtOnce.loop_41910 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_41911 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_41912 +23:407a SaveMenu_CopyTilemapAtOnce.loop_41913 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_41914 +23:408c SaveMenu_CopyTilemapAtOnce.loop_41915 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_41916 +23:409e SaveMenu_CopyTilemapAtOnce.loop_41917 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_41919 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_41920 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_41921 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_41922 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_41923 -23:413b PhoneRing_CopyTilemapAtOnce.loop_41924 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_41925 -23:414d PhoneRing_CopyTilemapAtOnce.loop_41926 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_41927 -23:415f PhoneRing_CopyTilemapAtOnce.loop_41928 +23:410e PhoneRing_CopyTilemapAtOnce.loop_41920 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_41921 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_41922 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_41923 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_41924 +23:413b PhoneRing_CopyTilemapAtOnce.loop_41925 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_41926 +23:414d PhoneRing_CopyTilemapAtOnce.loop_41927 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_41928 +23:415f PhoneRing_CopyTilemapAtOnce.loop_41929 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_42348 -23:4996 StartTrainerBattle_DrawSineWave.apply_42348 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_42348 -23:49aa StartTrainerBattle_DrawSineWave.even_42348 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42348 +23:498c StartTrainerBattle_DrawSineWave.negative_42349 +23:4996 StartTrainerBattle_DrawSineWave.apply_42349 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_42349 +23:49aa StartTrainerBattle_DrawSineWave.even_42349 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42349 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_43316 -23:6687 Sprites_Sine.apply_43316 -23:6696 Sprites_Sine.multiply_43316 -23:669b Sprites_Sine.even_43316 -23:66a3 Sprites_Sine.sinetable_43316 +23:667d Sprites_Sine.negative_43317 +23:6687 Sprites_Sine.apply_43317 +23:6696 Sprites_Sine.multiply_43317 +23:669b Sprites_Sine.even_43317 +23:66a3 Sprites_Sine.sinetable_43317 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_49252 -33:668e BattleAnim_Sine.apply_49252 -33:669d BattleAnim_Sine.multiply_49252 -33:66a2 BattleAnim_Sine.even_49252 +33:6684 BattleAnim_Sine.negative_49253 +33:668e BattleAnim_Sine.apply_49253 +33:669d BattleAnim_Sine.multiply_49253 +33:66a2 BattleAnim_Sine.even_49253 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_52100 -38:7567 CopyBoxmonSpecies.done_52100 +38:7545 CopyBoxmonSpecies.loop_52101 +38:7567 CopyBoxmonSpecies.done_52101 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_52101 -38:759a CopyBoxmonSpecies.done_52101 +38:7578 CopyBoxmonSpecies.loop_52102 +38:759a CopyBoxmonSpecies.done_52102 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_52102 -38:75cf CopyBoxmonSpecies.done_52102 +38:75ad CopyBoxmonSpecies.loop_52103 +38:75cf CopyBoxmonSpecies.done_52103 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor @@ -30004,7 +30004,7 @@ 00:a600 sPartyMon1Mail 00:a620 sPartyMon1MailMessageEnd 00:a621 sPartyMon1MailAuthor -00:a629 sPartyMon1MailAuthorNationality +00:a629 sPartyMon1MailNationality 00:a62b sPartyMon1MailAuthorID 00:a62d sPartyMon1MailSpecies 00:a62e sPartyMon1MailType @@ -30013,7 +30013,7 @@ 00:a62f sPartyMon1MailEnd 00:a64f sPartyMon2MailMessageEnd 00:a650 sPartyMon2MailAuthor -00:a658 sPartyMon2MailAuthorNationality +00:a658 sPartyMon2MailNationality 00:a65a sPartyMon2MailAuthorID 00:a65c sPartyMon2MailSpecies 00:a65d sPartyMon2MailType @@ -30022,7 +30022,7 @@ 00:a65e sPartyMon3Mail 00:a67e sPartyMon3MailMessageEnd 00:a67f sPartyMon3MailAuthor -00:a687 sPartyMon3MailAuthorNationality +00:a687 sPartyMon3MailNationality 00:a689 sPartyMon3MailAuthorID 00:a68b sPartyMon3MailSpecies 00:a68c sPartyMon3MailType @@ -30031,7 +30031,7 @@ 00:a68d sPartyMon4MailMessage 00:a6ad sPartyMon4MailMessageEnd 00:a6ae sPartyMon4MailAuthor -00:a6b6 sPartyMon4MailAuthorNationality +00:a6b6 sPartyMon4MailNationality 00:a6b8 sPartyMon4MailAuthorID 00:a6ba sPartyMon4MailSpecies 00:a6bb sPartyMon4MailType @@ -30040,7 +30040,7 @@ 00:a6bc sPartyMon5MailMessage 00:a6dc sPartyMon5MailMessageEnd 00:a6dd sPartyMon5MailAuthor -00:a6e5 sPartyMon5MailAuthorNationality +00:a6e5 sPartyMon5MailNationality 00:a6e7 sPartyMon5MailAuthorID 00:a6e9 sPartyMon5MailSpecies 00:a6ea sPartyMon5MailType @@ -30049,7 +30049,7 @@ 00:a6eb sPartyMon6Mail 00:a70b sPartyMon6MailMessageEnd 00:a70c sPartyMon6MailAuthor -00:a714 sPartyMon6MailAuthorNationality +00:a714 sPartyMon6MailNationality 00:a716 sPartyMon6MailAuthorID 00:a718 sPartyMon6MailSpecies 00:a719 sPartyMon6MailType @@ -30059,7 +30059,7 @@ 00:a71a sPartyMon6MailEnd 00:a73a sPartyMon1MailBackupMessageEnd 00:a73b sPartyMon1MailBackupAuthor -00:a743 sPartyMon1MailBackupAuthorNationality +00:a743 sPartyMon1MailBackupNationality 00:a745 sPartyMon1MailBackupAuthorID 00:a747 sPartyMon1MailBackupSpecies 00:a748 sPartyMon1MailBackupType @@ -30068,7 +30068,7 @@ 00:a749 sPartyMon1MailBackupEnd 00:a769 sPartyMon2MailBackupMessageEnd 00:a76a sPartyMon2MailBackupAuthor -00:a772 sPartyMon2MailBackupAuthorNationality +00:a772 sPartyMon2MailBackupNationality 00:a774 sPartyMon2MailBackupAuthorID 00:a776 sPartyMon2MailBackupSpecies 00:a777 sPartyMon2MailBackupType @@ -30077,7 +30077,7 @@ 00:a778 sPartyMon2MailBackupEnd 00:a798 sPartyMon3MailBackupMessageEnd 00:a799 sPartyMon3MailBackupAuthor -00:a7a1 sPartyMon3MailBackupAuthorNationality +00:a7a1 sPartyMon3MailBackupNationality 00:a7a3 sPartyMon3MailBackupAuthorID 00:a7a5 sPartyMon3MailBackupSpecies 00:a7a6 sPartyMon3MailBackupType @@ -30086,7 +30086,7 @@ 00:a7a7 sPartyMon4MailBackupMessage 00:a7c7 sPartyMon4MailBackupMessageEnd 00:a7c8 sPartyMon4MailBackupAuthor -00:a7d0 sPartyMon4MailBackupAuthorNationality +00:a7d0 sPartyMon4MailBackupNationality 00:a7d2 sPartyMon4MailBackupAuthorID 00:a7d4 sPartyMon4MailBackupSpecies 00:a7d5 sPartyMon4MailBackupType @@ -30095,7 +30095,7 @@ 00:a7d6 sPartyMon5MailBackup 00:a7f6 sPartyMon5MailBackupMessageEnd 00:a7f7 sPartyMon5MailBackupAuthor -00:a7ff sPartyMon5MailBackupAuthorNationality +00:a7ff sPartyMon5MailBackupNationality 00:a801 sPartyMon5MailBackupAuthorID 00:a803 sPartyMon5MailBackupSpecies 00:a804 sPartyMon5MailBackupType @@ -30104,7 +30104,7 @@ 00:a805 sPartyMon6MailBackup 00:a825 sPartyMon6MailBackupMessageEnd 00:a826 sPartyMon6MailBackupAuthor -00:a82e sPartyMon6MailBackupAuthorNationality +00:a82e sPartyMon6MailBackupNationality 00:a830 sPartyMon6MailBackupAuthorID 00:a832 sPartyMon6MailBackupSpecies 00:a833 sPartyMon6MailBackupType @@ -30115,7 +30115,7 @@ 00:a835 sMailboxes 00:a855 sMailbox1MessageEnd 00:a856 sMailbox1Author -00:a85e sMailbox1AuthorNationality +00:a85e sMailbox1Nationality 00:a860 sMailbox1AuthorID 00:a862 sMailbox1Species 00:a863 sMailbox1Type @@ -30124,7 +30124,7 @@ 00:a864 sMailbox2Message 00:a884 sMailbox2MessageEnd 00:a885 sMailbox2Author -00:a88d sMailbox2AuthorNationality +00:a88d sMailbox2Nationality 00:a88f sMailbox2AuthorID 00:a891 sMailbox2Species 00:a892 sMailbox2Type @@ -30133,7 +30133,7 @@ 00:a893 sMailbox2End 00:a8b3 sMailbox3MessageEnd 00:a8b4 sMailbox3Author -00:a8bc sMailbox3AuthorNationality +00:a8bc sMailbox3Nationality 00:a8be sMailbox3AuthorID 00:a8c0 sMailbox3Species 00:a8c1 sMailbox3Type @@ -30142,7 +30142,7 @@ 00:a8c2 sMailbox3End 00:a8e2 sMailbox4MessageEnd 00:a8e3 sMailbox4Author -00:a8eb sMailbox4AuthorNationality +00:a8eb sMailbox4Nationality 00:a8ed sMailbox4AuthorID 00:a8ef sMailbox4Species 00:a8f0 sMailbox4Type @@ -30151,7 +30151,7 @@ 00:a8f1 sMailbox5Message 00:a911 sMailbox5MessageEnd 00:a912 sMailbox5Author -00:a91a sMailbox5AuthorNationality +00:a91a sMailbox5Nationality 00:a91c sMailbox5AuthorID 00:a91e sMailbox5Species 00:a91f sMailbox5Type @@ -30160,7 +30160,7 @@ 00:a920 sMailbox5End 00:a940 sMailbox6MessageEnd 00:a941 sMailbox6Author -00:a949 sMailbox6AuthorNationality +00:a949 sMailbox6Nationality 00:a94b sMailbox6AuthorID 00:a94d sMailbox6Species 00:a94e sMailbox6Type @@ -30169,7 +30169,7 @@ 00:a94f sMailbox7Message 00:a96f sMailbox7MessageEnd 00:a970 sMailbox7Author -00:a978 sMailbox7AuthorNationality +00:a978 sMailbox7Nationality 00:a97a sMailbox7AuthorID 00:a97c sMailbox7Species 00:a97d sMailbox7Type @@ -30178,7 +30178,7 @@ 00:a97e sMailbox7End 00:a99e sMailbox8MessageEnd 00:a99f sMailbox8Author -00:a9a7 sMailbox8AuthorNationality +00:a9a7 sMailbox8Nationality 00:a9a9 sMailbox8AuthorID 00:a9ab sMailbox8Species 00:a9ac sMailbox8Type @@ -30187,7 +30187,7 @@ 00:a9ad sMailbox8End 00:a9cd sMailbox9MessageEnd 00:a9ce sMailbox9Author -00:a9d6 sMailbox9AuthorNationality +00:a9d6 sMailbox9Nationality 00:a9d8 sMailbox9AuthorID 00:a9da sMailbox9Species 00:a9db sMailbox9Type @@ -30196,7 +30196,7 @@ 00:a9dc sMailbox9End 00:a9fc sMailbox10MessageEnd 00:a9fd sMailbox10Author -00:aa05 sMailbox10AuthorNationality +00:aa05 sMailbox10Nationality 00:aa07 sMailbox10AuthorID 00:aa09 sMailbox10Species 00:aa0a sMailbox10Type @@ -30207,7 +30207,7 @@ 00:aa0c sMailbox1Backup 00:aa2c sMailbox1BackupMessageEnd 00:aa2d sMailbox1BackupAuthor -00:aa35 sMailbox1BackupAuthorNationality +00:aa35 sMailbox1BackupNationality 00:aa37 sMailbox1BackupAuthorID 00:aa39 sMailbox1BackupSpecies 00:aa3a sMailbox1BackupType @@ -30216,7 +30216,7 @@ 00:aa3b sMailbox1BackupEnd 00:aa5b sMailbox2BackupMessageEnd 00:aa5c sMailbox2BackupAuthor -00:aa64 sMailbox2BackupAuthorNationality +00:aa64 sMailbox2BackupNationality 00:aa66 sMailbox2BackupAuthorID 00:aa68 sMailbox2BackupSpecies 00:aa69 sMailbox2BackupType @@ -30225,7 +30225,7 @@ 00:aa6a sMailbox2BackupEnd 00:aa8a sMailbox3BackupMessageEnd 00:aa8b sMailbox3BackupAuthor -00:aa93 sMailbox3BackupAuthorNationality +00:aa93 sMailbox3BackupNationality 00:aa95 sMailbox3BackupAuthorID 00:aa97 sMailbox3BackupSpecies 00:aa98 sMailbox3BackupType @@ -30234,7 +30234,7 @@ 00:aa99 sMailbox3BackupEnd 00:aab9 sMailbox4BackupMessageEnd 00:aaba sMailbox4BackupAuthor -00:aac2 sMailbox4BackupAuthorNationality +00:aac2 sMailbox4BackupNationality 00:aac4 sMailbox4BackupAuthorID 00:aac6 sMailbox4BackupSpecies 00:aac7 sMailbox4BackupType @@ -30243,7 +30243,7 @@ 00:aac8 sMailbox4BackupEnd 00:aae8 sMailbox5BackupMessageEnd 00:aae9 sMailbox5BackupAuthor -00:aaf1 sMailbox5BackupAuthorNationality +00:aaf1 sMailbox5BackupNationality 00:aaf3 sMailbox5BackupAuthorID 00:aaf5 sMailbox5BackupSpecies 00:aaf6 sMailbox5BackupType @@ -30252,7 +30252,7 @@ 00:aaf7 sMailbox6Backup 00:ab17 sMailbox6BackupMessageEnd 00:ab18 sMailbox6BackupAuthor -00:ab20 sMailbox6BackupAuthorNationality +00:ab20 sMailbox6BackupNationality 00:ab22 sMailbox6BackupAuthorID 00:ab24 sMailbox6BackupSpecies 00:ab25 sMailbox6BackupType @@ -30261,7 +30261,7 @@ 00:ab26 sMailbox7BackupMessage 00:ab46 sMailbox7BackupMessageEnd 00:ab47 sMailbox7BackupAuthor -00:ab4f sMailbox7BackupAuthorNationality +00:ab4f sMailbox7BackupNationality 00:ab51 sMailbox7BackupAuthorID 00:ab53 sMailbox7BackupSpecies 00:ab54 sMailbox7BackupType @@ -30270,7 +30270,7 @@ 00:ab55 sMailbox7BackupEnd 00:ab75 sMailbox8BackupMessageEnd 00:ab76 sMailbox8BackupAuthor -00:ab7e sMailbox8BackupAuthorNationality +00:ab7e sMailbox8BackupNationality 00:ab80 sMailbox8BackupAuthorID 00:ab82 sMailbox8BackupSpecies 00:ab83 sMailbox8BackupType @@ -30279,7 +30279,7 @@ 00:ab84 sMailbox9BackupMessage 00:aba4 sMailbox9BackupMessageEnd 00:aba5 sMailbox9BackupAuthor -00:abad sMailbox9BackupAuthorNationality +00:abad sMailbox9BackupNationality 00:abaf sMailbox9BackupAuthorID 00:abb1 sMailbox9BackupSpecies 00:abb2 sMailbox9BackupType @@ -30288,7 +30288,7 @@ 00:abb3 sMailbox10BackupMessage 00:abd3 sMailbox10BackupMessageEnd 00:abd4 sMailbox10BackupAuthor -00:abdc sMailbox10BackupAuthorNationality +00:abdc sMailbox10BackupNationality 00:abde sMailbox10BackupAuthorID 00:abe0 sMailbox10BackupSpecies 00:abe1 sMailbox10BackupType @@ -30353,7 +30353,7 @@ 01:ada1 sBoxMon1Level 01:ada2 sBoxMon1BoxEnd 01:ada2 sBoxMon2 -01:b002 sBoxMonOT +01:b002 sBoxMonOTs 01:b0de sBoxMonNicknames 01:b1ba sBoxMonNicknamesEnd 01:b1ba sBoxEnd @@ -31776,7 +31776,7 @@ 02:a035 sBox1Mon1Level 02:a036 sBox1Mon2 02:a036 sBox1Mon1BoxEnd -02:a296 sBox1MonOT +02:a296 sBox1MonOTs 02:a372 sBox1MonNicknames 02:a44e sBox1End 02:a44e sBox1MonNicknamesEnd @@ -31805,7 +31805,7 @@ 02:a485 sBox2Mon1Level 02:a486 sBox2Mon1BoxEnd 02:a486 sBox2Mon2 -02:a6e6 sBox2MonOT +02:a6e6 sBox2MonOTs 02:a7c2 sBox2MonNicknames 02:a89e sBox2End 02:a89e sBox2MonNicknamesEnd @@ -31834,7 +31834,7 @@ 02:a8d5 sBox3Mon1Level 02:a8d6 sBox3Mon1BoxEnd 02:a8d6 sBox3Mon2 -02:ab36 sBox3MonOT +02:ab36 sBox3MonOTs 02:ac12 sBox3MonNicknames 02:acee sBox3End 02:acee sBox3MonNicknamesEnd @@ -31863,7 +31863,7 @@ 02:ad25 sBox4Mon1Level 02:ad26 sBox4Mon2 02:ad26 sBox4Mon1BoxEnd -02:af86 sBox4MonOT +02:af86 sBox4MonOTs 02:b062 sBox4MonNicknames 02:b13e sBox4End 02:b13e sBox4MonNicknamesEnd @@ -31892,7 +31892,7 @@ 02:b175 sBox5Mon1Level 02:b176 sBox5Mon2 02:b176 sBox5Mon1BoxEnd -02:b3d6 sBox5MonOT +02:b3d6 sBox5MonOTs 02:b4b2 sBox5MonNicknames 02:b58e sBox5MonNicknamesEnd 02:b58e sBox5End @@ -31921,7 +31921,7 @@ 02:b5c5 sBox6Mon1Level 02:b5c6 sBox6Mon2 02:b5c6 sBox6Mon1BoxEnd -02:b826 sBox6MonOT +02:b826 sBox6MonOTs 02:b902 sBox6MonNicknames 02:b9de sBox6End 02:b9de sBox6MonNicknamesEnd @@ -31950,7 +31950,7 @@ 02:ba15 sBox7Mon1Level 02:ba16 sBox7Mon2 02:ba16 sBox7Mon1BoxEnd -02:bc76 sBox7MonOT +02:bc76 sBox7MonOTs 02:bd52 sBox7MonNicknames 02:be2e sBox7End 02:be2e sBox7MonNicknamesEnd @@ -31979,7 +31979,7 @@ 03:a035 sBox8Mon1Level 03:a036 sBox8Mon1BoxEnd 03:a036 sBox8Mon2 -03:a296 sBox8MonOT +03:a296 sBox8MonOTs 03:a372 sBox8MonNicknames 03:a44e sBox8MonNicknamesEnd 03:a44e sBox8End @@ -32008,7 +32008,7 @@ 03:a485 sBox9Mon1Level 03:a486 sBox9Mon2 03:a486 sBox9Mon1BoxEnd -03:a6e6 sBox9MonOT +03:a6e6 sBox9MonOTs 03:a7c2 sBox9MonNicknames 03:a89e sBox9MonNicknamesEnd 03:a89e sBox9End @@ -32037,7 +32037,7 @@ 03:a8d5 sBox10Mon1Level 03:a8d6 sBox10Mon1BoxEnd 03:a8d6 sBox10Mon2 -03:ab36 sBox10MonOT +03:ab36 sBox10MonOTs 03:ac12 sBox10MonNicknames 03:acee sBox10MonNicknamesEnd 03:acee sBox10End @@ -32066,7 +32066,7 @@ 03:ad25 sBox11Mon1Level 03:ad26 sBox11Mon1BoxEnd 03:ad26 sBox11Mon2 -03:af86 sBox11MonOT +03:af86 sBox11MonOTs 03:b062 sBox11MonNicknames 03:b13e sBox11End 03:b13e sBox11MonNicknamesEnd @@ -32095,7 +32095,7 @@ 03:b175 sBox12Mon1Level 03:b176 sBox12Mon2 03:b176 sBox12Mon1BoxEnd -03:b3d6 sBox12MonOT +03:b3d6 sBox12MonOTs 03:b4b2 sBox12MonNicknames 03:b58e sBox12End 03:b58e sBox12MonNicknamesEnd @@ -32124,7 +32124,7 @@ 03:b5c5 sBox13Mon1Level 03:b5c6 sBox13Mon1BoxEnd 03:b5c6 sBox13Mon2 -03:b826 sBox13MonOT +03:b826 sBox13MonOTs 03:b902 sBox13MonNicknames 03:b9de sBox13MonNicknamesEnd 03:b9de sBox13End @@ -32153,7 +32153,7 @@ 03:ba15 sBox14Mon1Level 03:ba16 sBox14Mon1BoxEnd 03:ba16 sBox14Mon2 -03:bc76 sBox14MonOT +03:bc76 sBox14MonOTs 03:bd52 sBox14MonNicknames 03:be2e sBox14MonNicknamesEnd 03:be2e sBox14End @@ -33189,7 +33189,7 @@ 00:c71b wTimeCapsulePartyMon1Moves 00:c71e wLinkPlayerPartyMon1StatExp 00:c71e wLinkPlayerPartyMon1HPExp -00:c71f wTimeCapsulePartyMon1OTID +00:c71f wTimeCapsulePartyMon1ID 00:c720 wLinkPlayerPartyMon1AtkExp 00:c721 wTimeCapsulePartyMon1Exp 00:c721 wHallOfFamePokemonListMon2End @@ -33265,7 +33265,7 @@ 00:c747 wTimeCapsulePartyMon2Moves 00:c749 wLinkPlayerPartyMon2ID 00:c74b wLinkPlayerPartyMon2Exp -00:c74b wTimeCapsulePartyMon2OTID +00:c74b wTimeCapsulePartyMon2ID 00:c74d wTimeCapsulePartyMon2Exp 00:c74e wLinkPlayerPartyMon2HPExp 00:c74e wLinkPlayerPartyMon2StatExp @@ -33331,7 +33331,7 @@ 00:c774 wLinkPlayerPartyMon3Item 00:c775 wLinkPlayerPartyMon3Moves 00:c776 wMysteryGiftTrainerEnd -00:c777 wTimeCapsulePartyMon3OTID +00:c777 wTimeCapsulePartyMon3ID 00:c779 wTimeCapsulePartyMon3Exp 00:c779 wLinkPlayerPartyMon3ID 00:c77b wLinkPlayerPartyMon3Exp @@ -33386,9 +33386,9 @@ 00:c7a0 wLYOverrides2 00:c7a1 wLinkPlayerPartyMon3SpclDef 00:c7a3 wLinkPlayerPartyMon4Species +00:c7a3 wTimeCapsulePartyMon4ID 00:c7a3 wLinkPlayerPartyMon3StructEnd 00:c7a3 wLinkPlayerPartyMon4 -00:c7a3 wTimeCapsulePartyMon4OTID 00:c7a4 wLinkPlayerPartyMon4Item 00:c7a5 wLinkPlayerPartyMon4Moves 00:c7a5 wTimeCapsulePartyMon4Exp @@ -33441,7 +33441,7 @@ 00:c7cb wLinkPlayerPartyMon4Defense 00:c7cd wLinkPlayerPartyMon4Speed 00:c7cf wLinkPlayerPartyMon4SpclAtk -00:c7cf wTimeCapsulePartyMon5OTID +00:c7cf wTimeCapsulePartyMon5ID 00:c7d1 wLinkPlayerPartyMon4SpclDef 00:c7d1 wTimeCapsulePartyMon5Exp 00:c7d3 wLinkPlayerPartyMon5Species @@ -33496,7 +33496,7 @@ 00:c7f9 wLinkPlayerPartyMon5Attack 00:c7f9 wLinkPlayerPartyMon5Stats 00:c7fb wLinkPlayerPartyMon5Defense -00:c7fb wTimeCapsulePartyMon6OTID +00:c7fb wTimeCapsulePartyMon6ID 00:c7fd wTimeCapsulePartyMon6Exp 00:c7fd wLinkPlayerPartyMon5Speed 00:c7ff wLinkPlayerPartyMon5SpclAtk @@ -33542,7 +33542,8 @@ 00:c818 wLinkPlayerPartyMon6DVs 00:c819 wTimeCapsulePartyMon6Special 00:c81a wLinkPlayerPartyMon6PP -00:c81b wTimeCapsulePartyMonOTNames +00:c81b wTimeCapsulePartyMonOTs +00:c81b wTimeCapsulePartyMon1OT 00:c81e wLinkPlayerPartyMon6Happiness 00:c81f wLinkPlayerPartyMon6PokerusStatus 00:c820 wLinkPlayerPartyMon6Unused1 @@ -33552,6 +33553,7 @@ 00:c823 wLinkPlayerPartyMon6BoxEnd 00:c824 wLinkPlayerPartyMon6Unused 00:c825 wLinkPlayerPartyMon6HP +00:c826 wTimeCapsulePartyMon2OT 00:c827 wLinkPlayerPartyMon6MaxHP 00:c829 wLinkPlayerPartyMon6Stats 00:c829 wLinkPlayerPartyMon6Attack @@ -33559,21 +33561,43 @@ 00:c82d wLinkPlayerPartyMon6Speed 00:c82f wLinkPlayerPartyMon6SpclAtk 00:c830 wLYOverrides2End +00:c831 wTimeCapsulePartyMon3OT 00:c831 wLinkPlayerPartyMon6SpclDef -00:c833 wLinkPlayerPartyMonOTNames +00:c833 wLinkPlayerPartyMon1OT +00:c833 wLinkPlayerPartyMonOTs 00:c833 wLinkPlayerPartyMon6StructEnd +00:c83c wTimeCapsulePartyMon4OT +00:c83e wLinkPlayerPartyMon2OT +00:c847 wTimeCapsulePartyMon5OT +00:c849 wLinkPlayerPartyMon3OT 00:c850 wMysteryGiftPlayerData 00:c851 wMysteryGiftPlayerID +00:c852 wTimeCapsulePartyMon6OT 00:c853 wMysteryGiftPlayerName -00:c85d wTimeCapsulePartyMonNicks +00:c854 wLinkPlayerPartyMon4OT +00:c85d wTimeCapsulePartyMonNicknames +00:c85d wTimeCapsulePartyMon1Nickname 00:c85e wMysteryGiftPlayerDexCaught 00:c85f wMysteryGiftPlayerSentDeco +00:c85f wLinkPlayerPartyMon5OT 00:c860 wMysteryGiftPlayerWhichItem 00:c861 wMysteryGiftPlayerWhichDeco 00:c862 wMysteryGiftPlayerBackupItem 00:c864 wMysteryGiftPlayerDataEnd -00:c875 wLinkPlayerPartyMonNicks +00:c868 wTimeCapsulePartyMon2Nickname +00:c86a wLinkPlayerPartyMon6OT +00:c873 wTimeCapsulePartyMon3Nickname +00:c875 wLinkPlayerPartyMonNicknames +00:c875 wLinkPlayerPartyMon1Nickname +00:c87e wTimeCapsulePartyMon4Nickname +00:c880 wLinkPlayerPartyMon2Nickname +00:c889 wTimeCapsulePartyMon5Nickname +00:c88b wLinkPlayerPartyMon3Nickname 00:c890 wLYOverridesBackupEnd +00:c894 wTimeCapsulePartyMon6Nickname +00:c896 wLinkPlayerPartyMon4Nickname +00:c8a1 wLinkPlayerPartyMon5Nickname +00:c8ac wLinkPlayerPartyMon6Nickname 00:c8f4 wLinkPlayerMail 00:c8f4 wLinkReceivedMail 00:c8f4 wLinkPlayerMailPreamble @@ -33587,7 +33611,7 @@ 00:c90a wActiveAnimObjects 00:c90a wAnimObject01 00:c90b wAnimObject01OAMFlags -00:c90c wAnimObject01Field02 +00:c90c wAnimObject01FixY 00:c90d wAnimObject01FramesetID 00:c90e wAnimObject01Function 00:c90f wAnimObject01Palette @@ -33605,7 +33629,7 @@ 00:c922 wAnimObject02Index 00:c922 wAnimObject02 00:c923 wAnimObject02OAMFlags -00:c924 wAnimObject02Field02 +00:c924 wAnimObject02FixY 00:c925 wAnimObject02FramesetID 00:c926 wAnimObject02Function 00:c927 wAnimObject02Palette @@ -33623,7 +33647,7 @@ 00:c93a wAnimObject03Index 00:c93a wAnimObject03 00:c93b wAnimObject03OAMFlags -00:c93c wAnimObject03Field02 +00:c93c wAnimObject03FixY 00:c93d wAnimObject03FramesetID 00:c93e wAnimObject03Function 00:c93f wAnimObject03Palette @@ -33641,7 +33665,7 @@ 00:c952 wAnimObject04 00:c952 wAnimObject04Index 00:c953 wAnimObject04OAMFlags -00:c954 wAnimObject04Field02 +00:c954 wAnimObject04FixY 00:c955 wAnimObject04FramesetID 00:c956 wAnimObject04Function 00:c957 wAnimObject04Palette @@ -33659,7 +33683,7 @@ 00:c96a wAnimObject05Index 00:c96a wAnimObject05 00:c96b wAnimObject05OAMFlags -00:c96c wAnimObject05Field02 +00:c96c wAnimObject05FixY 00:c96d wAnimObject05FramesetID 00:c96e wAnimObject05Function 00:c96f wAnimObject05Palette @@ -33681,7 +33705,7 @@ 00:c982 wAnimObject06 00:c982 wPrinterData 00:c983 wAnimObject06OAMFlags -00:c984 wAnimObject06Field02 +00:c984 wAnimObject06FixY 00:c985 wAnimObject06FramesetID 00:c986 wAnimObject06Function 00:c986 wPrinterChecksum @@ -33707,7 +33731,7 @@ 00:c99a wAnimObject07Index 00:c99a wAnimObject07 00:c99b wAnimObject07OAMFlags -00:c99c wAnimObject07Field02 +00:c99c wAnimObject07FixY 00:c99d wAnimObject07FramesetID 00:c99e wAnimObject07Function 00:c99f wAnimObject07Palette @@ -33725,7 +33749,7 @@ 00:c9b2 wAnimObject08Index 00:c9b2 wAnimObject08 00:c9b3 wAnimObject08OAMFlags -00:c9b4 wAnimObject08Field02 +00:c9b4 wAnimObject08FixY 00:c9b5 wAnimObject08FramesetID 00:c9b6 wAnimObject08Function 00:c9b7 wAnimObject08Palette @@ -33744,7 +33768,7 @@ 00:c9ca wAnimObject09 00:c9ca wAnimObject09Index 00:c9cb wAnimObject09OAMFlags -00:c9cc wAnimObject09Field02 +00:c9cc wAnimObject09FixY 00:c9cd wAnimObject09FramesetID 00:c9ce wAnimObject09Function 00:c9cf wAnimObject09Palette @@ -33762,7 +33786,7 @@ 00:c9e2 wAnimObject10Index 00:c9e2 wAnimObject10 00:c9e3 wAnimObject10OAMFlags -00:c9e4 wAnimObject10Field02 +00:c9e4 wAnimObject10FixY 00:c9e5 wAnimObject10FramesetID 00:c9e6 wAnimObject10Function 00:c9e7 wAnimObject10Palette @@ -33863,23 +33887,29 @@ 00:cae9 wEnemyMoveStructEffect 00:caea wEnemyMoveStructPower 00:caea wLinkOTPartyMonTypes +00:caea wLinkOTPartyMon1Type 00:caeb wEnemyMoveStructType +00:caec wLinkOTPartyMon2Type 00:caec wEnemyMoveStructAccuracy 00:caed wEnemyMoveStructPP 00:caee wEnemyMoveStructEffectChance +00:caee wLinkOTPartyMon3Type 00:caef wPlayerMoveStructAnimation 00:caef wPlayerMoveStruct 00:caf0 wPlayerMoveStructEffect +00:caf0 wLinkOTPartyMon4Type 00:caf1 wPlayerMoveStructPower 00:caf2 wPlayerMoveStructType +00:caf2 wLinkOTPartyMon5Type 00:caf3 wPlayerMoveStructAccuracy 00:caf4 wPlayerMoveStructPP +00:caf4 wLinkOTPartyMon6Type 00:caf5 wPlayerMoveStructEffectChance -00:caf6 wEnemyMonNick +00:caf6 wEnemyMonNickname 00:caf8 wPrinterStatus 00:cafa wPrinterMargins 00:cafb wPrinterExposureTime -00:cb01 wBattleMonNick +00:cb01 wBattleMonNickname 00:cb0c wBattleMonSpecies 00:cb0c wGameboyPrinterRAMEnd 00:cb0c wBattleMon @@ -34234,7 +34264,6 @@ 00:ceed wLuckyNumberDigitsBuffer 00:ceed wEarthquakeMovementDataBuffer 00:ceed wMonMailMessageBuffer -00:ceed wBufferMonNick 00:ceed wLinkBattleRecordBuffer 00:ceed wPokeFluteCuredSleep 00:ceed wDebugColorIsTrainer @@ -34266,6 +34295,7 @@ 00:ceed wNumOwnedDecoCategories 00:ceed wMartItem1BCD 00:ceed wTownMapPlayerIconLandmark +00:ceed wBufferMonNickname 00:ceee wPlaceBallsDirection 00:ceee wMovementBufferObject 00:ceee wNextRadioLine @@ -34280,10 +34310,10 @@ 00:ceee wTempPokedexCaughtCount 00:ceee wMagnetTrainInitPosition 00:ceee wTownMapCursorCoordinates +00:ceef wBufferTrademonNickname 00:ceef wRadioTextDelay 00:ceef wDebugColorCurTMHM 00:ceef wBugContestFirstPlaceScore -00:ceef wBufferTrademonNick 00:ceef wTownMapCursorObjectPointer 00:ceef wTrainerHUDTiles 00:ceef wBillsPCTempBoxCount @@ -34341,7 +34371,7 @@ 00:cf12 wBufferMonDefExp 00:cf14 wBufferMonSpdExp 00:cf16 wBufferMonSpcExp -00:cf16 wTempMailAuthorNationality +00:cf16 wTempMailNationality 00:cf18 wTempMailAuthorID 00:cf18 wBufferMonDVs 00:cf1a wTempMailSpecies @@ -35879,8 +35909,20 @@ 01:db46 wPartyMon6SpclAtk 01:db48 wPartyMon6SpclDef 01:db4a wPartyMon6StructEnd -01:db4a wPartyMonOT +01:db4a wPartyMon1OT +01:db4a wPartyMonOTs +01:db55 wPartyMon2OT +01:db60 wPartyMon3OT +01:db6b wPartyMon4OT +01:db76 wPartyMon5OT +01:db81 wPartyMon6OT 01:db8c wPartyMonNicknames +01:db8c wPartyMon1Nickname +01:db97 wPartyMon2Nickname +01:dba2 wPartyMon3Nickname +01:dbad wPartyMon4Nickname +01:dbb8 wPartyMon5Nickname +01:dbc3 wPartyMon6Nickname 01:dbce wPartyMonNicknamesEnd 01:dbe4 wPokedexCaught 01:dc04 wEndPokedexCaught @@ -35890,7 +35932,7 @@ 01:dc3e wUnlockedUnowns 01:dc3f wFirstUnownSeen 01:dc40 wDayCareMan -01:dc41 wBreedMon1Nick +01:dc41 wBreedMon1Nickname 01:dc4c wBreedMon1OT 01:dc57 wBreedMon1 01:dc57 wBreedMon1Species @@ -35915,7 +35957,7 @@ 01:dc77 wBreedMon1BoxEnd 01:dc78 wStepsToEgg 01:dc79 wBreedMotherOrNonDitto -01:dc7a wBreedMon2Nick +01:dc7a wBreedMon2Nickname 01:dc85 wBreedMon2OT 01:dc90 wBreedMon2Species 01:dc90 wBreedMon2 @@ -35936,9 +35978,9 @@ 01:dcad wBreedMon2Unused1 01:dcae wBreedMon2Unused2 01:dcaf wBreedMon2Level -01:dcb0 wEggNick +01:dcb0 wEggMonNickname 01:dcb0 wBreedMon2BoxEnd -01:dcbb wEggOT +01:dcbb wEggMonOT 01:dcc6 wEggMonSpecies 01:dcc6 wEggMon 01:dcc7 wEggMonItem @@ -36223,10 +36265,21 @@ 01:de77 wOTPartyMon6Speed 01:de79 wOTPartyMon6SpclAtk 01:de7b wOTPartyMon6SpclDef -01:de7d wOTPartyMonsEnd -01:de7d wOTPartyMonOT +01:de7d wOTPartyMonOTs +01:de7d wOTPartyMon1OT 01:de7d wOTPartyMon6StructEnd +01:de88 wOTPartyMon2OT +01:de93 wOTPartyMon3OT +01:de9e wOTPartyMon4OT +01:dea9 wOTPartyMon5OT +01:deb4 wOTPartyMon6OT 01:debf wOTPartyMonNicknames +01:debf wOTPartyMon1Nickname +01:deca wOTPartyMon2Nickname +01:ded5 wOTPartyMon3Nickname +01:dee0 wOTPartyMon4Nickname +01:deeb wOTPartyMon5Nickname +01:def6 wOTPartyMon6Nickname 01:df01 wGameDataEnd 01:df01 wPokemonDataEnd 01:df01 wOTPartyDataEnd diff --git a/pokesilver_debug.sym b/pokesilver_debug.sym index ee362113..972b0990 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.__7889 +00:1014 CheckDict.__7890 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_8076 -00:2039 LoadMetatiles.next_8081 -00:204c LoadMetatiles.next_8086 +00:2026 LoadMetatiles.next_8077 +00:2039 LoadMetatiles.next_8082 +00:204c LoadMetatiles.next_8087 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_8168 -00:34e3 CopyTilemapAtOnce.loop_8169 -00:34ec CopyTilemapAtOnce.loop_8170 -00:34f5 CopyTilemapAtOnce.loop_8171 -00:34fe CopyTilemapAtOnce.loop_8172 -00:3507 CopyTilemapAtOnce.loop_8173 -00:3510 CopyTilemapAtOnce.loop_8174 -00:3519 CopyTilemapAtOnce.loop_8175 -00:3522 CopyTilemapAtOnce.loop_8176 -00:352b CopyTilemapAtOnce.loop_8177 +00:34da CopyTilemapAtOnce.loop_8169 +00:34e3 CopyTilemapAtOnce.loop_8170 +00:34ec CopyTilemapAtOnce.loop_8171 +00:34f5 CopyTilemapAtOnce.loop_8172 +00:34fe CopyTilemapAtOnce.loop_8173 +00:3507 CopyTilemapAtOnce.loop_8174 +00:3510 CopyTilemapAtOnce.loop_8175 +00:3519 CopyTilemapAtOnce.loop_8176 +00:3522 CopyTilemapAtOnce.loop_8177 +00:352b CopyTilemapAtOnce.loop_8178 00:3546 SetPalettes 00:3556 SetPalettes.SetPalettesForGameBoyColor 00:3564 ClearPalettes @@ -1109,8 +1109,8 @@ 00:3a79 GetBaseData 00:3a9e GetBaseData.egg 00:3ab3 GetBaseData.end -00:3abf GetCurNick -00:3ac5 GetNick +00:3abf GetCurNickname +00:3ac5 GetNickname 00:3ade PrintBCDNumber 00:3af0 PrintBCDNumber.loop 00:3b07 PrintBCDNumber.skipLeftAlignmentAdjustment @@ -1954,7 +1954,7 @@ 01:73bd GiveShuckle 01:741b GiveShuckle.NotGiven 01:7420 SpecialShuckleOT -01:7426 SpecialShuckleNick +01:7426 SpecialShuckleNickname 01:742e ReturnShuckie 01:745f ReturnShuckie.CheckOT 01:746b ReturnShuckie.done @@ -2084,11 +2084,11 @@ 02:4ac3 QueueFollowerFirstStep.up 02:4ac7 QueueFollowerFirstStep.same_xy 02:4ac9 _Sine -02:4ad5 _Sine.negative_13129 -02:4adf _Sine.apply_13129 -02:4aee _Sine.multiply_13129 -02:4af3 _Sine.even_13129 -02:4afb _Sine.sinetable_13129 +02:4ad5 _Sine.negative_13130 +02:4adf _Sine.apply_13130 +02:4aee _Sine.multiply_13130 +02:4af3 _Sine.even_13130 +02:4afb _Sine.sinetable_13130 02:4b3b GetPredefPointer 02:4b5b PredefPointers 02:4b5b LearnMovePredef @@ -2682,7 +2682,7 @@ 03:472d FieldMoveJumptableReset 03:4738 FieldMoveJumptable 03:4745 FieldMoveJumptable.okay -03:4749 GetPartyNick +03:4749 GetPartyNickname 03:4764 CheckEngineFlag 03:4772 CheckEngineFlag.isset 03:4774 CheckBadge @@ -11309,31 +11309,31 @@ 23:402d SaveMenu_CopyTilemapAtOnce.wait2 23:403b SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack 23:404c SaveMenu_CopyTilemapAtOnce.loop -23:404d SaveMenu_CopyTilemapAtOnce.loop_41909 -23:4056 SaveMenu_CopyTilemapAtOnce.loop_41910 -23:405f SaveMenu_CopyTilemapAtOnce.loop_41911 -23:4068 SaveMenu_CopyTilemapAtOnce.loop_41912 -23:4071 SaveMenu_CopyTilemapAtOnce.loop_41913 -23:407a SaveMenu_CopyTilemapAtOnce.loop_41914 -23:4083 SaveMenu_CopyTilemapAtOnce.loop_41915 -23:408c SaveMenu_CopyTilemapAtOnce.loop_41916 -23:4095 SaveMenu_CopyTilemapAtOnce.loop_41917 -23:409e SaveMenu_CopyTilemapAtOnce.loop_41918 +23:404d SaveMenu_CopyTilemapAtOnce.loop_41910 +23:4056 SaveMenu_CopyTilemapAtOnce.loop_41911 +23:405f SaveMenu_CopyTilemapAtOnce.loop_41912 +23:4068 SaveMenu_CopyTilemapAtOnce.loop_41913 +23:4071 SaveMenu_CopyTilemapAtOnce.loop_41914 +23:407a SaveMenu_CopyTilemapAtOnce.loop_41915 +23:4083 SaveMenu_CopyTilemapAtOnce.loop_41916 +23:408c SaveMenu_CopyTilemapAtOnce.loop_41917 +23:4095 SaveMenu_CopyTilemapAtOnce.loop_41918 +23:409e SaveMenu_CopyTilemapAtOnce.loop_41919 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_41921 -23:4117 PhoneRing_CopyTilemapAtOnce.loop_41922 -23:4120 PhoneRing_CopyTilemapAtOnce.loop_41923 -23:4129 PhoneRing_CopyTilemapAtOnce.loop_41924 -23:4132 PhoneRing_CopyTilemapAtOnce.loop_41925 -23:413b PhoneRing_CopyTilemapAtOnce.loop_41926 -23:4144 PhoneRing_CopyTilemapAtOnce.loop_41927 -23:414d PhoneRing_CopyTilemapAtOnce.loop_41928 -23:4156 PhoneRing_CopyTilemapAtOnce.loop_41929 -23:415f PhoneRing_CopyTilemapAtOnce.loop_41930 +23:410e PhoneRing_CopyTilemapAtOnce.loop_41922 +23:4117 PhoneRing_CopyTilemapAtOnce.loop_41923 +23:4120 PhoneRing_CopyTilemapAtOnce.loop_41924 +23:4129 PhoneRing_CopyTilemapAtOnce.loop_41925 +23:4132 PhoneRing_CopyTilemapAtOnce.loop_41926 +23:413b PhoneRing_CopyTilemapAtOnce.loop_41927 +23:4144 PhoneRing_CopyTilemapAtOnce.loop_41928 +23:414d PhoneRing_CopyTilemapAtOnce.loop_41929 +23:4156 PhoneRing_CopyTilemapAtOnce.loop_41930 +23:415f PhoneRing_CopyTilemapAtOnce.loop_41931 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_42350 -23:4996 StartTrainerBattle_DrawSineWave.apply_42350 -23:49a5 StartTrainerBattle_DrawSineWave.multiply_42350 -23:49aa StartTrainerBattle_DrawSineWave.even_42350 -23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42350 +23:498c StartTrainerBattle_DrawSineWave.negative_42351 +23:4996 StartTrainerBattle_DrawSineWave.apply_42351 +23:49a5 StartTrainerBattle_DrawSineWave.multiply_42351 +23:49aa StartTrainerBattle_DrawSineWave.even_42351 +23:49b2 StartTrainerBattle_DrawSineWave.sinetable_42351 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_43318 -23:6687 Sprites_Sine.apply_43318 -23:6696 Sprites_Sine.multiply_43318 -23:669b Sprites_Sine.even_43318 -23:66a3 Sprites_Sine.sinetable_43318 +23:667d Sprites_Sine.negative_43319 +23:6687 Sprites_Sine.apply_43319 +23:6696 Sprites_Sine.multiply_43319 +23:669b Sprites_Sine.even_43319 +23:66a3 Sprites_Sine.sinetable_43319 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_49254 -33:668e BattleAnim_Sine.apply_49254 -33:669d BattleAnim_Sine.multiply_49254 -33:66a2 BattleAnim_Sine.even_49254 +33:6684 BattleAnim_Sine.negative_49255 +33:668e BattleAnim_Sine.apply_49255 +33:669d BattleAnim_Sine.multiply_49255 +33:66a2 BattleAnim_Sine.even_49255 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_52102 -38:7567 CopyBoxmonSpecies.done_52102 +38:7545 CopyBoxmonSpecies.loop_52103 +38:7567 CopyBoxmonSpecies.done_52103 38:7575 CopyBoxmonSpecies.party -38:7578 CopyBoxmonSpecies.loop_52103 -38:759a CopyBoxmonSpecies.done_52103 +38:7578 CopyBoxmonSpecies.loop_52104 +38:759a CopyBoxmonSpecies.done_52104 38:75a5 CopyBoxmonSpecies.sBox -38:75ad CopyBoxmonSpecies.loop_52104 -38:75cf CopyBoxmonSpecies.done_52104 +38:75ad CopyBoxmonSpecies.loop_52105 +38:75cf CopyBoxmonSpecies.done_52105 38:75dd BillsPC_GetSelectedPokemonSpecies 38:75ef BillsPC_UpdateSelectionCursor 38:75f9 BillsPC_UpdateSelectionCursor.place_cursor @@ -30168,7 +30168,7 @@ 00:a600 sPartyMon1Mail 00:a620 sPartyMon1MailMessageEnd 00:a621 sPartyMon1MailAuthor -00:a629 sPartyMon1MailAuthorNationality +00:a629 sPartyMon1MailNationality 00:a62b sPartyMon1MailAuthorID 00:a62d sPartyMon1MailSpecies 00:a62e sPartyMon1MailType @@ -30177,7 +30177,7 @@ 00:a62f sPartyMon1MailEnd 00:a64f sPartyMon2MailMessageEnd 00:a650 sPartyMon2MailAuthor -00:a658 sPartyMon2MailAuthorNationality +00:a658 sPartyMon2MailNationality 00:a65a sPartyMon2MailAuthorID 00:a65c sPartyMon2MailSpecies 00:a65d sPartyMon2MailType @@ -30186,7 +30186,7 @@ 00:a65e sPartyMon3Mail 00:a67e sPartyMon3MailMessageEnd 00:a67f sPartyMon3MailAuthor -00:a687 sPartyMon3MailAuthorNationality +00:a687 sPartyMon3MailNationality 00:a689 sPartyMon3MailAuthorID 00:a68b sPartyMon3MailSpecies 00:a68c sPartyMon3MailType @@ -30195,7 +30195,7 @@ 00:a68d sPartyMon4MailMessage 00:a6ad sPartyMon4MailMessageEnd 00:a6ae sPartyMon4MailAuthor -00:a6b6 sPartyMon4MailAuthorNationality +00:a6b6 sPartyMon4MailNationality 00:a6b8 sPartyMon4MailAuthorID 00:a6ba sPartyMon4MailSpecies 00:a6bb sPartyMon4MailType @@ -30204,7 +30204,7 @@ 00:a6bc sPartyMon5MailMessage 00:a6dc sPartyMon5MailMessageEnd 00:a6dd sPartyMon5MailAuthor -00:a6e5 sPartyMon5MailAuthorNationality +00:a6e5 sPartyMon5MailNationality 00:a6e7 sPartyMon5MailAuthorID 00:a6e9 sPartyMon5MailSpecies 00:a6ea sPartyMon5MailType @@ -30213,7 +30213,7 @@ 00:a6eb sPartyMon6Mail 00:a70b sPartyMon6MailMessageEnd 00:a70c sPartyMon6MailAuthor -00:a714 sPartyMon6MailAuthorNationality +00:a714 sPartyMon6MailNationality 00:a716 sPartyMon6MailAuthorID 00:a718 sPartyMon6MailSpecies 00:a719 sPartyMon6MailType @@ -30223,7 +30223,7 @@ 00:a71a sPartyMon6MailEnd 00:a73a sPartyMon1MailBackupMessageEnd 00:a73b sPartyMon1MailBackupAuthor -00:a743 sPartyMon1MailBackupAuthorNationality +00:a743 sPartyMon1MailBackupNationality 00:a745 sPartyMon1MailBackupAuthorID 00:a747 sPartyMon1MailBackupSpecies 00:a748 sPartyMon1MailBackupType @@ -30232,7 +30232,7 @@ 00:a749 sPartyMon1MailBackupEnd 00:a769 sPartyMon2MailBackupMessageEnd 00:a76a sPartyMon2MailBackupAuthor -00:a772 sPartyMon2MailBackupAuthorNationality +00:a772 sPartyMon2MailBackupNationality 00:a774 sPartyMon2MailBackupAuthorID 00:a776 sPartyMon2MailBackupSpecies 00:a777 sPartyMon2MailBackupType @@ -30241,7 +30241,7 @@ 00:a778 sPartyMon2MailBackupEnd 00:a798 sPartyMon3MailBackupMessageEnd 00:a799 sPartyMon3MailBackupAuthor -00:a7a1 sPartyMon3MailBackupAuthorNationality +00:a7a1 sPartyMon3MailBackupNationality 00:a7a3 sPartyMon3MailBackupAuthorID 00:a7a5 sPartyMon3MailBackupSpecies 00:a7a6 sPartyMon3MailBackupType @@ -30250,7 +30250,7 @@ 00:a7a7 sPartyMon4MailBackupMessage 00:a7c7 sPartyMon4MailBackupMessageEnd 00:a7c8 sPartyMon4MailBackupAuthor -00:a7d0 sPartyMon4MailBackupAuthorNationality +00:a7d0 sPartyMon4MailBackupNationality 00:a7d2 sPartyMon4MailBackupAuthorID 00:a7d4 sPartyMon4MailBackupSpecies 00:a7d5 sPartyMon4MailBackupType @@ -30259,7 +30259,7 @@ 00:a7d6 sPartyMon5MailBackup 00:a7f6 sPartyMon5MailBackupMessageEnd 00:a7f7 sPartyMon5MailBackupAuthor -00:a7ff sPartyMon5MailBackupAuthorNationality +00:a7ff sPartyMon5MailBackupNationality 00:a801 sPartyMon5MailBackupAuthorID 00:a803 sPartyMon5MailBackupSpecies 00:a804 sPartyMon5MailBackupType @@ -30268,7 +30268,7 @@ 00:a805 sPartyMon6MailBackup 00:a825 sPartyMon6MailBackupMessageEnd 00:a826 sPartyMon6MailBackupAuthor -00:a82e sPartyMon6MailBackupAuthorNationality +00:a82e sPartyMon6MailBackupNationality 00:a830 sPartyMon6MailBackupAuthorID 00:a832 sPartyMon6MailBackupSpecies 00:a833 sPartyMon6MailBackupType @@ -30279,7 +30279,7 @@ 00:a835 sMailboxes 00:a855 sMailbox1MessageEnd 00:a856 sMailbox1Author -00:a85e sMailbox1AuthorNationality +00:a85e sMailbox1Nationality 00:a860 sMailbox1AuthorID 00:a862 sMailbox1Species 00:a863 sMailbox1Type @@ -30288,7 +30288,7 @@ 00:a864 sMailbox2Message 00:a884 sMailbox2MessageEnd 00:a885 sMailbox2Author -00:a88d sMailbox2AuthorNationality +00:a88d sMailbox2Nationality 00:a88f sMailbox2AuthorID 00:a891 sMailbox2Species 00:a892 sMailbox2Type @@ -30297,7 +30297,7 @@ 00:a893 sMailbox2End 00:a8b3 sMailbox3MessageEnd 00:a8b4 sMailbox3Author -00:a8bc sMailbox3AuthorNationality +00:a8bc sMailbox3Nationality 00:a8be sMailbox3AuthorID 00:a8c0 sMailbox3Species 00:a8c1 sMailbox3Type @@ -30306,7 +30306,7 @@ 00:a8c2 sMailbox3End 00:a8e2 sMailbox4MessageEnd 00:a8e3 sMailbox4Author -00:a8eb sMailbox4AuthorNationality +00:a8eb sMailbox4Nationality 00:a8ed sMailbox4AuthorID 00:a8ef sMailbox4Species 00:a8f0 sMailbox4Type @@ -30315,7 +30315,7 @@ 00:a8f1 sMailbox5Message 00:a911 sMailbox5MessageEnd 00:a912 sMailbox5Author -00:a91a sMailbox5AuthorNationality +00:a91a sMailbox5Nationality 00:a91c sMailbox5AuthorID 00:a91e sMailbox5Species 00:a91f sMailbox5Type @@ -30324,7 +30324,7 @@ 00:a920 sMailbox5End 00:a940 sMailbox6MessageEnd 00:a941 sMailbox6Author -00:a949 sMailbox6AuthorNationality +00:a949 sMailbox6Nationality 00:a94b sMailbox6AuthorID 00:a94d sMailbox6Species 00:a94e sMailbox6Type @@ -30333,7 +30333,7 @@ 00:a94f sMailbox7Message 00:a96f sMailbox7MessageEnd 00:a970 sMailbox7Author -00:a978 sMailbox7AuthorNationality +00:a978 sMailbox7Nationality 00:a97a sMailbox7AuthorID 00:a97c sMailbox7Species 00:a97d sMailbox7Type @@ -30342,7 +30342,7 @@ 00:a97e sMailbox7End 00:a99e sMailbox8MessageEnd 00:a99f sMailbox8Author -00:a9a7 sMailbox8AuthorNationality +00:a9a7 sMailbox8Nationality 00:a9a9 sMailbox8AuthorID 00:a9ab sMailbox8Species 00:a9ac sMailbox8Type @@ -30351,7 +30351,7 @@ 00:a9ad sMailbox8End 00:a9cd sMailbox9MessageEnd 00:a9ce sMailbox9Author -00:a9d6 sMailbox9AuthorNationality +00:a9d6 sMailbox9Nationality 00:a9d8 sMailbox9AuthorID 00:a9da sMailbox9Species 00:a9db sMailbox9Type @@ -30360,7 +30360,7 @@ 00:a9dc sMailbox9End 00:a9fc sMailbox10MessageEnd 00:a9fd sMailbox10Author -00:aa05 sMailbox10AuthorNationality +00:aa05 sMailbox10Nationality 00:aa07 sMailbox10AuthorID 00:aa09 sMailbox10Species 00:aa0a sMailbox10Type @@ -30371,7 +30371,7 @@ 00:aa0c sMailbox1Backup 00:aa2c sMailbox1BackupMessageEnd 00:aa2d sMailbox1BackupAuthor -00:aa35 sMailbox1BackupAuthorNationality +00:aa35 sMailbox1BackupNationality 00:aa37 sMailbox1BackupAuthorID 00:aa39 sMailbox1BackupSpecies 00:aa3a sMailbox1BackupType @@ -30380,7 +30380,7 @@ 00:aa3b sMailbox1BackupEnd 00:aa5b sMailbox2BackupMessageEnd 00:aa5c sMailbox2BackupAuthor -00:aa64 sMailbox2BackupAuthorNationality +00:aa64 sMailbox2BackupNationality 00:aa66 sMailbox2BackupAuthorID 00:aa68 sMailbox2BackupSpecies 00:aa69 sMailbox2BackupType @@ -30389,7 +30389,7 @@ 00:aa6a sMailbox2BackupEnd 00:aa8a sMailbox3BackupMessageEnd 00:aa8b sMailbox3BackupAuthor -00:aa93 sMailbox3BackupAuthorNationality +00:aa93 sMailbox3BackupNationality 00:aa95 sMailbox3BackupAuthorID 00:aa97 sMailbox3BackupSpecies 00:aa98 sMailbox3BackupType @@ -30398,7 +30398,7 @@ 00:aa99 sMailbox3BackupEnd 00:aab9 sMailbox4BackupMessageEnd 00:aaba sMailbox4BackupAuthor -00:aac2 sMailbox4BackupAuthorNationality +00:aac2 sMailbox4BackupNationality 00:aac4 sMailbox4BackupAuthorID 00:aac6 sMailbox4BackupSpecies 00:aac7 sMailbox4BackupType @@ -30407,7 +30407,7 @@ 00:aac8 sMailbox4BackupEnd 00:aae8 sMailbox5BackupMessageEnd 00:aae9 sMailbox5BackupAuthor -00:aaf1 sMailbox5BackupAuthorNationality +00:aaf1 sMailbox5BackupNationality 00:aaf3 sMailbox5BackupAuthorID 00:aaf5 sMailbox5BackupSpecies 00:aaf6 sMailbox5BackupType @@ -30416,7 +30416,7 @@ 00:aaf7 sMailbox6Backup 00:ab17 sMailbox6BackupMessageEnd 00:ab18 sMailbox6BackupAuthor -00:ab20 sMailbox6BackupAuthorNationality +00:ab20 sMailbox6BackupNationality 00:ab22 sMailbox6BackupAuthorID 00:ab24 sMailbox6BackupSpecies 00:ab25 sMailbox6BackupType @@ -30425,7 +30425,7 @@ 00:ab26 sMailbox7BackupMessage 00:ab46 sMailbox7BackupMessageEnd 00:ab47 sMailbox7BackupAuthor -00:ab4f sMailbox7BackupAuthorNationality +00:ab4f sMailbox7BackupNationality 00:ab51 sMailbox7BackupAuthorID 00:ab53 sMailbox7BackupSpecies 00:ab54 sMailbox7BackupType @@ -30434,7 +30434,7 @@ 00:ab55 sMailbox7BackupEnd 00:ab75 sMailbox8BackupMessageEnd 00:ab76 sMailbox8BackupAuthor -00:ab7e sMailbox8BackupAuthorNationality +00:ab7e sMailbox8BackupNationality 00:ab80 sMailbox8BackupAuthorID 00:ab82 sMailbox8BackupSpecies 00:ab83 sMailbox8BackupType @@ -30443,7 +30443,7 @@ 00:ab84 sMailbox9BackupMessage 00:aba4 sMailbox9BackupMessageEnd 00:aba5 sMailbox9BackupAuthor -00:abad sMailbox9BackupAuthorNationality +00:abad sMailbox9BackupNationality 00:abaf sMailbox9BackupAuthorID 00:abb1 sMailbox9BackupSpecies 00:abb2 sMailbox9BackupType @@ -30452,7 +30452,7 @@ 00:abb3 sMailbox10BackupMessage 00:abd3 sMailbox10BackupMessageEnd 00:abd4 sMailbox10BackupAuthor -00:abdc sMailbox10BackupAuthorNationality +00:abdc sMailbox10BackupNationality 00:abde sMailbox10BackupAuthorID 00:abe0 sMailbox10BackupSpecies 00:abe1 sMailbox10BackupType @@ -30517,7 +30517,7 @@ 01:ada1 sBoxMon1Level 01:ada2 sBoxMon1BoxEnd 01:ada2 sBoxMon2 -01:b002 sBoxMonOT +01:b002 sBoxMonOTs 01:b0de sBoxMonNicknames 01:b1ba sBoxMonNicknamesEnd 01:b1ba sBoxEnd @@ -31940,7 +31940,7 @@ 02:a035 sBox1Mon1Level 02:a036 sBox1Mon2 02:a036 sBox1Mon1BoxEnd -02:a296 sBox1MonOT +02:a296 sBox1MonOTs 02:a372 sBox1MonNicknames 02:a44e sBox1End 02:a44e sBox1MonNicknamesEnd @@ -31969,7 +31969,7 @@ 02:a485 sBox2Mon1Level 02:a486 sBox2Mon1BoxEnd 02:a486 sBox2Mon2 -02:a6e6 sBox2MonOT +02:a6e6 sBox2MonOTs 02:a7c2 sBox2MonNicknames 02:a89e sBox2End 02:a89e sBox2MonNicknamesEnd @@ -31998,7 +31998,7 @@ 02:a8d5 sBox3Mon1Level 02:a8d6 sBox3Mon1BoxEnd 02:a8d6 sBox3Mon2 -02:ab36 sBox3MonOT +02:ab36 sBox3MonOTs 02:ac12 sBox3MonNicknames 02:acee sBox3End 02:acee sBox3MonNicknamesEnd @@ -32027,7 +32027,7 @@ 02:ad25 sBox4Mon1Level 02:ad26 sBox4Mon2 02:ad26 sBox4Mon1BoxEnd -02:af86 sBox4MonOT +02:af86 sBox4MonOTs 02:b062 sBox4MonNicknames 02:b13e sBox4End 02:b13e sBox4MonNicknamesEnd @@ -32056,7 +32056,7 @@ 02:b175 sBox5Mon1Level 02:b176 sBox5Mon2 02:b176 sBox5Mon1BoxEnd -02:b3d6 sBox5MonOT +02:b3d6 sBox5MonOTs 02:b4b2 sBox5MonNicknames 02:b58e sBox5MonNicknamesEnd 02:b58e sBox5End @@ -32085,7 +32085,7 @@ 02:b5c5 sBox6Mon1Level 02:b5c6 sBox6Mon2 02:b5c6 sBox6Mon1BoxEnd -02:b826 sBox6MonOT +02:b826 sBox6MonOTs 02:b902 sBox6MonNicknames 02:b9de sBox6End 02:b9de sBox6MonNicknamesEnd @@ -32114,7 +32114,7 @@ 02:ba15 sBox7Mon1Level 02:ba16 sBox7Mon2 02:ba16 sBox7Mon1BoxEnd -02:bc76 sBox7MonOT +02:bc76 sBox7MonOTs 02:bd52 sBox7MonNicknames 02:be2e sBox7End 02:be2e sBox7MonNicknamesEnd @@ -32143,7 +32143,7 @@ 03:a035 sBox8Mon1Level 03:a036 sBox8Mon1BoxEnd 03:a036 sBox8Mon2 -03:a296 sBox8MonOT +03:a296 sBox8MonOTs 03:a372 sBox8MonNicknames 03:a44e sBox8MonNicknamesEnd 03:a44e sBox8End @@ -32172,7 +32172,7 @@ 03:a485 sBox9Mon1Level 03:a486 sBox9Mon2 03:a486 sBox9Mon1BoxEnd -03:a6e6 sBox9MonOT +03:a6e6 sBox9MonOTs 03:a7c2 sBox9MonNicknames 03:a89e sBox9MonNicknamesEnd 03:a89e sBox9End @@ -32201,7 +32201,7 @@ 03:a8d5 sBox10Mon1Level 03:a8d6 sBox10Mon1BoxEnd 03:a8d6 sBox10Mon2 -03:ab36 sBox10MonOT +03:ab36 sBox10MonOTs 03:ac12 sBox10MonNicknames 03:acee sBox10MonNicknamesEnd 03:acee sBox10End @@ -32230,7 +32230,7 @@ 03:ad25 sBox11Mon1Level 03:ad26 sBox11Mon1BoxEnd 03:ad26 sBox11Mon2 -03:af86 sBox11MonOT +03:af86 sBox11MonOTs 03:b062 sBox11MonNicknames 03:b13e sBox11End 03:b13e sBox11MonNicknamesEnd @@ -32259,7 +32259,7 @@ 03:b175 sBox12Mon1Level 03:b176 sBox12Mon2 03:b176 sBox12Mon1BoxEnd -03:b3d6 sBox12MonOT +03:b3d6 sBox12MonOTs 03:b4b2 sBox12MonNicknames 03:b58e sBox12End 03:b58e sBox12MonNicknamesEnd @@ -32288,7 +32288,7 @@ 03:b5c5 sBox13Mon1Level 03:b5c6 sBox13Mon1BoxEnd 03:b5c6 sBox13Mon2 -03:b826 sBox13MonOT +03:b826 sBox13MonOTs 03:b902 sBox13MonNicknames 03:b9de sBox13MonNicknamesEnd 03:b9de sBox13End @@ -32317,7 +32317,7 @@ 03:ba15 sBox14Mon1Level 03:ba16 sBox14Mon1BoxEnd 03:ba16 sBox14Mon2 -03:bc76 sBox14MonOT +03:bc76 sBox14MonOTs 03:bd52 sBox14MonNicknames 03:be2e sBox14MonNicknamesEnd 03:be2e sBox14End @@ -33382,7 +33382,7 @@ 00:c71e wDebugRoomMonUnused2 00:c71e wLinkPlayerPartyMon1StatExp 00:c71e wLinkPlayerPartyMon1HPExp -00:c71f wTimeCapsulePartyMon1OTID +00:c71f wTimeCapsulePartyMon1ID 00:c71f wDebugRoomMonLevel 00:c720 wLinkPlayerPartyMon1AtkExp 00:c720 wDebugRoomMonBoxEnd @@ -33461,7 +33461,7 @@ 00:c747 wTimeCapsulePartyMon2Moves 00:c749 wLinkPlayerPartyMon2ID 00:c74b wLinkPlayerPartyMon2Exp -00:c74b wTimeCapsulePartyMon2OTID +00:c74b wTimeCapsulePartyMon2ID 00:c74d wTimeCapsulePartyMon2Exp 00:c74e wLinkPlayerPartyMon2HPExp 00:c74e wLinkPlayerPartyMon2StatExp @@ -33527,7 +33527,7 @@ 00:c774 wLinkPlayerPartyMon3Item 00:c775 wLinkPlayerPartyMon3Moves 00:c776 wMysteryGiftTrainerEnd -00:c777 wTimeCapsulePartyMon3OTID +00:c777 wTimeCapsulePartyMon3ID 00:c779 wTimeCapsulePartyMon3Exp 00:c779 wLinkPlayerPartyMon3ID 00:c77b wLinkPlayerPartyMon3Exp @@ -33582,9 +33582,9 @@ 00:c7a0 wLYOverrides2 00:c7a1 wLinkPlayerPartyMon3SpclDef 00:c7a3 wLinkPlayerPartyMon4Species +00:c7a3 wTimeCapsulePartyMon4ID 00:c7a3 wLinkPlayerPartyMon3StructEnd 00:c7a3 wLinkPlayerPartyMon4 -00:c7a3 wTimeCapsulePartyMon4OTID 00:c7a4 wLinkPlayerPartyMon4Item 00:c7a5 wLinkPlayerPartyMon4Moves 00:c7a5 wTimeCapsulePartyMon4Exp @@ -33637,7 +33637,7 @@ 00:c7cb wLinkPlayerPartyMon4Defense 00:c7cd wLinkPlayerPartyMon4Speed 00:c7cf wLinkPlayerPartyMon4SpclAtk -00:c7cf wTimeCapsulePartyMon5OTID +00:c7cf wTimeCapsulePartyMon5ID 00:c7d1 wLinkPlayerPartyMon4SpclDef 00:c7d1 wTimeCapsulePartyMon5Exp 00:c7d3 wLinkPlayerPartyMon5Species @@ -33692,7 +33692,7 @@ 00:c7f9 wLinkPlayerPartyMon5Attack 00:c7f9 wLinkPlayerPartyMon5Stats 00:c7fb wLinkPlayerPartyMon5Defense -00:c7fb wTimeCapsulePartyMon6OTID +00:c7fb wTimeCapsulePartyMon6ID 00:c7fd wTimeCapsulePartyMon6Exp 00:c7fd wLinkPlayerPartyMon5Speed 00:c7ff wLinkPlayerPartyMon5SpclAtk @@ -33738,7 +33738,8 @@ 00:c818 wLinkPlayerPartyMon6DVs 00:c819 wTimeCapsulePartyMon6Special 00:c81a wLinkPlayerPartyMon6PP -00:c81b wTimeCapsulePartyMonOTNames +00:c81b wTimeCapsulePartyMonOTs +00:c81b wTimeCapsulePartyMon1OT 00:c81e wLinkPlayerPartyMon6Happiness 00:c81f wLinkPlayerPartyMon6PokerusStatus 00:c820 wLinkPlayerPartyMon6Unused1 @@ -33748,6 +33749,7 @@ 00:c823 wLinkPlayerPartyMon6BoxEnd 00:c824 wLinkPlayerPartyMon6Unused 00:c825 wLinkPlayerPartyMon6HP +00:c826 wTimeCapsulePartyMon2OT 00:c827 wLinkPlayerPartyMon6MaxHP 00:c829 wLinkPlayerPartyMon6Stats 00:c829 wLinkPlayerPartyMon6Attack @@ -33755,21 +33757,43 @@ 00:c82d wLinkPlayerPartyMon6Speed 00:c82f wLinkPlayerPartyMon6SpclAtk 00:c830 wLYOverrides2End +00:c831 wTimeCapsulePartyMon3OT 00:c831 wLinkPlayerPartyMon6SpclDef -00:c833 wLinkPlayerPartyMonOTNames +00:c833 wLinkPlayerPartyMon1OT +00:c833 wLinkPlayerPartyMonOTs 00:c833 wLinkPlayerPartyMon6StructEnd +00:c83c wTimeCapsulePartyMon4OT +00:c83e wLinkPlayerPartyMon2OT +00:c847 wTimeCapsulePartyMon5OT +00:c849 wLinkPlayerPartyMon3OT 00:c850 wMysteryGiftPlayerData 00:c851 wMysteryGiftPlayerID +00:c852 wTimeCapsulePartyMon6OT 00:c853 wMysteryGiftPlayerName -00:c85d wTimeCapsulePartyMonNicks +00:c854 wLinkPlayerPartyMon4OT +00:c85d wTimeCapsulePartyMonNicknames +00:c85d wTimeCapsulePartyMon1Nickname 00:c85e wMysteryGiftPlayerDexCaught 00:c85f wMysteryGiftPlayerSentDeco +00:c85f wLinkPlayerPartyMon5OT 00:c860 wMysteryGiftPlayerWhichItem 00:c861 wMysteryGiftPlayerWhichDeco 00:c862 wMysteryGiftPlayerBackupItem 00:c864 wMysteryGiftPlayerDataEnd -00:c875 wLinkPlayerPartyMonNicks +00:c868 wTimeCapsulePartyMon2Nickname +00:c86a wLinkPlayerPartyMon6OT +00:c873 wTimeCapsulePartyMon3Nickname +00:c875 wLinkPlayerPartyMonNicknames +00:c875 wLinkPlayerPartyMon1Nickname +00:c87e wTimeCapsulePartyMon4Nickname +00:c880 wLinkPlayerPartyMon2Nickname +00:c889 wTimeCapsulePartyMon5Nickname +00:c88b wLinkPlayerPartyMon3Nickname 00:c890 wLYOverridesBackupEnd +00:c894 wTimeCapsulePartyMon6Nickname +00:c896 wLinkPlayerPartyMon4Nickname +00:c8a1 wLinkPlayerPartyMon5Nickname +00:c8ac wLinkPlayerPartyMon6Nickname 00:c8f4 wLinkPlayerMail 00:c8f4 wLinkReceivedMail 00:c8f4 wLinkPlayerMailPreamble @@ -33783,7 +33807,7 @@ 00:c90a wActiveAnimObjects 00:c90a wAnimObject01 00:c90b wAnimObject01OAMFlags -00:c90c wAnimObject01Field02 +00:c90c wAnimObject01FixY 00:c90d wAnimObject01FramesetID 00:c90e wAnimObject01Function 00:c90f wAnimObject01Palette @@ -33801,7 +33825,7 @@ 00:c922 wAnimObject02Index 00:c922 wAnimObject02 00:c923 wAnimObject02OAMFlags -00:c924 wAnimObject02Field02 +00:c924 wAnimObject02FixY 00:c925 wAnimObject02FramesetID 00:c926 wAnimObject02Function 00:c927 wAnimObject02Palette @@ -33819,7 +33843,7 @@ 00:c93a wAnimObject03Index 00:c93a wAnimObject03 00:c93b wAnimObject03OAMFlags -00:c93c wAnimObject03Field02 +00:c93c wAnimObject03FixY 00:c93d wAnimObject03FramesetID 00:c93e wAnimObject03Function 00:c93f wAnimObject03Palette @@ -33837,7 +33861,7 @@ 00:c952 wAnimObject04 00:c952 wAnimObject04Index 00:c953 wAnimObject04OAMFlags -00:c954 wAnimObject04Field02 +00:c954 wAnimObject04FixY 00:c955 wAnimObject04FramesetID 00:c956 wAnimObject04Function 00:c957 wAnimObject04Palette @@ -33855,7 +33879,7 @@ 00:c96a wAnimObject05Index 00:c96a wAnimObject05 00:c96b wAnimObject05OAMFlags -00:c96c wAnimObject05Field02 +00:c96c wAnimObject05FixY 00:c96d wAnimObject05FramesetID 00:c96e wAnimObject05Function 00:c96f wAnimObject05Palette @@ -33877,7 +33901,7 @@ 00:c982 wAnimObject06 00:c982 wPrinterData 00:c983 wAnimObject06OAMFlags -00:c984 wAnimObject06Field02 +00:c984 wAnimObject06FixY 00:c985 wAnimObject06FramesetID 00:c986 wAnimObject06Function 00:c986 wPrinterChecksum @@ -33903,7 +33927,7 @@ 00:c99a wAnimObject07Index 00:c99a wAnimObject07 00:c99b wAnimObject07OAMFlags -00:c99c wAnimObject07Field02 +00:c99c wAnimObject07FixY 00:c99d wAnimObject07FramesetID 00:c99e wAnimObject07Function 00:c99f wAnimObject07Palette @@ -33921,7 +33945,7 @@ 00:c9b2 wAnimObject08Index 00:c9b2 wAnimObject08 00:c9b3 wAnimObject08OAMFlags -00:c9b4 wAnimObject08Field02 +00:c9b4 wAnimObject08FixY 00:c9b5 wAnimObject08FramesetID 00:c9b6 wAnimObject08Function 00:c9b7 wAnimObject08Palette @@ -33940,7 +33964,7 @@ 00:c9ca wAnimObject09 00:c9ca wAnimObject09Index 00:c9cb wAnimObject09OAMFlags -00:c9cc wAnimObject09Field02 +00:c9cc wAnimObject09FixY 00:c9cd wAnimObject09FramesetID 00:c9ce wAnimObject09Function 00:c9cf wAnimObject09Palette @@ -33958,7 +33982,7 @@ 00:c9e2 wAnimObject10Index 00:c9e2 wAnimObject10 00:c9e3 wAnimObject10OAMFlags -00:c9e4 wAnimObject10Field02 +00:c9e4 wAnimObject10FixY 00:c9e5 wAnimObject10FramesetID 00:c9e6 wAnimObject10Function 00:c9e7 wAnimObject10Palette @@ -34059,23 +34083,29 @@ 00:cae9 wEnemyMoveStructEffect 00:caea wEnemyMoveStructPower 00:caea wLinkOTPartyMonTypes +00:caea wLinkOTPartyMon1Type 00:caeb wEnemyMoveStructType +00:caec wLinkOTPartyMon2Type 00:caec wEnemyMoveStructAccuracy 00:caed wEnemyMoveStructPP 00:caee wEnemyMoveStructEffectChance +00:caee wLinkOTPartyMon3Type 00:caef wPlayerMoveStructAnimation 00:caef wPlayerMoveStruct 00:caf0 wPlayerMoveStructEffect +00:caf0 wLinkOTPartyMon4Type 00:caf1 wPlayerMoveStructPower 00:caf2 wPlayerMoveStructType +00:caf2 wLinkOTPartyMon5Type 00:caf3 wPlayerMoveStructAccuracy 00:caf4 wPlayerMoveStructPP +00:caf4 wLinkOTPartyMon6Type 00:caf5 wPlayerMoveStructEffectChance -00:caf6 wEnemyMonNick +00:caf6 wEnemyMonNickname 00:caf8 wPrinterStatus 00:cafa wPrinterMargins 00:cafb wPrinterExposureTime -00:cb01 wBattleMonNick +00:cb01 wBattleMonNickname 00:cb0c wBattleMonSpecies 00:cb0c wGameboyPrinterRAMEnd 00:cb0c wBattleMon @@ -34430,7 +34460,6 @@ 00:ceed wLuckyNumberDigitsBuffer 00:ceed wEarthquakeMovementDataBuffer 00:ceed wMonMailMessageBuffer -00:ceed wBufferMonNick 00:ceed wLinkBattleRecordBuffer 00:ceed wPokeFluteCuredSleep 00:ceed wDebugColorIsTrainer @@ -34463,6 +34492,7 @@ 00:ceed wNumOwnedDecoCategories 00:ceed wMartItem1BCD 00:ceed wTownMapPlayerIconLandmark +00:ceed wBufferMonNickname 00:ceee wPlaceBallsDirection 00:ceee wMovementBufferObject 00:ceee wDebugRoomCurValue @@ -34478,10 +34508,10 @@ 00:ceee wTempPokedexCaughtCount 00:ceee wMagnetTrainInitPosition 00:ceee wTownMapCursorCoordinates +00:ceef wBufferTrademonNickname 00:ceef wRadioTextDelay 00:ceef wDebugColorCurTMHM 00:ceef wBugContestFirstPlaceScore -00:ceef wBufferTrademonNick 00:ceef wTownMapCursorObjectPointer 00:ceef wTrainerHUDTiles 00:ceef wBillsPCTempBoxCount @@ -34545,7 +34575,7 @@ 00:cf12 wBufferMonDefExp 00:cf14 wBufferMonSpdExp 00:cf16 wBufferMonSpcExp -00:cf16 wTempMailAuthorNationality +00:cf16 wTempMailNationality 00:cf18 wTempMailAuthorID 00:cf18 wBufferMonDVs 00:cf1a wTempMailSpecies @@ -36083,8 +36113,20 @@ 01:db46 wPartyMon6SpclAtk 01:db48 wPartyMon6SpclDef 01:db4a wPartyMon6StructEnd -01:db4a wPartyMonOT +01:db4a wPartyMon1OT +01:db4a wPartyMonOTs +01:db55 wPartyMon2OT +01:db60 wPartyMon3OT +01:db6b wPartyMon4OT +01:db76 wPartyMon5OT +01:db81 wPartyMon6OT 01:db8c wPartyMonNicknames +01:db8c wPartyMon1Nickname +01:db97 wPartyMon2Nickname +01:dba2 wPartyMon3Nickname +01:dbad wPartyMon4Nickname +01:dbb8 wPartyMon5Nickname +01:dbc3 wPartyMon6Nickname 01:dbce wPartyMonNicknamesEnd 01:dbe4 wPokedexCaught 01:dc04 wEndPokedexCaught @@ -36094,7 +36136,7 @@ 01:dc3e wUnlockedUnowns 01:dc3f wFirstUnownSeen 01:dc40 wDayCareMan -01:dc41 wBreedMon1Nick +01:dc41 wBreedMon1Nickname 01:dc4c wBreedMon1OT 01:dc57 wBreedMon1 01:dc57 wBreedMon1Species @@ -36119,7 +36161,7 @@ 01:dc77 wBreedMon1BoxEnd 01:dc78 wStepsToEgg 01:dc79 wBreedMotherOrNonDitto -01:dc7a wBreedMon2Nick +01:dc7a wBreedMon2Nickname 01:dc85 wBreedMon2OT 01:dc90 wBreedMon2Species 01:dc90 wBreedMon2 @@ -36140,9 +36182,9 @@ 01:dcad wBreedMon2Unused1 01:dcae wBreedMon2Unused2 01:dcaf wBreedMon2Level -01:dcb0 wEggNick +01:dcb0 wEggMonNickname 01:dcb0 wBreedMon2BoxEnd -01:dcbb wEggOT +01:dcbb wEggMonOT 01:dcc6 wEggMonSpecies 01:dcc6 wEggMon 01:dcc7 wEggMonItem @@ -36427,10 +36469,21 @@ 01:de77 wOTPartyMon6Speed 01:de79 wOTPartyMon6SpclAtk 01:de7b wOTPartyMon6SpclDef -01:de7d wOTPartyMonsEnd -01:de7d wOTPartyMonOT +01:de7d wOTPartyMonOTs +01:de7d wOTPartyMon1OT 01:de7d wOTPartyMon6StructEnd +01:de88 wOTPartyMon2OT +01:de93 wOTPartyMon3OT +01:de9e wOTPartyMon4OT +01:dea9 wOTPartyMon5OT +01:deb4 wOTPartyMon6OT 01:debf wOTPartyMonNicknames +01:debf wOTPartyMon1Nickname +01:deca wOTPartyMon2Nickname +01:ded5 wOTPartyMon3Nickname +01:dee0 wOTPartyMon4Nickname +01:deeb wOTPartyMon5Nickname +01:def6 wOTPartyMon6Nickname 01:df01 wGameDataEnd 01:df01 wPokemonDataEnd 01:df01 wOTPartyDataEnd