72%

mkst · Jun 3, 2024 · 7fcd945 · 7fcd945
1 parent 09579ca
commit 7fcd945
Show file tree

Hide file tree

Showing 34 changed files with 1,139 additions and 1,079 deletions.
diff --git a/include/animals.h b/include/animals.h
@@ -90,4 +90,10 @@
 #define WATER_DAMAGE        1024
 #define WATER_DAMAGE_X2     2048
 
+// sizing
+
+#define SCALE_EVO_MICROCHIP 25
+#define SCALE_ELEPHANT      160
+#define SCALE_GORILLA       154
+
 #endif
diff --git a/include/common.h b/include/common.h
@@ -21,6 +21,9 @@ typedef u8 Addr[];
 // TODO: EU version of these
 #define CHECK_SEGMENT          (0, (((D_803D5524->biome == D_803F2D50.segment) || ((D_803D5524->biome == 0) && ((D_803F2D50.segment == 4) || (D_803F2D50.segment == 5)))) ? (1) : (0)))
 
+#define SET_JOINT(j0, j1, scale, x, y, z, f, g, flip, i, dl) \
+    func_802C78B0_6D8F60(j0, j1, (scale*(x)) >> 6, (scale*(y)) >> 6, (scale*(z)) >> 6, f, g, flip, i, dl)
+
 #define SIN(x)                 D_80152C78[((s16)(x)       ) & 0xFF]
 #define COS(x)                 D_80152C78[((s16)(x) + 0x40) & 0xFF]
 

diff --git a/include/functions.us.h b/include/functions.us.h
@@ -969,10 +969,10 @@ void func_8033B9B8_74D068(u8);
 void func_8033C054_74D704(u8);
 void func_8033C320_74D9D0(u8);
 void reset_camera(void);
-s32  func_8033C814_74DEC4(s16 arg0, s16 arg1, s16 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, u8 arg8);
-s32  func_8033C8EC_74DF9C(s16 arg0, s16 arg1, s16 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7);
-s32  func_8033C9CC_74E07C(s16 arg0, s16 arg1, s16 arg2, u8 arg3, s16 arg4, s16 arg5, s16 arg6, u8 arg7, u8 arg8, u8 arg9);
-s32  func_8033D604_74ECB4(s16 arg0, s16 arg1, s16 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7);
+s16  func_8033C814_74DEC4(s16 arg0, s16 arg1, s16 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, u8 arg8);
+s16  func_8033C8EC_74DF9C(s16 arg0, s16 arg1, s16 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7);
+s16  func_8033C9CC_74E07C(s16 arg0, s16 arg1, s16 arg2, u8 arg3, s16 arg4, s16 arg5, s16 arg6, u8 arg7, u8 arg8, u8 arg9);
+s16  func_8033D604_74ECB4(s16 arg0, s16 arg1, s16 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7);
 s16  func_8033DF88_74F638(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7, s16 arg8, s16 arg9); // tbd
 void func_8033E430_74FAE0(void);
 void func_8033E6B8_74FD68(f32 arg0, f32 arg1, f32 arg2, f32 *arg3, f32 *arg4, f32 *arg5);
@@ -1391,7 +1391,7 @@ void func_803962EC_7A799C(Gfx **dl, s16 p_screen_x, s16 p_screen_y, s16 arg3, s1
 void func_8039661C_7A7CCC(s16 arg0, s16 arg1, s16 arg2);
 s32  func_80396714_7A7DC4(void);
 s32  func_80396748_7A7DF8(void);
-void func_803967D4_7A7E84(u16 arg0, s16 arg1, u8 red, u8 green, u8 blue, s16 head, s16 torso, s16 arms, s16 legs, s16 arg9);
+// void func_803967D4_7A7E84(u16 arg0, s16 arg1, u8 red, u8 green, u8 blue, s16 head, s16 torso, s16 arms, s16 legs, s16 arg9);
 
 // overlay2_7A8A50
 void func_803973A0_7A8A50(s16);

diff --git a/include/ld_symbols.us.h b/include/ld_symbols.us.h
@@ -375,6 +375,7 @@ extern Addr _103B30_bin;
 extern Addr _1043A0_bin;
 extern Addr _104420_bin;
 extern Addr _104440_bin;
+extern Addr _2CB20_data__s;
 extern Addr _2E5C0_data__s;
 extern Addr _2FA70_data__s;
 extern Addr _2FD80_data__s;

diff --git a/include/macro.inc b/include/macro.inc
@@ -6,10 +6,16 @@
 
 .macro glabel label
     .global \label
-    .balign 4
+    .type \label, @function
     \label:
 .endm
 
-.macro .word32 x
-    .word \x
+.macro dlabel label
+    .global \label
+    \label:
+.endm
+
+.macro jlabel label
+    .global \label
+    \label:
 .endm
diff --git a/include/structs.h b/include/structs.h
@@ -783,21 +783,23 @@ struct Animal {
     /* 0x165 */ u8  unk165[0x3];
     /* 0x168 */ Animal *owner; // owner
     /* 0x16C */ struct035* unk16C;
-    /* 0x170 */ u8  unk170;
-    /* 0x172 */ s16 unk172;
+
+    /* 0x170 */ u8  unk170; // current waypoint mode?
+    /* 0x172 */ s16 waypointFudgeFactor;
     /* 0x174 */ struct {
                     s8 unk0 : 4;
                     s8 unk4 : 4;
                     s8 unk8 : 8;
                 } unk174;
     /* 0x174 */ s16 unk176; // waypoint related
-    /* 0x178 */ s16 unk178; // targetXPos for waypoint?
-    /* 0x17A */ s16 unk17A; // targetZPos for waypoint?
-    /* 0x17C */ s16 unk17C; // targetYPos for waypoint
-    /* 0x17E */ s16 unk17E; // initialXPos for waypoint?
-    /* 0x180 */ s16 unk180; // initialZPos for waypoint?
-    /* 0x182 */ s16 unk182; // initialYPos for waypoint?
-    /* 0x184 */ s16 unk184; // some kind of speed factor for waypoints?
+    /* 0x178 */ s16 waypointTargetXPos;
+    /* 0x17A */ s16 waypointTargetZPos;
+    /* 0x17C */ s16 waypointTargetYPos;
+    /* 0x17E */ s16 waypointStartXPos;
+    /* 0x180 */ s16 waypointStartZPos;
+    /* 0x182 */ s16 waypointStartYPos;
+    /* 0x184 */ s16 waypointVelocity;
+
     /* 0x188 */ Animal *target;
     /* 0x18C */ u8  unk18C;
     /* 0x18D */ u8  unk18D[5];
@@ -2392,26 +2394,32 @@ typedef struct {
 } struct099; // particle, size 0x18?
 
 typedef struct {
-  u16  unk0;  // flags
+  u16  flags;  // flags
   u8   unk2;  // ?
-  s8   unk3;  // tris?
+  s8   tris;  // tris?
 } struct102_inner; // size 0x4
 
+// typedef struct {
+//     s16 unk0; // tc0
+//     s16 unk2; // tc1
+//     u8  unk4; // cn[0] / r
+//     u8  unk5; // cn[1] / g
+//     u8  unk6; // cn[2] / b
+//     s8  unk7; // x
+//     s16 unk8; // y
+//     s8  unkA; // z
+//     u8  unkB; // cn[3] / a
+// } struct102_payload; // size 0xC
+
 typedef struct {
-    s16 unk0; // tc0
-    s16 unk2; // tc1
-    u8  unk4; // cn[0] / r
-    u8  unk5; // cn[1] / g
-    u8  unk6; // cn[2] / b
-    s8  unk7; // x
-    s16 unk8; // y
-    s8  unkA; // z
-    u8  unkB; // cn[3] / a
-} struct102_payload; // size 0xC
+    s16 unk0; // tbd
+    s16 unk2; // tbd
+    s16 unk4[4];
+} struct102_payload_2; // size 0xC
 
 typedef struct {
   /* 0x00 */ struct102_inner unk0;
-  /* 0x04 */ struct102_payload unk4[4];
+  /* 0x04 */ struct102_payload_2 unk4[4];
 } struct102; // size 0x34?
 
 typedef struct {

diff --git a/include/variables.us.h b/include/variables.us.h
@@ -155,8 +155,8 @@ extern u8   D_04007B40[];
 extern u8   D_04007C60[];
 extern u8   D_04007D90[];
 extern u8   D_04007DD0_E5390[];
-extern u8   D_04007E70[];
-extern u8   D_04007E90[];
+extern u8   D_04007E70_E5430[];
+extern u8   D_04007E90_E5450[];
 extern u8   D_04007EC0[];
 extern u8   D_04007FA0_11EB70[];
 extern u8   D_04008290_107FE0[];