ovl_En_Test4 with 1 non-matching (#319)

* Decompile update and stuff

* Decompile some more

* func_80A41FA4 non_matching

* init is a disaster

* Import bss

* match func_80A41D70

* Improve func_80A42AB8 a bit

* equivalent EnTest4_Init

* Import data

* CLOCK_TIME

* Run formatter

* func_80A42AB8 may be equivalent now, not completely sure

* match func_80A42AB8

* Some minor renames

* Name some struct members

* Format

* format in bigpo

* fix merge issue

* Apply suggestions from code review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Description: Day transition effects

* Un-rename unk_144

* Update include/macros.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* sIsLoaded

* Update src/overlays/actors/ovl_En_Test4/z_en_test4.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* review

* format

* daytemp

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

tools/disasm/variables.txt

@@ -978,13 +978,13 @@
     0x801BDBA0:("D_801BDBA0","UNK_TYPE1","",0x1),
     0x801BDBA4:("D_801BDBA4","UNK_TYPE1","",0x1),
     0x801BDBA8:("D_801BDBA8","UNK_TYPE1","",0x1),
-    0x801BDBB0:("D_801BDBB0","UNK_TYPE1","",0x1),
+    0x801BDBB0:("D_801BDBB0","u8","",0x1),
     0x801BDBB4:("D_801BDBB4","UNK_TYPE1","",0x1),
     0x801BDBB8:("D_801BDBB8","UNK_TYPE1","",0x1),
     0x801BDBBC:("D_801BDBBC","UNK_TYPE1","",0x1),
     0x801BDBC0:("D_801BDBC0","UNK_TYPE1","",0x1),
     0x801BDBC4:("D_801BDBC4","UNK_TYPE1","",0x1),
-    0x801BDBC8:("D_801BDBC8","UNK_TYPE1","",0x1),
+    0x801BDBC8:("D_801BDBC8","u8","",0x1),
     0x801BDBCC:("D_801BDBCC","UNK_TYPE1","",0x1),
     0x801BDCF4:("D_801BDCF4","UNK_TYPE1","",0x1),
     0x801BE38E:("D_801BE38E","UNK_TYPE1","",0x1),
@@ -4064,7 +4064,7 @@
     0x801F4E70:("D_801F4E70","UNK_TYPE1","",0x1),
     0x801F4E74:("D_801F4E74","UNK_TYPE1","",0x1),
     0x801F4E78:("D_801F4E78","UNK_TYPE1","",0x1),
-    0x801F4E7A:("D_801F4E7A","UNK_TYPE1","",0x1),
+    0x801F4E7A:("D_801F4E7A","s16","",0x2),
     0x801F4E80:("D_801F4E80","UNK_TYPE1","",0x1),
     0x801F4EE0:("D_801F4EE0","UNK_TYPE1","",0x1),
     0x801F4EE8:("D_801F4EE8","UNK_TYPE1","",0x1),
@@ -11773,14 +11773,14 @@
     0x80A41D68:("D_80A41D68","UNK_TYPE1","",0x1),
     0x80A41D6C:("D_80A41D6C","UNK_TYPE1","",0x1),
     0x80A43320:("En_Test4_InitVars","ActorInit","",0x20),
-    0x80A43340:("D_80A43340","UNK_TYPE4","",0x4),
-    0x80A43342:("D_80A43342","UNK_TYPE1","",0x1),
-    0x80A4334A:("D_80A4334A","UNK_TYPE1","",0x1),
-    0x80A43352:("D_80A43352","UNK_TYPE1","",0x1),
-    0x80A4335A:("D_80A4335A","UNK_TYPE1","",0x1),
-    0x80A43364:("D_80A43364","UNK_TYPE1","",0x1),
-    0x80A434D0:("D_80A434D0","s16","[2]",0x4),
-    0x80A434D4:("D_80A434D4","UNK_TYPE1","",0x1),
+    0x80A43340:("sIsLoaded","s32","[3]",0x6),
+    0x80A43342:("sNightMessages1","s16","[3]",0x6),
+    0x80A4334A:("sDayMessages1","s16","[3]",0x6),
+    0x80A43352:("sNightMessages2","s16","[3]",0x6),
+    0x80A4335A:("sDayMessages2","s16","[3]",0x6),
+    0x80A43364:("D_80A43364","u16","[2]",0x4),
+    0x80A434D0:("sCutscenes","s16","[2]",0x4),
+    0x80A434D4:("sCurrentCs","s16","",0x2),
     0x80A449E0:("En_Bat_InitVars","UNK_TYPE1","",0x1),
     0x80A44A00:("D_80A44A00","UNK_TYPE1","",0x1),
     0x80A44A2C:("D_80A44A2C","UNK_TYPE1","",0x1),

tools/permuter_settings.toml

@@ -12,6 +12,7 @@ ABS = "int"
 SQ = "int"
 CLAMP = "int"
 CLOCK_TIME = "int"
+CURRENT_DAY = "int"
 
 [decompme.compilers]
 "tools/ido_recomp/linux/7.1/cc" = "ido7.1"

tools/sfxconvert.py

@@ -61,7 +61,9 @@ def fix_sfx_flag(id):
     if(id.endswith(' - SFX_FLAG')):
         splitdata = id.split('-')
         return splitdata[0].strip(), ' -' + splitdata[1]
-    if not(int(id,16) & 0x800):
+    if id.endswith("U"):
+        id = id[:-1]
+    if not(int(id, 16) & 0x800):
         newid = '0x' + format(int(id,16) + 0x800,'X')
         sfxFlag = ' - SFX_FLAG'
     else :