tileset animations begin

battle_engine

@@ -1 +1 @@
-Subproject commit 991e2793854c10885382ad325c55ad42a0585f61
+Subproject commit 6d4c025273b357e9f820516bc27f385ca13c3d5b

g3headers

@@ -1 +1 @@
-Subproject commit 1c9d6f8cdaaf7482b2f03b8e90d911303c251375
+Subproject commit 8d64b390cbaf2e1fc9a09fbf0edb339847954332

makefile

@@ -18,6 +18,7 @@ PYMAPS	:= $(PYTHON_BIN) ../tools/v_tools/pymap2s.py
 PYSETS	:= $(PYTHON_BIN) ../tools/v_tools/pyset2s.py
 
 export PATH := $(realpath ../tools):$(PATH)
+export GCC_COLORS := error=01;31:warning=01;35:note=01;36:range1=32:range2=34:locus=01:quote=01:fixit-insert=32:fixit-delete=31:diff-filename=01:diff-hunk=32:diff-delete=31:diff-insert=32
 
 PAGB_MAIN := g3headers
 PAGB_INCLUDE := $(PAGB_MAIN)/build/include
@@ -29,7 +30,7 @@ CHARMAP := charmap.txt
 
 DEFINES   := -DBPRE -DSOFTWARE_VERSION=0 -DLAN_DE
 ASFLAGS   := -mthumb
-CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fdiagnostics-show-option -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -Igenerated_image -fdiagnostics-color $(DEFINES)
+CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fdiagnostics-show-option -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -Igenerated_image -fdiagnostics-color=always $(DEFINES)
 GRITFLAGS := -ftc -fa
 LDFLAGS   := -z muldefs
 BLDPATH   := object
@@ -142,7 +143,7 @@ rom: main.asm $(MAIN_OBJ)
 	@echo "*** SUCCESSFULLY BUILT PROJECT ***"
 	@echo "*** REMOVING INTERMEDIATE FILES ***"
 	
-$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $()#$(B_ENGINE)
+$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) #$(B_ENGINE)
 	$(MAKE) -f assets.makefile
 	@echo -e "\e[1;32mLinking ELF binary $@\e[0m"
 	@echo "INPUT($^)" > $(TMP_LD)
@@ -155,7 +156,7 @@ $(MAP_PROJ_S): $(MAP_PROJ)
 
 .PHONY: $(B_ENGINE)
 $(B_ENGINE):
-	$(MAKE) -C battle_engine build/linked.o
+	$(MAKE) -C battle_engine build/linked.o PAGB_INCLUDE=../$(PAGB_MAIN)/build
 
 .PHONY: cleansrcdatascript
 cleansrcdatascript:

sots-private

@@ -1 +1 @@
-Subproject commit dfea70a8db81df4268df3a91cdf0d8619c2b2afb
+Subproject commit b6e8c0cbbc187ba843d7d08e56bb59baf4209ff4

src/overworld/tileset_animation/main_animator.c

@@ -1,6 +1,8 @@
 #include <pokeagb/pokeagb.h>
 #include <tileset_animation/smoke.h>
-
+#include <tileset_animation/water_stone.h>
+#include <tileset_animation/flowers_mag.h>
+#include <tileset_animation/flowers_ora.h>
 struct TilesetAnimation {
     u16 tile_start;
     u16 frame_length;
@@ -10,7 +12,10 @@ struct TilesetAnimation {
 };
 
 const struct TilesetAnimation hesperia_second_animations[] = {
-    {.tile_start = 0x114, .frame_length = 7, .tile_length = 4, .frame_count = 5, .image = smokeTiles},
+    {.tile_start = 0x10C, .frame_length = 14, .tile_length = 4, .frame_count = 10, .image = flowers_magTiles},
+    {.tile_start = 0x110, .frame_length = 14, .tile_length = 4, .frame_count = 15, .image = flowers_oraTiles},
+    {.tile_start = 0x114, .frame_length = 7, .tile_length = 4, .frame_count = 8, .image = smokeTiles},
+    {.tile_start = 0x13C, .frame_length = 7, .tile_length = 4, .frame_count = 4, .image = water_stoneTiles},
     {.tile_start = 0, .frame_length = 0, .tile_length = 0, .frame_count = 0, .image = (void *)0xFFFFFFFF},
 };
 
@@ -22,6 +27,7 @@ void animate_from_structure(const struct TilesetAnimation *anim, u16 tile_skip,
         u16 max_frame = anim[current_animation].frame_length * anim[current_animation].frame_count;
         u16 used_frame = current_frame % max_frame;
         used_frame /= anim[current_animation].frame_length;
+        dprintf("using tile %d.\n",used_frame);
         memcpy(current_vram, anim[current_animation].image + (0x20 * anim[current_animation].tile_length * used_frame),
                anim[current_animation].tile_length * 0x20);
         current_animation++;
@@ -45,6 +51,6 @@ void main_animator_init(void) {
 
 void main_second_animator_init(void) {
     blockset_two_current_frame = 0;
-    blockset_two_max_frame = 0x100;
+    blockset_two_max_frame = 0x3C0;
     blockset_two_animator = main_second_animator;
 }