text system, some images, some section fixes

05117n complete

bpre.sym

@@ -139,6 +139,20 @@ side_affecting_halfword = 0x2023DDE;
 battle_turn_order = 0x02023bde;
 battle_status_3 = 0x02023DFC;
 
+battle_80801F0_something = 0x080801F0|1;
+battle_init = 0x08080110|1;
+
+trainerbattle_battle_type = 0x020386AC;
+trainerbattle_flag_id = 0x020386AE;
+trainerbattle_arg2 = 0x020386B0;
+trainerbattle_message_intro = 0x020386B4;
+trainerbattle_message_defeat = 0x020386B8;
+trainerbattle_message_2 = 0x020386BC;
+trainerbattle_message_need_2_poke = 0x020386C0;
+trainerbattle_next_scr_cmd = 0x020386C4;
+trainerbattle_message_4 = 0x020386C8;
+trainerbattle_unknown = 0x020386CC;
+
 item_get_quality = 0x0809A948|1;
 item_get_x12 = 0x0809A924|1;
 

data/item/item_gfx.S

@@ -1,5 +1,5 @@
 #define ITEM_GFX_0	.word 0x08E87028, 0x08E8730C
-.section .rodata
+.text
 .align 2
 .thumb
 

data/item/item_scripts.S

@@ -1,5 +1,5 @@
 .align 2
-
+.text 
 .global item_flagtable
 item_flagtable:
 

data/overworld/overworld_data.S

@@ -1,5 +1,5 @@
 .thumb
-.section .rodata
+.text
 
 .global ow_data_0
 .global ow_data_1

data/overworld/overworld_frames.S

@@ -1,5 +1,5 @@
 .thumb
-.section .rodata
+.text
 
 .global ow_frames_0
 .global ow_frames_1

data/overworld/overworld_pal_table.S

@@ -1,5 +1,5 @@
 .thumb
-.section .rodata
+.text
 .align 2
 
 .global ow_pal_table

data/raw_defines.s

@@ -1,6 +1,6 @@
 .align 2
 .thumb
-.section .rodata
+.text
 
 .global objects
 objects:

data/text_lookup/text_lookup_array.s

@@ -1,99 +1,5 @@
 .align 2
 .text
-.thumb
-
-.global get_text_pointer_from_lookup
-get_text_pointer_from_lookup:
-push {r4-r5, lr}
-ldr r0, =str_invalid_text
-b valid_text_two
-@delete those two lines to activate the system
-
-ldr r0, =sav_one
-ldr r0, [r0]
-ldrb r4, [r0, #4] @r4 = bank
-ldrb r5, [r0, #5] @r5 = map
-ldrh r0, =0x800F
-ldr r2, =var_get
-bl bxr2 @r0 = person id
-ldr r1, =text_lookup_array
-lsl r3, r4, #2
-add r1, r3
-ldr r1, [r1]    @load bank
-lsl r3, r5, #2
-add r1, r3
-ldr r1, [r1]    @load map
-add r1, #4      @skip the global map pointer
-lsl r3, r0, #2
-add r1, r3
-ldr r1, [r1]    @load person
-mov r4, r1
-ldrh r0, =0x500C
-ldr r2, =var_get
-bl bxr2
-lsl r0, #2
-add r1, r0, r4
-ldr r0, [r1, #0] @load specific ID
-lsr r1, r0, #0x18
-cmp r1, #8
-beq valid_text_two
-cmp r1, #9
-beq valid_text_two
-ldr r0, =str_invalid_text
-valid_text_two:
-ldr r1, lp_offset
-str r0, [r1]
-pop {r4-r5}
-pop {r1}
-bx r1
-
-.global get_map_pointer_from_lookup
-get_map_pointer_from_lookup:
-push {r4-r5, lr}
-ldr r0, =str_invalid_text
-b valid_text_one
-@delete those two lines to activate the system
-
-ldr r0, =sav_one
-ldr r0, [r0]
-ldrb r4, [r0, #4] @r4 = bank
-ldrb r5, [r0, #5] @r5 = map
-ldr r1, =text_lookup_array
-lsl r3, r4, #2
-add r1, r3
-ldr r1, [r1]    @load bank
-lsl r3, r5, #2
-add r1, r3
-ldr r1, [r1]    @load map
-ldr r4, [r1]    @map specific text array
-ldrh r0, =0x500C
-ldr r2, =var_get
-bl bxr2
-lsl r0, #2
-add r1, r0, r4
-ldr r0, [r1, #0] @load specific ID
-lsr r1, r0, #0x18
-cmp r1, #8
-beq valid_text_one
-cmp r1, #9
-beq valid_text_one
-ldr r0, =str_invalid_text
-valid_text_one:
-ldr r1, lp_offset
-str r0, [r1]
-pop {r4-r5}
-pop {r1}
-bx r1
-
-bxr2:
-bx r2
-
-.align 2
-lp_offset:
-    .word 0x03000F14
-
-.align 2
-.section .rodata
 .global text_lookup_array
 text_lookup_array:
     .word text_bank_zero
@@ -105,8 +11,13 @@ text_lookup_array:
     .word 0xDEADBEEF
 
 text_bank_zero:
+    .word text_bank_zero_map_zero
+    .word 0xDEADBEEF
 text_bank_one:
 text_bank_two:
+    .word text_bank_two_map_zero
+    .word 0xDEADBEEF
+
 text_bank_three:
 text_bank_four:
     .word text_bank_zero_map_zero
@@ -117,38 +28,49 @@ text_bank_five:
     .word 0xDEADBEEF
 
 text_bank_zero_map_zero:
-text_bank_zero_map_one:
     .word text_bank_zero_map_zero_global
-    .word text_bank_zero_amp_zero_ev_one
-    .word text_bank_zero_amp_zero_ev_two
-    .word text_bank_zero_amp_zero_ev_three
-    .word text_bank_zero_amp_zero_ev_four
-    .word text_bank_zero_amp_zero_ev_five
-    .word text_bank_zero_amp_zero_ev_six
-    .word text_bank_zero_amp_zero_ev_seven
+text_bank_zero_map_one:
     .word 0xDEADBEEF
 
-text_bank_zero_amp_zero_ev_one:
-text_bank_zero_amp_zero_ev_two:
-text_bank_zero_amp_zero_ev_three:
-text_bank_zero_amp_zero_ev_four:
-text_bank_zero_amp_zero_ev_five:
-text_bank_zero_amp_zero_ev_six:
-text_bank_zero_amp_zero_ev_seven:
-    .word str_person_test
+text_bank_two_map_zero:
+    .word text_bank_two_map_zero_global
+    .word 0xDEADBEEF
+
+text_bank_five_map_zero:
+    .word text_bank_five_map_zero_global
     .word 0xDEADBEEF
 
 text_bank_zero_map_zero_global:
-    .word str_person_test
-    .word str_person_zero
+    .word str_hesp_out_g_0
+    .word str_hesp_out_g_1
+    .word str_hesp_out_g_2
+    .word str_hesp_out_g_3
+    .word str_hesp_out_g_4
+    .word str_hesp_out_g_5
+    .word str_hesp_out_g_6
+    .word str_hesp_out_g_7
+    .word str_hesp_out_g_8
+    .word str_hesp_out_g_9
+    .word str_hesp_out_g_10
+    .word str_hesp_out_g_11
+    .word str_hesp_out_g_12
+    .word str_hesp_out_g_13
+    .word str_hesp_out_g_14
+    .word str_hesp_out_g_15
+    .word str_hesp_out_g_16
+    .word str_hesp_out_g_17
+    .word str_hesp_out_g_18
+    .word str_hesp_out_g_19
+    .word str_hesp_out_g_20
+    .word str_hesp_out_g_21
+    .word str_hesp_out_g_22
     .word 0xDEADBEEF
 
-text_bank_five_map_zero:
-    .word text_bank_five_map_zero_global
+text_bank_two_map_zero_global:
+    .word str_hesp_20_g_0
     .word 0xDEADBEEF
 
 text_bank_five_map_zero_global:
-    .word str_tundra_hq_name
     .word str_tundra_hq_0
     .word str_tundra_hq_1
     .word str_tundra_hq_2
@@ -161,4 +83,9 @@ text_bank_five_map_zero_global:
     .word str_tundra_hq_9
     .word str_tundra_hq_10
     .word str_tundra_hq_11
-    .word str_tundra_hq_12
+    .word str_tundra_hq_12
+    .word 0xDEADBEEF
+
+.global text_lookup_table
+text_lookup_table:
+    .word text_lookup_array

data/text_lookup/text_lookup_trainer.s

@@ -0,0 +1,32 @@
+.align 2
+.thumb
+.text
+
+.global trainer_text_table
+trainer_text_table:
+    .word trainer_texts_0
+    .word trainer_texts_1
+    .word trainer_texts_2
+    .word trainer_texts_3
+    .word trainer_texts_4
+    .word trainer_texts_5
+    .word 0xDEADBEEF
+.align 2
+
+trainer_texts_0:
+    .word str_t0_intro
+    .word str_t0_defeat
+    .word 0xDEADBEEF
+trainer_texts_1:
+trainer_texts_2:
+trainer_texts_3:
+trainer_texts_4:
+trainer_texts_5:
+    .word 0xDEADBEEF
+
+.align 2
+.global trainer_text_array
+trainer_text_array:
+    .word trainer_text_table
+
+

data/text_lookup/text_multichoice.s

@@ -1,4 +1,4 @@
-.section .rodata
+.text
 .align 2
 
 .thumb

data/trainer_sprites/ts_alt.s

@@ -0,0 +1,256 @@
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0
+.hword	0x108, 0

gfx_build/trainer_sprites/.gitignore

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

main.asm

@@ -36,6 +36,8 @@
 
 .include "patches/overworlds/overworld.asm"
 
+.include "patches/trainer_sprites/images.asm"
+
 .include "patches/interface.asm"
 
 .include "patches/battle_engine/malloc.asm"
@@ -43,6 +45,9 @@
 
 .include "patches/text_system.asm"
 
+.org 0x0815F9B8
+    .word 0x08069ED5 // fix nop1 for now...
+
 .org 0x09000000
 .importobj "object/linked.o"
 .close

nbproject/configurations.xml

@@ -5,11 +5,21 @@
       <df name="data">
         <df name="text_lookup">
           <in>text_lookup_array.s</in>
+          <in>text_lookup_trainer.s</in>
           <in>text_multichoice.s</in>
         </df>
+        <df name="trainer_sprites">
+          <in>ts_alt.s</in>
+          <in>ts_pal.s</in>
+          <in>ts_tiles.s</in>
+        </df>
         <in>raw_defines.s</in>
       </df>
       <df name="patches">
+        <df name="trainer_sprites">
+          <in>altitude.asm</in>
+          <in>images.asm</in>
+        </df>
         <in>interface.asm</in>
         <in>text_system.asm</in>
       </df>
@@ -143,16 +153,24 @@
           <in>custom_specials.c</in>
           <in>cutscene_meteor.c</in>
           <in>load_text_special.c</in>
+          <in>trainer_battle.c</in>
         </df>
       </df>
       <df name="string">
         <df name="de">
           <df name="story_text">
+            <df name="hesperia">
+              <in>globals.txt</in>
+              <in>player_house.txt</in>
+            </df>
             <df name="tundra_hq">
               <in>globals.txt</in>
             </df>
           </df>
-          <in>text.txt</in>
+          <df name="trainers">
+            <in>test_trainers.txt</in>
+          </df>
+          <in>invalid.txt</in>
           <in>text_multichoices.txt</in>
         </df>
       </df>
@@ -202,11 +220,22 @@
             tool="4"
             flavor2="0">
       </item>
+      <item path="data/text_lookup/text_lookup_trainer.s"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="data/text_lookup/text_multichoice.s"
             ex="false"
             tool="4"
             flavor2="0">
       </item>
+      <item path="data/trainer_sprites/ts_alt.s" ex="false" tool="4" flavor2="0">
+      </item>
+      <item path="data/trainer_sprites/ts_pal.s" ex="false" tool="4" flavor2="0">
+      </item>
+      <item path="data/trainer_sprites/ts_tiles.s" ex="false" tool="4" flavor2="0">
+      </item>
       <folder path="0/sots-private">
         <cTool>
           <incDir>
@@ -466,6 +495,13 @@
       </item>
       <item path="patches/text_system.asm" ex="false" tool="4" flavor2="0">
       </item>
+      <item path="patches/trainer_sprites/altitude.asm"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
+      <item path="patches/trainer_sprites/images.asm" ex="false" tool="4" flavor2="0">
+      </item>
       <item path="sots-private/sound/Assembler/musicInjector.c"
             ex="false"
             tool="0"
@@ -644,15 +680,32 @@
       </item>
       <item path="src/specials/load_text_special.c" ex="false" tool="0" flavor2="0">
       </item>
-      <item path="string/de/story_text/tundra_hq/globals.txt"
+      <item path="src/specials/trainer_battle.c" ex="false" tool="0" flavor2="0">
+      </item>
+      <item path="string/de/invalid.txt" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="string/de/story_text/hesperia/globals.txt"
+            ex="false"
+            tool="3"
+            flavor2="0">
+      </item>
+      <item path="string/de/story_text/hesperia/player_house.txt"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="string/de/text.txt" ex="false" tool="3" flavor2="0">
+      <item path="string/de/story_text/tundra_hq/globals.txt"
+            ex="false"
+            tool="3"
+            flavor2="0">
       </item>
       <item path="string/de/text_multichoices.txt" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="string/de/trainers/test_trainers.txt"
+            ex="false"
+            tool="3"
+            flavor2="0">
+      </item>
     </conf>
   </confs>
 </configurationDescriptor>

nbproject/private/private.xml

@@ -19,43 +19,12 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/battle_engine/battle_help.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/moves.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/battle_engine/custom_structs_malloc.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/specials/cutscene_meteor.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/battle.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/makefile</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/battle_script.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/memory.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/overworld/overworld.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/battle_locations.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/attack_names.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/battle_abilities.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/pkmn_abilities.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/game_engine.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/battle_engine/battle_initiative.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/interface/textbox_mugshots.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/patches/hooks.asm</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/battle_engine/battle_abilities.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/types.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/battle_test.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/battle_initiative.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/pkmn_item_effects.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/moves/ability_changers/ability_change.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/specials/custom_specials.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/pkmn_attributes.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/lcd.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/math.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/moves/feint/feint.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/battle_help.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/battle_engine/battle_test.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/specials/camera_move.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/debug.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/de/item_data.txt</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/include/battle_structs.h</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/debug/debug.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/battle_engine/entry_hazards.c</file>
-            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/src/moves/assurance/assurance.c</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/assets.makefile</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/de/story_text/hesperia/player_house.txt</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/data/text_lookup/text_lookup_array.s</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/table.tbl</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/de/story_text/hesperia/globals.txt</file>
+            <file>file:/C:/cygwin64/home/Philipp/sots/engine/source_of_the_sovereign/string/de/story_text/tundra_hq/globals.txt</file>
         </group>
     </open-files>
 </project-private>

patches/dns/core.asm

@@ -1,22 +1,22 @@
 .org 0x08059A90
-    ldr r3, =dns_mapdata_load_palette_one+1
-    bx r3
-    .pool
+    //ldr r3, =dns_mapdata_load_palette_one+1
+   // bx r3
+    //.pool
 
 .org 0x08059AA0
-    ldr r3, =dns_mapdata_load_palette_two+1
-    bx r3
-    .pool
+    //ldr r3, =dns_mapdata_load_palette_two+1
+    //bx r3
+    //.pool
 
 .org 0x0805F538
-    ldr r2, =dns_pal_patch_for_npc+1
-    bx r2
-    .pool
+    //ldr r2, =dns_pal_patch_for_npc+1
+    //bx r2
+    //.pool
 
 .org 0x08083614
-    ldr r1, =dns_overworld_anim_load_pal+1
-    bx r1
-    .pool
+    //ldr r1, =dns_overworld_anim_load_pal+1
+    //bx r1
+    //.pool
 
 .org 0x08056578
     //ldr r0, =dns_cb_overworld_hacked+1

patches/special.asm

@@ -2,10 +2,10 @@
 .word sp_special_casm|1
 
 .org 0x0815FD60 + (4*0x69)
-.word get_text_pointer_from_lookup|1
+.word sp_load_text_person|1
 
 .org 0x0815FD60 + (4*0x6A)
-.word get_map_pointer_from_lookup|1
+.word sp_load_text_map|1
 
 .org 0x0815FD60 + (4*0x6B)
 .word sp_clear_variables|1

patches/text_system.asm

@@ -4,4 +4,7 @@
 .org 0x0809CFD4
 .word multichoice_array
 
-
+.org 0x08080228
+    ldr r1, =tb_configure_by_script+1
+    bx r1
+    .pool

patches/trainer_sprites/altitude.asm

@@ -0,0 +1,11 @@
+.org 0x08037E78
+    .word ts_alt_table
+
+.org 0x0803804C
+    .word ts_alt_table
+
+.org 0x0803CAD4
+    .word ts_alt_table
+
+.org 0x08158514
+    .word ts_alt_table

patches/trainer_sprites/images.asm

@@ -0,0 +1,60 @@
+.org 0x0803473C 
+.word ts_image_maintable
+ 
+.org 0x080347A4 
+.word ts_image_maintable
+ 
+.org 0x08037E8C 
+.word ts_image_maintable
+ 
+.org 0x08038060 
+.word ts_image_maintable
+ 
+.org 0x0803CAE8 
+.word ts_image_maintable
+ 
+.org 0x080838E4 
+.word ts_image_maintable
+ 
+.org 0x08083928 
+.word ts_image_maintable
+ 
+.org 0x0810BC3C 
+.word ts_image_maintable
+ 
+.org 0x08158528 
+.word ts_image_maintable
+
+
+.org 0x0803474C 
+.word ts_pal_maintable
+ 
+.org 0x080347A0 
+.word ts_pal_maintable
+ 
+.org 0x08037E88 
+.word ts_pal_maintable
+ 
+.org 0x0803805C 
+.word ts_pal_maintable
+ 
+.org 0x0803CAE4 
+.word ts_pal_maintable
+ 
+.org 0x080838E0 
+.word ts_pal_maintable
+ 
+.org 0x0808392C 
+.word ts_pal_maintable
+ 
+.org 0x0810BD1C 
+.word ts_pal_maintable
+ 
+.org 0x0810BD3C 
+.word ts_pal_maintable
+ 
+.org 0x0810BD7C 
+.word ts_pal_maintable
+ 
+.org 0x08158524 
+.word ts_pal_maintable

sprites.makefile

@@ -22,6 +22,9 @@ SPRITE_BACK_OBJ = $(addprefix $(GFX_BUILD_DIR)/sprites/back_sprites/,$(notdir $(
 OW_PNG = $(sort $(wildcard $(ASSET_ROOT)/overworld/*.png))
 OW_OBJ = $(addprefix $(GFX_BUILD_DIR)/overworlds/,$(notdir $(OW_PNG:.png=.o)))
 
+TS_PNG = $(sort $(wildcard $(ASSET_ROOT)/trainer_sprites/*.png))
+TS_OBJ = $(addprefix $(GFX_BUILD_DIR)/trainer_sprites/,$(notdir $(TS_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
@@ -40,7 +43,7 @@ clean:
 	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) $(OW_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) $(TS_OBJ)
 	rm -f $(TMP_FILE2)
 	rm -f $(TMP_FILE)
 	for file in $^;\
@@ -62,6 +65,14 @@ $(GFX_BUILD_DIR)/overworlds/%.o: $(GFX_BUILD_DIR)/overworlds/%.s
 $(GFX_BUILD_DIR)/overworlds/%.s: $(ASSET_ROOT)/overworld/%.png
 	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
+	$(AS) -o $@ $<
+
+.PRECIOUS: $(GFX_BUILD_DIR)/trainer_sprites/%.s
+$(GFX_BUILD_DIR)/trainer_sprites/%.s: $(ASSET_ROOT)/trainer_sprites/%.png
+	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
 	$(AS) -o $@ $<

src/include/assets/interface/arrows.img.h

@@ -7,7 +7,7 @@
 //	+ 24 tiles not compressed
 //	Total size: 768 = 768
 //
-//	Time-stamp: 2017-01-01, 16:49:47
+//	Time-stamp: 2017-01-04, 23:39:13
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

src/include/assets/interface/emoticons.img.h

@@ -7,7 +7,7 @@
 //	+ 60 tiles not compressed
 //	Total size: 1920 = 1920
 //
-//	Time-stamp: 2017-01-01, 16:49:47
+//	Time-stamp: 2017-01-04, 23:39:13
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //

src/specials/custom_specials.c

@@ -71,7 +71,6 @@ static callback special_routines[6] = {
     sp_init_script,
     debug_some_test,
     sp_dns_switch,
-    get_text_pointer_from_lookup+1,
 };
 
 /* === IMPLEMENTATIONS === */

src/specials/load_text_special.c

@@ -1,12 +1,160 @@
+/****************************************************************************
+ * 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 Sovereign of the Skies.                             *
+ *   If not, see <http://www.gnu.org/licenses/>.                            *
+ ****************************************************************************/
+
+/**
+ * @file load_text_special.c
+ * @author Sturmvogel
+ * @date 05 Jan 2016
+ * @brief special 0x69 0x6A
+ * 
+ * Implements a new way to load text for more language compatability and code
+ * interchangability.
+ */
+
+/* === INCLUDE === */
 #include <types.h>
 #include <game_engine.h>
 #include <config.h>
-extern char** text_lookup_array;   
+
+/* === STRUCTURES === */
+struct lt_point
+{
+    u16 x;
+    u16 y;
+};
+
+struct lt_warpdata
+{
+    u8 bank;
+    u8 map;
+    u8 warpid;
+    u8 unknown;
+    u16 enter_x;
+    u16 enter_y;
+};
+
+struct sav_struct
+{
+    struct lt_point position;
+    struct lt_warpdata location;
+};
+
+/* === PROTOTYPES === */
+
+/**
+ * @brief load text according to bank, map and text_id
+ */
+void sp_load_text_map();
+
+/**
+ * @brief load text according to bank, map, person id and text_id
+ */
+void sp_load_text_person();
+
+/* === GLOBALS === */
+extern struct sav_struct* sav_one;
+
+char* str_invalid_text_ref;
+char***** text_lookup_table;   
 
 void** loadpointer = (void**)((0x03000EB0 + 0x64));
-extern char* get_text_pointer_from_lookup();
+
+/* === IMPLEMENTATIONS === */
+void sp_load_text_map()
+{
+    u8 bank = sav_one->location.bank;
+    u8 map = sav_one->location.map;
+    for(int i = 0; i<=bank;++i)
+    {
+        if(text_lookup_table[i] == (char****)(0xDEADBEEF))
+        {
+            *loadpointer =str_invalid_text_ref;
+            return;
+        }
+    }
+    for(int i = 0; i<=map; ++i)
+    {
+        if(text_lookup_table[bank][i] == (char***)(0xDEADBEEF))
+        {
+            *loadpointer = str_invalid_text_ref;
+            return;
+        }
+    }
+    if(text_lookup_table[bank][map][0] == (char**)(0xDEADBEEF))
+    {
+        *loadpointer = str_invalid_text_ref;
+        return;
+    }
+    u16 text_id = var_get(0x500C);
+    for(int i = 0; i<= text_id; ++i)
+    {
+        if(text_lookup_table[bank][map][0][i] == (char*)(0xDEADBEEF))
+        {
+            *loadpointer = str_invalid_text_ref;
+            return;
+        }
+    }
+    *loadpointer = text_lookup_table[bank][map][0][text_id];
+    return;
+}
+
 void sp_load_text_person()
 {
-    *loadpointer = get_text_pointer_from_lookup();
+    u8 bank = sav_one->location.bank;
+    u8 map = sav_one->location.map;
+    for(int i = 0; i<= bank; ++i)
+    {
+        if(text_lookup_table[i] == (char****)(0xDEADBEEF))
+        {
+            *loadpointer = str_invalid_text_ref;
+            return;
+        }
+    }
+    for(int i = 0; i<= bank; ++i)
+    {
+        if(text_lookup_table[bank][i] == (char***) (0xDEADBEEF))
+        {
+            *loadpointer = str_invalid_text_ref;
+            return;
+        }
+    }
+    u16 person_id = var_get(0x800F);    // LASTTALKED
+    for(int i = 0; i<= person_id; ++i)
+    {
+        if(text_lookup_table[bank][map][i] == (char**) (0xDEADBEEF))
+        {
+            *loadpointer = str_invalid_text_ref;
+            return;
+        }
+    }
+    u16 text_id = var_get(0x500C);   //TEXT_VAR
+    for(int i = 0; i<= text_id; ++i)
+    {
+        if(text_lookup_table[bank][map][person_id][i] == (char*) (0xDEADBEEF))
+        {
+            *loadpointer = str_invalid_text_ref;
+            return;
+        }
+    }
+    *loadpointer = text_lookup_table[bank][map][person_id][text_id];
     return;
 }

src/specials/trainer_battle.c

@@ -0,0 +1,311 @@
+/****************************************************************************
+ * 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 Sovereign of the Skies.                             *
+ *   If not, see <http://www.gnu.org/licenses/>.                            *
+ ****************************************************************************/
+
+/**
+ * @file trainer_battle.c
+ * @author Sturmvogel
+ * @date 04 Jan 2014
+ * @brief trainerbattle script command overhaul
+ * 
+ */
+
+/* === INCLUDE === */
+
+#include <types.h>
+#include <game_engine.h>
+#include <debug.h>
+#include <config.h>
+#include <callback.h>
+
+/* === ENGINE EXTERNS === */
+extern void battle_init();
+extern void battle_80801F0_something();
+
+extern volatile u8 trainerbattle_battle_type;
+extern volatile u16 trainerbattle_flag_id;
+extern volatile u16 trainerbattle_arg2;
+extern volatile char* trainerbattle_message_intro;
+extern volatile char* trainerbattle_message_defeat;
+extern volatile char* trainerbattle_message_2;
+extern volatile char* trainerbattle_message_need_2_poke;
+extern volatile char* trainerbattle_message_4;
+extern volatile void* trainerbattle_next_scr_cmd;
+extern volatile u16 trainerbattle_unknown;
+
+char*** trainer_text_array;
+char* str_invalid_text_ref;
+
+/* === PROTOTYPES === */
+
+/* === IMPLEMENTATIONS === */
+
+/**
+ * @brief loads a byte
+ * @param ptr pointer to load byte from
+ * @return byte loaded
+ */
+u8 load_byte(void* ptr)
+{
+    u8* to_load = (u8*)ptr;
+    return (u8)(*to_load);
+}
+
+/**
+ * @brief loads an unaligned hword
+ * @param ptr pointer to load from
+ * @return half word at pointer
+ */
+u16 load_hword(void* ptr)
+{
+    u8* to_load = (u8*)ptr;
+    u16 result = *to_load;
+    u16 result2 = *(to_load+1) << 8;
+    return result | result2;
+}
+
+/**
+ * @brief loads an unaligned word
+ * @param ptr pointer to load from
+ * @return word read at pointer
+ */
+u32 load_word(void* ptr)
+{
+    u8* to_load = (u8*)ptr;
+    u32 result = *to_load;
+    u32 result2 = *(to_load+1);
+    u32 result3 = *(to_load+2);
+    u32 result4 = *(to_load+3);
+    return (result) | (result2 << 8) | (result3 << 16) | (result4 << 24);
+}
+
+/**
+ * @brief modifies the given flag by game difficulty
+ * @param flag flag to modify
+ * @return flag +1 for medium, flag +2 for hard
+ */
+u16 tb_modify_flag_id(u16 flag)
+{
+    u16 difficulty = var_get(0x5052);
+    switch(difficulty)
+    {
+        case 0:
+            return flag;
+        case 1:
+            return flag + 1;
+        case 2:
+            return flag + 2;
+    }
+    assert(0);
+}
+
+/**
+ * @brief modifies null text pointers according to the trainer text table
+ * @param original original pointer, will be modified only if equal to NULL
+ * @param index index of the requested text in the trainer table
+ * @return 
+ */
+char* tb_modify_text(char* original, u8 index)
+{
+    if(original != NULL)
+        return original;
+    u8 flag_index = trainerbattle_flag_id;   /* NOTE: divide by 3 eventually */
+    for(int i = 0; i <= flag_index; ++i)
+    {
+        if(trainer_text_array[i] == (char**)0xDEADBEEF)
+        {
+            return str_invalid_text_ref;
+        }
+    }
+    for(int i = 0; i <= index; ++i)
+    {
+        if(trainer_text_array[flag_index][i] == (char*)0xDEADBEEF)
+        {
+            return str_invalid_text_ref;
+        }
+    }
+    return trainer_text_array[flag_index][index];
+}
+
+/**
+ * @brief read parameters and initialize a trainerbattle instance
+ * @param ptr_script pointer to current executed script
+ * @return new script pointer
+ */
+void* tb_configure_by_script(void* ptr_script)
+{
+    battle_init();
+    trainerbattle_battle_type = load_byte(ptr_script);
+    switch(trainerbattle_battle_type)
+    {
+        case 1:
+        case 2:
+            trainerbattle_battle_type = load_byte(ptr_script);
+            ptr_script++;
+            
+            trainerbattle_flag_id = tb_modify_flag_id(load_hword(ptr_script));
+            ptr_script+=2;
+            
+            trainerbattle_arg2 = load_hword(ptr_script);
+            ptr_script+=2;
+            
+            trainerbattle_message_intro = tb_modify_text((char*)load_word(ptr_script), 0);
+            ptr_script+=4;
+            
+            trainerbattle_message_defeat = tb_modify_text((char*)load_word(ptr_script), 1);
+            ptr_script+=4;
+            
+            trainerbattle_message_2 = NULL;
+            trainerbattle_message_need_2_poke = NULL;
+            
+            trainerbattle_message_4 = tb_modify_text((char*)load_word(ptr_script), 2);
+            ptr_script+=4;
+            trainerbattle_next_scr_cmd = ptr_script;
+            battle_80801F0_something();
+            return (void*) (0x081A4EC1) /* some script to execute */;
+        case 3:
+            trainerbattle_battle_type = load_byte(ptr_script);
+            
+            trainerbattle_flag_id = tb_modify_flag_id(load_hword(ptr_script));
+            ptr_script+=2;
+            
+            trainerbattle_arg2 = load_hword(ptr_script);
+            ptr_script+=2;
+            
+            trainerbattle_message_intro = NULL;
+            
+            trainerbattle_message_defeat = tb_modify_text((char*)load_word(ptr_script), 0);
+            ptr_script++;
+            
+            trainerbattle_message_2 = NULL;
+            trainerbattle_message_need_2_poke = NULL;
+            
+            trainerbattle_message_4 = NULL;
+            
+            trainerbattle_next_scr_cmd = ptr_script;
+            return (void*) (0x081A4F21); /* some script to execute*/
+        case 4:
+            trainerbattle_battle_type = load_byte(ptr_script);
+            ptr_script++;
+            
+            trainerbattle_flag_id = tb_modify_flag_id(load_hword(ptr_script));
+            ptr_script+=2;
+            
+            trainerbattle_arg2 = load_hword(ptr_script);
+            ptr_script+=2;
+            
+            trainerbattle_message_intro = tb_modify_text((char*)load_word(ptr_script), 0);
+            ptr_script+=4;
+            
+            trainerbattle_message_defeat = tb_modify_text((char*)load_word(ptr_script), 1);
+            ptr_script+=4;
+            
+            trainerbattle_message_2 = NULL;
+            
+            trainerbattle_message_need_2_poke = tb_modify_text((char*)load_word(ptr_script), 2);
+            ptr_script+= 4;
+            
+            trainerbattle_message_4 = NULL;
+            ptr_script+= 4;
+            trainerbattle_next_scr_cmd = ptr_script;
+            battle_80801F0_something();
+            return (void*) (0x081A4EE9); /* some script to execute */
+        case 5:
+            assert(0);
+            return NULL;
+        case 6:
+        case 8:
+            trainerbattle_battle_type = load_byte(ptr_script);
+            ptr_script++;
+            
+            trainerbattle_flag_id = tb_modify_flag_id(load_hword(ptr_script));
+            ptr_script+=2;
+            
+            trainerbattle_arg2 = load_hword(ptr_script);
+            ptr_script+=2;
+            
+            trainerbattle_message_intro = tb_modify_text((char*)load_word(ptr_script), 0);
+            ptr_script+=4;
+            
+            trainerbattle_message_defeat = tb_modify_text((char*)load_word(ptr_script), 1);
+            ptr_script+=4;
+            
+            trainerbattle_message_2 = NULL;
+            
+            trainerbattle_message_need_2_poke = tb_modify_text((char*)load_word(ptr_script), 2);
+            ptr_script += 4;
+            trainerbattle_message_4 = tb_modify_text((char*)load_word(ptr_script), 3);
+            ptr_script += 4;
+            trainerbattle_next_scr_cmd = ptr_script;
+            battle_80801F0_something();
+            return (void*) (0x081A4EE9); /* some script to execute */
+        case 7:
+            assert(0);
+            return NULL;
+        case 9:
+            /* WIN / LOSE resume script */
+            trainerbattle_flag_id = tb_modify_flag_id(load_hword(ptr_script));
+            ptr_script += 2;
+            
+            trainerbattle_unknown = load_hword(ptr_script);
+            ptr_script += 2;
+            
+            trainerbattle_message_intro = NULL;
+            
+            trainerbattle_message_defeat = tb_modify_text((char*)load_word(ptr_script), 0);
+            ptr_script += 4;
+            
+            trainerbattle_message_2 = tb_modify_text((char*)load_word(ptr_script), 1);
+            ptr_script += 4;
+            
+            trainerbattle_message_need_2_poke = NULL;
+            
+            trainerbattle_message_4 = NULL;
+            
+            trainerbattle_next_scr_cmd = ptr_script;
+            return (void*) 0x081A4F21; /* some script to execute */
+        default:
+            trainerbattle_battle_type = load_byte(ptr_script);
+            ptr_script++;
+            
+            trainerbattle_flag_id = tb_modify_flag_id(load_hword(ptr_script));
+            ptr_script+=2;
+            
+            trainerbattle_arg2 = load_hword(ptr_script);
+            ptr_script+=2;
+            
+            trainerbattle_message_intro = tb_modify_text((char*)load_word(ptr_script), 0);
+            ptr_script+=4;
+            
+            trainerbattle_message_defeat = tb_modify_text((char*)load_word(ptr_script), 1);
+            ptr_script+=4;
+            
+            trainerbattle_message_2 = NULL;
+            trainerbattle_message_need_2_poke = NULL;
+            trainerbattle_message_4 = NULL;
+            trainerbattle_next_scr_cmd = ptr_script;
+            battle_80801F0_something();
+            return (void*) (0x081A4EC1); /* some script to execute */
+    }
+    /* should never be reached */
+    //assert(0);
+   // return NULL;
+}

string/de/invalid.txt

@@ -0,0 +1 @@
+str_invalid_text=Dies ist ein Dummy Text!

string/de/story_text/hesperia/globals.txt

@@ -0,0 +1,25 @@
+str_hesp_out_g_0=\v\h01! Was bitte war das!? Diese\nErschütterung\.\p\c\h08\h05.\c\h08\h05.\c\h08\h05.\c\h08\h05.\c\h08\h05.\pIch bin so froh, dass dir nichts\npassiert ist\.\pEs hörte sich an wie ein\nErdbeben\c\h08\h05.\c\h08\h05.\c\h08\h05.\pVielleicht weiß dein Vater ja, was\nvorgefallen ist.\pMach dich bitte auf den Weg mein\nSchatz.\pIch werde wieder reingehen, pass\nbitte auf dich auf!
+str_hesp_out_g_1=\v\h01! Warte!
+str_hesp_out_g_2=Tut mir Leid, ich bin spät dran\.\pHast du auch diese Vibration\ngespürt, als hätte es ein Erdbeben\lgegeben oder so was\.\pIch mache mir Sorgen, hoffentlich\nist niemandem etwas passiert\.\pMeinst du nicht wir sollten Vater\naufsuchen?\pKommt lass uns gehen!
+str_hesp_out_g_3=Ah sieh mal! Da ist er ja!
+str_hesp_out_g_4=Achim! Bilde ich mir das jetzt\nein oder gab es gerade ein hefiges\lErdbeben östlich von Hesperia?
+str_hesp_out_g_5=Das ist keine Einbildung, ich habe\nes ebenfalls gespürt.\pUnd habe ehrlich gesagt ein\nkomisches Gefühl\.\pDenn was auch immer es war, ein\ngewöhnliches Beben war es zumindest\lnicht.
+str_hesp_out_g_6=Du hast Recht!\pDer Himmel färbte sich rot und es\nwurde plötzlich so düster und\lstill.\pUnd dann diese Explosion\.\pIch fürchte es war kein Erdbeben\.\pEs muss einen anderen Ursprung\nhaben!
+str_hesp_out_g_7=Das erfahren wir erst, wenn wir\nNachforschungen betreiben.\pWenn du mich kurz entschuldigst.\pIch werde etwas telefonieren,\num herauszufinden, was passiert\list.\pWarte du hier auf deine Kinder.
+str_hesp_out_g_8=Ah, da seit ihr ja!\pLeider ist uns etwas dazwischen\ngekommen. Wir müssen mit dem\lwarten, was wir vorhatten.
+str_hesp_out_g_9=Meinst du vielleicht mit "etwas\ndazwischen" gekommen, das Erdbeben?
+str_hesp_out_g_10=Wie? Dann habt ihr es also auch\ngespürt, verstehe\.
+str_hesp_out_g_11=Ja, aber ich bin nicht der Einzige.\pAuch Mama und \v\h01 haben es gespürt.
+str_hesp_out_g_12=Verstehe\. Es würde mich nicht\nwundern, wenn es nicht alle in\lHesperia gespürt hätten[.]\pWir können aber noch nicht zu\neinhundert Prozent sagen, was es\lwar.\pAchim hört sich um und\ntelefoniert mit ein paar Kollegen.\pVielleicht kann er uns Genaueres\nmitteilen.\pLasst uns auf ihn warten!
+str_hesp_out_g_13=Ah, da kommt er ja!
+str_hesp_out_g_14=Und? Achim was ist passiert?
+str_hesp_out_g_15=Ich weiß gar nicht, wie ich euch\ndas erklären soll\.\pAber\. Ich kanns einfach nicht\nfassen\.\pEin Meteorit hat nördlich von\nCarun City eingeschlagen und alles\lverwüstet.
+str_hesp_out_g_16=WAS!? Geht es deiner Familie gut?
+str_hesp_out_g_17=Ja, meiner Familie, sowie den\nBewohnern von Carun City ist nicht\lpassiert.\pEs war zwar kein großer Meteorit\nwie der von damals, aber\ldennoch scheint er eine Menge\l verwüstet zu haben.\pDer gesamte nördliche Teil von\nCarun City, Veternia, ist komplett zerstört\lund unbewohnbar.\pEs ist auch derzeit noch nicht\nbekannt, ob es Verletzte oder Tote\lgibt.\pAuszuschließen ist das nicht. Ich\nrechne mit dem Schlimmsten.\pIch muss mich sofort auf den Weg\nmachen!\pUnsere Arbeit können wir ein andermal\nfortsetzen!
+str_hesp_out_g_18=Außer Frage, ich komme so schnell\nes möglich ist nach.
+str_hesp_out_g_19=Vielen Dank, mein Freund!\pIch verlasse mich auf dich!
+str_hesp_out_g_20=Das Ganze ist jetzt sicherlich ein\nbisschen geschmackslos und kommt\lvielleicht plötzlich, aber ich\lwollte euch eigentlich heute euer\lerstes Pokémon schenken!\pEs sollte zunächst eine\nÜberraschung sein, aber ich denke\ldas habe ich euch leider verdorben.\lEs tut mir Leid!\pAber wir sind, wie es jetzt selber\nmitbekommen habt, in einer ernsten\lSituation, also machen wir es\lschnell.\pFolgt mir ins Labor!
+str_hesp_out_g_21=Habe ich richtig gehört?\pWir bekommen unser eigenes Pokémon?
+str_hesp_out_g_22=\v\h06! \v\h01!\pWorauf wartet ihr!? Wir haben es\neilig!
+
+str_hesp_20_g_0=Na \v\h01, bist du aufgewacht?\nDein Vater erwartet \v\h06\lund dich bereits im Labor. Wenn du\ldich bereit fühlst, dann lass ihn\lnicht warten.\pMich findest du in der Küche mein\nSchatz.

string/de/story_text/hesperia/player_house.txt

@@ -0,0 +1 @@
+str_hesp_21_p1_0=Ah, \v\h01! Du bist also auch\naufgewacht.\pMama hat mir gesagt, dass wir\nrunterkommen sollen, sobald wir\laufgewacht sind.\pGeh ruhig vor, ich komme später\nnach.

string/de/story_text/tundra_hq/globals.txt

@@ -1,4 +1,3 @@
-str_tundra_hq_name=Tundra HQ
 str_tundra_hq_0=Wähle deinen Schwierigkeitsgrad\naus, um das Spiel zu beginnen!
 str_tundra_hq_1=Bist du sicher, dass du in diesem\nModus spielen möchtest?
 str_tundra_hq_2=Dann wähle einen anderen Modus!

string/de/text.txt

@@ -1,3 +0,0 @@
-str_person_test=Dies ist ein Test\num die Funktionalität\lzu testen!
-str_person_zero=Falscher Text!
-str_invalid_text=Dies ist ein Dummy Text!

string/de/trainers/test_trainers.txt

@@ -0,0 +1,2 @@
+str_t0_intro=Ich bin ein Trainer, KAMPF!!
+str_t0_defeat=Ugh, hello darkness und so...

string/table.tbl

@@ -14,7 +14,7 @@
 ?=0xAC
 .=0xAD
 -=0xAE
-\.=0xAF
+\.=0xB0
 é=0x1B
 ,=0xB8
 \k=0xB9
@@ -81,5 +81,7 @@ z=0xEE
 \e=0x35
 \l=0xFA
 \p=0xFB
+\c=0xFC
+\v=0xFD
 \n=0xFE
 \x=0xFF