sethealing

patches/game_engine/quick_hacks.asm

@@ -81,4 +81,15 @@ PLAYER_S_M EQU 0
 .byte 0x5
 
 .org 0x08054A06
-.byte 0x0
+.byte 0x0
+
+.org 0x0807F5EC
+.word scr_whiteout_mom
+
+.org 0x0807F5CC
+.word scr_whiteout_center
+
+.org 0x080BFD54
+ldr r0, =whiteout_hook|1
+bx r0
+.pool

sots-private

@@ -1 +1 @@
-Subproject commit 2e7288290d8843a9323c3cf7c1742809eb5b44ad
+Subproject commit 40bfd538e204a662376e4e708e90e2cc5673b6e4

src/game_engine/whiteout_hook.s

@@ -0,0 +1,33 @@
+#include <config.h>
+
+.align 2
+.thumb
+.text
+
+.global whiteout_hook
+whiteout_hook:
+ldr r0, =HEALING_BANK_MAP_VAR
+bl var_get_rekt
+lsl r1, r0, #0x18
+lsr r0, r0, #8
+lsr r1, r1, #0x18
+strb r1, [r4]
+strb r0, [r4,#1]
+mov r0, #0xFF
+strb r0, [r4, #2]
+ldr r0, =HEALING_X_VAR
+bl var_get_rekt
+lsl r0, #0x10
+lsr r0, #0x10
+strh r0, [r4, #4]
+ldr r0, =HEALING_Y_VAR
+bl var_get_rekt
+lsl r0, #0x10
+lsr r0, #0x10
+strh r0, [r4,#6]
+ldr r0, =0x080BFDF5
+bx r0
+
+var_get_rekt:
+ldr r1, =var_get
+bx r1

src/include/config.h

@@ -39,6 +39,10 @@
 /*Variable for controlling evolutions*/
 #define EVO_VAR 0x500D
 
+#define HEALING_BANK_MAP_VAR 0x500E
+#define HEALING_X_VAR 0x500F
+#define HEALING_Y_VAR 0x5010
+
 /*Variables to control the music overrides*/
 #define VAR_FROM_1 0x51FA
 #define VAR_FROM_2 0x51FB

src/include/script_language.h

@@ -826,9 +826,10 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .hword \checkanimation_animation
 .endm
 
-.macro sethealingplace sethealingplace_flightspot:req
-.byte 0x9F
-.hword \sethealingplace_flightspot
+.macro sethealingplace shp_bank:req shp_map:req shp_x:req shp_y:req
+    setvar HEALING_BANK_MAP_VAR \shp_map << 8 | \shp_bank
+    setvar HEALING_X_VAR \shp_x
+    setvar HEALING_Y_VAR \shp_y
 .endm
 
 .macro checkgender