Use hex instead of decimal

4 files changed, 84 insertions, 84 deletions

diff --git a/src/code/code_0x800A5AC0.c b/src/code/code_0x800A5AC0.c
index 88216c55c..ce9a6abeb 100644
--- a/src/code/code_0x800A5AC0.c
+++ b/src/code/code_0x800A5AC0.c
@@ -4,48 +4,48 @@
 // TODO this file looks like an actor, it should be cleaned up as such
 
 UNK_RET func_800A5AC0(void* a0, UNK_TYPE a1) {
-    struct s800A5AC0* s0 = (struct s800A5AC0*)a0;
-    s0->unk278 = ((s0->unk28 >> 8) & 0xFF) | 0x300;
-    s0->unk28 = (s0->unk28 & 0xFF) - 9;
+    s800A5AC0* s0 = (s800A5AC0*)a0;
+    s0->unk116 = ((s0->unk1C >> 8) & 0xFF) | 0x300;
+    s0->unk1C = (s0->unk1C & 0xFF) - 9;
     func_800FFADC((z_Actor*)s0, (z_ActorCompInitEntry*)&D_801ADEAC);
-    func_800B3BA4(&s0->unk188, 0, (void*)&func_800B3FC0, 0x41400000);
-    func_800E1374(a1, &s0->unk328, (z_Actor*)s0, &D_801ADE80);
-    func_800E7DF8((z_Actor*)s0, &s0->unk328);
-    s0->unk182 = 255;
-    s0->unk324 = func_800A5B98;
+    func_800B3BA4(&s0->unkBC, 0, (void*)&func_800B3FC0, 0x41400000);
+    func_800E1374(a1, &s0->unk148, (z_Actor*)s0, &D_801ADE80);
+    func_800E7DF8((z_Actor*)s0, &s0->unk148);
+    s0->unkB6 = 255;
+    s0->unk144 = func_800A5B98;
 }
 
-UNK_RET func_800A5B6C(struct s800A5AC0* a0, z_GlobalContext* a1) {
-    UNK_TYPE* a2 = &a0->unk328;
+UNK_RET func_800A5B6C(s800A5AC0* a0, z_GlobalContext* a1) {
+    UNK_TYPE* a2 = &a0->unk148;
     func_800E11EC(a1, a2);
 }
 
-UNK_RET func_800A5B98(struct s800A5AC0* a0, UNK_TYPE a1) {
+UNK_RET func_800A5B98(s800A5AC0* a0, UNK_TYPE a1) {
     s16 v0;
     s32 v1;
     if (func_800B84D0(a0, a1) != 0) {
-        a0->unk324 = (void(*)(struct s800A5AC0*, UNK_TYPE))func_800A5C28; //! Is this cast correct?
+        a0->unk144 = (void(*)(s800A5AC0*, UNK_TYPE))func_800A5C28; //! Is this cast correct?
     } else {
-        v0 = a0->unk146 - a0->unk190;
+        v0 = a0->unk92 - a0->unkBE;
         v1 = (v0 < 0)? -v0 : v0;
-        if ((v1 < 10240) || ((a0->unk28 == 1) && (v1 > 22528))) {
+        if ((v1 < 10240) || ((a0->unk1C == 1) && (v1 > 22528))) {
             func_800B863C(a0, a1);
         }
     }
 }
 
-UNK_RET func_800A5C28(struct s800A5AC0* a0) {
+UNK_RET func_800A5C28(s800A5AC0* a0) {
     if (func_800B867C(a0) != 0) {
-        a0->unk324 = func_800A5B98;
+        a0->unk144 = func_800A5B98;
     }
 }
 
-UNK_RET func_800A5C60(struct s800A5AC0* a0, UNK_TYPE a1) {
-    (a0->unk324)(a0, a1);
+UNK_RET func_800A5C60(s800A5AC0* a0, UNK_TYPE a1) {
+    (a0->unk144)(a0, a1);
     func_800B675C(a0, 0x42340000);
-    func_800E2928(a1, a1 + 0x18884, &a0->unk328);
+    func_800E2928(a1, a1 + 0x18884, &a0->unk148);
 }
 
-UNK_RET func_800A5CB8(struct s800A5AC0* a0, UNK_TYPE a1) {
-    func_800BDFC0(a1, D_801ADEB0[a0->unk28], a1, a0);
+UNK_RET func_800A5CB8(s800A5AC0* a0, UNK_TYPE a1) {
+    func_800BDFC0(a1, D_801ADEB0[a0->unk1C], a1, a0);
 }
diff --git a/src/code/code_0x800BF9A0.c b/src/code/code_0x800BF9A0.c
index 1b22f04a4..4617d11b6 100644
--- a/src/code/code_0x800BF9A0.c
+++ b/src/code/code_0x800BF9A0.c
@@ -3,7 +3,7 @@
 
 UNK_RET func_800BF9A0(UNK_TYPE a0, UNK_TYPE a1) {
     s32 i;
-    s800BF9A0_s* s0;
+    s800BF9A0* s0;
     UNK_TYPE v1;
 
     func_8008439C(-2, 0);
@@ -11,27 +11,27 @@ UNK_RET func_800BF9A0(UNK_TYPE a0, UNK_TYPE a1) {
     func_800847CC(&D_801DCBC4);
 
     for (i = 0, s0 = &D_801AEFD0; i < D_801B4610; i++, s0++) {
-        v1 = s0->unk12 - s0->unk8;
-        if (s0->unk16 == 0) continue;
-        func_800847CC(&D_801DCBE4, i, s0->unk16, s0->unk16 + v1, s0->unk30, &D_801DCBFC);
+        v1 = s0->unkC - s0->unk8;
+        if (s0->unk10 == 0) continue;
+        func_800847CC(&D_801DCBE4, i, s0->unk10, s0->unk10 + v1, s0->unk1E, &D_801DCBFC);
     }
 }
 
 UNK_TYPE func_800BFA78(UNK_TYPE a0, UNK_TYPE a1) {
     s32 i;
-    s800BF9A0_s* v0 = &D_801AEFD0;
+    s800BF9A0* v0 = &D_801AEFD0;
     UNK_TYPE t1;
     UNK_TYPE a2;
     UNK_TYPE a0_2 = a0;
 
     for (i = 0; i < D_801B4610; i++, v0++) {
-        t1 = v0->unk8 - v0->unk16;
-        a2 = v0->unk12 - v0->unk8;
+        t1 = v0->unk8 - v0->unk10;
+        a2 = v0->unkC - v0->unk8;
 
-        if (v0->unk16 == 0) continue;
-        if (a0_2 < v0->unk16) continue;
+        if (v0->unk10 == 0) continue;
+        if (a0_2 < v0->unk10) continue;
 
-        if (a0_2 < (v0->unk16 + a2)) {
+        if (a0_2 < (v0->unk10 + a2)) {
             return a0_2 + t1;
         }
     }
diff --git a/src/code/code_0x800CAAD0.c b/src/code/code_0x800CAAD0.c
index e5fc11c21..748b162ab 100644
--- a/src/code/code_0x800CAAD0.c
+++ b/src/code/code_0x800CAAD0.c
@@ -2,98 +2,98 @@
 #include <global.h>
 
 UNK_RET func_800CAAD0(UNK_TYPE a0, UNK_TYPE a1, UNK_TYPE a2) {
-    UNK_TYPE sp208;
-    UNK_TYPE sp144;
-    UNK_TYPE sp80;
-    UNK_TYPE sp68;
-    UNK_TYPE sp56;
-    UNK_TYPE sp36;
-    
+    UNK_TYPE spD0;
+    UNK_TYPE sp90;
+    UNK_TYPE sp50;
+    UNK_TYPE sp44;
+    UNK_TYPE sp38;
+    UNK_TYPE sp24;
+
     s800CAAD0* v1;
-    
+
     if (func_800C6024(a1) == 0) return;
-    
+
     v1 = (s800CAAD0*)(a0 + a1 * 100);
-    
-    func_80139894(&sp208, v1->unk104, v1->unk108, v1->unk112, v1->unk116, v1->unk118,
-                  v1->unk120, v1->unk124, v1->unk128, v1->unk132);
-    
-    if (func_80139188(&sp208, &sp144) == 2) return;
-    
-    func_80139894(&sp80, v1->unk136, v1->unk140, v1->unk144, v1->unk148, v1->unk150,
-                  v1->unk152, v1->unk156, v1->unk160, v1->unk164);
-                  
-    func_80138C88(&sp144, (UNK_PTR)(a2 + 36), &sp36);
-    func_80138C88(&sp80, &sp56, &sp68);
-    
-    v1->unk0 = *(UNK_TYPE*)((u8*)sp36 + 0);
-    v1->unk4 = *(UNK_TYPE*)((u8*)sp36 + 4);
-    v1->unk8 = *(UNK_TYPE*)((u8*)sp36 + 8);
+
+    func_80139894(&spD0, v1->unk68, v1->unk6C, v1->unk70, v1->unk72, v1->unk74,
+                  v1->unk76, v1->unk7C, v1->unk80, v1->unk84);
+
+    if (func_80139188(&spD0, &sp90) == 2) return;
+
+    func_80139894(&sp50, v1->unk88, v1->unk8C, v1->unk90, v1->unk94, v1->unk96,
+                  v1->unk98, v1->unk9C, v1->unkA0, v1->unkA4);
+
+    func_80138C88(&sp90, (UNK_PTR)(a2 + 36), &sp24);
+    func_80138C88(&sp50, &sp38, &sp44);
+
+    v1->unk0 = *(UNK_TYPE*)((u8*)sp24 + 0);
+    v1->unk4 = *(UNK_TYPE*)((u8*)sp24 + 4);
+    v1->unk8 = *(UNK_TYPE*)((u8*)sp24 + 8);
 }
 
 UNK_RET func_800CAC0C(UNK_TYPE a0, UNK_TYPE a1, UNK_TYPE a2) {
     UNK_TYPE v0;
     s16 v1;
-    
+
     if (func_800C6024(a0) == 0) return;
-    
+
     v0 = a0 + a1 * 100;
-    
+
     v1 = *(s16*)(v0 + 150) - *(s16*)(v0 + 118);
-    
+
     if (*(s16*)a2 == 0) {
         *(s16*)(a2 + 2772) += v1;
     }
-    
+
     *(s16*)(a2 + 190) += v1;
     *(s16*)(a2 + 50) += v1;
 }
 
 UNK_RET func_800CACA0(UNK_TYPE a0, UNK_TYPE a1, UNK_TYPE a2) {
-    UNK_TYPE sp28;
-    
+    UNK_TYPE sp1C;
+
     if (func_800C6024(a2) == 0) return;
-    
-    sp28 = func_800C6248(a0, a2);
-    
-    if (sp28 == 0) return;
-    
-    func_800CAE88(sp28);
-    
+
+    sp1C = func_800C6248(a0, a2);
+
+    if (sp1C == 0) return;
+
+    func_800CAE88(sp1C);
+
     if ((*(u32*)(a1 + 4) & 0x04000000) == 0x0400) {
-        func_800CAF24(sp28);
+        func_800CAF24(sp1C);
     }
-    
+
     if ((*(u32*)(a1 + 4) & 0x20000) == 0x20000) {
-        func_800CAF38(sp28);
+        func_800CAF38(sp1C);
     }
 }
 
 UNK_TYPE func_800CAD2C(UNK_TYPE a0, UNK_TYPE a1, UNK_TYPE a2) {
     UNK_TYPE v1;
-    UNK_TYPE sp36 = 0;
-    
+    UNK_TYPE sp24 = 0;
+
     if (func_800C6024(a1) == 0) return;
-    
-    if (((*(u16*)(a0 + a1*2 + 5084) & 0x2) != 0) || 
+
+    if (((*(u16*)(a0 + a1*2 + 5084) & 0x2) != 0) ||
         ((*(u16*)(a0 + a1*2 + 5084) & 0x1) == 0)) {
         return 0;
     }
-    
+
     v1 = func_800C6248(a0, a1);
     if (v1 == 0) {
         return 0;
     }
-    
+
     if ((*(u32*)(v1 + 340) & 0x1) != 0) {
         func_800CAAD0(a0, a1, a2);
-        sp36 = 1;
+        sp24 = 1;
     }
-    
+
     if ((*(u32*)(v1 + 340) & 0x2) != 0) {
         func_800CAC0C(a0, a1, a2);
-        sp36 = 1;
+        sp24 = 1;
     }
-    
-    return sp36;
+
+    return sp24;
 }
diff --git a/src/code/code_0x800F4F40.c.ignore b/src/code/code_0x800F4F40.c.ignore
index 65830b4df..c28a46b28 100644
--- a/src/code/code_0x800F4F40.c.ignore
+++ b/src/code/code_0x800F4F40.c.ignore
@@ -6,7 +6,7 @@ void func_800F4F40(UNK_TYPE a0, UNK_TYPE a1, UNK_TYPE a2) {
 }
 
 void func_800F4F54(s800F4F54* a0, u8 a1, UNK_TYPE a2) {
-    u32 arg0 = (u32)a0 + a0->unk92152 * (15 * 1024) + a2 + 19056;
+    u32 arg0 = (u32)a0 + a0->unk167F8 * (15 * 1024) + a2 + 19056;
     u32 arg1 = ((a1 * 128) - 4096) + (u32)&D_00ACC000;
     func_80080C90(arg0, arg1, 128);
 }