Port mon_markings

pret · Nov 2, 2019 · ae97c32 · ae97c32
1 parent 97de750
commit ae97c32
Show file tree

Hide file tree

Showing 10 changed files with 549 additions and 1,166 deletions.
diff --git a/asm/mon_markings.s b/asm/mon_markings.s
diff --git a/data/graphics.s b/data/graphics.s
@@ -16209,10 +16209,10 @@ gUnknown_8E9CAEC:: @ 8E9CAEC
 	.incbin "baserom.gba", 0xE9CAEC, 0xB0
 
 gUnknown_8E9CB9C:: @ 8E9CB9C
-	.incbin "baserom.gba", 0xE9CB9C, 0x20 @UNKNOWN
+	.incbin "graphics/misc/markings2.gbapal"
 
 gUnknown_8E9CBBC:: @ 8E9CBBC
-	.incbin "baserom.gba", 0xE9CBBC, 0x320 @UNKNOWN
+	.incbin "graphics/misc/markings2.4bpp"
 
 gTradeMenu_Pal:: @ 8E9CEDC
 	.incbin "graphics/trade/menu.gbapal"

diff --git a/data/mon_markings.s b/data/mon_markings.s
diff --git a/graphics/misc/markings2.png b/graphics/misc/markings2.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
@@ -102,6 +102,9 @@ graphics/pokenav/region_map.8bpp: %.8bpp: %.png
 $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 29
 
+$(MISCGFXDIR)/markings2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 25
+
 $(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \
 						$(INTERFACEGFXDIR)/menu_1.gbapal
 	@cat $^ >$@

diff --git a/include/graphics.h b/include/graphics.h
@@ -4222,4 +4222,8 @@ extern const u16 gUnknown_8E9E9FC[];
 extern const u16 gTradeButtons_Gfx[];
 extern const u16 gTradeMenuMonBox_Tilemap[];
 
+// mon_markings
+extern const u16 gUnknown_8E9CBBC[];
+extern const u16 gUnknown_8E9CB9C[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/mon_markings.h b/include/mon_markings.h
@@ -0,0 +1,24 @@
+#ifndef GUARD_MON_MARKINGS_H
+#define GUARD_MON_MARKINGS_H
+
+struct PokemonMarkMenu
+{
+    /*0x0000*/ u16 baseTileTag;
+    /*0x0002*/ u16 basePaletteTag;
+    /*0x0004*/ u8 markings; // bit flags
+    /*0x0005*/ s8 cursorPos;
+    /*0x0006*/ bool8 markingsArray[4];
+    /*0x000A*/ u8 cursorBaseY;
+    /*0x000B*/ bool8 spriteSheetLoadRequired;
+    /*0x000C*/ struct Sprite * menuWindowSprites[2]; // upper and lower halves of menu window
+    /*0x0014*/ struct Sprite * menuMarkingSprites[4];
+    /*0x0024*/ struct Sprite * unkSprite;
+    /*0x0028*/ struct Sprite * menuTextSprite;
+    /*0x002C*/ const u8 *frameTiles;
+    /*0x0030*/ const u16 *framePalette;
+    /*0x0034*/ u8 menuWindowSpriteTiles[0x1000];
+    /*0x1034*/ u8 filler1034[0x80];
+    /*0x10B4*/ u8 tileLoadState;
+}; // 10b8
+
+#endif //GUARD_MON_MARKINGS_H
diff --git a/ld_script.txt b/ld_script.txt
@@ -175,7 +175,7 @@ SECTIONS {
         src/battle_intro.o(.text);
         asm/bike.o(.text);
         src/easy_chat.o(.text);
-        asm/mon_markings.o(.text);
+        src/mon_markings.o(.text);
         src/mail.o(.text);
         src/menu_helpers.o(.text);
         asm/script_pokemon_util_80BF8FC.o(.text);
@@ -461,7 +461,7 @@ SECTIONS {
         src/battle_intro.o(.rodata);
         data/bike.o(.rodata);
         src/easy_chat.o(.rodata);
-        data/mon_markings.o(.rodata);
+        src/mon_markings.o(.rodata);
         src/mail.o(.rodata);
         src/heal_location.o(.rodata);
         data/region_map.o(.rodata);