fix trainer loops, migrate some methods to pokeagb

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "battle_engine"]
 	path = battle_engine
 	url = https://github.com/EternalCode/battle_engine
+[submodule "g3headers"]
+	path = g3headers
+	url = https://github.com/SBird1337/g3headers

.vscode/c_cpp_properties.json

@@ -35,7 +35,7 @@
                     "/usr/include",
                     "/usr/local/include",
                     "src/include",
-                    "${workspaceRoot}"
+                    "$(workspaceRoot}/g3headers/include"
                 ],
                 "limitSymbolsToIncludedHeaders": true,
                 "databaseFilename": ""

bpre.sym

@@ -92,7 +92,7 @@ objc_exec = 0x08006B5D;
 obj_sync = 0x08006BA9;
 
 flag_clear = 0x0806E6A8|1;
-flag_set = 0x0806E680|1;
+/*flag_set = 0x0806E680|1;*/
 
 divide = 0x081E4018;
 

g3headers

@@ -0,0 +1 @@
+Subproject commit 055ac19e4f3768b154554e097d3e8e9b46c8935b

main.asm

@@ -43,6 +43,7 @@
 .include "patches/pokemon_data/pokemon_evolution.asm"
 
 .include "patches/overworlds/pkm_wild.asm"
+.include "patches/overworlds/trainer.asm"
 //.include "patches/dns/core.asm"
 
 .include "patches/overworlds/overworld.asm"

makefile

@@ -12,7 +12,7 @@ STRAGB	:= string2agb
 
 export PATH := $(realpath ../tools):$(PATH)
 
-PAGB_MAIN := battle_engine/deps/pokeagb
+PAGB_MAIN := g3headers
 PAGB_INCLUDE := $(PAGB_MAIN)/build/include/
 PAGB_LINK := $(PAGB_MAIN)/build/linker/BPRE.ld
 
@@ -85,7 +85,7 @@ rom: main.asm $(MAIN_OBJ)
 	
 $(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $(STRING_OBJ)#$(B_ENGINE)
 	$(MAKE) -f assets.makefile
-	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
+	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
 
 .PHONY: $(B_ENGINE)
 $(B_ENGINE):

patches/hooks.asm

@@ -100,6 +100,11 @@ _call_via_r1 equ 0x081E3BAC
 	bx r0
 	lsl r0, #0
 	.pool
+
+.org 0x0806E680
+    ldr r1, =flag_set|1
+    bx r1
+    .pool
 //end of flag routine
 
 //var routine

patches/overworlds/trainer.asm

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

src/savefile/flag_manipulation.c

@@ -26,16 +26,11 @@
  * @date 25 may 2017
  * @brief functions for preserving flags and reusing difficulty
  */
+#include <pokeagb/pokeagb.h>
 
 #define TRAINER_FLAG_SPACE_START 0x1000
 
-#include <types.h>
-#include <agb_debug.h>
-#include <stdbool.h>
-#include <game_engine.h>
-#include <battle_structs.h>
-#include <config.h>
-
+extern u16 tb_modify_flag_id(u16 flag_id);
 u16 trainerflag_fix_difficulty(u16 flag_id);
 
 u16 load_hword(void* ptr)
@@ -46,6 +41,11 @@ u16 load_hword(void* ptr)
     return result | result2;
 }
 
+u8 load_byte(void* ptr)
+{
+    return (u8) (*((u8*)ptr));
+}
+
 u16 trainerflag_fix_difficulty(u16 flag_id)
 {
     u16 new_flag = ((flag_id - TRAINER_FLAG_SPACE_START + 1) / 3) + TRAINER_FLAG_SPACE_START;
@@ -53,6 +53,31 @@ u16 trainerflag_fix_difficulty(u16 flag_id)
     return new_flag;
 }
 
+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));
+    /* check for line of sight */
+
+    u8 hit_result = npc_trainer_and_raycast_hit(&npc_states[npc_id]);
+
+    if(hit_result == 0)
+        return false;
+
+    if(flag_check(trainerflag_fix_difficulty(flag + TRAINER_FLAG_SPACE_START)))
+        return false;
+
+    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);
+    return true;
+
+}
+
 u8 trainerflag_read_fix(void* script_location)
 {
     script_location+=2;
@@ -83,3 +108,10 @@ 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)
+        *addr |= 1 << (flag & 7);
+}