diff options
Diffstat (limited to 'src/engine/menus')
-rw-r--r-- | src/engine/menus/duel.asm | 12 | ||||
-rw-r--r-- | src/engine/menus/glossary.asm | 6 | ||||
-rw-r--r-- | src/engine/menus/play_area.asm | 4 | ||||
-rw-r--r-- | src/engine/menus/unknown.asm | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/engine/menus/duel.asm b/src/engine/menus/duel.asm index 672bd73..36f6647 100644 --- a/src/engine/menus/duel.asm +++ b/src/engine/menus/duel.asm @@ -1470,12 +1470,12 @@ endr dw .SelectedOppsHand dw .SelectedDeck -.YourOrOppPlayAreaData ; 8808 (2:4808) +.YourOrOppPlayAreaData textitem 2, 14, YourPlayAreaText textitem 2, 16, OppPlayAreaText db $ff -.PlayAreaMenuParameters ; 8811 (2:4811) +.PlayAreaMenuParameters db 1, 14 ; cursor x, cursor y db 2 ; y displacement between items db 2 ; number of items @@ -1483,7 +1483,7 @@ endr db SYM_SPACE ; tile behind cursor dw NULL ; function pointer if non-0 -.SelectedPrize ; 8819 (2:4819) +.SelectedPrize ld a, [wYourOrOppPlayAreaCurPosition] ld c, a ld b, $1 @@ -1511,7 +1511,7 @@ endr call GetTurnDuelistVariable jr .ShowSelectedCard -.SelectedOppsHand ; 883c (2:483c) +.SelectedOppsHand call CreateHandCardList ret c ld hl, wDuelTempList @@ -1519,7 +1519,7 @@ endr ld a, [hl] jr .ShowSelectedCard -.SelectedDeck ; 8849 (2:4849) +.SelectedDeck call CreateDeckCardList ret c ld a, %01111111 @@ -1532,7 +1532,7 @@ endr ; output: ; a = wce5c ; with upper bit set if turn was swapped -.ShowSelectedCard ; 8855 (2:4855) +.ShowSelectedCard ld b, a ld a, [wce5c] or a diff --git a/src/engine/menus/glossary.asm b/src/engine/menus/glossary.asm index 78f44dd..aa42851 100644 --- a/src/engine/menus/glossary.asm +++ b/src/engine/menus/glossary.asm @@ -56,7 +56,7 @@ OpenGlossaryScreen: jr .next ; display glossary menu. -.display_menu ; 1852b (6:452b) +.display_menu xor a ld [wTileMapFill], a call ZeroObjectPositions @@ -77,7 +77,7 @@ OpenGlossaryScreen: ret ; print texts in glossary menu. -.print_menu ; 1855a (6:455a) +.print_menu ld hl, wDefaultText ld a, TX_SYMBOL @@ -122,7 +122,7 @@ OpenGlossaryScreen: ret ; display glossary description. -.print_description ; 18598 (6:4598) +.print_description push af xor a ld [wTileMapFill], a diff --git a/src/engine/menus/play_area.asm b/src/engine/menus/play_area.asm index 047d24f..0a09953 100644 --- a/src/engine/menus/play_area.asm +++ b/src/engine/menus/play_area.asm @@ -93,7 +93,7 @@ OpenInPlayAreaScreen: jp .start -.print_associated_text ; 18171 (6:4171) +.print_associated_text ; each position has a text associated to it, ; which is printed at the bottom of the screen push af @@ -541,7 +541,7 @@ OpenInPlayAreaScreen_HandleInput: bit 4, [hl] ; = and $10 jr nz, ZeroObjectPositionsAndToggleOAMCopy_Bank6 -.draw_cursor ; 184a0 (6:44a0) +.draw_cursor call ZeroObjectPositions ld hl, wMenuInputTablePointer ld e, [hl] diff --git a/src/engine/menus/unknown.asm b/src/engine/menus/unknown.asm index c6f04fa..95865de 100644 --- a/src/engine/menus/unknown.asm +++ b/src/engine/menus/unknown.asm @@ -76,7 +76,7 @@ Func_18661: ; unreferenced ld a, SYM_CURSOR_R bit D_RIGHT_F, [hl] jr z, .draw_tile -.draw_blank_cursor ; 186d4 (6:46d4) +.draw_blank_cursor ld a, SYM_SPACE .draw_tile ld e, a @@ -98,6 +98,6 @@ Func_18661: ; unreferenced call WriteByteToBGMap0 or a ret -.draw_cursor ; 186f3 (6:46f3) +.draw_cursor ld a, SYM_CURSOR_R jr .draw_tile |