summaryrefslogtreecommitdiff
path: root/engine/menus
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menus')
-rw-r--r--engine/menus/intro_menu.asm8
-rw-r--r--engine/menus/menu.asm4
-rw-r--r--engine/menus/menu_2.asm2
-rw-r--r--engine/menus/naming_screen.asm4
-rw-r--r--engine/menus/save.asm12
-rw-r--r--engine/menus/scrolling_menu.asm2
-rw-r--r--engine/menus/start_menu.asm2
-rw-r--r--engine/menus/trainer_card.asm4
8 files changed, 19 insertions, 19 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 37f88506a..0c8d38375 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -781,7 +781,7 @@ NamePlayer:
.Kris:
db "KRIS@@@@@@@"
-Unreferenced_GSShowPlayerNamingChoices:
+GSShowPlayerNamingChoices: ; unreferenced
call LoadMenuHeader
call VerticalMenu
ld a, [wMenuCursorY]
@@ -1033,7 +1033,7 @@ RunTitleScreen:
scf
ret
-Unreferenced_Function6292:
+Function6292: ; unreferenced
ldh a, [hVBlankCounter]
and $7
ret nz
@@ -1061,7 +1061,7 @@ TitleScreenScene:
dw TitleScreenMain
dw TitleScreenEnd
-.Unreferenced_NextScene:
+TitleScreenNextScene: ; unreferenced
ld hl, wJumptableIndex
inc [hl]
ret
@@ -1252,7 +1252,7 @@ ResetClock:
farcall _ResetClock
jp Init
-Unreferenced_Function639b:
+Function639b: ; unreferenced
; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here.
ld a, [wTitleScreenTimer]
and %00000011
diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm
index 091dd27d0..94accb539 100644
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -272,7 +272,7 @@ MobileMenuJoypad:
ld c, a
ret
-Unreferenced_Function241d5:
+Function241d5: ; unreferenced
call Place2DMenuCursor
.loop
call Move2DMenuCursor
@@ -690,7 +690,7 @@ _ExitMenu::
dec [hl]
ret
-Unreferenced_Function24423:
+Function24423: ; unreferenced
ld a, [wVramState]
bit 0, a
ret z
diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm
index 3c68c2c49..6c65f8bf5 100644
--- a/engine/menus/menu_2.asm
+++ b/engine/menus/menu_2.asm
@@ -110,7 +110,7 @@ CoinString:
ShowMoney_TerminatorString:
db "@"
-Unreferenced_StartMenu_PrintSafariGameStatus:
+StartMenu_PrintSafariGameStatus: ; unreferenced
ld hl, wOptions
ld a, [hl]
push af
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index aa0d9abf7..791ae5e02 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -698,7 +698,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
scf
ret
-Unreferenced_AddDakutenToCharacter:
+AddDakutenToCharacter: ; unreferenced
ld a, [wNamingScreenCurNameLength]
and a
ret z
@@ -975,7 +975,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
ld [wNamingScreenMaxNameLength], a
ret
-.Unreferenced_PleaseWriteAMailString:
+.PleaseWriteAMailString: ; unreferenced
db "メールを かいてね@"
.InitCharset:
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index 3bb23f08e..8f77e9b55 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -18,7 +18,7 @@ SaveMenu:
.refused
call ExitMenu
- call ret_d90
+ call GSReloadPalettes
farcall SaveMenu_CopyTilemapAtOnce
scf
ret
@@ -205,7 +205,7 @@ SaveTheGame_yesorno:
dec a
call CloseWindow
push af
- call ret_d90
+ call GSReloadPalettes
pop af
and a
ret
@@ -390,7 +390,7 @@ EraseHallOfFame:
call ByteFill
jp CloseSRAM
-Unreferenced_Function14d18:
+Function14d18: ; unreferenced
ld a, BANK(s4_a007)
call OpenSRAM
ld hl, .Data
@@ -421,7 +421,7 @@ SaveData:
call _SaveData
ret
-Unreferenced_Function14d6c:
+Function14d6c: ; unreferenced
ld a, BANK(s4_a60b) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
call OpenSRAM
ld a, [s4_a60b] ; address of MBC30 bank
@@ -436,7 +436,7 @@ Unreferenced_Function14d6c:
call CloseSRAM
ret
-Unreferenced_Function14d83:
+Function14d83: ; unreferenced
ld a, BANK(s4_a60c) ; aka BANK(s4_a60d) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
call OpenSRAM
xor a
@@ -445,7 +445,7 @@ Unreferenced_Function14d83:
call CloseSRAM
ret
-Unreferenced_Function14d93:
+Function14d93: ; unreferenced
ld a, BANK(s7_a000) ; MBC30 bank used by JP Crystal; inaccessible by MBC3
call OpenSRAM
xor a
diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm
index 0574bc730..d23b4d1e3 100644
--- a/engine/menus/scrolling_menu.asm
+++ b/engine/menus/scrolling_menu.asm
@@ -78,7 +78,7 @@ ScrollingMenuJoyAction:
jp nz, .d_down
jr .loop
-.unreferenced ; unused
+.no_zero_no_carry ; unreferenced
ld a, -1
and a
ret
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index e9e5236a9..dc12767ff 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -151,7 +151,7 @@ StartMenu::
call DrawVariableLengthMenuBox
call .DrawBugContestStatus
call UpdateSprites
- call ret_d90
+ call GSReloadPalettes
call FinishExitMenu
ret
diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm
index 726148e20..6a7477e14 100644
--- a/engine/menus/trainer_card.asm
+++ b/engine/menus/trainer_card.asm
@@ -128,7 +128,7 @@ TrainerCard_Page1_Joypad:
ld [wJumptableIndex], a
ret
-.Unreferenced_KantoCheck:
+.KantoBadgeCheck: ; unreferenced
ld a, [wKantoBadges]
and a
ret z
@@ -171,7 +171,7 @@ TrainerCard_Page2_Joypad:
ld [wJumptableIndex], a
ret
-.Unreferenced_KantoCheck:
+.KantoBadgeCheck: ; unreferenced
ld a, [wKantoBadges]
and a
ret z