Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

src/battle_bg/battle_bg_hook.s

@@ -47,4 +47,4 @@ bxr1:
 	bx r1
 bxr0:
 	bx r0
-*/
+*/

src/dns/dns_core.c

@@ -367,7 +367,7 @@ void dns_mapdata_load_palette_one(struct mapdata_header* data_header) {
 void dns_apply_lighting(void* blockset, u8 secondary, struct color* buffer) {
     if (dns_get_time_of_day() != NIGHT)
         return;
-    for (int i = 0; i < (sizeof (lightmap) / sizeof (lightmap[0])); ++i) {
+    for (unsigned int i = 0; i < (sizeof (lightmap) / sizeof (lightmap[0])); ++i) {
         if (blockset == lightmap[i].blockset) {
             buffer[(lightmap[i].pal - (secondary ? 7 : 0)) * 16 + lightmap[i].index] = lightmap[i].color;
         }
@@ -442,4 +442,4 @@ void dns_pal_patch_for_npc(u16 tag, u8 pal_slot) {
     tint_palette(pal_slot);
     dns_apply_shaders(pal_slot + 16, 1, palette_unfaded_buffer);
 }
-/*use fade in animation, load palettes according to current fade state*/
+/*use fade in animation, load palettes according to current fade state*/

src/savefile/flag_manipulation.c

@@ -28,6 +28,8 @@
 */
 #include <pokeagb/pokeagb.h>
 
+#include <agb_debug.h>
+
 #define TRAINER_FLAG_SPACE_START 0x1000
 
 extern u16 tb_modify_flag_id(u16 flag_id);
@@ -122,4 +124,4 @@ bool var_set_script_hack(struct ScriptEnvironment *env) {
     u16 val = script_read_halfword(env);
     var_set_hack(var, val);
     return 0;
-}
+}