started to make npcs dynamic once again

bpre.sym

@@ -83,6 +83,8 @@ wram_decompress = 0x081E3B70|1;
 battle_script_push = 0x08017544|1;
 objects = 0x0202063C;
 
+stored_palettes = 0x0203FF00;
+
 fade_screen = 0x08070589;
 fade_update = 0x080704D1;
 

g3headers

@@ -1 +1 @@
-Subproject commit 22ac0f74bd5d9c9a951e6d7f17cd8912a0ca2d39
+Subproject commit f7f112b0d286765a4396669278cb0595a7a69ff5

main.asm

@@ -7,8 +7,7 @@
 .include "patches/hooks.asm"
 
 
-//no dynamic overworlds, sorry :T
-//.include "patches/dynamic_overworld_hooks.asm"
+.include "patches/dynamic_overworld_hooks.asm"
 
 
 .include "patches/special.asm"

patches/dynamic_overworld_hooks.asm

@@ -1,4 +1,4 @@
-.org 0x5f574 + 0x08000000
+/*.org 0x5f574 + 0x08000000
 ldr r0, =ClearAllPalettes|1
 bx r0
 .pool
@@ -247,4 +247,22 @@ lsl r0, #0
 .byte 1
 .byte 0x22
 .byte 0x5
-.byte 0xE0
+.byte 0xE0*/
+
+.org 0x0805E590
+ldr r5, =npc_spawn_with_provided_template|1
+bx r5
+
+.pool
+
+.org 0x08007280
+ldr r1, =obj_delete_and_free_tiles_hook|1
+bx r1
+
+.pool
+
+.org 0x0800779A
+ldr r1, =obj_delete_all_hook|1
+bx r1
+
+.pool

src/overworld/dyn_npc_hooks.S

@@ -1,9 +1,28 @@
 .align 2
-.text
 .thumb
+.text
+
+.global obj_delete_and_free_tiles_hook
+obj_delete_and_free_tiles_hook:
+	push {r4-r7,lr}
+	mov r5, r0
+    ldrb r0, [r5,#5]
+    lsr r0, #4
+    bl npc_dynamic_remove_entry
+	mov r0, r5
+	add r0, #0x3E
+	ldrb r1, [r0]
+	ldr r0, =0x8007288+1
+	bx r0
+
+.global obj_delete_all_hook
+obj_delete_all_hook:
+ldr r1, =obj_delete
+bl bxr1
+bl npc_dynamic_reset
+pop {r4-r5}
+pop {r0}
+bx r0
 
-.global npc_spawn_hook:
-npc_spawn_hook:
-    ldrh r0, [r6, #2]
-    bl dynamic_npc_load_palette
-    lsl r1, r0, #4
+bxr1:
+bx r1

src/overworld/dynamic_overworld.c

@@ -1,22 +1,109 @@
 #include <pokeagb/pokeagb.h>
 
-enum PalStoreType{
-    UNUSED,
-    NPC,
-    REFLECTION,
-    OTHER
-};
+#define MAX_PAL_STORE 16
 
-struct PalStoreEntry{
-    enum PalStoreType type;
+struct PalStoreEntry {
     u8 reference_count;
-    u16 tag; 
+    u16 tag;
 };
 
 extern struct PalStoreEntry stored_palettes[16];
 
-u8 dynamic_npc_load_palette(u16 tag)
-{
+extern struct NpcType *npc_get_type(u16 id);
+
+extern void dprintf(const char *str, ...);
+
+s8 npc_dynamic_find_palette(u16 tag) {
+    for (s8 i = 0; i < MAX_PAL_STORE; ++i) {
+        if (stored_palettes[i].reference_count > 0 && stored_palettes[i].tag == tag)
+            return i;
+    }
+    return -1;
+}
+
+s8 npc_dynamic_allocate_palette(u16 tag) {
+    for (s8 i = 0; i < MAX_PAL_STORE; ++i) {
+        if (stored_palettes[i].reference_count == 0) {
+            stored_palettes[i].tag = tag;
+            stored_palettes[i].reference_count++;
+            return i;
+        }
+    }
+    return -1;
+}
+
+u8 npc_dynamic_load_palette(u16 tag) {
+    s8 store_entry = npc_dynamic_find_palette(tag);
+    if (store_entry != -1) {
+        stored_palettes[store_entry].reference_count++;
+        return store_entry;
+    }
+    store_entry = npc_dynamic_allocate_palette(tag);
+    if (store_entry == -1) {
+        /* we do not have allocation space left */
+        dprintf("ATTENTION: TRIED TO ALLOCATE DYNOVER PALETTE WITHOUT SPACE LEFT, INCREASING ZERO REFERENCE\n");
+        stored_palettes[0].reference_count++;
+        return 0;
+    }
+
+    pal_patch_for_npc(tag, (u8)store_entry);
+
+    return (u8)store_entry;
+}
+
+void npc_dynamic_reset() {
+    for (u8 i = 0; i < MAX_PAL_STORE; ++i) {
+        stored_palettes[i].reference_count = 0;
+        stored_palettes[i].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;
+    }
 }
 
+u8 npc_spawn_with_provided_template(struct RomNpc *npc, struct Template *template, u8 map, u8 bank, s16 x, s16 y) {
+    u8 state = rom_npc_to_npc_state(npc, map, bank);
+    if (state >= 16)
+        return 16;
+
+    struct NpcState *created_state = &npc_states[state];
+    struct NpcType *type = npc_get_type(created_state->type_id | (npc->field3 << 8));
+    s8 pal_slot = npc_dynamic_load_palette(type->pal_num);
+
+    if (created_state->running_behavior == 76)
+        created_state->field1 |= 0x20;
+    template->pal_tag = 0xFFFF;
+    u8 obj_id = template_instanciate_forward_search(template, 0, 0, 0);
+    if (obj_id == 64) {
+        created_state->bitfield &= 0xFE;
+        return 16;
+    }
+
+    struct Object *npc_object = &objects[obj_id];
+    npc_fix_position(x + created_state->to.x, y + created_state->to.y, &npc_object->pos1.x, &npc_object->pos1.y);
+    npc_object->shift.x = -(type->pos_neg_center.x / 2);
+    npc_object->shift.y = -(type->pos_neg_center.y / 2);
+    npc_object->pos1.x += 8;
+    npc_object->pos1.y += (s8)npc_object->shift.y + 16;
+
+    /* Set our allocated index */
+    npc_object->final_oam.palette_num = pal_slot;
+    npc_object->bitfield2 |= 2;
+    npc_object->priv[0] = state;
+    created_state->oam_id = obj_id;
+
+    u8 unknown = (created_state->field1 & 0xEF) | (16 * (type->pal_slot_unk << 25 >> 31));
+    created_state->field1 = unknown;
+    if (!(unknown & 0x10)) {
+        obj_anim_image_start(npc_object, npc_direction_to_obj_anim_image_number(created_state->direction));
+    }
+    npc_y_height_related(created_state->height >> 4, npc_object, 1);
+    npc_obj_offscreen_culling_and_flag_update(created_state, npc_object);
+    return state;
+}