Consistent labels for each nickname in RAM

pokecrystal.sym

@@ -289,7 +289,7 @@
 00:1082 DummyChar
 00:1083 NextChar
 00:1087 CheckDict
-00:1122 CheckDict.__8442
+00:1122 CheckDict.__8443
 00:1145 CheckDict.diacritic
 00:114c CheckDict.not_diacritic
 00:115c CheckDict.hiragana_dakuten
@@ -627,9 +627,9 @@
 00:21a5 LoadMetatiles.row
 00:21a9 LoadMetatiles.col
 00:21b2 LoadMetatiles.ok
-00:21d8 LoadMetatiles.next_8607
-00:21eb LoadMetatiles.next_8612
-00:21fe LoadMetatiles.next_8617
+00:21d8 LoadMetatiles.next_8608
+00:21eb LoadMetatiles.next_8613
+00:21fe LoadMetatiles.next_8618
 00:2225 LoadMetatiles.ok2
 00:222a ReturnToMapFromSubmenu
 00:2238 CheckWarpTile
@@ -959,16 +959,16 @@
 00:326d _CopyTilemapAtOnce.wait2
 00:327b _CopyTilemapAtOnce.CopyBGMapViaStack
 00:328c _CopyTilemapAtOnce.loop
-00:328d _CopyTilemapAtOnce.loop_8695
-00:3296 _CopyTilemapAtOnce.loop_8696
-00:329f _CopyTilemapAtOnce.loop_8697
-00:32a8 _CopyTilemapAtOnce.loop_8698
-00:32b1 _CopyTilemapAtOnce.loop_8699
-00:32ba _CopyTilemapAtOnce.loop_8700
-00:32c3 _CopyTilemapAtOnce.loop_8701
-00:32cc _CopyTilemapAtOnce.loop_8702
-00:32d5 _CopyTilemapAtOnce.loop_8703
-00:32de _CopyTilemapAtOnce.loop_8704
+00:328d _CopyTilemapAtOnce.loop_8696
+00:3296 _CopyTilemapAtOnce.loop_8697
+00:329f _CopyTilemapAtOnce.loop_8698
+00:32a8 _CopyTilemapAtOnce.loop_8699
+00:32b1 _CopyTilemapAtOnce.loop_8700
+00:32ba _CopyTilemapAtOnce.loop_8701
+00:32c3 _CopyTilemapAtOnce.loop_8702
+00:32cc _CopyTilemapAtOnce.loop_8703
+00:32d5 _CopyTilemapAtOnce.loop_8704
+00:32de _CopyTilemapAtOnce.loop_8705
 00:32f9 SetPalettes
 00:3309 SetPalettes.SetPalettesForGameBoyColor
 00:3317 ClearPalettes
@@ -1083,8 +1083,8 @@
 00:3856 GetBaseData
 00:387b GetBaseData.egg
 00:3890 GetBaseData.end
-00:389c GetCurNick
-00:38a2 GetNick
+00:389c GetCurNickname
+00:38a2 GetNickname
 00:38bb PrintBCDNumber
 00:38cd PrintBCDNumber.loop
 00:38e4 PrintBCDNumber.skipLeftAlignmentAdjustment
@@ -1948,7 +1948,7 @@
 01:7305 GiveShuckle
 01:736b GiveShuckle.NotGiven
 01:7370 SpecialShuckleOT
-01:7376 SpecialShuckleNick
+01:7376 SpecialShuckleNickname
 01:737e ReturnShuckie
 01:73af ReturnShuckie.CheckOT
 01:73bb ReturnShuckie.done
@@ -2034,11 +2034,11 @@
 02:44d3 QueueFollowerFirstStep.up
 02:44d7 QueueFollowerFirstStep.same_xy
 02:44d9 _Sine
-02:44e5 _Sine.negative_9295
-02:44ef _Sine.apply_9295
-02:44fe _Sine.multiply_9295
-02:4503 _Sine.even_9295
-02:450b _Sine.sinetable_9295
+02:44e5 _Sine.negative_9296
+02:44ef _Sine.apply_9296
+02:44fe _Sine.multiply_9296
+02:4503 _Sine.even_9296
+02:450b _Sine.sinetable_9296
 02:454b GetPredefPointer
 02:456b PredefPointers
 02:456b LearnMovePredef
@@ -2715,7 +2715,7 @@
 03:46ea FieldMoveJumptableReset
 03:46f5 FieldMoveJumptable
 03:4702 FieldMoveJumptable.okay
-03:4706 GetPartyNick
+03:4706 GetPartyNickname
 03:4721 CheckEngineFlag
 03:472f CheckEngineFlag.isset
 03:4731 CheckBadge
@@ -6557,7 +6557,7 @@
 0a:5461 TradeAnim_ShowGetmonData
 0a:5487 TradeAnim_AnimateFrontpic
 0a:5491 TradeAnim_GetFrontpic
-0a:54a9 TradeAnim_GetNickname
+0a:54a9 TradeAnim_GetNicknamename
 0a:54bb TradeAnim_ShowGivemonFrontpic
 0a:54c0 TradeAnim_ShowGetmonFrontpic
 0a:54c3 TradeAnim_ShowFrontpic
@@ -10625,11 +10625,11 @@
 12:5b2f UpdateCelebiPosition.done
 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition
 12:5b3b CelebiEvent_Cosine
-12:5b48 CelebiEvent_Cosine.negative_28910
-12:5b52 CelebiEvent_Cosine.apply_28910
-12:5b61 CelebiEvent_Cosine.multiply_28910
-12:5b66 CelebiEvent_Cosine.even_28910
-12:5b6e CelebiEvent_Cosine.sinetable_28910
+12:5b48 CelebiEvent_Cosine.negative_28911
+12:5b52 CelebiEvent_Cosine.apply_28911
+12:5b61 CelebiEvent_Cosine.multiply_28911
+12:5b66 CelebiEvent_Cosine.even_28911
+12:5b6e CelebiEvent_Cosine.sinetable_28911
 12:5bae GetCelebiSpriteTile
 12:5bd0 GetCelebiSpriteTile.Frame1
 12:5bd4 GetCelebiSpriteTile.Frame2
@@ -10930,16 +10930,16 @@
 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2
 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 13:4f91 SaveMenu_CopyTilemapAtOnce.loop
-13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39367
-13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39368
-13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39369
-13:4fad SaveMenu_CopyTilemapAtOnce.loop_39370
-13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39371
-13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39372
-13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39373
-13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39374
-13:4fda SaveMenu_CopyTilemapAtOnce.loop_39375
-13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39376
+13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39368
+13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39369
+13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39370
+13:4fad SaveMenu_CopyTilemapAtOnce.loop_39371
+13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39372
+13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39373
+13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39374
+13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39375
+13:4fda SaveMenu_CopyTilemapAtOnce.loop_39376
+13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39377
 13:4ffe CheckSave
 13:501b CheckSave.ok
 13:501e MapScenes
@@ -10954,16 +10954,16 @@
 13:51bd PhoneRing_CopyTilemapAtOnce.wait2
 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 13:51dc PhoneRing_CopyTilemapAtOnce.loop
-13:51dd PhoneRing_CopyTilemapAtOnce.loop_39538
-13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39539
-13:51ef PhoneRing_CopyTilemapAtOnce.loop_39540
-13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39541
-13:5201 PhoneRing_CopyTilemapAtOnce.loop_39542
-13:520a PhoneRing_CopyTilemapAtOnce.loop_39543
-13:5213 PhoneRing_CopyTilemapAtOnce.loop_39544
-13:521c PhoneRing_CopyTilemapAtOnce.loop_39545
-13:5225 PhoneRing_CopyTilemapAtOnce.loop_39546
-13:522e PhoneRing_CopyTilemapAtOnce.loop_39547
+13:51dd PhoneRing_CopyTilemapAtOnce.loop_39539
+13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39540
+13:51ef PhoneRing_CopyTilemapAtOnce.loop_39541
+13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39542
+13:5201 PhoneRing_CopyTilemapAtOnce.loop_39543
+13:520a PhoneRing_CopyTilemapAtOnce.loop_39544
+13:5213 PhoneRing_CopyTilemapAtOnce.loop_39545
+13:521c PhoneRing_CopyTilemapAtOnce.loop_39546
+13:5225 PhoneRing_CopyTilemapAtOnce.loop_39547
+13:522e PhoneRing_CopyTilemapAtOnce.loop_39548
 13:5249 Shrink1Pic
 13:52d9 Shrink2Pic
 13:5319 LinkMonStatsScreen
@@ -11199,7 +11199,7 @@
 13:6505 CopyNickname
 13:650d CopyNickname.okay
 13:6522 CopyNickname.partymon
-13:6528 GetNicknamePointer
+13:6528 GetNicknamenamePointer
 13:653f CheckFaintedFrzSlp
 13:6552 CheckFaintedFrzSlp.fainted_frz_slp
 13:6554 CatchTutorial
@@ -17223,11 +17223,11 @@
 23:46ef WipeLYOverrides.wipe
 23:46f2 WipeLYOverrides.loop
 23:46f7 StartTrainerBattle_DrawSineWave
-23:4702 StartTrainerBattle_DrawSineWave.negative_54409
-23:470c StartTrainerBattle_DrawSineWave.apply_54409
-23:471b StartTrainerBattle_DrawSineWave.multiply_54409
-23:4720 StartTrainerBattle_DrawSineWave.even_54409
-23:4728 StartTrainerBattle_DrawSineWave.sinetable_54409
+23:4702 StartTrainerBattle_DrawSineWave.negative_54410
+23:470c StartTrainerBattle_DrawSineWave.apply_54410
+23:471b StartTrainerBattle_DrawSineWave.multiply_54410
+23:4720 StartTrainerBattle_DrawSineWave.even_54410
+23:4728 StartTrainerBattle_DrawSineWave.sinetable_54410
 23:4768 StartTrainerBattle_ZoomToBlack
 23:4771 StartTrainerBattle_ZoomToBlack.loop
 23:478c StartTrainerBattle_ZoomToBlack.done
@@ -17584,11 +17584,11 @@
 23:672a Sprites_Cosine
 23:672a UnusedSpriteAnimGFX.DeletedGFX
 23:672c Sprites_Sine
-23:6737 Sprites_Sine.negative_55796
-23:6741 Sprites_Sine.apply_55796
-23:6750 Sprites_Sine.multiply_55796
-23:6755 Sprites_Sine.even_55796
-23:675d Sprites_Sine.sinetable_55796
+23:6737 Sprites_Sine.negative_55797
+23:6741 Sprites_Sine.apply_55797
+23:6750 Sprites_Sine.multiply_55797
+23:6755 Sprites_Sine.even_55797
+23:675d Sprites_Sine.sinetable_55797
 23:679d AnimateEndOfExpBar
 23:67a8 AnimateEndOfExpBar.load
 23:67b5 AnimateEndOfExpBar.loop
@@ -23933,10 +23933,10 @@
 33:672c BattleAnim_IncAnonJumptableIndex
 33:6732 BattleAnim_Cosine
 33:6734 BattleAnim_Sine
-33:673f BattleAnim_Sine.negative_69742
-33:6749 BattleAnim_Sine.apply_69742
-33:6758 BattleAnim_Sine.multiply_69742
-33:675d BattleAnim_Sine.even_69742
+33:673f BattleAnim_Sine.negative_69743
+33:6749 BattleAnim_Sine.apply_69743
+33:6758 BattleAnim_Sine.multiply_69743
+33:675d BattleAnim_Sine.even_69743
 33:6765 BattleAnim_Sine_e
 33:676b BattleAnim_Cosine_e
 33:6771 BattleAnim_AbsSinePrecise
@@ -27081,14 +27081,14 @@
 38:6d23 BillsPC_RefreshTextboxes.placeholder_string
 38:6d2a BillsPC_RefreshTextboxes.Placeholder
 38:6d30 CopyBoxmonSpecies
-38:6d57 CopyBoxmonSpecies.loop_76356
-38:6d79 CopyBoxmonSpecies.done_76356
+38:6d57 CopyBoxmonSpecies.loop_76357
+38:6d79 CopyBoxmonSpecies.done_76357
 38:6d87 CopyBoxmonSpecies.party
-38:6d8a CopyBoxmonSpecies.loop_76357
-38:6dac CopyBoxmonSpecies.done_76357
+38:6d8a CopyBoxmonSpecies.loop_76358
+38:6dac CopyBoxmonSpecies.done_76358
 38:6db7 CopyBoxmonSpecies.sBox
-38:6dbf CopyBoxmonSpecies.loop_76358
-38:6de1 CopyBoxmonSpecies.done_76358
+38:6dbf CopyBoxmonSpecies.loop_76359
+38:6de1 CopyBoxmonSpecies.done_76359
 38:6def BillsPC_GetSelectedPokemonSpecies
 38:6e01 BillsPC_UpdateSelectionCursor
 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor
@@ -29896,8 +29896,8 @@
 3e:77f2 CompareNewToOld.loop
 3e:77fe CompareNewToOld.different
 3e:7800 CompareNewToOld.terminator
-3e:7802 GetNicknameLength
-3e:7804 GetNicknameLength.loop
+3e:7802 GetNicknamenameLength
+3e:7804 GetNicknamenameLength.loop
 3e:780f NameRaterHelloText
 3e:7814 NameRaterWhichMonText
 3e:7819 NameRaterBetterNameText
@@ -42911,7 +42911,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
@@ -42920,7 +42920,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
@@ -42929,7 +42929,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
@@ -42938,7 +42938,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
@@ -42947,7 +42947,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
@@ -42956,7 +42956,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
@@ -42966,7 +42966,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
@@ -42975,7 +42975,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
@@ -42984,7 +42984,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
@@ -42993,7 +42993,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
@@ -43002,7 +43002,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
@@ -43011,7 +43011,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
@@ -43022,7 +43022,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
@@ -43031,7 +43031,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
@@ -43040,7 +43040,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
@@ -43049,7 +43049,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
@@ -43058,7 +43058,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
@@ -43067,7 +43067,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
@@ -43076,7 +43076,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
@@ -43085,7 +43085,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
@@ -43094,7 +43094,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
@@ -43103,7 +43103,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
@@ -43114,7 +43114,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
@@ -43123,7 +43123,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
@@ -43132,7 +43132,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
@@ -43141,7 +43141,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
@@ -43150,7 +43150,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
@@ -43159,7 +43159,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
@@ -43168,7 +43168,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
@@ -43177,7 +43177,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
@@ -43186,7 +43186,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
@@ -43195,7 +43195,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
@@ -43263,7 +43263,7 @@
 01:ad45 sBoxMon1Level
 01:ad46 sBoxMon1BoxEnd
 01:ad46 sBoxMon2
-01:afa6 sBoxMonOT
+01:afa6 sBoxMonOTs
 01:b082 sBoxMonNicknames
 01:b15e sBoxMonNicknamesEnd
 01:b15e sBoxEnd
@@ -44704,7 +44704,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
@@ -44736,7 +44736,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
@@ -44768,7 +44768,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
@@ -44800,7 +44800,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
@@ -44832,7 +44832,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
@@ -44864,7 +44864,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
@@ -44896,7 +44896,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
@@ -44928,7 +44928,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
@@ -44960,7 +44960,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
@@ -44992,7 +44992,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
@@ -45024,7 +45024,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
@@ -45056,7 +45056,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
@@ -45088,7 +45088,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
@@ -45120,7 +45120,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
@@ -46112,7 +46112,7 @@
 00:c615 wOddEggAtkExp
 00:c615 wBT_OTTempMon1Moves
 00:c615 wPlayerMoveStructEffectChance
-00:c616 wEnemyMonNick
+00:c616 wEnemyMonNickname
 00:c617 wOddEggDefExp
 00:c618 wc618
 00:c619 wHallOfFameTempMon2
@@ -46132,7 +46132,7 @@
 00:c61f wHallOfFameTempMon2Nickname
 00:c61f wOddEggPP
 00:c620 wBT_OTTempMon1AtkExp
-00:c621 wBattleMonNick
+00:c621 wBattleMonNickname
 00:c622 wBT_OTTempMon1DefExp
 00:c623 wOddEggHappiness
 00:c624 wBT_OTTempMon1SpdExp
@@ -46210,7 +46210,7 @@
 00:c641 wBT_OTTempMon1SpclDef
 00:c642 wc642
 00:c642 wBattleMonDefense
-00:c643 wOddEggOTName
+00:c643 wOddEggOT
 00:c643 wBT_OTTempMon1Name
 00:c643 wBT_OTTempMon1StructEnd
 00:c644 wBattleMonSpeed
@@ -46695,7 +46695,7 @@
 00:c81e wLinkPlayerPartyMon1StatExp
 00:c81e wLinkPlayerPartyMon1HPExp
 00:c81e wMobileSDK_SendCommandID
-00:c81f wTimeCapsulePartyMon1OTID
+00:c81f wTimeCapsulePartyMon1ID
 00:c820 wLinkPlayerPartyMon1AtkExp
 00:c821 wTimeCapsulePartyMon1Exp
 00:c821 wHallOfFamePokemonListMon2End
@@ -46776,7 +46776,7 @@
 00:c847 wTimeCapsulePartyMon2Moves
 00:c849 wLinkPlayerPartyMon2ID
 00:c84b wLinkPlayerPartyMon2Exp
-00:c84b wTimeCapsulePartyMon2OTID
+00:c84b wTimeCapsulePartyMon2ID
 00:c84d wTimeCapsulePartyMon2Exp
 00:c84e wLinkPlayerPartyMon2HPExp
 00:c84e wLinkPlayerPartyMon2StatExp
@@ -46848,7 +46848,7 @@
 00:c874 wNameCardDataEnd
 00:c875 wLinkPlayerPartyMon3Moves
 00:c876 wMysteryGiftTrainerEnd
-00:c877 wTimeCapsulePartyMon3OTID
+00:c877 wTimeCapsulePartyMon3ID
 00:c879 wTimeCapsulePartyMon3Exp
 00:c879 wLinkPlayerPartyMon3ID
 00:c87b wLinkPlayerPartyMon3Exp
@@ -46904,9 +46904,9 @@
 00:c89f wLinkPlayerPartyMon3SpclAtk
 00:c8a1 wLinkPlayerPartyMon3SpclDef
 00:c8a3 wLinkPlayerPartyMon4Species
+00:c8a3 wTimeCapsulePartyMon4ID
 00:c8a3 wLinkPlayerPartyMon3StructEnd
 00:c8a3 wLinkPlayerPartyMon4
-00:c8a3 wTimeCapsulePartyMon4OTID
 00:c8a4 wLinkPlayerPartyMon4Item
 00:c8a5 wLinkPlayerPartyMon4Moves
 00:c8a5 wTimeCapsulePartyMon4Exp
@@ -46962,7 +46962,7 @@
 00:c8cb wLinkPlayerPartyMon4Defense
 00:c8cd wLinkPlayerPartyMon4Speed
 00:c8cf wLinkPlayerPartyMon4SpclAtk
-00:c8cf wTimeCapsulePartyMon5OTID
+00:c8cf wTimeCapsulePartyMon5ID
 00:c8d1 wLinkPlayerPartyMon4SpclDef
 00:c8d1 wTimeCapsulePartyMon5Exp
 00:c8d3 wLinkPlayerPartyMon5Species
@@ -47020,7 +47020,7 @@
 00:c8f9 wLinkPlayerPartyMon5Attack
 00:c8f9 wLinkPlayerPartyMon5Stats
 00:c8fb wLinkPlayerPartyMon5Defense
-00:c8fb wTimeCapsulePartyMon6OTID
+00:c8fb wTimeCapsulePartyMon6ID
 00:c8fd wTimeCapsulePartyMon6Exp
 00:c8fd wLinkPlayerPartyMon5Speed
 00:c8ff wLinkPlayerPartyMon5SpclAtk
@@ -47065,7 +47065,8 @@
 00:c918 wLinkPlayerPartyMon6DVs
 00:c919 wTimeCapsulePartyMon6Special
 00:c91a wLinkPlayerPartyMon6PP
-00:c91b wTimeCapsulePartyMonOTNames
+00:c91b wTimeCapsulePartyMonOTs
+00:c91b wTimeCapsulePartyMon1OT
 00:c91e wLinkPlayerPartyMon6Happiness
 00:c91f wLinkPlayerPartyMon6PokerusStatus
 00:c920 wLinkPlayerPartyMon6CaughtLevel
@@ -47078,26 +47079,49 @@
 00:c923 wLinkPlayerPartyMon6BoxEnd
 00:c924 wLinkPlayerPartyMon6Unused
 00:c925 wLinkPlayerPartyMon6HP
+00:c926 wTimeCapsulePartyMon2OT
 00:c927 wLinkPlayerPartyMon6MaxHP
 00:c929 wLinkPlayerPartyMon6Stats
 00:c929 wLinkPlayerPartyMon6Attack
 00:c92b wLinkPlayerPartyMon6Defense
 00:c92d wLinkPlayerPartyMon6Speed
 00:c92f wLinkPlayerPartyMon6SpclAtk
+00:c931 wTimeCapsulePartyMon3OT
 00:c931 wLinkPlayerPartyMon6SpclDef
-00:c933 wLinkPlayerPartyMonOTNames
+00:c933 wLinkPlayerPartyMon1OT
+00:c933 wLinkPlayerPartyMonOTs
 00:c933 wLinkPlayerPartyMon6StructEnd
+00:c93c wTimeCapsulePartyMon4OT
+00:c93e wLinkPlayerPartyMon2OT
+00:c947 wTimeCapsulePartyMon5OT
+00:c949 wLinkPlayerPartyMon3OT
 00:c950 wMysteryGiftPlayerData
 00:c951 wMysteryGiftPlayerID
+00:c952 wTimeCapsulePartyMon6OT
 00:c953 wMysteryGiftPlayerName
-00:c95d wTimeCapsulePartyMonNicks
+00:c954 wLinkPlayerPartyMon4OT
+00:c95d wTimeCapsulePartyMonNicknames
+00:c95d wTimeCapsulePartyMon1Nickname
 00:c95e wMysteryGiftPlayerDexCaught
 00:c95f wMysteryGiftPlayerSentDeco
+00:c95f wLinkPlayerPartyMon5OT
 00:c960 wMysteryGiftPlayerWhichItem
 00:c961 wMysteryGiftPlayerWhichDeco
 00:c962 wMysteryGiftPlayerBackupItem
 00:c964 wMysteryGiftPlayerDataEnd
-00:c975 wLinkPlayerPartyMonNicks
+00:c968 wTimeCapsulePartyMon2Nickname
+00:c96a wLinkPlayerPartyMon6OT
+00:c973 wTimeCapsulePartyMon3Nickname
+00:c975 wLinkPlayerPartyMonNicknames
+00:c975 wLinkPlayerPartyMon1Nickname
+00:c97e wTimeCapsulePartyMon4Nickname
+00:c980 wLinkPlayerPartyMon2Nickname
+00:c989 wTimeCapsulePartyMon5Nickname
+00:c98b wLinkPlayerPartyMon3Nickname
+00:c994 wTimeCapsulePartyMon6Nickname
+00:c996 wLinkPlayerPartyMon4Nickname
+00:c9a1 wLinkPlayerPartyMon5Nickname
+00:c9ac wLinkPlayerPartyMon6Nickname
 00:c9f4 wLinkPlayerMail
 00:c9f4 wLinkReceivedMail
 00:c9f4 wLinkPlayerMailPreamble
@@ -47141,6 +47165,12 @@
 00:cb84 wLinkOTMailMessages
 00:cbe8 wCurLinkOTPartyMonTypePointer
 00:cbea wLinkOTPartyMonTypes
+00:cbea wLinkOTPartyMon1Type
+00:cbec wLinkOTPartyMon2Type
+00:cbee wLinkOTPartyMon3Type
+00:cbf0 wLinkOTPartyMon4Type
+00:cbf2 wLinkOTPartyMon5Type
+00:cbf4 wLinkOTPartyMon6Type
 00:cbf8 wPrinterStatus
 00:cbfa wPrinterMargins
 00:cbfb wPrinterExposureTime
@@ -47169,7 +47199,7 @@
 00:cd22 wMobileMonStructPointer
 00:cd22 wCreditsTimer
 00:cd23 wcd23
-00:cd24 wMobileMonOTNamePointer
+00:cd24 wMobileMonOTPointer
 00:cd24 wcd24
 00:cd25 wMobileCommsJumptableIndex
 00:cd26 wMobileMonNicknamePointer
@@ -47454,7 +47484,6 @@
 01:d002 wEarthquakeMovementDataBuffer
 01:d002 wMonMailMessageBuffer
 01:d002 wSuicuneFrame
-01:d002 wBufferMonNick
 01:d002 wLinkBattleRecordBuffer
 01:d002 wPokeFluteCuredSleep
 01:d002 wDebugColorIsTrainer
@@ -47487,6 +47516,7 @@
 01:d002 wNumOwnedDecoCategories
 01:d002 wMartItem1BCD
 01:d002 wTownMapPlayerIconLandmark
+01:d002 wBufferMonNickname
 01:d003 wPlaceBallsDirection
 01:d003 wMovementBufferObject
 01:d003 wNextRadioLine
@@ -47502,10 +47532,10 @@
 01:d003 wSeerNickname
 01:d003 wTempPokedexCaughtCount
 01:d003 wTownMapCursorCoordinates
+01:d004 wBufferTrademonNickname
 01:d004 wRadioTextDelay
 01:d004 wDebugColorCurTMHM
 01:d004 wBugContestFirstPlaceScore
-01:d004 wBufferTrademonNick
 01:d004 wTownMapCursorObjectPointer
 01:d004 wTrainerHUDTiles
 01:d004 wd004
@@ -47573,9 +47603,9 @@
 01:d025 wBufferMonAtkExp
 01:d027 wBufferMonDefExp
 01:d029 wBufferMonSpdExp
-01:d02a wSeerOTName
+01:d02a wSeerOT
 01:d02b wBufferMonSpcExp
-01:d02b wTempMailAuthorNationality
+01:d02b wTempMailNationality
 01:d02d wd02d
 01:d02d wTempMailAuthorID
 01:d02d wBufferMonDVs
@@ -47592,8 +47622,8 @@
 01:d033 wd033
 01:d034 wBufferMonPokerusStatus
 01:d034 wd034
+01:d035 wSeerOTGrammar
 01:d035 wBufferMonCaughtLevel
-01:d035 wSeerOTNameGrammar
 01:d035 wBufferMonCaughtData
 01:d035 wBufferMonCaughtTime
 01:d036 wBufferMonCaughtLocation
@@ -48270,10 +48300,21 @@
 01:d3a2 wOTPartyMon6Speed
 01:d3a4 wOTPartyMon6SpclAtk
 01:d3a6 wOTPartyMon6SpclDef
-01:d3a8 wOTPartyMonsEnd
-01:d3a8 wOTPartyMonOT
+01:d3a8 wOTPartyMonOTs
+01:d3a8 wOTPartyMon1OT
 01:d3a8 wOTPartyMon6StructEnd
+01:d3b3 wOTPartyMon2OT
+01:d3be wOTPartyMon3OT
+01:d3c9 wOTPartyMon4OT
+01:d3d4 wOTPartyMon5OT
+01:d3df wOTPartyMon6OT
 01:d3ea wOTPartyMonNicknames
+01:d3ea wOTPartyMon1Nickname
+01:d3f5 wOTPartyMon2Nickname
+01:d400 wOTPartyMon3Nickname
+01:d40b wOTPartyMon4Nickname
+01:d416 wOTPartyMon5Nickname
+01:d421 wOTPartyMon6Nickname
 01:d42c wOTPartyDataEnd
 01:d430 wd430
 01:d430 wBattleAction
@@ -49436,8 +49477,20 @@
 01:ddfb wPartyMon6SpclAtk
 01:ddfd wPartyMon6SpclDef
 01:ddff wPartyMon6StructEnd
-01:ddff wPartyMonOT
+01:ddff wPartyMon1OT
+01:ddff wPartyMonOTs
+01:de0a wPartyMon2OT
+01:de15 wPartyMon3OT
+01:de20 wPartyMon4OT
+01:de2b wPartyMon5OT
+01:de36 wPartyMon6OT
 01:de41 wPartyMonNicknames
+01:de41 wPartyMon1Nickname
+01:de4c wPartyMon2Nickname
+01:de57 wPartyMon3Nickname
+01:de62 wPartyMon4Nickname
+01:de6d wPartyMon5Nickname
+01:de78 wPartyMon6Nickname
 01:de83 wPartyMonNicknamesEnd
 01:de99 wPokedexCaught
 01:deb9 wEndPokedexCaught
@@ -49447,7 +49500,7 @@
 01:def3 wUnlockedUnowns
 01:def4 wFirstUnownSeen
 01:def5 wDayCareMan
-01:def6 wBreedMon1Nick
+01:def6 wBreedMon1Nickname
 01:df01 wBreedMon1OT
 01:df0c wBreedMon1
 01:df0c wBreedMon1Species
@@ -49475,7 +49528,7 @@
 01:df2c wBreedMon1BoxEnd
 01:df2d wStepsToEgg
 01:df2e wBreedMotherOrNonDitto
-01:df2f wBreedMon2Nick
+01:df2f wBreedMon2Nickname
 01:df3a wBreedMon2OT
 01:df45 wBreedMon2Species
 01:df45 wBreedMon2
@@ -49499,9 +49552,9 @@
 01:df63 wBreedMon2CaughtLocation
 01:df63 wBreedMon2CaughtGender
 01:df64 wBreedMon2Level
-01:df65 wEggNick
+01:df65 wEggMonNickname
 01:df65 wBreedMon2BoxEnd
-01:df70 wEggOT
+01:df70 wEggMonOT
 01:df7b wEggMonSpecies
 01:df7b wEggMon
 01:df7c wEggMonItem
@@ -50580,7 +50633,7 @@
 05:d30a wActiveAnimObjects
 05:d30a wAnimObject01
 05:d30b wAnimObject01OAMFlags
-05:d30c wAnimObject01Field02
+05:d30c wAnimObject01FixY
 05:d30d wAnimObject01FramesetID
 05:d30e wAnimObject01Function
 05:d30f wAnimObject01Palette
@@ -50598,7 +50651,7 @@
 05:d322 wAnimObject02Index
 05:d322 wAnimObject02
 05:d323 wAnimObject02OAMFlags
-05:d324 wAnimObject02Field02
+05:d324 wAnimObject02FixY
 05:d325 wAnimObject02FramesetID
 05:d326 wAnimObject02Function
 05:d327 wAnimObject02Palette
@@ -50616,7 +50669,7 @@
 05:d33a wAnimObject03Index
 05:d33a wAnimObject03
 05:d33b wAnimObject03OAMFlags
-05:d33c wAnimObject03Field02
+05:d33c wAnimObject03FixY
 05:d33d wAnimObject03FramesetID
 05:d33e wAnimObject03Function
 05:d33f wAnimObject03Palette
@@ -50634,7 +50687,7 @@
 05:d352 wAnimObject04
 05:d352 wAnimObject04Index
 05:d353 wAnimObject04OAMFlags
-05:d354 wAnimObject04Field02
+05:d354 wAnimObject04FixY
 05:d355 wAnimObject04FramesetID
 05:d356 wAnimObject04Function
 05:d357 wAnimObject04Palette
@@ -50652,7 +50705,7 @@
 05:d36a wAnimObject05Index
 05:d36a wAnimObject05
 05:d36b wAnimObject05OAMFlags
-05:d36c wAnimObject05Field02
+05:d36c wAnimObject05FixY
 05:d36d wAnimObject05FramesetID
 05:d36e wAnimObject05Function
 05:d36f wAnimObject05Palette
@@ -50670,7 +50723,7 @@
 05:d382 wAnimObject06Index
 05:d382 wAnimObject06
 05:d383 wAnimObject06OAMFlags
-05:d384 wAnimObject06Field02
+05:d384 wAnimObject06FixY
 05:d385 wAnimObject06FramesetID
 05:d386 wAnimObject06Function
 05:d387 wAnimObject06Palette
@@ -50688,7 +50741,7 @@
 05:d39a wAnimObject07Index
 05:d39a wAnimObject07
 05:d39b wAnimObject07OAMFlags
-05:d39c wAnimObject07Field02
+05:d39c wAnimObject07FixY
 05:d39d wAnimObject07FramesetID
 05:d39e wAnimObject07Function
 05:d39f wAnimObject07Palette
@@ -50706,7 +50759,7 @@
 05:d3b2 wAnimObject08Index
 05:d3b2 wAnimObject08
 05:d3b3 wAnimObject08OAMFlags
-05:d3b4 wAnimObject08Field02
+05:d3b4 wAnimObject08FixY
 05:d3b5 wAnimObject08FramesetID
 05:d3b6 wAnimObject08Function
 05:d3b7 wAnimObject08Palette
@@ -50724,7 +50777,7 @@
 05:d3ca wAnimObject09
 05:d3ca wAnimObject09Index
 05:d3cb wAnimObject09OAMFlags
-05:d3cc wAnimObject09Field02
+05:d3cc wAnimObject09FixY
 05:d3cd wAnimObject09FramesetID
 05:d3ce wAnimObject09Function
 05:d3cf wAnimObject09Palette
@@ -50742,7 +50795,7 @@
 05:d3e2 wAnimObject10Index
 05:d3e2 wAnimObject10
 05:d3e3 wAnimObject10OAMFlags
-05:d3e4 wAnimObject10Field02
+05:d3e4 wAnimObject10FixY
 05:d3e5 wAnimObject10FramesetID
 05:d3e6 wAnimObject10Function
 05:d3e7 wAnimObject10Palette

pokecrystal11.sym

@@ -289,7 +289,7 @@
 00:1082 DummyChar
 00:1083 NextChar
 00:1087 CheckDict
-00:1122 CheckDict.__8442
+00:1122 CheckDict.__8443
 00:1145 CheckDict.diacritic
 00:114c CheckDict.not_diacritic
 00:115c CheckDict.hiragana_dakuten
@@ -627,9 +627,9 @@
 00:21a5 LoadMetatiles.row
 00:21a9 LoadMetatiles.col
 00:21b2 LoadMetatiles.ok
-00:21d8 LoadMetatiles.next_8607
-00:21eb LoadMetatiles.next_8612
-00:21fe LoadMetatiles.next_8617
+00:21d8 LoadMetatiles.next_8608
+00:21eb LoadMetatiles.next_8613
+00:21fe LoadMetatiles.next_8618
 00:2225 LoadMetatiles.ok2
 00:222a ReturnToMapFromSubmenu
 00:2238 CheckWarpTile
@@ -959,16 +959,16 @@
 00:326d _CopyTilemapAtOnce.wait2
 00:327b _CopyTilemapAtOnce.CopyBGMapViaStack
 00:328c _CopyTilemapAtOnce.loop
-00:328d _CopyTilemapAtOnce.loop_8695
-00:3296 _CopyTilemapAtOnce.loop_8696
-00:329f _CopyTilemapAtOnce.loop_8697
-00:32a8 _CopyTilemapAtOnce.loop_8698
-00:32b1 _CopyTilemapAtOnce.loop_8699
-00:32ba _CopyTilemapAtOnce.loop_8700
-00:32c3 _CopyTilemapAtOnce.loop_8701
-00:32cc _CopyTilemapAtOnce.loop_8702
-00:32d5 _CopyTilemapAtOnce.loop_8703
-00:32de _CopyTilemapAtOnce.loop_8704
+00:328d _CopyTilemapAtOnce.loop_8696
+00:3296 _CopyTilemapAtOnce.loop_8697
+00:329f _CopyTilemapAtOnce.loop_8698
+00:32a8 _CopyTilemapAtOnce.loop_8699
+00:32b1 _CopyTilemapAtOnce.loop_8700
+00:32ba _CopyTilemapAtOnce.loop_8701
+00:32c3 _CopyTilemapAtOnce.loop_8702
+00:32cc _CopyTilemapAtOnce.loop_8703
+00:32d5 _CopyTilemapAtOnce.loop_8704
+00:32de _CopyTilemapAtOnce.loop_8705
 00:32f9 SetPalettes
 00:3309 SetPalettes.SetPalettesForGameBoyColor
 00:3317 ClearPalettes
@@ -1083,8 +1083,8 @@
 00:3856 GetBaseData
 00:387b GetBaseData.egg
 00:3890 GetBaseData.end
-00:389c GetCurNick
-00:38a2 GetNick
+00:389c GetCurNickname
+00:38a2 GetNickname
 00:38bb PrintBCDNumber
 00:38cd PrintBCDNumber.loop
 00:38e4 PrintBCDNumber.skipLeftAlignmentAdjustment
@@ -1948,7 +1948,7 @@
 01:7305 GiveShuckle
 01:736b GiveShuckle.NotGiven
 01:7370 SpecialShuckleOT
-01:7376 SpecialShuckleNick
+01:7376 SpecialShuckleNickname
 01:737e ReturnShuckie
 01:73af ReturnShuckie.CheckOT
 01:73bb ReturnShuckie.done
@@ -2034,11 +2034,11 @@
 02:44d3 QueueFollowerFirstStep.up
 02:44d7 QueueFollowerFirstStep.same_xy
 02:44d9 _Sine
-02:44e5 _Sine.negative_9295
-02:44ef _Sine.apply_9295
-02:44fe _Sine.multiply_9295
-02:4503 _Sine.even_9295
-02:450b _Sine.sinetable_9295
+02:44e5 _Sine.negative_9296
+02:44ef _Sine.apply_9296
+02:44fe _Sine.multiply_9296
+02:4503 _Sine.even_9296
+02:450b _Sine.sinetable_9296
 02:454b GetPredefPointer
 02:456b PredefPointers
 02:456b LearnMovePredef
@@ -2715,7 +2715,7 @@
 03:46ea FieldMoveJumptableReset
 03:46f5 FieldMoveJumptable
 03:4702 FieldMoveJumptable.okay
-03:4706 GetPartyNick
+03:4706 GetPartyNickname
 03:4721 CheckEngineFlag
 03:472f CheckEngineFlag.isset
 03:4731 CheckBadge
@@ -6557,7 +6557,7 @@
 0a:5461 TradeAnim_ShowGetmonData
 0a:5487 TradeAnim_AnimateFrontpic
 0a:5491 TradeAnim_GetFrontpic
-0a:54a9 TradeAnim_GetNickname
+0a:54a9 TradeAnim_GetNicknamename
 0a:54bb TradeAnim_ShowGivemonFrontpic
 0a:54c0 TradeAnim_ShowGetmonFrontpic
 0a:54c3 TradeAnim_ShowFrontpic
@@ -10625,11 +10625,11 @@
 12:5b2f UpdateCelebiPosition.done
 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition
 12:5b3b CelebiEvent_Cosine
-12:5b48 CelebiEvent_Cosine.negative_28910
-12:5b52 CelebiEvent_Cosine.apply_28910
-12:5b61 CelebiEvent_Cosine.multiply_28910
-12:5b66 CelebiEvent_Cosine.even_28910
-12:5b6e CelebiEvent_Cosine.sinetable_28910
+12:5b48 CelebiEvent_Cosine.negative_28911
+12:5b52 CelebiEvent_Cosine.apply_28911
+12:5b61 CelebiEvent_Cosine.multiply_28911
+12:5b66 CelebiEvent_Cosine.even_28911
+12:5b6e CelebiEvent_Cosine.sinetable_28911
 12:5bae GetCelebiSpriteTile
 12:5bd0 GetCelebiSpriteTile.Frame1
 12:5bd4 GetCelebiSpriteTile.Frame2
@@ -10930,16 +10930,16 @@
 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2
 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 13:4f91 SaveMenu_CopyTilemapAtOnce.loop
-13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39367
-13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39368
-13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39369
-13:4fad SaveMenu_CopyTilemapAtOnce.loop_39370
-13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39371
-13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39372
-13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39373
-13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39374
-13:4fda SaveMenu_CopyTilemapAtOnce.loop_39375
-13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39376
+13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39368
+13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39369
+13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39370
+13:4fad SaveMenu_CopyTilemapAtOnce.loop_39371
+13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39372
+13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39373
+13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39374
+13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39375
+13:4fda SaveMenu_CopyTilemapAtOnce.loop_39376
+13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39377
 13:4ffe CheckSave
 13:501b CheckSave.ok
 13:501e MapScenes
@@ -10954,16 +10954,16 @@
 13:51bd PhoneRing_CopyTilemapAtOnce.wait2
 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 13:51dc PhoneRing_CopyTilemapAtOnce.loop
-13:51dd PhoneRing_CopyTilemapAtOnce.loop_39538
-13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39539
-13:51ef PhoneRing_CopyTilemapAtOnce.loop_39540
-13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39541
-13:5201 PhoneRing_CopyTilemapAtOnce.loop_39542
-13:520a PhoneRing_CopyTilemapAtOnce.loop_39543
-13:5213 PhoneRing_CopyTilemapAtOnce.loop_39544
-13:521c PhoneRing_CopyTilemapAtOnce.loop_39545
-13:5225 PhoneRing_CopyTilemapAtOnce.loop_39546
-13:522e PhoneRing_CopyTilemapAtOnce.loop_39547
+13:51dd PhoneRing_CopyTilemapAtOnce.loop_39539
+13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39540
+13:51ef PhoneRing_CopyTilemapAtOnce.loop_39541
+13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39542
+13:5201 PhoneRing_CopyTilemapAtOnce.loop_39543
+13:520a PhoneRing_CopyTilemapAtOnce.loop_39544
+13:5213 PhoneRing_CopyTilemapAtOnce.loop_39545
+13:521c PhoneRing_CopyTilemapAtOnce.loop_39546
+13:5225 PhoneRing_CopyTilemapAtOnce.loop_39547
+13:522e PhoneRing_CopyTilemapAtOnce.loop_39548
 13:5249 Shrink1Pic
 13:52d9 Shrink2Pic
 13:5319 LinkMonStatsScreen
@@ -11199,7 +11199,7 @@
 13:6505 CopyNickname
 13:650d CopyNickname.okay
 13:6522 CopyNickname.partymon
-13:6528 GetNicknamePointer
+13:6528 GetNicknamenamePointer
 13:653f CheckFaintedFrzSlp
 13:6552 CheckFaintedFrzSlp.fainted_frz_slp
 13:6554 CatchTutorial
@@ -17223,11 +17223,11 @@
 23:46ef WipeLYOverrides.wipe
 23:46f2 WipeLYOverrides.loop
 23:46f7 StartTrainerBattle_DrawSineWave
-23:4702 StartTrainerBattle_DrawSineWave.negative_54409
-23:470c StartTrainerBattle_DrawSineWave.apply_54409
-23:471b StartTrainerBattle_DrawSineWave.multiply_54409
-23:4720 StartTrainerBattle_DrawSineWave.even_54409
-23:4728 StartTrainerBattle_DrawSineWave.sinetable_54409
+23:4702 StartTrainerBattle_DrawSineWave.negative_54410
+23:470c StartTrainerBattle_DrawSineWave.apply_54410
+23:471b StartTrainerBattle_DrawSineWave.multiply_54410
+23:4720 StartTrainerBattle_DrawSineWave.even_54410
+23:4728 StartTrainerBattle_DrawSineWave.sinetable_54410
 23:4768 StartTrainerBattle_ZoomToBlack
 23:4771 StartTrainerBattle_ZoomToBlack.loop
 23:478c StartTrainerBattle_ZoomToBlack.done
@@ -17584,11 +17584,11 @@
 23:672a Sprites_Cosine
 23:672a UnusedSpriteAnimGFX.DeletedGFX
 23:672c Sprites_Sine
-23:6737 Sprites_Sine.negative_55796
-23:6741 Sprites_Sine.apply_55796
-23:6750 Sprites_Sine.multiply_55796
-23:6755 Sprites_Sine.even_55796
-23:675d Sprites_Sine.sinetable_55796
+23:6737 Sprites_Sine.negative_55797
+23:6741 Sprites_Sine.apply_55797
+23:6750 Sprites_Sine.multiply_55797
+23:6755 Sprites_Sine.even_55797
+23:675d Sprites_Sine.sinetable_55797
 23:679d AnimateEndOfExpBar
 23:67a8 AnimateEndOfExpBar.load
 23:67b5 AnimateEndOfExpBar.loop
@@ -23933,10 +23933,10 @@
 33:672c BattleAnim_IncAnonJumptableIndex
 33:6732 BattleAnim_Cosine
 33:6734 BattleAnim_Sine
-33:673f BattleAnim_Sine.negative_69742
-33:6749 BattleAnim_Sine.apply_69742
-33:6758 BattleAnim_Sine.multiply_69742
-33:675d BattleAnim_Sine.even_69742
+33:673f BattleAnim_Sine.negative_69743
+33:6749 BattleAnim_Sine.apply_69743
+33:6758 BattleAnim_Sine.multiply_69743
+33:675d BattleAnim_Sine.even_69743
 33:6765 BattleAnim_Sine_e
 33:676b BattleAnim_Cosine_e
 33:6771 BattleAnim_AbsSinePrecise
@@ -27081,14 +27081,14 @@
 38:6d23 BillsPC_RefreshTextboxes.placeholder_string
 38:6d2a BillsPC_RefreshTextboxes.Placeholder
 38:6d30 CopyBoxmonSpecies
-38:6d57 CopyBoxmonSpecies.loop_76356
-38:6d79 CopyBoxmonSpecies.done_76356
+38:6d57 CopyBoxmonSpecies.loop_76357
+38:6d79 CopyBoxmonSpecies.done_76357
 38:6d87 CopyBoxmonSpecies.party
-38:6d8a CopyBoxmonSpecies.loop_76357
-38:6dac CopyBoxmonSpecies.done_76357
+38:6d8a CopyBoxmonSpecies.loop_76358
+38:6dac CopyBoxmonSpecies.done_76358
 38:6db7 CopyBoxmonSpecies.sBox
-38:6dbf CopyBoxmonSpecies.loop_76358
-38:6de1 CopyBoxmonSpecies.done_76358
+38:6dbf CopyBoxmonSpecies.loop_76359
+38:6de1 CopyBoxmonSpecies.done_76359
 38:6def BillsPC_GetSelectedPokemonSpecies
 38:6e01 BillsPC_UpdateSelectionCursor
 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor
@@ -29896,8 +29896,8 @@
 3e:77f2 CompareNewToOld.loop
 3e:77fe CompareNewToOld.different
 3e:7800 CompareNewToOld.terminator
-3e:7802 GetNicknameLength
-3e:7804 GetNicknameLength.loop
+3e:7802 GetNicknamenameLength
+3e:7804 GetNicknamenameLength.loop
 3e:780f NameRaterHelloText
 3e:7814 NameRaterWhichMonText
 3e:7819 NameRaterBetterNameText
@@ -42911,7 +42911,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
@@ -42920,7 +42920,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
@@ -42929,7 +42929,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
@@ -42938,7 +42938,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
@@ -42947,7 +42947,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
@@ -42956,7 +42956,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
@@ -42966,7 +42966,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
@@ -42975,7 +42975,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
@@ -42984,7 +42984,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
@@ -42993,7 +42993,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
@@ -43002,7 +43002,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
@@ -43011,7 +43011,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
@@ -43022,7 +43022,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
@@ -43031,7 +43031,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
@@ -43040,7 +43040,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
@@ -43049,7 +43049,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
@@ -43058,7 +43058,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
@@ -43067,7 +43067,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
@@ -43076,7 +43076,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
@@ -43085,7 +43085,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
@@ -43094,7 +43094,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
@@ -43103,7 +43103,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
@@ -43114,7 +43114,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
@@ -43123,7 +43123,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
@@ -43132,7 +43132,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
@@ -43141,7 +43141,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
@@ -43150,7 +43150,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
@@ -43159,7 +43159,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
@@ -43168,7 +43168,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
@@ -43177,7 +43177,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
@@ -43186,7 +43186,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
@@ -43195,7 +43195,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
@@ -43263,7 +43263,7 @@
 01:ad45 sBoxMon1Level
 01:ad46 sBoxMon1BoxEnd
 01:ad46 sBoxMon2
-01:afa6 sBoxMonOT
+01:afa6 sBoxMonOTs
 01:b082 sBoxMonNicknames
 01:b15e sBoxMonNicknamesEnd
 01:b15e sBoxEnd
@@ -44704,7 +44704,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
@@ -44736,7 +44736,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
@@ -44768,7 +44768,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
@@ -44800,7 +44800,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
@@ -44832,7 +44832,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
@@ -44864,7 +44864,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
@@ -44896,7 +44896,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
@@ -44928,7 +44928,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
@@ -44960,7 +44960,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
@@ -44992,7 +44992,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
@@ -45024,7 +45024,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
@@ -45056,7 +45056,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
@@ -45088,7 +45088,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
@@ -45120,7 +45120,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
@@ -46112,7 +46112,7 @@
 00:c615 wOddEggAtkExp
 00:c615 wBT_OTTempMon1Moves
 00:c615 wPlayerMoveStructEffectChance
-00:c616 wEnemyMonNick
+00:c616 wEnemyMonNickname
 00:c617 wOddEggDefExp
 00:c618 wc618
 00:c619 wHallOfFameTempMon2
@@ -46132,7 +46132,7 @@
 00:c61f wHallOfFameTempMon2Nickname
 00:c61f wOddEggPP
 00:c620 wBT_OTTempMon1AtkExp
-00:c621 wBattleMonNick
+00:c621 wBattleMonNickname
 00:c622 wBT_OTTempMon1DefExp
 00:c623 wOddEggHappiness
 00:c624 wBT_OTTempMon1SpdExp
@@ -46210,7 +46210,7 @@
 00:c641 wBT_OTTempMon1SpclDef
 00:c642 wc642
 00:c642 wBattleMonDefense
-00:c643 wOddEggOTName
+00:c643 wOddEggOT
 00:c643 wBT_OTTempMon1Name
 00:c643 wBT_OTTempMon1StructEnd
 00:c644 wBattleMonSpeed
@@ -46696,7 +46696,7 @@
 00:c81e wLinkPlayerPartyMon1StatExp
 00:c81e wLinkPlayerPartyMon1HPExp
 00:c81e wMobileSDK_SendCommandID
-00:c81f wTimeCapsulePartyMon1OTID
+00:c81f wTimeCapsulePartyMon1ID
 00:c820 wLinkPlayerPartyMon1AtkExp
 00:c821 wTimeCapsulePartyMon1Exp
 00:c821 wHallOfFamePokemonListMon2End
@@ -46777,7 +46777,7 @@
 00:c847 wTimeCapsulePartyMon2Moves
 00:c849 wLinkPlayerPartyMon2ID
 00:c84b wLinkPlayerPartyMon2Exp
-00:c84b wTimeCapsulePartyMon2OTID
+00:c84b wTimeCapsulePartyMon2ID
 00:c84d wTimeCapsulePartyMon2Exp
 00:c84e wLinkPlayerPartyMon2HPExp
 00:c84e wLinkPlayerPartyMon2StatExp
@@ -46849,7 +46849,7 @@
 00:c874 wNameCardDataEnd
 00:c875 wLinkPlayerPartyMon3Moves
 00:c876 wMysteryGiftTrainerEnd
-00:c877 wTimeCapsulePartyMon3OTID
+00:c877 wTimeCapsulePartyMon3ID
 00:c879 wTimeCapsulePartyMon3Exp
 00:c879 wLinkPlayerPartyMon3ID
 00:c87b wLinkPlayerPartyMon3Exp
@@ -46905,9 +46905,9 @@
 00:c89f wLinkPlayerPartyMon3SpclAtk
 00:c8a1 wLinkPlayerPartyMon3SpclDef
 00:c8a3 wLinkPlayerPartyMon4Species
+00:c8a3 wTimeCapsulePartyMon4ID
 00:c8a3 wLinkPlayerPartyMon3StructEnd
 00:c8a3 wLinkPlayerPartyMon4
-00:c8a3 wTimeCapsulePartyMon4OTID
 00:c8a4 wLinkPlayerPartyMon4Item
 00:c8a5 wLinkPlayerPartyMon4Moves
 00:c8a5 wTimeCapsulePartyMon4Exp
@@ -46963,7 +46963,7 @@
 00:c8cb wLinkPlayerPartyMon4Defense
 00:c8cd wLinkPlayerPartyMon4Speed
 00:c8cf wLinkPlayerPartyMon4SpclAtk
-00:c8cf wTimeCapsulePartyMon5OTID
+00:c8cf wTimeCapsulePartyMon5ID
 00:c8d1 wLinkPlayerPartyMon4SpclDef
 00:c8d1 wTimeCapsulePartyMon5Exp
 00:c8d3 wLinkPlayerPartyMon5Species
@@ -47021,7 +47021,7 @@
 00:c8f9 wLinkPlayerPartyMon5Attack
 00:c8f9 wLinkPlayerPartyMon5Stats
 00:c8fb wLinkPlayerPartyMon5Defense
-00:c8fb wTimeCapsulePartyMon6OTID
+00:c8fb wTimeCapsulePartyMon6ID
 00:c8fd wTimeCapsulePartyMon6Exp
 00:c8fd wLinkPlayerPartyMon5Speed
 00:c8ff wLinkPlayerPartyMon5SpclAtk
@@ -47066,7 +47066,8 @@
 00:c918 wLinkPlayerPartyMon6DVs
 00:c919 wTimeCapsulePartyMon6Special
 00:c91a wLinkPlayerPartyMon6PP
-00:c91b wTimeCapsulePartyMonOTNames
+00:c91b wTimeCapsulePartyMonOTs
+00:c91b wTimeCapsulePartyMon1OT
 00:c91e wLinkPlayerPartyMon6Happiness
 00:c91f wLinkPlayerPartyMon6PokerusStatus
 00:c920 wLinkPlayerPartyMon6CaughtLevel
@@ -47079,26 +47080,49 @@
 00:c923 wLinkPlayerPartyMon6BoxEnd
 00:c924 wLinkPlayerPartyMon6Unused
 00:c925 wLinkPlayerPartyMon6HP
+00:c926 wTimeCapsulePartyMon2OT
 00:c927 wLinkPlayerPartyMon6MaxHP
 00:c929 wLinkPlayerPartyMon6Stats
 00:c929 wLinkPlayerPartyMon6Attack
 00:c92b wLinkPlayerPartyMon6Defense
 00:c92d wLinkPlayerPartyMon6Speed
 00:c92f wLinkPlayerPartyMon6SpclAtk
+00:c931 wTimeCapsulePartyMon3OT
 00:c931 wLinkPlayerPartyMon6SpclDef
-00:c933 wLinkPlayerPartyMonOTNames
+00:c933 wLinkPlayerPartyMon1OT
+00:c933 wLinkPlayerPartyMonOTs
 00:c933 wLinkPlayerPartyMon6StructEnd
+00:c93c wTimeCapsulePartyMon4OT
+00:c93e wLinkPlayerPartyMon2OT
+00:c947 wTimeCapsulePartyMon5OT
+00:c949 wLinkPlayerPartyMon3OT
 00:c950 wMysteryGiftPlayerData
 00:c951 wMysteryGiftPlayerID
+00:c952 wTimeCapsulePartyMon6OT
 00:c953 wMysteryGiftPlayerName
-00:c95d wTimeCapsulePartyMonNicks
+00:c954 wLinkPlayerPartyMon4OT
+00:c95d wTimeCapsulePartyMonNicknames
+00:c95d wTimeCapsulePartyMon1Nickname
 00:c95e wMysteryGiftPlayerDexCaught
 00:c95f wMysteryGiftPlayerSentDeco
+00:c95f wLinkPlayerPartyMon5OT
 00:c960 wMysteryGiftPlayerWhichItem
 00:c961 wMysteryGiftPlayerWhichDeco
 00:c962 wMysteryGiftPlayerBackupItem
 00:c964 wMysteryGiftPlayerDataEnd
-00:c975 wLinkPlayerPartyMonNicks
+00:c968 wTimeCapsulePartyMon2Nickname
+00:c96a wLinkPlayerPartyMon6OT
+00:c973 wTimeCapsulePartyMon3Nickname
+00:c975 wLinkPlayerPartyMonNicknames
+00:c975 wLinkPlayerPartyMon1Nickname
+00:c97e wTimeCapsulePartyMon4Nickname
+00:c980 wLinkPlayerPartyMon2Nickname
+00:c989 wTimeCapsulePartyMon5Nickname
+00:c98b wLinkPlayerPartyMon3Nickname
+00:c994 wTimeCapsulePartyMon6Nickname
+00:c996 wLinkPlayerPartyMon4Nickname
+00:c9a1 wLinkPlayerPartyMon5Nickname
+00:c9ac wLinkPlayerPartyMon6Nickname
 00:c9f4 wLinkPlayerMail
 00:c9f4 wLinkReceivedMail
 00:c9f4 wLinkPlayerMailPreamble
@@ -47142,6 +47166,12 @@
 00:cb84 wLinkOTMailMessages
 00:cbe8 wCurLinkOTPartyMonTypePointer
 00:cbea wLinkOTPartyMonTypes
+00:cbea wLinkOTPartyMon1Type
+00:cbec wLinkOTPartyMon2Type
+00:cbee wLinkOTPartyMon3Type
+00:cbf0 wLinkOTPartyMon4Type
+00:cbf2 wLinkOTPartyMon5Type
+00:cbf4 wLinkOTPartyMon6Type
 00:cbf8 wPrinterStatus
 00:cbfa wPrinterMargins
 00:cbfb wPrinterExposureTime
@@ -47170,7 +47200,7 @@
 00:cd22 wMobileMonStructPointer
 00:cd22 wCreditsTimer
 00:cd23 wcd23
-00:cd24 wMobileMonOTNamePointer
+00:cd24 wMobileMonOTPointer
 00:cd24 wcd24
 00:cd25 wMobileCommsJumptableIndex
 00:cd26 wMobileMonNicknamePointer
@@ -47454,7 +47484,6 @@
 01:d002 wEarthquakeMovementDataBuffer
 01:d002 wMonMailMessageBuffer
 01:d002 wSuicuneFrame
-01:d002 wBufferMonNick
 01:d002 wLinkBattleRecordBuffer
 01:d002 wPokeFluteCuredSleep
 01:d002 wDebugColorIsTrainer
@@ -47487,6 +47516,7 @@
 01:d002 wNumOwnedDecoCategories
 01:d002 wMartItem1BCD
 01:d002 wTownMapPlayerIconLandmark
+01:d002 wBufferMonNickname
 01:d003 wPlaceBallsDirection
 01:d003 wMovementBufferObject
 01:d003 wNextRadioLine
@@ -47502,10 +47532,10 @@
 01:d003 wSeerNickname
 01:d003 wTempPokedexCaughtCount
 01:d003 wTownMapCursorCoordinates
+01:d004 wBufferTrademonNickname
 01:d004 wRadioTextDelay
 01:d004 wDebugColorCurTMHM
 01:d004 wBugContestFirstPlaceScore
-01:d004 wBufferTrademonNick
 01:d004 wTownMapCursorObjectPointer
 01:d004 wTrainerHUDTiles
 01:d004 wd004
@@ -47573,9 +47603,9 @@
 01:d025 wBufferMonAtkExp
 01:d027 wBufferMonDefExp
 01:d029 wBufferMonSpdExp
-01:d02a wSeerOTName
+01:d02a wSeerOT
 01:d02b wBufferMonSpcExp
-01:d02b wTempMailAuthorNationality
+01:d02b wTempMailNationality
 01:d02d wd02d
 01:d02d wTempMailAuthorID
 01:d02d wBufferMonDVs
@@ -47592,8 +47622,8 @@
 01:d033 wd033
 01:d034 wBufferMonPokerusStatus
 01:d034 wd034
+01:d035 wSeerOTGrammar
 01:d035 wBufferMonCaughtLevel
-01:d035 wSeerOTNameGrammar
 01:d035 wBufferMonCaughtData
 01:d035 wBufferMonCaughtTime
 01:d036 wBufferMonCaughtLocation
@@ -48270,10 +48300,21 @@
 01:d3a2 wOTPartyMon6Speed
 01:d3a4 wOTPartyMon6SpclAtk
 01:d3a6 wOTPartyMon6SpclDef
-01:d3a8 wOTPartyMonsEnd
-01:d3a8 wOTPartyMonOT
+01:d3a8 wOTPartyMonOTs
+01:d3a8 wOTPartyMon1OT
 01:d3a8 wOTPartyMon6StructEnd
+01:d3b3 wOTPartyMon2OT
+01:d3be wOTPartyMon3OT
+01:d3c9 wOTPartyMon4OT
+01:d3d4 wOTPartyMon5OT
+01:d3df wOTPartyMon6OT
 01:d3ea wOTPartyMonNicknames
+01:d3ea wOTPartyMon1Nickname
+01:d3f5 wOTPartyMon2Nickname
+01:d400 wOTPartyMon3Nickname
+01:d40b wOTPartyMon4Nickname
+01:d416 wOTPartyMon5Nickname
+01:d421 wOTPartyMon6Nickname
 01:d42c wOTPartyDataEnd
 01:d430 wd430
 01:d430 wBattleAction
@@ -49436,8 +49477,20 @@
 01:ddfb wPartyMon6SpclAtk
 01:ddfd wPartyMon6SpclDef
 01:ddff wPartyMon6StructEnd
-01:ddff wPartyMonOT
+01:ddff wPartyMon1OT
+01:ddff wPartyMonOTs
+01:de0a wPartyMon2OT
+01:de15 wPartyMon3OT
+01:de20 wPartyMon4OT
+01:de2b wPartyMon5OT
+01:de36 wPartyMon6OT
 01:de41 wPartyMonNicknames
+01:de41 wPartyMon1Nickname
+01:de4c wPartyMon2Nickname
+01:de57 wPartyMon3Nickname
+01:de62 wPartyMon4Nickname
+01:de6d wPartyMon5Nickname
+01:de78 wPartyMon6Nickname
 01:de83 wPartyMonNicknamesEnd
 01:de99 wPokedexCaught
 01:deb9 wEndPokedexCaught
@@ -49447,7 +49500,7 @@
 01:def3 wUnlockedUnowns
 01:def4 wFirstUnownSeen
 01:def5 wDayCareMan
-01:def6 wBreedMon1Nick
+01:def6 wBreedMon1Nickname
 01:df01 wBreedMon1OT
 01:df0c wBreedMon1
 01:df0c wBreedMon1Species
@@ -49475,7 +49528,7 @@
 01:df2c wBreedMon1BoxEnd
 01:df2d wStepsToEgg
 01:df2e wBreedMotherOrNonDitto
-01:df2f wBreedMon2Nick
+01:df2f wBreedMon2Nickname
 01:df3a wBreedMon2OT
 01:df45 wBreedMon2Species
 01:df45 wBreedMon2
@@ -49499,9 +49552,9 @@
 01:df63 wBreedMon2CaughtLocation
 01:df63 wBreedMon2CaughtGender
 01:df64 wBreedMon2Level
-01:df65 wEggNick
+01:df65 wEggMonNickname
 01:df65 wBreedMon2BoxEnd
-01:df70 wEggOT
+01:df70 wEggMonOT
 01:df7b wEggMonSpecies
 01:df7b wEggMon
 01:df7c wEggMonItem
@@ -50580,7 +50633,7 @@
 05:d30a wActiveAnimObjects
 05:d30a wAnimObject01
 05:d30b wAnimObject01OAMFlags
-05:d30c wAnimObject01Field02
+05:d30c wAnimObject01FixY
 05:d30d wAnimObject01FramesetID
 05:d30e wAnimObject01Function
 05:d30f wAnimObject01Palette
@@ -50598,7 +50651,7 @@
 05:d322 wAnimObject02Index
 05:d322 wAnimObject02
 05:d323 wAnimObject02OAMFlags
-05:d324 wAnimObject02Field02
+05:d324 wAnimObject02FixY
 05:d325 wAnimObject02FramesetID
 05:d326 wAnimObject02Function
 05:d327 wAnimObject02Palette
@@ -50616,7 +50669,7 @@
 05:d33a wAnimObject03Index
 05:d33a wAnimObject03
 05:d33b wAnimObject03OAMFlags
-05:d33c wAnimObject03Field02
+05:d33c wAnimObject03FixY
 05:d33d wAnimObject03FramesetID
 05:d33e wAnimObject03Function
 05:d33f wAnimObject03Palette
@@ -50634,7 +50687,7 @@
 05:d352 wAnimObject04
 05:d352 wAnimObject04Index
 05:d353 wAnimObject04OAMFlags
-05:d354 wAnimObject04Field02
+05:d354 wAnimObject04FixY
 05:d355 wAnimObject04FramesetID
 05:d356 wAnimObject04Function
 05:d357 wAnimObject04Palette
@@ -50652,7 +50705,7 @@
 05:d36a wAnimObject05Index
 05:d36a wAnimObject05
 05:d36b wAnimObject05OAMFlags
-05:d36c wAnimObject05Field02
+05:d36c wAnimObject05FixY
 05:d36d wAnimObject05FramesetID
 05:d36e wAnimObject05Function
 05:d36f wAnimObject05Palette
@@ -50670,7 +50723,7 @@
 05:d382 wAnimObject06Index
 05:d382 wAnimObject06
 05:d383 wAnimObject06OAMFlags
-05:d384 wAnimObject06Field02
+05:d384 wAnimObject06FixY
 05:d385 wAnimObject06FramesetID
 05:d386 wAnimObject06Function
 05:d387 wAnimObject06Palette
@@ -50688,7 +50741,7 @@
 05:d39a wAnimObject07Index
 05:d39a wAnimObject07
 05:d39b wAnimObject07OAMFlags
-05:d39c wAnimObject07Field02
+05:d39c wAnimObject07FixY
 05:d39d wAnimObject07FramesetID
 05:d39e wAnimObject07Function
 05:d39f wAnimObject07Palette
@@ -50706,7 +50759,7 @@
 05:d3b2 wAnimObject08Index
 05:d3b2 wAnimObject08
 05:d3b3 wAnimObject08OAMFlags
-05:d3b4 wAnimObject08Field02
+05:d3b4 wAnimObject08FixY
 05:d3b5 wAnimObject08FramesetID
 05:d3b6 wAnimObject08Function
 05:d3b7 wAnimObject08Palette
@@ -50724,7 +50777,7 @@
 05:d3ca wAnimObject09
 05:d3ca wAnimObject09Index
 05:d3cb wAnimObject09OAMFlags
-05:d3cc wAnimObject09Field02
+05:d3cc wAnimObject09FixY
 05:d3cd wAnimObject09FramesetID
 05:d3ce wAnimObject09Function
 05:d3cf wAnimObject09Palette
@@ -50742,7 +50795,7 @@
 05:d3e2 wAnimObject10Index
 05:d3e2 wAnimObject10
 05:d3e3 wAnimObject10OAMFlags
-05:d3e4 wAnimObject10Field02
+05:d3e4 wAnimObject10FixY
 05:d3e5 wAnimObject10FramesetID
 05:d3e6 wAnimObject10Function
 05:d3e7 wAnimObject10Palette

pokecrystal11_debug.sym

@@ -289,7 +289,7 @@
 00:1082 DummyChar
 00:1083 NextChar
 00:1087 CheckDict
-00:1122 CheckDict.__8442
+00:1122 CheckDict.__8443
 00:1145 CheckDict.diacritic
 00:114c CheckDict.not_diacritic
 00:115c CheckDict.hiragana_dakuten
@@ -627,9 +627,9 @@
 00:21a5 LoadMetatiles.row
 00:21a9 LoadMetatiles.col
 00:21b2 LoadMetatiles.ok
-00:21d8 LoadMetatiles.next_8607
-00:21eb LoadMetatiles.next_8612
-00:21fe LoadMetatiles.next_8617
+00:21d8 LoadMetatiles.next_8608
+00:21eb LoadMetatiles.next_8613
+00:21fe LoadMetatiles.next_8618
 00:2225 LoadMetatiles.ok2
 00:222a ReturnToMapFromSubmenu
 00:2238 CheckWarpTile
@@ -962,16 +962,16 @@
 00:329b _CopyTilemapAtOnce.wait2
 00:32a9 _CopyTilemapAtOnce.CopyBGMapViaStack
 00:32ba _CopyTilemapAtOnce.loop
-00:32bb _CopyTilemapAtOnce.loop_8695
-00:32c4 _CopyTilemapAtOnce.loop_8696
-00:32cd _CopyTilemapAtOnce.loop_8697
-00:32d6 _CopyTilemapAtOnce.loop_8698
-00:32df _CopyTilemapAtOnce.loop_8699
-00:32e8 _CopyTilemapAtOnce.loop_8700
-00:32f1 _CopyTilemapAtOnce.loop_8701
-00:32fa _CopyTilemapAtOnce.loop_8702
-00:3303 _CopyTilemapAtOnce.loop_8703
-00:330c _CopyTilemapAtOnce.loop_8704
+00:32bb _CopyTilemapAtOnce.loop_8696
+00:32c4 _CopyTilemapAtOnce.loop_8697
+00:32cd _CopyTilemapAtOnce.loop_8698
+00:32d6 _CopyTilemapAtOnce.loop_8699
+00:32df _CopyTilemapAtOnce.loop_8700
+00:32e8 _CopyTilemapAtOnce.loop_8701
+00:32f1 _CopyTilemapAtOnce.loop_8702
+00:32fa _CopyTilemapAtOnce.loop_8703
+00:3303 _CopyTilemapAtOnce.loop_8704
+00:330c _CopyTilemapAtOnce.loop_8705
 00:3327 SetPalettes
 00:3337 SetPalettes.SetPalettesForGameBoyColor
 00:3345 ClearPalettes
@@ -1086,8 +1086,8 @@
 00:3884 GetBaseData
 00:38a9 GetBaseData.egg
 00:38be GetBaseData.end
-00:38ca GetCurNick
-00:38d0 GetNick
+00:38ca GetCurNickname
+00:38d0 GetNickname
 00:38e9 PrintBCDNumber
 00:38fb PrintBCDNumber.loop
 00:3912 PrintBCDNumber.skipLeftAlignmentAdjustment
@@ -1952,7 +1952,7 @@
 01:730c GiveShuckle
 01:7372 GiveShuckle.NotGiven
 01:7377 SpecialShuckleOT
-01:737d SpecialShuckleNick
+01:737d SpecialShuckleNickname
 01:7385 ReturnShuckie
 01:73b6 ReturnShuckie.CheckOT
 01:73c2 ReturnShuckie.done
@@ -2038,11 +2038,11 @@
 02:44d3 QueueFollowerFirstStep.up
 02:44d7 QueueFollowerFirstStep.same_xy
 02:44d9 _Sine
-02:44e5 _Sine.negative_9296
-02:44ef _Sine.apply_9296
-02:44fe _Sine.multiply_9296
-02:4503 _Sine.even_9296
-02:450b _Sine.sinetable_9296
+02:44e5 _Sine.negative_9297
+02:44ef _Sine.apply_9297
+02:44fe _Sine.multiply_9297
+02:4503 _Sine.even_9297
+02:450b _Sine.sinetable_9297
 02:454b GetPredefPointer
 02:456b PredefPointers
 02:456b LearnMovePredef
@@ -2719,7 +2719,7 @@
 03:46ea FieldMoveJumptableReset
 03:46f5 FieldMoveJumptable
 03:4702 FieldMoveJumptable.okay
-03:4706 GetPartyNick
+03:4706 GetPartyNickname
 03:4721 CheckEngineFlag
 03:472f CheckEngineFlag.isset
 03:4731 CheckBadge
@@ -6562,7 +6562,7 @@
 0a:5461 TradeAnim_ShowGetmonData
 0a:5487 TradeAnim_AnimateFrontpic
 0a:5491 TradeAnim_GetFrontpic
-0a:54a9 TradeAnim_GetNickname
+0a:54a9 TradeAnim_GetNicknamename
 0a:54bb TradeAnim_ShowGivemonFrontpic
 0a:54c0 TradeAnim_ShowGetmonFrontpic
 0a:54c3 TradeAnim_ShowFrontpic
@@ -10631,11 +10631,11 @@
 12:5b2f UpdateCelebiPosition.done
 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition
 12:5b3b CelebiEvent_Cosine
-12:5b48 CelebiEvent_Cosine.negative_28911
-12:5b52 CelebiEvent_Cosine.apply_28911
-12:5b61 CelebiEvent_Cosine.multiply_28911
-12:5b66 CelebiEvent_Cosine.even_28911
-12:5b6e CelebiEvent_Cosine.sinetable_28911
+12:5b48 CelebiEvent_Cosine.negative_28912
+12:5b52 CelebiEvent_Cosine.apply_28912
+12:5b61 CelebiEvent_Cosine.multiply_28912
+12:5b66 CelebiEvent_Cosine.even_28912
+12:5b6e CelebiEvent_Cosine.sinetable_28912
 12:5bae GetCelebiSpriteTile
 12:5bd0 GetCelebiSpriteTile.Frame1
 12:5bd4 GetCelebiSpriteTile.Frame2
@@ -10937,16 +10937,16 @@
 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2
 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 13:4f91 SaveMenu_CopyTilemapAtOnce.loop
-13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39369
-13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39370
-13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39371
-13:4fad SaveMenu_CopyTilemapAtOnce.loop_39372
-13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39373
-13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39374
-13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39375
-13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39376
-13:4fda SaveMenu_CopyTilemapAtOnce.loop_39377
-13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39378
+13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39370
+13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39371
+13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39372
+13:4fad SaveMenu_CopyTilemapAtOnce.loop_39373
+13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39374
+13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39375
+13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39376
+13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39377
+13:4fda SaveMenu_CopyTilemapAtOnce.loop_39378
+13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39379
 13:4ffe CheckSave
 13:501b CheckSave.ok
 13:501e MapScenes
@@ -10961,16 +10961,16 @@
 13:51bd PhoneRing_CopyTilemapAtOnce.wait2
 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 13:51dc PhoneRing_CopyTilemapAtOnce.loop
-13:51dd PhoneRing_CopyTilemapAtOnce.loop_39540
-13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39541
-13:51ef PhoneRing_CopyTilemapAtOnce.loop_39542
-13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39543
-13:5201 PhoneRing_CopyTilemapAtOnce.loop_39544
-13:520a PhoneRing_CopyTilemapAtOnce.loop_39545
-13:5213 PhoneRing_CopyTilemapAtOnce.loop_39546
-13:521c PhoneRing_CopyTilemapAtOnce.loop_39547
-13:5225 PhoneRing_CopyTilemapAtOnce.loop_39548
-13:522e PhoneRing_CopyTilemapAtOnce.loop_39549
+13:51dd PhoneRing_CopyTilemapAtOnce.loop_39541
+13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39542
+13:51ef PhoneRing_CopyTilemapAtOnce.loop_39543
+13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39544
+13:5201 PhoneRing_CopyTilemapAtOnce.loop_39545
+13:520a PhoneRing_CopyTilemapAtOnce.loop_39546
+13:5213 PhoneRing_CopyTilemapAtOnce.loop_39547
+13:521c PhoneRing_CopyTilemapAtOnce.loop_39548
+13:5225 PhoneRing_CopyTilemapAtOnce.loop_39549
+13:522e PhoneRing_CopyTilemapAtOnce.loop_39550
 13:5249 Shrink1Pic
 13:52d9 Shrink2Pic
 13:5319 LinkMonStatsScreen
@@ -11211,7 +11211,7 @@
 13:6564 CopyNickname
 13:656c CopyNickname.okay
 13:6581 CopyNickname.partymon
-13:6587 GetNicknamePointer
+13:6587 GetNicknamenamePointer
 13:659e CheckFaintedFrzSlp
 13:65b1 CheckFaintedFrzSlp.fainted_frz_slp
 13:65b3 CatchTutorial
@@ -17235,11 +17235,11 @@
 23:46ef WipeLYOverrides.wipe
 23:46f2 WipeLYOverrides.loop
 23:46f7 StartTrainerBattle_DrawSineWave
-23:4702 StartTrainerBattle_DrawSineWave.negative_54413
-23:470c StartTrainerBattle_DrawSineWave.apply_54413
-23:471b StartTrainerBattle_DrawSineWave.multiply_54413
-23:4720 StartTrainerBattle_DrawSineWave.even_54413
-23:4728 StartTrainerBattle_DrawSineWave.sinetable_54413
+23:4702 StartTrainerBattle_DrawSineWave.negative_54414
+23:470c StartTrainerBattle_DrawSineWave.apply_54414
+23:471b StartTrainerBattle_DrawSineWave.multiply_54414
+23:4720 StartTrainerBattle_DrawSineWave.even_54414
+23:4728 StartTrainerBattle_DrawSineWave.sinetable_54414
 23:4768 StartTrainerBattle_ZoomToBlack
 23:4771 StartTrainerBattle_ZoomToBlack.loop
 23:478c StartTrainerBattle_ZoomToBlack.done
@@ -17596,11 +17596,11 @@
 23:672a Sprites_Cosine
 23:672a UnusedSpriteAnimGFX.DeletedGFX
 23:672c Sprites_Sine
-23:6737 Sprites_Sine.negative_55800
-23:6741 Sprites_Sine.apply_55800
-23:6750 Sprites_Sine.multiply_55800
-23:6755 Sprites_Sine.even_55800
-23:675d Sprites_Sine.sinetable_55800
+23:6737 Sprites_Sine.negative_55801
+23:6741 Sprites_Sine.apply_55801
+23:6750 Sprites_Sine.multiply_55801
+23:6755 Sprites_Sine.even_55801
+23:675d Sprites_Sine.sinetable_55801
 23:679d AnimateEndOfExpBar
 23:67a8 AnimateEndOfExpBar.load
 23:67b5 AnimateEndOfExpBar.loop
@@ -23945,10 +23945,10 @@
 33:672c BattleAnim_IncAnonJumptableIndex
 33:6732 BattleAnim_Cosine
 33:6734 BattleAnim_Sine
-33:673f BattleAnim_Sine.negative_69746
-33:6749 BattleAnim_Sine.apply_69746
-33:6758 BattleAnim_Sine.multiply_69746
-33:675d BattleAnim_Sine.even_69746
+33:673f BattleAnim_Sine.negative_69747
+33:6749 BattleAnim_Sine.apply_69747
+33:6758 BattleAnim_Sine.multiply_69747
+33:675d BattleAnim_Sine.even_69747
 33:6765 BattleAnim_Sine_e
 33:676b BattleAnim_Cosine_e
 33:6771 BattleAnim_AbsSinePrecise
@@ -27093,14 +27093,14 @@
 38:6d23 BillsPC_RefreshTextboxes.placeholder_string
 38:6d2a BillsPC_RefreshTextboxes.Placeholder
 38:6d30 CopyBoxmonSpecies
-38:6d57 CopyBoxmonSpecies.loop_76360
-38:6d79 CopyBoxmonSpecies.done_76360
+38:6d57 CopyBoxmonSpecies.loop_76361
+38:6d79 CopyBoxmonSpecies.done_76361
 38:6d87 CopyBoxmonSpecies.party
-38:6d8a CopyBoxmonSpecies.loop_76361
-38:6dac CopyBoxmonSpecies.done_76361
+38:6d8a CopyBoxmonSpecies.loop_76362
+38:6dac CopyBoxmonSpecies.done_76362
 38:6db7 CopyBoxmonSpecies.sBox
-38:6dbf CopyBoxmonSpecies.loop_76362
-38:6de1 CopyBoxmonSpecies.done_76362
+38:6dbf CopyBoxmonSpecies.loop_76363
+38:6de1 CopyBoxmonSpecies.done_76363
 38:6def BillsPC_GetSelectedPokemonSpecies
 38:6e01 BillsPC_UpdateSelectionCursor
 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor
@@ -29908,8 +29908,8 @@
 3e:77f2 CompareNewToOld.loop
 3e:77fe CompareNewToOld.different
 3e:7800 CompareNewToOld.terminator
-3e:7802 GetNicknameLength
-3e:7804 GetNicknameLength.loop
+3e:7802 GetNicknamenameLength
+3e:7804 GetNicknamenameLength.loop
 3e:780f NameRaterHelloText
 3e:7814 NameRaterWhichMonText
 3e:7819 NameRaterBetterNameText
@@ -43131,7 +43131,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
@@ -43140,7 +43140,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
@@ -43149,7 +43149,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
@@ -43158,7 +43158,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
@@ -43167,7 +43167,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
@@ -43176,7 +43176,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
@@ -43186,7 +43186,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
@@ -43195,7 +43195,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
@@ -43204,7 +43204,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
@@ -43213,7 +43213,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
@@ -43222,7 +43222,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
@@ -43231,7 +43231,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
@@ -43242,7 +43242,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
@@ -43251,7 +43251,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
@@ -43260,7 +43260,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
@@ -43269,7 +43269,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
@@ -43278,7 +43278,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
@@ -43287,7 +43287,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
@@ -43296,7 +43296,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
@@ -43305,7 +43305,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
@@ -43314,7 +43314,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
@@ -43323,7 +43323,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
@@ -43334,7 +43334,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
@@ -43343,7 +43343,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
@@ -43352,7 +43352,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
@@ -43361,7 +43361,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
@@ -43370,7 +43370,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
@@ -43379,7 +43379,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
@@ -43388,7 +43388,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
@@ -43397,7 +43397,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
@@ -43406,7 +43406,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
@@ -43415,7 +43415,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
@@ -43488,7 +43488,7 @@
 01:ad45 sBoxMon1Level
 01:ad46 sBoxMon1BoxEnd
 01:ad46 sBoxMon2
-01:afa6 sBoxMonOT
+01:afa6 sBoxMonOTs
 01:b082 sBoxMonNicknames
 01:b15e sBoxMonNicknamesEnd
 01:b15e sBoxEnd
@@ -44929,7 +44929,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
@@ -44961,7 +44961,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
@@ -44993,7 +44993,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
@@ -45025,7 +45025,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
@@ -45057,7 +45057,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
@@ -45089,7 +45089,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
@@ -45121,7 +45121,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
@@ -45153,7 +45153,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
@@ -45185,7 +45185,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
@@ -45217,7 +45217,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
@@ -45249,7 +45249,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
@@ -45281,7 +45281,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
@@ -45313,7 +45313,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
@@ -45345,7 +45345,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
@@ -46337,7 +46337,7 @@
 00:c615 wOddEggAtkExp
 00:c615 wBT_OTTempMon1Moves
 00:c615 wPlayerMoveStructEffectChance
-00:c616 wEnemyMonNick
+00:c616 wEnemyMonNickname
 00:c617 wOddEggDefExp
 00:c618 wc618
 00:c619 wHallOfFameTempMon2
@@ -46357,7 +46357,7 @@
 00:c61f wHallOfFameTempMon2Nickname
 00:c61f wOddEggPP
 00:c620 wBT_OTTempMon1AtkExp
-00:c621 wBattleMonNick
+00:c621 wBattleMonNickname
 00:c622 wBT_OTTempMon1DefExp
 00:c623 wOddEggHappiness
 00:c624 wBT_OTTempMon1SpdExp
@@ -46435,7 +46435,7 @@
 00:c641 wBT_OTTempMon1SpclDef
 00:c642 wc642
 00:c642 wBattleMonDefense
-00:c643 wOddEggOTName
+00:c643 wOddEggOT
 00:c643 wBT_OTTempMon1Name
 00:c643 wBT_OTTempMon1StructEnd
 00:c644 wBattleMonSpeed
@@ -46946,7 +46946,7 @@
 00:c81e wLinkPlayerPartyMon1StatExp
 00:c81e wLinkPlayerPartyMon1HPExp
 00:c81e wMobileSDK_SendCommandID
-00:c81f wTimeCapsulePartyMon1OTID
+00:c81f wTimeCapsulePartyMon1ID
 00:c820 wLinkPlayerPartyMon1AtkExp
 00:c820 wDebugRoomMonID
 00:c821 wTimeCapsulePartyMon1Exp
@@ -47047,7 +47047,7 @@
 00:c847 wTimeCapsulePartyMon2Moves
 00:c849 wLinkPlayerPartyMon2ID
 00:c84b wLinkPlayerPartyMon2Exp
-00:c84b wTimeCapsulePartyMon2OTID
+00:c84b wTimeCapsulePartyMon2ID
 00:c84d wTimeCapsulePartyMon2Exp
 00:c84e wLinkPlayerPartyMon2HPExp
 00:c84e wLinkPlayerPartyMon2StatExp
@@ -47119,7 +47119,7 @@
 00:c874 wNameCardDataEnd
 00:c875 wLinkPlayerPartyMon3Moves
 00:c876 wMysteryGiftTrainerEnd
-00:c877 wTimeCapsulePartyMon3OTID
+00:c877 wTimeCapsulePartyMon3ID
 00:c879 wTimeCapsulePartyMon3Exp
 00:c879 wLinkPlayerPartyMon3ID
 00:c87b wLinkPlayerPartyMon3Exp
@@ -47175,9 +47175,9 @@
 00:c89f wLinkPlayerPartyMon3SpclAtk
 00:c8a1 wLinkPlayerPartyMon3SpclDef
 00:c8a3 wLinkPlayerPartyMon4Species
+00:c8a3 wTimeCapsulePartyMon4ID
 00:c8a3 wLinkPlayerPartyMon3StructEnd
 00:c8a3 wLinkPlayerPartyMon4
-00:c8a3 wTimeCapsulePartyMon4OTID
 00:c8a4 wLinkPlayerPartyMon4Item
 00:c8a5 wLinkPlayerPartyMon4Moves
 00:c8a5 wTimeCapsulePartyMon4Exp
@@ -47233,7 +47233,7 @@
 00:c8cb wLinkPlayerPartyMon4Defense
 00:c8cd wLinkPlayerPartyMon4Speed
 00:c8cf wLinkPlayerPartyMon4SpclAtk
-00:c8cf wTimeCapsulePartyMon5OTID
+00:c8cf wTimeCapsulePartyMon5ID
 00:c8d1 wLinkPlayerPartyMon4SpclDef
 00:c8d1 wTimeCapsulePartyMon5Exp
 00:c8d3 wLinkPlayerPartyMon5Species
@@ -47291,7 +47291,7 @@
 00:c8f9 wLinkPlayerPartyMon5Attack
 00:c8f9 wLinkPlayerPartyMon5Stats
 00:c8fb wLinkPlayerPartyMon5Defense
-00:c8fb wTimeCapsulePartyMon6OTID
+00:c8fb wTimeCapsulePartyMon6ID
 00:c8fd wTimeCapsulePartyMon6Exp
 00:c8fd wLinkPlayerPartyMon5Speed
 00:c8ff wLinkPlayerPartyMon5SpclAtk
@@ -47336,7 +47336,8 @@
 00:c918 wLinkPlayerPartyMon6DVs
 00:c919 wTimeCapsulePartyMon6Special
 00:c91a wLinkPlayerPartyMon6PP
-00:c91b wTimeCapsulePartyMonOTNames
+00:c91b wTimeCapsulePartyMonOTs
+00:c91b wTimeCapsulePartyMon1OT
 00:c91e wLinkPlayerPartyMon6Happiness
 00:c91f wLinkPlayerPartyMon6PokerusStatus
 00:c920 wLinkPlayerPartyMon6CaughtLevel
@@ -47349,26 +47350,49 @@
 00:c923 wLinkPlayerPartyMon6BoxEnd
 00:c924 wLinkPlayerPartyMon6Unused
 00:c925 wLinkPlayerPartyMon6HP
+00:c926 wTimeCapsulePartyMon2OT
 00:c927 wLinkPlayerPartyMon6MaxHP
 00:c929 wLinkPlayerPartyMon6Stats
 00:c929 wLinkPlayerPartyMon6Attack
 00:c92b wLinkPlayerPartyMon6Defense
 00:c92d wLinkPlayerPartyMon6Speed
 00:c92f wLinkPlayerPartyMon6SpclAtk
+00:c931 wTimeCapsulePartyMon3OT
 00:c931 wLinkPlayerPartyMon6SpclDef
-00:c933 wLinkPlayerPartyMonOTNames
+00:c933 wLinkPlayerPartyMon1OT
+00:c933 wLinkPlayerPartyMonOTs
 00:c933 wLinkPlayerPartyMon6StructEnd
+00:c93c wTimeCapsulePartyMon4OT
+00:c93e wLinkPlayerPartyMon2OT
+00:c947 wTimeCapsulePartyMon5OT
+00:c949 wLinkPlayerPartyMon3OT
 00:c950 wMysteryGiftPlayerData
 00:c951 wMysteryGiftPlayerID
+00:c952 wTimeCapsulePartyMon6OT
 00:c953 wMysteryGiftPlayerName
-00:c95d wTimeCapsulePartyMonNicks
+00:c954 wLinkPlayerPartyMon4OT
+00:c95d wTimeCapsulePartyMonNicknames
+00:c95d wTimeCapsulePartyMon1Nickname
 00:c95e wMysteryGiftPlayerDexCaught
 00:c95f wMysteryGiftPlayerSentDeco
+00:c95f wLinkPlayerPartyMon5OT
 00:c960 wMysteryGiftPlayerWhichItem
 00:c961 wMysteryGiftPlayerWhichDeco
 00:c962 wMysteryGiftPlayerBackupItem
 00:c964 wMysteryGiftPlayerDataEnd
-00:c975 wLinkPlayerPartyMonNicks
+00:c968 wTimeCapsulePartyMon2Nickname
+00:c96a wLinkPlayerPartyMon6OT
+00:c973 wTimeCapsulePartyMon3Nickname
+00:c975 wLinkPlayerPartyMonNicknames
+00:c975 wLinkPlayerPartyMon1Nickname
+00:c97e wTimeCapsulePartyMon4Nickname
+00:c980 wLinkPlayerPartyMon2Nickname
+00:c989 wTimeCapsulePartyMon5Nickname
+00:c98b wLinkPlayerPartyMon3Nickname
+00:c994 wTimeCapsulePartyMon6Nickname
+00:c996 wLinkPlayerPartyMon4Nickname
+00:c9a1 wLinkPlayerPartyMon5Nickname
+00:c9ac wLinkPlayerPartyMon6Nickname
 00:c9f4 wLinkPlayerMail
 00:c9f4 wLinkReceivedMail
 00:c9f4 wLinkPlayerMailPreamble
@@ -47412,6 +47436,12 @@
 00:cb84 wLinkOTMailMessages
 00:cbe8 wCurLinkOTPartyMonTypePointer
 00:cbea wLinkOTPartyMonTypes
+00:cbea wLinkOTPartyMon1Type
+00:cbec wLinkOTPartyMon2Type
+00:cbee wLinkOTPartyMon3Type
+00:cbf0 wLinkOTPartyMon4Type
+00:cbf2 wLinkOTPartyMon5Type
+00:cbf4 wLinkOTPartyMon6Type
 00:cbf8 wPrinterStatus
 00:cbfa wPrinterMargins
 00:cbfb wPrinterExposureTime
@@ -47440,7 +47470,7 @@
 00:cd22 wMobileMonStructPointer
 00:cd22 wCreditsTimer
 00:cd23 wcd23
-00:cd24 wMobileMonOTNamePointer
+00:cd24 wMobileMonOTPointer
 00:cd24 wcd24
 00:cd25 wMobileCommsJumptableIndex
 00:cd26 wMobileMonNicknamePointer
@@ -47724,7 +47754,6 @@
 01:d002 wEarthquakeMovementDataBuffer
 01:d002 wMonMailMessageBuffer
 01:d002 wSuicuneFrame
-01:d002 wBufferMonNick
 01:d002 wLinkBattleRecordBuffer
 01:d002 wPokeFluteCuredSleep
 01:d002 wDebugColorIsTrainer
@@ -47757,6 +47786,7 @@
 01:d002 wNumOwnedDecoCategories
 01:d002 wMartItem1BCD
 01:d002 wTownMapPlayerIconLandmark
+01:d002 wBufferMonNickname
 01:d003 wPlaceBallsDirection
 01:d003 wMovementBufferObject
 01:d003 wNextRadioLine
@@ -47772,10 +47802,10 @@
 01:d003 wSeerNickname
 01:d003 wTempPokedexCaughtCount
 01:d003 wTownMapCursorCoordinates
+01:d004 wBufferTrademonNickname
 01:d004 wRadioTextDelay
 01:d004 wDebugColorCurTMHM
 01:d004 wBugContestFirstPlaceScore
-01:d004 wBufferTrademonNick
 01:d004 wTownMapCursorObjectPointer
 01:d004 wTrainerHUDTiles
 01:d004 wd004
@@ -47843,9 +47873,9 @@
 01:d025 wBufferMonAtkExp
 01:d027 wBufferMonDefExp
 01:d029 wBufferMonSpdExp
-01:d02a wSeerOTName
+01:d02a wSeerOT
 01:d02b wBufferMonSpcExp
-01:d02b wTempMailAuthorNationality
+01:d02b wTempMailNationality
 01:d02d wd02d
 01:d02d wTempMailAuthorID
 01:d02d wBufferMonDVs
@@ -47862,8 +47892,8 @@
 01:d033 wd033
 01:d034 wBufferMonPokerusStatus
 01:d034 wd034
+01:d035 wSeerOTGrammar
 01:d035 wBufferMonCaughtLevel
-01:d035 wSeerOTNameGrammar
 01:d035 wBufferMonCaughtData
 01:d035 wBufferMonCaughtTime
 01:d036 wBufferMonCaughtLocation
@@ -48540,10 +48570,21 @@
 01:d3a2 wOTPartyMon6Speed
 01:d3a4 wOTPartyMon6SpclAtk
 01:d3a6 wOTPartyMon6SpclDef
-01:d3a8 wOTPartyMonsEnd
-01:d3a8 wOTPartyMonOT
+01:d3a8 wOTPartyMonOTs
+01:d3a8 wOTPartyMon1OT
 01:d3a8 wOTPartyMon6StructEnd
+01:d3b3 wOTPartyMon2OT
+01:d3be wOTPartyMon3OT
+01:d3c9 wOTPartyMon4OT
+01:d3d4 wOTPartyMon5OT
+01:d3df wOTPartyMon6OT
 01:d3ea wOTPartyMonNicknames
+01:d3ea wOTPartyMon1Nickname
+01:d3f5 wOTPartyMon2Nickname
+01:d400 wOTPartyMon3Nickname
+01:d40b wOTPartyMon4Nickname
+01:d416 wOTPartyMon5Nickname
+01:d421 wOTPartyMon6Nickname
 01:d42c wOTPartyDataEnd
 01:d430 wd430
 01:d430 wBattleAction
@@ -49706,8 +49747,20 @@
 01:ddfb wPartyMon6SpclAtk
 01:ddfd wPartyMon6SpclDef
 01:ddff wPartyMon6StructEnd
-01:ddff wPartyMonOT
+01:ddff wPartyMon1OT
+01:ddff wPartyMonOTs
+01:de0a wPartyMon2OT
+01:de15 wPartyMon3OT
+01:de20 wPartyMon4OT
+01:de2b wPartyMon5OT
+01:de36 wPartyMon6OT
 01:de41 wPartyMonNicknames
+01:de41 wPartyMon1Nickname
+01:de4c wPartyMon2Nickname
+01:de57 wPartyMon3Nickname
+01:de62 wPartyMon4Nickname
+01:de6d wPartyMon5Nickname
+01:de78 wPartyMon6Nickname
 01:de83 wPartyMonNicknamesEnd
 01:de99 wPokedexCaught
 01:deb9 wEndPokedexCaught
@@ -49717,7 +49770,7 @@
 01:def3 wUnlockedUnowns
 01:def4 wFirstUnownSeen
 01:def5 wDayCareMan
-01:def6 wBreedMon1Nick
+01:def6 wBreedMon1Nickname
 01:df01 wBreedMon1OT
 01:df0c wBreedMon1
 01:df0c wBreedMon1Species
@@ -49745,7 +49798,7 @@
 01:df2c wBreedMon1BoxEnd
 01:df2d wStepsToEgg
 01:df2e wBreedMotherOrNonDitto
-01:df2f wBreedMon2Nick
+01:df2f wBreedMon2Nickname
 01:df3a wBreedMon2OT
 01:df45 wBreedMon2Species
 01:df45 wBreedMon2
@@ -49769,9 +49822,9 @@
 01:df63 wBreedMon2CaughtLocation
 01:df63 wBreedMon2CaughtGender
 01:df64 wBreedMon2Level
-01:df65 wEggNick
+01:df65 wEggMonNickname
 01:df65 wBreedMon2BoxEnd
-01:df70 wEggOT
+01:df70 wEggMonOT
 01:df7b wEggMonSpecies
 01:df7b wEggMon
 01:df7c wEggMonItem
@@ -50850,7 +50903,7 @@
 05:d30a wActiveAnimObjects
 05:d30a wAnimObject01
 05:d30b wAnimObject01OAMFlags
-05:d30c wAnimObject01Field02
+05:d30c wAnimObject01FixY
 05:d30d wAnimObject01FramesetID
 05:d30e wAnimObject01Function
 05:d30f wAnimObject01Palette
@@ -50868,7 +50921,7 @@
 05:d322 wAnimObject02Index
 05:d322 wAnimObject02
 05:d323 wAnimObject02OAMFlags
-05:d324 wAnimObject02Field02
+05:d324 wAnimObject02FixY
 05:d325 wAnimObject02FramesetID
 05:d326 wAnimObject02Function
 05:d327 wAnimObject02Palette
@@ -50886,7 +50939,7 @@
 05:d33a wAnimObject03Index
 05:d33a wAnimObject03
 05:d33b wAnimObject03OAMFlags
-05:d33c wAnimObject03Field02
+05:d33c wAnimObject03FixY
 05:d33d wAnimObject03FramesetID
 05:d33e wAnimObject03Function
 05:d33f wAnimObject03Palette
@@ -50904,7 +50957,7 @@
 05:d352 wAnimObject04
 05:d352 wAnimObject04Index
 05:d353 wAnimObject04OAMFlags
-05:d354 wAnimObject04Field02
+05:d354 wAnimObject04FixY
 05:d355 wAnimObject04FramesetID
 05:d356 wAnimObject04Function
 05:d357 wAnimObject04Palette
@@ -50922,7 +50975,7 @@
 05:d36a wAnimObject05Index
 05:d36a wAnimObject05
 05:d36b wAnimObject05OAMFlags
-05:d36c wAnimObject05Field02
+05:d36c wAnimObject05FixY
 05:d36d wAnimObject05FramesetID
 05:d36e wAnimObject05Function
 05:d36f wAnimObject05Palette
@@ -50940,7 +50993,7 @@
 05:d382 wAnimObject06Index
 05:d382 wAnimObject06
 05:d383 wAnimObject06OAMFlags
-05:d384 wAnimObject06Field02
+05:d384 wAnimObject06FixY
 05:d385 wAnimObject06FramesetID
 05:d386 wAnimObject06Function
 05:d387 wAnimObject06Palette
@@ -50958,7 +51011,7 @@
 05:d39a wAnimObject07Index
 05:d39a wAnimObject07
 05:d39b wAnimObject07OAMFlags
-05:d39c wAnimObject07Field02
+05:d39c wAnimObject07FixY
 05:d39d wAnimObject07FramesetID
 05:d39e wAnimObject07Function
 05:d39f wAnimObject07Palette
@@ -50976,7 +51029,7 @@
 05:d3b2 wAnimObject08Index
 05:d3b2 wAnimObject08
 05:d3b3 wAnimObject08OAMFlags
-05:d3b4 wAnimObject08Field02
+05:d3b4 wAnimObject08FixY
 05:d3b5 wAnimObject08FramesetID
 05:d3b6 wAnimObject08Function
 05:d3b7 wAnimObject08Palette
@@ -50994,7 +51047,7 @@
 05:d3ca wAnimObject09
 05:d3ca wAnimObject09Index
 05:d3cb wAnimObject09OAMFlags
-05:d3cc wAnimObject09Field02
+05:d3cc wAnimObject09FixY
 05:d3cd wAnimObject09FramesetID
 05:d3ce wAnimObject09Function
 05:d3cf wAnimObject09Palette
@@ -51012,7 +51065,7 @@
 05:d3e2 wAnimObject10Index
 05:d3e2 wAnimObject10
 05:d3e3 wAnimObject10OAMFlags
-05:d3e4 wAnimObject10Field02
+05:d3e4 wAnimObject10FixY
 05:d3e5 wAnimObject10FramesetID
 05:d3e6 wAnimObject10Function
 05:d3e7 wAnimObject10Palette

pokecrystal_au.sym

@@ -289,7 +289,7 @@
 00:1082 DummyChar
 00:1083 NextChar
 00:1087 CheckDict
-00:1122 CheckDict.__8442
+00:1122 CheckDict.__8443
 00:1145 CheckDict.diacritic
 00:114c CheckDict.not_diacritic
 00:115c CheckDict.hiragana_dakuten
@@ -627,9 +627,9 @@
 00:21a5 LoadMetatiles.row
 00:21a9 LoadMetatiles.col
 00:21b2 LoadMetatiles.ok
-00:21d8 LoadMetatiles.next_8607
-00:21eb LoadMetatiles.next_8612
-00:21fe LoadMetatiles.next_8617
+00:21d8 LoadMetatiles.next_8608
+00:21eb LoadMetatiles.next_8613
+00:21fe LoadMetatiles.next_8618
 00:2225 LoadMetatiles.ok2
 00:222a ReturnToMapFromSubmenu
 00:2238 CheckWarpTile
@@ -959,16 +959,16 @@
 00:326d _CopyTilemapAtOnce.wait2
 00:327b _CopyTilemapAtOnce.CopyBGMapViaStack
 00:328c _CopyTilemapAtOnce.loop
-00:328d _CopyTilemapAtOnce.loop_8695
-00:3296 _CopyTilemapAtOnce.loop_8696
-00:329f _CopyTilemapAtOnce.loop_8697
-00:32a8 _CopyTilemapAtOnce.loop_8698
-00:32b1 _CopyTilemapAtOnce.loop_8699
-00:32ba _CopyTilemapAtOnce.loop_8700
-00:32c3 _CopyTilemapAtOnce.loop_8701
-00:32cc _CopyTilemapAtOnce.loop_8702
-00:32d5 _CopyTilemapAtOnce.loop_8703
-00:32de _CopyTilemapAtOnce.loop_8704
+00:328d _CopyTilemapAtOnce.loop_8696
+00:3296 _CopyTilemapAtOnce.loop_8697
+00:329f _CopyTilemapAtOnce.loop_8698
+00:32a8 _CopyTilemapAtOnce.loop_8699
+00:32b1 _CopyTilemapAtOnce.loop_8700
+00:32ba _CopyTilemapAtOnce.loop_8701
+00:32c3 _CopyTilemapAtOnce.loop_8702
+00:32cc _CopyTilemapAtOnce.loop_8703
+00:32d5 _CopyTilemapAtOnce.loop_8704
+00:32de _CopyTilemapAtOnce.loop_8705
 00:32f9 SetPalettes
 00:3309 SetPalettes.SetPalettesForGameBoyColor
 00:3317 ClearPalettes
@@ -1083,8 +1083,8 @@
 00:3856 GetBaseData
 00:387b GetBaseData.egg
 00:3890 GetBaseData.end
-00:389c GetCurNick
-00:38a2 GetNick
+00:389c GetCurNickname
+00:38a2 GetNickname
 00:38bb PrintBCDNumber
 00:38cd PrintBCDNumber.loop
 00:38e4 PrintBCDNumber.skipLeftAlignmentAdjustment
@@ -1948,7 +1948,7 @@
 01:7305 GiveShuckle
 01:736b GiveShuckle.NotGiven
 01:7370 SpecialShuckleOT
-01:7376 SpecialShuckleNick
+01:7376 SpecialShuckleNickname
 01:737e ReturnShuckie
 01:73af ReturnShuckie.CheckOT
 01:73bb ReturnShuckie.done
@@ -2034,11 +2034,11 @@
 02:44d3 QueueFollowerFirstStep.up
 02:44d7 QueueFollowerFirstStep.same_xy
 02:44d9 _Sine
-02:44e5 _Sine.negative_9295
-02:44ef _Sine.apply_9295
-02:44fe _Sine.multiply_9295
-02:4503 _Sine.even_9295
-02:450b _Sine.sinetable_9295
+02:44e5 _Sine.negative_9296
+02:44ef _Sine.apply_9296
+02:44fe _Sine.multiply_9296
+02:4503 _Sine.even_9296
+02:450b _Sine.sinetable_9296
 02:454b GetPredefPointer
 02:456b PredefPointers
 02:456b LearnMovePredef
@@ -2715,7 +2715,7 @@
 03:46ea FieldMoveJumptableReset
 03:46f5 FieldMoveJumptable
 03:4702 FieldMoveJumptable.okay
-03:4706 GetPartyNick
+03:4706 GetPartyNickname
 03:4721 CheckEngineFlag
 03:472f CheckEngineFlag.isset
 03:4731 CheckBadge
@@ -6557,7 +6557,7 @@
 0a:5461 TradeAnim_ShowGetmonData
 0a:5487 TradeAnim_AnimateFrontpic
 0a:5491 TradeAnim_GetFrontpic
-0a:54a9 TradeAnim_GetNickname
+0a:54a9 TradeAnim_GetNicknamename
 0a:54bb TradeAnim_ShowGivemonFrontpic
 0a:54c0 TradeAnim_ShowGetmonFrontpic
 0a:54c3 TradeAnim_ShowFrontpic
@@ -10625,11 +10625,11 @@
 12:5b2f UpdateCelebiPosition.done
 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition
 12:5b3b CelebiEvent_Cosine
-12:5b48 CelebiEvent_Cosine.negative_28910
-12:5b52 CelebiEvent_Cosine.apply_28910
-12:5b61 CelebiEvent_Cosine.multiply_28910
-12:5b66 CelebiEvent_Cosine.even_28910
-12:5b6e CelebiEvent_Cosine.sinetable_28910
+12:5b48 CelebiEvent_Cosine.negative_28911
+12:5b52 CelebiEvent_Cosine.apply_28911
+12:5b61 CelebiEvent_Cosine.multiply_28911
+12:5b66 CelebiEvent_Cosine.even_28911
+12:5b6e CelebiEvent_Cosine.sinetable_28911
 12:5bae GetCelebiSpriteTile
 12:5bd0 GetCelebiSpriteTile.Frame1
 12:5bd4 GetCelebiSpriteTile.Frame2
@@ -10930,16 +10930,16 @@
 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2
 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 13:4f91 SaveMenu_CopyTilemapAtOnce.loop
-13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39367
-13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39368
-13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39369
-13:4fad SaveMenu_CopyTilemapAtOnce.loop_39370
-13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39371
-13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39372
-13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39373
-13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39374
-13:4fda SaveMenu_CopyTilemapAtOnce.loop_39375
-13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39376
+13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39368
+13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39369
+13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39370
+13:4fad SaveMenu_CopyTilemapAtOnce.loop_39371
+13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39372
+13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39373
+13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39374
+13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39375
+13:4fda SaveMenu_CopyTilemapAtOnce.loop_39376
+13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39377
 13:4ffe CheckSave
 13:501b CheckSave.ok
 13:501e MapScenes
@@ -10954,16 +10954,16 @@
 13:51bd PhoneRing_CopyTilemapAtOnce.wait2
 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 13:51dc PhoneRing_CopyTilemapAtOnce.loop
-13:51dd PhoneRing_CopyTilemapAtOnce.loop_39538
-13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39539
-13:51ef PhoneRing_CopyTilemapAtOnce.loop_39540
-13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39541
-13:5201 PhoneRing_CopyTilemapAtOnce.loop_39542
-13:520a PhoneRing_CopyTilemapAtOnce.loop_39543
-13:5213 PhoneRing_CopyTilemapAtOnce.loop_39544
-13:521c PhoneRing_CopyTilemapAtOnce.loop_39545
-13:5225 PhoneRing_CopyTilemapAtOnce.loop_39546
-13:522e PhoneRing_CopyTilemapAtOnce.loop_39547
+13:51dd PhoneRing_CopyTilemapAtOnce.loop_39539
+13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39540
+13:51ef PhoneRing_CopyTilemapAtOnce.loop_39541
+13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39542
+13:5201 PhoneRing_CopyTilemapAtOnce.loop_39543
+13:520a PhoneRing_CopyTilemapAtOnce.loop_39544
+13:5213 PhoneRing_CopyTilemapAtOnce.loop_39545
+13:521c PhoneRing_CopyTilemapAtOnce.loop_39546
+13:5225 PhoneRing_CopyTilemapAtOnce.loop_39547
+13:522e PhoneRing_CopyTilemapAtOnce.loop_39548
 13:5249 Shrink1Pic
 13:52d9 Shrink2Pic
 13:5319 LinkMonStatsScreen
@@ -11199,7 +11199,7 @@
 13:6505 CopyNickname
 13:650d CopyNickname.okay
 13:6522 CopyNickname.partymon
-13:6528 GetNicknamePointer
+13:6528 GetNicknamenamePointer
 13:653f CheckFaintedFrzSlp
 13:6552 CheckFaintedFrzSlp.fainted_frz_slp
 13:6554 CatchTutorial
@@ -17223,11 +17223,11 @@
 23:46ef WipeLYOverrides.wipe
 23:46f2 WipeLYOverrides.loop
 23:46f7 StartTrainerBattle_DrawSineWave
-23:4702 StartTrainerBattle_DrawSineWave.negative_54409
-23:470c StartTrainerBattle_DrawSineWave.apply_54409
-23:471b StartTrainerBattle_DrawSineWave.multiply_54409
-23:4720 StartTrainerBattle_DrawSineWave.even_54409
-23:4728 StartTrainerBattle_DrawSineWave.sinetable_54409
+23:4702 StartTrainerBattle_DrawSineWave.negative_54410
+23:470c StartTrainerBattle_DrawSineWave.apply_54410
+23:471b StartTrainerBattle_DrawSineWave.multiply_54410
+23:4720 StartTrainerBattle_DrawSineWave.even_54410
+23:4728 StartTrainerBattle_DrawSineWave.sinetable_54410
 23:4768 StartTrainerBattle_ZoomToBlack
 23:4771 StartTrainerBattle_ZoomToBlack.loop
 23:478c StartTrainerBattle_ZoomToBlack.done
@@ -17584,11 +17584,11 @@
 23:672a Sprites_Cosine
 23:672a UnusedSpriteAnimGFX.DeletedGFX
 23:672c Sprites_Sine
-23:6737 Sprites_Sine.negative_55796
-23:6741 Sprites_Sine.apply_55796
-23:6750 Sprites_Sine.multiply_55796
-23:6755 Sprites_Sine.even_55796
-23:675d Sprites_Sine.sinetable_55796
+23:6737 Sprites_Sine.negative_55797
+23:6741 Sprites_Sine.apply_55797
+23:6750 Sprites_Sine.multiply_55797
+23:6755 Sprites_Sine.even_55797
+23:675d Sprites_Sine.sinetable_55797
 23:679d AnimateEndOfExpBar
 23:67a8 AnimateEndOfExpBar.load
 23:67b5 AnimateEndOfExpBar.loop
@@ -23933,10 +23933,10 @@
 33:672c BattleAnim_IncAnonJumptableIndex
 33:6732 BattleAnim_Cosine
 33:6734 BattleAnim_Sine
-33:673f BattleAnim_Sine.negative_69742
-33:6749 BattleAnim_Sine.apply_69742
-33:6758 BattleAnim_Sine.multiply_69742
-33:675d BattleAnim_Sine.even_69742
+33:673f BattleAnim_Sine.negative_69743
+33:6749 BattleAnim_Sine.apply_69743
+33:6758 BattleAnim_Sine.multiply_69743
+33:675d BattleAnim_Sine.even_69743
 33:6765 BattleAnim_Sine_e
 33:676b BattleAnim_Cosine_e
 33:6771 BattleAnim_AbsSinePrecise
@@ -27081,14 +27081,14 @@
 38:6d23 BillsPC_RefreshTextboxes.placeholder_string
 38:6d2a BillsPC_RefreshTextboxes.Placeholder
 38:6d30 CopyBoxmonSpecies
-38:6d57 CopyBoxmonSpecies.loop_76356
-38:6d79 CopyBoxmonSpecies.done_76356
+38:6d57 CopyBoxmonSpecies.loop_76357
+38:6d79 CopyBoxmonSpecies.done_76357
 38:6d87 CopyBoxmonSpecies.party
-38:6d8a CopyBoxmonSpecies.loop_76357
-38:6dac CopyBoxmonSpecies.done_76357
+38:6d8a CopyBoxmonSpecies.loop_76358
+38:6dac CopyBoxmonSpecies.done_76358
 38:6db7 CopyBoxmonSpecies.sBox
-38:6dbf CopyBoxmonSpecies.loop_76358
-38:6de1 CopyBoxmonSpecies.done_76358
+38:6dbf CopyBoxmonSpecies.loop_76359
+38:6de1 CopyBoxmonSpecies.done_76359
 38:6def BillsPC_GetSelectedPokemonSpecies
 38:6e01 BillsPC_UpdateSelectionCursor
 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor
@@ -29896,8 +29896,8 @@
 3e:77f2 CompareNewToOld.loop
 3e:77fe CompareNewToOld.different
 3e:7800 CompareNewToOld.terminator
-3e:7802 GetNicknameLength
-3e:7804 GetNicknameLength.loop
+3e:7802 GetNicknamenameLength
+3e:7804 GetNicknamenameLength.loop
 3e:780f NameRaterHelloText
 3e:7814 NameRaterWhichMonText
 3e:7819 NameRaterBetterNameText
@@ -42911,7 +42911,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
@@ -42920,7 +42920,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
@@ -42929,7 +42929,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
@@ -42938,7 +42938,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
@@ -42947,7 +42947,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
@@ -42956,7 +42956,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
@@ -42966,7 +42966,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
@@ -42975,7 +42975,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
@@ -42984,7 +42984,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
@@ -42993,7 +42993,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
@@ -43002,7 +43002,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
@@ -43011,7 +43011,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
@@ -43022,7 +43022,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
@@ -43031,7 +43031,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
@@ -43040,7 +43040,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
@@ -43049,7 +43049,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
@@ -43058,7 +43058,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
@@ -43067,7 +43067,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
@@ -43076,7 +43076,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
@@ -43085,7 +43085,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
@@ -43094,7 +43094,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
@@ -43103,7 +43103,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
@@ -43114,7 +43114,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
@@ -43123,7 +43123,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
@@ -43132,7 +43132,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
@@ -43141,7 +43141,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
@@ -43150,7 +43150,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
@@ -43159,7 +43159,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
@@ -43168,7 +43168,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
@@ -43177,7 +43177,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
@@ -43186,7 +43186,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
@@ -43195,7 +43195,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
@@ -43263,7 +43263,7 @@
 01:ad45 sBoxMon1Level
 01:ad46 sBoxMon1BoxEnd
 01:ad46 sBoxMon2
-01:afa6 sBoxMonOT
+01:afa6 sBoxMonOTs
 01:b082 sBoxMonNicknames
 01:b15e sBoxMonNicknamesEnd
 01:b15e sBoxEnd
@@ -44704,7 +44704,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
@@ -44736,7 +44736,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
@@ -44768,7 +44768,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
@@ -44800,7 +44800,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
@@ -44832,7 +44832,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
@@ -44864,7 +44864,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
@@ -44896,7 +44896,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
@@ -44928,7 +44928,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
@@ -44960,7 +44960,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
@@ -44992,7 +44992,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
@@ -45024,7 +45024,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
@@ -45056,7 +45056,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
@@ -45088,7 +45088,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
@@ -45120,7 +45120,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
@@ -46112,7 +46112,7 @@
 00:c615 wOddEggAtkExp
 00:c615 wBT_OTTempMon1Moves
 00:c615 wPlayerMoveStructEffectChance
-00:c616 wEnemyMonNick
+00:c616 wEnemyMonNickname
 00:c617 wOddEggDefExp
 00:c618 wc618
 00:c619 wHallOfFameTempMon2
@@ -46132,7 +46132,7 @@
 00:c61f wHallOfFameTempMon2Nickname
 00:c61f wOddEggPP
 00:c620 wBT_OTTempMon1AtkExp
-00:c621 wBattleMonNick
+00:c621 wBattleMonNickname
 00:c622 wBT_OTTempMon1DefExp
 00:c623 wOddEggHappiness
 00:c624 wBT_OTTempMon1SpdExp
@@ -46210,7 +46210,7 @@
 00:c641 wBT_OTTempMon1SpclDef
 00:c642 wc642
 00:c642 wBattleMonDefense
-00:c643 wOddEggOTName
+00:c643 wOddEggOT
 00:c643 wBT_OTTempMon1Name
 00:c643 wBT_OTTempMon1StructEnd
 00:c644 wBattleMonSpeed
@@ -46696,7 +46696,7 @@
 00:c81e wLinkPlayerPartyMon1StatExp
 00:c81e wLinkPlayerPartyMon1HPExp
 00:c81e wMobileSDK_SendCommandID
-00:c81f wTimeCapsulePartyMon1OTID
+00:c81f wTimeCapsulePartyMon1ID
 00:c820 wLinkPlayerPartyMon1AtkExp
 00:c821 wTimeCapsulePartyMon1Exp
 00:c821 wHallOfFamePokemonListMon2End
@@ -46777,7 +46777,7 @@
 00:c847 wTimeCapsulePartyMon2Moves
 00:c849 wLinkPlayerPartyMon2ID
 00:c84b wLinkPlayerPartyMon2Exp
-00:c84b wTimeCapsulePartyMon2OTID
+00:c84b wTimeCapsulePartyMon2ID
 00:c84d wTimeCapsulePartyMon2Exp
 00:c84e wLinkPlayerPartyMon2HPExp
 00:c84e wLinkPlayerPartyMon2StatExp
@@ -46849,7 +46849,7 @@
 00:c874 wNameCardDataEnd
 00:c875 wLinkPlayerPartyMon3Moves
 00:c876 wMysteryGiftTrainerEnd
-00:c877 wTimeCapsulePartyMon3OTID
+00:c877 wTimeCapsulePartyMon3ID
 00:c879 wTimeCapsulePartyMon3Exp
 00:c879 wLinkPlayerPartyMon3ID
 00:c87b wLinkPlayerPartyMon3Exp
@@ -46905,9 +46905,9 @@
 00:c89f wLinkPlayerPartyMon3SpclAtk
 00:c8a1 wLinkPlayerPartyMon3SpclDef
 00:c8a3 wLinkPlayerPartyMon4Species
+00:c8a3 wTimeCapsulePartyMon4ID
 00:c8a3 wLinkPlayerPartyMon3StructEnd
 00:c8a3 wLinkPlayerPartyMon4
-00:c8a3 wTimeCapsulePartyMon4OTID
 00:c8a4 wLinkPlayerPartyMon4Item
 00:c8a5 wLinkPlayerPartyMon4Moves
 00:c8a5 wTimeCapsulePartyMon4Exp
@@ -46963,7 +46963,7 @@
 00:c8cb wLinkPlayerPartyMon4Defense
 00:c8cd wLinkPlayerPartyMon4Speed
 00:c8cf wLinkPlayerPartyMon4SpclAtk
-00:c8cf wTimeCapsulePartyMon5OTID
+00:c8cf wTimeCapsulePartyMon5ID
 00:c8d1 wLinkPlayerPartyMon4SpclDef
 00:c8d1 wTimeCapsulePartyMon5Exp
 00:c8d3 wLinkPlayerPartyMon5Species
@@ -47021,7 +47021,7 @@
 00:c8f9 wLinkPlayerPartyMon5Attack
 00:c8f9 wLinkPlayerPartyMon5Stats
 00:c8fb wLinkPlayerPartyMon5Defense
-00:c8fb wTimeCapsulePartyMon6OTID
+00:c8fb wTimeCapsulePartyMon6ID
 00:c8fd wTimeCapsulePartyMon6Exp
 00:c8fd wLinkPlayerPartyMon5Speed
 00:c8ff wLinkPlayerPartyMon5SpclAtk
@@ -47066,7 +47066,8 @@
 00:c918 wLinkPlayerPartyMon6DVs
 00:c919 wTimeCapsulePartyMon6Special
 00:c91a wLinkPlayerPartyMon6PP
-00:c91b wTimeCapsulePartyMonOTNames
+00:c91b wTimeCapsulePartyMonOTs
+00:c91b wTimeCapsulePartyMon1OT
 00:c91e wLinkPlayerPartyMon6Happiness
 00:c91f wLinkPlayerPartyMon6PokerusStatus
 00:c920 wLinkPlayerPartyMon6CaughtLevel
@@ -47079,26 +47080,49 @@
 00:c923 wLinkPlayerPartyMon6BoxEnd
 00:c924 wLinkPlayerPartyMon6Unused
 00:c925 wLinkPlayerPartyMon6HP
+00:c926 wTimeCapsulePartyMon2OT
 00:c927 wLinkPlayerPartyMon6MaxHP
 00:c929 wLinkPlayerPartyMon6Stats
 00:c929 wLinkPlayerPartyMon6Attack
 00:c92b wLinkPlayerPartyMon6Defense
 00:c92d wLinkPlayerPartyMon6Speed
 00:c92f wLinkPlayerPartyMon6SpclAtk
+00:c931 wTimeCapsulePartyMon3OT
 00:c931 wLinkPlayerPartyMon6SpclDef
-00:c933 wLinkPlayerPartyMonOTNames
+00:c933 wLinkPlayerPartyMon1OT
+00:c933 wLinkPlayerPartyMonOTs
 00:c933 wLinkPlayerPartyMon6StructEnd
+00:c93c wTimeCapsulePartyMon4OT
+00:c93e wLinkPlayerPartyMon2OT
+00:c947 wTimeCapsulePartyMon5OT
+00:c949 wLinkPlayerPartyMon3OT
 00:c950 wMysteryGiftPlayerData
 00:c951 wMysteryGiftPlayerID
+00:c952 wTimeCapsulePartyMon6OT
 00:c953 wMysteryGiftPlayerName
-00:c95d wTimeCapsulePartyMonNicks
+00:c954 wLinkPlayerPartyMon4OT
+00:c95d wTimeCapsulePartyMonNicknames
+00:c95d wTimeCapsulePartyMon1Nickname
 00:c95e wMysteryGiftPlayerDexCaught
 00:c95f wMysteryGiftPlayerSentDeco
+00:c95f wLinkPlayerPartyMon5OT
 00:c960 wMysteryGiftPlayerWhichItem
 00:c961 wMysteryGiftPlayerWhichDeco
 00:c962 wMysteryGiftPlayerBackupItem
 00:c964 wMysteryGiftPlayerDataEnd
-00:c975 wLinkPlayerPartyMonNicks
+00:c968 wTimeCapsulePartyMon2Nickname
+00:c96a wLinkPlayerPartyMon6OT
+00:c973 wTimeCapsulePartyMon3Nickname
+00:c975 wLinkPlayerPartyMonNicknames
+00:c975 wLinkPlayerPartyMon1Nickname
+00:c97e wTimeCapsulePartyMon4Nickname
+00:c980 wLinkPlayerPartyMon2Nickname
+00:c989 wTimeCapsulePartyMon5Nickname
+00:c98b wLinkPlayerPartyMon3Nickname
+00:c994 wTimeCapsulePartyMon6Nickname
+00:c996 wLinkPlayerPartyMon4Nickname
+00:c9a1 wLinkPlayerPartyMon5Nickname
+00:c9ac wLinkPlayerPartyMon6Nickname
 00:c9f4 wLinkPlayerMail
 00:c9f4 wLinkReceivedMail
 00:c9f4 wLinkPlayerMailPreamble
@@ -47142,6 +47166,12 @@
 00:cb84 wLinkOTMailMessages
 00:cbe8 wCurLinkOTPartyMonTypePointer
 00:cbea wLinkOTPartyMonTypes
+00:cbea wLinkOTPartyMon1Type
+00:cbec wLinkOTPartyMon2Type
+00:cbee wLinkOTPartyMon3Type
+00:cbf0 wLinkOTPartyMon4Type
+00:cbf2 wLinkOTPartyMon5Type
+00:cbf4 wLinkOTPartyMon6Type
 00:cbf8 wPrinterStatus
 00:cbfa wPrinterMargins
 00:cbfb wPrinterExposureTime
@@ -47170,7 +47200,7 @@
 00:cd22 wMobileMonStructPointer
 00:cd22 wCreditsTimer
 00:cd23 wcd23
-00:cd24 wMobileMonOTNamePointer
+00:cd24 wMobileMonOTPointer
 00:cd24 wcd24
 00:cd25 wMobileCommsJumptableIndex
 00:cd26 wMobileMonNicknamePointer
@@ -47454,7 +47484,6 @@
 01:d002 wEarthquakeMovementDataBuffer
 01:d002 wMonMailMessageBuffer
 01:d002 wSuicuneFrame
-01:d002 wBufferMonNick
 01:d002 wLinkBattleRecordBuffer
 01:d002 wPokeFluteCuredSleep
 01:d002 wDebugColorIsTrainer
@@ -47487,6 +47516,7 @@
 01:d002 wNumOwnedDecoCategories
 01:d002 wMartItem1BCD
 01:d002 wTownMapPlayerIconLandmark
+01:d002 wBufferMonNickname
 01:d003 wPlaceBallsDirection
 01:d003 wMovementBufferObject
 01:d003 wNextRadioLine
@@ -47502,10 +47532,10 @@
 01:d003 wSeerNickname
 01:d003 wTempPokedexCaughtCount
 01:d003 wTownMapCursorCoordinates
+01:d004 wBufferTrademonNickname
 01:d004 wRadioTextDelay
 01:d004 wDebugColorCurTMHM
 01:d004 wBugContestFirstPlaceScore
-01:d004 wBufferTrademonNick
 01:d004 wTownMapCursorObjectPointer
 01:d004 wTrainerHUDTiles
 01:d004 wd004
@@ -47573,9 +47603,9 @@
 01:d025 wBufferMonAtkExp
 01:d027 wBufferMonDefExp
 01:d029 wBufferMonSpdExp
-01:d02a wSeerOTName
+01:d02a wSeerOT
 01:d02b wBufferMonSpcExp
-01:d02b wTempMailAuthorNationality
+01:d02b wTempMailNationality
 01:d02d wd02d
 01:d02d wTempMailAuthorID
 01:d02d wBufferMonDVs
@@ -47592,8 +47622,8 @@
 01:d033 wd033
 01:d034 wBufferMonPokerusStatus
 01:d034 wd034
+01:d035 wSeerOTGrammar
 01:d035 wBufferMonCaughtLevel
-01:d035 wSeerOTNameGrammar
 01:d035 wBufferMonCaughtData
 01:d035 wBufferMonCaughtTime
 01:d036 wBufferMonCaughtLocation
@@ -48270,10 +48300,21 @@
 01:d3a2 wOTPartyMon6Speed
 01:d3a4 wOTPartyMon6SpclAtk
 01:d3a6 wOTPartyMon6SpclDef
-01:d3a8 wOTPartyMonsEnd
-01:d3a8 wOTPartyMonOT
+01:d3a8 wOTPartyMonOTs
+01:d3a8 wOTPartyMon1OT
 01:d3a8 wOTPartyMon6StructEnd
+01:d3b3 wOTPartyMon2OT
+01:d3be wOTPartyMon3OT
+01:d3c9 wOTPartyMon4OT
+01:d3d4 wOTPartyMon5OT
+01:d3df wOTPartyMon6OT
 01:d3ea wOTPartyMonNicknames
+01:d3ea wOTPartyMon1Nickname
+01:d3f5 wOTPartyMon2Nickname
+01:d400 wOTPartyMon3Nickname
+01:d40b wOTPartyMon4Nickname
+01:d416 wOTPartyMon5Nickname
+01:d421 wOTPartyMon6Nickname
 01:d42c wOTPartyDataEnd
 01:d430 wd430
 01:d430 wBattleAction
@@ -49436,8 +49477,20 @@
 01:ddfb wPartyMon6SpclAtk
 01:ddfd wPartyMon6SpclDef
 01:ddff wPartyMon6StructEnd
-01:ddff wPartyMonOT
+01:ddff wPartyMon1OT
+01:ddff wPartyMonOTs
+01:de0a wPartyMon2OT
+01:de15 wPartyMon3OT
+01:de20 wPartyMon4OT
+01:de2b wPartyMon5OT
+01:de36 wPartyMon6OT
 01:de41 wPartyMonNicknames
+01:de41 wPartyMon1Nickname
+01:de4c wPartyMon2Nickname
+01:de57 wPartyMon3Nickname
+01:de62 wPartyMon4Nickname
+01:de6d wPartyMon5Nickname
+01:de78 wPartyMon6Nickname
 01:de83 wPartyMonNicknamesEnd
 01:de99 wPokedexCaught
 01:deb9 wEndPokedexCaught
@@ -49447,7 +49500,7 @@
 01:def3 wUnlockedUnowns
 01:def4 wFirstUnownSeen
 01:def5 wDayCareMan
-01:def6 wBreedMon1Nick
+01:def6 wBreedMon1Nickname
 01:df01 wBreedMon1OT
 01:df0c wBreedMon1
 01:df0c wBreedMon1Species
@@ -49475,7 +49528,7 @@
 01:df2c wBreedMon1BoxEnd
 01:df2d wStepsToEgg
 01:df2e wBreedMotherOrNonDitto
-01:df2f wBreedMon2Nick
+01:df2f wBreedMon2Nickname
 01:df3a wBreedMon2OT
 01:df45 wBreedMon2Species
 01:df45 wBreedMon2
@@ -49499,9 +49552,9 @@
 01:df63 wBreedMon2CaughtLocation
 01:df63 wBreedMon2CaughtGender
 01:df64 wBreedMon2Level
-01:df65 wEggNick
+01:df65 wEggMonNickname
 01:df65 wBreedMon2BoxEnd
-01:df70 wEggOT
+01:df70 wEggMonOT
 01:df7b wEggMonSpecies
 01:df7b wEggMon
 01:df7c wEggMonItem
@@ -50580,7 +50633,7 @@
 05:d30a wActiveAnimObjects
 05:d30a wAnimObject01
 05:d30b wAnimObject01OAMFlags
-05:d30c wAnimObject01Field02
+05:d30c wAnimObject01FixY
 05:d30d wAnimObject01FramesetID
 05:d30e wAnimObject01Function
 05:d30f wAnimObject01Palette
@@ -50598,7 +50651,7 @@
 05:d322 wAnimObject02Index
 05:d322 wAnimObject02
 05:d323 wAnimObject02OAMFlags
-05:d324 wAnimObject02Field02
+05:d324 wAnimObject02FixY
 05:d325 wAnimObject02FramesetID
 05:d326 wAnimObject02Function
 05:d327 wAnimObject02Palette
@@ -50616,7 +50669,7 @@
 05:d33a wAnimObject03Index
 05:d33a wAnimObject03
 05:d33b wAnimObject03OAMFlags
-05:d33c wAnimObject03Field02
+05:d33c wAnimObject03FixY
 05:d33d wAnimObject03FramesetID
 05:d33e wAnimObject03Function
 05:d33f wAnimObject03Palette
@@ -50634,7 +50687,7 @@
 05:d352 wAnimObject04
 05:d352 wAnimObject04Index
 05:d353 wAnimObject04OAMFlags
-05:d354 wAnimObject04Field02
+05:d354 wAnimObject04FixY
 05:d355 wAnimObject04FramesetID
 05:d356 wAnimObject04Function
 05:d357 wAnimObject04Palette
@@ -50652,7 +50705,7 @@
 05:d36a wAnimObject05Index
 05:d36a wAnimObject05
 05:d36b wAnimObject05OAMFlags
-05:d36c wAnimObject05Field02
+05:d36c wAnimObject05FixY
 05:d36d wAnimObject05FramesetID
 05:d36e wAnimObject05Function
 05:d36f wAnimObject05Palette
@@ -50670,7 +50723,7 @@
 05:d382 wAnimObject06Index
 05:d382 wAnimObject06
 05:d383 wAnimObject06OAMFlags
-05:d384 wAnimObject06Field02
+05:d384 wAnimObject06FixY
 05:d385 wAnimObject06FramesetID
 05:d386 wAnimObject06Function
 05:d387 wAnimObject06Palette
@@ -50688,7 +50741,7 @@
 05:d39a wAnimObject07Index
 05:d39a wAnimObject07
 05:d39b wAnimObject07OAMFlags
-05:d39c wAnimObject07Field02
+05:d39c wAnimObject07FixY
 05:d39d wAnimObject07FramesetID
 05:d39e wAnimObject07Function
 05:d39f wAnimObject07Palette
@@ -50706,7 +50759,7 @@
 05:d3b2 wAnimObject08Index
 05:d3b2 wAnimObject08
 05:d3b3 wAnimObject08OAMFlags
-05:d3b4 wAnimObject08Field02
+05:d3b4 wAnimObject08FixY
 05:d3b5 wAnimObject08FramesetID
 05:d3b6 wAnimObject08Function
 05:d3b7 wAnimObject08Palette
@@ -50724,7 +50777,7 @@
 05:d3ca wAnimObject09
 05:d3ca wAnimObject09Index
 05:d3cb wAnimObject09OAMFlags
-05:d3cc wAnimObject09Field02
+05:d3cc wAnimObject09FixY
 05:d3cd wAnimObject09FramesetID
 05:d3ce wAnimObject09Function
 05:d3cf wAnimObject09Palette
@@ -50742,7 +50795,7 @@
 05:d3e2 wAnimObject10Index
 05:d3e2 wAnimObject10
 05:d3e3 wAnimObject10OAMFlags
-05:d3e4 wAnimObject10Field02
+05:d3e4 wAnimObject10FixY
 05:d3e5 wAnimObject10FramesetID
 05:d3e6 wAnimObject10Function
 05:d3e7 wAnimObject10Palette

pokecrystal_debug.sym

@@ -289,7 +289,7 @@
 00:1082 DummyChar
 00:1083 NextChar
 00:1087 CheckDict
-00:1122 CheckDict.__8442
+00:1122 CheckDict.__8443
 00:1145 CheckDict.diacritic
 00:114c CheckDict.not_diacritic
 00:115c CheckDict.hiragana_dakuten
@@ -627,9 +627,9 @@
 00:21a5 LoadMetatiles.row
 00:21a9 LoadMetatiles.col
 00:21b2 LoadMetatiles.ok
-00:21d8 LoadMetatiles.next_8607
-00:21eb LoadMetatiles.next_8612
-00:21fe LoadMetatiles.next_8617
+00:21d8 LoadMetatiles.next_8608
+00:21eb LoadMetatiles.next_8613
+00:21fe LoadMetatiles.next_8618
 00:2225 LoadMetatiles.ok2
 00:222a ReturnToMapFromSubmenu
 00:2238 CheckWarpTile
@@ -962,16 +962,16 @@
 00:329b _CopyTilemapAtOnce.wait2
 00:32a9 _CopyTilemapAtOnce.CopyBGMapViaStack
 00:32ba _CopyTilemapAtOnce.loop
-00:32bb _CopyTilemapAtOnce.loop_8695
-00:32c4 _CopyTilemapAtOnce.loop_8696
-00:32cd _CopyTilemapAtOnce.loop_8697
-00:32d6 _CopyTilemapAtOnce.loop_8698
-00:32df _CopyTilemapAtOnce.loop_8699
-00:32e8 _CopyTilemapAtOnce.loop_8700
-00:32f1 _CopyTilemapAtOnce.loop_8701
-00:32fa _CopyTilemapAtOnce.loop_8702
-00:3303 _CopyTilemapAtOnce.loop_8703
-00:330c _CopyTilemapAtOnce.loop_8704
+00:32bb _CopyTilemapAtOnce.loop_8696
+00:32c4 _CopyTilemapAtOnce.loop_8697
+00:32cd _CopyTilemapAtOnce.loop_8698
+00:32d6 _CopyTilemapAtOnce.loop_8699
+00:32df _CopyTilemapAtOnce.loop_8700
+00:32e8 _CopyTilemapAtOnce.loop_8701
+00:32f1 _CopyTilemapAtOnce.loop_8702
+00:32fa _CopyTilemapAtOnce.loop_8703
+00:3303 _CopyTilemapAtOnce.loop_8704
+00:330c _CopyTilemapAtOnce.loop_8705
 00:3327 SetPalettes
 00:3337 SetPalettes.SetPalettesForGameBoyColor
 00:3345 ClearPalettes
@@ -1086,8 +1086,8 @@
 00:3884 GetBaseData
 00:38a9 GetBaseData.egg
 00:38be GetBaseData.end
-00:38ca GetCurNick
-00:38d0 GetNick
+00:38ca GetCurNickname
+00:38d0 GetNickname
 00:38e9 PrintBCDNumber
 00:38fb PrintBCDNumber.loop
 00:3912 PrintBCDNumber.skipLeftAlignmentAdjustment
@@ -1952,7 +1952,7 @@
 01:730c GiveShuckle
 01:7372 GiveShuckle.NotGiven
 01:7377 SpecialShuckleOT
-01:737d SpecialShuckleNick
+01:737d SpecialShuckleNickname
 01:7385 ReturnShuckie
 01:73b6 ReturnShuckie.CheckOT
 01:73c2 ReturnShuckie.done
@@ -2038,11 +2038,11 @@
 02:44d3 QueueFollowerFirstStep.up
 02:44d7 QueueFollowerFirstStep.same_xy
 02:44d9 _Sine
-02:44e5 _Sine.negative_9296
-02:44ef _Sine.apply_9296
-02:44fe _Sine.multiply_9296
-02:4503 _Sine.even_9296
-02:450b _Sine.sinetable_9296
+02:44e5 _Sine.negative_9297
+02:44ef _Sine.apply_9297
+02:44fe _Sine.multiply_9297
+02:4503 _Sine.even_9297
+02:450b _Sine.sinetable_9297
 02:454b GetPredefPointer
 02:456b PredefPointers
 02:456b LearnMovePredef
@@ -2719,7 +2719,7 @@
 03:46ea FieldMoveJumptableReset
 03:46f5 FieldMoveJumptable
 03:4702 FieldMoveJumptable.okay
-03:4706 GetPartyNick
+03:4706 GetPartyNickname
 03:4721 CheckEngineFlag
 03:472f CheckEngineFlag.isset
 03:4731 CheckBadge
@@ -6562,7 +6562,7 @@
 0a:5461 TradeAnim_ShowGetmonData
 0a:5487 TradeAnim_AnimateFrontpic
 0a:5491 TradeAnim_GetFrontpic
-0a:54a9 TradeAnim_GetNickname
+0a:54a9 TradeAnim_GetNicknamename
 0a:54bb TradeAnim_ShowGivemonFrontpic
 0a:54c0 TradeAnim_ShowGetmonFrontpic
 0a:54c3 TradeAnim_ShowFrontpic
@@ -10631,11 +10631,11 @@
 12:5b2f UpdateCelebiPosition.done
 12:5b30 UpdateCelebiPosition.FreezeCelebiPosition
 12:5b3b CelebiEvent_Cosine
-12:5b48 CelebiEvent_Cosine.negative_28911
-12:5b52 CelebiEvent_Cosine.apply_28911
-12:5b61 CelebiEvent_Cosine.multiply_28911
-12:5b66 CelebiEvent_Cosine.even_28911
-12:5b6e CelebiEvent_Cosine.sinetable_28911
+12:5b48 CelebiEvent_Cosine.negative_28912
+12:5b52 CelebiEvent_Cosine.apply_28912
+12:5b61 CelebiEvent_Cosine.multiply_28912
+12:5b66 CelebiEvent_Cosine.even_28912
+12:5b6e CelebiEvent_Cosine.sinetable_28912
 12:5bae GetCelebiSpriteTile
 12:5bd0 GetCelebiSpriteTile.Frame1
 12:5bd4 GetCelebiSpriteTile.Frame2
@@ -10937,16 +10937,16 @@
 13:4f72 SaveMenu_CopyTilemapAtOnce.wait2
 13:4f80 SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
 13:4f91 SaveMenu_CopyTilemapAtOnce.loop
-13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39369
-13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39370
-13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39371
-13:4fad SaveMenu_CopyTilemapAtOnce.loop_39372
-13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39373
-13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39374
-13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39375
-13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39376
-13:4fda SaveMenu_CopyTilemapAtOnce.loop_39377
-13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39378
+13:4f92 SaveMenu_CopyTilemapAtOnce.loop_39370
+13:4f9b SaveMenu_CopyTilemapAtOnce.loop_39371
+13:4fa4 SaveMenu_CopyTilemapAtOnce.loop_39372
+13:4fad SaveMenu_CopyTilemapAtOnce.loop_39373
+13:4fb6 SaveMenu_CopyTilemapAtOnce.loop_39374
+13:4fbf SaveMenu_CopyTilemapAtOnce.loop_39375
+13:4fc8 SaveMenu_CopyTilemapAtOnce.loop_39376
+13:4fd1 SaveMenu_CopyTilemapAtOnce.loop_39377
+13:4fda SaveMenu_CopyTilemapAtOnce.loop_39378
+13:4fe3 SaveMenu_CopyTilemapAtOnce.loop_39379
 13:4ffe CheckSave
 13:501b CheckSave.ok
 13:501e MapScenes
@@ -10961,16 +10961,16 @@
 13:51bd PhoneRing_CopyTilemapAtOnce.wait2
 13:51cb PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
 13:51dc PhoneRing_CopyTilemapAtOnce.loop
-13:51dd PhoneRing_CopyTilemapAtOnce.loop_39540
-13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39541
-13:51ef PhoneRing_CopyTilemapAtOnce.loop_39542
-13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39543
-13:5201 PhoneRing_CopyTilemapAtOnce.loop_39544
-13:520a PhoneRing_CopyTilemapAtOnce.loop_39545
-13:5213 PhoneRing_CopyTilemapAtOnce.loop_39546
-13:521c PhoneRing_CopyTilemapAtOnce.loop_39547
-13:5225 PhoneRing_CopyTilemapAtOnce.loop_39548
-13:522e PhoneRing_CopyTilemapAtOnce.loop_39549
+13:51dd PhoneRing_CopyTilemapAtOnce.loop_39541
+13:51e6 PhoneRing_CopyTilemapAtOnce.loop_39542
+13:51ef PhoneRing_CopyTilemapAtOnce.loop_39543
+13:51f8 PhoneRing_CopyTilemapAtOnce.loop_39544
+13:5201 PhoneRing_CopyTilemapAtOnce.loop_39545
+13:520a PhoneRing_CopyTilemapAtOnce.loop_39546
+13:5213 PhoneRing_CopyTilemapAtOnce.loop_39547
+13:521c PhoneRing_CopyTilemapAtOnce.loop_39548
+13:5225 PhoneRing_CopyTilemapAtOnce.loop_39549
+13:522e PhoneRing_CopyTilemapAtOnce.loop_39550
 13:5249 Shrink1Pic
 13:52d9 Shrink2Pic
 13:5319 LinkMonStatsScreen
@@ -11211,7 +11211,7 @@
 13:6564 CopyNickname
 13:656c CopyNickname.okay
 13:6581 CopyNickname.partymon
-13:6587 GetNicknamePointer
+13:6587 GetNicknamenamePointer
 13:659e CheckFaintedFrzSlp
 13:65b1 CheckFaintedFrzSlp.fainted_frz_slp
 13:65b3 CatchTutorial
@@ -17235,11 +17235,11 @@
 23:46ef WipeLYOverrides.wipe
 23:46f2 WipeLYOverrides.loop
 23:46f7 StartTrainerBattle_DrawSineWave
-23:4702 StartTrainerBattle_DrawSineWave.negative_54413
-23:470c StartTrainerBattle_DrawSineWave.apply_54413
-23:471b StartTrainerBattle_DrawSineWave.multiply_54413
-23:4720 StartTrainerBattle_DrawSineWave.even_54413
-23:4728 StartTrainerBattle_DrawSineWave.sinetable_54413
+23:4702 StartTrainerBattle_DrawSineWave.negative_54414
+23:470c StartTrainerBattle_DrawSineWave.apply_54414
+23:471b StartTrainerBattle_DrawSineWave.multiply_54414
+23:4720 StartTrainerBattle_DrawSineWave.even_54414
+23:4728 StartTrainerBattle_DrawSineWave.sinetable_54414
 23:4768 StartTrainerBattle_ZoomToBlack
 23:4771 StartTrainerBattle_ZoomToBlack.loop
 23:478c StartTrainerBattle_ZoomToBlack.done
@@ -17596,11 +17596,11 @@
 23:672a Sprites_Cosine
 23:672a UnusedSpriteAnimGFX.DeletedGFX
 23:672c Sprites_Sine
-23:6737 Sprites_Sine.negative_55800
-23:6741 Sprites_Sine.apply_55800
-23:6750 Sprites_Sine.multiply_55800
-23:6755 Sprites_Sine.even_55800
-23:675d Sprites_Sine.sinetable_55800
+23:6737 Sprites_Sine.negative_55801
+23:6741 Sprites_Sine.apply_55801
+23:6750 Sprites_Sine.multiply_55801
+23:6755 Sprites_Sine.even_55801
+23:675d Sprites_Sine.sinetable_55801
 23:679d AnimateEndOfExpBar
 23:67a8 AnimateEndOfExpBar.load
 23:67b5 AnimateEndOfExpBar.loop
@@ -23945,10 +23945,10 @@
 33:672c BattleAnim_IncAnonJumptableIndex
 33:6732 BattleAnim_Cosine
 33:6734 BattleAnim_Sine
-33:673f BattleAnim_Sine.negative_69746
-33:6749 BattleAnim_Sine.apply_69746
-33:6758 BattleAnim_Sine.multiply_69746
-33:675d BattleAnim_Sine.even_69746
+33:673f BattleAnim_Sine.negative_69747
+33:6749 BattleAnim_Sine.apply_69747
+33:6758 BattleAnim_Sine.multiply_69747
+33:675d BattleAnim_Sine.even_69747
 33:6765 BattleAnim_Sine_e
 33:676b BattleAnim_Cosine_e
 33:6771 BattleAnim_AbsSinePrecise
@@ -27093,14 +27093,14 @@
 38:6d23 BillsPC_RefreshTextboxes.placeholder_string
 38:6d2a BillsPC_RefreshTextboxes.Placeholder
 38:6d30 CopyBoxmonSpecies
-38:6d57 CopyBoxmonSpecies.loop_76360
-38:6d79 CopyBoxmonSpecies.done_76360
+38:6d57 CopyBoxmonSpecies.loop_76361
+38:6d79 CopyBoxmonSpecies.done_76361
 38:6d87 CopyBoxmonSpecies.party
-38:6d8a CopyBoxmonSpecies.loop_76361
-38:6dac CopyBoxmonSpecies.done_76361
+38:6d8a CopyBoxmonSpecies.loop_76362
+38:6dac CopyBoxmonSpecies.done_76362
 38:6db7 CopyBoxmonSpecies.sBox
-38:6dbf CopyBoxmonSpecies.loop_76362
-38:6de1 CopyBoxmonSpecies.done_76362
+38:6dbf CopyBoxmonSpecies.loop_76363
+38:6de1 CopyBoxmonSpecies.done_76363
 38:6def BillsPC_GetSelectedPokemonSpecies
 38:6e01 BillsPC_UpdateSelectionCursor
 38:6e0b BillsPC_UpdateSelectionCursor.place_cursor
@@ -29908,8 +29908,8 @@
 3e:77f2 CompareNewToOld.loop
 3e:77fe CompareNewToOld.different
 3e:7800 CompareNewToOld.terminator
-3e:7802 GetNicknameLength
-3e:7804 GetNicknameLength.loop
+3e:7802 GetNicknamenameLength
+3e:7804 GetNicknamenameLength.loop
 3e:780f NameRaterHelloText
 3e:7814 NameRaterWhichMonText
 3e:7819 NameRaterBetterNameText
@@ -43131,7 +43131,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
@@ -43140,7 +43140,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
@@ -43149,7 +43149,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
@@ -43158,7 +43158,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
@@ -43167,7 +43167,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
@@ -43176,7 +43176,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
@@ -43186,7 +43186,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
@@ -43195,7 +43195,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
@@ -43204,7 +43204,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
@@ -43213,7 +43213,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
@@ -43222,7 +43222,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
@@ -43231,7 +43231,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
@@ -43242,7 +43242,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
@@ -43251,7 +43251,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
@@ -43260,7 +43260,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
@@ -43269,7 +43269,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
@@ -43278,7 +43278,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
@@ -43287,7 +43287,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
@@ -43296,7 +43296,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
@@ -43305,7 +43305,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
@@ -43314,7 +43314,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
@@ -43323,7 +43323,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
@@ -43334,7 +43334,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
@@ -43343,7 +43343,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
@@ -43352,7 +43352,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
@@ -43361,7 +43361,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
@@ -43370,7 +43370,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
@@ -43379,7 +43379,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
@@ -43388,7 +43388,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
@@ -43397,7 +43397,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
@@ -43406,7 +43406,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
@@ -43415,7 +43415,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
@@ -43488,7 +43488,7 @@
 01:ad45 sBoxMon1Level
 01:ad46 sBoxMon1BoxEnd
 01:ad46 sBoxMon2
-01:afa6 sBoxMonOT
+01:afa6 sBoxMonOTs
 01:b082 sBoxMonNicknames
 01:b15e sBoxMonNicknamesEnd
 01:b15e sBoxEnd
@@ -44929,7 +44929,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
@@ -44961,7 +44961,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
@@ -44993,7 +44993,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
@@ -45025,7 +45025,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
@@ -45057,7 +45057,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
@@ -45089,7 +45089,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
@@ -45121,7 +45121,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
@@ -45153,7 +45153,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
@@ -45185,7 +45185,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
@@ -45217,7 +45217,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
@@ -45249,7 +45249,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
@@ -45281,7 +45281,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
@@ -45313,7 +45313,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
@@ -45345,7 +45345,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
@@ -46337,7 +46337,7 @@
 00:c615 wOddEggAtkExp
 00:c615 wBT_OTTempMon1Moves
 00:c615 wPlayerMoveStructEffectChance
-00:c616 wEnemyMonNick
+00:c616 wEnemyMonNickname
 00:c617 wOddEggDefExp
 00:c618 wc618
 00:c619 wHallOfFameTempMon2
@@ -46357,7 +46357,7 @@
 00:c61f wHallOfFameTempMon2Nickname
 00:c61f wOddEggPP
 00:c620 wBT_OTTempMon1AtkExp
-00:c621 wBattleMonNick
+00:c621 wBattleMonNickname
 00:c622 wBT_OTTempMon1DefExp
 00:c623 wOddEggHappiness
 00:c624 wBT_OTTempMon1SpdExp
@@ -46435,7 +46435,7 @@
 00:c641 wBT_OTTempMon1SpclDef
 00:c642 wc642
 00:c642 wBattleMonDefense
-00:c643 wOddEggOTName
+00:c643 wOddEggOT
 00:c643 wBT_OTTempMon1Name
 00:c643 wBT_OTTempMon1StructEnd
 00:c644 wBattleMonSpeed
@@ -46945,7 +46945,7 @@
 00:c81e wLinkPlayerPartyMon1StatExp
 00:c81e wLinkPlayerPartyMon1HPExp
 00:c81e wMobileSDK_SendCommandID
-00:c81f wTimeCapsulePartyMon1OTID
+00:c81f wTimeCapsulePartyMon1ID
 00:c820 wLinkPlayerPartyMon1AtkExp
 00:c820 wDebugRoomMonID
 00:c821 wTimeCapsulePartyMon1Exp
@@ -47046,7 +47046,7 @@
 00:c847 wTimeCapsulePartyMon2Moves
 00:c849 wLinkPlayerPartyMon2ID
 00:c84b wLinkPlayerPartyMon2Exp
-00:c84b wTimeCapsulePartyMon2OTID
+00:c84b wTimeCapsulePartyMon2ID
 00:c84d wTimeCapsulePartyMon2Exp
 00:c84e wLinkPlayerPartyMon2HPExp
 00:c84e wLinkPlayerPartyMon2StatExp
@@ -47118,7 +47118,7 @@
 00:c874 wNameCardDataEnd
 00:c875 wLinkPlayerPartyMon3Moves
 00:c876 wMysteryGiftTrainerEnd
-00:c877 wTimeCapsulePartyMon3OTID
+00:c877 wTimeCapsulePartyMon3ID
 00:c879 wTimeCapsulePartyMon3Exp
 00:c879 wLinkPlayerPartyMon3ID
 00:c87b wLinkPlayerPartyMon3Exp
@@ -47174,9 +47174,9 @@
 00:c89f wLinkPlayerPartyMon3SpclAtk
 00:c8a1 wLinkPlayerPartyMon3SpclDef
 00:c8a3 wLinkPlayerPartyMon4Species
+00:c8a3 wTimeCapsulePartyMon4ID
 00:c8a3 wLinkPlayerPartyMon3StructEnd
 00:c8a3 wLinkPlayerPartyMon4
-00:c8a3 wTimeCapsulePartyMon4OTID
 00:c8a4 wLinkPlayerPartyMon4Item
 00:c8a5 wLinkPlayerPartyMon4Moves
 00:c8a5 wTimeCapsulePartyMon4Exp
@@ -47232,7 +47232,7 @@
 00:c8cb wLinkPlayerPartyMon4Defense
 00:c8cd wLinkPlayerPartyMon4Speed
 00:c8cf wLinkPlayerPartyMon4SpclAtk
-00:c8cf wTimeCapsulePartyMon5OTID
+00:c8cf wTimeCapsulePartyMon5ID
 00:c8d1 wLinkPlayerPartyMon4SpclDef
 00:c8d1 wTimeCapsulePartyMon5Exp
 00:c8d3 wLinkPlayerPartyMon5Species
@@ -47290,7 +47290,7 @@
 00:c8f9 wLinkPlayerPartyMon5Attack
 00:c8f9 wLinkPlayerPartyMon5Stats
 00:c8fb wLinkPlayerPartyMon5Defense
-00:c8fb wTimeCapsulePartyMon6OTID
+00:c8fb wTimeCapsulePartyMon6ID
 00:c8fd wTimeCapsulePartyMon6Exp
 00:c8fd wLinkPlayerPartyMon5Speed
 00:c8ff wLinkPlayerPartyMon5SpclAtk
@@ -47335,7 +47335,8 @@
 00:c918 wLinkPlayerPartyMon6DVs
 00:c919 wTimeCapsulePartyMon6Special
 00:c91a wLinkPlayerPartyMon6PP
-00:c91b wTimeCapsulePartyMonOTNames
+00:c91b wTimeCapsulePartyMonOTs
+00:c91b wTimeCapsulePartyMon1OT
 00:c91e wLinkPlayerPartyMon6Happiness
 00:c91f wLinkPlayerPartyMon6PokerusStatus
 00:c920 wLinkPlayerPartyMon6CaughtLevel
@@ -47348,26 +47349,49 @@
 00:c923 wLinkPlayerPartyMon6BoxEnd
 00:c924 wLinkPlayerPartyMon6Unused
 00:c925 wLinkPlayerPartyMon6HP
+00:c926 wTimeCapsulePartyMon2OT
 00:c927 wLinkPlayerPartyMon6MaxHP
 00:c929 wLinkPlayerPartyMon6Stats
 00:c929 wLinkPlayerPartyMon6Attack
 00:c92b wLinkPlayerPartyMon6Defense
 00:c92d wLinkPlayerPartyMon6Speed
 00:c92f wLinkPlayerPartyMon6SpclAtk
+00:c931 wTimeCapsulePartyMon3OT
 00:c931 wLinkPlayerPartyMon6SpclDef
-00:c933 wLinkPlayerPartyMonOTNames
+00:c933 wLinkPlayerPartyMon1OT
+00:c933 wLinkPlayerPartyMonOTs
 00:c933 wLinkPlayerPartyMon6StructEnd
+00:c93c wTimeCapsulePartyMon4OT
+00:c93e wLinkPlayerPartyMon2OT
+00:c947 wTimeCapsulePartyMon5OT
+00:c949 wLinkPlayerPartyMon3OT
 00:c950 wMysteryGiftPlayerData
 00:c951 wMysteryGiftPlayerID
+00:c952 wTimeCapsulePartyMon6OT
 00:c953 wMysteryGiftPlayerName
-00:c95d wTimeCapsulePartyMonNicks
+00:c954 wLinkPlayerPartyMon4OT
+00:c95d wTimeCapsulePartyMonNicknames
+00:c95d wTimeCapsulePartyMon1Nickname
 00:c95e wMysteryGiftPlayerDexCaught
 00:c95f wMysteryGiftPlayerSentDeco
+00:c95f wLinkPlayerPartyMon5OT
 00:c960 wMysteryGiftPlayerWhichItem
 00:c961 wMysteryGiftPlayerWhichDeco
 00:c962 wMysteryGiftPlayerBackupItem
 00:c964 wMysteryGiftPlayerDataEnd
-00:c975 wLinkPlayerPartyMonNicks
+00:c968 wTimeCapsulePartyMon2Nickname
+00:c96a wLinkPlayerPartyMon6OT
+00:c973 wTimeCapsulePartyMon3Nickname
+00:c975 wLinkPlayerPartyMonNicknames
+00:c975 wLinkPlayerPartyMon1Nickname
+00:c97e wTimeCapsulePartyMon4Nickname
+00:c980 wLinkPlayerPartyMon2Nickname
+00:c989 wTimeCapsulePartyMon5Nickname
+00:c98b wLinkPlayerPartyMon3Nickname
+00:c994 wTimeCapsulePartyMon6Nickname
+00:c996 wLinkPlayerPartyMon4Nickname
+00:c9a1 wLinkPlayerPartyMon5Nickname
+00:c9ac wLinkPlayerPartyMon6Nickname
 00:c9f4 wLinkPlayerMail
 00:c9f4 wLinkReceivedMail
 00:c9f4 wLinkPlayerMailPreamble
@@ -47411,6 +47435,12 @@
 00:cb84 wLinkOTMailMessages
 00:cbe8 wCurLinkOTPartyMonTypePointer
 00:cbea wLinkOTPartyMonTypes
+00:cbea wLinkOTPartyMon1Type
+00:cbec wLinkOTPartyMon2Type
+00:cbee wLinkOTPartyMon3Type
+00:cbf0 wLinkOTPartyMon4Type
+00:cbf2 wLinkOTPartyMon5Type
+00:cbf4 wLinkOTPartyMon6Type
 00:cbf8 wPrinterStatus
 00:cbfa wPrinterMargins
 00:cbfb wPrinterExposureTime
@@ -47439,7 +47469,7 @@
 00:cd22 wMobileMonStructPointer
 00:cd22 wCreditsTimer
 00:cd23 wcd23
-00:cd24 wMobileMonOTNamePointer
+00:cd24 wMobileMonOTPointer
 00:cd24 wcd24
 00:cd25 wMobileCommsJumptableIndex
 00:cd26 wMobileMonNicknamePointer
@@ -47724,7 +47754,6 @@
 01:d002 wEarthquakeMovementDataBuffer
 01:d002 wMonMailMessageBuffer
 01:d002 wSuicuneFrame
-01:d002 wBufferMonNick
 01:d002 wLinkBattleRecordBuffer
 01:d002 wPokeFluteCuredSleep
 01:d002 wDebugColorIsTrainer
@@ -47757,6 +47786,7 @@
 01:d002 wNumOwnedDecoCategories
 01:d002 wMartItem1BCD
 01:d002 wTownMapPlayerIconLandmark
+01:d002 wBufferMonNickname
 01:d003 wPlaceBallsDirection
 01:d003 wMovementBufferObject
 01:d003 wNextRadioLine
@@ -47772,10 +47802,10 @@
 01:d003 wSeerNickname
 01:d003 wTempPokedexCaughtCount
 01:d003 wTownMapCursorCoordinates
+01:d004 wBufferTrademonNickname
 01:d004 wRadioTextDelay
 01:d004 wDebugColorCurTMHM
 01:d004 wBugContestFirstPlaceScore
-01:d004 wBufferTrademonNick
 01:d004 wTownMapCursorObjectPointer
 01:d004 wTrainerHUDTiles
 01:d004 wd004
@@ -47843,9 +47873,9 @@
 01:d025 wBufferMonAtkExp
 01:d027 wBufferMonDefExp
 01:d029 wBufferMonSpdExp
-01:d02a wSeerOTName
+01:d02a wSeerOT
 01:d02b wBufferMonSpcExp
-01:d02b wTempMailAuthorNationality
+01:d02b wTempMailNationality
 01:d02d wd02d
 01:d02d wTempMailAuthorID
 01:d02d wBufferMonDVs
@@ -47862,8 +47892,8 @@
 01:d033 wd033
 01:d034 wBufferMonPokerusStatus
 01:d034 wd034
+01:d035 wSeerOTGrammar
 01:d035 wBufferMonCaughtLevel
-01:d035 wSeerOTNameGrammar
 01:d035 wBufferMonCaughtData
 01:d035 wBufferMonCaughtTime
 01:d036 wBufferMonCaughtLocation
@@ -48540,10 +48570,21 @@
 01:d3a2 wOTPartyMon6Speed
 01:d3a4 wOTPartyMon6SpclAtk
 01:d3a6 wOTPartyMon6SpclDef
-01:d3a8 wOTPartyMonsEnd
-01:d3a8 wOTPartyMonOT
+01:d3a8 wOTPartyMonOTs
+01:d3a8 wOTPartyMon1OT
 01:d3a8 wOTPartyMon6StructEnd
+01:d3b3 wOTPartyMon2OT
+01:d3be wOTPartyMon3OT
+01:d3c9 wOTPartyMon4OT
+01:d3d4 wOTPartyMon5OT
+01:d3df wOTPartyMon6OT
 01:d3ea wOTPartyMonNicknames
+01:d3ea wOTPartyMon1Nickname
+01:d3f5 wOTPartyMon2Nickname
+01:d400 wOTPartyMon3Nickname
+01:d40b wOTPartyMon4Nickname
+01:d416 wOTPartyMon5Nickname
+01:d421 wOTPartyMon6Nickname
 01:d42c wOTPartyDataEnd
 01:d430 wd430
 01:d430 wBattleAction
@@ -49706,8 +49747,20 @@
 01:ddfb wPartyMon6SpclAtk
 01:ddfd wPartyMon6SpclDef
 01:ddff wPartyMon6StructEnd
-01:ddff wPartyMonOT
+01:ddff wPartyMon1OT
+01:ddff wPartyMonOTs
+01:de0a wPartyMon2OT
+01:de15 wPartyMon3OT
+01:de20 wPartyMon4OT
+01:de2b wPartyMon5OT
+01:de36 wPartyMon6OT
 01:de41 wPartyMonNicknames
+01:de41 wPartyMon1Nickname
+01:de4c wPartyMon2Nickname
+01:de57 wPartyMon3Nickname
+01:de62 wPartyMon4Nickname
+01:de6d wPartyMon5Nickname
+01:de78 wPartyMon6Nickname
 01:de83 wPartyMonNicknamesEnd
 01:de99 wPokedexCaught
 01:deb9 wEndPokedexCaught
@@ -49717,7 +49770,7 @@
 01:def3 wUnlockedUnowns
 01:def4 wFirstUnownSeen
 01:def5 wDayCareMan
-01:def6 wBreedMon1Nick
+01:def6 wBreedMon1Nickname
 01:df01 wBreedMon1OT
 01:df0c wBreedMon1
 01:df0c wBreedMon1Species
@@ -49745,7 +49798,7 @@
 01:df2c wBreedMon1BoxEnd
 01:df2d wStepsToEgg
 01:df2e wBreedMotherOrNonDitto
-01:df2f wBreedMon2Nick
+01:df2f wBreedMon2Nickname
 01:df3a wBreedMon2OT
 01:df45 wBreedMon2Species
 01:df45 wBreedMon2
@@ -49769,9 +49822,9 @@
 01:df63 wBreedMon2CaughtLocation
 01:df63 wBreedMon2CaughtGender
 01:df64 wBreedMon2Level
-01:df65 wEggNick
+01:df65 wEggMonNickname
 01:df65 wBreedMon2BoxEnd
-01:df70 wEggOT
+01:df70 wEggMonOT
 01:df7b wEggMonSpecies
 01:df7b wEggMon
 01:df7c wEggMonItem
@@ -50850,7 +50903,7 @@
 05:d30a wActiveAnimObjects
 05:d30a wAnimObject01
 05:d30b wAnimObject01OAMFlags
-05:d30c wAnimObject01Field02
+05:d30c wAnimObject01FixY
 05:d30d wAnimObject01FramesetID
 05:d30e wAnimObject01Function
 05:d30f wAnimObject01Palette
@@ -50868,7 +50921,7 @@
 05:d322 wAnimObject02Index
 05:d322 wAnimObject02
 05:d323 wAnimObject02OAMFlags
-05:d324 wAnimObject02Field02
+05:d324 wAnimObject02FixY
 05:d325 wAnimObject02FramesetID
 05:d326 wAnimObject02Function
 05:d327 wAnimObject02Palette
@@ -50886,7 +50939,7 @@
 05:d33a wAnimObject03Index
 05:d33a wAnimObject03
 05:d33b wAnimObject03OAMFlags
-05:d33c wAnimObject03Field02
+05:d33c wAnimObject03FixY
 05:d33d wAnimObject03FramesetID
 05:d33e wAnimObject03Function
 05:d33f wAnimObject03Palette
@@ -50904,7 +50957,7 @@
 05:d352 wAnimObject04
 05:d352 wAnimObject04Index
 05:d353 wAnimObject04OAMFlags
-05:d354 wAnimObject04Field02
+05:d354 wAnimObject04FixY
 05:d355 wAnimObject04FramesetID
 05:d356 wAnimObject04Function
 05:d357 wAnimObject04Palette
@@ -50922,7 +50975,7 @@
 05:d36a wAnimObject05Index
 05:d36a wAnimObject05
 05:d36b wAnimObject05OAMFlags
-05:d36c wAnimObject05Field02
+05:d36c wAnimObject05FixY
 05:d36d wAnimObject05FramesetID
 05:d36e wAnimObject05Function
 05:d36f wAnimObject05Palette
@@ -50940,7 +50993,7 @@
 05:d382 wAnimObject06Index
 05:d382 wAnimObject06
 05:d383 wAnimObject06OAMFlags
-05:d384 wAnimObject06Field02
+05:d384 wAnimObject06FixY
 05:d385 wAnimObject06FramesetID
 05:d386 wAnimObject06Function
 05:d387 wAnimObject06Palette
@@ -50958,7 +51011,7 @@
 05:d39a wAnimObject07Index
 05:d39a wAnimObject07
 05:d39b wAnimObject07OAMFlags
-05:d39c wAnimObject07Field02
+05:d39c wAnimObject07FixY
 05:d39d wAnimObject07FramesetID
 05:d39e wAnimObject07Function
 05:d39f wAnimObject07Palette
@@ -50976,7 +51029,7 @@
 05:d3b2 wAnimObject08Index
 05:d3b2 wAnimObject08
 05:d3b3 wAnimObject08OAMFlags
-05:d3b4 wAnimObject08Field02
+05:d3b4 wAnimObject08FixY
 05:d3b5 wAnimObject08FramesetID
 05:d3b6 wAnimObject08Function
 05:d3b7 wAnimObject08Palette
@@ -50994,7 +51047,7 @@
 05:d3ca wAnimObject09
 05:d3ca wAnimObject09Index
 05:d3cb wAnimObject09OAMFlags
-05:d3cc wAnimObject09Field02
+05:d3cc wAnimObject09FixY
 05:d3cd wAnimObject09FramesetID
 05:d3ce wAnimObject09Function
 05:d3cf wAnimObject09Palette
@@ -51012,7 +51065,7 @@
 05:d3e2 wAnimObject10Index
 05:d3e2 wAnimObject10
 05:d3e3 wAnimObject10OAMFlags
-05:d3e4 wAnimObject10Field02
+05:d3e4 wAnimObject10FixY
 05:d3e5 wAnimObject10FramesetID
 05:d3e6 wAnimObject10Function
 05:d3e7 wAnimObject10Palette