summaryrefslogtreecommitdiff
path: root/engine/menus
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menus')
-rw-r--r--engine/menus/delete_save.asm6
-rw-r--r--engine/menus/init_gender.asm9
-rw-r--r--engine/menus/intro_menu.asm20
-rw-r--r--engine/menus/main_menu.asm21
-rw-r--r--engine/menus/menu_2.asm8
-rw-r--r--engine/menus/naming_screen.asm3
-rw-r--r--engine/menus/save.asm24
-rw-r--r--engine/menus/start_menu.asm10
8 files changed, 39 insertions, 62 deletions
diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm
index ecfb9761d..8be78e979 100644
--- a/engine/menus/delete_save.asm
+++ b/engine/menus/delete_save.asm
@@ -18,18 +18,18 @@ _DeleteSaveData:
farcall EmptyAllSRAMBanks
ret
-.Text_ClearAllSaveData: ; 0x4d580
+.Text_ClearAllSaveData:
; Clear all save data?
text_jump UnknownText_0x1c564a
db "@"
-.NoYesMenuHeader: ; 0x4d585
+.NoYesMenuHeader:
db 0 ; flags
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
-.MenuData: ; 0x4d58d
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "NO@"
diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm
index cf942cf38..21871d0ab 100644
--- a/engine/menus/init_gender.asm
+++ b/engine/menus/init_gender.asm
@@ -41,25 +41,22 @@ InitGender:
call DelayFrames
ret
-.MenuHeader: ; 0x48dfc
+.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 6, 4, 12, 9
dw .MenuData
db 1 ; default option
-; 0x48e04
-.MenuData: ; 0x48e04
+.MenuData:
db STATICMENU_CURSOR | STATICMENU_WRAP | STATICMENU_DISABLE_B ; flags
db 2 ; items
db "Boy@"
db "Girl@"
-; 0x48e0f
-TextJump_AreYouABoyOrAreYouAGirl: ; 0x48e0f
+TextJump_AreYouABoyOrAreYouAGirl:
; Are you a boy? Or are you a girl?
text_jump Text_AreYouABoyOrAreYouAGirl
db "@"
-; 0x48e14
InitGenderScreen:
ld a, $10
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 87334b25e..1bdf8b02f 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -627,7 +627,7 @@ Continue_DisplayGameTime:
jp PrintNum
-OakSpeech: ; 0x5f99
+OakSpeech:
farcall InitClock
call RotateFourPalettesLeft
call ClearTileMap
@@ -705,11 +705,11 @@ OakSpeech: ; 0x5f99
call PrintText
ret
-OakText1: ; 0x6045
+OakText1:
text_jump _OakText1
db "@"
-OakText2: ; 0x604a
+OakText2:
text_jump _OakText2
start_asm
ld a, WOOPER
@@ -718,27 +718,27 @@ OakText2: ; 0x604a
ld hl, OakText3
ret
-OakText3: ; 0x605b
+OakText3:
text_jump _OakText3
db "@"
-OakText4: ; 0x6060
+OakText4:
text_jump _OakText4
db "@"
-OakText5: ; 0x6065
+OakText5:
text_jump _OakText5
db "@"
-OakText6: ; 0x606a
+OakText6:
text_jump _OakText6
db "@"
-OakText7: ; 0x606f
+OakText7:
text_jump _OakText7
db "@"
-NamePlayer: ; 0x6074
+NamePlayer:
farcall MovePlayerPicRight
farcall ShowPlayerNamingChoices
ld a, [wMenuCursorY]
@@ -867,7 +867,7 @@ Intro_RotatePalettesLeftFrontpic:
jr nz, .loop
ret
-IntroFadePalettes: ; 0x617c
+IntroFadePalettes:
db %01010100
db %10101000
db %11111100
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index dc57fe971..87823228d 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -48,14 +48,13 @@ MainMenu:
db "MOBILE@"
db "MOBILE STUDIUM@"
-.Jumptable: ; 0x49d60
+.Jumptable:
dw MainMenu_Continue
dw MainMenu_NewGame
dw MainMenu_Options
dw MainMenu_MysteryGift
dw MainMenu_Mobile
dw MainMenu_MobileStudium
-; 0x49d6c
CONTINUE EQU 0
NEW_GAME EQU 1
@@ -66,20 +65,20 @@ MOBILE_STUDIUM EQU 5
MainMenuItems:
-NewGameMenu: ; 0x49d6c
+NewGameMenu:
db 2
db NEW_GAME
db OPTION
db -1
-ContinueMenu: ; 0x49d70
+ContinueMenu:
db 3
db CONTINUE
db NEW_GAME
db OPTION
db -1
-MobileMysteryMenu: ; 0x49d75
+MobileMysteryMenu:
db 5
db CONTINUE
db NEW_GAME
@@ -88,7 +87,7 @@ MobileMysteryMenu: ; 0x49d75
db MOBILE
db -1
-MobileMenu: ; 0x49d7c
+MobileMenu:
db 4
db CONTINUE
db NEW_GAME
@@ -96,7 +95,7 @@ MobileMenu: ; 0x49d7c
db MOBILE
db -1
-MobileStudiumMenu: ; 0x49d82
+MobileStudiumMenu:
db 5
db CONTINUE
db NEW_GAME
@@ -105,7 +104,7 @@ MobileStudiumMenu: ; 0x49d82
db MOBILE_STUDIUM
db -1
-MysteryMobileStudiumMenu: ; 0x49d89
+MysteryMobileStudiumMenu:
db 6
db CONTINUE
db NEW_GAME
@@ -115,7 +114,7 @@ MysteryMobileStudiumMenu: ; 0x49d89
db MOBILE_STUDIUM
db -1
-MysteryMenu: ; 0x49d91
+MysteryMenu:
db 4
db CONTINUE
db NEW_GAME
@@ -123,7 +122,7 @@ MysteryMenu: ; 0x49d91
db MYSTERY_GIFT
db -1
-MysteryStudiumMenu: ; 0x49d97
+MysteryStudiumMenu:
db 5
db CONTINUE
db NEW_GAME
@@ -132,7 +131,7 @@ MysteryStudiumMenu: ; 0x49d97
db MOBILE_STUDIUM
db -1
-StudiumMenu: ; 0x49d9e
+StudiumMenu:
db 4
db CONTINUE
db NEW_GAME
diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm
index b4a9ef95a..b039b590f 100644
--- a/engine/menus/menu_2.asm
+++ b/engine/menus/menu_2.asm
@@ -1,4 +1,4 @@
-PlaceMenuItemName: ; 0x24ab4
+PlaceMenuItemName:
push de
ld a, [wMenuSelection]
ld [wNamedObjectIndexBuffer], a
@@ -7,7 +7,7 @@ PlaceMenuItemName: ; 0x24ab4
call PlaceString
ret
-PlaceMenuItemQuantity: ; 0x24ac3
+PlaceMenuItemQuantity:
push de
ld a, [wMenuSelection]
ld [wCurItem], a
@@ -52,13 +52,13 @@ PlaceMoneyTextBox:
call PrintNum
ret
-MenuHeader_0x24b15: ; 0x24b15
+MenuHeader_0x24b15:
db MENU_BACKUP_TILES ; flags
menu_coords 11, 0, SCREEN_WIDTH - 1, 2
dw NULL
db 1 ; default option
-MenuHeader_0x24b1d: ; 0x24b1d
+MenuHeader_0x24b1d:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 11, 8, 13
dw NULL
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index fb42b1350..9d633bb3f 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -4,13 +4,12 @@ NAMINGSCREEN_BORDER EQUS "\"■\"" ; $60
NAMINGSCREEN_MIDDLELINE EQUS "\"→\"" ; $eb
NAMINGSCREEN_UNDERLINE EQUS "\"<DOT>\"" ; $f2
-_NamingScreen: ; 0x116b7
+_NamingScreen:
call DisableSpriteUpdates
call NamingScreen
call ReturnToMapWithSpeechTextbox
ret
-; 0x116c1
NamingScreen:
ld hl, wNamingScreenDestinationPointer
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index a0db01a95..903d9db04 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -1112,50 +1112,42 @@ Checksum:
ret
-Text_WouldYouLikeToSaveTheGame: ; 0x15283
+Text_WouldYouLikeToSaveTheGame:
; Would you like to save the game?
text_jump UnknownText_0x1c454b
db "@"
-; 0x15288
-Text_SavingDontTurnOffThePower: ; 0x15288
+Text_SavingDontTurnOffThePower:
; SAVING… DON'T TURN OFF THE POWER.
text_jump UnknownText_0x1c456d
db "@"
-; 0x1528d
-Text_PlayerSavedTheGame: ; 0x1528d
+Text_PlayerSavedTheGame:
; saved the game.
text_jump UnknownText_0x1c4590
db "@"
-; 0x15292
-Text_AlreadyASaveFile: ; 0x15292
+Text_AlreadyASaveFile:
; There is already a save file. Is it OK to overwrite?
text_jump UnknownText_0x1c45a3
db "@"
-; 0x15297
-Text_AnotherSaveFile: ; 0x15297
+Text_AnotherSaveFile:
; There is another save file. Is it OK to overwrite?
text_jump UnknownText_0x1c45d9
db "@"
-; 0x1529c
-Text_SaveFileCorrupted: ; 0x1529c
+Text_SaveFileCorrupted:
; The save file is corrupted!
text_jump UnknownText_0x1c460d
db "@"
-; 0x152a1
-Text_SaveOnBoxSwitch: ; 0x152a1
+Text_SaveOnBoxSwitch:
; When you change a #MON BOX, data will be saved. OK?
text_jump UnknownText_0x1c462a
db "@"
-; 0x152a6
-Text_SaveOnMoveMonWOMail: ; 0x152a6
+Text_SaveOnMoveMonWOMail:
; Each time you move a #MON, data will be saved. OK?
text_jump UnknownText_0x1c465f
db "@"
-; 0x152ab
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index 0330b00a3..9cff1cb70 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -647,7 +647,6 @@ TossItemFromPC:
; That's too impor- tant to toss out!
text_jump UnknownText_0x1c1adf
db "@"
-; 0x12a60
CantUseItem:
ld hl, CantUseItemText
@@ -1137,7 +1136,6 @@ MonMailAction:
menu_coords 12, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData
db 1 ; default option
-; 0x12dd1
.MenuData:
db STATICMENU_CURSOR ; flags
@@ -1145,44 +1143,37 @@ MonMailAction:
db "READ@"
db "TAKE@"
db "QUIT@"
-; 0x12de2
.mailwilllosemessagetext
; The MAIL will lose its message. OK?
text_jump UnknownText_0x1c1c22
db "@"
-; 0x12de7
.tookmailfrommontext
; MAIL detached from <POKEMON>.
text_jump UnknownText_0x1c1c47
db "@"
-; 0x12dec
.bagfulltext
; There's no space for removing MAIL.
text_jump UnknownText_0x1c1c62
db "@"
-; 0x12df1
.sendmailtopctext
; Send the removed MAIL to your PC?
text_jump UnknownText_0x1c1c86
db "@"
-; 0x12df6
.mailboxfulltext
; Your PC's MAILBOX is full.
text_jump UnknownText_0x1c1ca9
db "@"
-; 0x12dfb
.sentmailtopctext
; The MAIL was sent to your PC.
text_jump UnknownText_0x1c1cc4
db "@"
-; 0x12e00
OpenPartyStats:
@@ -1348,7 +1339,6 @@ MonMenu_Softboiled_MilkDrink:
; Not enough HP!
text_jump UnknownText_0x1c1ce3
db "@"
-; 0x12f05
.CheckMonHasEnoughHP:
; Need to have at least (MaxHP / 5) HP left.
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 16:19:26 +0000