update private, fix more overworld stuff, change script location

makefile

@@ -37,6 +37,7 @@ MAPROOT	  := sots-private/map
 MAPMAPS	  := $(MAPROOT)/maps
 MAPTS	  := $(MAPROOT)/tileset
 MAP_PROJ	:= $(MAPROOT)/sots.json
+SCRIPTROOT := $(MAPROOT)/script
 
 MAIN_OBJ  := $(BLDPATH)/linked.o
 B_ENGINE  := battle_engine/build/linked.o
@@ -67,7 +68,7 @@ C_SRC       := $(call rwildcard,src/,*.c)
 DATA_SRC    := $(call rwildcard,data/,*.s)
 STRING		:= $(call rwildcard,string/$(LAN)/,*.txt)
 STRING_SRC	:= $(STRING:%.txt=%.s)
-SCRIPT_SRC	:= $(call rwildcard,$(MAPMAPS)/,*.s)
+SCRIPT_SRC	:= $(call rwildcard,$(SCRIPTROOT)/,*.s)
 
 MAP_PROJ_S	:= $(MAP_PROJ:%.json=%.s)
 MAP_PROJ_O	:= $(MAP_PROJ:%.json=$(BLDPATH)/%.o)

patches/dynamic_overworld_hooks.asm

@@ -255,10 +255,10 @@ bx r5
 
 .pool
 
-.org 0x08007280
+/*.org 0x08007280
 ldr r1, =obj_delete_and_free_tiles_hook|1
 bx r1
-.pool
+.pool*/
 
 .org 0x0800779A
 ldr r1, =obj_delete_all_hook|1
@@ -278,10 +278,10 @@ bxr4:
 bx r4
 .pool
 
-.org 0x0808265C
+/*.org 0x0808265C
 ldr r3, =ov_emot_load|1
 bx r3
-.pool
+.pool*/
 
 /*.org 0x08083614
 ldr r1, =oec01_load_pal_impl|1
@@ -291,4 +291,9 @@ bx r1
 .org 0x0808365C
 ldr r1, =oec02_load_pal_impl|1
 bx r1
-.pool*/
+.pool*/
+
+.org 0x0805E510
+ldr r1, =npc_delete_obj_and_free_tiles_for_npc_hack|1
+bx r1
+.pool

patches/overworlds/overworld.asm

@@ -16,10 +16,10 @@ strb r0, [r4]
 ldrb r0, [r5, #3]
 strb r0, [r4, #0x1A]
 
-.org 0x0805E510
+/*.org 0x0805E510
     ldr r1, =overworld_h_two+1
     bx r1
-    .pool
+    .pool*/
 
 .org 0x0805E744
     lsl r4, r4, #0x10

sots-private

@@ -1 +1 @@
-Subproject commit 1824abff46e5206961d42a691f6235f8c82e125d
+Subproject commit 50f15740eefbb1757648d648c46e2b50a1170f62

src/overworld/dynamic_overworld.c

@@ -81,14 +81,12 @@ void npc_dynamic_reset() {
     }
 }
 
-void npc_dynamic_remove_entry(u8 id, u16 tag) {
-    if (stored_palettes[id].tag == tag) {
-        if (stored_palettes[id].reference_count > 0) {
-            stored_palettes[id].reference_count--;
-            dprintf("npc_dynamic: removed entry #%d\n", id);
-            if (stored_palettes[id].reference_count == 0)
-                stored_palettes[id].tag = 0;
-        }
+void npc_dynamic_remove_entry(u8 id) {
+    if (stored_palettes[id].reference_count > 0) {
+        stored_palettes[id].reference_count--;
+        dprintf("npc_dynamic: removed entry #%d\n", id);
+        if (stored_palettes[id].reference_count == 0)
+            stored_palettes[id].tag = 0;
     }
 }
 
@@ -106,8 +104,7 @@ void npc_restore_state(u8 id, u16 x, u16 y) {
 
     struct Template template_to_load;
     u32 f14;
-    npc_to_objtemplate__with_indexed_objfunc(type_id, npc_to_load->running_behavior, &template_to_load,
-                                             &f14);
+    npc_to_objtemplate__with_indexed_objfunc(type_id, npc_to_load->running_behavior, &template_to_load, &f14);
     template_to_load.pal_tag = 0xFFFF;
     s8 pal_slot = npc_dynamic_load_palette(type_to_load->pal_num);
 
@@ -222,3 +219,15 @@ void oec02_load_pal_impl(u32 *oe_script) {
     }
     *oe_script += 4;
 }
+
+void npc_delete_obj_and_free_tiles_for_npc_hack(struct NpcState *state) {
+    struct SpriteTiles tiles;
+    u16 npc_id = ((u16)state->type_id) | (((u16)state->field1A << 8));
+    struct NpcType *type = npc_get_type(npc_id);
+    tiles.size = type->field_6;
+    objects[state->oam_id].gfx_table = &tiles;
+    u8 pal_num = objects[state->oam_id].final_oam.palette_num;
+    obj_delete_and_free(&objects[state->oam_id]);
+    npc_dynamic_remove_entry(pal_num);
+    dprintf("deleted npc state at x: %d y: %d\n", state->to.x, state->to.y);
+}