aboutsummaryrefslogtreecommitdiffstats
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/init.asm4
-rw-r--r--home/overworld.asm5
2 files changed, 5 insertions, 4 deletions
diff --git a/home/init.asm b/home/init.asm
index fc426e29..bef73b7e 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -98,11 +98,7 @@ Init::
dec a
ld [wUpdateSpritesEnabled], a
-; FASTBOOT: skip the GameFreak/Pikachu intro if a save file exists
- farcall CheckForPlayerNameInSRAM
- jr c, .fastbootSkipIntro
predef PlayIntro
-.fastbootSkipIntro
call DisableLCD
call ClearVram
diff --git a/home/overworld.asm b/home/overworld.asm
index 4586e5c0..a2626089 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -73,6 +73,11 @@ OverworldLoopLessDelay::
.notSimulating
ldh a, [hJoyPressed]
.checkIfStartIsPressed
+ bit B_PAD_SELECT, a ; WARP MENU hotkey
+ jr z, .notWarpHotkey
+ farcall WarpMenu
+ jp OverworldLoop
+.notWarpHotkey
bit B_PAD_START, a
jr z, .startButtonNotPressed
; if START is pressed