pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Consistent labels for each nickname in RAM

Browse Source
This commit is contained in:
Rangi 2021-03-17 16:16:02 -04:00
parent 6c8f8609cb
commit 4522162d45
57 changed files with 382 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/npc_trade_constants.asm
View File

@ -3,13 +3,13 @@ rsreset
NPCTRADE_DIALOG rb NPCTRADE_DIALOG rb
NPCTRADE_GIVEMON rb NPCTRADE_GIVEMON rb
NPCTRADE_GETMON rb NPCTRADE_GETMON rb
NPCTRADE_NICK rb MON_NAME_LENGTH NPCTRADE_NICKNAME rb MON_NAME_LENGTH
NPCTRADE_DVS rw NPCTRADE_DVS rw
NPCTRADE_ITEM rb NPCTRADE_ITEM rb
NPCTRADE_OT_ID rw NPCTRADE_OT_ID rw
NPCTRADE_OT_NAME rb NAME_LENGTH NPCTRADE_OT_NAME rb NAME_LENGTH
NPCTRADE_GENDER rb NPCTRADE_GENDER rb
NPCTRADE_PADDING rb rb_skip
NPCTRADE_STRUCT_LENGTH EQU _RS NPCTRADE_STRUCT_LENGTH EQU _RS
; NPCTrades indexes (see data/events/npc_trades.asm) ; NPCTrades indexes (see data/events/npc_trades.asm)

42
data/text/battle.asm
View File

@ -9,7 +9,7 @@ BattleText_PlayerPickedUpPayDayMoney:
WildPokemonAppearedText: WildPokemonAppearedText:
text "Wild @" text "Wild @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "appeared!" line "appeared!"
prompt prompt
@ -17,20 +17,20 @@ WildPokemonAppearedText:
HookedPokemonAttackedText: HookedPokemonAttackedText:
text "The hooked" text "The hooked"
line "@" line "@"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
cont "attacked!" cont "attacked!"
prompt prompt
PokemonFellFromTreeText: PokemonFellFromTreeText:
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text " fell" text " fell"
line "out of the tree!" line "out of the tree!"
prompt prompt
WildCelebiAppearedText: WildCelebiAppearedText:
text "Wild @" text "Wild @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "appeared!" line "appeared!"
prompt prompt
@ -42,14 +42,14 @@ WantsToBattleText::
BattleText_WildFled: BattleText_WildFled:
text "Wild @" text "Wild @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "fled!" line "fled!"
prompt prompt
BattleText_EnemyFled: BattleText_EnemyFled:
text "Enemy @" text "Enemy @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "fled!" line "fled!"
prompt prompt
@ -161,7 +161,7 @@ BattleText_TheSandstormSubsided:
BattleText_EnemyMonFainted: BattleText_EnemyMonFainted:
text "Enemy @" text "Enemy @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "fainted!" line "fainted!"
prompt prompt
@ -206,7 +206,7 @@ UnusedRivalLossText: ; unreferenced
prompt prompt
BattleText_MonFainted: BattleText_MonFainted:
text_ram wBattleMonNick text_ram wBattleMonNickname
text_start text_start
line "fainted!" line "fainted!"
prompt prompt
@ -230,7 +230,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
text "<ENEMY>" text "<ENEMY>"
line "is about to use" line "is about to use"
cont "@" cont "@"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text "." text "."
para "Will <PLAYER>" para "Will <PLAYER>"
@ -241,7 +241,7 @@ BattleText_EnemySentOut:
text "<ENEMY>" text "<ENEMY>"
line "sent out" line "sent out"
cont "@" cont "@"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text "!" text "!"
done done
@ -308,13 +308,13 @@ BattleText_ItemsCantBeUsedHere:
prompt prompt
BattleText_MonIsAlreadyOut: BattleText_MonIsAlreadyOut:
text_ram wBattleMonNick text_ram wBattleMonNickname
text_start text_start
line "is already out." line "is already out."
prompt prompt
BattleText_MonCantBeRecalled: BattleText_MonCantBeRecalled:
text_ram wBattleMonNick text_ram wBattleMonNickname
text_start text_start
line "can't be recalled!" line "can't be recalled!"
prompt prompt
@ -330,7 +330,7 @@ BattleText_TheMoveIsDisabled:
prompt prompt
BattleText_MonHasNoMovesLeft: BattleText_MonHasNoMovesLeft:
text_ram wBattleMonNick text_ram wBattleMonNickname
text_start text_start
line "has no moves left!" line "has no moves left!"
done done
@ -353,14 +353,14 @@ BattleText_StringBuffer1GrewToLevel:
BattleText_WildMonIsEating: BattleText_WildMonIsEating:
text "Wild @" text "Wild @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "is eating!" line "is eating!"
prompt prompt
BattleText_WildMonIsAngry: BattleText_WildMonIsAngry:
text "Wild @" text "Wild @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "is angry!" line "is angry!"
prompt prompt
@ -516,37 +516,37 @@ DisabledMoveText:
prompt prompt
LoafingAroundText: LoafingAroundText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " is" text " is"
line "loafing around." line "loafing around."
prompt prompt
BeganToNapText: BeganToNapText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " began" text " began"
line "to nap!" line "to nap!"
prompt prompt
WontObeyText: WontObeyText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " won't" text " won't"
line "obey!" line "obey!"
prompt prompt
TurnedAwayText: TurnedAwayText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " turned" text " turned"
line "away!" line "away!"
prompt prompt
IgnoredOrdersText: IgnoredOrdersText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " ignored" text " ignored"
line "orders!" line "orders!"
prompt prompt
IgnoredSleepingText: IgnoredSleepingText:
text_ram wBattleMonNick text_ram wBattleMonNickname
text " ignored" text " ignored"
line "orders…sleeping!" line "orders…sleeping!"
prompt prompt

4
data/text/common_1.asm
View File

@ -1106,7 +1106,7 @@ _EnemyWithdrewText::
text "<ENEMY>" text "<ENEMY>"
line "withdrew" line "withdrew"
cont "@" cont "@"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text "!" text "!"
prompt prompt
@ -1116,7 +1116,7 @@ _EnemyUsedOnText::
text_ram wMonOrItemNameBuffer text_ram wMonOrItemNameBuffer
text_start text_start
cont "on @" cont "on @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text "!" text "!"
prompt prompt

8
data/text/common_2.asm
View File

@ -133,12 +133,12 @@ _YourFoesWeakGetmMonText::
text_end text_end
_BattleMonNicknameText:: _BattleMonNicknameText::
text_ram wBattleMonNick text_ram wBattleMonNickname
text "!" text "!"
done done
_BattleMonNickCommaText:: _BattleMonNickCommaText::
text_ram wBattleMonNick text_ram wBattleMonNickname
text ",@" text ",@"
text_end text_end
@ -807,7 +807,7 @@ _BreedAskNicknameText::
_LeftWithDayCareLadyText:: _LeftWithDayCareLadyText::
text "It's @" text "It's @"
text_ram wBreedMon2Nick text_ram wBreedMon2Nickname
text_start text_start
line "that was left with" line "that was left with"
cont "the DAY-CARE LADY." cont "the DAY-CARE LADY."
@ -815,7 +815,7 @@ _LeftWithDayCareLadyText::
_LeftWithDayCareManText:: _LeftWithDayCareManText::
text "It's @" text "It's @"
text_ram wBreedMon1Nick text_ram wBreedMon1Nickname
text_start text_start
line "that was left with" line "that was left with"
cont "the DAY-CARE MAN." cont "the DAY-CARE MAN."

10
data/text/common_3.asm
View File

@ -72,7 +72,7 @@ _LinkAbnormalMonText::
_LinkAskTradeForText:: _LinkAskTradeForText::
text "Trade @" text "Trade @"
text_ram wBufferTrademonNick text_ram wBufferTrademonNickname
text_start text_start
line "for @" line "for @"
text_ram wStringBuffer1 text_ram wStringBuffer1
@ -322,7 +322,7 @@ _SeerTradeText::
text_ram wSeerNickname text_ram wSeerNickname
text_start text_start
line "came from @" line "came from @"
text_ram wSeerOTName text_ram wSeerOT
text_start text_start
cont "in a trade?" cont "in a trade?"
@ -330,7 +330,7 @@ _SeerTradeText::
text_ram wSeerCaughtLocation text_ram wSeerCaughtLocation
text_start text_start
line "was where @" line "was where @"
text_ram wSeerOTName text_ram wSeerOT
text_start text_start
cont "met @" cont "met @"
text_ram wSeerNickname text_ram wSeerNickname
@ -1216,7 +1216,7 @@ _BallSoCloseText::
Text_BallCaught:: Text_BallCaught::
text "Gotcha! @" text "Gotcha! @"
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text_start text_start
line "was caught!@" line "was caught!@"
sound_caught_mon sound_caught_mon
@ -1237,7 +1237,7 @@ _BallSentToPCText::
prompt prompt
_NewDexDataText:: _NewDexDataText::
text_ram wEnemyMonNick text_ram wEnemyMonNickname
text "'s data" text "'s data"
line "was newly added to" line "was newly added to"
cont "the #DEX.@" cont "the #DEX.@"

4
data/text_buffers.asm
View File

@ -5,5 +5,5 @@ StringBufferPointers::
dw wStringBuffer5 ; 2 dw wStringBuffer5 ; 2
dw wStringBuffer2 ; 3 dw wStringBuffer2 ; 3
dw wStringBuffer1 ; 4 dw wStringBuffer1 ; 4
dw wEnemyMonNick ; 5 dw wEnemyMonNickname ; 5
dw wBattleMonNick ; 6 dw wBattleMonNickname ; 6

2
docs/bugs_and_glitches.md
View File

@ -566,7 +566,7 @@ This bug affects Attract, Curse, Foresight, Mean Look, Mimic, Nightmare, Spider
.got_mon .got_mon
ld a, [wCurBeatUpPartyMon] ld a, [wCurBeatUpPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld a, MON_HP ld a, MON_HP
call GetBeatupMonLocation call GetBeatupMonLocation
ld a, [hli] ld a, [hli]

14
docs/text_commands.md
View File

@ -110,13 +110,13 @@ Play `SFX_SLOT_MACHINE_START`.
Write text from one of the following addresses (listed in [data/text_buffers.asm](https://github.com/pret/pokecrystal/blob/master/data/text_buffers.asm)): Write text from one of the following addresses (listed in [data/text_buffers.asm](https://github.com/pret/pokecrystal/blob/master/data/text_buffers.asm)):
0. `StringBuffer3` 0. `wStringBuffer3`
1. `StringBuffer4` 1. `wStringBuffer4`
2. `StringBuffer5` 2. `wStringBuffer5`
3. `StringBuffer2` 3. `wStringBuffer2`
4. `StringBuffer1` 4. `wStringBuffer1`
5. `EnemyMonNick` 5. `wEnemyMonNickname`
6. `BattleMonNick` 6. `wBattleMonNickname`
## `$15`: `text_today` ## `$15`: `text_today`

14
engine/battle/core.asm
View File

@ -3885,7 +3885,7 @@ InitBattleMon:
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld a, [wCurBattleMon] ld a, [wCurBattleMon]
call SkipNames call SkipNames
ld de, wBattleMonNick ld de, wBattleMonNickname
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld hl, wBattleMonAttack ld hl, wBattleMonAttack
@ -3965,7 +3965,7 @@ InitEnemyMon:
ld hl, wOTPartyMonNicknames ld hl, wOTPartyMonNicknames
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call SkipNames call SkipNames
ld de, wEnemyMonNick ld de, wEnemyMonNickname
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld hl, wEnemyMonAttack ld hl, wEnemyMonAttack
@ -4642,7 +4642,7 @@ CheckDanger:
ret ret
PrintPlayerHUD: PrintPlayerHUD:
ld de, wBattleMonNick ld de, wBattleMonNickname
hlcoord 10, 7 hlcoord 10, 7
call Battle_DummyFunction call Battle_DummyFunction
call PlaceString call PlaceString
@ -4728,7 +4728,7 @@ DrawEnemyHUD:
ld [wCurSpecies], a ld [wCurSpecies], a
ld [wCurPartySpecies], a ld [wCurPartySpecies], a
call GetBaseData call GetBaseData
ld de, wEnemyMonNick ld de, wEnemyMonNickname
hlcoord 1, 0 hlcoord 1, 0
call Battle_DummyFunction call Battle_DummyFunction
call PlaceString call PlaceString
@ -6394,7 +6394,7 @@ LoadEnemyMon:
; Update enemy nick ; Update enemy nick
ld hl, wStringBuffer1 ld hl, wStringBuffer1
ld de, wEnemyMonNick ld de, wEnemyMonNickname
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
@ -7112,7 +7112,7 @@ GiveExperiencePoints:
ld [wStringBuffer2], a ld [wStringBuffer2], a
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld hl, Text_MonGainedExpPoint ld hl, Text_MonGainedExpPoint
call BattleTextbox call BattleTextbox
ld a, [wStringBuffer2 + 1] ld a, [wStringBuffer2 + 1]
@ -7523,7 +7523,7 @@ AnimateExpBar:
ld c, $40 ld c, $40
call .LoopBarAnimation call .LoopBarAnimation
call PrintPlayerHUD call PrintPlayerHUD
ld hl, wBattleMonNick ld hl, wBattleMonNickname
ld de, wStringBuffer1 ld de, wStringBuffer1
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes

2
engine/battle/move_effects/beat_up.asm
View File

@ -28,7 +28,7 @@ BattleCommand_BeatUp:
.got_mon .got_mon
ld a, [wCurBeatUpPartyMon] ld a, [wCurBeatUpPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld a, MON_HP ld a, MON_HP
call GetBeatupMonLocation call GetBeatupMonLocation
ld a, [hli] ld a, [hli]

2
engine/battle/read_trainer_party.asm
View File

@ -14,7 +14,7 @@ ReadTrainerParty:
ld [hl], a ld [hl], a
ld hl, wOTPartyMons ld hl, wOTPartyMons
ld bc, wOTPartyMonsEnd - wOTPartyMons ld bc, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH
xor a xor a
call ByteFill call ByteFill

2
engine/events/battle_tower/battle_tower.asm
View File

@ -1258,7 +1258,7 @@ BattleTowerAction_EggTicket: ; BattleTowerAction $0e
cp EGG cp EGG
jr nz, .not_egg jr nz, .not_egg
push hl push hl
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld de, NAME_LENGTH_JAPANESE ld de, NAME_LENGTH_JAPANESE
ld a, b ld a, b
and a and a

2
engine/events/bug_contest/display_stats.asm
View File

@ -48,7 +48,7 @@ DisplayCaughtContestMonStats:
ld [wTempMonLevel], a ld [wTempMonLevel], a
call PrintLevel call PrintLevel
ld de, wEnemyMonNick ld de, wEnemyMonNickname
hlcoord 1, 8 hlcoord 1, 8
call PlaceString call PlaceString

20
engine/events/daycare.asm
View File

@ -40,7 +40,7 @@ DayCareMan:
.AskWithdrawMon: .AskWithdrawMon:
farcall GetBreedMon1LevelGrowth farcall GetBreedMon1LevelGrowth
ld hl, wBreedMon1Nick ld hl, wBreedMon1Nickname
call GetPriceToRetrieveBreedmon call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon call DayCare_AskWithdrawBreedMon
jr c, .print_text jr c, .print_text
@ -78,7 +78,7 @@ DayCareLady:
.AskWithdrawMon: .AskWithdrawMon:
farcall GetBreedMon2LevelGrowth farcall GetBreedMon2LevelGrowth
ld hl, wBreedMon2Nick ld hl, wBreedMon2Nickname
call GetPriceToRetrieveBreedmon call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon call DayCare_AskWithdrawBreedMon
jr c, .print_text jr c, .print_text
@ -137,7 +137,7 @@ DayCareAskDepositPokemon:
jr c, .HoldingMail jr c, .HoldingMail
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call GetNick call GetNickname
and a and a
ret ret
@ -467,13 +467,13 @@ DayCare_GiveEgg:
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call DayCare_GetCurrentPartyMember call DayCare_GetCurrentPartyMember
ld hl, wEggNick ld hl, wEggMonNickname
call CopyBytes call CopyBytes
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call DayCare_GetCurrentPartyMember call DayCare_GetCurrentPartyMember
ld hl, wEggOT ld hl, wEggMonOT
call CopyBytes call CopyBytes
ld hl, wPartyMon1 ld hl, wPartyMon1
@ -550,10 +550,10 @@ DayCare_InitBreeding:
ld hl, wEggMon ld hl, wEggMon
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
call ByteFill call ByteFill
ld hl, wEggNick ld hl, wEggMonNickname
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call ByteFill call ByteFill
ld hl, wEggOT ld hl, wEggMonOT
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call ByteFill call ByteFill
ld a, [wBreedMon1DVs] ld a, [wBreedMon1DVs]
@ -606,11 +606,11 @@ DayCare_InitBreeding:
ld [wEggMonSpecies], a ld [wEggMonSpecies], a
call GetBaseData call GetBaseData
ld hl, wEggNick ld hl, wEggMonNickname
ld de, .String_EGG ld de, .String_EGG
call CopyName2 call CopyName2
ld hl, wPlayerName ld hl, wPlayerName
ld de, wEggOT ld de, wEggMonOT
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
xor a xor a

2
engine/events/haircut.asm
View File

@ -33,7 +33,7 @@ HaircutOrGrooming:
cp EGG cp EGG
jr z, .egg jr z, .egg
push hl push hl
call GetCurNick call GetCurNickname
call CopyPokemonName_Buffer1_Buffer3 call CopyPokemonName_Buffer1_Buffer3
pop hl pop hl
call Random call Random

2
engine/events/magikarp.asm
View File

@ -49,7 +49,7 @@ CheckMagikarpLength:
ld [de], a ld [de], a
inc de inc de
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
call CopyBytes call CopyBytes
ld a, MAGIKARPLENGTH_BEAT_RECORD ld a, MAGIKARPLENGTH_BEAT_RECORD

2
engine/events/move_tutor.asm
View File

@ -60,7 +60,7 @@ CheckCanLearnMoveTutorMove:
push bc push bc
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
pop bc pop bc
ld a, c ld a, c

12
engine/events/name_rater.asm
View File

@ -14,7 +14,7 @@ _NameRater:
cp EGG cp EGG
jr z, .egg jr z, .egg
; ... or a Pokemon you got from a trade. ; ... or a Pokemon you got from a trade.
call GetCurNick call GetCurNickname
call CheckIfMonIsYourOT call CheckIfMonIsYourOT
jr c, .traded jr c, .traded
; This name is good, but we can do better. How about it? ; This name is good, but we can do better. How about it?
@ -57,7 +57,7 @@ _NameRater:
.samename .samename
push hl push hl
call GetCurNick call GetCurNickname
ld hl, NameRaterNamedText ld hl, NameRaterNamedText
call PrintText call PrintText
pop hl pop hl
@ -80,7 +80,7 @@ _NameRater:
CheckIfMonIsYourOT: CheckIfMonIsYourOT:
; Checks to see if the partymon loaded in [wCurPartyMon] has the different OT as you. Returns carry if not. ; 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 bc, NAME_LENGTH
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call AddNTimes call AddNTimes
@ -138,10 +138,10 @@ CompareNewToOld:
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call AddNTimes call AddNTimes
push hl push hl
call GetNicknameLength call GetNicknamenameLength
ld b, c ld b, c
ld hl, wStringBuffer2 ld hl, wStringBuffer2
call GetNicknameLength call GetNicknamenameLength
pop hl pop hl
ld a, c ld a, c
cp b cp b
@ -165,7 +165,7 @@ CompareNewToOld:
scf scf
ret ret
GetNicknameLength: GetNicknamenameLength:
; Gets the length of the name starting at hl and returns it in c. ; Gets the length of the name starting at hl and returns it in c.
ld c, 0 ld c, 0
.loop .loop

6
engine/events/npc_trade.asm
View File

@ -132,7 +132,7 @@ DoNPCTrade:
call GetTradeMonName call GetTradeMonName
call CopyTradeName call CopyTradeName
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call Trade_GetAttributeOfCurrentPartymon call Trade_GetAttributeOfCurrentPartymon
ld de, wPlayerTrademonOTName ld de, wPlayerTrademonOTName
@ -196,7 +196,7 @@ DoNPCTrade:
.incomplete .incomplete
farcall SetGiftPartyMonCaughtData farcall SetGiftPartyMonCaughtData
ld e, NPCTRADE_NICK ld e, NPCTRADE_NICKNAME
call GetTradeAttr call GetTradeAttr
ld de, wOTTrademonNickname ld de, wOTTrademonNickname
call CopyTradeName call CopyTradeName
@ -216,7 +216,7 @@ DoNPCTrade:
ld de, wOTTrademonSenderName ld de, wOTTrademonSenderName
call CopyTradeName call CopyTradeName
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call Trade_GetAttributeOfLastPartymon call Trade_GetAttributeOfLastPartymon
ld hl, wOTTrademonOTName ld hl, wOTTrademonOTName

10
engine/events/odd_egg.asm
View File

@ -42,8 +42,8 @@ _GiveOddEgg:
ld a, NICKNAMED_MON_STRUCT_LENGTH ld a, NICKNAMED_MON_STRUCT_LENGTH
call AddNTimes call AddNTimes
; Writes to wOddEgg, wOddEggName, and wOddEggOTName, ; Writes to wOddEgg, wOddEggName, and wOddEggOT,
; even though OddEggs does not have data for wOddEggOTName ; even though OddEggs does not have data for wOddEggOT
ld de, wOddEgg ld de, wOddEgg
ld bc, NICKNAMED_MON_STRUCT_LENGTH + NAME_LENGTH ld bc, NICKNAMED_MON_STRUCT_LENGTH + NAME_LENGTH
call CopyBytes call CopyBytes
@ -78,11 +78,11 @@ _GiveOddEgg:
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
; load pointer to wTempOddEggNickname in wMobileMonOTNamePointer ; load pointer to wTempOddEggNickname in wMobileMonOTPointer
ld a, LOW(wTempOddEggNickname) ld a, LOW(wTempOddEggNickname)
ld [wMobileMonOTNamePointer], a ld [wMobileMonOTPointer], a
ld a, HIGH(wTempOddEggNickname) ld a, HIGH(wTempOddEggNickname)
ld [wMobileMonOTNamePointer + 1], a ld [wMobileMonOTPointer + 1], a
; load pointer to wOddEggName in wMobileMonNicknamePointer ; load pointer to wOddEggName in wMobileMonNicknamePointer
ld a, LOW(wOddEggName) ld a, LOW(wOddEggName)
ld [wMobileMonNicknamePointer], a ld [wMobileMonNicknamePointer], a

24
engine/events/overworld.asm
View File

@ -19,13 +19,13 @@ FieldMoveJumptable:
scf scf
ret ret
GetPartyNick: GetPartyNickname:
; write wCurPartyMon nickname to wStringBuffer1-3 ; write wCurPartyMon nickname to wStringBuffer1-3
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld a, BOXMON ld a, BOXMON
ld [wMonType], a ld [wMonType], a
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call GetNick call GetNickname
call CopyName1 call CopyName1
; copy text from wStringBuffer2 to wStringBuffer3 ; copy text from wStringBuffer2 to wStringBuffer3
ld de, wStringBuffer2 ld de, wStringBuffer2
@ -204,7 +204,7 @@ Script_CutFromMenu:
special UpdateTimePals special UpdateTimePals
Script_Cut: Script_Cut:
callasm GetPartyNick callasm GetPartyNickname
writetext UseCutText writetext UseCutText
reloadmappart reloadmappart
callasm CutDownTreeOrGrass callasm CutDownTreeOrGrass
@ -379,7 +379,7 @@ SurfFunction:
.DoSurf: .DoSurf:
call GetSurfType call GetSurfType
ld [wSurfingPlayerState], a ld [wSurfingPlayerState], a
call GetPartyNick call GetPartyNickname
ld hl, SurfFromMenuScript ld hl, SurfFromMenuScript
call QueueScript call QueueScript
ld a, $81 ld a, $81
@ -516,7 +516,7 @@ TrySurfOW::
call GetSurfType call GetSurfType
ld [wSurfingPlayerState], a ld [wSurfingPlayerState], a
call GetPartyNick call GetPartyNickname
ld a, BANK(AskSurfScript) ld a, BANK(AskSurfScript)
ld hl, AskSurfScript ld hl, AskSurfScript
@ -674,7 +674,7 @@ Script_WaterfallFromMenu:
special UpdateTimePals special UpdateTimePals
Script_UsedWaterfall: Script_UsedWaterfall:
callasm GetPartyNick callasm GetPartyNickname
writetext .UseWaterfallText writetext .UseWaterfallText
waitbutton waitbutton
closetext closetext
@ -798,7 +798,7 @@ EscapeRopeOrDig:
ld de, wNextWarp ld de, wNextWarp
ld bc, 3 ld bc, 3
call CopyBytes call CopyBytes
call GetPartyNick call GetPartyNickname
ld a, [wEscapeRopeOrDigType] ld a, [wEscapeRopeOrDigType]
cp $2 cp $2
jr nz, .escaperope jr nz, .escaperope
@ -911,7 +911,7 @@ TeleportFunction:
ret ret
.DoTeleport: .DoTeleport:
call GetPartyNick call GetPartyNickname
ld hl, .TeleportScript ld hl, .TeleportScript
call QueueScript call QueueScript
ld a, $81 ld a, $81
@ -999,7 +999,7 @@ SetStrengthFlag:
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld [wStrengthSpecies], a ld [wStrengthSpecies], a
call GetPartyNick call GetPartyNickname
ret ret
Script_StrengthFromMenu: Script_StrengthFromMenu:
@ -1166,7 +1166,7 @@ Script_WhirlpoolFromMenu:
special UpdateTimePals special UpdateTimePals
Script_UsedWhirlpool: Script_UsedWhirlpool:
callasm GetPartyNick callasm GetPartyNickname
writetext UseWhirlpoolText writetext UseWhirlpoolText
reloadmappart reloadmappart
callasm DisappearWhirlpool callasm DisappearWhirlpool
@ -1265,7 +1265,7 @@ HeadbuttFromMenuScript:
special UpdateTimePals special UpdateTimePals
HeadbuttScript: HeadbuttScript:
callasm GetPartyNick callasm GetPartyNickname
writetext UseHeadbuttText writetext UseHeadbuttText
reloadmappart reloadmappart
@ -1362,7 +1362,7 @@ RockSmashFromMenuScript:
special UpdateTimePals special UpdateTimePals
RockSmashScript: RockSmashScript:
callasm GetPartyNick callasm GetPartyNickname
writetext UseRockSmashText writetext UseRockSmashText
closetext closetext
special WaitSFX special WaitSFX

2
engine/events/poisonstep.asm
View File

@ -128,7 +128,7 @@ DoPoisonStep::
jr z, .mon_not_fainted jr z, .mon_not_fainted
ld c, HAPPINESS_POISONFAINT ld c, HAPPINESS_POISONFAINT
farcall ChangeHappiness farcall ChangeHappiness
farcall GetPartyNick farcall GetPartyNickname
ld hl, .PoisonFaintText ld hl, .PoisonFaintText
call PrintText call PrintText

6
engine/events/poke_seer.asm
View File

@ -249,10 +249,10 @@ GetCaughtLocation:
GetCaughtOT: GetCaughtOT:
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call AddNTimes call AddNTimes
ld de, wSeerOTName ld de, wSeerOT
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
@ -264,7 +264,7 @@ GetCaughtOT:
ld hl, .female ld hl, .female
.got_grammar .got_grammar
ld de, wSeerOTNameGrammar ld de, wSeerOTGrammar
ld a, "@" ld a, "@"
ld [de], a ld [de], a
ret ret

8
engine/events/shuckle.asm
View File

@ -42,13 +42,13 @@ GiveShuckle:
dec a dec a
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call SkipNames call SkipNames
ld de, SpecialShuckleNick ld de, SpecialShuckleNickname
call CopyName2 call CopyName2
; OT. ; OT.
ld a, [wPartyCount] ld a, [wPartyCount]
dec a dec a
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
ld de, SpecialShuckleOT ld de, SpecialShuckleOT
call CopyName2 call CopyName2
@ -68,7 +68,7 @@ GiveShuckle:
SpecialShuckleOT: SpecialShuckleOT:
db "MANIA@" db "MANIA@"
SpecialShuckleNick: SpecialShuckleNickname:
db "SHUCKIE@" db "SHUCKIE@"
ReturnShuckie: ReturnShuckie:
@ -94,7 +94,7 @@ ReturnShuckie:
; OT ; OT
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
ld de, SpecialShuckleOT ld de, SpecialShuckleOT
.CheckOT: .CheckOT:

2
engine/events/sweet_scent.asm
View File

@ -8,7 +8,7 @@ SweetScentFromMenu:
.SweetScent: .SweetScent:
reloadmappart reloadmappart
special UpdateTimePals special UpdateTimePals
callasm GetPartyNick callasm GetPartyNickname
writetext UseSweetScentText writetext UseSweetScentText
waitbutton waitbutton
callasm SweetScentEncounter callasm SweetScentEncounter

2
engine/items/item_effects.asm
View File

@ -1292,7 +1292,7 @@ RareCandy_StatBooster_GetParameters:
call GetBaseData call GetBaseData
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ret ret
RareCandyEffect: RareCandyEffect:

2
engine/items/pack.asm
View File

@ -590,7 +590,7 @@ GiveItem:
push af push af
ld a, [wPackJumptableIndex] ld a, [wPackJumptableIndex]
push af push af
call GetCurNick call GetCurNickname
ld hl, wStringBuffer1 ld hl, wStringBuffer1
ld de, wMonOrItemNameBuffer ld de, wMonOrItemNameBuffer
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH

2
engine/items/tmhm.asm
View File

@ -122,7 +122,7 @@ TeachTMHM:
push bc push bc
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
pop bc pop bc
ld a, c ld a, c

4
engine/link/init_list.asm
View File

@ -5,7 +5,7 @@ InitList:
cp INIT_ENEMYOT_LIST cp INIT_ENEMYOT_LIST
jr nz, .check_party_ot_name jr nz, .check_party_ot_name
ld hl, wOTPartyCount ld hl, wOTPartyCount
ld de, wOTPartyMonOT ld de, wOTPartyMonOTs
ld a, ENEMY_OT_NAME ld a, ENEMY_OT_NAME
jr .done jr .done
@ -13,7 +13,7 @@ InitList:
cp INIT_PLAYEROT_LIST cp INIT_PLAYEROT_LIST
jr nz, .check_mon_name jr nz, .check_mon_name
ld hl, wPartyCount ld hl, wPartyCount
ld de, wPartyMonOT ld de, wPartyMonOTs
ld a, PARTY_OT_NAME ld a, PARTY_OT_NAME
jr .done jr .done

20
engine/link/link.asm
View File

@ -177,9 +177,9 @@ Gen2ToGen1LinkComms:
ld hl, wTimeCapsulePlayerData ld hl, wTimeCapsulePlayerData
call Link_ConvertPartyStruct1to2 call Link_ConvertPartyStruct1to2
ld a, LOW(wOTPartyMonOT) ld a, LOW(wOTPartyMonOTs)
ld [wUnusedNamesPointer], a ld [wUnusedNamesPointer], a
ld a, HIGH(wOTPartyMonOT) ld a, HIGH(wOTPartyMonOTs)
ld [wUnusedNamesPointer + 1], a ld [wUnusedNamesPointer + 1], a
ld de, MUSIC_NONE ld de, MUSIC_NONE
@ -432,9 +432,9 @@ Gen2ToGen2LinkComms:
ld bc, wOTPartyDataEnd - wOTPartyMons ld bc, wOTPartyDataEnd - wOTPartyMons
call CopyBytes call CopyBytes
ld a, LOW(wOTPartyMonOT) ld a, LOW(wOTPartyMonOTs)
ld [wUnusedNamesPointer], a ld [wUnusedNamesPointer], a
ld a, HIGH(wOTPartyMonOT) ld a, HIGH(wOTPartyMonOTs)
ld [wUnusedNamesPointer + 1], a ld [wUnusedNamesPointer + 1], a
ld de, MUSIC_NONE ld de, MUSIC_NONE
@ -716,7 +716,7 @@ Link_PrepPartyData_Gen1:
dec c dec c
jr nz, .mon_loop jr nz, .mon_loop
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call .copy_ot_nicks call .copy_ot_nicks
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
@ -860,7 +860,7 @@ Link_PrepPartyData_Gen2:
ld bc, PARTY_LENGTH * PARTYMON_STRUCT_LENGTH ld bc, PARTY_LENGTH * PARTYMON_STRUCT_LENGTH
call CopyBytes call CopyBytes
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, PARTY_LENGTH * NAME_LENGTH ld bc, PARTY_LENGTH * NAME_LENGTH
call CopyBytes call CopyBytes
@ -1005,7 +1005,7 @@ Link_ConvertPartyStruct1to2:
pop hl pop hl
ld bc, PARTY_LENGTH * REDMON_STRUCT_LENGTH ld bc, PARTY_LENGTH * REDMON_STRUCT_LENGTH
add hl, bc add hl, bc
ld de, wOTPartyMonOT ld de, wOTPartyMonOTs
ld bc, PARTY_LENGTH * NAME_LENGTH ld bc, PARTY_LENGTH * NAME_LENGTH
call CopyBytes call CopyBytes
ld de, wOTPartyMonNicknames ld de, wOTPartyMonNicknames
@ -1672,7 +1672,7 @@ LinkTrade:
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
call GetPokemonName call GetPokemonName
ld hl, wStringBuffer1 ld hl, wStringBuffer1
ld de, wBufferTrademonNick ld de, wBufferTrademonNickname
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ld a, [wCurOTTradePartyMon] ld a, [wCurOTTradePartyMon]
@ -1811,7 +1811,7 @@ LinkTrade:
push af push af
; OT name ; OT name
ld a, [wCurTradePartyMon] ld a, [wCurTradePartyMon]
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
ld de, wPlayerTrademonOTName ld de, wPlayerTrademonOTName
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
@ -1858,7 +1858,7 @@ LinkTrade:
ld [wOTTrademonSpecies], a ld [wOTTrademonSpecies], a
; OT name ; OT name
ld a, [wCurOTTradePartyMon] ld a, [wCurOTTradePartyMon]
ld hl, wOTPartyMonOT ld hl, wOTPartyMonOTs
call SkipNames call SkipNames
ld de, wOTTrademonOTName ld de, wOTTrademonOTName
ld bc, NAME_LENGTH ld bc, NAME_LENGTH

6
engine/movie/trade_animation.asm
View File

@ -212,10 +212,10 @@ RunTradeAnimScript:
call TradeAnim_GetFrontpic call TradeAnim_GetFrontpic
ld a, [wPlayerTrademonSpecies] ld a, [wPlayerTrademonSpecies]
ld de, wPlayerTrademonSpeciesName ld de, wPlayerTrademonSpeciesName
call TradeAnim_GetNickname call TradeAnim_GetNicknamename
ld a, [wOTTrademonSpecies] ld a, [wOTTrademonSpecies]
ld de, wOTTrademonSpeciesName ld de, wOTTrademonSpeciesName
call TradeAnim_GetNickname call TradeAnim_GetNicknamename
call TradeAnim_NormalPals call TradeAnim_NormalPals
ret ret
@ -817,7 +817,7 @@ TradeAnim_GetFrontpic:
predef GetMonFrontpic predef GetMonFrontpic
ret ret
TradeAnim_GetNickname: TradeAnim_GetNicknamename:
push de push de
ld [wNamedObjectIndex], a ld [wNamedObjectIndex], a
call GetPokemonName call GetPokemonName

16
engine/pokemon/bills_pc.asm
View File

@ -1709,7 +1709,7 @@ BillsPC_CopyMon:
call CopySpeciesToTemp call CopySpeciesToTemp
ld hl, sBoxMonNicknames ld hl, sBoxMonNicknames
call CopyNicknameToTemp call CopyNicknameToTemp
ld hl, sBoxMonOT ld hl, sBoxMonOTs
call CopyOTNameToTemp call CopyOTNameToTemp
ld hl, sBoxMons ld hl, sBoxMons
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
@ -1727,7 +1727,7 @@ BillsPC_CopyMon:
call CopySpeciesToTemp call CopySpeciesToTemp
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call CopyNicknameToTemp call CopyNicknameToTemp
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call CopyOTNameToTemp call CopyOTNameToTemp
ld hl, wPartyMon1 ld hl, wPartyMon1
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
@ -1753,7 +1753,7 @@ BillsPC_CopyMon:
call CopyNicknameToTemp call CopyNicknameToTemp
pop hl pop hl
push hl push hl
ld bc, sBoxMonOT - sBox ld bc, sBoxMonOTs - sBox
add hl, bc add hl, bc
call CopyOTNameToTemp call CopyOTNameToTemp
pop hl pop hl
@ -1772,7 +1772,7 @@ DepositPokemon:
ld [wCurPartyMon], a ld [wCurPartyMon], a
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call GetNick call GetNickname
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
predef SendGetMonIntoFromBox predef SendGetMonIntoFromBox
@ -1826,7 +1826,7 @@ TryWithdrawPokemon:
call OpenSRAM call OpenSRAM
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, sBoxMonNicknames ld hl, sBoxMonNicknames
call GetNick call GetNickname
call CloseSRAM call CloseSRAM
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
@ -2051,7 +2051,7 @@ MovePKMNWitoutMail_InsertMon:
call CopySpeciesToTemp call CopySpeciesToTemp
ld hl, sBoxMonNicknames ld hl, sBoxMonNicknames
call CopyNicknameToTemp call CopyNicknameToTemp
ld hl, sBoxMonOT ld hl, sBoxMonOTs
call CopyOTNameToTemp call CopyOTNameToTemp
ld hl, sBoxMons ld hl, sBoxMons
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
@ -2084,7 +2084,7 @@ MovePKMNWitoutMail_InsertMon:
call CopySpeciesToTemp call CopySpeciesToTemp
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call CopyNicknameToTemp call CopyNicknameToTemp
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call CopyOTNameToTemp call CopyOTNameToTemp
ld hl, wPartyMon1Species ld hl, wPartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
@ -2115,7 +2115,7 @@ CopyNicknameToTemp:
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call AddNTimes call AddNTimes
ld de, wBufferMonNick ld de, wBufferMonNickname
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
call CopyBytes call CopyBytes
ret ret

6
engine/pokemon/breeding.asm
View File

@ -303,7 +303,7 @@ HatchEggs:
ld a, [wPlayerID + 1] ld a, [wPlayerID + 1]
ld [hl], a ld [hl], a
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call AddNTimes call AddNTimes
ld d, h ld d, h
@ -870,7 +870,7 @@ DayCareMon1:
bit DAYCARELADY_HAS_MON_F, a bit DAYCARELADY_HAS_MON_F, a
jr z, DayCareMonCursor jr z, DayCareMonCursor
call PromptButton call PromptButton
ld hl, wBreedMon2Nick ld hl, wBreedMon2Nickname
call DayCareMonCompatibilityText call DayCareMonCompatibilityText
jp PrintText jp PrintText
@ -883,7 +883,7 @@ DayCareMon2:
bit DAYCAREMAN_HAS_MON_F, a bit DAYCAREMAN_HAS_MON_F, a
jr z, DayCareMonCursor jr z, DayCareMonCursor
call PromptButton call PromptButton
ld hl, wBreedMon1Nick ld hl, wBreedMon1Nickname
call DayCareMonCompatibilityText call DayCareMonCompatibilityText
jp PrintText jp PrintText

2
engine/pokemon/caught_data.asm
View File

@ -31,7 +31,7 @@ CheckPartyFullAfterContest:
call CopyBytes call CopyBytes
ld a, [wPartyCount] ld a, [wPartyCount]
dec a dec a
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
ld d, h ld d, h
ld e, l ld e, l

2
engine/pokemon/correct_party_errors.asm
View File

@ -137,7 +137,7 @@ CorrectPartyErrors: ; unreferenced
dec b dec b
jr nz, .loop3 jr nz, .loop3
ld de, wPartyMonOT ld de, wPartyMonOTs
ld a, [wPartyCount] ld a, [wPartyCount]
ld b, a ld b, a
ld c, 0 ld c, 0

2
engine/pokemon/european_mail.asm
View File

@ -5,7 +5,7 @@ IsMailEuropean:
; return 4 if Spanish ; return 4 if Spanish
; return 0 if none of the above ; return 0 if none of the above
ld c, $0 ld c, $0
ld hl, sPartyMon1MailAuthorNationality - sPartyMon1Mail ld hl, sPartyMon1MailNationality - sPartyMon1Mail
add hl, de add hl, de
ld a, [hli] ld a, [hli]
cp "E" cp "E"

2
engine/pokemon/evolve.asm
View File

@ -202,7 +202,7 @@ EvolveAfterBattle_MasterLoop:
ld [wEvolutionNewSpecies], a ld [wEvolutionNewSpecies], a
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
call CopyName1 call CopyName1
ld hl, EvolvingText ld hl, EvolvingText
call PrintText call PrintText

2
engine/pokemon/learn.asm
View File

@ -2,7 +2,7 @@ LearnMove:
call LoadTilemapToTempTilemap call LoadTilemapToTempTilemap
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld hl, wStringBuffer1 ld hl, wStringBuffer1
ld de, wMonOrItemNameBuffer ld de, wMonOrItemNameBuffer
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH

2
engine/pokemon/mail.asm
View File

@ -213,7 +213,7 @@ GivePokeMail::
call CopyBytes call CopyBytes
pop af pop af
push af push af
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call AddNTimes call AddNTimes
ld bc, NAME_LENGTH - 1 ld bc, NAME_LENGTH - 1

8
engine/pokemon/mon_menu.asm
View File

@ -109,7 +109,7 @@ PokemonActionSubmenu:
lb bc, 2, 18 lb bc, 2, 18
call ClearBox call ClearBox
farcall MonSubmenu farcall MonSubmenu
call GetCurNick call GetCurNickname
ld a, [wMenuSelection] ld a, [wMenuSelection]
ld hl, .Actions ld hl, .Actions
ld de, 3 ld de, 3
@ -210,7 +210,7 @@ GiveTakePartyMonItem:
call ExitMenu call ExitMenu
jr c, .cancel jr c, .cancel
call GetCurNick call GetCurNickname
ld hl, wStringBuffer1 ld hl, wStringBuffer1
ld de, wMonOrItemNameBuffer ld de, wMonOrItemNameBuffer
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
@ -529,7 +529,7 @@ MonMailAction:
jr nc, .BagIsFull jr nc, .BagIsFull
call GetPartyItemLocation call GetPartyItemLocation
ld [hl], $0 ld [hl], $0
call GetCurNick call GetCurNickname
ld hl, .MailDetachedText ld hl, .MailDetachedText
call MenuTextboxBackup call MenuTextboxBackup
jr .done jr .done
@ -1119,7 +1119,7 @@ SetUpMoveScreenBG:
ld [wMonType], a ld [wMonType], a
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call GetNick call GetNickname
hlcoord 5, 1 hlcoord 5, 1
call PlaceString call PlaceString
push bc push bc

2
engine/pokemon/mon_stats.asm
View File

@ -343,7 +343,7 @@ Unused_PlaceEnemyHPLevel:
push hl push hl
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call GetNick call GetNickname
pop hl pop hl
call PlaceString call PlaceString
call CopyMonToTempMon call CopyMonToTempMon

50
engine/pokemon/move_mon.asm
View File

@ -34,11 +34,11 @@ TryAddMonToParty:
ld a, -1 ld a, -1
ld [de], a ld [de], a
; Now let's load the OT name. ; Now let's load the OT name.
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld a, [wMonType] ld a, [wMonType]
and $f and $f
jr z, .loadOTname jr z, .loadOTname
ld hl, wOTPartyMonOT ld hl, wOTPartyMonOTs
.loadOTname .loadOTname
ldh a, [hMoveMon] ; Restore index from backup ldh a, [hMoveMon] ; Restore index from backup
@ -419,13 +419,13 @@ AddTempmonToParty:
ld hl, wTempMonSpecies ld hl, wTempMonSpecies
call CopyBytes call CopyBytes
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld a, [wPartyCount] ld a, [wPartyCount]
dec a dec a
call SkipNames call SkipNames
ld d, h ld d, h
ld e, l ld e, l
ld hl, wOTPartyMonOT ld hl, wOTPartyMonOTs
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
call SkipNames call SkipNames
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
@ -565,10 +565,10 @@ SendGetMonIntoFromBox:
ld de, wBreedMon1OT ld de, wBreedMon1OT
jr z, .okay5 jr z, .okay5
dec a dec a
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld a, [wPartyCount] ld a, [wPartyCount]
jr nz, .okay6 jr nz, .okay6
ld hl, sBoxMonOT ld hl, sBoxMonOTs
ld a, [sBoxCount] ld a, [sBoxCount]
.okay6 .okay6
@ -578,14 +578,14 @@ SendGetMonIntoFromBox:
ld e, l ld e, l
.okay5 .okay5
ld hl, sBoxMonOT ld hl, sBoxMonOTs
ld a, [wPokemonWithdrawDepositParameter] ld a, [wPokemonWithdrawDepositParameter]
and a and a
jr z, .okay7 jr z, .okay7
ld hl, wBreedMon1OT ld hl, wBreedMon1OT
cp DAY_CARE_WITHDRAW cp DAY_CARE_WITHDRAW
jr z, .okay8 jr z, .okay8
ld hl, wPartyMonOT ld hl, wPartyMonOTs
.okay7 .okay7
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
@ -596,7 +596,7 @@ SendGetMonIntoFromBox:
call CopyBytes call CopyBytes
ld a, [wPokemonWithdrawDepositParameter] ld a, [wPokemonWithdrawDepositParameter]
cp DAY_CARE_DEPOSIT cp DAY_CARE_DEPOSIT
ld de, wBreedMon1Nick ld de, wBreedMon1Nickname
jr z, .okay9 jr z, .okay9
dec a dec a
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
@ -616,7 +616,7 @@ SendGetMonIntoFromBox:
ld a, [wPokemonWithdrawDepositParameter] ld a, [wPokemonWithdrawDepositParameter]
and a and a
jr z, .okay11 jr z, .okay11
ld hl, wBreedMon1Nick ld hl, wBreedMon1Nickname
cp DAY_CARE_WITHDRAW cp DAY_CARE_WITHDRAW
jr z, .okay12 jr z, .okay12
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
@ -819,10 +819,10 @@ RetrieveBreedmon:
ld a, [wPokemonWithdrawDepositParameter] ld a, [wPokemonWithdrawDepositParameter]
and a and a
ld a, [wBreedMon1Species] ld a, [wBreedMon1Species]
ld de, wBreedMon1Nick ld de, wBreedMon1Nickname
jr z, .okay jr z, .okay
ld a, [wBreedMon2Species] ld a, [wBreedMon2Species]
ld de, wBreedMon2Nick ld de, wBreedMon2Nickname
.okay .okay
ld [hli], a ld [hli], a
@ -839,7 +839,7 @@ RetrieveBreedmon:
pop de pop de
call CopyBytes call CopyBytes
push hl push hl
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld a, [wPartyCount] ld a, [wPartyCount]
dec a dec a
call SkipNames call SkipNames
@ -909,14 +909,14 @@ GetLastPartyMon:
ret ret
DepositMonWithDayCareMan: DepositMonWithDayCareMan:
ld de, wBreedMon1Nick ld de, wBreedMon1Nickname
call DepositBreedmon call DepositBreedmon
xor a ; REMOVE_PARTY xor a ; REMOVE_PARTY
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
jp RemoveMonFromPartyOrBox jp RemoveMonFromPartyOrBox
DepositMonWithDayCareLady: DepositMonWithDayCareLady:
ld de, wBreedMon2Nick ld de, wBreedMon2Nickname
call DepositBreedmon call DepositBreedmon
xor a ; REMOVE_PARTY xor a ; REMOVE_PARTY
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
@ -928,7 +928,7 @@ DepositBreedmon:
call SkipNames call SkipNames
call CopyBytes call CopyBytes
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
call CopyBytes call CopyBytes
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
@ -967,7 +967,7 @@ SendMonIntoBox:
call ShiftBoxMon call ShiftBoxMon
ld hl, wPlayerName ld hl, wPlayerName
ld de, sBoxMonOT ld de, sBoxMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
@ -1071,7 +1071,7 @@ SendMonIntoBox:
ret ret
ShiftBoxMon: ShiftBoxMon:
ld hl, sBoxMonOT ld hl, sBoxMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call .shift call .shift
@ -1246,12 +1246,12 @@ RemoveMonFromPartyOrBox:
ld [hli], a ld [hli], a
inc a inc a
jr nz, .loop jr nz, .loop
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld d, PARTY_LENGTH - 1 ld d, PARTY_LENGTH - 1
ld a, [wPokemonWithdrawDepositParameter] ld a, [wPokemonWithdrawDepositParameter]
and a and a
jr z, .party jr z, .party
ld hl, sBoxMonOT ld hl, sBoxMonOTs
ld d, MONS_PER_BOX - 1 ld d, MONS_PER_BOX - 1
.party .party
@ -1296,13 +1296,13 @@ RemoveMonFromPartyOrBox:
jr z, .party5 jr z, .party5
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
add hl, bc add hl, bc
ld bc, sBoxMonOT ld bc, sBoxMonOTs
jr .copy jr .copy
.party5 .party5
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
add hl, bc add hl, bc
ld bc, wPartyMonOT ld bc, wPartyMonOTs
.copy .copy
call CopyDataUntil call CopyDataUntil
; Shift the nicknames ; Shift the nicknames
@ -1705,7 +1705,7 @@ GivePoke::
push hl push hl
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
ld d, h ld d, h
ld e, l ld e, l
@ -1734,9 +1734,9 @@ GivePoke::
jr .skip_nickname jr .skip_nickname
.send_to_box .send_to_box
ld a, BANK(sBoxMonOT) ld a, BANK(sBoxMonOTs)
call OpenSRAM call OpenSRAM
ld de, sBoxMonOT ld de, sBoxMonOTs
.loop .loop
ld a, [wScriptBank] ld a, [wScriptBank]
call GetFarByte call GetFarByte

8
engine/pokemon/move_mon_wo_mail.asm
View File

@ -8,12 +8,12 @@ InsertPokemonIntoBox:
ld [wNextBoxOrPartyIndex], a ld [wNextBoxOrPartyIndex], a
ld hl, sBoxMonNicknames ld hl, sBoxMonNicknames
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
ld de, wBufferMonNick ld de, wBufferMonNickname
call InsertDataIntoBoxOrParty call InsertDataIntoBoxOrParty
ld a, [sBoxCount] ld a, [sBoxCount]
dec a dec a
ld [wNextBoxOrPartyIndex], a ld [wNextBoxOrPartyIndex], a
ld hl, sBoxMonOT ld hl, sBoxMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
ld de, wBufferMonOT ld de, wBufferMonOT
call InsertDataIntoBoxOrParty call InsertDataIntoBoxOrParty
@ -45,12 +45,12 @@ InsertPokemonIntoParty:
ld [wNextBoxOrPartyIndex], a ld [wNextBoxOrPartyIndex], a
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld bc, MON_NAME_LENGTH ld bc, MON_NAME_LENGTH
ld de, wBufferMonNick ld de, wBufferMonNickname
call InsertDataIntoBoxOrParty call InsertDataIntoBoxOrParty
ld a, [wPartyCount] ld a, [wPartyCount]
dec a dec a
ld [wNextBoxOrPartyIndex], a ld [wNextBoxOrPartyIndex], a
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
ld de, wBufferMonOT ld de, wBufferMonOT
call InsertDataIntoBoxOrParty call InsertDataIntoBoxOrParty

4
engine/pokemon/party_menu.asm
View File

@ -91,7 +91,7 @@ PlacePartyNicknames:
push hl push hl
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
ld a, b ld a, b
call GetNick call GetNickname
pop hl pop hl
call PlaceString call PlaceString
pop hl pop hl
@ -773,7 +773,7 @@ YouHaveNoPKMNString:
PrintPartyMenuActionText: PrintPartyMenuActionText:
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld a, [wPartyMenuActionText] ld a, [wPartyMenuActionText]
and $f and $f
ld hl, .MenuActionTexts ld hl, .MenuActionTexts

6
engine/pokemon/search.asm
View File

@ -58,7 +58,7 @@ CheckOwnMonAnywhere:
ld d, a ld d, a
ld e, 0 ld e, 0
ld hl, wPartyMon1Species ld hl, wPartyMon1Species
ld bc, wPartyMonOT ld bc, wPartyMonOTs
; Run CheckOwnMon on each Pokémon in the party. ; Run CheckOwnMon on each Pokémon in the party.
.partymon .partymon
@ -82,7 +82,7 @@ CheckOwnMonAnywhere:
ld d, a ld d, a
ld hl, sBoxMon1Species ld hl, sBoxMon1Species
ld bc, sBoxMonOT ld bc, sBoxMonOTs
.openboxmon .openboxmon
call CheckOwnMon call CheckOwnMon
jr nc, .loop jr nc, .loop
@ -138,7 +138,7 @@ CheckOwnMonAnywhere:
ld e, l ld e, l
pop hl pop hl
push de push de
ld de, sBoxMonOT - sBoxCount ld de, sBoxMonOTs - sBoxCount
add hl, de add hl, de
ld b, h ld b, h
ld c, l ld c, l

14
engine/pokemon/stats_screen.asm
View File

@ -430,7 +430,7 @@ StatsScreen_InitUpperHalf:
hlcoord 14, 0 hlcoord 14, 0
call PrintLevel call PrintLevel
ld hl, .NicknamePointers ld hl, .NicknamePointers
call GetNicknamePointer call GetNicknamenamePointer
call CopyNickname call CopyNickname
hlcoord 8, 2 hlcoord 8, 2
call PlaceString call PlaceString
@ -481,7 +481,7 @@ StatsScreen_InitUpperHalf:
dw wPartyMonNicknames dw wPartyMonNicknames
dw wOTPartyMonNicknames dw wOTPartyMonNicknames
dw sBoxMonNicknames dw sBoxMonNicknames
dw wBufferMonNick dw wBufferMonNickname
StatsScreen_PlaceVerticalDivider: ; unreferenced StatsScreen_PlaceVerticalDivider: ; unreferenced
; The Japanese stats screen has a vertical divider. ; The Japanese stats screen has a vertical divider.
@ -789,7 +789,7 @@ LoadBluePage:
ld de, wTempMonID ld de, wTempMonID
call PrintNum call PrintNum
ld hl, .OTNamePointers ld hl, .OTNamePointers
call GetNicknamePointer call GetNicknamenamePointer
call CopyNickname call CopyNickname
farcall CorrectNickErrors farcall CorrectNickErrors
hlcoord 2, 13 hlcoord 2, 13
@ -810,9 +810,9 @@ LoadBluePage:
ret ret
.OTNamePointers: .OTNamePointers:
dw wPartyMonOT dw wPartyMonOTs
dw wOTPartyMonOT dw wOTPartyMonOTs
dw sBoxMonOT dw sBoxMonOTs
dw wBufferMonOT dw wBufferMonOT
IDNoString: IDNoString:
@ -1157,7 +1157,7 @@ CopyNickname:
pop de pop de
ret ret
GetNicknamePointer: GetNicknamenamePointer:
ld a, [wMonType] ld a, [wMonType]
add a add a
ld c, a ld c, a

4
engine/pokemon/switchpartymons.asm
View File

@ -81,12 +81,12 @@ _SwitchPartyMons:
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes call CopyBytes
ld a, [wSwitchMonTo] ld a, [wSwitchMonTo]
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
push hl push hl
call .CopyNameToSwitchMonBuffer call .CopyNameToSwitchMonBuffer
ld a, [wSwitchMonFrom] ld a, [wSwitchMonFrom]
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
pop de pop de
push hl push hl

2
engine/printer/print_party.asm
View File

@ -192,7 +192,7 @@ PrintPartyMonPage1:
hlcoord 1, 9 hlcoord 1, 9
ld de, PrintParty_OTString ld de, PrintParty_OTString
call PlaceString call PlaceString
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call GetCurPartyMonName call GetCurPartyMonName
hlcoord 4, 9 hlcoord 4, 9
call PlaceString call PlaceString

4
home/names.asm
View File

@ -4,8 +4,8 @@ NamesPointers::
dba MoveNames ; MOVE_NAME dba MoveNames ; MOVE_NAME
dba NULL ; DUMMY_NAME dba NULL ; DUMMY_NAME
dba ItemNames ; ITEM_NAME dba ItemNames ; ITEM_NAME
dbw 0, wPartyMonOT ; PARTY_OT_NAME dbw 0, wPartyMonOTs ; PARTY_OT_NAME
dbw 0, wOTPartyMonOT ; ENEMY_OT_NAME dbw 0, wOTPartyMonOTs ; ENEMY_OT_NAME
dba TrainerClassNames ; TRAINER_NAME dba TrainerClassNames ; TRAINER_NAME
dbw 4, MoveDescriptions ; MOVE_DESC_NAME_BROKEN (wrong bank) dbw 4, MoveDescriptions ; MOVE_DESC_NAME_BROKEN (wrong bank)

4
home/pokemon.asm
View File

@ -298,11 +298,11 @@ GetBaseData::
pop bc pop bc
ret ret
GetCurNick:: GetCurNickname::
ld a, [wCurPartyMon] ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
GetNick:: GetNickname::
; Get nickname a from list hl. ; Get nickname a from list hl.
push hl push hl

8
home/text.asm
View File

@ -336,7 +336,7 @@ PlaceBattlersName:
and a and a
jr nz, .enemy jr nz, .enemy
ld de, wBattleMonNick ld de, wBattleMonNickname
jr PlaceCommandCharacter jr PlaceCommandCharacter
.enemy .enemy
@ -344,7 +344,7 @@ PlaceBattlersName:
call PlaceString call PlaceString
ld h, b ld h, b
ld l, c ld l, c
ld de, wEnemyMonNick ld de, wEnemyMonNickname
jr PlaceCommandCharacter jr PlaceCommandCharacter
PlaceEnemysName:: PlaceEnemysName::
@ -1000,8 +1000,8 @@ TextCommand_STRINGBUFFER::
; 2: wStringBuffer5 ; 2: wStringBuffer5
; 3: wStringBuffer2 ; 3: wStringBuffer2
; 4: wStringBuffer1 ; 4: wStringBuffer1
; 5: wEnemyMonNick ; 5: wEnemyMonNickname
; 6: wBattleMonNick ; 6: wBattleMonNickname
ld a, [hli] ld a, [hli]
push hl push hl
ld e, a ld e, a

13
macros/wram.asm
View File

@ -54,7 +54,7 @@ red_box_struct: MACRO
\1Type2:: db \1Type2:: db
\1CatchRate:: db \1CatchRate:: db
\1Moves:: ds NUM_MOVES \1Moves:: ds NUM_MOVES
\1OTID:: dw \1ID:: dw
\1Exp:: ds 3 \1Exp:: ds 3
\1HPExp:: dw \1HPExp:: dw
\1AttackExp:: dw \1AttackExp:: dw
@ -105,7 +105,7 @@ box: MACRO
\1Mons:: \1Mons::
\1Mon1:: box_struct \1Mon1 \1Mon1:: box_struct \1Mon1
\1Mon2:: ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX - 1) \1Mon2:: ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX - 1)
\1MonOT:: ds NAME_LENGTH * MONS_PER_BOX \1MonOTs:: ds NAME_LENGTH * MONS_PER_BOX
\1MonNicknames:: ds MON_NAME_LENGTH * MONS_PER_BOX \1MonNicknames:: ds MON_NAME_LENGTH * MONS_PER_BOX
\1MonNicknamesEnd:: \1MonNicknamesEnd::
\1End:: \1End::
@ -170,7 +170,7 @@ ENDM
battle_tower_struct: MACRO battle_tower_struct: MACRO
\1Name:: ds NAME_LENGTH - 1 \1Name:: ds NAME_LENGTH - 1
\1TrainerClass:: ds 1 \1TrainerClass:: db
\1Mon1:: party_struct \1Mon1 \1Mon1:: party_struct \1Mon1
\1Mon1Name:: ds MON_NAME_LENGTH \1Mon1Name:: ds MON_NAME_LENGTH
\1Mon1NameEnd:: \1Mon1NameEnd::
@ -186,9 +186,9 @@ ENDM
mailmsg: MACRO mailmsg: MACRO
\1Message:: ds MAIL_MSG_LENGTH \1Message:: ds MAIL_MSG_LENGTH
\1MessageEnd:: ds 1 \1MessageEnd:: db
\1Author:: ds PLAYER_NAME_LENGTH \1Author:: ds PLAYER_NAME_LENGTH
\1AuthorNationality:: ds 2 \1Nationality:: dw
\1AuthorID:: dw \1AuthorID:: dw
\1Species:: db \1Species:: db
\1Type:: db \1Type:: db
@ -364,10 +364,9 @@ sprite_anim_struct: MACRO
ENDM ENDM
battle_anim_struct: MACRO battle_anim_struct: MACRO
; Placeholder until we can figure out what it all means
\1Index:: db \1Index:: db
\1OAMFlags:: db \1OAMFlags:: db
\1Field02:: ds 1 \1FixY:: db
\1FramesetID:: db \1FramesetID:: db
\1Function:: db \1Function:: db
\1Palette:: db \1Palette:: db

12
mobile/mobile_12_2.asm
View File

@ -9,7 +9,7 @@ MobileCheckOwnMonAnywhere:
ld d, a ld d, a
ld e, 0 ld e, 0
ld hl, wPartyMon1Species ld hl, wPartyMon1Species
ld bc, wPartyMonOT ld bc, wPartyMonOTs
.asm_4a851 .asm_4a851
call .CheckMatch call .CheckMatch
ret c ret c
@ -27,7 +27,7 @@ MobileCheckOwnMonAnywhere:
jr z, .asm_4a888 jr z, .asm_4a888
ld d, a ld d, a
ld hl, sBoxMon1Species ld hl, sBoxMon1Species
ld bc, sBoxMonOT ld bc, sBoxMonOTs
.asm_4a873 .asm_4a873
call .CheckMatch call .CheckMatch
jr nc, .asm_4a87c jr nc, .asm_4a87c
@ -72,7 +72,7 @@ MobileCheckOwnMonAnywhere:
ld e, l ld e, l
pop hl pop hl
push de push de
ld de, sBoxMonOT - sBoxCount ld de, sBoxMonOTs - sBoxCount
add hl, de add hl, de
ld b, h ld b, h
ld c, l ld c, l
@ -264,7 +264,7 @@ Function4a9c3:
Function4a9d7: Function4a9d7:
ld a, [wd002] ld a, [wd002]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld h, d ld h, d
ld l, e ld l, e
ld de, wMobileParticipant1Nickname ld de, wMobileParticipant1Nickname
@ -272,7 +272,7 @@ Function4a9d7:
call CopyBytes call CopyBytes
ld a, [wd003] ld a, [wd003]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld h, d ld h, d
ld l, e ld l, e
ld de, wMobileParticipant2Nickname ld de, wMobileParticipant2Nickname
@ -280,7 +280,7 @@ Function4a9d7:
call CopyBytes call CopyBytes
ld a, [wd004] ld a, [wd004]
ld hl, wPartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNickname
ld h, d ld h, d
ld l, e ld l, e
ld de, wMobileParticipant3Nickname ld de, wMobileParticipant3Nickname

18
mobile/mobile_40.asm
View File

@ -2388,7 +2388,7 @@ Unknown_100fc0:
dbwww $80, wPartyCount, 1 + PARTY_LENGTH + 1, wOTPartyCount dbwww $80, wPartyCount, 1 + PARTY_LENGTH + 1, wOTPartyCount
dbwww $80, wPlayerID, 2, wOTPlayerID dbwww $80, wPlayerID, 2, wOTPlayerID
dbwww $80, wPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, wOTPartyMons dbwww $80, wPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, wOTPartyMons
dbwww $80, wPartyMonOT, NAME_LENGTH * PARTY_LENGTH, wOTPartyMonOT dbwww $80, wPartyMonOTs, NAME_LENGTH * PARTY_LENGTH, wOTPartyMonOTs
dbwww $80, wPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, wOTPartyMonNicknames dbwww $80, wPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, wOTPartyMonNicknames
db -1 db -1
@ -2411,7 +2411,7 @@ Unknown_10102c:
dbwww $80, wOTPlayerName, NAME_LENGTH, NULL dbwww $80, wOTPlayerName, NAME_LENGTH, NULL
dbwww $80, wOTPlayerID, 2, NULL dbwww $80, wOTPlayerID, 2, NULL
dbwww $80, wOTPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, NULL dbwww $80, wOTPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, NULL
dbwww $80, wOTPartyMonOT, NAME_LENGTH * PARTY_LENGTH, NULL dbwww $80, wOTPartyMonOTs, NAME_LENGTH * PARTY_LENGTH, NULL
dbwww $80, wOTPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, NULL dbwww $80, wOTPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, NULL
db -1 db -1
@ -2454,7 +2454,7 @@ Function10107d:
ld de, wc608 + 13 ld de, wc608 + 13
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call .CopyAllFromOT call .CopyAllFromOT
ld hl, wOTPartyMonOT ld hl, wOTPartyMonOTs
ld de, wOTClassName + 1 ld de, wOTClassName + 1
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call .CopyAllFromOT call .CopyAllFromOT
@ -2510,7 +2510,7 @@ LoadSelectedPartiesForColosseum:
ld de, wPartyMon1Species ld de, wPartyMon1Species
call .CopyPartyStruct call .CopyPartyStruct
ld hl, wPlayerMonSelection ld hl, wPlayerMonSelection
ld de, wPartyMonOT ld de, wPartyMonOTs
call .CopyName call .CopyName
ld hl, wPlayerMonSelection ld hl, wPlayerMonSelection
ld de, wPartyMonNicknames ld de, wPartyMonNicknames
@ -2522,7 +2522,7 @@ LoadSelectedPartiesForColosseum:
ld de, wOTPartyMon1Species ld de, wOTPartyMon1Species
call .CopyPartyStruct call .CopyPartyStruct
ld hl, wOTMonSelection ld hl, wOTMonSelection
ld de, wOTPartyMonOT ld de, wOTPartyMonOTs
call .CopyName call .CopyName
ld hl, wOTMonSelection ld hl, wOTMonSelection
ld de, wOTPartyMonNicknames ld de, wOTPartyMonNicknames
@ -6004,7 +6004,7 @@ Function102a3b:
ld [wPlayerTrademonSpecies], a ld [wPlayerTrademonSpecies], a
ld a, [wcd4c] ld a, [wcd4c]
dec a dec a
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
ld de, wPlayerTrademonOTName ld de, wPlayerTrademonOTName
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
@ -6049,7 +6049,7 @@ Function102a3b:
ld [wOTTrademonSpecies], a ld [wOTTrademonSpecies], a
ld a, [wcd4d] ld a, [wcd4d]
dec a dec a
ld hl, wOTPartyMonOT ld hl, wOTPartyMonOTs
call SkipNames call SkipNames
ld de, wOTTrademonOTName ld de, wOTTrademonOTName
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
@ -6238,8 +6238,8 @@ Function102c21:
ret ret
Function102c2e: Function102c2e:
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld de, wOTPartyMonOT ld de, wOTPartyMonOTs
ld bc, 11 ld bc, 11
call Function102c71 call Function102c71
ret ret

16
mobile/mobile_46.asm
View File

@ -6900,7 +6900,7 @@ Function11b483:
ld [hl], a ld [hl], a
pop bc pop bc
ld de, NAME_LENGTH ld de, NAME_LENGTH
ld hl, wPartyMonOT ld hl, wPartyMonOTs
pop af pop af
push af push af
.loop4 .loop4
@ -7191,9 +7191,9 @@ Function11b6b4:
ld [wMobileMonStructPointer + 1], a ld [wMobileMonStructPointer + 1], a
ld a, LOW($c63d) ; OT ld a, LOW($c63d) ; OT
ld [wMobileMonOTNamePointer], a ld [wMobileMonOTPointer], a
ld a, HIGH($c63d) ld a, HIGH($c63d)
ld [wMobileMonOTNamePointer + 1], a ld [wMobileMonOTPointer + 1], a
ld a, LOW($c642) ; Nickname ld a, LOW($c642) ; Nickname
ld [wMobileMonNicknamePointer], a ld [wMobileMonNicknamePointer], a
@ -7493,9 +7493,9 @@ Function11b93b:
ld [wMobileMonStructPointer + 1], a ld [wMobileMonStructPointer + 1], a
ld a, LOW($c641) ld a, LOW($c641)
ld [wMobileMonOTNamePointer], a ld [wMobileMonOTPointer], a
ld a, HIGH($c641) ld a, HIGH($c641)
ld [wMobileMonOTNamePointer + 1], a ld [wMobileMonOTPointer + 1], a
ld a, LOW($c646) ld a, LOW($c646)
ld [wMobileMonNicknamePointer], a ld [wMobileMonNicknamePointer], a
@ -7553,7 +7553,7 @@ AddMobileMonToParty:
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes call CopyBytes
ld hl, wPartyMonOT ld hl, wPartyMonOTs
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
ld a, [wMobileMonSpecies] ld a, [wMobileMonSpecies]
.loop3 .loop3
@ -7563,9 +7563,9 @@ AddMobileMonToParty:
jr nz, .loop3 jr nz, .loop3
ld e, l ld e, l
ld d, h ld d, h
ld a, [wMobileMonOTNamePointer] ld a, [wMobileMonOTPointer]
ld l, a ld l, a
ld a, [wMobileMonOTNamePointer + 1] ld a, [wMobileMonOTPointer + 1]
ld h, a ld h, a
ld bc, MON_NAME_LENGTH - 1 ld bc, MON_NAME_LENGTH - 1
call CopyBytes call CopyBytes

4
mobile/mobile_5f.asm
View File

@ -2299,7 +2299,7 @@ Function17ded9:
push hl push hl
ld a, [wPartyCount] ld a, [wPartyCount]
dec a dec a
ld hl, wPartyMonOT ld hl, wPartyMonOTs
call SkipNames call SkipNames
ld d, h ld d, h
ld e, l ld e, l
@ -2486,7 +2486,7 @@ Function17e026:
jr z, .asm_17e08e jr z, .asm_17e08e
push bc push bc
ld bc, $6 ld bc, $6
ld de, sBoxMonOT ld de, sBoxMonOTs
call CopyBytes call CopyBytes
ld a, [hli] ld a, [hli]
ld b, a ld b, a

126
wram.asm
View File

@ -404,8 +404,8 @@ wBattle::
wEnemyMoveStruct:: move_struct wEnemyMoveStruct wEnemyMoveStruct:: move_struct wEnemyMoveStruct
wPlayerMoveStruct:: move_struct wPlayerMoveStruct wPlayerMoveStruct:: move_struct wPlayerMoveStruct
wEnemyMonNick:: ds MON_NAME_LENGTH wEnemyMonNickname:: ds MON_NAME_LENGTH
wBattleMonNick:: ds MON_NAME_LENGTH wBattleMonNickname:: ds MON_NAME_LENGTH
wBattleMon:: battle_struct wBattleMon wBattleMon:: battle_struct wBattleMon
@ -718,7 +718,7 @@ NEXTU
; odd egg ; odd egg
wOddEgg:: party_struct wOddEgg wOddEgg:: party_struct wOddEgg
wOddEggName:: ds MON_NAME_LENGTH wOddEggName:: ds MON_NAME_LENGTH
wOddEggOTName:: ds NAME_LENGTH wOddEggOT:: ds NAME_LENGTH
NEXTU NEXTU
; debug mon color picker ; debug mon color picker
@ -994,8 +994,26 @@ wLinkPlayerPartyMon4:: party_struct wLinkPlayerPartyMon4
wLinkPlayerPartyMon5:: party_struct wLinkPlayerPartyMon5 wLinkPlayerPartyMon5:: party_struct wLinkPlayerPartyMon5
wLinkPlayerPartyMon6:: party_struct wLinkPlayerPartyMon6 wLinkPlayerPartyMon6:: party_struct wLinkPlayerPartyMon6
assert_table_length PARTY_LENGTH 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 NEXTU
; time capsule party data ; time capsule party data
@ -1008,8 +1026,26 @@ wTimeCapsulePartyMon4:: red_party_struct wTimeCapsulePartyMon4
wTimeCapsulePartyMon5:: red_party_struct wTimeCapsulePartyMon5 wTimeCapsulePartyMon5:: red_party_struct wTimeCapsulePartyMon5
wTimeCapsulePartyMon6:: red_party_struct wTimeCapsulePartyMon6 wTimeCapsulePartyMon6:: red_party_struct wTimeCapsulePartyMon6
assert_table_length PARTY_LENGTH 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 NEXTU
; link patch lists ; link patch lists
@ -1021,7 +1057,16 @@ NEXTU
; link data prep ; link data prep
ds 1000 ds 1000
wCurLinkOTPartyMonTypePointer:: dw 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 NEXTU
; link mail data ; link mail data
@ -1199,7 +1244,7 @@ NEXTU
; mobile data ; mobile data
wMobileMonSpeciesPointer:: dw wMobileMonSpeciesPointer:: dw
wMobileMonStructPointer:: dw wMobileMonStructPointer:: dw
wMobileMonOTNamePointer:: dw wMobileMonOTPointer:: dw
wMobileMonNicknamePointer:: dw wMobileMonNicknamePointer:: dw
wMobileMonMailPointer:: dw wMobileMonMailPointer:: dw
@ -1219,7 +1264,9 @@ wcd29:: ds 1
wMobileMonSpecies:: wMobileMonSpecies::
wcd2a:: db wcd2a:: db
wTempOddEggNickname:: ; ds 11 UNION
wTempOddEggNickname:: ds MON_NAME_LENGTH
NEXTU
wcd2b:: ds 1 wcd2b:: ds 1
wcd2c:: ds 1 wcd2c:: ds 1
wcd2d:: ds 1 wcd2d:: ds 1
@ -1231,6 +1278,7 @@ wcd32:: ds 1
wcd33:: ds 1 wcd33:: ds 1
wcd34:: ds 1 wcd34:: ds 1
wcd35:: ds 1 wcd35:: ds 1
ENDU
; current time for link/mobile? ; current time for link/mobile?
wcd36:: db ; hours wcd36:: db ; hours
@ -1710,7 +1758,7 @@ wDefaultSpawnpoint:: db
UNION UNION
; mon buffer ; mon buffer
wBufferMonNick:: ds MON_NAME_LENGTH wBufferMonNickname:: ds MON_NAME_LENGTH
wBufferMonOT:: ds NAME_LENGTH wBufferMonOT:: ds NAME_LENGTH
wBufferMon:: party_struct wBufferMon wBufferMon:: party_struct wBufferMon
ds 8 ds 8
@ -1723,8 +1771,8 @@ wSeerAction:: db
wSeerNickname:: ds MON_NAME_LENGTH wSeerNickname:: ds MON_NAME_LENGTH
wSeerCaughtLocation:: ds 17 wSeerCaughtLocation:: ds 17
wSeerTimeOfDay:: ds NAME_LENGTH wSeerTimeOfDay:: ds NAME_LENGTH
wSeerOTName:: ds NAME_LENGTH wSeerOT:: ds NAME_LENGTH
wSeerOTNameGrammar:: db wSeerOTGrammar:: db
wSeerCaughtLevelString:: ds 4 wSeerCaughtLevelString:: ds 4
wSeerCaughtLevel:: db wSeerCaughtLevel:: db
wSeerCaughtData:: db wSeerCaughtData:: db
@ -1872,7 +1920,7 @@ NEXTU
; trade ; trade
wCurTradePartyMon:: db wCurTradePartyMon:: db
wCurOTTradePartyMon:: db wCurOTTradePartyMon:: db
wBufferTrademonNick:: ds MON_NAME_LENGTH wBufferTrademonNickname:: ds MON_NAME_LENGTH
NEXTU NEXTU
; link battle record data ; link battle record data
@ -2576,10 +2624,26 @@ wOTPartyMon4:: party_struct wOTPartyMon4
wOTPartyMon5:: party_struct wOTPartyMon5 wOTPartyMon5:: party_struct wOTPartyMon5
wOTPartyMon6:: party_struct wOTPartyMon6 wOTPartyMon6:: party_struct wOTPartyMon6
assert_table_length PARTY_LENGTH assert_table_length PARTY_LENGTH
wOTPartyMonsEnd::
wOTPartyMonOT:: ds NAME_LENGTH * PARTY_LENGTH wOTPartyMonOTs::
wOTPartyMonNicknames:: ds MON_NAME_LENGTH * PARTY_LENGTH 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:: wOTPartyDataEnd::
NEXTU NEXTU
@ -3142,9 +3206,25 @@ wPartyMon5:: party_struct wPartyMon5
wPartyMon6:: party_struct wPartyMon6 wPartyMon6:: party_struct wPartyMon6
assert_table_length PARTY_LENGTH 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:: wPartyMonNicknamesEnd::
ds 22 ds 22
@ -3166,7 +3246,7 @@ wDayCareMan::
; bit 0: monster 1 in day-care ; bit 0: monster 1 in day-care
db db
wBreedMon1Nick:: ds MON_NAME_LENGTH wBreedMon1Nickname:: ds MON_NAME_LENGTH
wBreedMon1OT:: ds NAME_LENGTH wBreedMon1OT:: ds NAME_LENGTH
wBreedMon1:: box_struct wBreedMon1 wBreedMon1:: box_struct wBreedMon1
@ -3182,12 +3262,12 @@ wBreedMotherOrNonDitto::
; nz: no ; nz: no
db db
wBreedMon2Nick:: ds MON_NAME_LENGTH wBreedMon2Nickname:: ds MON_NAME_LENGTH
wBreedMon2OT:: ds NAME_LENGTH wBreedMon2OT:: ds NAME_LENGTH
wBreedMon2:: box_struct wBreedMon2 wBreedMon2:: box_struct wBreedMon2
wEggNick:: ds MON_NAME_LENGTH wEggMonNickname:: ds MON_NAME_LENGTH
wEggOT:: ds NAME_LENGTH wEggMonOT:: ds NAME_LENGTH
wEggMon:: box_struct wEggMon wEggMon:: box_struct wEggMon
wBugContestSecondPartySpecies:: db wBugContestSecondPartySpecies:: db