diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/phone/phone.asm | 23 | ||||
| -rw-r--r-- | engine/pokedex/pokedex_2.asm | 6 | ||||
| -rw-r--r-- | engine/printer/print_party.asm | 4 | ||||
| -rw-r--r-- | engine/printer/printer.asm | 4 |
4 files changed, 19 insertions, 18 deletions
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 27acc48f1..c8c9744ed 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -93,7 +93,8 @@ GetRemainingSpaceInPhoneList: INCLUDE "data/phone/permanent_numbers.asm" -FarPlaceString: +BrokenPlaceFarString: +; This routine is not in bank 0 and will fail or crash if called. ldh a, [hROMBank] push af ld a, b @@ -455,14 +456,14 @@ RingTwice_StartCall: .Ring: call Phone_StartRinging call Phone_Wait20Frames - call Phone_CallerTextboxWithName + call .CallerTextboxWithName call Phone_Wait20Frames call Phone_CallerTextbox call Phone_Wait20Frames - call Phone_CallerTextboxWithName + call .CallerTextboxWithName ret -Phone_CallerTextboxWithName: +.CallerTextboxWithName: ld a, [wCurCaller] ld b, a call Phone_TextboxWithName @@ -475,22 +476,22 @@ PhoneCall:: ld [wPhoneCaller], a ld a, d ld [wPhoneCaller + 1], a - call Phone_FirstOfTwoRings - call Phone_FirstOfTwoRings + call .Ring + call .Ring farcall StubbedTrainerRankings_PhoneCalls ret -Phone_FirstOfTwoRings: +.Ring: call Phone_StartRinging call Phone_Wait20Frames - call Phone_CallerTextboxWithName2 + call .CallerTextboxWithName call Phone_Wait20Frames call Phone_CallerTextbox call Phone_Wait20Frames - call Phone_CallerTextboxWithName2 + call .CallerTextboxWithName ret -Phone_CallerTextboxWithName2: +.CallerTextboxWithName: call Phone_CallerTextbox hlcoord 1, 2 ld [hl], "☎" @@ -502,7 +503,7 @@ Phone_CallerTextboxWithName2: ld e, a ld a, [wPhoneCaller + 1] ld d, a - call FarPlaceString + call BrokenPlaceFarString ret Phone_NoSignal: diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index 38282d174..354ddfaba 100644 --- a/engine/pokedex/pokedex_2.asm +++ b/engine/pokedex/pokedex_2.asm @@ -86,7 +86,7 @@ DisplayDexEntry: ld a, b push af hlcoord 9, 5 - call FarString ; dex species + call PlaceFarString ; dex species ld h, b ld l, c push de @@ -182,7 +182,7 @@ DisplayDexEntry: pop af hlcoord 2, 11 push af - call FarString + call PlaceFarString pop bc ld a, [wPokedexStatus] or a ; check for page 2 @@ -211,7 +211,7 @@ DisplayDexEntry: inc de pop af hlcoord 2, 11 - call FarString + call PlaceFarString ret POKeString: ; unreferenced diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index d50c2dd17..4889b6ad8 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -37,7 +37,7 @@ PrintPage1: pop af ld a, b hlcoord 1, 11, wPrinterTilemapBuffer - call nz, FarString + call nz, PlaceFarString hlcoord 19, 0, wPrinterTilemapBuffer ld [hl], $35 ld de, SCREEN_WIDTH @@ -86,7 +86,7 @@ PrintPage2: pop af hlcoord 1, 1, wPrinterTilemapBuffer ld a, b - call nz, FarString + call nz, PlaceFarString ret .FillColumn: diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 761053621..8fac5165c 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -567,7 +567,7 @@ PlacePrinterStatusString: ld d, [hl] hlcoord 1, 7 ld a, BANK(GBPrinterStrings) - call FarString + call PlaceFarString hlcoord 2, 15 ld de, String_PressBToCancel call PlaceString @@ -600,7 +600,7 @@ PlacePrinterStatusStringBorderless: ; unreferenced ld d, [hl] hlcoord 4, 7 ld a, BANK(GBPrinterStrings) - call FarString + call PlaceFarString hlcoord 4, 15 ld de, String_PressBToCancel call PlaceString |