Merge branch 'master' into build_more_roms

1 files changed, 54 insertions, 15 deletions

diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 536123f..8a37093 100644
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -4,22 +4,61 @@ SECTION "Main Menu Definition", ROMX[$5418], BANK[$01]
 
 MainMenuHeader:
 	db $40
-	db $00, $00, $07, $0d
-	dw .data
+	menu_coords 0, 0, 13, 7
+	dw .MenuData
 	db 1 ; default option
 
-.data
+.MenuData: ; 01:5420
 	db $80
-	db 0 ; number of options
-
-	dw $5461
+	db 0 ; items
+	dw MainMenuItems
 	db $8a, $1f
-	dw MainMenuStrings
-
-MainMenuStrings: ; 01:5428
-    db "つづきから　はじめる@"
-    db "さいしょから　はじめる@"
-    db "せっていを　かえる@"
-    db "#を　あそぶ@"
-    db "じかんセット@"
-; 01:5457
+	dw .Strings
+
+.Strings: ; 01:5428
+	db "つづきから　はじめる@"
+	db "さいしょから　はじめる@"
+	db "せっていを　かえる@"
+	db "#を　あそぶ@"
+	db "じかんセット@"
+
+MainMenuJumptable: ; 01:5457
+	dw $547c
+	dw $555c
+	dw $5cf3
+	dw $555c
+	dw $5473
+
+CONTINUE     EQU 0
+NEW_GAME     EQU 1
+OPTION       EQU 2
+PLAY_POKEMON EQU 3
+SET_TIME     EQU 4
+
+MainMenuItems:
+
+NewGameMenu:
+	db 2
+	db NEW_GAME
+	db OPTION
+	db -1
+
+ContinueMenu:
+	db 3
+	db CONTINUE
+	db NEW_GAME
+	db OPTION
+	db -1
+
+PlayPokemonMenu:
+	db 2
+	db PLAY_POKEMON
+	db OPTION
+	db -1
+
+PlayPokemonSetTimeMenu:
+	db 3
+	db PLAY_POKEMON
+	db OPTION
+	db SET_TIME
+	db -1