summaryrefslogtreecommitdiff
path: root/engine/menus
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menus')
-rw-r--r--engine/menus/intro_menu.asm7
-rw-r--r--engine/menus/start_menu.asm13
2 files changed, 1 insertions, 19 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 2e1f2d234..9652dd73e 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -94,7 +94,6 @@ ResetWRAM:
ret
_ResetWRAM:
-
ld hl, wVirtualOAM
ld bc, wOptions - wVirtualOAM
xor a
@@ -801,7 +800,6 @@ StorePlayerName:
ret
ShrinkPlayer:
-
ld a, [hROMBank]
push af
@@ -911,7 +909,6 @@ ShrinkFrame:
ret
Intro_PlacePlayerSprite:
-
farcall GetPlayerIcon
ld c, $c
ld hl, vTiles0
@@ -1067,7 +1064,6 @@ TitleScreenScene:
ret
TitleScreenEntrance:
-
; Animate the logo:
; Move each line by 4 pixels until our count hits 0.
ld a, [hSCX]
@@ -1115,7 +1111,6 @@ TitleScreenEntrance:
ret
TitleScreenTimer:
-
; Next scene
ld hl, wJumptableIndex
inc [hl]
@@ -1129,7 +1124,6 @@ TitleScreenTimer:
ret
TitleScreenMain:
-
; Run the timer down.
ld hl, wTitleScreenTimer
ld e, [hl]
@@ -1230,7 +1224,6 @@ TitleScreenMain:
ret
TitleScreenEnd:
-
; Wait until the music is done fading.
ld hl, wTitleScreenTimer
diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
index 45d08ca7a..108a4edf6 100644
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@@ -11,7 +11,6 @@
const STARTMENUITEM_QUIT ; 8
StartMenu::
-
call ClearWindowData
ld de, SFX_MENU
@@ -24,8 +23,8 @@ StartMenu::
ld hl, .MenuHeader
jr z, .GotMenuData
ld hl, .ContestMenuHeader
-.GotMenuData:
+.GotMenuData:
call LoadMenuHeader
call .SetUpMenuItems
ld a, [wBattleMenuCursorBuffer]
@@ -459,7 +458,6 @@ StartMenu_Status:
ret
StartMenu_Pokedex:
-
ld a, [wPartyCount]
and a
jr z, .asm_12949
@@ -473,7 +471,6 @@ StartMenu_Pokedex:
ret
StartMenu_Pokegear:
-
call FadeToMenu
farcall PokeGear
call CloseSubmenu
@@ -481,7 +478,6 @@ StartMenu_Pokegear:
ret
StartMenu_Pack:
-
call FadeToMenu
farcall Pack
ld a, [wPackUsedItem]
@@ -497,7 +493,6 @@ StartMenu_Pack:
ret
StartMenu_Pokemon:
-
ld a, [wPartyCount]
and a
jr z, .return
@@ -700,7 +695,6 @@ PokemonActionSubmenu:
dbw MONMENUITEM_MAIL, MonMailAction
SwitchPartyMons:
-
; Don't try if there's nothing to switch!
ld a, [wPartyCount]
cp 2
@@ -751,7 +745,6 @@ SwitchPartyMons:
ret
GiveTakePartyMonItem:
-
; Eggs can't hold items!
ld a, [wCurPartySpecies]
cp EGG
@@ -791,7 +784,6 @@ GiveTakePartyMonItem:
ret
.GiveItem:
-
farcall DepositSellInitPackBuffers
.loop
@@ -822,7 +814,6 @@ GiveTakePartyMonItem:
ret
TryGiveItemToPartymon:
-
call SpeechTextBox
call PartyMonItemName
call GetPartyItemLocation
@@ -885,7 +876,6 @@ TryGiveItemToPartymon:
ret
GivePartyItem:
-
call GetPartyItemLocation
ld a, [wCurItem]
ld [hl], a
@@ -898,7 +888,6 @@ GivePartyItem:
ret
TakePartyItem:
-
call SpeechTextBox
call GetPartyItemLocation
ld a, [hl]