diff options
43 files changed, 309 insertions, 233 deletions
diff --git a/constants/npc_trade_constants.asm b/constants/npc_trade_constants.asm index 72333a65..1654e0e9 100644 --- a/constants/npc_trade_constants.asm +++ b/constants/npc_trade_constants.asm @@ -1,15 +1,15 @@ ; npctrade struct members (see data/events/npc_trades.asm) rsreset -NPCTRADE_DIALOG rb -NPCTRADE_GIVEMON rb -NPCTRADE_GETMON rb -NPCTRADE_NICK rb MON_NAME_LENGTH -NPCTRADE_DVS rw -NPCTRADE_ITEM rb -NPCTRADE_OT_ID rw -NPCTRADE_OT_NAME rb NAME_LENGTH -NPCTRADE_GENDER rb -NPCTRADE_PADDING rb +NPCTRADE_DIALOG rb +NPCTRADE_GIVEMON rb +NPCTRADE_GETMON rb +NPCTRADE_NICKNAME rb MON_NAME_LENGTH +NPCTRADE_DVS rw +NPCTRADE_ITEM rb +NPCTRADE_OT_ID rw +NPCTRADE_OT_NAME rb NAME_LENGTH +NPCTRADE_GENDER rb + rb_skip NPCTRADE_STRUCT_LENGTH EQU _RS ; NPCTrades indexes (see data/events/npc_trades.asm) diff --git a/data/text/battle.asm b/data/text/battle.asm index a83095bc..ee7d7d24 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -9,7 +9,7 @@ BattleText_PlayerPickedUpPayDayMoney: WildPokemonAppearedText: text "Wild @" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text_start line "appeared!" prompt @@ -17,13 +17,13 @@ WildPokemonAppearedText: HookedPokemonAttackedText: text "The hooked" line "@" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text_start cont "attacked!" prompt PokemonFellFromTreeText: - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text " fell" line "out of the tree!" prompt @@ -35,14 +35,14 @@ WantsToBattleText:: BattleText_WildFled: text "Wild @" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text_start line "fled!" prompt BattleText_EnemyFled: text "Enemy @" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text_start line "fled!" prompt @@ -154,7 +154,7 @@ BattleText_TheSandstormSubsided: BattleText_EnemyMonFainted: text "Enemy @" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text_start line "fainted!" prompt @@ -199,7 +199,7 @@ UnusedRivalLossText: ; unreferenced prompt BattleText_MonFainted: - text_ram wBattleMonNick + text_ram wBattleMonNickname text_start line "fainted!" prompt @@ -223,7 +223,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon: text "<ENEMY>" line "is about to use" cont "@" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text "." para "Will <PLAYER>" @@ -234,7 +234,7 @@ BattleText_EnemySentOut: text "<ENEMY>" line "sent out" cont "@" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text "!" done @@ -301,13 +301,13 @@ BattleText_ItemsCantBeUsedHere: prompt BattleText_MonIsAlreadyOut: - text_ram wBattleMonNick + text_ram wBattleMonNickname text_start line "is already out." prompt BattleText_MonCantBeRecalled: - text_ram wBattleMonNick + text_ram wBattleMonNickname text_start line "can't be recalled!" prompt @@ -323,7 +323,7 @@ BattleText_TheMoveIsDisabled: prompt BattleText_MonHasNoMovesLeft: - text_ram wBattleMonNick + text_ram wBattleMonNickname text_start line "has no moves left!" done @@ -344,14 +344,14 @@ BattleText_StringBuffer1GrewToLevel: BattleText_WildMonIsEating: text "Wild @" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text_start line "is eating!" prompt BattleText_WildMonIsAngry: text "Wild @" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text_start line "is angry!" prompt @@ -502,37 +502,37 @@ DisabledMoveText: prompt LoafingAroundText: - text_ram wBattleMonNick + text_ram wBattleMonNickname text " is" line "loafing around." prompt BeganToNapText: - text_ram wBattleMonNick + text_ram wBattleMonNickname text " began" line "to nap!" prompt WontObeyText: - text_ram wBattleMonNick + text_ram wBattleMonNickname text " won't" line "obey!" prompt TurnedAwayText: - text_ram wBattleMonNick + text_ram wBattleMonNickname text " turned" line "away!" prompt IgnoredOrdersText: - text_ram wBattleMonNick + text_ram wBattleMonNickname text " ignored" line "orders!" prompt IgnoredSleepingText: - text_ram wBattleMonNick + text_ram wBattleMonNickname text " ignored" line "orders…sleeping!" prompt diff --git a/data/text/common_1.asm b/data/text/common_1.asm index c27c465f..ddcdc889 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -157,7 +157,7 @@ _EnemyWithdrewText:: text "<ENEMY>" line "withdrew" cont "@" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text "!" prompt @@ -167,7 +167,7 @@ _EnemyUsedOnText:: text_ram wMonOrItemNameBuffer text_start cont "on @" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text "!" prompt @@ -1666,32 +1666,32 @@ _ExpPointsText:: _GoMonText:: text "Go! @" - text_ram wBattleMonNick + text_ram wBattleMonNickname text "!" done _DoItMonText:: text "Do it! @" - text_ram wBattleMonNick + text_ram wBattleMonNickname text "!" done _GoForItMonText:: text "Go for it," line "@" - text_ram wBattleMonNick + text_ram wBattleMonNickname text "!" done _YourFoesWeakGetmMonText:: text "Your foe's weak!" line "Get'm, @" - text_ram wBattleMonNick + text_ram wBattleMonNickname text "!" done _BattleMonNickCommaText:: - text_ram wBattleMonNick + text_ram wBattleMonNickname text ",@@" _ThatsEnoughComeBackText:: diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 52399ab9..720ff8ce 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -467,7 +467,7 @@ _BreedAskNicknameText:: _LeftWithDayCareLadyText:: text "It's @" - text_ram wBreedMon2Nick + text_ram wBreedMon2Nickname text_start line "that was left with" cont "the DAY-CARE LADY." @@ -475,7 +475,7 @@ _LeftWithDayCareLadyText:: _LeftWithDayCareManText:: text "It's @" - text_ram wBreedMon1Nick + text_ram wBreedMon1Nickname text_start line "that was left with" cont "the DAY-CARE MAN." @@ -1264,7 +1264,7 @@ _LinkAbnormalMonText:: _LinkAskTradeForText:: text "Trade @" - text_ram wBufferTrademonNick + text_ram wBufferTrademonNickname text_start line "for @" text_ram wStringBuffer1 diff --git a/data/text/common_3.asm b/data/text/common_3.asm index cc3ee20c..79e1948b 100644 --- a/data/text/common_3.asm +++ b/data/text/common_3.asm @@ -259,7 +259,7 @@ _BallSoCloseText:: Text_BallCaught:: text "Gotcha! @" - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text_start line "was caught!@" sound_caught_mon @@ -278,7 +278,7 @@ _BallSentToPCText:: prompt _NewDexDataText:: - text_ram wEnemyMonNick + text_ram wEnemyMonNickname text "'s data" line "was newly added to" cont "the #DEX.@" diff --git a/data/text_buffers.asm b/data/text_buffers.asm index 7c28c11e..2f681004 100644 --- a/data/text_buffers.asm +++ b/data/text_buffers.asm @@ -1,9 +1,9 @@ StringBufferPointers:: ; entries correspond to arguments for text_buffer (TX_STRINGBUFFER) - dw wStringBuffer3 ; 0 - dw wStringBuffer4 ; 1 - dw wStringBuffer5 ; 2 - dw wStringBuffer2 ; 3 - dw wStringBuffer1 ; 4 - dw wEnemyMonNick ; 5 - dw wBattleMonNick ; 6 + dw wStringBuffer3 ; 0 + dw wStringBuffer4 ; 1 + dw wStringBuffer5 ; 2 + dw wStringBuffer2 ; 3 + dw wStringBuffer1 ; 4 + dw wEnemyMonNickname ; 5 + dw wBattleMonNickname ; 6 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 063383bf..f644f6bd 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3657,7 +3657,7 @@ InitBattleMon: ld hl, wPartyMonNicknames ld a, [wCurBattleMon] call SkipNames - ld de, wBattleMonNick + ld de, wBattleMonNickname ld bc, MON_NAME_LENGTH call CopyBytes ld hl, wBattleMonAttack @@ -3737,7 +3737,7 @@ InitEnemyMon: ld hl, wOTPartyMonNicknames ld a, [wCurPartyMon] call SkipNames - ld de, wEnemyMonNick + ld de, wEnemyMonNickname ld bc, MON_NAME_LENGTH call CopyBytes ld hl, wEnemyMonAttack @@ -4406,7 +4406,7 @@ CheckDanger: ret PrintPlayerHUD: - ld de, wBattleMonNick + ld de, wBattleMonNickname hlcoord 10, 7 call Battle_DummyFunction call PlaceString @@ -4492,7 +4492,7 @@ DrawEnemyHUD: ld [wCurSpecies], a ld [wCurPartySpecies], a call GetBaseData - ld de, wEnemyMonNick + ld de, wEnemyMonNickname hlcoord 1, 0 call Battle_DummyFunction call PlaceString @@ -6168,7 +6168,7 @@ LoadEnemyMon: ; Update enemy nick ld hl, wStringBuffer1 - ld de, wEnemyMonNick + ld de, wEnemyMonNickname ld bc, MON_NAME_LENGTH call CopyBytes @@ -6847,7 +6847,7 @@ GiveExperiencePoints: ld [wStringBuffer2], a ld a, [wCurPartyMon] ld hl, wPartyMonNicknames - call GetNick + call GetNickname ld hl, Text_MonGainedExpPoint call PrintText ld a, [wStringBuffer2 + 1] @@ -7242,7 +7242,7 @@ AnimateExpBar: ld c, $40 call .LoopBarAnimation call PrintPlayerHUD - ld hl, wBattleMonNick + ld hl, wBattleMonNickname ld de, wStringBuffer1 ld bc, MON_NAME_LENGTH call CopyBytes diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm index d2797f79..bdacfda0 100644 --- a/engine/battle/move_effects/beat_up.asm +++ b/engine/battle/move_effects/beat_up.asm @@ -28,7 +28,7 @@ BattleCommand_BeatUp: .got_mon ld a, [wCurBeatUpPartyMon] ld hl, wPartyMonNicknames - call GetNick + call GetNickname ld a, MON_HP call GetBeatupMonLocation ld a, [hli] diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index 18e23f13..c30ee423 100644 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -10,7 +10,7 @@ ReadTrainerParty: ld [hl], a ld hl, wOTPartyMons - ld bc, wOTPartyMonsEnd - wOTPartyMons + ld bc, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH xor a call ByteFill diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index 2507dfab..498b33bc 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -48,7 +48,7 @@ DisplayCaughtContestMonStats: ld [wTempMonLevel], a call PrintLevel - ld de, wEnemyMonNick + ld de, wEnemyMonNickname hlcoord 1, 8 call PlaceString diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 20c35572..2cde38aa 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -40,7 +40,7 @@ DayCareMan: .AskWithdrawMon: farcall GetBreedMon1LevelGrowth - ld hl, wBreedMon1Nick + ld hl, wBreedMon1Nickname call GetPriceToRetrieveBreedmon call DayCare_AskWithdrawBreedMon jr c, .print_text @@ -78,7 +78,7 @@ DayCareLady: .AskWithdrawMon: farcall GetBreedMon2LevelGrowth - ld hl, wBreedMon2Nick + ld hl, wBreedMon2Nickname call GetPriceToRetrieveBreedmon call DayCare_AskWithdrawBreedMon jr c, .print_text @@ -131,7 +131,7 @@ DayCareAskDepositPokemon: jr c, .HoldingMail ld hl, wPartyMonNicknames ld a, [wCurPartyMon] - call GetNick + call GetNickname and a ret @@ -461,13 +461,13 @@ DayCare_GiveEgg: ld hl, wPartyMonNicknames ld bc, MON_NAME_LENGTH call DayCare_GetCurrentPartyMember - ld hl, wEggNick + ld hl, wEggMonNickname call CopyBytes - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld bc, NAME_LENGTH call DayCare_GetCurrentPartyMember - ld hl, wEggOT + ld hl, wEggMonOT call CopyBytes ld hl, wPartyMon1 @@ -544,10 +544,10 @@ DayCare_InitBreeding: ld hl, wEggMon ld bc, BOXMON_STRUCT_LENGTH call ByteFill - ld hl, wEggNick + ld hl, wEggMonNickname ld bc, MON_NAME_LENGTH call ByteFill - ld hl, wEggOT + ld hl, wEggMonOT ld bc, NAME_LENGTH call ByteFill ld a, [wBreedMon1DVs] @@ -600,11 +600,11 @@ DayCare_InitBreeding: ld [wEggMonSpecies], a call GetBaseData - ld hl, wEggNick + ld hl, wEggMonNickname ld de, .String_EGG call CopyName2 ld hl, wPlayerName - ld de, wEggOT + ld de, wEggMonOT ld bc, NAME_LENGTH call CopyBytes xor a diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm index d03e6a09..f4ff5536 100644 --- a/engine/events/haircut.asm +++ b/engine/events/haircut.asm @@ -33,7 +33,7 @@ HaircutOrGrooming: cp EGG jr z, .egg push hl - call GetCurNick + call GetCurNickname call CopyPokemonName_Buffer1_Buffer3 pop hl call Random diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 035148b5..822c0598 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -48,7 +48,7 @@ CheckMagikarpLength: ld [de], a inc de ld a, [wCurPartyMon] - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call SkipNames call CopyBytes ld a, MAGIKARPLENGTH_BEAT_RECORD diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index d3a1dc58..9e9987b5 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -14,7 +14,7 @@ _NameRater: cp EGG jr z, .egg ; ... or a Pokemon you got from a trade. - call GetCurNick + call GetCurNickname call CheckIfMonIsYourOT jr c, .traded ; This name is good, but we can do better. How about it? @@ -57,7 +57,7 @@ _NameRater: .samename push hl - call GetCurNick + call GetCurNickname ld hl, NameRaterNamedText call PrintText pop hl @@ -80,7 +80,7 @@ _NameRater: CheckIfMonIsYourOT: ; Checks to see if the partymon loaded in [wCurPartyMon] has the different OT as you. Returns carry if not. - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld bc, NAME_LENGTH ld a, [wCurPartyMon] call AddNTimes diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index b4393ebd..7f9b74ca 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -132,7 +132,7 @@ DoNPCTrade: call GetTradeMonName call CopyTradeName - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld bc, NAME_LENGTH call Trade_GetAttributeOfCurrentPartymon ld de, wPlayerTrademonOTName @@ -167,7 +167,7 @@ DoNPCTrade: callfar RemoveMonFromPartyOrBox predef TryAddMonToParty - ld e, NPCTRADE_NICK + ld e, NPCTRADE_NICKNAME call GetTradeAttr ld de, wOTTrademonNickname call CopyTradeName @@ -187,7 +187,7 @@ DoNPCTrade: ld de, wOTTrademonSenderName call CopyTradeName - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld bc, NAME_LENGTH call Trade_GetAttributeOfLastPartymon ld hl, wOTTrademonOTName diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index b01bf5ca..113c0fab 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -19,13 +19,13 @@ FieldMoveJumptable: scf ret -GetPartyNick: +GetPartyNickname: ; write wCurPartyMon nickname to wStringBuffer1-3 ld hl, wPartyMonNicknames ld a, BOXMON ld [wMonType], a ld a, [wCurPartyMon] - call GetNick + call GetNickname call CopyName1 ; copy text from wStringBuffer2 to wStringBuffer3 ld de, wStringBuffer2 @@ -204,7 +204,7 @@ Script_CutFromMenu: special UpdateTimePals Script_Cut: - callasm GetPartyNick + callasm GetPartyNickname writetext UseCutText reloadmappart callasm CutDownTreeOrGrass @@ -369,7 +369,7 @@ SurfFunction: .DoSurf: call GetSurfType ld [wSurfingPlayerState], a - call GetPartyNick + call GetPartyNickname ld hl, SurfFromMenuScript call QueueScript ld a, $81 @@ -500,7 +500,7 @@ TrySurfOW:: call GetSurfType ld [wSurfingPlayerState], a - call GetPartyNick + call GetPartyNickname ld a, BANK(AskSurfScript) ld hl, AskSurfScript @@ -652,7 +652,7 @@ Script_WaterfallFromMenu: special UpdateTimePals Script_UsedWaterfall: - callasm GetPartyNick + callasm GetPartyNickname writetext .UseWaterfallText waitbutton closetext @@ -775,7 +775,7 @@ EscapeRopeOrDig: ld de, wNextWarp ld bc, 3 call CopyBytes - call GetPartyNick + call GetPartyNickname ld a, [wEscapeRopeOrDigType] cp $2 jr nz, .escaperope @@ -887,7 +887,7 @@ TeleportFunction: ret .DoTeleport: - call GetPartyNick + call GetPartyNickname ld hl, .TeleportScript call QueueScript ld a, $81 @@ -975,7 +975,7 @@ SetStrengthFlag: add hl, de ld a, [hl] ld [wStrengthSpecies], a - call GetPartyNick + call GetPartyNickname ret Script_StrengthFromMenu: @@ -1142,7 +1142,7 @@ Script_WhirlpoolFromMenu: special UpdateTimePals Script_UsedWhirlpool: - callasm GetPartyNick + callasm GetPartyNickname writetext UseWhirlpoolText reloadmappart callasm DisappearWhirlpool @@ -1241,7 +1241,7 @@ HeadbuttFromMenuScript: special UpdateTimePals HeadbuttScript: - callasm GetPartyNick + callasm GetPartyNickname writetext UseHeadbuttText reloadmappart @@ -1338,7 +1338,7 @@ RockSmashFromMenuScript: special UpdateTimePals RockSmashScript: - callasm GetPartyNick + callasm GetPartyNickname writetext UseRockSmashText closetext special WaitSFX diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 827f6941..b7a1ce23 100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -128,7 +128,7 @@ DoPoisonStep:: jr z, .mon_not_fainted ld c, HAPPINESS_POISONFAINT farcall ChangeHappiness - farcall GetPartyNick + farcall GetPartyNickname ld hl, .PoisonFaintText call PrintText diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index b19f4f55..1c0e86d4 100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -38,13 +38,13 @@ GiveShuckle: dec a ld hl, wPartyMonNicknames call SkipNames - ld de, SpecialShuckleNick + ld de, SpecialShuckleNickname call CopyName2 ; OT. ld a, [wPartyCount] dec a - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call SkipNames ld de, SpecialShuckleOT call CopyName2 @@ -64,7 +64,7 @@ GiveShuckle: SpecialShuckleOT: db "MANIA@" -SpecialShuckleNick: +SpecialShuckleNickname: db "SHUCKIE@" ReturnShuckie: @@ -90,7 +90,7 @@ ReturnShuckie: ; OT ld a, [wCurPartyMon] - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call SkipNames ld de, SpecialShuckleOT .CheckOT: diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 9b99a256..acc1f8a5 100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -8,7 +8,7 @@ SweetScentFromMenu: .SweetScent: reloadmappart special UpdateTimePals - callasm GetPartyNick + callasm GetPartyNickname writetext UseSweetScentText waitbutton callasm SweetScentEncounter diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index ae169553..1be54c68 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1259,7 +1259,7 @@ RareCandy_StatBooster_GetParameters: call GetBaseData ld a, [wCurPartyMon] ld hl, wPartyMonNicknames - call GetNick + call GetNickname ret RareCandyEffect: diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 0479fb3c..e166249a 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -590,7 +590,7 @@ GiveItem: push af ld a, [wPackJumptableIndex] push af - call GetCurNick + call GetCurNickname ld hl, wStringBuffer1 ld de, wMonOrItemNameBuffer ld bc, MON_NAME_LENGTH diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index c240282f..f8986c17 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -121,7 +121,7 @@ TeachTMHM: push bc ld a, [wCurPartyMon] ld hl, wPartyMonNicknames - call GetNick + call GetNickname pop bc ld a, c diff --git a/engine/link/init_list.asm b/engine/link/init_list.asm index 4d76ebdc..acececd5 100644 --- a/engine/link/init_list.asm +++ b/engine/link/init_list.asm @@ -5,7 +5,7 @@ InitList: cp INIT_ENEMYOT_LIST jr nz, .check_party_ot_name ld hl, wOTPartyCount - ld de, wOTPartyMonOT + ld de, wOTPartyMonOTs ld a, ENEMY_OT_NAME jr .done @@ -13,7 +13,7 @@ InitList: cp INIT_PLAYEROT_LIST jr nz, .check_mon_name ld hl, wPartyCount - ld de, wPartyMonOT + ld de, wPartyMonOTs ld a, PARTY_OT_NAME jr .done diff --git a/engine/link/link.asm b/engine/link/link.asm index c28330f4..d549dc47 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -175,9 +175,9 @@ Gen2ToGen1LinkComms: ld hl, wTimeCapsulePlayerData call Link_ConvertPartyStruct1to2 - ld a, LOW(wOTPartyMonOT) + ld a, LOW(wOTPartyMonOTs) ld [wUnusedNamesPointer], a - ld a, HIGH(wOTPartyMonOT) + ld a, HIGH(wOTPartyMonOTs) ld [wUnusedNamesPointer + 1], a ld de, MUSIC_NONE @@ -402,9 +402,9 @@ Gen2ToGen2LinkComms: ld bc, wOTPartyDataEnd - wOTPartyMons call CopyBytes - ld a, LOW(wOTPartyMonOT) + ld a, LOW(wOTPartyMonOTs) ld [wUnusedNamesPointer], a - ld a, HIGH(wOTPartyMonOT) + ld a, HIGH(wOTPartyMonOTs) ld [wUnusedNamesPointer + 1], a ld de, MUSIC_NONE @@ -657,7 +657,7 @@ Link_PrepPartyData_Gen1: dec c jr nz, .mon_loop - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call .copy_ot_nicks ld hl, wPartyMonNicknames @@ -801,7 +801,7 @@ Link_PrepPartyData_Gen2: ld bc, PARTY_LENGTH * PARTYMON_STRUCT_LENGTH call CopyBytes - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld bc, PARTY_LENGTH * NAME_LENGTH call CopyBytes @@ -913,7 +913,7 @@ Link_ConvertPartyStruct1to2: pop hl ld bc, PARTY_LENGTH * REDMON_STRUCT_LENGTH add hl, bc - ld de, wOTPartyMonOT + ld de, wOTPartyMonOTs ld bc, PARTY_LENGTH * NAME_LENGTH call CopyBytes ld de, wOTPartyMonNicknames @@ -1528,7 +1528,7 @@ LinkTrade: ld [wNamedObjectIndex], a call GetPokemonName ld hl, wStringBuffer1 - ld de, wBufferTrademonNick + ld de, wBufferTrademonNickname ld bc, MON_NAME_LENGTH call CopyBytes ld a, [wCurOTTradePartyMon] @@ -1665,7 +1665,7 @@ LinkTrade: push af ; OT name ld a, [wCurTradePartyMon] - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call SkipNames ld de, wPlayerTrademonOTName ld bc, NAME_LENGTH @@ -1703,7 +1703,7 @@ LinkTrade: ld [wOTTrademonSpecies], a ; OT name ld a, [wCurOTTradePartyMon] - ld hl, wOTPartyMonOT + ld hl, wOTPartyMonOTs call SkipNames ld de, wOTTrademonOTName ld bc, NAME_LENGTH diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 2902d9ef..b0b4c158 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -1687,7 +1687,7 @@ BillsPC_CopyMon: call CopySpeciesToTemp ld hl, sBoxMonNicknames call CopyNicknameToTemp - ld hl, sBoxMonOT + ld hl, sBoxMonOTs call CopyOTNameToTemp ld hl, sBoxMons ld bc, BOXMON_STRUCT_LENGTH @@ -1705,7 +1705,7 @@ BillsPC_CopyMon: call CopySpeciesToTemp ld hl, wPartyMonNicknames call CopyNicknameToTemp - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call CopyOTNameToTemp ld hl, wPartyMon1 ld bc, PARTYMON_STRUCT_LENGTH @@ -1731,7 +1731,7 @@ BillsPC_CopyMon: call CopyNicknameToTemp pop hl push hl - ld bc, sBoxMonOT - sBox + ld bc, sBoxMonOTs - sBox add hl, bc call CopyOTNameToTemp pop hl @@ -1750,7 +1750,7 @@ DepositPokemon: ld [wCurPartyMon], a ld hl, wPartyMonNicknames ld a, [wCurPartyMon] - call GetNick + call GetNickname ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a predef SendGetMonIntoFromBox @@ -1804,7 +1804,7 @@ TryWithdrawPokemon: call OpenSRAM ld a, [wCurPartyMon] ld hl, sBoxMonNicknames - call GetNick + call GetNickname call CloseSRAM xor a ld [wPokemonWithdrawDepositParameter], a @@ -2029,7 +2029,7 @@ MovePKMNWitoutMail_InsertMon: call CopySpeciesToTemp ld hl, sBoxMonNicknames call CopyNicknameToTemp - ld hl, sBoxMonOT + ld hl, sBoxMonOTs call CopyOTNameToTemp ld hl, sBoxMons ld bc, BOXMON_STRUCT_LENGTH @@ -2062,7 +2062,7 @@ MovePKMNWitoutMail_InsertMon: call CopySpeciesToTemp ld hl, wPartyMonNicknames call CopyNicknameToTemp - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call CopyOTNameToTemp ld hl, wPartyMon1Species ld bc, PARTYMON_STRUCT_LENGTH @@ -2093,7 +2093,7 @@ CopyNicknameToTemp: ld bc, MON_NAME_LENGTH ld a, [wCurPartyMon] call AddNTimes - ld de, wBufferMonNick + ld de, wBufferMonNickname ld bc, MON_NAME_LENGTH call CopyBytes ret diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index da282b7f..64bcb4e1 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -301,7 +301,7 @@ HatchEggs: ld a, [wPlayerID + 1] ld [hl], a ld a, [wCurPartyMon] - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld bc, NAME_LENGTH call AddNTimes ld d, h @@ -854,7 +854,7 @@ DayCareMon1: bit DAYCARELADY_HAS_MON_F, a jr z, DayCareMonCursor call PromptButton - ld hl, wBreedMon2Nick + ld hl, wBreedMon2Nickname call DayCareMonCompatibilityText jp PrintText @@ -867,7 +867,7 @@ DayCareMon2: bit DAYCAREMAN_HAS_MON_F, a jr z, DayCareMonCursor call PromptButton - ld hl, wBreedMon1Nick + ld hl, wBreedMon1Nickname call DayCareMonCompatibilityText jp PrintText diff --git a/engine/pokemon/caught_nickname.asm b/engine/pokemon/caught_nickname.asm index ff26887d..5c1eb53d 100644 --- a/engine/pokemon/caught_nickname.asm +++ b/engine/pokemon/caught_nickname.asm @@ -31,7 +31,7 @@ CheckPartyFullAfterContest: call CopyBytes ld a, [wPartyCount] dec a - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call SkipNames ld d, h ld e, l diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index b5ac3074..678c87a8 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -202,7 +202,7 @@ EvolveAfterBattle_MasterLoop: ld [wEvolutionNewSpecies], a ld a, [wCurPartyMon] ld hl, wPartyMonNicknames - call GetNick + call GetNickname call CopyName1 ld hl, EvolvingText call PrintText diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 2c597c7b..c7728249 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -2,7 +2,7 @@ LearnMove: call LoadTilemapToTempTilemap ld a, [wCurPartyMon] ld hl, wPartyMonNicknames - call GetNick + call GetNickname ld hl, wStringBuffer1 ld de, wMonOrItemNameBuffer ld bc, MON_NAME_LENGTH diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index e9cc1551..e70f0ec5 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -213,7 +213,7 @@ GivePokeMail:: call CopyBytes pop af push af - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld bc, NAME_LENGTH call AddNTimes ld bc, NAME_LENGTH - 1 diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 5289cb69..8d14ca36 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -109,7 +109,7 @@ PokemonActionSubmenu: lb bc, 2, 18 call ClearBox farcall MonSubmenu - call GetCurNick + call GetCurNickname ld a, [wMenuSelection] ld hl, .Actions ld de, 3 @@ -210,7 +210,7 @@ GiveTakePartyMonItem: call ExitMenu jr c, .cancel - call GetCurNick + call GetCurNickname ld hl, wStringBuffer1 ld de, wMonOrItemNameBuffer ld bc, MON_NAME_LENGTH @@ -529,7 +529,7 @@ MonMailAction: jr nc, .BagIsFull call GetPartyItemLocation ld [hl], $0 - call GetCurNick + call GetCurNickname ld hl, .MailDetachedText call MenuTextboxBackup jr .done @@ -1118,7 +1118,7 @@ SetUpMoveScreenBG: ld [wMonType], a ld hl, wPartyMonNicknames ld a, [wCurPartyMon] - call GetNick + call GetNickname hlcoord 5, 1 call PlaceString push bc diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm index c8fbff28..c76d20db 100644 --- a/engine/pokemon/mon_stats.asm +++ b/engine/pokemon/mon_stats.asm @@ -330,7 +330,7 @@ Unused_PlaceEnemyHPLevel: push hl ld hl, wPartyMonNicknames ld a, [wCurPartyMon] - call GetNick + call GetNickname pop hl call PlaceString call CopyMonToTempMon diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 605ac07c..f843e46a 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -34,11 +34,11 @@ TryAddMonToParty: ld a, -1 ld [de], a ; Now let's load the OT name. - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld a, [wMonType] and $f jr z, .loadOTname - ld hl, wOTPartyMonOT + ld hl, wOTPartyMonOTs .loadOTname ldh a, [hMoveMon] ; Restore index from backup @@ -419,13 +419,13 @@ AddTempmonToParty: ld hl, wTempMonSpecies call CopyBytes - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld a, [wPartyCount] dec a call SkipNames ld d, h ld e, l - ld hl, wOTPartyMonOT + ld hl, wOTPartyMonOTs ld a, [wCurPartyMon] call SkipNames ld bc, NAME_LENGTH @@ -565,10 +565,10 @@ SendGetMonIntoFromBox: ld de, wBreedMon1OT jr z, .okay5 dec a - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld a, [wPartyCount] jr nz, .okay6 - ld hl, sBoxMonOT + ld hl, sBoxMonOTs ld a, [sBoxCount] .okay6 @@ -578,14 +578,14 @@ SendGetMonIntoFromBox: ld e, l .okay5 - ld hl, sBoxMonOT + ld hl, sBoxMonOTs ld a, [wPokemonWithdrawDepositParameter] and a jr z, .okay7 ld hl, wBreedMon1OT cp DAY_CARE_WITHDRAW jr z, .okay8 - ld hl, wPartyMonOT + ld hl, wPartyMonOTs .okay7 ld a, [wCurPartyMon] @@ -596,7 +596,7 @@ SendGetMonIntoFromBox: call CopyBytes ld a, [wPokemonWithdrawDepositParameter] cp DAY_CARE_DEPOSIT - ld de, wBreedMon1Nick + ld de, wBreedMon1Nickname jr z, .okay9 dec a ld hl, wPartyMonNicknames @@ -616,7 +616,7 @@ SendGetMonIntoFromBox: ld a, [wPokemonWithdrawDepositParameter] and a jr z, .okay11 - ld hl, wBreedMon1Nick + ld hl, wBreedMon1Nickname cp DAY_CARE_WITHDRAW jr z, .okay12 ld hl, wPartyMonNicknames @@ -819,10 +819,10 @@ RetrieveBreedmon: ld a, [wPokemonWithdrawDepositParameter] and a ld a, [wBreedMon1Species] - ld de, wBreedMon1Nick + ld de, wBreedMon1Nickname jr z, .okay ld a, [wBreedMon2Species] - ld de, wBreedMon2Nick + ld de, wBreedMon2Nickname .okay ld [hli], a @@ -839,7 +839,7 @@ RetrieveBreedmon: pop de call CopyBytes push hl - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld a, [wPartyCount] dec a call SkipNames @@ -909,14 +909,14 @@ GetLastPartyMon: ret DepositMonWithDayCareMan: - ld de, wBreedMon1Nick + ld de, wBreedMon1Nickname call DepositBreedmon xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a jp RemoveMonFromPartyOrBox DepositMonWithDayCareLady: - ld de, wBreedMon2Nick + ld de, wBreedMon2Nickname call DepositBreedmon xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a @@ -928,7 +928,7 @@ DepositBreedmon: call SkipNames call CopyBytes ld a, [wCurPartyMon] - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call SkipNames call CopyBytes ld a, [wCurPartyMon] @@ -967,7 +967,7 @@ SendMonIntoBox: call ShiftBoxMon ld hl, wPlayerName - ld de, sBoxMonOT + ld de, sBoxMonOTs ld bc, NAME_LENGTH call CopyBytes @@ -1071,7 +1071,7 @@ SendMonIntoBox: ret ShiftBoxMon: - ld hl, sBoxMonOT + ld hl, sBoxMonOTs ld bc, NAME_LENGTH call .shift @@ -1246,12 +1246,12 @@ RemoveMonFromPartyOrBox: ld [hli], a inc a jr nz, .loop - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld d, PARTY_LENGTH - 1 ld a, [wPokemonWithdrawDepositParameter] and a jr z, .party - ld hl, sBoxMonOT + ld hl, sBoxMonOTs ld d, MONS_PER_BOX - 1 .party @@ -1296,13 +1296,13 @@ RemoveMonFromPartyOrBox: jr z, .party5 ld bc, BOXMON_STRUCT_LENGTH add hl, bc - ld bc, sBoxMonOT + ld bc, sBoxMonOTs jr .copy .party5 ld bc, PARTYMON_STRUCT_LENGTH add hl, bc - ld bc, wPartyMonOT + ld bc, wPartyMonOTs .copy call CopyDataUntil ; Shift the nicknames @@ -1718,7 +1718,7 @@ GivePoke:: push hl ld a, [wCurPartyMon] - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call SkipNames ld d, h ld e, l @@ -1735,9 +1735,9 @@ GivePoke:: jr .skip_nickname .send_to_box - ld a, BANK(sBoxMonOT) + ld a, BANK(sBoxMonOTs) call OpenSRAM - ld de, sBoxMonOT + ld de, sBoxMonOTs ld bc, MON_NAME_LENGTH ld a, [wScriptBank] call FarCopyBytes diff --git a/engine/pokemon/move_mon_wo_mail.asm b/engine/pokemon/move_mon_wo_mail.asm index 79f70d05..b8e492f1 100644 --- a/engine/pokemon/move_mon_wo_mail.asm +++ b/engine/pokemon/move_mon_wo_mail.asm @@ -8,12 +8,12 @@ InsertPokemonIntoBox: ld [wNextBoxOrPartyIndex], a ld hl, sBoxMonNicknames ld bc, MON_NAME_LENGTH - ld de, wBufferMonNick + ld de, wBufferMonNickname call InsertDataIntoBoxOrParty ld a, [sBoxCount] dec a ld [wNextBoxOrPartyIndex], a - ld hl, sBoxMonOT + ld hl, sBoxMonOTs ld bc, NAME_LENGTH ld de, wBufferMonOT call InsertDataIntoBoxOrParty @@ -45,12 +45,12 @@ InsertPokemonIntoParty: ld [wNextBoxOrPartyIndex], a ld hl, wPartyMonNicknames ld bc, MON_NAME_LENGTH - ld de, wBufferMonNick + ld de, wBufferMonNickname call InsertDataIntoBoxOrParty ld a, [wPartyCount] dec a ld [wNextBoxOrPartyIndex], a - ld hl, wPartyMonOT + ld hl, wPartyMonOTs ld bc, NAME_LENGTH ld de, wBufferMonOT call InsertDataIntoBoxOrParty diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 60fb0dc7..f435fb7b 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -90,7 +90,7 @@ PlacePartyNicknames: push hl ld hl, wPartyMonNicknames ld a, b - call GetNick + call GetNickname pop hl call PlaceString pop hl @@ -695,7 +695,7 @@ YouHaveNoPKMNString: PrintPartyMenuActionText: ld a, [wCurPartyMon] ld hl, wPartyMonNicknames - call GetNick + call GetNickname ld a, [wPartyMenuActionText] and $f ld hl, .MenuActionTexts diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index d35d0d75..4aa4db52 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -338,7 +338,7 @@ StatsScreen_InitUpperHalf: dw wPartyMonNicknames dw wOTPartyMonNicknames dw sBoxMonNicknames - dw wBufferMonNick + dw wBufferMonNickname LoadPinkPage: push bc @@ -670,7 +670,7 @@ LoadBluePage: ; OT name ld a, [wMonType] cp BOXMON - ld a, BANK(sBoxMonOT) + ld a, BANK(sBoxMonOTs) call z, OpenSRAM ld de, wStringBuffer1 push de @@ -708,9 +708,9 @@ LoadBluePage: ret .OTNamePointers: - dw wPartyMonOT - dw wOTPartyMonOT - dw sBoxMonOT + dw wPartyMonOTs + dw wOTPartyMonOTs + dw sBoxMonOTs dw wBufferMonOT IDNoString: diff --git a/engine/pokemon/switchpartymons.asm b/engine/pokemon/switchpartymons.asm index 1ec3cf69..b6c152d7 100644 --- a/engine/pokemon/switchpartymons.asm +++ b/engine/pokemon/switchpartymons.asm @@ -81,12 +81,12 @@ _SwitchPartyMons: ld bc, PARTYMON_STRUCT_LENGTH call CopyBytes ld a, [wSwitchMonTo] - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call SkipNames push hl call .CopyNameToSwitchMonBuffer ld a, [wSwitchMonFrom] - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call SkipNames pop de push hl diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index b2a7e821..9588c617 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -192,7 +192,7 @@ PrintPartyMonPage1: hlcoord 1, 9 ld de, PrintParty_OTString call PlaceString - ld hl, wPartyMonOT + ld hl, wPartyMonOTs call GetCurPartyMonName hlcoord 4, 9 call PlaceString diff --git a/home/names.asm b/home/names.asm index 4e8e1224..dee25307 100644 --- a/home/names.asm +++ b/home/names.asm @@ -4,8 +4,8 @@ NamesPointers:: dba MoveNames ; MOVE_NAME dba NULL ; DUMMY_NAME dba ItemNames ; ITEM_NAME - dbw 0, wPartyMonOT ; PARTY_OT_NAME - dbw 0, wOTPartyMonOT ; ENEMY_OT_NAME + dbw 0, wPartyMonOTs ; PARTY_OT_NAME + dbw 0, wOTPartyMonOTs ; ENEMY_OT_NAME dba TrainerClassNames ; TRAINER_NAME dbw 4, MoveDescriptions ; MOVE_DESC_NAME_BROKEN (wrong bank) diff --git a/home/pokemon.asm b/home/pokemon.asm index 8d434089..6b16b7dd 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -268,11 +268,11 @@ GetBaseData:: pop bc ret -GetCurNick:: +GetCurNickname:: ld a, [wCurPartyMon] ld hl, wPartyMonNicknames -GetNick:: +GetNickname:: ; Get nickname a from list hl. push hl diff --git a/home/text.asm b/home/text.asm index 36fda27b..47881803 100644 --- a/home/text.asm +++ b/home/text.asm @@ -316,7 +316,7 @@ PlaceBattlersName: and a jr nz, .enemy - ld de, wBattleMonNick + ld de, wBattleMonNickname jr PlaceCommandCharacter .enemy @@ -324,7 +324,7 @@ PlaceBattlersName: call PlaceString ld h, b ld l, c - ld de, wEnemyMonNick + ld de, wEnemyMonNickname jr PlaceCommandCharacter PlaceEnemysName:: @@ -905,8 +905,8 @@ TextCommand_STRINGBUFFER:: ; 2: wStringBuffer5 ; 3: wStringBuffer2 ; 4: wStringBuffer1 -; 5: wEnemyMonNick -; 6: wBattleMonNick +; 5: wEnemyMonNickname +; 6: wBattleMonNickname ld a, [hli] push hl ld e, a diff --git a/macros/wram.asm b/macros/wram.asm index ba1e52dc..419c8397 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -51,7 +51,7 @@ red_box_struct: MACRO \1Type2:: db \1CatchRate:: db \1Moves:: ds NUM_MOVES -\1OTID:: dw +\1ID:: dw \1Exp:: ds 3 \1HPExp:: dw \1AttackExp:: dw @@ -97,13 +97,13 @@ battle_struct: MACRO ENDM curbox: MACRO -\1Count:: db -\1Species:: ds MONS_PER_BOX + 1 +\1Count:: db +\1Species:: ds MONS_PER_BOX + 1 \1Mons:: -\1Mon1:: box_struct \1Mon1 -\1Mon2:: ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX - 1) -\1MonOT:: ds NAME_LENGTH * MONS_PER_BOX -\1MonNicknames:: ds MON_NAME_LENGTH * MONS_PER_BOX +\1Mon1:: box_struct \1Mon1 +\1Mon2:: ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX - 1) +\1MonOTs:: ds NAME_LENGTH * MONS_PER_BOX +\1MonNicknames:: ds MON_NAME_LENGTH * MONS_PER_BOX \1MonNicknamesEnd:: \1End:: ENDM @@ -155,7 +155,7 @@ channel_struct: MACRO \1VibratoRate:: db ; hi:frames for each alt lo:frames to the next alt \1PitchSlideTarget:: dw ; frequency endpoint for pitch slide \1PitchSlideAmount:: db -\1PitchSlideAmountFraction:: db +\1PitchSlideAmountFraction:: db \1Field25:: db ds 1 \1PitchOffset:: dw @@ -170,13 +170,13 @@ channel_struct: MACRO ENDM mailmsg: MACRO -\1Message:: ds MAIL_MSG_LENGTH -\1MessageEnd:: ds 1 -\1Author:: ds PLAYER_NAME_LENGTH -\1AuthorNationality:: ds 2 -\1AuthorID:: dw -\1Species:: db -\1Type:: db +\1Message:: ds MAIL_MSG_LENGTH +\1MessageEnd:: db +\1Author:: ds PLAYER_NAME_LENGTH +\1Nationality:: dw +\1AuthorID:: dw +\1Species:: db +\1Type:: db \1End:: ENDM @@ -348,24 +348,23 @@ sprite_anim_struct: MACRO ENDM battle_anim_struct: MACRO -; Placeholder until we can figure out what it all means -\1Index:: db -\1OAMFlags:: db -\1Field02:: ds 1 -\1FramesetID:: db -\1Function:: db -\1Palette:: db -\1TileID:: db -\1XCoord:: db -\1YCoord:: db -\1XOffset:: db -\1YOffset:: db -\1Param:: db -\1Duration:: db -\1Frame:: db -\1JumptableIndex:: db -\1Var1:: db -\1Var2:: db +\1Index:: db +\1OAMFlags:: db +\1FixY:: db +\1FramesetID:: db +\1Function:: db +\1Palette:: db +\1TileID:: db +\1XCoord:: db +\1YCoord:: db +\1XOffset:: db +\1YOffset:: db +\1Param:: db +\1Duration:: db +\1Frame:: db +\1JumptableIndex:: db +\1Var1:: db +\1Var2:: db ds 7 ENDM @@ -564,8 +564,26 @@ wLinkPlayerPartyMon4:: party_struct wLinkPlayerPartyMon4 wLinkPlayerPartyMon5:: party_struct wLinkPlayerPartyMon5 wLinkPlayerPartyMon6:: party_struct wLinkPlayerPartyMon6 assert_table_length PARTY_LENGTH -wLinkPlayerPartyMonOTNames:: ds NAME_LENGTH * PARTY_LENGTH -wLinkPlayerPartyMonNicks:: ds MON_NAME_LENGTH * PARTY_LENGTH + +wLinkPlayerPartyMonOTs:: + table_width NAME_LENGTH, wLinkPlayerPartyMonOTs +wLinkPlayerPartyMon1OT:: ds NAME_LENGTH +wLinkPlayerPartyMon2OT:: ds NAME_LENGTH +wLinkPlayerPartyMon3OT:: ds NAME_LENGTH +wLinkPlayerPartyMon4OT:: ds NAME_LENGTH +wLinkPlayerPartyMon5OT:: ds NAME_LENGTH +wLinkPlayerPartyMon6OT:: ds NAME_LENGTH + assert_table_length PARTY_LENGTH + +wLinkPlayerPartyMonNicknames:: + table_width MON_NAME_LENGTH, wLinkPlayerPartyMonNicknames +wLinkPlayerPartyMon1Nickname:: ds MON_NAME_LENGTH +wLinkPlayerPartyMon2Nickname:: ds MON_NAME_LENGTH +wLinkPlayerPartyMon3Nickname:: ds MON_NAME_LENGTH +wLinkPlayerPartyMon4Nickname:: ds MON_NAME_LENGTH +wLinkPlayerPartyMon5Nickname:: ds MON_NAME_LENGTH +wLinkPlayerPartyMon6Nickname:: ds MON_NAME_LENGTH + assert_table_length PARTY_LENGTH NEXTU ; time capsule party data @@ -578,8 +596,26 @@ wTimeCapsulePartyMon4:: red_party_struct wTimeCapsulePartyMon4 wTimeCapsulePartyMon5:: red_party_struct wTimeCapsulePartyMon5 wTimeCapsulePartyMon6:: red_party_struct wTimeCapsulePartyMon6 assert_table_length PARTY_LENGTH -wTimeCapsulePartyMonOTNames:: ds NAME_LENGTH * PARTY_LENGTH -wTimeCapsulePartyMonNicks:: ds MON_NAME_LENGTH * PARTY_LENGTH + +wTimeCapsulePartyMonOTs:: + table_width NAME_LENGTH, wTimeCapsulePartyMonOTs +wTimeCapsulePartyMon1OT:: ds NAME_LENGTH +wTimeCapsulePartyMon2OT:: ds NAME_LENGTH +wTimeCapsulePartyMon3OT:: ds NAME_LENGTH +wTimeCapsulePartyMon4OT:: ds NAME_LENGTH +wTimeCapsulePartyMon5OT:: ds NAME_LENGTH +wTimeCapsulePartyMon6OT:: ds NAME_LENGTH + assert_table_length PARTY_LENGTH + +wTimeCapsulePartyMonNicknames:: + table_width MON_NAME_LENGTH, wTimeCapsulePartyMonNicknames +wTimeCapsulePartyMon1Nickname:: ds MON_NAME_LENGTH +wTimeCapsulePartyMon2Nickname:: ds MON_NAME_LENGTH +wTimeCapsulePartyMon3Nickname:: ds MON_NAME_LENGTH +wTimeCapsulePartyMon4Nickname:: ds MON_NAME_LENGTH +wTimeCapsulePartyMon5Nickname:: ds MON_NAME_LENGTH +wTimeCapsulePartyMon6Nickname:: ds MON_NAME_LENGTH + assert_table_length PARTY_LENGTH NEXTU ; link patch lists @@ -591,7 +627,16 @@ NEXTU ; link data prep ds 1000 wCurLinkOTPartyMonTypePointer:: dw -wLinkOTPartyMonTypes:: ds 2 * PARTY_LENGTH + +wLinkOTPartyMonTypes:: + table_width 2, wLinkOTPartyMonTypes +wLinkOTPartyMon1Type:: dw +wLinkOTPartyMon2Type:: dw +wLinkOTPartyMon3Type:: dw +wLinkOTPartyMon4Type:: dw +wLinkOTPartyMon5Type:: dw +wLinkOTPartyMon6Type:: dw + assert_table_length PARTY_LENGTH NEXTU ; link mail data @@ -773,8 +818,8 @@ wBattle:: wEnemyMoveStruct:: move_struct wEnemyMoveStruct wPlayerMoveStruct:: move_struct wPlayerMoveStruct -wEnemyMonNick:: ds MON_NAME_LENGTH -wBattleMonNick:: ds MON_NAME_LENGTH +wEnemyMonNickname:: ds MON_NAME_LENGTH +wBattleMonNickname:: ds MON_NAME_LENGTH UNION ; battle mon @@ -1401,7 +1446,7 @@ wDefaultSpawnpoint:: db UNION ; mon buffer -wBufferMonNick:: ds MON_NAME_LENGTH +wBufferMonNickname:: ds MON_NAME_LENGTH wBufferMonOT:: ds NAME_LENGTH wBufferMon:: party_struct wBufferMon @@ -1553,7 +1598,7 @@ NEXTU ; trade wCurTradePartyMon:: db wCurOTTradePartyMon:: db -wBufferTrademonNick:: ds MON_NAME_LENGTH +wBufferTrademonNickname:: ds MON_NAME_LENGTH NEXTU ; link battle record data @@ -2721,9 +2766,25 @@ wPartyMon5:: party_struct wPartyMon5 wPartyMon6:: party_struct wPartyMon6 assert_table_length PARTY_LENGTH -wPartyMonOT:: ds NAME_LENGTH * PARTY_LENGTH +wPartyMonOTs:: + table_width NAME_LENGTH, wPartyMonOTs +wPartyMon1OT:: ds NAME_LENGTH +wPartyMon2OT:: ds NAME_LENGTH +wPartyMon3OT:: ds NAME_LENGTH +wPartyMon4OT:: ds NAME_LENGTH +wPartyMon5OT:: ds NAME_LENGTH +wPartyMon6OT:: ds NAME_LENGTH + assert_table_length PARTY_LENGTH -wPartyMonNicknames:: ds MON_NAME_LENGTH * PARTY_LENGTH +wPartyMonNicknames:: + table_width MON_NAME_LENGTH, wPartyMonNicknames +wPartyMon1Nickname:: ds MON_NAME_LENGTH +wPartyMon2Nickname:: ds MON_NAME_LENGTH +wPartyMon3Nickname:: ds MON_NAME_LENGTH +wPartyMon4Nickname:: ds MON_NAME_LENGTH +wPartyMon5Nickname:: ds MON_NAME_LENGTH +wPartyMon6Nickname:: ds MON_NAME_LENGTH + assert_table_length PARTY_LENGTH wPartyMonNicknamesEnd:: ds 22 @@ -2745,9 +2806,9 @@ wDayCareMan:: ; bit 0: monster 1 in day-care db -wBreedMon1Nick:: ds MON_NAME_LENGTH -wBreedMon1OT:: ds NAME_LENGTH -wBreedMon1:: box_struct wBreedMon1 +wBreedMon1Nickname:: ds MON_NAME_LENGTH +wBreedMon1OT:: ds NAME_LENGTH +wBreedMon1:: box_struct wBreedMon1 wDayCareLady:: ; bit 7: active @@ -2761,13 +2822,13 @@ wBreedMotherOrNonDitto:: ; nz: no db -wBreedMon2Nick:: ds MON_NAME_LENGTH -wBreedMon2OT:: ds NAME_LENGTH -wBreedMon2:: box_struct wBreedMon2 +wBreedMon2Nickname:: ds MON_NAME_LENGTH +wBreedMon2OT:: ds NAME_LENGTH +wBreedMon2:: box_struct wBreedMon2 -wEggNick:: ds MON_NAME_LENGTH -wEggOT:: ds NAME_LENGTH -wEggMon:: box_struct wEggMon +wEggMonNickname:: ds MON_NAME_LENGTH +wEggMonOT:: ds NAME_LENGTH +wEggMon:: box_struct wEggMon wBugContestSecondPartySpecies:: db wContestMon:: party_struct wContestMon @@ -2819,10 +2880,26 @@ wOTPartyMon4:: party_struct wOTPartyMon4 wOTPartyMon5:: party_struct wOTPartyMon5 wOTPartyMon6:: party_struct wOTPartyMon6 assert_table_length PARTY_LENGTH -wOTPartyMonsEnd:: -wOTPartyMonOT:: ds NAME_LENGTH * PARTY_LENGTH -wOTPartyMonNicknames:: ds MON_NAME_LENGTH * PARTY_LENGTH +wOTPartyMonOTs:: + table_width NAME_LENGTH, wOTPartyMonOTs +wOTPartyMon1OT:: ds NAME_LENGTH +wOTPartyMon2OT:: ds NAME_LENGTH +wOTPartyMon3OT:: ds NAME_LENGTH +wOTPartyMon4OT:: ds NAME_LENGTH +wOTPartyMon5OT:: ds NAME_LENGTH +wOTPartyMon6OT:: ds NAME_LENGTH + assert_table_length PARTY_LENGTH + +wOTPartyMonNicknames:: + table_width MON_NAME_LENGTH, wOTPartyMonNicknames +wOTPartyMon1Nickname:: ds MON_NAME_LENGTH +wOTPartyMon2Nickname:: ds MON_NAME_LENGTH +wOTPartyMon3Nickname:: ds MON_NAME_LENGTH +wOTPartyMon4Nickname:: ds MON_NAME_LENGTH +wOTPartyMon5Nickname:: ds MON_NAME_LENGTH +wOTPartyMon6Nickname:: ds MON_NAME_LENGTH + assert_table_length PARTY_LENGTH wOTPartyDataEnd:: NEXTU |