diff options
| author | Lhivorde <62214635+Lhivorde@users.noreply.github.com> | 2020-05-29 06:16:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 11:16:49 +0000 |
| commit | 4f49a1f2f0044c10b2d447e35d8c05f3381ea49c (patch) | |
| tree | a49fbd91376ba05074763f09c178da4af7f679a7 | |
| parent | edcf08ff361e58b2d03ff80a0b2eb0550ac7c647 (diff) | |
Rename ScrollingMenu_UpdateDisplay.string_2485f (#726)
| -rw-r--r-- | engine/items/tmhm.asm | 6 | ||||
| -rw-r--r-- | engine/link/link.asm | 4 | ||||
| -rw-r--r-- | engine/link/link_trade.asm | 4 | ||||
| -rw-r--r-- | engine/menus/scrolling_menu.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/party_menu.asm | 4 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 4 | ||||
| -rw-r--r-- | mobile/mobile_46.asm | 4 |
7 files changed, 15 insertions, 15 deletions
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index c15be2847..ecc2d45cb 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -417,7 +417,7 @@ TMHM_DisplayPocketItems: inc hl inc hl push de - ld de, TMHM_String_Cancel + ld de, TMHM_CancelString call PlaceString pop de .done @@ -449,7 +449,7 @@ Unreferenced_Function2ca95: pop hl ret -TMHM_String_Cancel: +TMHM_CancelString: db "CANCEL@" TMHM_GetCurrentPocketPosition: @@ -472,7 +472,7 @@ TMHM_GetCurrentPocketPosition: Tutorial_TMHMPocket: hlcoord 9, 3 push de - ld de, TMHM_String_Cancel + ld de, TMHM_CancelString call PlaceString pop de ret diff --git a/engine/link/link.asm b/engine/link/link.asm index 31c189112..521cfdd8b 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -1571,10 +1571,10 @@ Unreferenced_Function28b42: ld bc, SCREEN_WIDTH - 2 call ByteFill hlcoord 2, 16 - ld de, .Cancel + ld de, .CancelString jp PlaceString -.Cancel: +.CancelString: db "CANCEL@" Function28b68: diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm index 4119e48a7..14386ae23 100644 --- a/engine/link/link_trade.asm +++ b/engine/link/link_trade.asm @@ -115,11 +115,11 @@ InitTradeSpeciesList: farcall InitMG_Mobile_LinkTradePalMap farcall PlaceTradePartnerNamesAndParty hlcoord 10, 17 - ld de, .CANCEL + ld de, .CancelString call PlaceString ret -.CANCEL: +.CancelString: db "CANCEL@" _LoadTradeScreenBorder: diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index 6b0572a6d..0574bc730 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -401,11 +401,11 @@ ScrollingMenu_UpdateDisplay: 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 diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 12036497d..cf82c38ee 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -105,11 +105,11 @@ PlacePartyNicknames: .end dec hl dec hl - ld de, .CANCEL + ld de, .CancelString call PlaceString ret -.CANCEL: +.CancelString: db "CANCEL@" PlacePartyHPBar: diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index b20c3de32..1cbb3bda7 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -6487,12 +6487,12 @@ Function102e07: db "Waiting...!@" Function102e3e: - ld de, .CANCEL + ld de, .CancelString hlcoord 10, 17 call PlaceString ret -.CANCEL: +.CancelString: db "CANCEL@" Function102e4f: diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 793cf7c21..0f4698c1d 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -3889,8 +3889,8 @@ Strings_Ll0ToL40: db " L:30 @@" db " L:40 @@" db "CANCEL@@" - -String_119d8c: + +Unreferenced_CancelString: db "CANCEL@" BattleTower_LevelCheck: |