Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent labels for each nickname in RAM

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

20
constants/npc_trade_constants.asm
View File

@ -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)

42
data/text/battle.asm
View File

@ -9,7 +9,7 @@ BattleText_PlayerPickedUpPayDayMoney:
WildPokemonAppearedText:
text "Wild @"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
line "appeared!"
prompt
@ -17,20 +17,20 @@ 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
WildCelebiAppearedText:
text "Wild @"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
line "appeared!"
prompt
@ -42,14 +42,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
@ -161,7 +161,7 @@ BattleText_TheSandstormSubsided:
BattleText_EnemyMonFainted:
text "Enemy @"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text_start
line "fainted!"
prompt
@ -206,7 +206,7 @@ UnusedRivalLossText: ; unreferenced
prompt
BattleText_MonFainted:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text_start
line "fainted!"
prompt
@ -230,7 +230,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
text "<ENEMY>"
line "is about to use"
cont "@"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text "."
para "Will <PLAYER>"
@ -241,7 +241,7 @@ BattleText_EnemySentOut:
text "<ENEMY>"
line "sent out"
cont "@"
text_ram wEnemyMonNick
text_ram wEnemyMonNickname
text "!"
done
@ -308,13 +308,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
@ -330,7 +330,7 @@ BattleText_TheMoveIsDisabled:
prompt
BattleText_MonHasNoMovesLeft:
text_ram wBattleMonNick
text_ram wBattleMonNickname
text_start
line "has no moves left!"
done
@ -353,14 +353,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
@ -516,37 +516,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

4
data/text/common_1.asm
View File

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

8
data/text/common_2.asm
View File

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

10
data/text/common_3.asm
View File

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

14
data/text_buffers.asm
View File

@ -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

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
ld a, [wCurBeatUpPartyMon]
ld hl, wPartyMonNicknames
call GetNick
call GetNickname
ld a, MON_HP
call GetBeatupMonLocation
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)):
0. `StringBuffer3`
1. `StringBuffer4`
2. `StringBuffer5`
3. `StringBuffer2`
4. `StringBuffer1`
5. `EnemyMonNick`
6. `BattleMonNick`
0. `wStringBuffer3`
1. `wStringBuffer4`
2. `wStringBuffer5`
3. `wStringBuffer2`
4. `wStringBuffer1`
5. `wEnemyMonNickname`
6. `wBattleMonNickname`
## `$15`: `text_today`

14
engine/battle/core.asm
View File

@ -3885,7 +3885,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
@ -3965,7 +3965,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
@ -4642,7 +4642,7 @@ CheckDanger:
ret
PrintPlayerHUD:
ld de, wBattleMonNick
ld de, wBattleMonNickname
hlcoord 10, 7
call Battle_DummyFunction
call PlaceString
@ -4728,7 +4728,7 @@ DrawEnemyHUD:
ld [wCurSpecies], a
ld [wCurPartySpecies], a
call GetBaseData
ld de, wEnemyMonNick
ld de, wEnemyMonNickname
hlcoord 1, 0
call Battle_DummyFunction
call PlaceString
@ -6394,7 +6394,7 @@ LoadEnemyMon:
; Update enemy nick
ld hl, wStringBuffer1
ld de, wEnemyMonNick
ld de, wEnemyMonNickname
ld bc, MON_NAME_LENGTH
call CopyBytes
@ -7112,7 +7112,7 @@ GiveExperiencePoints:
ld [wStringBuffer2], a
ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames
call GetNick
call GetNickname
ld hl, Text_MonGainedExpPoint
call BattleTextbox
ld a, [wStringBuffer2 + 1]
@ -7523,7 +7523,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

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

@ -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]

2
engine/battle/read_trainer_party.asm
View File

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

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

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

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

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

20
engine/events/daycare.asm
View File

@ -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
@ -137,7 +137,7 @@ DayCareAskDepositPokemon:
jr c, .HoldingMail
ld hl, wPartyMonNicknames
ld a, [wCurPartyMon]
call GetNick
call GetNickname
and a
ret
@ -467,13 +467,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
@ -550,10 +550,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]
@ -606,11 +606,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

2
engine/events/haircut.asm
View File

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

2
engine/events/magikarp.asm
View File

@ -49,7 +49,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

2
engine/events/move_tutor.asm
View File

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

12
engine/events/name_rater.asm
View File

@ -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
@ -138,10 +138,10 @@ CompareNewToOld:
ld a, [wCurPartyMon]
call AddNTimes
push hl
call GetNicknameLength
call GetNicknamenameLength
ld b, c
ld hl, wStringBuffer2
call GetNicknameLength
call GetNicknamenameLength
pop hl
ld a, c
cp b
@ -165,7 +165,7 @@ CompareNewToOld:
scf
ret
GetNicknameLength:
GetNicknamenameLength:
; Gets the length of the name starting at hl and returns it in c.
ld c, 0
.loop

6
engine/events/npc_trade.asm
View File

@ -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
@ -196,7 +196,7 @@ DoNPCTrade:
.incomplete
farcall SetGiftPartyMonCaughtData
ld e, NPCTRADE_NICK
ld e, NPCTRADE_NICKNAME
call GetTradeAttr
ld de, wOTTrademonNickname
call CopyTradeName
@ -216,7 +216,7 @@ DoNPCTrade:
ld de, wOTTrademonSenderName
call CopyTradeName
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
ld bc, NAME_LENGTH
call Trade_GetAttributeOfLastPartymon
ld hl, wOTTrademonOTName

10
engine/events/odd_egg.asm
View File

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

24
engine/events/overworld.asm
View File

@ -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
@ -379,7 +379,7 @@ SurfFunction:
.DoSurf:
call GetSurfType
ld [wSurfingPlayerState], a
call GetPartyNick
call GetPartyNickname
ld hl, SurfFromMenuScript
call QueueScript
ld a, $81
@ -516,7 +516,7 @@ TrySurfOW::
call GetSurfType
ld [wSurfingPlayerState], a
call GetPartyNick
call GetPartyNickname
ld a, BANK(AskSurfScript)
ld hl, AskSurfScript
@ -674,7 +674,7 @@ Script_WaterfallFromMenu:
special UpdateTimePals
Script_UsedWaterfall:
callasm GetPartyNick
callasm GetPartyNickname
writetext .UseWaterfallText
waitbutton
closetext
@ -798,7 +798,7 @@ EscapeRopeOrDig:
ld de, wNextWarp
ld bc, 3
call CopyBytes
call GetPartyNick
call GetPartyNickname
ld a, [wEscapeRopeOrDigType]
cp $2
jr nz, .escaperope
@ -911,7 +911,7 @@ TeleportFunction:
ret
.DoTeleport:
call GetPartyNick
call GetPartyNickname
ld hl, .TeleportScript
call QueueScript
ld a, $81
@ -999,7 +999,7 @@ SetStrengthFlag:
add hl, de
ld a, [hl]
ld [wStrengthSpecies], a
call GetPartyNick
call GetPartyNickname
ret
Script_StrengthFromMenu:
@ -1166,7 +1166,7 @@ Script_WhirlpoolFromMenu:
special UpdateTimePals
Script_UsedWhirlpool:
callasm GetPartyNick
callasm GetPartyNickname
writetext UseWhirlpoolText
reloadmappart
callasm DisappearWhirlpool
@ -1265,7 +1265,7 @@ HeadbuttFromMenuScript:
special UpdateTimePals
HeadbuttScript:
callasm GetPartyNick
callasm GetPartyNickname
writetext UseHeadbuttText
reloadmappart
@ -1362,7 +1362,7 @@ RockSmashFromMenuScript:
special UpdateTimePals
RockSmashScript:
callasm GetPartyNick
callasm GetPartyNickname
writetext UseRockSmashText
closetext
special WaitSFX

2
engine/events/poisonstep.asm
View File

@ -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

6
engine/events/poke_seer.asm
View File

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

8
engine/events/shuckle.asm
View File

@ -42,13 +42,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
@ -68,7 +68,7 @@ GiveShuckle:
SpecialShuckleOT:
db "MANIA@"
SpecialShuckleNick:
SpecialShuckleNickname:
db "SHUCKIE@"
ReturnShuckie:
@ -94,7 +94,7 @@ ReturnShuckie:
; OT
ld a, [wCurPartyMon]
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call SkipNames
ld de, SpecialShuckleOT
.CheckOT:

2
engine/events/sweet_scent.asm
View File

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

2
engine/items/item_effects.asm
View File

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

2
engine/items/pack.asm
View File

@ -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

2
engine/items/tmhm.asm
View File

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

4
engine/link/init_list.asm
View File

@ -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

20
engine/link/link.asm
View File

@ -177,9 +177,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
@ -432,9 +432,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
@ -716,7 +716,7 @@ Link_PrepPartyData_Gen1:
dec c
jr nz, .mon_loop
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call .copy_ot_nicks
ld hl, wPartyMonNicknames
@ -860,7 +860,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
@ -1005,7 +1005,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
@ -1672,7 +1672,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]
@ -1811,7 +1811,7 @@ LinkTrade:
push af
; OT name
ld a, [wCurTradePartyMon]
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call SkipNames
ld de, wPlayerTrademonOTName
ld bc, NAME_LENGTH
@ -1858,7 +1858,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

6
engine/movie/trade_animation.asm
View File

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

16
engine/pokemon/bills_pc.asm
View File

@ -1709,7 +1709,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
@ -1727,7 +1727,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
@ -1753,7 +1753,7 @@ BillsPC_CopyMon:
call CopyNicknameToTemp
pop hl
push hl
ld bc, sBoxMonOT - sBox
ld bc, sBoxMonOTs - sBox
add hl, bc
call CopyOTNameToTemp
pop hl
@ -1772,7 +1772,7 @@ DepositPokemon:
ld [wCurPartyMon], a
ld hl, wPartyMonNicknames
ld a, [wCurPartyMon]
call GetNick
call GetNickname
ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a
predef SendGetMonIntoFromBox
@ -1826,7 +1826,7 @@ TryWithdrawPokemon:
call OpenSRAM
ld a, [wCurPartyMon]
ld hl, sBoxMonNicknames
call GetNick
call GetNickname
call CloseSRAM
xor a
ld [wPokemonWithdrawDepositParameter], a
@ -2051,7 +2051,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
@ -2084,7 +2084,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
@ -2115,7 +2115,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

6
engine/pokemon/breeding.asm
View File

@ -303,7 +303,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
@ -870,7 +870,7 @@ DayCareMon1:
bit DAYCARELADY_HAS_MON_F, a
jr z, DayCareMonCursor
call PromptButton
ld hl, wBreedMon2Nick
ld hl, wBreedMon2Nickname
call DayCareMonCompatibilityText
jp PrintText
@ -883,7 +883,7 @@ DayCareMon2:
bit DAYCAREMAN_HAS_MON_F, a
jr z, DayCareMonCursor
call PromptButton
ld hl, wBreedMon1Nick
ld hl, wBreedMon1Nickname
call DayCareMonCompatibilityText
jp PrintText

2
engine/pokemon/caught_data.asm
View File

@ -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

2
engine/pokemon/correct_party_errors.asm
View File

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

2
engine/pokemon/european_mail.asm
View File

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

2
engine/pokemon/evolve.asm
View File

@ -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

2
engine/pokemon/learn.asm
View File

@ -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

2
engine/pokemon/mail.asm
View File

@ -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

8
engine/pokemon/mon_menu.asm
View File

@ -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
@ -1119,7 +1119,7 @@ SetUpMoveScreenBG:
ld [wMonType], a
ld hl, wPartyMonNicknames
ld a, [wCurPartyMon]
call GetNick
call GetNickname
hlcoord 5, 1
call PlaceString
push bc

2
engine/pokemon/mon_stats.asm
View File

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

50
engine/pokemon/move_mon.asm
View File

@ -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
@ -1705,7 +1705,7 @@ GivePoke::
push hl
ld a, [wCurPartyMon]
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call SkipNames
ld d, h
ld e, l
@ -1734,9 +1734,9 @@ GivePoke::
jr .skip_nickname
.send_to_box
ld a, BANK(sBoxMonOT)
ld a, BANK(sBoxMonOTs)
call OpenSRAM
ld de, sBoxMonOT
ld de, sBoxMonOTs
.loop
ld a, [wScriptBank]
call GetFarByte

8
engine/pokemon/move_mon_wo_mail.asm
View File

@ -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

4
engine/pokemon/party_menu.asm
View File

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

6
engine/pokemon/search.asm
View File

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

14
engine/pokemon/stats_screen.asm
View File

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

4
engine/pokemon/switchpartymons.asm
View File

@ -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

2
engine/printer/print_party.asm
View File

@ -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

4
home/names.asm
View File

@ -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)

4
home/pokemon.asm
View File

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

8
home/text.asm
View File

@ -336,7 +336,7 @@ PlaceBattlersName:
and a
jr nz, .enemy
ld de, wBattleMonNick
ld de, wBattleMonNickname
jr PlaceCommandCharacter
.enemy
@ -344,7 +344,7 @@ PlaceBattlersName:
call PlaceString
ld h, b
ld l, c
ld de, wEnemyMonNick
ld de, wEnemyMonNickname
jr PlaceCommandCharacter
PlaceEnemysName::
@ -1000,8 +1000,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

83
macros/wram.asm
View File

@ -54,7 +54,7 @@ red_box_struct: MACRO
\1Type2:: db
\1CatchRate:: db
\1Moves:: ds NUM_MOVES
\1OTID:: dw
\1ID:: dw
\1Exp:: ds 3
\1HPExp:: dw
\1AttackExp:: dw
@ -100,13 +100,13 @@ battle_struct: MACRO
ENDM
box: 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::
ds 2 ; padding
@ -154,7 +154,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
@ -169,29 +169,29 @@ channel_struct: MACRO
ENDM
battle_tower_struct: MACRO
\1Name:: ds NAME_LENGTH - 1
\1TrainerClass:: ds 1
\1Mon1:: party_struct \1Mon1
\1Mon1Name:: ds MON_NAME_LENGTH
\1Name:: ds NAME_LENGTH - 1
\1TrainerClass:: db
\1Mon1:: party_struct \1Mon1
\1Mon1Name:: ds MON_NAME_LENGTH
\1Mon1NameEnd::
\1Mon2:: party_struct \1Mon2
\1Mon2Name:: ds MON_NAME_LENGTH
\1Mon2:: party_struct \1Mon2
\1Mon2Name:: ds MON_NAME_LENGTH
\1Mon2NameEnd::
\1Mon3:: party_struct \1Mon3
\1Mon3Name:: ds MON_NAME_LENGTH
\1Mon3:: party_struct \1Mon3
\1Mon3Name:: ds MON_NAME_LENGTH
\1Mon3NameEnd::
\1TrainerData:: ds BATTLETOWER_TRAINERDATALENGTH
\1TrainerData:: ds BATTLETOWER_TRAINERDATALENGTH
\1TrainerEnd::
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
@ -364,24 +364,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

12
mobile/mobile_12_2.asm
View File

@ -9,7 +9,7 @@ MobileCheckOwnMonAnywhere:
ld d, a
ld e, 0
ld hl, wPartyMon1Species
ld bc, wPartyMonOT
ld bc, wPartyMonOTs
.asm_4a851
call .CheckMatch
ret c
@ -27,7 +27,7 @@ MobileCheckOwnMonAnywhere:
jr z, .asm_4a888
ld d, a
ld hl, sBoxMon1Species
ld bc, sBoxMonOT
ld bc, sBoxMonOTs
.asm_4a873
call .CheckMatch
jr nc, .asm_4a87c
@ -72,7 +72,7 @@ MobileCheckOwnMonAnywhere:
ld e, l
pop hl
push de
ld de, sBoxMonOT - sBoxCount
ld de, sBoxMonOTs - sBoxCount
add hl, de
ld b, h
ld c, l
@ -264,7 +264,7 @@ Function4a9c3:
Function4a9d7:
ld a, [wd002]
ld hl, wPartyMonNicknames
call GetNick
call GetNickname
ld h, d
ld l, e
ld de, wMobileParticipant1Nickname
@ -272,7 +272,7 @@ Function4a9d7:
call CopyBytes
ld a, [wd003]
ld hl, wPartyMonNicknames
call GetNick
call GetNickname
ld h, d
ld l, e
ld de, wMobileParticipant2Nickname
@ -280,7 +280,7 @@ Function4a9d7:
call CopyBytes
ld a, [wd004]
ld hl, wPartyMonNicknames
call GetNick
call GetNickname
ld h, d
ld l, e
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, wPlayerID, 2, wOTPlayerID
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
db -1
@ -2411,7 +2411,7 @@ Unknown_10102c:
dbwww $80, wOTPlayerName, NAME_LENGTH, NULL
dbwww $80, wOTPlayerID, 2, 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
db -1
@ -2454,7 +2454,7 @@ Function10107d:
ld de, wc608 + 13
ld bc, NAME_LENGTH
call .CopyAllFromOT
ld hl, wOTPartyMonOT
ld hl, wOTPartyMonOTs
ld de, wOTClassName + 1
ld bc, NAME_LENGTH
call .CopyAllFromOT
@ -2510,7 +2510,7 @@ LoadSelectedPartiesForColosseum:
ld de, wPartyMon1Species
call .CopyPartyStruct
ld hl, wPlayerMonSelection
ld de, wPartyMonOT
ld de, wPartyMonOTs
call .CopyName
ld hl, wPlayerMonSelection
ld de, wPartyMonNicknames
@ -2522,7 +2522,7 @@ LoadSelectedPartiesForColosseum:
ld de, wOTPartyMon1Species
call .CopyPartyStruct
ld hl, wOTMonSelection
ld de, wOTPartyMonOT
ld de, wOTPartyMonOTs
call .CopyName
ld hl, wOTMonSelection
ld de, wOTPartyMonNicknames
@ -6004,7 +6004,7 @@ Function102a3b:
ld [wPlayerTrademonSpecies], a
ld a, [wcd4c]
dec a
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call SkipNames
ld de, wPlayerTrademonOTName
ld bc, NAME_LENGTH
@ -6049,7 +6049,7 @@ Function102a3b:
ld [wOTTrademonSpecies], a
ld a, [wcd4d]
dec a
ld hl, wOTPartyMonOT
ld hl, wOTPartyMonOTs
call SkipNames
ld de, wOTTrademonOTName
ld bc, NAME_LENGTH
@ -6238,8 +6238,8 @@ Function102c21:
ret
Function102c2e:
ld hl, wPartyMonOT
ld de, wOTPartyMonOT
ld hl, wPartyMonOTs
ld de, wOTPartyMonOTs
ld bc, 11
call Function102c71
ret

16
mobile/mobile_46.asm
View File

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

4
mobile/mobile_5f.asm
View File

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

136
wram.asm
View File

@ -404,8 +404,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
wBattleMon:: battle_struct wBattleMon
@ -718,7 +718,7 @@ NEXTU
; odd egg
wOddEgg:: party_struct wOddEgg
wOddEggName:: ds MON_NAME_LENGTH
wOddEggOTName:: ds NAME_LENGTH
wOddEggOT:: ds NAME_LENGTH
NEXTU
; debug mon color picker
@ -994,8 +994,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
@ -1008,8 +1026,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
@ -1021,7 +1057,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
@ -1199,7 +1244,7 @@ NEXTU
; mobile data
wMobileMonSpeciesPointer:: dw
wMobileMonStructPointer:: dw
wMobileMonOTNamePointer:: dw
wMobileMonOTPointer:: dw
wMobileMonNicknamePointer:: dw
wMobileMonMailPointer:: dw
@ -1219,7 +1264,9 @@ wcd29:: ds 1
wMobileMonSpecies::
wcd2a:: db
wTempOddEggNickname:: ; ds 11
UNION
wTempOddEggNickname:: ds MON_NAME_LENGTH
NEXTU
wcd2b:: ds 1
wcd2c:: ds 1
wcd2d:: ds 1
@ -1231,6 +1278,7 @@ wcd32:: ds 1
wcd33:: ds 1
wcd34:: ds 1
wcd35:: ds 1
ENDU
; current time for link/mobile?
wcd36:: db ; hours
@ -1710,7 +1758,7 @@ wDefaultSpawnpoint:: db
UNION
; mon buffer
wBufferMonNick:: ds MON_NAME_LENGTH
wBufferMonNickname:: ds MON_NAME_LENGTH
wBufferMonOT:: ds NAME_LENGTH
wBufferMon:: party_struct wBufferMon
ds 8
@ -1723,8 +1771,8 @@ wSeerAction:: db
wSeerNickname:: ds MON_NAME_LENGTH
wSeerCaughtLocation:: ds 17
wSeerTimeOfDay:: ds NAME_LENGTH
wSeerOTName:: ds NAME_LENGTH
wSeerOTNameGrammar:: db
wSeerOT:: ds NAME_LENGTH
wSeerOTGrammar:: db
wSeerCaughtLevelString:: ds 4
wSeerCaughtLevel:: db
wSeerCaughtData:: db
@ -1872,7 +1920,7 @@ NEXTU
; trade
wCurTradePartyMon:: db
wCurOTTradePartyMon:: db
wBufferTrademonNick:: ds MON_NAME_LENGTH
wBufferTrademonNickname:: ds MON_NAME_LENGTH
NEXTU
; link battle record data
@ -2576,10 +2624,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
@ -3142,9 +3206,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
@ -3166,9 +3246,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
@ -3182,13 +3262,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