ref: 4f49a1f2f0044c10b2d447e35d8c05f3381ea49c
parent: edcf08ff361e58b2d03ff80a0b2eb0550ac7c647
author: Lhivorde <62214635+Lhivorde@users.noreply.github.com>
date: Fri May 29 02:16:49 EDT 2020
Rename ScrollingMenu_UpdateDisplay.string_2485f (#726)
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -417,7 +417,7 @@
inc hl
inc hl
push de
- ld de, TMHM_String_Cancel
+ ld de, TMHM_CancelString
call PlaceString
pop de
.done
@@ -449,7 +449,7 @@
pop hl
ret
-TMHM_String_Cancel:
+TMHM_CancelString:
db "CANCEL@"
TMHM_GetCurrentPocketPosition:
@@ -472,7 +472,7 @@
Tutorial_TMHMPocket:
hlcoord 9, 3
push de
- ld de, TMHM_String_Cancel
+ ld de, TMHM_CancelString
call PlaceString
pop de
ret
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -1571,10 +1571,10 @@
ld bc, SCREEN_WIDTH - 2
call ByteFill
hlcoord 2, 16
- ld de, .Cancel
+ ld de, .CancelString
jp PlaceString
-.Cancel:
+.CancelString:
db "CANCEL@"
Function28b68:
--- a/engine/link/link_trade.asm
+++ b/engine/link/link_trade.asm
@@ -115,11 +115,11 @@
farcall InitMG_Mobile_LinkTradePalMap
farcall PlaceTradePartnerNamesAndParty
hlcoord 10, 17
- ld de, .CANCEL
+ ld de, .CancelString
call PlaceString
ret
-.CANCEL:
+.CancelString:
db "CANCEL@"
_LoadTradeScreenBorder:
--- a/engine/menus/scrolling_menu.asm
+++ b/engine/menus/scrolling_menu.asm
@@ -401,11 +401,11 @@
ld a, [wMenuDataFlags]
bit 0, a ; call function on cancel
jr nz, .call_function
- ld de, .string_2485f
+ ld de, .CancelString
call PlaceString
ret
-.string_2485f
+.CancelString
db "CANCEL@"
.call_function
--- a/engine/pokemon/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@@ -105,11 +105,11 @@
.end
dec hl
dec hl
- ld de, .CANCEL
+ ld de, .CancelString
call PlaceString
ret
-.CANCEL:
+.CancelString:
db "CANCEL@"
PlacePartyHPBar:
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -6487,12 +6487,12 @@
db "Waiting...!@"
Function102e3e:
- ld de, .CANCEL
+ ld de, .CancelString
hlcoord 10, 17
call PlaceString
ret
-.CANCEL:
+.CancelString:
db "CANCEL@"
Function102e4f:
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -3889,8 +3889,8 @@
db " L:30 @@"
db " L:40 @@"
db "CANCEL@@"
-
-String_119d8c:
+
+Unreferenced_CancelString:
db "CANCEL@"
BattleTower_LevelCheck: