diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-17 16:29:28 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-17 16:38:30 -0400 |
| commit | afd42efb6058a7cd19b847e5393b07e7e4fdbb95 (patch) | |
| tree | 79b71efd95bae359ce02b66a4ceeee18148292ab /engine/events/overworld.asm | |
| parent | d1167570cc5c8db26b2bc310db8c574ba3a9a9e5 (diff) | |
Consistent labels for each nickname in RAM
Diffstat (limited to 'engine/events/overworld.asm')
| -rw-r--r-- | engine/events/overworld.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index b01bf5ca..113c0fab 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -19,13 +19,13 @@ FieldMoveJumptable: scf ret -GetPartyNick: +GetPartyNickname: ; write wCurPartyMon nickname to wStringBuffer1-3 ld hl, wPartyMonNicknames ld a, BOXMON ld [wMonType], a ld a, [wCurPartyMon] - call GetNick + call GetNickname call CopyName1 ; copy text from wStringBuffer2 to wStringBuffer3 ld de, wStringBuffer2 @@ -204,7 +204,7 @@ Script_CutFromMenu: special UpdateTimePals Script_Cut: - callasm GetPartyNick + callasm GetPartyNickname writetext UseCutText reloadmappart callasm CutDownTreeOrGrass @@ -369,7 +369,7 @@ SurfFunction: .DoSurf: call GetSurfType ld [wSurfingPlayerState], a - call GetPartyNick + call GetPartyNickname ld hl, SurfFromMenuScript call QueueScript ld a, $81 @@ -500,7 +500,7 @@ TrySurfOW:: call GetSurfType ld [wSurfingPlayerState], a - call GetPartyNick + call GetPartyNickname ld a, BANK(AskSurfScript) ld hl, AskSurfScript @@ -652,7 +652,7 @@ Script_WaterfallFromMenu: special UpdateTimePals Script_UsedWaterfall: - callasm GetPartyNick + callasm GetPartyNickname writetext .UseWaterfallText waitbutton closetext @@ -775,7 +775,7 @@ EscapeRopeOrDig: ld de, wNextWarp ld bc, 3 call CopyBytes - call GetPartyNick + call GetPartyNickname ld a, [wEscapeRopeOrDigType] cp $2 jr nz, .escaperope @@ -887,7 +887,7 @@ TeleportFunction: ret .DoTeleport: - call GetPartyNick + call GetPartyNickname ld hl, .TeleportScript call QueueScript ld a, $81 @@ -975,7 +975,7 @@ SetStrengthFlag: add hl, de ld a, [hl] ld [wStrengthSpecies], a - call GetPartyNick + call GetPartyNickname ret Script_StrengthFromMenu: @@ -1142,7 +1142,7 @@ Script_WhirlpoolFromMenu: special UpdateTimePals Script_UsedWhirlpool: - callasm GetPartyNick + callasm GetPartyNickname writetext UseWhirlpoolText reloadmappart callasm DisappearWhirlpool @@ -1241,7 +1241,7 @@ HeadbuttFromMenuScript: special UpdateTimePals HeadbuttScript: - callasm GetPartyNick + callasm GetPartyNickname writetext UseHeadbuttText reloadmappart @@ -1338,7 +1338,7 @@ RockSmashFromMenuScript: special UpdateTimePals RockSmashScript: - callasm GetPartyNick + callasm GetPartyNickname writetext UseRockSmashText closetext special WaitSFX |