block wild battle fleeing

bpre.sym

@@ -105,8 +105,12 @@ npc_states = 0x02036E38;
 sav_one = 0x03005008;
 
 weather_turns = 0x02023F48;
+
+battle_call_bc_move_exec = 0x0801BBE4|1;
+battle_preparation_phase = 0x02023E82;
 battle_type_flags = 0x02022B4C;
 battle_active_bank = 0x02023BC4;
+battle_buffer_b = 0x020233C4;
 battle_num_active_sides = 0x02023BCC;
 battle_mode = 0x02023BE3;
 battle_participants	= 0x02023BE4;

nbproject/configurations.xml

@@ -36,6 +36,7 @@
           <in>battle_end_of_turn.c</in>
           <in>battle_help.c</in>
           <in>battle_initiative.c</in>
+          <in>battle_m_flee_hook.S</in>
           <in>battle_test.c</in>
           <in>custom_structs_malloc.c</in>
           <in>entry_hazards.c</in>
@@ -539,6 +540,11 @@
         <cTool flags="0">
         </cTool>
       </item>
+      <item path="src/battle_engine/battle_m_flee_hook.S"
+            ex="false"
+            tool="4"
+            flavor2="0">
+      </item>
       <item path="src/battle_engine/battle_test.c" ex="false" tool="0" flavor2="3">
         <cTool flags="0">
         </cTool>

patches/battle_engine/battle_engine.asm

@@ -17,4 +17,9 @@ bx r3
 .word battle_end_of_turn_hook+1
 
 .org 0x08018254
-.word battle_end_of_turn_hook+1
+.word battle_end_of_turn_hook+1
+
+.org 0x080146AC
+ldr r0, =battle_m_flee_hook+1
+bx r0
+.pool

src/battle_engine/battle_m_flee_hook.S

@@ -0,0 +1,54 @@
+.text
+.align 2
+.thumb
+
+.global battle_m_flee_hook
+battle_m_flee_hook:
+
+ldr r0, =battle_type_flags
+ldr r0, [r0]
+mov r1, #0xA
+and r0, r1
+cmp r0, #8
+bne no_trainer
+ldr r0, =battle_buffer_b
+ldr r4, =battle_active_side
+ldrb r1, [r4]
+lsl r1, #9
+add r0, #1
+add r1, r1, r0
+ldrb r0, [r1]
+cmp r0, #3
+bne no_flee
+ldr r0, =0x080146CB
+bx r0
+no_trainer:
+/* here we have a wild battle (hopefully) and want to intercept on flag */
+@for testing: intercept everything!
+
+@only intercept the flee command though...
+ldr r0, =battle_buffer_b
+ldr r4, =battle_active_side
+ldrb r1, [r4]
+lsl r1, #9
+add r0, #1
+add r1, r1, r0
+ldrb r0, [r1]
+cmp r0, #3
+bne no_flee
+
+ldr r0, =0x081D8924 @some move script change later
+bl call_battle_call_move_something
+ldr r1, =battle_preparation_phase
+ldrb r0, [r4]
+add r0, r0, r1
+ldr r1, =0x08014927
+bx r1
+no_flee:
+ldr r0, =0x080146ED
+bx r0
+
+.align 2
+call_battle_call_move_something:
+ldr r1, =battle_call_bc_move_exec
+bx r1

string/de/trainers/trainer_data.txt

@@ -259,19 +259,19 @@ str_trainer_name_42=Hanah
 @word pokemon_von_id_42
 
 @byte 0, 48, 1, 56
-str_trainer_name_43=Jörg
+str_trainer_name_43=Jörg
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0
 @word pokemon_von_id_43
 
 @byte 0, 48, 1, 56
-str_trainer_name_44=Jörg
+str_trainer_name_44=Jörg
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_44
 
 @byte 0, 48, 1, 56
-str_trainer_name_45=Jörg
+str_trainer_name_45=Jörg
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_45