diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/items/print_item_description.asm | 2 | ||||
| -rw-r--r-- | engine/items/tmhm.asm | 8 | ||||
| -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/menus/trainer_card.asm | 11 | ||||
| -rw-r--r-- | engine/movie/credits.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/party_menu.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/print_move_description.asm | 4 |
10 files changed, 27 insertions, 20 deletions
diff --git a/engine/items/print_item_description.asm b/engine/items/print_item_description.asm index 5d944e206..999c2075a 100644 --- a/engine/items/print_item_description.asm +++ b/engine/items/print_item_description.asm @@ -11,7 +11,7 @@ PrintItemDescription: pop hl ld a, [wTempTMHM] ld [wCurSpecies], a - predef PrintMoveDesc + predef PrintMoveDescription ret .not_a_tm diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 736f00cdb..ecc2d45cb 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -252,7 +252,7 @@ TMHM_ShowTMMoveDescription: ld a, [wTempTMHM] ld [wCurSpecies], a hlcoord 1, 14 - call PrintMoveDesc + call PrintMoveDescription jp TMHM_JoypadLoop TMHM_ChooseTMorHM: @@ -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/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 712032cbe..726148e20 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -356,7 +356,8 @@ TrainerCard_InitBorder: ld a, $23 ld [hli], a - ld e, SCREEN_HEIGHT - 1 + + ld e, SCREEN_WIDTH - 3 ld a, " " .loop2 ld [hli], a @@ -367,11 +368,12 @@ TrainerCard_InitBorder: ld [hli], a ld a, $23 ld [hli], a + .loop3 ld a, $23 ld [hli], a - ld e, SCREEN_HEIGHT + ld e, SCREEN_WIDTH - 2 ld a, " " .loop4 ld [hli], a @@ -380,6 +382,7 @@ TrainerCard_InitBorder: ld a, $23 ld [hli], a + dec d jr nz, .loop3 @@ -388,14 +391,16 @@ TrainerCard_InitBorder: ld a, $24 ld [hli], a - ld e, SCREEN_HEIGHT - 1 + ld e, SCREEN_WIDTH - 3 ld a, " " .loop5 ld [hli], a dec e jr nz, .loop5 + ld a, $23 ld [hli], a + ld e, SCREEN_WIDTH .loop6 ld a, $23 diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index a494d3681..650e056b7 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -245,7 +245,7 @@ ParseCredits: xor a ldh [hBGMapMode], a hlcoord 0, 5 - ld bc, 20 * 12 + ld bc, SCREEN_WIDTH * 12 ld a, " " call ByteFill @@ -306,7 +306,7 @@ ParseCredits: .print ; Print strings spaced every two lines. call .get - ld bc, 20 * 2 + ld bc, SCREEN_WIDTH * 2 call AddNTimes call PlaceString jr .loop diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index d25d6cc2b..8ffba32bf 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -1214,7 +1214,7 @@ PlaceMoveData: .description hlcoord 1, 14 - predef PrintMoveDesc + predef PrintMoveDescription ld a, $1 ldh [hBGMapMode], a ret 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/engine/pokemon/print_move_description.asm b/engine/pokemon/print_move_description.asm index c461f2f3d..3647e1c54 100644 --- a/engine/pokemon/print_move_description.asm +++ b/engine/pokemon/print_move_description.asm @@ -1,4 +1,4 @@ -PrintMoveDesc: +PrintMoveDescription: push hl ld hl, MoveDescriptions ld a, [wCurSpecies] @@ -12,3 +12,5 @@ PrintMoveDesc: ld d, [hl] pop hl jp PlaceString + +INCLUDE "data/moves/descriptions.asm" |