diff options
| -rw-r--r-- | engine/items/print_item_description.asm | 2 | ||||
| -rw-r--r-- | engine/movie/credits.asm | 2 | ||||
| -rw-r--r-- | engine/phone/phone.asm | 21 | ||||
| -rw-r--r-- | engine/pokedex/pokedex_2.asm | 6 | ||||
| -rw-r--r-- | engine/pokemon/print_move_description.asm | 2 | ||||
| -rw-r--r-- | engine/printer/print_party.asm | 4 | ||||
| -rw-r--r-- | engine/printer/printer.asm | 4 | ||||
| -rw-r--r-- | home/text.asm | 2 |
8 files changed, 22 insertions, 21 deletions
diff --git a/engine/items/print_item_description.asm b/engine/items/print_item_description.asm index 8ac6f816..ad6a170e 100644 --- a/engine/items/print_item_description.asm +++ b/engine/items/print_item_description.asm @@ -29,4 +29,4 @@ PrintItemDescription: ld e, l pop hl ld a, BANK(ItemDescriptions) - jp FarString + jp PlaceFarString diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index a1b91d7e..34ac382d 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -303,7 +303,7 @@ ParseCredits: ld bc, SCREEN_WIDTH * 2 call AddNTimes ld a, BANK(CreditsStrings) - call FarString + call PlaceFarString jr .loop .theend diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 49b3eb2f..796aed9b 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 @@ -459,14 +460,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 @@ -479,19 +480,19 @@ PhoneCall:: ld [wPhoneCaller], a ld a, d ld [wPhoneCaller + 1], a - call Phone_Ring + call .Ring ; fallthrough (rings a second time) -Phone_Ring: +.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], "☎" @@ -503,7 +504,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 1f78bd4b..d869b4af 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/pokemon/print_move_description.asm b/engine/pokemon/print_move_description.asm index fd12f82b..1b57b46e 100644 --- a/engine/pokemon/print_move_description.asm +++ b/engine/pokemon/print_move_description.asm @@ -13,4 +13,4 @@ PrintMoveDescription: ld e, l pop hl ld a, BANK(MoveDescriptions) - jp FarString + jp PlaceFarString diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index 568a0c92..576efcff 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 302119f7..214ee9b9 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -563,7 +563,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 @@ -596,7 +596,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 diff --git a/home/text.asm b/home/text.asm index 77b8911c..85270b0f 100644 --- a/home/text.asm +++ b/home/text.asm @@ -554,7 +554,7 @@ UnloadBlinkingCursor:: ldcoord_a 18, 17 ret -FarString:: +PlaceFarString:: ld b, a ldh a, [hROMBank] push af |