variable debugging

patches/hooks.asm

@@ -101,8 +101,12 @@ _call_via_r1 equ 0x081E3BAC
 	lsl r0, #0
 	.pool
 
+.org 0x0806E584
+    ldr r3, =var_set_hack|1
+    bx r3
+
 .org 0x0806E680
-    ldr r1, =flag_set|1
+    ldr r1, =flag_set_hack|1
     bx r1
     .pool
 //end of flag routine

src/savefile/flag_manipulation.c

@@ -20,12 +20,12 @@
  *   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
- */
+/**
+* @file flag_manipulation.c
+* @author Sturmvogel
+* @date 25 may 2017
+* @brief functions for preserving flags and reusing difficulty
+*/
 #include <pokeagb/pokeagb.h>
 
 #define TRAINER_FLAG_SPACE_START 0x1000
@@ -33,85 +33,79 @@
 extern u16 tb_modify_flag_id(u16 flag_id);
 u16 trainerflag_fix_difficulty(u16 flag_id);
 
-u16 load_hword(void* ptr)
-{
-    u8* to_load = (u8*)ptr;
+u16 load_hword(void *ptr) {
+    u8 *to_load = (u8 *)ptr;
     u16 result = *to_load;
-    u16 result2 = *(to_load+1) << 8;
+    u16 result2 = *(to_load + 1) << 8;
     return result | result2;
 }
 
-u8 load_byte(void* ptr)
-{
-    return (u8) (*((u8*)ptr));
-}
+u8 load_byte(void *ptr) { return (u8)(*((u8 *)ptr)); }
 
-u16 trainerflag_fix_difficulty(u16 flag_id)
-{
+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, status: %s\n", flag_id, new_flag, flag_check(new_flag) ? "true" : "false");
+    dprintf("trainerflag_fix_difficulty;; flag_id: 0x%x, reduced: 0x%x, status: %s\n", flag_id, new_flag,
+            flag_check(new_flag) ? "true" : "false");
     return new_flag;
 }
 
-bool trainer_check_flag_on_spot(u8 npc_id)
-{
-    void* script = npc_get_script_by_npc_id(npc_id);
+bool trainer_check_flag_on_spot(u8 npc_id) {
+    void *script = npc_get_script_by_npc_id(npc_id);
     /* probably inject some script execution here */
 
-    u16 flag = tb_modify_flag_id(load_hword(script+2));
+    u16 flag = tb_modify_flag_id(load_hword(script + 2));
     /* check for line of sight */
 
     u8 hit_result = npc_trainer_and_raycast_hit(&npc_states[npc_id]);
 
-    if(hit_result == 0)
+    if (hit_result == 0)
         return false;
 
-    if(flag_check(trainerflag_fix_difficulty(flag + TRAINER_FLAG_SPACE_START)))
+    if (flag_check(trainerflag_fix_difficulty(flag + TRAINER_FLAG_SPACE_START)))
         return false;
 
-    if((load_byte(script + 1) == 4) && (player_cant_double_battle() > 0))
+    if ((load_byte(script + 1) == 4) && (player_cant_double_battle() > 0))
         return false;
-    
+
     spot_trainer_8080334(npc_id, script);
-    spot_trainer_8081E68(&npc_states[npc_id], hit_result -1);
+    spot_trainer_8081E68(&npc_states[npc_id], hit_result - 1);
     return true;
-
 }
 
-u8 trainerflag_read_fix(void* script_location)
-{
-    script_location+=2;
+u8 trainerflag_read_fix(void *script_location) {
+    script_location += 2;
     u16 flag = load_hword(script_location);
-    //dprintf("trainerflag_read_fix: 0x%x", flag);
+    // 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)
-{
+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));
-}
+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_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));
-}
+void trainerflag_clear_fix(u16 flag) { flag_clear(trainerflag_fix_difficulty(flag + TRAINER_FLAG_SPACE_START)); }
 
-void flag_set(u16 flag)
-{
-    u8* addr = flag_byte_access(flag);
-    if(addr != NULL)
+void flag_set_hack(u16 flag) {
+    u8 *addr = flag_byte_access(flag);
+    if (addr != NULL) {
+        dprintf("flag 0x%x was set\n", flag);
         *addr |= 1 << (flag & 7);
+    }
 }
+
+bool var_set_hack(u16 var, u16 val) {
+    u16 *ptr = var_access(var);
+    if (ptr != NULL) {
+        dprintf("variable 0x%x was set to 0x%x (Address: 0x%x)\n", var, val, ptr);
+        *ptr = val;
+        return true;
+    }
+    return false;
+}