fix header

nbproject/configurations.xml

@@ -2,31 +2,6 @@
 <configurationDescriptor version="100">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="." name="0">
-      <df name="data">
-        <df name="overworld">
-          <in>wild_pokemon_data.S</in>
-        </df>
-        <df name="trainer">
-          <in>trainer_money_rate.s</in>
-          <in>trainer_pkmn_data.s</in>
-        </df>
-      </df>
-      <df name="patches">
-        <df name="graphics">
-          <in>boot.asm</in>
-          <in>char.asm</in>
-          <in>title.asm</in>
-        </df>
-        <df name="overworlds">
-          <in>pkm_wild.asm</in>
-        </df>
-        <df name="pokemon_data">
-          <in>pokemon_evolution.asm</in>
-        </df>
-        <df name="trainer_sprites">
-          <in>trainer_data.asm</in>
-        </df>
-      </df>
       <df name="sots-private">
         <df name="sound">
           <df name="Assembler">
@@ -93,7 +68,6 @@
             </df>
             <in>ascii.c</in>
           </df>
-          <in>agb_debug.h</in>
         </df>
         <df name="interface">
           <in>textbox_mugshots.c</in>
@@ -178,18 +152,6 @@
           <in>trainer_battle.c</in>
         </df>
       </df>
-      <df name="string">
-        <df name="de">
-          <df name="pkmn_data">
-            <in>pokedex_data.txt</in>
-            <in>pokedex_entries.txt</in>
-          </df>
-          <df name="trainers">
-            <in>trainer_data.txt</in>
-            <in>trainerclasses.txt</in>
-          </df>
-        </df>
-      </df>
     </df>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -235,12 +197,6 @@
           <preBuildCommand></preBuildCommand>
         </preBuild>
       </makefileType>
-      <item path="data/overworld/wild_pokemon_data.S" ex="false" tool="4" flavor2="0">
-      </item>
-      <item path="data/trainer/trainer_money_rate.s" ex="false" tool="4" flavor2="0">
-      </item>
-      <item path="data/trainer/trainer_pkmn_data.s" ex="false" tool="4" flavor2="0">
-      </item>
       <folder path="0/sots-private/sound/Assembler">
         <cTool>
           <incDir>
@@ -266,24 +222,237 @@
           </preprocessorList>
         </cTool>
       </folder>
-      <item path="patches/graphics/boot.asm" ex="false" tool="4" flavor2="0">
-      </item>
-      <item path="patches/graphics/char.asm" ex="false" tool="4" flavor2="0">
-      </item>
-      <item path="patches/graphics/title.asm" ex="false" tool="4" flavor2="0">
-      </item>
-      <item path="patches/overworlds/pkm_wild.asm" ex="false" tool="4" flavor2="0">
-      </item>
-      <item path="patches/pokemon_data/pokemon_evolution.asm"
-            ex="false"
-            tool="4"
-            flavor2="0">
-      </item>
-      <item path="patches/trainer_sprites/trainer_data.asm"
-            ex="false"
-            tool="4"
-            flavor2="0">
-      </item>
+      <folder path="0/src/agb_debug">
+        <cTool>
+          <incDir>
+            <pElem>src/agb_debug</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/assets">
+        <cTool>
+          <incDir>
+            <pElem>src/assets/meteor</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/battle_engine">
+        <cTool>
+          <incDir>
+            <pElem>src/battle_engine</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/debug">
+        <cTool>
+          <incDir>
+            <pElem>src/debug</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/dns">
+        <cTool>
+          <incDir>
+            <pElem>src/dns</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/encode">
+        <cTool>
+          <incDir>
+            <pElem>src/encode</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/evolution">
+        <cTool>
+          <incDir>
+            <pElem>src/evolution</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/include/assets/mug">
+        <cTool>
+          <incDir>
+            <pElem>src/include/assets/mug</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/interface">
+        <cTool>
+          <incDir>
+            <pElem>src/interface</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/ability_changers">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/ability_changers</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/assurance">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/assurance</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/bride">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/bride</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/close_combat">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/close_combat</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/crush_grip_like">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/crush_grip_like</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/defog">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/defog</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/feint">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/feint</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/gastro_acid">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/gastro_acid</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/healing_wish">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/healing_wish</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/lucky_chant">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/lucky_chant</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/magnet_rise">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/magnet_rise</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/metal_burst">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/metal_burst</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/pay_back">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/pay_back</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/power_trick">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/power_trick</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/punishment">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/punishment</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/rooms">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/rooms</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/roost">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/roost</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/split_moves">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/split_moves</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/swap_moves">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/swap_moves</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/tailwind">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/tailwind</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/moves/veno_shock">
+        <cTool>
+          <incDir>
+            <pElem>src/moves/veno_shock</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/music">
+        <cTool>
+          <incDir>
+            <pElem>src/music</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/overworld">
+        <cTool>
+          <incDir>
+            <pElem>src/overworld</pElem>
+          </incDir>
+        </cTool>
+      </folder>
+      <folder path="0/src/specials">
+        <cTool>
+          <incDir>
+            <pElem>src/specials</pElem>
+          </incDir>
+        </cTool>
+      </folder>
       <item path="sots-private/sound/Assembler/musicInjector.c"
             ex="false"
             tool="0"
@@ -323,7 +492,7 @@
           </incDir>
         </cTool>
       </item>
-      <item path="src/agb_debug/agb_debug.c" ex="false" tool="0" flavor2="0">
+      <item path="src/agb_debug/agb_debug.c" ex="false" tool="0" flavor2="3">
       </item>
       <item path="src/assets/meteor/met_background.c" ex="false" tool="0" flavor2="3">
         <cTool flags="0">
@@ -397,12 +566,13 @@
         <cTool flags="0">
         </cTool>
       </item>
-      <item path="src/evolution/evolution_methods.c" ex="false" tool="0" flavor2="0">
-      </item>
-      <item path="src/include/agb_debug.h" ex="false" tool="3" flavor2="0">
+      <item path="src/evolution/evolution_methods.c" ex="false" tool="0" flavor2="3">
       </item>
       <item path="src/include/assets/ascii.c" ex="false" tool="0" flavor2="3">
         <cTool flags="0">
+          <incDir>
+            <pElem>src/include/assets</pElem>
+          </incDir>
         </cTool>
       </item>
       <item path="src/include/assets/mug/mug_00.c" ex="false" tool="0" flavor2="3">
@@ -598,26 +768,6 @@
         <cTool flags="0">
         </cTool>
       </item>
-      <item path="string/de/pkmn_data/pokedex_data.txt"
-            ex="false"
-            tool="4"
-            flavor2="0">
-      </item>
-      <item path="string/de/pkmn_data/pokedex_entries.txt"
-            ex="false"
-            tool="4"
-            flavor2="0">
-      </item>
-      <item path="string/de/trainers/trainer_data.txt"
-            ex="false"
-            tool="4"
-            flavor2="0">
-      </item>
-      <item path="string/de/trainers/trainerclasses.txt"
-            ex="false"
-            tool="4"
-            flavor2="0">
-      </item>
     </conf>
   </confs>
 </configurationDescriptor>

nbproject/private/Default.properties

@@ -1,56 +0,0 @@
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/encode/crc32.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/encode/crc32.c -o object/src/encode/crc32.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/mug/mug_05.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/mug/mug_05.c -o object/src/include/assets/mug/mug_05.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/mug/mug_01.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/mug/mug_01.c -o object/src/include/assets/mug/mug_01.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/mug/mug_09.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/mug/mug_09.c -o object/src/include/assets/mug/mug_09.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/mug/mug_07.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/mug/mug_07.c -o object/src/include/assets/mug/mug_07.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/mug/mug_10.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/mug/mug_10.c -o object/src/include/assets/mug/mug_10.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/mug/mug_02.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/mug/mug_02.c -o object/src/include/assets/mug/mug_02.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/mug/mug_00.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/mug/mug_00.c -o object/src/include/assets/mug/mug_00.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/mug/mug_08.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/mug/mug_08.c -o object/src/include/assets/mug/mug_08.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/mug/mug_06.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/mug/mug_06.c -o object/src/include/assets/mug/mug_06.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/mug/mug_11.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/mug/mug_11.c -o object/src/include/assets/mug/mug_11.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/include/assets/ascii.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/include/assets/ascii.c -o object/src/include/assets/ascii.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/debug/debug.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/debug/debug.c -o object/src/debug/debug.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/music/music_override.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/music/music_override.c -o object/src/music/music_override.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/assets/meteor/met_foreground.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/assets/meteor/met_foreground.c -o object/src/assets/meteor/met_foreground.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/assets/meteor/met_clouds.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/assets/meteor/met_clouds.c -o object/src/assets/meteor/met_clouds.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/assets/meteor/met_meteor.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/assets/meteor/met_meteor.c -o object/src/assets/meteor/met_meteor.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/assets/meteor/met_sky.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/assets/meteor/met_sky.c -o object/src/assets/meteor/met_sky.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/assets/meteor/met_background.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/assets/meteor/met_background.c -o object/src/assets/meteor/met_background.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/specials/cutscene_meteor.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/specials/cutscene_meteor.c -o object/src/specials/cutscene_meteor.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/specials/load_text_special.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/specials/load_text_special.c -o object/src/specials/load_text_special.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/specials/camera_move.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/specials/camera_move.c -o object/src/specials/camera_move.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/specials/custom_specials.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/specials/custom_specials.c -o object/src/specials/custom_specials.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/specials/trainer_battle.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/specials/trainer_battle.c -o object/src/specials/trainer_battle.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/battle_engine/entry_hazards.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/battle_engine/entry_hazards.c -o object/src/battle_engine/entry_hazards.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/battle_engine/battle_test.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/battle_engine/battle_test.c -o object/src/battle_engine/battle_test.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/battle_engine/battle_abilities.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/battle_engine/battle_abilities.c -o object/src/battle_engine/battle_abilities.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/battle_engine/custom_structs_malloc.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/battle_engine/custom_structs_malloc.c -o object/src/battle_engine/custom_structs_malloc.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/battle_engine/battle_help.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/battle_engine/battle_help.c -o object/src/battle_engine/battle_help.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/battle_engine/battle_end_of_turn.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/battle_engine/battle_end_of_turn.c -o object/src/battle_engine/battle_end_of_turn.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/battle_engine/battle_initiative.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/battle_engine/battle_initiative.c -o object/src/battle_engine/battle_initiative.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/bride/bride.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/bride/bride.c -o object/src/moves/bride/bride.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/rooms/rooms.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/rooms/rooms.c -o object/src/moves/rooms/rooms.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/veno_shock/venoshock_has_multiplier.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/veno_shock/venoshock_has_multiplier.c -o object/src/moves/veno_shock/venoshock_has_multiplier.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/tailwind/tailwind.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/tailwind/tailwind.c -o object/src/moves/tailwind/tailwind.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/split_moves/split_moves.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/split_moves/split_moves.c -o object/src/moves/split_moves/split_moves.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/roost/roost.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/roost/roost.c -o object/src/moves/roost/roost.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/magnet_rise/magnet_rise.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/magnet_rise/magnet_rise.c -o object/src/moves/magnet_rise/magnet_rise.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/defog/defog.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/defog/defog.c -o object/src/moves/defog/defog.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/metal_burst/metal_burst.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/metal_burst/metal_burst.c -o object/src/moves/metal_burst/metal_burst.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/assurance/assurance.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/assurance/assurance.c -o object/src/moves/assurance/assurance.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/gastro_acid/gastro_acid.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/gastro_acid/gastro_acid.c -o object/src/moves/gastro_acid/gastro_acid.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/punishment/punishment.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/punishment/punishment.c -o object/src/moves/punishment/punishment.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/close_combat/close_combat.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/close_combat/close_combat.c -o object/src/moves/close_combat/close_combat.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/lucky_chant/lucky_chant.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/lucky_chant/lucky_chant.c -o object/src/moves/lucky_chant/lucky_chant.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/ability_changers/ability_change.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/ability_changers/ability_change.c -o object/src/moves/ability_changers/ability_change.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/healing_wish/healing_wish.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/healing_wish/healing_wish.c -o object/src/moves/healing_wish/healing_wish.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/feint/feint.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/feint/feint.c -o object/src/moves/feint/feint.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/pay_back/pay_back.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/pay_back/pay_back.c -o object/src/moves/pay_back/pay_back.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/power_trick/power_trick.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/power_trick/power_trick.c -o object/src/moves/power_trick/power_trick.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/swap_moves/swap_moves.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/swap_moves/swap_moves.c -o object/src/moves/swap_moves/swap_moves.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/moves/crush_grip_like/hp_damage_mod.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/moves/crush_grip_like/hp_damage_mod.c -o object/src/moves/crush_grip_like/hp_damage_mod.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/dns/dns_core.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/dns/dns_core.c -o object/src/dns/dns_core.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/overworld/grass_animation.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/overworld/grass_animation.c -o object/src/overworld/grass_animation.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/overworld/overworld.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/overworld/overworld.c -o object/src/overworld/overworld.o
-D:/cygwin/home/Philipp/sots/source_of_the_sovereign/src/interface/textbox_mugshots.c=D:/cygwin/home/Philipp/sots/source_of_the_sovereign#-mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -O3 -std=c99 -Wall -Isrc/include -DBPRE -DSOFTWARE_VERSION=0 -c src/interface/textbox_mugshots.c -o object/src/interface/textbox_mugshots.o

src/include/game_engine.h

@@ -84,6 +84,23 @@ extern void flag_clear(u16 flag);
  */
 extern u32 pokemon_get_attribute(struct pokemon* poke_address, u8 request, void* destination);
 
+struct move_data {
+    u8 effect;
+    u8 damage;
+    u8 type;
+    u8 accuracy;
+    u8 pp;
+    u8 effect_accuracy;
+    u8 target;
+    s8 priority;
+    u8 flags;
+    u8 arg1;
+    u8 split;
+    u8 arg3;
+};
+
+extern struct move_data move_table[676];
+
 /**
  * @brief sets attribute of pokémon
  * @param poke_address address to pokémon structure

src/include/moves.h

@@ -631,22 +631,4 @@
 #define MOVE_ZAP_CANNON 0xC0
 #define MOVE_ZEN_HEADBUTT 0x1AC
 
-struct move_data
-{
-    u8 effect;
-    u8 damage;
-    u8 type;
-    u8 accuracy;
-    u8 pp;
-    u8 effect_accuracy;
-    u8 target;
-    s8 priority;
-    u8 flags;
-    u8 arg1;
-    u8 split;
-    u8 arg3;
-};
-
-extern struct move_data move_table[676];
-
 #endif /* MOVE_IDS_H */