start revamp dns

g3headers

@@ -1 +1 @@
-Subproject commit f332778115f7c814f63d2192bcd4bce5504ecf00
+Subproject commit 252b211d9c1cefed1ed41ae2a42a34043a1145cc

main.asm

@@ -46,7 +46,8 @@
 
 .include "patches/overworlds/pkm_wild.asm"
 .include "patches/overworlds/trainer.asm"
-//.include "patches/dns/core.asm"
+
+.include "patches/dns/core.asm"
 
 .include "patches/overworlds/overworld.asm"
 

patches/dns/core.asm

@@ -21,4 +21,30 @@
 .org 0x08056578
     //ldr r0, =dns_cb_overworld_hacked+1
     //bx r0
-    //.pool
+    //.pool
+
+
+//new dn system
+
+//tile palettes
+.org 0x080599C8
+    ldr r3, =dns_blockset_load_palette+1
+    bx r3
+    .pool
+
+//oec palettes
+.org 0x08083614
+ldr r1, =dns_oec01_load_pal_impl|1
+bx r1
+.pool
+
+.org 0x0808365C
+ldr r1, =dns_oec02_load_pal_impl|1
+bx r1
+.pool
+
+//npc palettes
+.org 0x0805F538
+ldr r2, =dns_pal_patch_for_npc|1
+bx r2
+.pool

patches/dynamic_overworld_hooks.asm

@@ -283,16 +283,6 @@ ldr r3, =ov_emot_load|1
 bx r3
 .pool*/
 
-/*.org 0x08083614
-ldr r1, =oec01_load_pal_impl|1
-bx r1
-.pool
-
-.org 0x0808365C
-ldr r1, =oec02_load_pal_impl|1
-bx r1
-.pool*/
-
 .org 0x0805E510
 ldr r1, =npc_delete_obj_and_free_tiles_for_npc_hack|1
 bx r1

src/include/dns.h

@@ -0,0 +1,10 @@
+#ifndef DNS_H_
+#define DNS_H_
+
+#include <pokeagb/pokeagb.h>
+
+#define DNS_ACTICE 1
+
+void dns_modify_palette(union Color* buffer, u16 size);
+
+#endif

src/overworld/dns/dns.c

@@ -0,0 +1,137 @@
+#include <pokeagb/pokeagb.h>
+#include <agb_debug.h>
+#include <dns.h>
+
+#define DNS_BUF_SIZE 256
+#define DNS_SEC_PAL_START 224
+#define DNS_SEC_PAL_START_C (DNS_SEC_PAL_START / 2)
+
+#define crgb5(r,g,b) (union Color)(((u16)(((b) << 10) | ((g)<<5) | ((r)))))
+#define rgb82rgb5(r,g,b) (crgb5(r/8, g/8, b/8))
+
+const union Color dns_color_times[5] = {
+    rgb82rgb5(70, 70, 196),
+    rgb82rgb5(70, 70, 196),
+    rgb82rgb5(70, 70, 196),
+    rgb82rgb5(70, 70, 196),
+    rgb82rgb5(70, 70, 196)
+};
+
+union Color dns_color_multiply(union Color a, union Color b);
+
+
+void dns_blockset_load_palette(struct MapBlockset* blockset, u16 offset, u16 size){
+    dprintf("loading blocset 0x%x\n", blockset);
+    if(blockset != NULL){
+        union Color *dns_buffer = malloc(DNS_BUF_SIZE*2);
+        if(blockset->secondary > 0)
+        {
+            if(blockset->secondary == 1)
+            {
+                //load secondary palette uncompressed
+                memcpy(dns_buffer, blockset->palettes+DNS_SEC_PAL_START, size);
+                dns_modify_palette(dns_buffer, size/2);
+                gpu_pal_apply(dns_buffer, offset,size);
+                load_palette3(offset, size/2);
+            }
+            else
+            {
+                //load secondary palette compressed 
+                LZ77UnCompWram(blockset->palettes, dns_buffer);
+
+                dns_modify_palette(&dns_buffer[DNS_SEC_PAL_START_C], size/2);
+
+                gpu_pal_apply(&dns_buffer[DNS_SEC_PAL_START_C], offset, size);
+                load_palette3(offset,size/2);
+                
+            }
+        }
+        else
+        {
+            union Color black;
+            black.packed = 0x0000;
+            gpu_pal_apply(&black, 0, 2);
+            memcpy(dns_buffer, blockset->palettes, size);
+            dns_modify_palette(dns_buffer, size/2);
+            gpu_pal_apply(&dns_buffer[1], offset+1, size-2);
+            load_palette3(offset+1, (size-2)/2);
+            //load primary palette
+            
+        }
+        free(dns_buffer);
+    }
+}
+
+void dns_oec01_load_pal_impl(u32 *oe_script) {
+    struct SpritePalette *pal = (struct SpritePalette *)oe_read_word(oe_script);
+    struct SpritePalette palToApply = {
+        .data = NULL,
+        .tag = pal->tag
+    };
+    u8 idx = gpu_pal_tags_index_of(palToApply.tag);
+
+    union Color *buffer = malloc(32);
+    memcpy(buffer, pal->data, 32);
+    dns_modify_palette(buffer, 16);
+    palToApply.data = buffer;
+
+    gpu_pal_obj_alloc_tag_and_apply(&palToApply);
+    if(idx == 0xFF) {
+        u8 idx = gpu_pal_tags_index_of(palToApply.tag);
+        tint_palette_switch(idx);
+    }
+    idx = gpu_pal_tags_index_of(palToApply.tag);
+    free(buffer);
+    palette_obj_807AA8C(idx);
+    *oe_script += 4;
+}
+
+void dns_oec02_load_pal_impl(u32 *oe_script) {
+    struct SpritePalette *pal = (struct SpritePalette *)oe_read_word(oe_script);
+    struct SpritePalette palToApply = {
+        .data = NULL,
+        .tag = pal->tag
+    };
+    u8 idx = gpu_pal_tags_index_of(palToApply.tag);
+
+    union Color *buffer = malloc(32);
+    memcpy(buffer, pal->data, 32);
+    dns_modify_palette(buffer, 16);
+    palToApply.data = buffer;
+    
+    gpu_pal_obj_alloc_tag_and_apply(&palToApply);
+    if(idx == 0xFF) {
+        u8 idx = gpu_pal_tags_index_of(palToApply.tag);
+        tint_palette_switch(idx);
+    }
+    free(buffer);
+    *oe_script += 4;
+}
+
+void dns_pal_patch_for_npc(u16 tag, u8 idx)
+{
+    extern struct SpritePalette ow_pal_table[1100];
+    u16 npcPalIdx = hacked_npc_pal_idx_for_given_tag(tag);
+    union Color *buffer = malloc(32);
+    memcpy(buffer, ow_pal_table[npcPalIdx].data,32);
+    dns_modify_palette(buffer,16);
+    gpu_pal_apply(buffer, 256 + 16*idx, 32);
+
+    free(buffer);
+    tint_palette_switch(idx);
+}
+
+void dns_modify_palette(union Color* buffer, u16 size){
+    if(current_map_header.light == 8)
+        return;
+    for(u16 i = 0; i < size; ++i) {
+        buffer[i] = dns_color_multiply(dns_color_times[0], buffer[i]);
+    }
+}
+
+union Color dns_color_multiply(union Color a, union Color b) {
+    u32 red = (a.components.r * b.components.r) / 31;
+    u32 green = (a.components.g * b.components.g) / 31;
+    u32 blue = (a.components.b * b.components.b) / 31;
+    return crgb5(red,green,blue);
+}

src/overworld/dynamic_overworld.c

@@ -191,35 +191,6 @@ u8 npc_spawn_with_provided_template(struct RomNpc *npc, struct Template *templat
     return state;
 }
 
-void oec01_load_pal_impl(u32 *oe_script) {
-    struct SpritePalette *pal = (struct SpritePalette *)oe_read_word(oe_script);
-    s8 allocated = npc_dynamic_find_palette(pal->tag);
-    if (allocated == -1)
-        allocated = npc_dynamic_allocate_palette(pal->tag);
-    if (allocated > 0) {
-        gpu_pal_apply(pal->data, 256 + (16 * allocated), 32);
-        tint_palette_switch(allocated);
-        palette_obj_807AA8C(allocated);
-    } else {
-        dprintf("ERROR: RAN OUT OF PALETTES FOR DYNAMIC SYSTEM\n");
-    }
-    *oe_script += 4;
-}
-
-void oec02_load_pal_impl(u32 *oe_script) {
-    struct SpritePalette *pal = (struct SpritePalette *)oe_read_word(oe_script);
-    s8 allocated = npc_dynamic_find_palette(pal->tag);
-    if (allocated == -1)
-        allocated = npc_dynamic_allocate_palette(pal->tag);
-    if (allocated > 0) {
-        gpu_pal_apply(pal->data, 256 + (16 * allocated), 32);
-        tint_palette_switch(allocated);
-    } else {
-        dprintf("ERROR: RAN OUT OF PALETTES FOR DYNAMIC SYSTEM\n");
-    }
-    *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));