diff options
Diffstat (limited to 'engine/menu')
| -rw-r--r-- | engine/menu/debug_menu.asm | 4 | ||||
| -rw-r--r-- | engine/menu/main_menu.asm | 2 | ||||
| -rw-r--r-- | engine/menu/set_time.asm | 2 | ||||
| -rw-r--r-- | engine/menu/start_menu.asm | 5 | ||||
| -rw-r--r-- | engine/menu/text_entry.asm | 10 |
5 files changed, 8 insertions, 15 deletions
diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm index b9b3081..e33d61c 100644 --- a/engine/menu/debug_menu.asm +++ b/engine/menu/debug_menu.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "engine/menu/debug_menu.asm", ROMX -DebugMenu:: ; $4031 +DebugMenu:: call ClearTileMap call ClearWindowData call LoadFont @@ -105,5 +105,3 @@ DebugMenuOptionName:: ld a, $e4 ldh [rBGP], a jp DebugMenu - -; 40FD diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index c5c19d0..fca2b96 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -292,5 +292,3 @@ StartNewGame:: jp z, DemoStart call DebugSetUpPlayer jp IntroCleanup - -; 558D diff --git a/engine/menu/set_time.asm b/engine/menu/set_time.asm index 15e40dc..ab00280 100644 --- a/engine/menu/set_time.asm +++ b/engine/menu/set_time.asm @@ -79,5 +79,3 @@ Textdbb6c: deciram wStartMinute, 1, 2 text " ふん？" done - -; 36:7b98 diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 5b91246..299606f 100644 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -345,7 +345,6 @@ DrawBackpack: call DrawTextBox ret -; 04:600C ld hl, wVramState set 0, [hl] call ExitMenu @@ -993,7 +992,7 @@ PartyHeldItem: call .PartyTryRecieveItem call CloseWindow jr .jump -.close; 04:65B3 +.close call CloseWindow .jump jp HandleSelectedPokemon @@ -1175,7 +1174,7 @@ ItemPrompt6753: dw wcd11 text "は @" -.UnusedText5; 04:675A +.UnusedText5: db 1 dw wStringBuffer1 text "を" diff --git a/engine/menu/text_entry.asm b/engine/menu/text_entry.asm index 4f4b9ee..14dbc85 100644 --- a/engine/menu/text_entry.asm +++ b/engine/menu/text_entry.asm @@ -206,8 +206,8 @@ GetNamingScreenSetup: ret NamingScreen_InitText: -; fills the tilemap with ■, then clears a 12x17 box at 1,1 -; next it places the tiles at 04:58B3 onto the screen at 2,9 (tiles form an 11x8 box) +; fills the tilemap with "■", then clears a 12x17 box at 1,1 +; next it places the tiles at TextEntryChars in a 11x8 box at 2,9 call WaitForAutoBgMapTransfer hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT @@ -437,7 +437,7 @@ NamingScreenJoypadLoop: LetterOffsetsTable1: db $00, $08, $10, $18, $20, $30, $38, $40, $48, $50, $60, $68, $70, $78, $80 -LetterOffsetsTable2:; 04:56ED +LetterOffsetsTable2: db $00, $08, $10, $18, $20, $28, $30, $38 NamingScreenTryAddCharacter: @@ -701,7 +701,7 @@ ComposeMailMessage: ldh [hMapAnims], a ret -.firstruncheck; 04:5A1B +.firstruncheck ld hl, wFlyDestination ld a, [hl] and 1 @@ -863,7 +863,7 @@ DoMailEntry: inc [hl] ret -.processjoypad; 04:5B51 +.processjoypad ld hl, hJoypadSum ld a, [hl] and A_BUTTON |