Merge remote-tracking branch 'refs/remotes/origin/master'

base/readme_base.md

@@ -0,0 +1,3 @@
+# Base
+
+add a `firered(u)` version 1.0 rom named `bpre0.gba` in this folder in order for the build to work.

base/readme_base.txt

@@ -1,3 +0,0 @@
-###README_BASE###
-
-add a firered(u) version 1.0 rom named "bpre0.gba" in this folder in order for the build to work.

g3headers

@@ -1 +1 @@
-Subproject commit 62f31b413bc364b5616d2240e0a4cbb050902f31
+Subproject commit 96f9db527ac23ab26be5614c2aeda2b1e3e5c7ab

icons.makefile

@@ -17,13 +17,13 @@ clean:
 	@echo -e "TRYING TO CLEAN ICONS FROM WRONG MAKEFILE"
 
 #$(ICON_AR): $(OBJ_FILES)
-#	@echo -e "\e[1;32mCreating archive $@\e[0m"
+#	@echo "\033[1;32mCreating archive $@\033[0m"
 #	$(AR) rcs $@ $^
 
 #$(GFX_BUILD_DIR)/icons/%.o: $(GFX_BUILD_DIR)/icons/%.s
-#	@echo -e "\e[32mAssembling $<\e[0m"
+#	@echo "\033[32mAssembling $<\033[0m"
 #	$(AS) -o $@ $<
 
 #$(GFX_BUILD_DIR)/icons/%.s: $(I_ASSET_ROOT)/pkmn_icons/%.png
-#	@echo -e "\e[34mProcessing image $<\e[0m"
+#	@echo  "\033[34mProcessing image $<\033[0m"
 #	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gz! -m! -p! -s icon_$(notdir $(basename $<)) -o $@

makefile

@@ -1,7 +1,7 @@
 AS      := @arm-none-eabi-as
 LD      := @arm-none-eabi-ld
 OBJCOPY := @arm-none-eabi-objcopy
-GRIT    := grit
+GRIT    := @grit
 CC      := @arm-none-eabi-gcc
 ARS     := @armips
 MAKE    := make
@@ -30,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=always $(DEFINES)
+CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fdiagnostics-show-option -mlong-calls -march=armv4t -Og -std=c11 -Werror -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -Igenerated_image -fdiagnostics-color=always $(DEFINES)
 GRITFLAGS := -ftc -fa
 LDFLAGS   := -z muldefs
 BLDPATH   := object
@@ -95,40 +95,40 @@ SCRIPT_OBJ	:= $(SCRIPT_SRC:%.s=$(BLDPATH)/%.o)
 ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ) $(SCRIPT_OBJ) $(MAP_PROJ_O) $(MAP_FILES_O) $(TS_FILES_O) $(TS_GEN_O)
 
 $(MAPMAPS)/%.s: $(MAPMAPS)/%.pmh
-	@echo -e "\e[96mGenerating map $<\e[0m"
+	@echo "\033[96mGenerating map $<\033[0m"
 	$(PYMAPS) -o $@ $<
 
 $(MAPTS)/%.s: $(MAPTS)/%.pts
-	@echo -e "\e[94mGenerating tileset $<\e[0m"
+	@echo "\033[94mGenerating tileset $<\033[0m"
 	$(PYSETS) -o $@ $<
 
 $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
-	@echo -e "\e[93mGenerating strings $<\e[0m"
+	@echo "\033[93mGenerating strings $<\033[0m"
 	$(STRAGB) -o $@ -i $< -t string/table.tbl -e 0xFF
 
 $(BLDPATH)/%.o: %.c $(ASSETS) $(PAGB_INCLUDE)/pokeagb/pokeagb.h
-	@echo -e "\e[32mCompiling $<\e[0m"		
+	@echo "\033[32mCompiling $<\033[0m"		
 	$(shell mkdir -p $(dir $@))		
 	$(CC) $(CFLAGS) -c $< -o $@		
 		
 $(BLDPATH)/%.o: %.s $(PAGB_INCLUDE)/pokeagb/pokeagb.h
-	@echo -e "\e[32mAssembling $<\e[0m"		
+	@echo "\033[32mAssembling $<\033[0m"		
 	$(shell mkdir -p $(dir $@))		
 	$(PREPROC) $< $(CHARMAP) > $*.i		
 	$(CC) $(CFLAGS) -c -x assembler-with-cpp $*.i -o $@		
 	@rm -f $*.i
 
 $(MAPTS)/%.s: $(MAPTS)/%.png
-	@echo -e "\e[34mProcessing image (tileset) $<\e[0m"
+	@echo "\033[34mProcessing image (tileset) $<\033[0m"
 	$(GRIT) $< -o $@ -fts -gzl -pz! -pu16 -gB4 -m! -mR!
 
 generated_image/%.c generated_image/%.h: $(AUTO_ASSET_ROOT)/%.png $(AUTO_ASSET_ROOT)/%.grit
-	@echo -e "\e[34mProcessing image $<\e[0m"
+	@echo "\033[34mProcessing image $<\033[0m"
 	$(shell mkdir -p $(dir $@))
 	$(GRIT) $< -o $@ -ftc -ff $(<:%.png=%.grit)
 
 generated_image/%.c generated_image/%.h: $(AUTO_ASSET_ROOT)/%.png
-	@echo -e "\e[34mProcessing image $< (using directory grit file)\e[0m"
+	@echo "\033[34mProcessing image $< (using directory grit file)\033[0m"
 	$(shell mkdir -p $(dir $@))
 	$(GRIT) $< -o $@ -ftc -ff $(<D)/$(notdir $(<D)).grit
 
@@ -136,7 +136,7 @@ all: $(GEN_H) rom
 
 .PHONY: rom
 rom: main.asm $(MAIN_OBJ)
-	@echo -e "\e[1;32mCreating ROM\e[0m"
+	@echo "\033[1;32mCreating ROM\033[0m"
 	$(ARS) $<
 	$(NM) $(BLDPATH)/linked.o -n -g --defined-only | \
 		sed -e '{s/^/0x/g};{/.*\sA\s.*/d};{s/\sT\s/ /g}' > $(OUTPATH)/__symbols.sym
@@ -145,7 +145,7 @@ rom: main.asm $(MAIN_OBJ)
 	
 $(MAIN_OBJ): $(ALL_OBJ) $(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 "\033[1;32mLinking ELF binary $@\033[0m"
 	@echo "INPUT($^)" > $(TMP_LD)
 	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group -T $(TMP_LD) --end-group
 	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -o $@.dbg --start-group -T $(TMP_LD) --end-group
@@ -153,7 +153,7 @@ $(MAIN_OBJ): $(ALL_OBJ) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR)
 	@rm -f $(TMP_LD)
 
 $(MAP_PROJ_S): $(MAP_PROJ)
-	@echo -e "\e[91mGenerating map project $<\e[0m"
+	@echo "\033[91mGenerating map project $<\033[0m"
 	$(PYPROJS) -b sovereign_banks -f sovereign_footer -o $@ $<
 
 .PHONY: $(B_ENGINE)
@@ -191,42 +191,42 @@ clean:
 
 .PHONY: $(ASSETS)
 $(ASSETS):
-	@echo -e "\e[95mMaking Assets\e[0m"
+	@echo "\033[95mMaking Assets\033[0m"
 	$(MAKE) -f assets.makefile
 
 .PHONY: $(SPRITES)
 $(SPRITES):
-	@echo -e "\e[95mMaking Sprites\e[0m"
+	@echo "\033[95mMaking Sprites\033[0m"
 	$(MAKE) -f sprites.makefile
 
 .PHONY: $(ICONS_AR)
 $(ICONS_AR):
-	@echo -e "\e[95mMaking Icons\e[0m"
+	@echo "\033[95mMaking Icons\033[0m"
 	$(MAKE) -f icons.makefile
 
 .PHONY: $(MUSIC_AR)
 $(MUSIC_AR):
-	@echo -e "\e[95mMaking Music\e[0m"
+	@echo "\033[95mMaking Music\033[0m"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(SMPL_AR)
 $(SMPL_AR):
-	@echo -e "\e[95mMaking Sampler\e[0m"
+	@echo "\033[95mMaking Sampler\033[0m"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(VOICE_AR)
 $(VOICE_AR):
-	@echo -e "\e[95mMaking Voice\e[0m"
+	@echo "\033[95mMaking Voice\033[0m"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(LIST_AR)
 $(LIST_AR):
-	@echo -e "\e[95mMaking Songlist\e[0m"
+	@echo "\033[95mMaking Songlist\033[0m"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: $(CRY_AR)
 $(CRY_AR):
-	@echo -e "\e[95mMaking Cries\e[0m"
+	@echo "\033[95mMaking Cries\033[0m"
 	$(MAKE) -C $(dir $@) all
 
 .PHONY: constants

patches/game_engine/quick_hacks.asm

@@ -1,8 +1,8 @@
 EGG_HATCH_LEVEL EQU 1
 EV_CAP EQU 252
 
-PLAYER_S_X EQU 0x40
-PLAYER_S_Y EQU 0x10
+PLAYER_S_X EQU 0x42
+PLAYER_S_Y EQU 0x14
 
 PLAYER_S_B EQU 0x0
 PLAYER_S_M EQU 0x0

sots-private

@@ -1 +1 @@
-Subproject commit 397965069d35a0c0b96de7488e254080af911cbd
+Subproject commit d78db20338af087422889fc23d0ad91207e26b62

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/battle_engine/battle_help.c

@@ -68,6 +68,9 @@ u8 type_effectiveness_table[TYPE_FAIRY - 0x4][TYPE_FAIRY - 0x4] = {
 /* === IMPLEMENTATIONS === */
 u16 battle_damage_type_effectiveness_update(u8 attacking_type, u8 defending_type, u8 atk_bank, u8 def_bank,
                                             u16 chained_effect, u8 airstatus) {
+
+    (void)airstatus; //TODO
+
     u8 effect, atype = attacking_type, dtype = defending_type;
     if (!chained_effect || atype == TYPE_EGG || dtype == TYPE_EGG)
         return chained_effect;
@@ -124,6 +127,9 @@ u16 battle_apply_type_effectiveness(u16 chained_effect, u8 move_type, u8 target_
 
 u16 battle_type_effectiveness_calc(u16 move, u8 move_type, u8 atk_bank, u8 def_bank,
                                    u8 effects_handling_and_recording) {
+    (void)move;
+    (void)effects_handling_and_recording;
+    
     u16 chained_effect = 64;
     // TODO: double_type moves
     // TODO: get air status

src/evolution/evolution_methods.c

@@ -375,12 +375,14 @@ struct evo_result evolve_by_move_type(struct evo_call_arguments arguments)
 
 struct evo_result evolve_no_method(struct evo_call_arguments arguments)
 {
+    (void)arguments;
     //For shedninja
     return EVO_NO_EVO;
 }
 
 struct evo_result evolve_invalid_method(struct evo_call_arguments arguments)
 {
+    (void)arguments;
     dprintf("A pokemon tried to execute an evolution method that is not yet implemented.\n");
     return (struct evo_result){false, false, 0};
 }

src/include/types.h

@@ -19,6 +19,6 @@ typedef     double                  f64;
 #include <stddef.h>
 #include <stdbool.h>
 
-#define rgb5(r,g,b)                 (u16)( r | ( g << 5) | ( b << 10) )
+//#define rgb5(r,g,b)                 (u16)( r | ( g << 5) | ( b << 10) )
 
 #endif

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/interface/textbox_mugshots.c

@@ -29,13 +29,8 @@
  */
 
 /* === INCLUDES === */
-#include <objects.h>
-#include <callback.h>
+#include <pokeagb/pokeagb.h>
 #include <config/core.h>
-#include <lcd.h>
-#include <debug.h>
-#include <game_engine.h>
-#include <memory.h>
 
 /* === PROTOTYPES === */
 
@@ -43,7 +38,7 @@
  * @brief null callback
  * @param self object
  */
-void mug_cb_null(struct obj_entity *self);
+void mug_cb_null(struct Object *self);
 
 /**
  * @brief called when tb is opened to create mugshot
@@ -58,24 +53,33 @@ void mug_delete();
 
 /* === STRUCTURES === */
 
-typedef struct mug_mugshot {
+typedef struct Mugshot {
     void *gfx;
     void *pal;
-} mug_mugshot;
+} Mugshot;
 
 /* === STATIC GLOBALS === */
 
-extern mug_mugshot mugshots[0xFF];
+extern Mugshot mugshots[0xFF];
 
 u8 *temp_obj_id1 = (u8*) OBJ_1_TEMP;
 u8 *temp_obj_id2 = (u8*) OBJ_2_TEMP;
 
-struct obj_oam_attributes mug_sprite = {0, 0x8000, 0, 0};
-
-struct obj_template mugshot_1_template = {MUGSHOT_1_TAG, MUGSHOT_1_TAG, &mug_sprite, (struct obj_frame **) 0x08231CF0, 0, (struct obj_rotscale_frame **) 0x08231CFC, mug_cb_null};
-struct obj_template mugshot_2_template = {MUGSHOT_2_TAG, MUGSHOT_2_TAG, &mug_sprite, (struct obj_frame **) 0x08231CF0, 0, (struct obj_rotscale_frame **) 0x08231CFC, mug_cb_null};
+struct OamData mug_sprite = {.size = 3};
 
+struct Template mugshot_1_template = {.tiles_tag = MUGSHOT_1_TAG,
+                                      .pal_tag = MUGSHOT_1_TAG, 
+                                      .oam = &mug_sprite, .graphics = NULL, 
+                                      .animation=SPRITE_NO_ANIMATION,
+                                      .rotscale = SPRITE_NO_ROTSCALE,
+                                      .callback=mug_cb_null};
 
+struct Template mugshot_2_template = {.tiles_tag = MUGSHOT_2_TAG,
+                                      .pal_tag = MUGSHOT_2_TAG, 
+                                      .oam = &mug_sprite, .graphics = NULL, 
+                                      .animation=SPRITE_NO_ANIMATION,
+                                      .rotscale = SPRITE_NO_ROTSCALE,
+                                      .callback=mug_cb_null};
 
 /* === IMPLEMENTATIONS === */
 
@@ -90,22 +94,22 @@ void mug_create_on_variable() {
         u16 *mug1_y = var_access(MUGSHOT_1_Y);
 
         mug_id_1--;
-        struct obj_resource gfx_mugshot_1 = {(mugshots[mug_id_1].gfx), 0x1C00, MUGSHOT_1_TAG};
-        struct obj_resource pal_mugshot_1 = {(mugshots[mug_id_1].pal), MUGSHOT_1_TAG};
+        struct SpriteTiles gfx_mugshot_1 = {(mugshots[mug_id_1].gfx), 0x1C00, MUGSHOT_1_TAG};
+        struct SpritePalette pal_mugshot_1 = {(mugshots[mug_id_1].pal), MUGSHOT_1_TAG};
 
 
-        obj_gpu_pal_alloc_tag_and_apply(&pal_mugshot_1);
-        obj_gpu_tile_decompress_alloc_tag_and_upload(&gfx_mugshot_1);
+        gpu_pal_obj_alloc_tag_and_apply(&pal_mugshot_1);
+        gpu_tile_obj_decompress_alloc_tag_and_upload(&gfx_mugshot_1);
 
-        *temp_obj_id1 = (u16) obj_template_instanciate_forward_search(&mugshot_1_template, 0, 100, 1);
+        *temp_obj_id1 = (u16) template_instanciate_forward_search(&mugshot_1_template, 0, 100, 1);
 
         if (h_flip)
-            objects[*temp_obj_id1].final_oam.attr1 |= 0x1000;
+            objects[*temp_obj_id1].final_oam.h_flip = true;
         if (v_flip)
-            objects[*temp_obj_id1].final_oam.attr1 |= 0x2000;
+            objects[*temp_obj_id1].final_oam.v_flip = true;
 
-        objects[*temp_obj_id1].x = *mug1_x;
-        objects[*temp_obj_id1].y = *mug1_y;
+        objects[*temp_obj_id1].pos1.x = *mug1_x;
+        objects[*temp_obj_id1].pos1.y = *mug1_y;
     }
     u16 *mug2_var = var_access(MUGHSOT_2_TABLE);
     u16 c_mug2_var = *mug2_var;
@@ -117,23 +121,23 @@ void mug_create_on_variable() {
         u16 *mug2_y = var_access(MUGSHOT_2_Y);
 
         mug_id_2--;
-        struct obj_resource gfx_mugshot_2 = {(mugshots[mug_id_2].gfx), 0x1C00, MUGSHOT_2_TAG};
-        struct obj_resource pal_mugshot_2 = {(mugshots[mug_id_2].pal), MUGSHOT_2_TAG};
+        struct SpriteTiles gfx_mugshot_2 = {(mugshots[mug_id_2].gfx), 0x1C00, MUGSHOT_2_TAG};
+        struct SpritePalette pal_mugshot_2 = {(mugshots[mug_id_2].pal), MUGSHOT_2_TAG};
 
 
-        obj_gpu_pal_alloc_tag_and_apply(&pal_mugshot_2);
-        obj_gpu_tile_decompress_alloc_tag_and_upload(&gfx_mugshot_2);
+        gpu_pal_obj_alloc_tag_and_apply(&pal_mugshot_2);
+        gpu_tile_obj_decompress_alloc_tag_and_upload(&gfx_mugshot_2);
 
         c_mug2_var = *mug2_var;
-        *temp_obj_id2 = (u16) obj_template_instanciate_forward_search(&mugshot_2_template, 0, 100, 1);
+        *temp_obj_id2 = (u16) template_instanciate_forward_search(&mugshot_2_template, 0, 100, 1);
 
         if (h_flip)
-            objects[*temp_obj_id2].final_oam.attr1 |= 0x1000;
+            objects[*temp_obj_id2].final_oam.h_flip = true;
         if (v_flip)
-            objects[*temp_obj_id2].final_oam.attr1 |= 0x2000;
+            objects[*temp_obj_id2].final_oam.v_flip = true;
 
-        objects[*temp_obj_id2].x = *mug2_x;
-        objects[*temp_obj_id2].y = *mug2_y;
+        objects[*temp_obj_id2].pos1.x = *mug2_x;
+        objects[*temp_obj_id2].pos1.y = *mug2_y;
     }
 }
 
@@ -143,7 +147,7 @@ void mug_delete() {
 
     if (*temp_obj_id1 != 0) {
         gpu_pal_free_by_tag(MUGSHOT_1_TAG);
-        obj_gpu_tile_free_by_tag(MUGSHOT_1_TAG);
+        gpu_tile_obj_free_by_tag(MUGSHOT_1_TAG);
 
         //*mug1_var = 0;
         //do reset mugshot var ; set it to old value instead
@@ -157,7 +161,7 @@ void mug_delete() {
     //return;
     if (*temp_obj_id2 != 0) {
         gpu_pal_free_by_tag(MUGSHOT_2_TAG);
-        obj_gpu_tile_free_by_tag(MUGSHOT_2_TAG);
+        gpu_tile_obj_free_by_tag(MUGSHOT_2_TAG);
 
         //*mug2_var = 0;
         //do reset mugshot var ; set it to old value instead
@@ -170,6 +174,7 @@ void mug_delete() {
 
 }
 
-void mug_cb_null(struct obj_entity *self) {
+void mug_cb_null(struct Object *self) {
+    (void)self;
     return;
 }

src/overworld/dns/dns.c

@@ -124,6 +124,9 @@ void dns_pal_patch_for_npc(u16 tag, u8 idx)
 }
 
 void dns_modify_palette(union Color* buffer, u16 size){
+    (void)buffer;
+    (void)size;
+    //to activate remove the above
    /* if(current_map_header.light == 8)
         return;
     for(u16 i = 0; i < size; ++i) {

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);
         }
 

src/specials/custom_specials.c

@@ -31,7 +31,7 @@
 /* === INCLUDES === */
 
 #include "camera_move.h"
-#include "cutscene_meteor.h"
+//#include "cutscene_meteor.h"
 #include <config/core.h>
 #include <pokeagb/pokeagb.h>
 
@@ -81,7 +81,7 @@ extern pchar name_rival_female[5];
 /* === STATICS === */
 
 static special_func special_routines[10] = {
-    met_play,         cam_sp_move_camera, sp_init_script,  NULL, NULL,
+    NULL,         cam_sp_move_camera, sp_init_script,  NULL, NULL,
     sp_random_number, sp_check_tileset,   sp_batchmaptile, sp_crystal_fade, sp_set_rival,
 };