add battle_engine, not working atm

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "sots-private"]
 	path = sots-private
 	url = ssh://sotshost:/home/sots/sots-private.git
+[submodule "battle_engine"]
+	path = battle_engine
+	url = https://github.com/EternalCode/battle_engine

battle_engine

@@ -0,0 +1 @@
+Subproject commit a5e46479febfe3d780ac3111ebbb9401940983b5

main.asm

@@ -5,7 +5,12 @@
 //exclude for now
 //.include "patches/split_physical_special.asm"
 .include "patches/hooks.asm"
-.include "patches/dynamic_overworld_hooks.asm"
+
+
+//no dynamic overworlds, sorry :T
+//.include "patches/dynamic_overworld_hooks.asm"
+
+
 .include "patches/special.asm"
 .include "patches/moves.asm"
 .include "patches/music.asm"
@@ -54,14 +59,16 @@
 
 .include "patches/game_engine/quick_hacks.asm"
 
+.include "battle_engine/patches/menutest.s"
+
 .org 0x0815F9B8
     .word 0x08069ED5 // fix nop1 for now...
 
 .org 0x083522F4
-    .word mapheader_alabastia
+    //.word mapheader_alabastia
 
 .org 0x0834ECC0
-    .word mapfooter_alabastia
+    //.word mapfooter_alabastia
 
 .org 0x09000000
 .importobj "object/linked.o"

makefile

@@ -23,6 +23,7 @@ SOURCEDIR := src
 STRINGDIR := string
 
 MAIN_OBJ  := $(BLDPATH)/linked.o
+B_ENGINE  := battle_engine/build/linked.o
 SPRITES   := $(BLDPATH)/pkmn_sprites.o
 ICONS_AR  := $(BLDPATH)/pkmn_icons.a
 DYN_OVER  := built/dynamic_overworld.o
@@ -78,11 +79,15 @@ rom: main.asm $(MAIN_OBJ)
 		sed -e '{s/^/0x/g};{/.*\sA\s.*/d};{s/\sT\s/ /g}' > $(OUTPATH)/__symbols.sym
 	@echo "*** SUCCESSFULLY BUILT PROJECT ***"
 	
-$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $(STRING_OBJ) $(DYN_OVER)
+$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $(STRING_OBJ) $(B_ENGINE)#$(DYN_OVER) 
 	$(MAKE) -f assets.makefile
 	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
 	$(LD) $(LDFLAGS) -T linker.ld -T bpre.sym -o object/debug.o object/linked.o
 
+.PHONY: $(B_ENGINE)
+$(B_ENGINE):
+	$(MAKE) -C $(dir $@)/.. build/linked.o
+
 .PHONY: clean
 clean:
 	rm -f  $(OUTPATH)/__symbols.sym $(OUTPATH)/pkmn_sots.gba

src/battle_engine/battle_m_flee_hook.S

@@ -15,7 +15,7 @@ and r0, r1
 cmp r0, #8
 bne no_trainer
 ldr r0, =battle_buffer_b
-ldr r4, =battle_active_side
+ldr r4, =battle_active_bank
 ldrb r1, [r4]
 lsl r1, #9
 add r0, #1
@@ -31,7 +31,7 @@ no_trainer:
 
 @only intercept the flee command though...
 ldr r0, =battle_buffer_b
-ldr r4, =battle_active_side
+ldr r4, =battle_active_bank
 ldrb r1, [r4]
 lsl r1, #9
 add r0, #1