diff options
| author | einstein95 <einstein95@users.noreply.github.com> | 2017-04-17 02:19:21 +1200 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2017-04-17 02:19:21 +1200 |
| commit | ce685ac9638b0c6d42168d7c8d37a237b1ce49be (patch) | |
| tree | 785a8e58e77b5c1c145343528be3aac80ec7d719 | |
| parent | 22e16624b8c295e5f45cdf432c5ded8bc0d388ee (diff) | |
Still more
| -rwxr-xr-x | engine/cable_club.asm | 4 | ||||
| -rw-r--r-- | engine/menu/text_box.asm | 24 | ||||
| -rw-r--r-- | engine/print_waiting_text.asm | 2 | ||||
| -rw-r--r-- | home.asm | 4 |
4 files changed, 17 insertions, 17 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm index a42916cb..60c87efb 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -11,7 +11,7 @@ CableClub_DoBattleOrTrade: call LoadTrainerInfoTextBoxTiles coord hl, 3, 8 ld b, 2 - ld c, 12 + ld c, 13 call CableClub_TextBoxBorder coord hl, 4, 10 ld de, PleaseWaitString @@ -602,7 +602,7 @@ TradeCenter_DrawCancelBox: call FillMemory coord hl, 0, 15 ld b, 1 - ld c, 9 + ld c, 12 call CableClub_TextBoxBorder coord hl, 2, 16 ld de, CancelTextString diff --git a/engine/menu/text_box.asm b/engine/menu/text_box.asm index b173a50d..1a9a027d 100644 --- a/engine/menu/text_box.asm +++ b/engine/menu/text_box.asm @@ -454,7 +454,7 @@ DisplayTwoOptionMenu: TwoOptionMenu_SaveScreenTiles: ld de, wBuffer - lb bc, 5, 6 + lb bc, 5, 7 .loop ld a, [hli] ld [de], a @@ -462,17 +462,17 @@ TwoOptionMenu_SaveScreenTiles: dec c jr nz, .loop push bc - ld bc, SCREEN_WIDTH - 6 + ld bc, SCREEN_WIDTH - 7 add hl, bc pop bc - ld c, $6 + ld c, $7 dec b jr nz, .loop ret TwoOptionMenu_RestoreScreenTiles: ld de, wBuffer - lb bc, 5, 6 + lb bc, 5, 7 .loop ld a, [de] inc de @@ -480,10 +480,10 @@ TwoOptionMenu_RestoreScreenTiles: dec c jr nz, .loop push bc - ld bc, SCREEN_WIDTH - 6 + ld bc, SCREEN_WIDTH - 7 add hl, bc pop bc - ld c, 6 + ld c, 7 dec b jr nz, .loop call UpdateSprites @@ -495,7 +495,7 @@ TwoOptionMenu_RestoreScreenTiles: ; 02: byte put blank line before first menu item ; 03: word text pointer TwoOptionMenuStrings: - db 4,3,0 + db 5,3,0 dw .YesNoMenu db 6,3,0 dw .NorthWestMenu @@ -505,11 +505,11 @@ TwoOptionMenuStrings: dw .YesNoMenu db 6,3,0 dw .NorthEastMenu - db 8,3,0 + db 7,3,0 dw .TradeCancelMenu db 7,4,1 dw .HealCancelMenu - db 4,3,0 + db 5,3,0 dw .NoYesMenu .NorthWestMenu @@ -728,13 +728,13 @@ GetMonFieldMoves: ; Leftmost tile = -1 + tile column in which the first letter of the move's name should be displayed ; "SOFTBOILED" is $08 because it has 4 more letters than "SURF", for example, whose value is $0C FieldMoveDisplayData: - db CUT, $01, $0C - db FLY, $02, $0C + db CUT, $01, $06 + db FLY, $02, $0B db $B4, $03, $0C ; unused field move db SURF, $04, $0C db STRENGTH, $05, $0C db FLASH, $06, $0C - db DIG, $07, $0C + db DIG, $07, $09 db TELEPORT, $08, $0A db SOFTBOILED, $09, $0B db $ff ; list terminator diff --git a/engine/print_waiting_text.asm b/engine/print_waiting_text.asm index a37f1856..17b44a55 100644 --- a/engine/print_waiting_text.asm +++ b/engine/print_waiting_text.asm @@ -1,7 +1,7 @@ PrintWaitingText: coord hl, 3, 10 ld b, $1 - ld c, $b + ld c, $d ld a, [wIsInBattle] and a jr z, .asm_4c17 @@ -3001,8 +3001,8 @@ Func_35f4:: InitYesNoTextBoxParameters:: xor a ; YES_NO_MENU ld [wTwoOptionMenuID], a - coord hl, 14, 7 - ld bc, $80f + coord hl, 13, 7 + ld bc, $80e ret YesNoChoicePokeCenter:: |