trainer flag fix

bpre.sym

@@ -71,7 +71,7 @@ flag_decrypt_func = 0x0806E6D1;
 var_access = 0x0806E455;
 var_get = 0x0806E569;
 var_set = 0x0806E585;
-flag_check = 0x0806E6D1;
+flag_check = 0x0806E6D0 | 1;
 get_bs_elem_env_index = 0x0800FC2D;
 load_battle_screen_elements_1 = 0x0800F261;
 npc_states = 0x02036E38;

patches/hooks.asm

@@ -111,25 +111,30 @@ _call_via_r1 equ 0x081E3BAC
 //end of var routine
 
 //trainer Flag stuff
-.org 0x08080382
-	mov r1, #0x80
-	lsl r1, #0x15
+.org 0x08080378
+	ldr r1, =trainerflag_read_fix+1
+	bx r1
+    .pool
 
-.org 0x080800BA
-	mov r2, #0x80
-	lsl r2, #0x5
+.org 0x080800B8
+    ldr r2, =trainerflag_opponent_fix+1
+    bx r2
+    .pool
 
-.org 0x08080428
-    mov r1, #0x80
-    lsl r1, #0x15
+.org 0x08080424
+    ldr r1, =trainerflag_check_fix+1
+    bx r1
+    .pool
 
-.org 0x08080440
-    mov r1, #0x80
-    lsl r1, #0x15
+.org 0x0808043c
+    ldr r1, =trainerflag_set_fix+1
+    bx r1
+    .pool
 
-.org 0x08080454
-    mov r1, #0x80
-    lsl r1, #0x15
+.org 0x08080450
+    ldr r1, =trainerflag_clear_fix+1
+    bx r1
+    .pool
 //end of trainer flag stuff
 
 //New behavior bytes for jumping

src/savefile/flag_hook.S

@@ -22,8 +22,10 @@ flag_hook:
 exit:	pop {r4-r6}
 	pop {r1}
 	bx r1
-normal:	ldr r0, normalmemoryblock
+normal:	
+	ldr r0, normalmemoryblock
 	ldr r0, [r0, #0x0]
+	
 there:	lsr r1, r6, #0x3
 	mov r3, #0xEE
 	lsl r3, r3, #0x4

src/savefile/flag_manipulation.c

@@ -0,0 +1,84 @@
+/****************************************************************************
+ * Copyright (C) 2015-2017 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 flag_manipulation.c
+ * @author Sturmvogel
+ * @date 25 may 2017
+ * @brief functions for preserving flags and reusing difficulty
+ */
+
+#define TRAINER_FLAG_SPACE_START 0x1000
+
+#include <types.h>
+#include <agb_debug.h>
+#include <stdbool.h>
+#include <game_engine.h>
+#include <battle_structs.h>
+
+u16 trainerflag_fix_difficulty(u16 flag_id);
+
+u16 load_hword(void* ptr)
+{
+    u8* to_load = (u8*)ptr;
+    u16 result = *to_load;
+    u16 result2 = *(to_load+1) << 8;
+    return result | result2;
+}
+
+u16 trainerflag_fix_difficulty(u16 flag_id)
+{
+    u16 new_flag = ((flag_id - TRAINER_FLAG_SPACE_START + 1) / 3) + TRAINER_FLAG_SPACE_START;
+    dprintf("trainerflag_fix_difficulty;; flag_id: 0x%x, reduced: 0x%x\n", flag_id, new_flag);
+    return new_flag;
+}
+
+u8 trainerflag_read_fix(void* script_location)
+{
+    script_location+=2;
+    u16 flag = load_hword(script_location);
+    //dprintf("trainerflag_read_fix: 0x%x", flag);
+    flag = trainerflag_fix_difficulty(flag + TRAINER_FLAG_SPACE_START);
+    return flag_check(flag);
+}
+
+volatile u8 test;
+
+u16 trainerflag_opponent_fix(void)
+{
+    return trainerflag_fix_difficulty(trainerbattle_flag_id + TRAINER_FLAG_SPACE_START);
+}
+
+bool trainerflag_check_fix(u16 flag)
+{
+    return flag_check(trainerflag_fix_difficulty(flag + TRAINER_FLAG_SPACE_START));
+}
+
+void trainerflag_set_fix(u16 flag)
+{
+    flag_set(trainerflag_fix_difficulty(flag + TRAINER_FLAG_SPACE_START)); 
+}
+
+void trainerflag_clear_fix(u16 flag)
+{
+    flag_clear(trainerflag_fix_difficulty(flag + TRAINER_FLAG_SPACE_START));
+}

src/specials/trainer_battle.c

@@ -35,6 +35,7 @@
 #include <debug.h>
 #include <config.h>
 #include <callback.h>
+#include <agb_debug.h>
 
 /* === ENGINE EXTERNS === */
 extern void battle_init();
@@ -104,16 +105,20 @@ u32 load_word(void* ptr)
 u16 tb_modify_flag_id(u16 flag)
 {
     u16 difficulty = var_get(0x5052);
+    u16 new_flag = flag;
     switch(difficulty)
     {
         case 0:
-            return flag;
+            break;
         case 1:
-            return flag + 1;
+            new_flag = flag + 1;
+            break;
         case 2:
-            return flag + 2;
+            new_flag = flag + 2;
+            break;
     }
-    return 0;
+    dprintf("tb_modify_flag_id;; trainer ID: %d, difficulty: %d, new trainer id: %d\n", flag, difficulty, new_flag);
+    return new_flag;
 }
 
 /**