match baserom

4 files changed, 11 insertions, 54 deletions

diff --git a/data/option_menu.s b/data/option_menu.s
deleted file mode 100644
index f8a590d6d..000000000
--- a/data/option_menu.s
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "constants/maps.h"
-#include "constants/species.h"
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2
-
-gUnknown_83CC2B8:: @ 83CC2B8
-    .incbin "baserom.gba", 0x3CC2B8, 0x20
-
-gUnknown_83CC2D8:: @ 83CC2D8
-    .incbin "baserom.gba", 0x3CC2D8, 0xC
-
-gUnknown_83CC2E4:: @ 83CC2E4
-    .incbin "baserom.gba", 0x3CC2E4, 0x20
-
-gUnknown_83CC304:: @ 83CC304
-    .incbin "baserom.gba", 0x3CC304, 0x10
-
-gUnknown_83CC314:: @ 83CC314
-    .incbin "baserom.gba", 0x3CC314, 0x1C
-
-gUnknown_83CC330:: @ 83CC330
-    .incbin "baserom.gba", 0x3CC330, 0xC
-
-gUnknown_83CC33C:: @ 83CC33C
-    .incbin "baserom.gba", 0x3CC33C, 0x8
-
-gUnknown_83CC344:: @ 83CC344
-    .incbin "baserom.gba", 0x3CC344, 0x8
-
-gUnknown_83CC34C:: @ 83CC34C
-    .incbin "baserom.gba", 0x3CC34C, 0x8
-
-gUnknown_83CC354:: @ 83CC354
-    .incbin "baserom.gba", 0x3CC354, 0xC
-
-gUnknown_83CC360:: @ 83CC360
-    .incbin "baserom.gba", 0x3CC360, 0x3
-
-gUnknown_83CC363:: @ 83CC363
-    .incbin "baserom.gba", 0x3CC363, 0x3
-    
diff --git a/include/strings.h b/include/strings.h
index 9f11d8fc2..1170c6f30 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -741,7 +741,7 @@ extern const u8 gText_DecimalPoint[];
 // map_name_popup
 extern const u8 gUnknown_841D18D[];
 
-// options menu
+// option menu
 extern const u8 gText_TextSpeed[];
 extern const u8 gText_BattleScene[];
 extern const u8 gText_BattleStyle[];
@@ -765,5 +765,4 @@ extern const u8 gText_MenuOptionOption[];
 extern const u8 gText_FrameType[];
 extern const u8 gText_PickSwitchCancel[];
 
-
 #endif //GUARD_STRINGS_H
diff --git a/ld_script.txt b/ld_script.txt
index 5a98f75cc..f64768f9b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -432,7 +432,7 @@ SECTIONS {
         data/trainer_see.o(.rodata);
         src/wild_encounter.o(.rodata);
         data/field_effect.o(.rodata);
-        data/option_menu.o(.rodata);
+        src/option_menu.o(.rodata);
         data/trainer_card.o(.rodata);
         data/pokemon_storage_system.o(.rodata);
         src/pokemon_icon.o(.rodata);
diff --git a/src/option_menu.c b/src/option_menu.c
index c1cde37a6..54b0e29cb 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -38,8 +38,8 @@ enum
     WIN_TEXT_OPTION,
     WIN_OPTIONS,
 };
-/*
-static const struct WindowTemplate gUnknown_83CC2B8[] =    //3CC2B8 -> sOptionMenuWinTemplates
+
+static const struct WindowTemplate gUnknown_83CC2B8[4] =    //3CC2B8 -> sOptionMenuWinTemplates
 {
     {
         .bg = 1,
@@ -70,7 +70,7 @@ static const struct WindowTemplate gUnknown_83CC2B8[] =    //3CC2B8 -> sOptionMe
 	},
     DUMMY_WIN_TEMPLATE,
 };
-static const struct BgTemplate gUnknown_83CC2D8[] =    //3CC2D8 -> sOptionMenuBgTemplates
+static const struct BgTemplate gUnknown_83CC2D8[3] =    //3CC2D8 -> sOptionMenuBgTemplates
 {
    {
        .bg = 1,
@@ -79,7 +79,7 @@ static const struct BgTemplate gUnknown_83CC2D8[] =    //3CC2D8 -> sOptionMenuBg
        .screenSize = 0,
        .paletteMode = 0,
        .priority = 0,
-       .baseTile = 0
+       .baseTile = 0,
    },
    {
        .bg = 0,
@@ -88,7 +88,7 @@ static const struct BgTemplate gUnknown_83CC2D8[] =    //3CC2D8 -> sOptionMenuBg
        .screenSize = 0,
        .paletteMode = 0,
        .priority = 1,
-       .baseTile = 0
+       .baseTile = 0,
    },
    {
 	   .bg = 2,
@@ -119,9 +119,10 @@ static const u8* gUnknown_83CC34C[] = {gText_SoundMono, gText_SoundStereo};		//3
 static const u8* gUnknown_83CC354[] = {gText_ButtonTypeNormal, gText_ButtonTypeLR, gText_ButtonTypeLEqualsA};	//3CC354
 static const u8 gUnknown_83CC360[] = {0xF, 0x1, 0x2};	//3CC360
 static const u8 gUnknown_83CC363[] = {0, 5, 4, 0, 0};	//3CC363
-*/
 
-extern const struct WindowTemplate gUnknown_83CC2B8[3];
+
+/*
+extern const struct WindowTemplate gUnknown_83CC2B8[4];
 extern const struct BgTemplate gUnknown_83CC2D8[3];
 extern const u16 gUnknown_83CC2E4[0x20];
 extern const u16 gUnknown_83CC304[MENUITEM_COUNT];
@@ -133,6 +134,7 @@ extern const u8* gUnknown_83CC34C[8];
 extern const u8* gUnknown_83CC354[12];
 extern const u8 gUnknown_83CC360[3];
 extern const u8 gUnknown_83CC363[3];
+*/
 
 //This file's functions
 static void sub_808835C(void);