Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

g3headers

@@ -1 +1 @@
-Subproject commit 96f9db527ac23ab26be5614c2aeda2b1e3e5c7ab
+Subproject commit a2e68703dcfccb4ef2319f8fd79a8ea7803a63c7

sprites.makefile

@@ -52,46 +52,46 @@ clean:
 
 
 $(SPRITES_BINARY): $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ)
-	@echo -e "\e[1;32mLinking $@\e[0m"
+	@echo "\033[1;32mLinking $@\033[0m"
 	@echo "INPUT($^)" > $(TMP_LD)
 	$(LD) -r -o $@ -T $(TMP_LD)
 
 # Item Targets
 $(GFX_BUILD_DIR)/item/%.o: $(GFX_BUILD_DIR)/item/%.s
-	@echo -e "\e[32mAssembling $<\e[0m"
+	@echo "\033[32mAssembling $<\033[0m"
 	$(AS) -o $@ $<
 
 .PRECIOUS: $(GFX_BUILD_DIR)/item/%.s
 $(GFX_BUILD_DIR)/item/%.s: $(ASSET_ROOT)/item_icons/%.png
-	@echo -e "\e[34mProcessing image $<\e[0m"
+	@echo "\033[34mProcessing image $<\033[0m"
 	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
 
 # OW Targets
 $(GFX_BUILD_DIR)/overworlds/%.o: $(GFX_BUILD_DIR)/overworlds/%.s
-	@echo -e "\e[32mAssembling $<\e[0m"
+	@echo "\033[32mAssembling $<\033[0m"
 	$(AS) -o $@ $<
 
 .PRECIOUS: $(GFX_BUILD_DIR)/overworlds/%.s
 $(GFX_BUILD_DIR)/overworlds/%.s: $(ASSET_ROOT)/overworld/%.png
-	@echo -e "\e[34mProcessing image $<\e[0m"
+	@echo "\033[34mProcessing image $<\033[0m"
 	$(GRIT) $< -fts -fh! -gt -gB4 -gz! -p -pz! -m! -pu16 -o $@
 
 # Trainer Sprite Targets
 $(GFX_BUILD_DIR)/trainer_sprites/%.o: $(GFX_BUILD_DIR)/trainer_sprites/%.s
-	@echo -e "\e[32mAssembling $<\e[0m"
+	@echo "\033[32mAssembling $<\033[0m"
 	$(AS) -o $@ $<
 
 $(GFX_BUILD_DIR)/trainer_sprites/%.s: $(ASSET_ROOT)/trainer_sprites/%.png
-	@echo -e "\e[34mProcessing image $<\e[0m"
+	@echo "\033[34mProcessing image $<\033[0m"
 	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -o $@
 
 # Normal Palette Targets
 $(GFX_BUILD_DIR)/sprites/normal_pal/%.o: $(GFX_BUILD_DIR)/sprites/normal_pal/%.s
-	@echo -e "\e[32mAssembling $<\e[0m"
+	@echo "\033[32mAssembling $<\033[0m"
 	$(AS) -o $@ $<
 
 $(GFX_BUILD_DIR)/sprites/normal_pal/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
-	@echo -e "\e[34mProcessing palette $< (normal)\e[0m"
+	@echo "\033[34mProcessing palette $< (normal)\033[0m"
 	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 16 \
 		-s $(shell echo $(notdir $(basename $<)) | sed "s/normal_/n_p_/g") \
 		-o $@
@@ -135,41 +135,41 @@ $(GFX_BUILD_DIR)/sprites/normal_pal/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
 
 # Misc hardcoded targets
 $(NORMAL_CASTFORM_PAL_OBJ): $(NORMAL_CASTFORM_PAL_OBJ:.o=.s)
-	@echo -e "\e[32mAssembling $<\e[0m"
+	@echo "\033[32mAssembling $<\033[0m"
 	$(AS) -o $@ $<
 
 $(NORMAL_CASTFORM_PAL_OBJ:.o=.s): $(CASTFORM_PNG)
-	@echo -e "\e[34mProcessing palette $< (normal)\e[0m"
+	@echo "\033[34mProcessing palette $< (normal)\033[0m"
 	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 64 \
 		-s n_p_0385 -o $@
 
 
 $(SHINY_CASTFORM_PAL_OBJ): $(SHINY_CASTFORM_PAL_OBJ:.o=.s)
-	@echo -e "\e[32mAssembling $<\e[0m"
+	@echo "\033[32mAssembling $<\033[0m"
 	$(AS) -o $@ $<
 
 $(SHINY_CASTFORM_PAL_OBJ:.o=.s): $(CASTFORM_PNG)
-	@echo -e "\e[34mProcessing palette $< (shiny)\e[0m"
+	@echo "\033[34mProcessing palette $< (shiny)\033[0m"
 	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 64 \
 		-s s_p_0385 -o $@
 
 
 $(CASTFORM_FRONT_OBJ): $(CASTFORM_FRONT_OBJ:.o=.s)
-	@echo -e "\e[32mAssembling $<\e[0m"
+	@echo "\033[32mAssembling $<\033[0m"
 	$(AS) -o $@ $<
 
 $(CASTFORM_FRONT_OBJ:.o=.s): $(CASTFORM_PNG)
-	@echo -e "\e[34mProcessing sprite $< (front)\e[0m"
+	@echo "\033[34mProcessing sprite $< (front)\033[0m"
 	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 256 -ah 64 -m! -p! \
 		-s front_0385 -o $@
 
 
 $(CASTFORM_BACK_OBJ): $(CASTFORM_BACK_OBJ:.o=.s)
-	@echo -e "\e[32mAssembling $<\e[0m"
+	@echo "\033[32mAssembling $<\033[0m"
 	$(AS) -o $@ $<
 
 $(CASTFORM_BACK_OBJ:.o=.s): $(CASTFORM_PNG)
-	@echo -e "\e[34mProcessing sprite $< (back)\e[0m"
+	@echo "\033[34mProcessing sprite $< (back)\033[0m"
 	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 256 -at 64 -ah 64 -m! -p! \
 		-s back_0385 -o $@
 

src/interface/show_item.c

@@ -0,0 +1,21 @@
+#include <pokeagb/pokeagb.h>
+
+const struct OamData item_oam = {.size = 2};
+
+void show_item_load_gfx(u16 item)
+{
+    struct SpriteTiles tiles = {.data = item_gfx_table[item].gfx, .size = 32*16, .tag = 0x1340};
+    struct SpritePalette pal = {.data = item_gfx_table[item].pal, .tag = 0x1340};
+    struct Template template = {
+        .tiles_tag = 0x1340,
+        .pal_tag = 0x1340,
+        .oam = &item_oam,
+        .animation = SPRITE_NO_ANIMATION,
+        .graphics = &tiles,
+        .rotscale = SPRITE_NO_ROTSCALE,
+        .callback = oac_nullsub
+    };
+    gpu_tile_obj_decompress_alloc_tag_and_upload(&tiles);
+    gpu_pal_obj_alloc_tag_and_apply(&pal);
+    template_instanciate_forward_search(&template, 100,100,0);
+}

src/overworld/tileset_animation/main_animator.c

@@ -46,11 +46,11 @@ void animate_from_structure(const struct TilesetAnimation *anim, u16 tile_skip)
     void *vram_address = (void *)(0x06000000 + (tile_skip * 0x20));
     u8 cur_anim = 0;
     while (anim[cur_anim].image != (void *)0xFFFFFFFF && cur_anim < NUM_MAX_ANIMATIONS) {
-        void *current_vram = vram_address + (0x20 * anim[cur_anim].tile_start);
+        void *current_vram = (u8*)vram_address + (0x20 * anim[cur_anim].tile_start);
 
         if (anim_state->cur_frame[cur_anim] == 0) {
             memcpy(current_vram,
-                   anim[cur_anim].image + (0x20 * anim[cur_anim].tile_length * anim_state->cur_tile[cur_anim]),
+                   (u8*)anim[cur_anim].image + (0x20 * anim[cur_anim].tile_length * anim_state->cur_tile[cur_anim]),
                    anim[cur_anim].tile_length * 0x20);
         }