malloc battle resources

bpre.sym

@@ -1,6 +1,6 @@
 set_callback2 = 0x08000545;
 vblank_handler_set = 0x080006F5;
-malloc = 0x08002BB1;
+malloc = 0x08002BB0|1;
 free = 0x08002BC4|1;
 memset = 0x081E5ED8|1;
 template_instanciate_forward_search = 0x08006F8D;

main.asm

@@ -28,6 +28,8 @@
 .include "patches/pokemon_data/pokemon_shiny_pal.asm"
 .include "patches/pokemon_data/pokemon_icons.asm"
 
+.include "patches/battle_engine/malloc.asm"
+
 
 .org 0x09000000
 .importobj "object/linked.o"

patches/battle_engine/malloc.asm

@@ -1,5 +1,11 @@
+.org 0x0802E078
+ldr r1, =alloc_res_hook|1
+bx r1
+
+.pool
+
 .org 0x0802E224
-.word alloc_res_hook|1
+.word free_res_hook|1
 
 .org 0x0802E1F8
-bx r0
+bx r4

src/battle_engine/custom_structs_malloc.c

@@ -1,12 +1,15 @@
 #include <bpre.h>
-#include "custum_structs_malloc.h"
+#include "custom_structs.h"
+#include "custom_structs_malloc.h"
 
 void malloc_battle_structs()
 {
-	
+	custom_battle_struct.ptr=(struct custom_battle_struct*)malloc(sizeof(struct custom_battle_struct));
+	custom_battle_struct.ptr->side_affecting[0].sticky_web=1;
 }
 
 void free_battle_structs()
 {
-	
+	free(custom_battle_struct.ptr);
+	custom_battle_struct.ptr=0;
 }

src/battle_engine/custom_structs_malloc_hook.S

@@ -4,16 +4,33 @@
 
 .global alloc_res_hook
 alloc_res_hook:
+str r0, [r4] @save last malloced data pointer
+ldr r4, =0x02023FF4 @some battle struct pointer
+mov r0, #0x20 @size of struct
+bl malloc_and_clear
+str r0, [r4]
 
-bl malloc_battle_structs
+bl malloc_battle_structs @allocate custom stuff
 ldr r0, =0x0802E084|1
 bx r0
 
 .align 2
-
 .global free_res_hook
 free_res_hook:
-
+ldr r4, =0x02022BBC
+ldr r0, [r4]
+bl free_routine
+str r5, [r4]	@@null_pointer
 bl free_battle_structs
 ldr r0, =0x0802E200|1
-bx r0
+bx r0
+
+.align 2
+
+malloc_and_clear:
+ldr r3, =malloc
+bx r3
+
+free_routine:
+ldr r3, =free
+bx r3