From 0ce725cb1c0d00c516302275a4b34989a93c6718 Mon Sep 17 00:00:00 2001
From: TeganGibby <32184356+TeganGibby@users.noreply.github.com>
Date: Sat, 2 Jun 2018 20:46:45 -0700
Subject: additional documentation

Compared to retail Gold disassembly
---
 engine/menu/main_menu.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engine')

diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 536123f..fdc7a9c 100644
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -8,11 +8,11 @@ MainMenuHeader:
 	dw .data
 	db 1 ; default option
 
-.data
+.data ; 01:5420
 	db $80
 	db 0 ; number of options
 
-	dw $5461
+	dw $5461 ; MainMenuItems in retail
 	db $8a, $1f
 	dw MainMenuStrings
 
-- 
cgit v1.2.3


From fd33b64f69bff72d0d5c0e5cc064048db79c1451 Mon Sep 17 00:00:00 2001
From: TeganGibby <32184356+TeganGibby@users.noreply.github.com>
Date: Sat, 2 Jun 2018 21:04:31 -0700
Subject: added detail on main menu functions

---
 engine/menu/main_menu.asm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'engine')

diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index fdc7a9c..45e441e 100644
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -23,3 +23,32 @@ MainMenuStrings: ; 01:5428
     db "#を　あそぶ@"
     db "じかんセット@"
 ; 01:5457
+
+CONTINUE	EQU 0
+NEW_GAME	EQU 1
+OPTION		EQU 2
+PLAY_POKEMON	EQU 3
+SET_TIME	EQU 4
+
+MainMenuItems:
+	db 2
+	db NEW_GAME
+	db OPTION
+	db -1
+	
+	db 3
+	db CONTINUE
+	db NEW_GAME
+	db OPTION
+	db -1
+	
+	db 2
+	db PLAY_POKEMON
+	db OPTION
+	db -1
+	
+	db 3
+	db PLAY_POKEMON
+	db OPTION
+	db SET_TIME
+	db -1
-- 
cgit v1.2.3


From c9274c2e55ccc20b528e75ebcb8bd5a06cceebc3 Mon Sep 17 00:00:00 2001
From: TeganGibby <32184356+TeganGibby@users.noreply.github.com>
Date: Sat, 2 Jun 2018 21:34:06 -0700
Subject: comments to explain duplicates

---
 engine/menu/main_menu.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engine')

diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 45e441e..ca6b292 100644
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -42,12 +42,12 @@ MainMenuItems:
 	db OPTION
 	db -1
 	
-	db 2
+	db 2 ; takes priority over the former
 	db PLAY_POKEMON
 	db OPTION
 	db -1
 	
-	db 3
+	db 3 ; takes priority over the former
 	db PLAY_POKEMON
 	db OPTION
 	db SET_TIME
-- 
cgit v1.2.3


From ec704bfa38280c885a7fdf12795efa7c4b1b81c3 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Sun, 3 Jun 2018 14:40:54 +0200
Subject: Fix main menu items position

---
 engine/menu/main_menu.asm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'engine')

diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index ca6b292..b1f01f8 100644
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -24,6 +24,9 @@ MainMenuStrings: ; 01:5428
     db "じかんセット@"
 ; 01:5457
 
+
+SECTION "Main Menu Items", ROMX[$5461], BANK[$01]
+
 CONTINUE	EQU 0
 NEW_GAME	EQU 1
 OPTION		EQU 2
-- 
cgit v1.2.3


From 20ac549a91c5e9249b1b04c16e65df2aefac1aae Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi@gmail.com>
Date: Sun, 3 Jun 2018 10:55:41 -0400
Subject: Copy pokecrystal's conventions for this data, including: - Tabs for
 indentation, spaces for alignment - Consistent comments and formatting for
 menu header data (incomplete here, until the related code is disassembled) -
 The second two menus do not "take priority"; they're all just a count + that
 many items + ending -1

---
 engine/menu/main_menu.asm | 59 ++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 26 deletions(-)

(limited to 'engine')

diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index b1f01f8..8a37093 100644
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -4,53 +4,60 @@ 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 ; 01:5420
+.MenuData: ; 01:5420
 	db $80
-	db 0 ; number of options
-
-	dw $5461 ; MainMenuItems in retail
+	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 "じかんセット@"
 
-SECTION "Main Menu Items", ROMX[$5461], BANK[$01]
+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
+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
-	
-	db 2 ; takes priority over the former
+
+PlayPokemonMenu:
+	db 2
 	db PLAY_POKEMON
 	db OPTION
 	db -1
-	
-	db 3 ; takes priority over the former
+
+PlayPokemonSetTimeMenu:
+	db 3
 	db PLAY_POKEMON
 	db OPTION
 	db SET_TIME
-- 
cgit v1.2.3