summaryrefslogtreecommitdiff
path: root/engine/events
diff options
context:
space:
mode:
Diffstat (limited to 'engine/events')
-rw-r--r--engine/events/battle_tower/battle_tower.asm2
-rw-r--r--engine/events/bug_contest/display_stats.asm2
-rw-r--r--engine/events/daycare.asm20
-rw-r--r--engine/events/haircut.asm2
-rw-r--r--engine/events/magikarp.asm2
-rw-r--r--engine/events/move_tutor.asm2
-rw-r--r--engine/events/name_rater.asm12
-rw-r--r--engine/events/npc_trade.asm6
-rw-r--r--engine/events/odd_egg.asm10
-rw-r--r--engine/events/overworld.asm24
-rw-r--r--engine/events/poisonstep.asm2
-rw-r--r--engine/events/poke_seer.asm6
-rw-r--r--engine/events/shuckle.asm8
-rw-r--r--engine/events/sweet_scent.asm2
14 files changed, 50 insertions, 50 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index 5d1ca4844..6b58203ca 100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -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
diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm
index b18aa1cbe..220eeb4e4 100644
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -48,7 +48,7 @@ DisplayCaughtContestMonStats:
ld [wTempMonLevel], a
call PrintLevel
- ld de, wEnemyMonNick
+ ld de, wEnemyMonNickname
hlcoord 1, 8
call PlaceString
diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm
index d5930575e..b44264692 100644
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@@ -40,7 +40,7 @@ DayCareMan:
.AskWithdrawMon:
farcall GetBreedMon1LevelGrowth
- ld hl, wBreedMon1Nick
+ ld hl, wBreedMon1Nickname
call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon
jr c, .print_text
@@ -78,7 +78,7 @@ DayCareLady:
.AskWithdrawMon:
farcall GetBreedMon2LevelGrowth
- ld hl, wBreedMon2Nick
+ ld hl, wBreedMon2Nickname
call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon
jr c, .print_text
@@ -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
diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm
index 932e196b8..2c8aed7b0 100644
--- a/engine/events/haircut.asm
+++ b/engine/events/haircut.asm
@@ -33,7 +33,7 @@ HaircutOrGrooming:
cp EGG
jr z, .egg
push hl
- call GetCurNick
+ call GetCurNickname
call CopyPokemonName_Buffer1_Buffer3
pop hl
call Random
diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm
index 3b71ee594..db536c64b 100644
--- a/engine/events/magikarp.asm
+++ b/engine/events/magikarp.asm
@@ -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
diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm
index 07c8b8bd4..ebe860502 100644
--- a/engine/events/move_tutor.asm
+++ b/engine/events/move_tutor.asm
@@ -60,7 +60,7 @@ CheckCanLearnMoveTutorMove:
push bc
ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames
- call GetNick
+ call GetNickname
pop bc
ld a, c
diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm
index d3a1dc58f..9b6ae6bc9 100644
--- a/engine/events/name_rater.asm
+++ b/engine/events/name_rater.asm
@@ -14,7 +14,7 @@ _NameRater:
cp EGG
jr z, .egg
; ... or a Pokemon you got from a trade.
- call GetCurNick
+ call GetCurNickname
call CheckIfMonIsYourOT
jr c, .traded
; This name is good, but we can do better. How about it?
@@ -57,7 +57,7 @@ _NameRater:
.samename
push hl
- call GetCurNick
+ call GetCurNickname
ld hl, NameRaterNamedText
call PrintText
pop hl
@@ -80,7 +80,7 @@ _NameRater:
CheckIfMonIsYourOT:
; Checks to see if the partymon loaded in [wCurPartyMon] has the different OT as you. Returns carry if not.
- ld hl, wPartyMonOT
+ ld hl, wPartyMonOTs
ld bc, NAME_LENGTH
ld a, [wCurPartyMon]
call AddNTimes
@@ -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
diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm
index 36cf380ac..b0c0c9dd5 100644
--- a/engine/events/npc_trade.asm
+++ b/engine/events/npc_trade.asm
@@ -132,7 +132,7 @@ DoNPCTrade:
call GetTradeMonName
call CopyTradeName
- ld hl, wPartyMonOT
+ ld hl, wPartyMonOTs
ld bc, NAME_LENGTH
call Trade_GetAttributeOfCurrentPartymon
ld de, wPlayerTrademonOTName
@@ -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
diff --git a/engine/events/odd_egg.asm b/engine/events/odd_egg.asm
index 9216e0e73..d8ef26a46 100644
--- a/engine/events/odd_egg.asm
+++ b/engine/events/odd_egg.asm
@@ -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
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 1cb797753..ec102744e 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -19,13 +19,13 @@ FieldMoveJumptable:
scf
ret
-GetPartyNick:
+GetPartyNickname:
; write wCurPartyMon nickname to wStringBuffer1-3
ld hl, wPartyMonNicknames
ld a, BOXMON
ld [wMonType], a
ld a, [wCurPartyMon]
- call GetNick
+ call GetNickname
call CopyName1
; copy text from wStringBuffer2 to wStringBuffer3
ld de, wStringBuffer2
@@ -204,7 +204,7 @@ Script_CutFromMenu:
special UpdateTimePals
Script_Cut:
- callasm GetPartyNick
+ callasm GetPartyNickname
writetext UseCutText
reloadmappart
callasm CutDownTreeOrGrass
@@ -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
diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm
index 827f69411..b7a1ce23a 100644
--- a/engine/events/poisonstep.asm
+++ b/engine/events/poisonstep.asm
@@ -128,7 +128,7 @@ DoPoisonStep::
jr z, .mon_not_fainted
ld c, HAPPINESS_POISONFAINT
farcall ChangeHappiness
- farcall GetPartyNick
+ farcall GetPartyNickname
ld hl, .PoisonFaintText
call PrintText
diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm
index 8e62d5ded..9ad8d71dd 100644
--- a/engine/events/poke_seer.asm
+++ b/engine/events/poke_seer.asm
@@ -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
diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm
index 50293cdfc..3e0e8b27f 100644
--- a/engine/events/shuckle.asm
+++ b/engine/events/shuckle.asm
@@ -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:
diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm
index c81aa9c3a..ceda90b11 100644
--- a/engine/events/sweet_scent.asm
+++ b/engine/events/sweet_scent.asm
@@ -8,7 +8,7 @@ SweetScentFromMenu:
.SweetScent:
reloadmappart
special UpdateTimePals
- callasm GetPartyNick
+ callasm GetPartyNickname
writetext UseSweetScentText
waitbutton
callasm SweetScentEncounter
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 15:35:35 +0000