migrate main_menu data to src

4 files changed, 59 insertions, 66 deletions

diff --git a/data/main_menu.s b/data/main_menu.s
deleted file mode 100644
index 1fae3850b..000000000
--- a/data/main_menu.s
+++ /dev/null
@@ -1,59 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_081E764C:: @ 81E764C
-	.incbin "graphics/birch_speech/bg0.gbapal"
-	.incbin "graphics/birch_speech/bg1.gbapal"
-
-	.align 2
-gBirchIntroShadowGfx:: @ 81E768C
-	.incbin "graphics/birch_speech/shadow.4bpp.lz"
-
-	.align 2
-gUnknown_081E7834:: @ 81E7834
-	.incbin "graphics/birch_speech/map.bin.lz"
-
-	.align 2
-gUnknown_081E795C:: @ 81E795C
-	.incbin "graphics/birch_speech/bg2.gbapal"
-
-	.align 2
-gUnknown_081E796C:: @ 81E796C
-	.space 16
-
-	.align 2
-gMainMenuPalette:: @ 81E797C
-	.incbin "graphics/misc/main_menu.gbapal"
-
-	.align 2
-gSpriteAffineAnim_81E799C:: @ 81E799C
-	obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 48
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_81E79AC:: @ 81E79AC
-	.4byte gSpriteAffineAnim_81E799C
-
-	.align 2
-gUnknown_081E79B0:: @ 81E79B0
-	.4byte gBirchText_Boy, 0
-	.4byte gBirchText_Girl, 0
-
-	.align 2
-gMalePresetNames:: @ 81E79C0
-	.4byte gBirchText_NewName, 0
-	.4byte gDefaultBoyName1, 0
-	.4byte gDefaultBoyName2, 0
-	.4byte gDefaultBoyName3, 0
-	.4byte gDefaultBoyName4, 0
-
-	.align 2
-gFemalePresetNames:: @ 81E79E8
-	.4byte gBirchText_NewName, 0
-	.4byte gDefaultGirlName1, 0
-	.4byte gDefaultGirlName2, 0
-	.4byte gDefaultGirlName3, 0
-	.4byte gDefaultGirlName4, 0
diff --git a/graphics/birch_speech/blank_pal.pal b/graphics/birch_speech/blank_pal.pal
new file mode 100755
index 000000000..7dc528e38
--- /dev/null
+++ b/graphics/birch_speech/blank_pal.pal
@@ -0,0 +1,11 @@
+JASC-PAL
+0100
+8
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/ld_script.txt b/ld_script.txt
index 3cf316c51..cae692d0c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -312,7 +312,7 @@ SECTIONS {
         src/engine/string_util.o(.rodata);
         src/engine/link.o(.rodata);
         src/engine/rtc.o(.rodata);
-        data/main_menu.o(.rodata);
+        src/engine/main_menu.o(.rodata);
         data/data2a.o(.rodata);
         src/battle/battle_4.o(.rodata);
         src/battle/battle_controller_player.o(.rodata);
diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c
index bfbf0dcd6..031dc49d1 100644
--- a/src/engine/main_menu.c
+++ b/src/engine/main_menu.c
@@ -30,8 +30,6 @@ extern struct PaletteFadeControl gPaletteFade;
 
 extern u16 gSaveFileStatus;
 
-extern u16 gMainMenuPalette[];
-
 extern const u8 gBirchSpeech_Welcome[];
 extern const u8 gBirchSpeech_ThisIsPokemon[];
 extern const u8 gBirchSpeech_WorldInhabitedByPokemon[];
@@ -43,15 +41,11 @@ extern u8 gBirchSpeech_AhOkayYouArePlayer[];
 extern u8 gBirchSpeech_AreYouReady[];
 
 extern struct SpriteTemplate gUnknown_02024E8C;
-extern u16 gUnknown_081E795C[];
 extern const struct MenuAction gUnknown_081E79B0[];
 extern const struct MenuAction gMalePresetNames[];
 extern const struct MenuAction gFemalePresetNames[];
 
-extern const u8 gUnknown_081E764C[];
-extern const u8 gBirchIntroShadowGfx[];
 extern const u8 gUnknown_081E7834[];
-extern const u8 gUnknown_081E796C[];
 
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E79AC[];
 
@@ -136,6 +130,53 @@ static void CreateNameMenu(u8 left, u8 top);
 static s8 NameMenuProcessInput(void);
 static void SetPresetPlayerName(u8 index);
 
+static const u16 gUnknown_081E764C[][16] =
+{
+    INCBIN_U16("graphics/birch_speech/bg0.gbapal"),
+    INCBIN_U16("graphics/birch_speech/bg1.gbapal"),
+};
+
+static const u8 gBirchIntroShadowGfx[] = INCBIN_U8("graphics/birch_speech/shadow.4bpp.lz");
+static const u8 gUnknown_081E7834[] = INCBIN_U8("graphics/birch_speech/map.bin.lz");
+static const u16 gUnknown_081E795C[] = INCBIN_U16("graphics/birch_speech/bg2.gbapal");
+static const u16 gUnknown_081E796C[] = INCBIN_U16("graphics/birch_speech/blank_pal.gbapal");
+static const u16 gMainMenuPalette[] = INCBIN_U16("graphics/misc/main_menu.gbapal");
+
+static const union AffineAnimCmd gSpriteAffineAnim_81E799C[] =
+{
+    AFFINEANIMCMD_FRAME(0xFFFE, 0xFFFE, 0, 48),
+    AFFINEANIMCMD_END,
+};
+
+static const union AffineAnimCmd *const gSpriteAffineAnimTable_81E79AC[] =
+{
+    gSpriteAffineAnim_81E799C,
+};
+
+static const struct MenuAction gUnknown_081E79B0[] =
+{
+    {gBirchText_Boy, NULL},
+    {gBirchText_Girl, NULL},
+};
+
+static const struct MenuAction gMalePresetNames[] =
+{
+    {gBirchText_NewName, NULL},
+    {gDefaultBoyName1, NULL},
+    {gDefaultBoyName2, NULL},
+    {gDefaultBoyName3, NULL},
+    {gDefaultBoyName4, NULL},
+};
+
+static const struct MenuAction gFemalePresetNames[] =
+{
+    {gBirchText_NewName, NULL},
+    {gDefaultGirlName1, NULL},
+    {gDefaultGirlName2, NULL},
+    {gDefaultGirlName3, NULL},
+    {gDefaultGirlName4, NULL},
+};
+
 static void CB2_MainMenu(void)
 {
     RunTasks();