finish boss 7 data

Makefile

@@ -422,9 +422,9 @@ else
 	@echo Outputting $(ROOT_DIR)/$@
 	@touch $(ROOT_DIR)/$(MAP)
 ifeq ($(PLATFORM),sdl)
-	cd $(OBJ_DIR) && $(CC1) $(OBJS_REL) $(shell sdl2-config --cflags --libs) -o $(ROOT_DIR)/$@
+	@cd $(OBJ_DIR) && $(CC1) $(OBJS_REL) $(shell sdl2-config --cflags --libs) -o $(ROOT_DIR)/$@
 else ifeq ($(PLATFORM),sdl_win32)
-	cd $(OBJ_DIR) && $(CC1) -mwin32 $(OBJS_REL) -lmingw32 -L$(ROOT_DIR)/$(SDL_MINGW_LIB) -lSDL2main -lSDL2.dll -lwinmm -lkernel32 -lxinput -o $(ROOT_DIR)/$@ -Xlinker -Map "$(ROOT_DIR)/$(MAP)"
+	@cd $(OBJ_DIR) && $(CC1) -mwin32 $(OBJS_REL) -lmingw32 -L$(ROOT_DIR)/$(SDL_MINGW_LIB) -lSDL2main -lSDL2.dll -lwinmm -lkernel32 -lxinput -o $(ROOT_DIR)/$@ -Xlinker -Map "$(ROOT_DIR)/$(MAP)"
 else
 	@cd $(OBJ_DIR) && $(CC1) -mwin32 $(OBJS_REL) -L$(ROOT_DIR)/libagbsyscall -lagbsyscall -lkernel32 -o $(ROOT_DIR)/$@ -Xlinker -Map "$(ROOT_DIR)/$(MAP)"
 endif
@@ -484,7 +484,7 @@ endif
 
 $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
 	@echo "$(AS) <flags> -o $@ $<"
-	$(PREPROC) $< "" | $(ASM_PSEUDO_OP_CONV) | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ -
+	@$(PREPROC) $< "" | $(ASM_PSEUDO_OP_CONV) | $(CPP) $(CPPFLAGS) - | $(AS) $(ASFLAGS) -o $@ -
 
 $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
 	@echo "$(AS) <flags> -o $@ $<"

asm/boss_run.s

@@ -3,13 +3,7 @@
 
 .section .rodata
 
-    .global gUnknown_080D8788
-gUnknown_080D8788:
-    .incbin "baserom.gba", 0x000D8788, 0xE
-
-    .global gUnknown_080D8796
-gUnknown_080D8796:
-    .incbin "baserom.gba", 0x000D8796, 0x42
+.align 2, 0
 
     .global gUnknown_080D87D8
 gUnknown_080D87D8:

graphics/80D8796.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 98 115
+255 255 255
+115 49 8
+180 74 8
+0 16 156
+32 16 16
+222 255 255
+164 189 205
+98 115 156
+74 82 115
+49 49 82
+255 222 32
+246 156 16
+255 164 131
+156 0 57
+238 0 90

graphics/80D87B6.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 156 197
+197 0 131
+230 205 255
+213 180 255
+255 238 180
+246 238 246
+205 0 131
+213 65 156
+230 139 180
+238 172 197
+246 205 213
+197 32 238
+197 98 246
+197 90 189
+222 255 230
+197 255 213

scripts/extract_data.py

@@ -32,15 +32,15 @@ def format_hex(val):
     rom.seek(address)
     # for i in range(length // 4):
     #     print(f"Q({read_s32(rom) / 256}), ")
-    # for i in range(length):
-    #     print(f"{read_s8(rom)}, ")
     # for i in range(length // 2):
     #     print(f"{read_s16(rom)}, ")
-    # for i in range(length // 20):
-    #     print("{ ", end="")
-    #     for j in range(10):
-    #         print(f"{(read_u16(rom))}" + ", ", end="")
-    #     print("},")
+    # for i in range(length // 8):
+    #     print(f"{read_u8(rom)}, ")
+    for i in range(length // 32):
+        print("{ ", end="")
+        for j in range(16):
+            print(f"{(read_u16(rom))}" + ", ", end="")
+        print("},")
     # for i in range(length // 8):
     #     print("{ ", end="")
     #     for j in range(2):

src/game/bosses/boss_7.c

@@ -233,8 +233,15 @@ const EggFrogCallback gUnknown_080D874C[] = {
     sub_8048B50, sub_8048BF0, sub_804911C, sub_8049174, sub_80491C4,
 };
 
-extern const u8 gUnknown_080D8788[][7];
-extern const u16 gUnknown_080D8796[][16];
+const u8 gUnknown_080D8788[][7] = {
+    { 4, 3, 3, 0, 0, 0, 0 },
+    { 4, 3, 2, 1, 1, 0, 0 },
+};
+
+const u16 gUnknown_080D8796[][16] = {
+    INCBIN_U16("graphics/80D8796.gbapal"),
+    INCBIN_U16("graphics/80D87B6.gbapal"),
+};
 
 void CreateEggFrog(void)
 {

src/game/bosses/boss_run.c

@@ -16,6 +16,10 @@ typedef struct {
     u8 unk6;
 } UNK_80498CC;
 
+// const u16 gUnknown_080D87D8[] = {
+//     6400, 13888, 18016, 23104, 29152, 38080, 43091,
+// };
+
 extern const u16 gUnknown_080D87E6[][2];
 
 void sub_80498CC(u8 bossNum)

src/platform/shared/stub.c

@@ -53,9 +53,6 @@ typedef struct {
     u8 unk3B;
 } UNK_80D8710;
 
-const u16 gUnknown_080D8796[][16]
-    = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
-const u8 gUnknown_080D8788[][7] = { { 0, 0, 0, 0, 0, 0, 0 } };
 extern void sub_8048C7C(void *boss);
 
 // boss run