added overworld processing code

gfx_build/overworlds/.gitignore

@@ -0,0 +1,2 @@
+*.s
+*.o

nbproject/configurations.xml

@@ -3775,6 +3775,7 @@
         </df>
         <df name="overworlds">
           <in>overworld.asm</in>
+          <in>trainer.asm</in>
         </df>
         <df name="pokemon_data">
           <in>altitude_table.asm</in>
@@ -4670,6 +4671,7 @@
         <df name="overworld">
           <in>overworld.c</in>
           <in>overworld_hooks.S</in>
+          <in>trainer_run.S</in>
         </df>
         <df name="player_interaction">
           <in>jump_behavior.S</in>
@@ -4727,7 +4729,7 @@
       <makefileType>
         <makeTool>
           <buildCommandWorkingDir>.</buildCommandWorkingDir>
-          <buildCommand>${MAKE} -f makefile LAN=DE -j8</buildCommand>
+          <buildCommand>${MAKE} -f makefile LAN=DE -j4</buildCommand>
           <cleanCommand>${MAKE} -f makefile clean</cleanCommand>
           <executablePath></executablePath>
         </makeTool>
@@ -23435,6 +23437,8 @@
       </item>
       <item path="patches/overworlds/overworld.asm" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="patches/overworlds/trainer.asm" ex="false" tool="4" flavor2="0">
+      </item>
       <item path="patches/pokemon_data/altitude_table.asm"
             ex="false"
             tool="4"
@@ -27344,6 +27348,8 @@
       </item>
       <item path="src/overworld/overworld_hooks.S" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="src/overworld/trainer_run.S" ex="false" tool="4" flavor2="0">
+      </item>
       <item path="src/player_interaction/jump_behavior.S"
             ex="false"
             tool="4"

nbproject/private/configurations.xml

@@ -51,6 +51,8 @@
       <df name="gfx_build">
         <df name="icons">
         </df>
+        <df name="overworlds">
+        </df>
         <df name="sprites">
           <df name="back_sprites">
             <in>normal_0000.s</in>
@@ -3852,6 +3854,7 @@
         </df>
         <df name="overworlds">
           <in>overworld.asm</in>
+          <in>trainer.asm</in>
         </df>
         <df name="pokemon_data">
           <in>altitude_table.asm</in>
@@ -3887,6 +3890,8 @@
       </df>
       <df name="sots-private">
         <df name="assets">
+          <df name="overworld">
+          </df>
           <df name="pkmn_icons">
           </df>
           <df name="pkmn_sprites">
@@ -5573,6 +5578,7 @@
         <df name="overworld">
           <in>overworld.c</in>
           <in>overworld_hooks.S</in>
+          <in>trainer_run.S</in>
         </df>
         <df name="player_interaction">
           <in>jump_behavior.S</in>
@@ -5593,8 +5599,14 @@
       </df>
       <df name="string">
         <df name="de">
+          <in>hazards.S</in>
+          <in>item_data.S</in>
+          <in>item_descriptions.S</in>
+          <in>move_descriptions.S</in>
           <in>move_descriptions.txt</in>
+          <in>move_names.S</in>
           <in>move_names.txt</in>
+          <in>move_strings.S</in>
         </df>
         <df name="en">
           <in>move_strings.txt</in>

patches/overworlds/trainer.asm

@@ -0,0 +1,6 @@
+.org 0x08081B84 
+ldr r1, =trainer_run_code+1
+bx r1
+.pool
+
+

sprites.makefile

@@ -19,6 +19,9 @@ SHINY_PAL_OBJ = $(addprefix $(GFX_BUILD_DIR)/sprites/shiny_pal/,$(notdir $(SHINY
 SPRITE_FRONT_OBJ = $(addprefix $(GFX_BUILD_DIR)/sprites/front_sprites/,$(notdir $(NORMAL_PNG:.png=.o)))
 SPRITE_BACK_OBJ = $(addprefix $(GFX_BUILD_DIR)/sprites/back_sprites/,$(notdir $(NORMAL_PNG:.png=.o)))
 
+OW_PNG = $(sort $(wildcard $(ASSET_ROOT)/overworld/*.png))
+OW_OBJ = $(addprefix $(GFX_BUILD_DIR)/overworlds/,$(notdir $(OW_PNG:.png=.o)))
+
 CASTFORM_PNG = $(ASSET_ROOT)/pkmn_sprites/castform/castform.png
 NORMAL_CASTFORM_PAL_OBJ = $(GFX_BUILD_DIR)/sprites/castform/castform_normal_pal.o
 SHINY_CASTFORM_PAL_OBJ = $(GFX_BUILD_DIR)/sprites/castform/castform_shiny_pal.o
@@ -35,8 +38,9 @@ clean:
 	rm -f $(GFX_BUILD_DIR)/sprites/shiny_pal/*
 	rm -f $(GFX_BUILD_DIR)/sprites/front_sprites/*
 	rm -f $(GFX_BUILD_DIR)/sprites/back_sprites/*
+	rm -f $(GFX_BUILD_DIR)/overworlds/*
 
-$(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ)
+$(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ)
 	rm -f $(TMP_FILE2)
 	rm -f $(TMP_FILE)
 	for file in $^;\
@@ -50,6 +54,13 @@ $(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRI
 	done
 	mv $(TMP_FILE) $@
 
+# OW Targets
+$(GFX_BUILD_DIR)/overworlds/%.o: $(GFX_BUILD_DIR)/overworlds/%.s
+	$(AS) -o $@ $<
+
+.PRECIOUS: $(GFX_BUILD_DIR)/overworlds/%.s
+$(GFX_BUILD_DIR)/overworlds/%.s: $(ASSET_ROOT)/overworld/%.png
+	grit $< -fts -fh! -gt -gB4 -gz! -p -pzl -m! -pu16
 
 # Normal Palette Targets
 $(GFX_BUILD_DIR)/sprites/normal_pal/%.o: $(GFX_BUILD_DIR)/sprites/normal_pal/%.s

src/overworld/trainer_run.S

@@ -0,0 +1,24 @@
+.align 2
+.thumb
+.text
+
+@TODO: pretty this up...
+.global trainer_run_code
+trainer_run_code:
+	.byte 240,181,  5, 28,  0,240, 40,248,  0, 46, 30,208,  0, 40, 30,208
+	.byte   7, 28,  0,240, 63,248,  1, 40, 23,208,  6,180, 32, 28,  0,240
+	.byte 101,248,  3, 28,  6,188,  0, 40, 15,208, 40, 28, 49, 28, 14,180
+	.byte   0,240, 52,248, 56, 28,  0,240, 85,248, 14,188, 89, 30, 32, 28
+	.byte   0,240, 88,248,  1, 32,240,189,  0,  0,  0, 32,240,189, 40, 28
+	.byte   0, 73,  8, 71,141, 27,  8,  8,  0,181, 12, 73,194,  0, 18, 24
+	.byte 146,  0, 82, 24, 20, 28, 16,122,  9, 73, 73,104, 10,120, 73,104
+	.byte  11,120,131, 66,  4,208, 24, 49,  1, 58,  0, 42,  4,208,247,231
+	.byte   2, 28,200,138, 14,105,  0,189,  0, 38,  0,189, 56,110,  3,  2
+	.byte 252,109,  3,  2,  0, 73,  8, 71,209,230,  6,  8, 16,181, 10, 75
+	.byte  26,112, 10, 76, 32,128, 10, 72, 65, 96, 10, 74,  2, 96, 37, 34
+	.byte   1, 56,  2,112,106, 34,  1, 56,  2,112,  0,240, 15,248,  6, 73
+	.byte   1, 32,  8,112, 16,189,  0,  0,116, 80,  0,  3,210,112,  3,  2
+	.byte 244,252,  3,  2, 55,  0, 39,  5,156, 15,  0,  3,  0, 73,  8, 71
+	.byte 229,154,  6,  8,  0, 73,  8, 71,129,230,  6,  8
+
+