summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/menu/main_menu.asm38
-rw-r--r--shim.sym1
2 files changed, 37 insertions, 2 deletions
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 8a37093..20c3f5c 100644
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -1,6 +1,42 @@
INCLUDE "constants.asm"
-SECTION "Main Menu Definition", ROMX[$5418], BANK[$01]
+SECTION "Main Menu Definition", ROMX[$53cc], BANK[$01]
+
+MainMenu:
+ ld hl, $d4a9
+ res 0, [hl]
+ call $0e2a
+ call $363c
+ call $0d1a
+ call $0d0a
+ call $1f9e
+ call $5388
+ ld hl, $ce60
+ bit 0, [hl]
+ jr nz, .skip1
+ xor a ; new game
+ jr .next1
+.skip1
+ ld a, 1 ; continue
+.next1
+ ld a, [$ffa3]
+ and $83
+ cp $83
+ jr nz, .skip2
+ ld a, 3 ; play pokemon, set time
+ jr .next2
+.skip2
+ ld a, 2 ; play pokemon
+.next2
+ ld [$cbf7],a
+ ld hl, MainMenuHeader
+ call $1d49
+ call $1e58
+ call $1c4c
+ jp c, $5dae
+ ld hl, MainMenuJumptable
+ ld a, [$cbf5]
+ jp $35cd
MainMenuHeader:
db $40
diff --git a/shim.sym b/shim.sym
index 0d89369..8390904 100644
--- a/shim.sym
+++ b/shim.sym
@@ -29,7 +29,6 @@
01:50B9 Function50b9
01:5190 _UpdateSprites
01:5190 Function5190
-01:53CC MainMenu
01:5D27 Function5d27
01:63D8 ReanchorBGMap_NoOAMUpdate
01:6437 LoadFonts_NoOAMUpdate