code cleanup and refractor, licence

.cproject

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="0.611547157">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.611547157" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration buildProperties="" description="" id="0.611547157" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+					<folderInfo id="0.611547157." name="/" resourcePath="">
+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.2045814114" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.2045814114.1252909595" name=""/>
+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1829609699" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.907440362" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.1527973307" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2026614964" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.291840161" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1833279374" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.1555053434" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.536157729" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="source_of_the_sovereign.null.1685340467" name="source_of_the_sovereign"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="0.611547157">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+</cproject>

.project

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>source_of_the_sovereign</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>

bpre.sym

@@ -8,7 +8,7 @@ free = 0x08002BC4|1;
 memmove = 0x081E8E60|1;
 memset = 0x081E5ED8|1;
 memcpy = 0x081E5E78|1;
-template_instanciate_forward_search = 0x08006F8D;
+obj_template_instanciate_forward_search = 0x08006F8D;
 gpu_copy_to_vram_by_bgid = 0x08001298|1;
 bg_set_tilemap = 0x08001FA0|1;
 bg_nullify_tilemap = 0x08001FD4|1;
@@ -21,7 +21,7 @@ gpu_bg_show = 0x08001320|1;
 gpu_bg_hide = 0x0800139C|1;
 gpu_sync_bg_visibility_and_mode = 0x080013D0|1;
 gpu_pal_upload = 0x08070474|1;
-gpu_sprites_upload = 0x08007320|1;
+obj_gpu_sprites_upload = 0x08007320|1;
 obj_delete_all = 0x8007770|1;
 camera_move_and_redraw = 0x0805ACB4|1;
 calc_circle = 0x0807EE2C|1;
@@ -55,9 +55,9 @@ lz77u_wram = 0x0800EBB4|1;
 
 vram_decompress = 0x081E3B6C|1;
 pal_decompress_slice_to_faded_and_unfaded = 0x080703A8|1;
-gpu_tile_obj_decompress_alloc_tag_and_upload = 0x0800F035;
-gpu_pal_obj_alloc_tag_and_apply = 0x08008929;
-gpu_tile_obj_free_by_tag = 0x0800874D;
+obj_gpu_tile_decompress_alloc_tag_and_upload = 0x0800F035;
+obj_gpu_pal_alloc_tag_and_apply = 0x08008929;
+obj_gpu_tile_free_by_tag = 0x0800874D;
 gpu_pal_free_by_tag = 0x08008A31;
 obj_delete_and_free_tiles = 0x08007281;
 box_zero_flag = 0x0203709C;

makefile

@@ -2,7 +2,7 @@ AS      := arm-none-eabi-as
 LD      := arm-none-eabi-ld
 OBJCOPY := arm-none-eabi-objcopy
 GRIT    := grit
-CC      := arm-none-eabi-gcc
+CC      := @arm-none-eabi-gcc
 ARS     := armips
 MAKE    := make
 NM      := @arm-none-eabi-nm
@@ -13,7 +13,7 @@ export PATH := $(realpath ../tools):$(PATH)
 
 DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
 ASFLAGS   := -mthumb
-CFLAGS    := -mthumb -mno-thumb-interwork -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include $(DEFINES)
+CFLAGS    := -mthumb -mno-thumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include $(DEFINES)
 GRITFLAGS := -ftc -fa
 LDFLAGS   := -z muldefs
 BLDPATH   := object
@@ -80,6 +80,7 @@ rom: main.asm $(MAIN_OBJ)
 $(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(DYN_OVER) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $(STRING_OBJ)
 	$(MAKE) -f assets.makefile
 	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
+	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym -o object/debug.o object/linked.o
 
 .PHONY: clean
 clean:

nbproject/configurations.xml

@@ -4835,7 +4835,7 @@
           <buildCommandWorkingDir>.</buildCommandWorkingDir>
           <buildCommand>${MAKE} -f makefile LAN=DE -j4</buildCommand>
           <cleanCommand>${MAKE} -f makefile clean</cleanCommand>
-          <executablePath></executablePath>
+          <executablePath>object/debug.o</executablePath>
         </makeTool>
         <preBuild>
           <preBuildCommandWorkingDir>.</preBuildCommandWorkingDir>

nbproject/private/configurations.xml

@@ -4363,7 +4363,7 @@
           </df>
         </df>
         <df name="string">
-          <df name="DE">
+          <df name="de">
           </df>
         </df>
       </df>
@@ -5587,6 +5587,7 @@
               <in>SEQ_BGM_E_CHAMPION.s</in>
               <in>SEQ_BGM_E_INISHIE.s</in>
               <in>SEQ_BGM_E_MENU.s</in>
+              <in>SEQ_BGM_GYM.s</in>
               <in>SEQ_BGM_LABO.s</in>
               <in>SEQ_BGM_MART.s</in>
               <in>SEQ_BGM_OVERTURE.s</in>
@@ -5700,6 +5701,8 @@
               <in>snd_127_sticks.s</in>
               <in>snd_127_tambourine.s</in>
               <in>snd_127_tom.s</in>
+              <in>snd_127_tom_45.s</in>
+              <in>snd_127_tom_48.s</in>
               <in>snd_127_triangle.s</in>
               <in>snd_14_tubular_bell.s</in>
               <in>snd_17_organ.s</in>
@@ -6275,11 +6278,12 @@
             <option name="gdb_init_file"
                     value="C:\cygwin64\home\auerp\sots\emu\gdbinit.gdb"/>
             <option name="gdb_source_dirs" value="src"/>
-            <option name="debug_command" value="&quot;../emu/mgba.exe&quot; -g &quot;build/pkmn_sots.gba&quot;"/>
+            <option name="debug_command"
+                    value="arm-none-eabi-gdb --args file &quot;build\debug.o&quot; target remote localhost:2345"/>
             <option name="debug_dir"
                     value="C:\cygwin64\home\auerp\sots\source_of_the_sovereign\."/>
             <option name="symbol_file"
-                    value="C:\cygwin64\home\auerp\sots\source_of_the_sovereign\object\linked.o"/>
+                    value="C:\cygwin64\home\auerp\sots\source_of_the_sovereign\object\debug.o"/>
           </DebugOptions>
         </gdb_options>
         <gdb_buildfirst gdb_buildfirst_overriden="false" gdb_buildfirst_old="false"/>

nbproject/private/private.xml

@@ -49,6 +49,7 @@
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle.h</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/moves.asm</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/pkmn_tables/pokemon_moveset_table.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/types.h</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/overworld_hooks.S</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/battle_engine/battle_engine.asm</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/moves/feint/feint.c</file>
@@ -91,6 +92,7 @@
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_script.h</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/battle_engine/entry_hazards_hook.S</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/moves/move_data.S</file>
+            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/interface/textbox_mugshots.c</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/string/de/move_strings.txt</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/battle_abilities.h</file>
             <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/items/items.asm</file>

src/battle_engine/#battle_abilities.c#

@@ -0,0 +1,22 @@
+#include <battle_abilities.h>
+#include <custom_structs.h>
+
+#include "battle_structs.h"
+
+u8 has_ability_effect(u8 bank, u8 mold_breaker, u8 gastro)
+{
+  if(gastro && custom_battle_elements.ptr->bank_affecting[bank].gastro_acided)
+        return false;
+    return true;
+    //TODO: MOLD BREAKER
+}
+
+u8 weather_abilities_effect()
+{
+    //TODO: AIR LOCK AND CLOUD NINE
+    return true;
+}
+u8 has_ability(u8 bank, u8 ability)
+{
+    return (has_ability_effect(bank,0,1) && battle_participants[bank].ability_id == ability);
+}

src/debug/debug.c

@@ -170,7 +170,7 @@ void debug_update() {
     objc_exec();
     obj_sync();
     gpu_pal_upload();
-    gpu_sprites_upload();
+    obj_gpu_sprites_upload();
 }
 
 void int_to_char(u32 i, char* ref) {

src/dns/dns_core.c

@@ -108,8 +108,8 @@ void overworld_anim_load_pal(void** oe_script_pointer) {
     memcpy(temp_color, pal_to_apply->palette, 32);
     apply_shaders(0, 0, temp_color);
 
-    struct resource temp_resource = {temp_color, pal_to_apply->tag, pal_to_apply->fill};
-    gpu_pal_obj_alloc_tag_and_apply(&temp_resource);
+    struct obj_resource temp_resource = {temp_color, pal_to_apply->tag, pal_to_apply->fill};
+    obj_gpu_pal_alloc_tag_and_apply(&temp_resource);
     free(temp_color);
     if (current_idx != 0xFF) {
         current_idx = gpu_pal_tags_index_of(pal_to_apply->tag);

src/include/callback.h

@@ -3,7 +3,8 @@
 
 #include <objects.h>
 typedef void (*callback)();
-typedef struct super {
+
+struct int_superstate {
 	callback callback1;
 	callback callback2;
 	callback callback2backup;
@@ -21,16 +22,15 @@ typedef struct super {
 	u16 buttons_new_and_key_repeat;
 	u32 keypad_countdown;
 	u32 unused_padding;
-	sprite sprites[128];
+	struct obj_entity sprites[128];
 	u8 multi_purpose_state_tracker;
 	u8 gpu_sprites_upload_skip;
- } super;
-extern super superstate;
-void set_callback2(callback address);
-void vblank_handler_set(callback address);
-
-
+ };
+ 
+extern struct int_superstate superstate;
+extern void set_callback2(callback address);
+extern void vblank_handler_set(callback address);
 
-void callback_overworld();
+extern void callback_overworld();
 
 #endif

src/include/lcd.h

@@ -53,13 +53,7 @@ void gpu_bg_hide(u8 id);
 void gpu_sync_bg_visibility_and_mode();
 void lcd_io_set_func(u8 id, u16 value);
 void gpu_pal_upload();
-void gpu_sprites_upload();
-
-u8 gpu_pal_obj_alloc_tag_and_apply(resource *pal);
 void gpu_pal_free_by_tag(u16 tag);
-void gpu_tile_obj_free_by_tag(u16 tag);
-void obj_delete_and_free_tiles(object *obj);
-void obj_delete_all();
 
 u16 lcd_io_get(u8 id);
 

src/include/objects.h

@@ -1,48 +1,68 @@
+/****************************************************************************
+ * Copyright (C) 2015-2016 by the SotS Team                                 *
+ *                                                                          *
+ * This file is part of Sovereign of the Skies.                             *
+ *                                                                          *
+ *   Sovereign of the Skies is free software: you can redistribute it       *
+ *   and/or modify it                                                       *
+ *   under the terms of the GNU Lesser General Public License as published  *
+ *   by the Free Software Foundation, either version 3 of the License, or   *
+ *   (at your option) any later version provided you include a copy of the  *
+ *   licence and this header.                                               *
+ *                                                                          *
+ *   Sovereign of the Skies is distributed in the hope that it will be      *
+ *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *   GNU Lesser General Public License for more details.                    *
+ *                                                                          *
+ *   You should have received a copy of the GNU Lesser General Public       *
+ *   License along with Box.  If not, see <http://www.gnu.org/licenses/>.   *
+ ****************************************************************************/
+
+/**
+ * @file objects.h
+ * @author Sturmvogel
+ * @date 15 dec 2016
+ * @brief Helpful operations and structure on object entities.
+ * 
+ * This header provides a framework for working with the object engine.
+ * Methods are used to create, destroy, manipulate and update the object
+ * entities.
+ */
+
 #ifndef OBJECTS_H_
 #define OBJECTS_H_
 
 #include "types.h"
 
-struct object;
-typedef struct object object;
-typedef void (*object_callback)(object*);
+/* === STRUCTURES === */
 
-typedef struct frame {
+struct obj_frame {
   u16 data;
   u16 duration;
-} frame;
+};
 
-typedef struct rotscale_frame {
+struct obj_rotscale_frame {
   u16 scale_delta_x;
   u16 scale_delta_y;
   u8 rot_delta;
   u8 duration;
   u16 field_6;
-}  rotscale_frame;
+};
 
-typedef struct sprite {
+struct obj_oam_attributes {
   u16 attr0;
   u16 attr1;
   u16 attr2;
   u16 rotscale;
-} sprite;
+};
 
-typedef struct template {
-  u16 tiles_tag;
-  u16 pal_tag;
-  sprite *oam;
-  frame **animation;
-  u32 *graphics;
-  rotscale_frame **rotscale;
-  object_callback callback;
-} template;
-
-typedef struct object {
-  sprite final_oam;
-  frame **animation_table;
+struct obj_entity {
+  struct obj_oam_attributes final_oam;
+  struct obj_frame **animation_table;
   u32 *gfx_table;
   u32 *rotscale_table;
-  template *template;
+  struct obj_template *template;
   u32 field18;
   u32 *callback;
   u16 x;
@@ -61,16 +81,73 @@ typedef struct object {
   u16 anim_data_offset;
   u8 field42;
   u8 field43;
-} object;
+};
+
+typedef void (*object_callback)(struct obj_entity*);
 
-typedef struct resource {
+struct obj_template {
+  u16 tiles_tag;
+  u16 pal_tag;
+  struct obj_oam_attributes *oam;
+  struct obj_frame **animation;
+  u32 *graphics;
+  struct obj_rotscale_frame **rotscale;
+  object_callback callback;
+};
+
+struct obj_resource {
   void *data;
   u16 size;
   u16 tag;
-} resource;
+};
+
+/* === EXTERN METHODS === */
+
+/**
+ * 
+ * @param t pointer to obj_template structure which should be instancinated
+ * @param x x position
+ * @param y y position
+ * @param b index to start searching at ( ? )
+ * @return id of the newly generated obj_entity structure [in superstate.sprites array]
+ */
+extern u8 obj_template_instanciate_forward_search(struct obj_template *t, u16 x, u16 y, u8 b);
+
+/**
+ * 
+ * @param src obj_resource structure to allocate
+ * @return tag of the allocated resource
+ */
+extern u16 obj_gpu_tile_decompress_alloc_tag_and_upload(struct obj_resource *src);
+
+/**
+ * @brief parses and uploads the objects in memory to the object hardware
+ */
+extern void obj_gpu_sprites_upload();
+
+/**
+ * 
+ * @param pal palette resource to create
+ * @return success ( ? )
+ */
+extern u8 obj_gpu_pal_alloc_tag_and_apply(struct obj_resource *pal);
+
+/**
+ * 
+ * @param tag tag of tile resource to free
+ */
+extern void obj_gpu_tile_free_by_tag(u16 tag);
+
+/**
+ * 
+ * @param obj obj_entitiy structure to free and delete
+ */
+extern void obj_delete_and_free_tiles(struct obj_entity *obj);
+
+/**
+ * @brief delete all object entities in game
+ */
+extern void obj_delete_all();
 
-u8 template_instanciate_forward_search(struct template *t, u16 x, u16 y, u8 b);
-u16 gpu_tile_obj_decompress_alloc_tag_and_upload(resource *src);
-#define objects ((object*)0x0202063C)
 
 #endif

src/include/types.h

@@ -16,6 +16,8 @@ typedef     double                  f64;
 
 typedef     unsigned int            size_t;
 
+typedef     unsigned char           bool;
+
 #define true 1
 #define false 0
 

src/interface/textbox_mugshots.c

@@ -1,7 +1,7 @@
-#include <stdbool.h>
 #include <objects.h>
+#include <callback.h>
 #include <config.h>
-
+#include <lcd.h>
 typedef struct mugshot {
 	void *gfx;
 	void *pal;
@@ -11,21 +11,16 @@ typedef struct mugshot {
 mugshot *mugshots = (mugshot (*) ) 0x097007E0;
 u8 *temp_obj_id1 = (u8*) OBJ_1_TEMP;
 u8 *temp_obj_id2 = (u8*) OBJ_2_TEMP;
-
-void gpu_pal_obj_alloc_tag_and_apply(resource *pal);
-void gpu_pal_free_by_tag(u16 tag);
-void gpu_tile_obj_free_by_tag(u16 tag);
-void obj_delete_and_free_tiles(object *obj);
 void* memset(void* ptr, int value, u32 num);
 
 u16* var_access(u16 num);
 
-sprite mug_sprite = {0, 0x8000, 0, 0};
+struct obj_oam_attributes mug_sprite = {0, 0x8000, 0, 0};
 
-void null_callback(object *self);
+void null_callback(struct obj_entity *self);
 
-template mugshot_1_template = {MUGSHOT_1_TAG, MUGSHOT_1_TAG, &mug_sprite, (frame **)0x08231CF0, 0, (rotscale_frame **)0x08231CFC, null_callback};
-template mugshot_2_template = {MUGSHOT_2_TAG, MUGSHOT_2_TAG, &mug_sprite, (frame **)0x08231CF0, 0, (rotscale_frame **)0x08231CFC, null_callback};
+struct obj_template mugshot_1_template = {MUGSHOT_1_TAG, MUGSHOT_1_TAG, &mug_sprite, (struct obj_frame **)0x08231CF0, 0, (struct obj_rotscale_frame **)0x08231CFC, null_callback};
+struct obj_template mugshot_2_template = {MUGSHOT_2_TAG, MUGSHOT_2_TAG, &mug_sprite, (struct obj_frame **)0x08231CF0, 0, (struct obj_rotscale_frame **)0x08231CFC, null_callback};
 
 void create_mugshot_on_variable()
 {
@@ -40,22 +35,22 @@ void create_mugshot_on_variable()
 		u16 *mug1_y = var_access(MUGSHOT_1_Y);
 
 		mug_id_1--;
-		resource gfx_mugshot_1 = {(mugshots[mug_id_1].gfx), 0x1C00, MUGSHOT_1_TAG};
-		resource pal_mugshot_1 = {(mugshots[mug_id_1].pal), MUGSHOT_1_TAG};
+		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};
 
 
-		gpu_pal_obj_alloc_tag_and_apply(&pal_mugshot_1);
-		gpu_tile_obj_decompress_alloc_tag_and_upload(&gfx_mugshot_1);
+		obj_gpu_pal_alloc_tag_and_apply(&pal_mugshot_1);
+		obj_gpu_tile_decompress_alloc_tag_and_upload(&gfx_mugshot_1);
 
-		*temp_obj_id1 = (u16)template_instanciate_forward_search(&mugshot_1_template, 0, 100, 1);
+		*temp_obj_id1 = (u16)obj_template_instanciate_forward_search(&mugshot_1_template, 0, 100, 1);
 
 		if(h_flip)
-			objects[*temp_obj_id1].final_oam.attr1 |= 0x1000;
+			superstate.sprites[*temp_obj_id1].final_oam.attr1 |= 0x1000;
 		if(v_flip)
-			objects[*temp_obj_id1].final_oam.attr1 |= 0x2000;
+			superstate.sprites[*temp_obj_id1].final_oam.attr1 |= 0x2000;
 
-		objects[*temp_obj_id1].x = *mug1_x;
-		objects[*temp_obj_id1].y = *mug1_y;
+		superstate.sprites[*temp_obj_id1].x = *mug1_x;
+		superstate.sprites[*temp_obj_id1].y = *mug1_y;
 	}
 	//return;
 	u16 *mug2_var = var_access(MUGHSOT_2_TABLE);
@@ -69,23 +64,23 @@ void create_mugshot_on_variable()
 		u16 *mug2_y = var_access(MUGSHOT_2_Y);
 
 		mug_id_2--;
-		resource gfx_mugshot_2 = {(mugshots[mug_id_2].gfx), 0x1C00, MUGSHOT_2_TAG};
-		resource pal_mugshot_2 = {(mugshots[mug_id_2].pal), MUGSHOT_2_TAG};
+		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};
 
 
-		gpu_pal_obj_alloc_tag_and_apply(&pal_mugshot_2);
-		gpu_tile_obj_decompress_alloc_tag_and_upload(&gfx_mugshot_2);
+		obj_gpu_pal_alloc_tag_and_apply(&pal_mugshot_2);
+		obj_gpu_tile_decompress_alloc_tag_and_upload(&gfx_mugshot_2);
 
 		c_mug2_var = *mug2_var;
-		*temp_obj_id2 = (u16)template_instanciate_forward_search(&mugshot_2_template, 0, 100, 1);
+		*temp_obj_id2 = (u16)obj_template_instanciate_forward_search(&mugshot_2_template, 0, 100, 1);
 
 		if(h_flip)
-			objects[*temp_obj_id2].final_oam.attr1 |= 0x1000;
+			superstate.sprites[*temp_obj_id2].final_oam.attr1 |= 0x1000;
 		if(v_flip)
-			objects[*temp_obj_id2].final_oam.attr1 |= 0x2000;
+			superstate.sprites[*temp_obj_id2].final_oam.attr1 |= 0x2000;
 
-		objects[*temp_obj_id2].x = *mug2_x;
-		objects[*temp_obj_id2].y = *mug2_y;
+		superstate.sprites[*temp_obj_id2].x = *mug2_x;
+		superstate.sprites[*temp_obj_id2].y = *mug2_y;
 	}
 }
 
@@ -97,14 +92,14 @@ void delete_mugshot()
 	if(*temp_obj_id1 != 0)
 	{
 		gpu_pal_free_by_tag(MUGSHOT_1_TAG);
-		gpu_tile_obj_free_by_tag(MUGSHOT_1_TAG);
+		obj_gpu_tile_free_by_tag(MUGSHOT_1_TAG);
 
 		//*mug1_var = 0;
 		//do reset mugshot var ; set it to old value instead
 
 		//*mug1_var = objects[object_id_1].private[0];
 
-		obj_delete_and_free_tiles(&objects[*temp_obj_id1]);
+		obj_delete_and_free_tiles(&(superstate.sprites[*temp_obj_id1]));
 		*temp_obj_id1 = 0;
 	}
 
@@ -112,20 +107,20 @@ void delete_mugshot()
 	if(*temp_obj_id2 != 0)
 	{
 		gpu_pal_free_by_tag(MUGSHOT_2_TAG);
-		gpu_tile_obj_free_by_tag(MUGSHOT_2_TAG);
+		obj_gpu_tile_free_by_tag(MUGSHOT_2_TAG);
 
 		//*mug2_var = 0;
 		//do reset mugshot var ; set it to old value instead
 
 		//*mug2_var = objects[object_id_2].private[0];
 
-		obj_delete_and_free_tiles(&objects[*temp_obj_id2]);
+		obj_delete_and_free_tiles(&(superstate.sprites[*temp_obj_id2]));
 		*temp_obj_id2 = 0;
 	}
 
 }
 
-void null_callback(object *self)
+void null_callback(struct obj_entity *self)
 {
 	//null_callback
 }

src/overworld/grass_animation.c

@@ -1,4 +1,4 @@
-#include <bpre.h>
+/*#include <bpre.h>
 
 #include "oe_animation.h"
 
@@ -9,4 +9,4 @@ void grass_step_general(struct npc_state* npc)
     
 }
 
-void grass_step_normal()
+void grass_step_normal()*/

src/player_interaction/#on_step.S#

@@ -0,0 +1,111 @@
+#include <config.h>
+
+.text
+.align 2
+.thumb
+.global on_step
+on_step:
+	push {r5}
+	bl safari_step
+	lsl r0, #0x18
+	lsr r0, #0x18
+	cmp r0, #1
+	beq return_true
+	
+	ldrh r0, =FLAG_WALK_SCRIPT
+	bl read_flag
+	cmp r0, #0
+	beq check_walking_script
+	sub SP, #4
+	mov r0, sp
+	mov r1, sp
+	add r1, #2
+	bl get_player_to
+	mov r0, sp
+	mov r1, sp
+	add r1, #2
+	ldrh r0, [r0]
+	ldrh r1, [r1]
+	add sp, #4
+	lsl r0, #0x10
+	asr r4, r0, #0x10
+	lsl r1, #0x10
+	asr r5, r1, #0x10
+	mov r0, r4
+	mov r1, r5
+	bl check_block_role
+	lsl r0, #0x18
+	lsr r0, #0x18
+	ldr r1, behavior_walk_table
+	lsl r0, #2
+	add r0, r1
+	ldr r0, [r0]
+	mov r2, #0
+	sub r2, #1
+	cmp r0, r2
+	beq check_walking_script
+	
+	bl execute_script
+	b return_false
+
+check_walking_script:
+	
+	ldrh r0, =WALK_SCRIPT_VAR
+	bl read_var
+	ldrh r0, [r0]
+	cmp r0, #0
+	beq return_false
+	sub r0, #1
+	ldr r1, script_walk_table
+	lsl r0, #2
+	add r0, r1
+	ldr r0, [r0]
+	mov r2, #0
+	sub r2, #1
+	cmp r0, r2
+	beq return_false
+	@@@EXECUTE WALKING SCRIPT HERE
+	bl execute_script
+
+return_false:
+	mov r0, #0
+	b end
+
+return_true:
+	mov r0, #1
+end:
+	pop {r5}
+	pop {r4}
+	pop {r1}
+	bx r1
+
+safari_step:
+	ldr r3, =0x080A0F0C|1
+	bx r3
+
+get_player_to:
+	ldr r3, =0x0805C538|1
+	bx r3
+
+check_block_role:
+	ldr r3, =0x08058F78|1
+	bx r3
+
+read_var:
+	ldr r3, =var_access
+	bx r3
+
+read_flag:
+	ldr r3, =flag_decrypt_func
+	bx r3
+	
+execute_script:
+	ldr r3, =0x08069AE4|1
+	bx r3
+
+.align 2
+behavior_walk_table:
+	.word 0x09700B20
+
+script_walk_table:
+	.word 0x09700F20

src/specials/camera_move.c

@@ -15,7 +15,7 @@ void update_screen_cam()
 	objc_exec();
 	obj_sync();
 	gpu_pal_upload();
-	gpu_sprites_upload();
+	obj_gpu_sprites_upload();
 }
 
 void sp_move_camera()

src/specials/cutscene_meteor.c

@@ -29,30 +29,30 @@ struct meteor_memory{
 
 static struct meteor_memory* memory = (struct meteor_memory*)(0x0203FFC0);
 
-static struct sprite sprite_meteor = {0, 0x8000, 0x800, 0x0};
+static struct obj_oam_attributes sprite_meteor = {0, 0x8000, 0x800, 0x0};
 
-static struct frame meteor_frames [4] = {
+static struct obj_frame meteor_frames [4] = {
 	{0, 10},
 	{16, 10},
 	{32, 10},
 	{0xFFFE, 0}
 };
 
-static struct frame* meteor_frames_a [1] = {
+static struct obj_frame* meteor_frames_a [1] = {
 	meteor_frames
 };
 
-static struct template template_meteor = {
+static struct obj_template template_meteor = {
 	TAG_METEOR,
 	TAG_METEOR,
 	&sprite_meteor,
 	meteor_frames_a,
 	0,
-	(rotscale_frame **) 0x08231CFC,
+	(struct obj_rotscale_frame **) 0x08231CFC,
 	meteor_callback
 };
 
-void meteor_callback(object* self)
+void meteor_callback(struct obj_entity* self)
 {
 	if(memory->meteor_moving > 0)
 	{
@@ -239,14 +239,14 @@ void setup_vram()
 
 	//setup oam
 	obj_delete_all();
-	resource gfx_meteor = {(void*)met_meteorTiles, 0x1C00, TAG_METEOR};
-	resource pal_meteor = {(void*)met_meteorPal, TAG_METEOR};
-	gpu_pal_obj_alloc_tag_and_apply(&pal_meteor);
-	gpu_tile_obj_decompress_alloc_tag_and_upload(&gfx_meteor);
+	struct obj_resource gfx_meteor = {(void*)met_meteorTiles, 0x1C00, TAG_METEOR};
+	struct obj_resource pal_meteor = {(void*)met_meteorPal, TAG_METEOR};
+	obj_gpu_pal_alloc_tag_and_apply(&pal_meteor);
+	obj_gpu_tile_decompress_alloc_tag_and_upload(&gfx_meteor);
 
-	u8 meteor_id = template_instanciate_forward_search(&template_meteor, 0, 100, 1);
-	objects[meteor_id].x = 200;
-	objects[meteor_id].y = 0;
+	u8 meteor_id = obj_template_instanciate_forward_search(&template_meteor, 0, 100, 1);
+	superstate.sprites[meteor_id].x = 200;
+	superstate.sprites[meteor_id].y = 0;
 
 	memory->animate_clouds = 1;
 }
@@ -258,7 +258,7 @@ void update_screen()
 	objc_exec();
 	obj_sync();
 	gpu_pal_upload();
-	gpu_sprites_upload();
+	obj_gpu_sprites_upload();
 	if(memory->cloud_animation_state == 0 && memory->animate_clouds != 0)
 	{
 		u16 sky_h = lcd_io_get(0x18);

src/specials/cutscene_meteor.h

@@ -12,7 +12,7 @@ void play_meteor();
 void setup_vram();
 void cutscene();
 void update_screen();
-void meteor_callback(object* self);
+void meteor_callback(struct obj_entity* self);
 void end_playback();
 
 #endif