[Maintenance] [th01] .GRC: Define the slot count in terms of used slo…

…t IDs Part of P0165, funded by Ember2528.
nmlgc · Nov 7, 2021 · 5fa2a4d · 5fa2a4d
1 parent b28585e
commit 5fa2a4d
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 48 deletions.
diff --git a/th01/formats/grc.cpp b/th01/formats/grc.cpp
@@ -6,7 +6,7 @@
 #include "th01/formats/pf.hpp"
 #include "th01/formats/grc.hpp"
 
-int grc_load(int slot, const char fn[PF_FN_LEN])
+int grc_load(main_grc_slot_t slot, const char fn[PF_FN_LEN])
 {
 	union {
 		spriteformat_header_inner_t inner;
@@ -43,7 +43,9 @@ int grc_load(int slot, const char fn[PF_FN_LEN])
 	return 0;
 }
 
-void grc_put_8(screen_x_t left, vram_y_t top, int slot, int image, int col)
+void grc_put_8(
+	screen_x_t left, vram_y_t top, main_grc_slot_t slot, int image, int col
+)
 {
 	vram_offset_t vram_offset_row = vram_offset_shift(left, top);
 	vram_offset_t vram_offset;
@@ -91,7 +93,7 @@ void grc_put_8(screen_x_t left, vram_y_t top, int slot, int image, int col)
 	#undef grc_slot
 }
 
-void grc_free(int slot)
+void grc_free(main_grc_slot_t slot)
 {
 	for(int i = 0; grc_images[slot].image_count > i; i++) {
 		if(grc_images[slot].dots[i]) {

diff --git a/th01/formats/grc.hpp b/th01/formats/grc.hpp
@@ -1,6 +1,7 @@
 /// Uncompressed monochrome 8w×h sprite format
 /// ------------------------------------------
 #include "th01/formats/sprfmt_h.hpp"
+#include "th01/sprites/main_grc.h"
 
 #define GRC_MAGIC "GRCG"
 
@@ -12,7 +13,6 @@ struct grc_header_t {
 	spriteformat_header_inner_t inner;
 };
 
-static const int GRC_SLOT_COUNT = 8;
 static const int GRC_IMAGES_PER_SLOT = 8;
 
 // In-memory slot structure
@@ -27,12 +27,14 @@ extern grc_t grc_images[GRC_SLOT_COUNT];
 
 // Loads all images from the .GRC file with the given [fn] inside the
 // currently active packfile into the given .GRC [slot]. Always returns 0.
-int grc_load(int slot, const char fn[PF_FN_LEN]);
+int grc_load(main_grc_slot_t slot, const char fn[PF_FN_LEN]);
 
 // Frees all images in the given [slot].
-void grc_free(int slot);
+void grc_free(main_grc_slot_t slot);
 
 // Blits the sub[image] from the given [slot] to (⌊left/8⌋*8, top) with the
 // given [col]. Correctly clips the sprite at all 4 edges of VRAM.
-void grc_put_8(screen_x_t left, vram_y_t top, int slot, int image, int col);
+void grc_put_8(
+	screen_x_t left, vram_y_t top, main_grc_slot_t slot, int image, int col
+);
 /// ------------------------------------------
diff --git a/th01/main/boss/b20m.cpp b/th01/main/boss/b20m.cpp
@@ -128,10 +128,10 @@ void sariel_load_and_init(void)
 	ent_shield.load(boss6_1_bos, 0);
 	anm_wand.load(boss6_2_bos, 0);
 	anm_dress.load(boss6_3_bos, 1);
-	grc_load(0, boss6gr1_grc);
-	grc_load(1, boss6gr2_grc);
-	grc_load(2, boss6gr3_grc);
-	grc_load(3, boss6gr4_grc);
+	grc_load(GRC_SLOT_BOSS_1, boss6gr1_grc);
+	grc_load(GRC_SLOT_BOSS_2, boss6gr2_grc);
+	grc_load(GRC_SLOT_BOSS_3, boss6gr3_grc);
+	grc_load(GRC_SLOT_BOSS_4, boss6gr4_grc);
 	boss_palette_snap();
 	void sariel_setup(void);
 	sariel_setup();

diff --git a/th01/sprites/main_grc.h b/th01/sprites/main_grc.h
@@ -0,0 +1,13 @@
+typedef enum {
+	// .GRC slots that can be freely used by bosses.
+	GRC_SLOT_BOSS_1 = 0,
+	GRC_SLOT_BOSS_2 = 1,
+	GRC_SLOT_BOSS_3 = 2,
+	GRC_SLOT_BOSS_4 = 3,
+
+	GRC_SLOT_BOMB_KUJI_1 = 6, // kuzi1.grc
+	GRC_SLOT_BOMB_KUJI_2 = 7, // kuzi2.grc
+	GRC_SLOT_COUNT,
+
+	_main_grc_slot_t_FORCE_INT16 = 0x7FFF
+} main_grc_slot_t;
diff --git a/th01/sprites/main_grc.inc b/th01/sprites/main_grc.inc
@@ -0,0 +1,8 @@
+GRC_SLOT_BOSS_1 = 0
+GRC_SLOT_BOSS_2 = 1
+GRC_SLOT_BOSS_3 = 2
+GRC_SLOT_BOSS_4 = 3
+
+GRC_SLOT_BOMB_KUJI_1 = 6
+GRC_SLOT_BOMB_KUJI_2 = 7
+GRC_SLOT_COUNT = 8