diff --git a/assets/xml/code/sub_s.xml b/assets/xml/code/sub_s.xml
index 03329f0c5..76db7e32c 100644
--- a/assets/xml/code/sub_s.xml
+++ b/assets/xml/code/sub_s.xml
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index f73e9252f..e1a35f83b 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -1001,8 +1001,8 @@
-
-
+
+
@@ -1044,15 +1044,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1110,12 +1110,12 @@
-
+
-
-
+
+
diff --git a/assets/xml/objects/object_box.xml b/assets/xml/objects/object_box.xml
index fb1fb3fd5..85e788633 100644
--- a/assets/xml/objects/object_box.xml
+++ b/assets/xml/objects/object_box.xml
@@ -1,52 +1,53 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_ikana_obj.xml b/assets/xml/objects/object_ikana_obj.xml
index 66398991b..6040495ab 100644
--- a/assets/xml/objects/object_ikana_obj.xml
+++ b/assets/xml/objects/object_ikana_obj.xml
@@ -9,8 +9,8 @@
-
-
+
+
@@ -38,7 +38,7 @@
-
+
diff --git a/assets/xml/objects/object_mask_gero.xml b/assets/xml/objects/object_mask_gero.xml
index b6acf6c17..b6f4a6117 100644
--- a/assets/xml/objects/object_mask_gero.xml
+++ b/assets/xml/objects/object_mask_gero.xml
@@ -1,13 +1,14 @@
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_mastergolon.xml b/assets/xml/objects/object_mastergolon.xml
index ae481332c..35eb9d285 100644
--- a/assets/xml/objects/object_mastergolon.xml
+++ b/assets/xml/objects/object_mastergolon.xml
@@ -1,5 +1,6 @@
+
-
+
diff --git a/assets/xml/objects/object_masterzoora.xml b/assets/xml/objects/object_masterzoora.xml
index c4f8735d7..f21b99b50 100644
--- a/assets/xml/objects/object_masterzoora.xml
+++ b/assets/xml/objects/object_masterzoora.xml
@@ -1,5 +1,6 @@
+
-
+
diff --git a/assets/xml/objects/object_oF1d_map.xml b/assets/xml/objects/object_oF1d_map.xml
index 6c3af0778..a55e9c9ea 100644
--- a/assets/xml/objects/object_oF1d_map.xml
+++ b/assets/xml/objects/object_oF1d_map.xml
@@ -1,108 +1,142 @@
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_obj_yasi.xml b/assets/xml/objects/object_obj_yasi.xml
index b7d2c1fd1..a8e153edd 100644
--- a/assets/xml/objects/object_obj_yasi.xml
+++ b/assets/xml/objects/object_obj_yasi.xml
@@ -1,11 +1,12 @@
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_rs.xml b/assets/xml/objects/object_rs.xml
index 01099db47..fe58a7555 100644
--- a/assets/xml/objects/object_rs.xml
+++ b/assets/xml/objects/object_rs.xml
@@ -1,53 +1,63 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_stk.xml b/assets/xml/objects/object_stk.xml
index 68e8ae26b..9698e335e 100644
--- a/assets/xml/objects/object_stk.xml
+++ b/assets/xml/objects/object_stk.xml
@@ -1,110 +1,138 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_stk2.xml b/assets/xml/objects/object_stk2.xml
index fe62266a8..2aab5947e 100644
--- a/assets/xml/objects/object_stk2.xml
+++ b/assets/xml/objects/object_stk2.xml
@@ -1,86 +1,105 @@
+
-
+
+
-
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_stk3.xml b/assets/xml/objects/object_stk3.xml
index dbd5da652..7b45bf201 100644
--- a/assets/xml/objects/object_stk3.xml
+++ b/assets/xml/objects/object_stk3.xml
@@ -1,11 +1,12 @@
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_tokei_turret.xml b/assets/xml/objects/object_tokei_turret.xml
index edca7c5c2..3ed158d83 100644
--- a/assets/xml/objects/object_tokei_turret.xml
+++ b/assets/xml/objects/object_tokei_turret.xml
@@ -1,17 +1,18 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_yabusame_point.xml b/assets/xml/objects/object_yabusame_point.xml
index 856d94cfe..a7a3cac85 100644
--- a/assets/xml/objects/object_yabusame_point.xml
+++ b/assets/xml/objects/object_yabusame_point.xml
@@ -1,6 +1,8 @@
-
-
+
+
+
+
diff --git a/assets/xml/objects/object_zl4.xml b/assets/xml/objects/object_zl4.xml
index dafdef8cd..65596c370 100644
--- a/assets/xml/objects/object_zl4.xml
+++ b/assets/xml/objects/object_zl4.xml
@@ -1,125 +1,164 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/xml/objects/object_zo.xml b/assets/xml/objects/object_zo.xml
index 8fc22ae46..d2a16cfac 100644
--- a/assets/xml/objects/object_zo.xml
+++ b/assets/xml/objects/object_zo.xml
@@ -1,28 +1,39 @@
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -42,37 +53,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md
index 7e8435da9..e31a31969 100644
--- a/docs/tutorial/documenting.md
+++ b/docs/tutorial/documenting.md
@@ -216,7 +216,7 @@ void EnRecepgirl_Update(Actor *thisx, GlobalContext *globalCtx) {
Vec3s sp30;
this->actionFunc(this, globalCtx);
- func_800E9250(globalCtx, &this->actor, &this->unk_2AE, &sp30, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_2AE, &sp30, this->actor.focus.pos);
func_80C100DC(this);
}
@@ -287,7 +287,7 @@ That's probably as much as we can do on functions for now. Next let's think abou
- data/bss
- intrafunction/stack variables
-and this is roughly the order of preference for naming them (although not necessarily the logical order to determine what they do). This actor is quite limited in the last category: only `sp30` is unnamed at the moment. Even though `func_800E9250` is decomped, the purpose of the argument in which `sp30` is placed is not clear (and, indeed, is not named), so it's probably best to leave it unnamed for now. (With greater experience, you might analyse `func_800E9250` to work out what this argument is for, but let's not worry about that for now.)
+and this is roughly the order of preference for naming them (although not necessarily the logical order to determine what they do). This actor is quite limited in the last category: only `sp30` is unnamed at the moment. Even though `Actor_TrackPlayer` is decomped, the purpose of the argument in which `sp30` is placed is not clear (and, indeed, is not named), so it's probably best to leave it unnamed for now. (With greater experience, you might analyse `Actor_TrackPlayer` to work out what this argument is for, but let's not worry about that for now.)
As for the struct, there are two unnamed variables at the moment:
```C
diff --git a/docs/tutorial/other_functions.md b/docs/tutorial/other_functions.md
index 796939dd8..f9a189d6b 100644
--- a/docs/tutorial/other_functions.md
+++ b/docs/tutorial/other_functions.md
@@ -422,7 +422,7 @@ void EnRecepgirl_Update(Actor *thisx, GlobalContext *globalCtx) {
? sp30;
this->actionFunc(this, globalCtx);
- func_800E9250(globalCtx, (Actor *) this, this + 0x2AE, (Vec3s *) &sp30, (bitwise Vec3f) this->actor.focus.pos.x, this->actor.focus.pos.y, this->actor.focus.pos.z);
+ Actor_TrackPlayer(globalCtx, (Actor *) this, this + 0x2AE, (Vec3s *) &sp30, (bitwise Vec3f) this->actor.focus.pos.x, this->actor.focus.pos.y, this->actor.focus.pos.z);
func_80C100DC(this);
}
```
@@ -440,13 +440,13 @@ void EnRecepgirl_Update(Actor *thisx, GlobalContext *globalCtx) {
? sp30;
this->actionFunc(this, globalCtx);
- func_800E9250(globalCtx, &this->actor, this + 0x2AE, (Vec3s *) &sp30, (bitwise Vec3f) this->actor.focus.pos.x, this->actor.focus.pos.y, this->actor.focus.pos.z);
+ Actor_TrackPlayer(globalCtx, &this->actor, this + 0x2AE, (Vec3s *) &sp30, (bitwise Vec3f) this->actor.focus.pos.x, this->actor.focus.pos.y, this->actor.focus.pos.z);
func_80C100DC(this);
}
```
-Now, our problem is `func_800E9250`. The arguments all look terrible! Indeed, if we look at the actual function in `src/code/code_800E8EA0.c` (found by searching), we find that it should be
+Now, our problem is `Actor_TrackPlayer`. The arguments all look terrible! Indeed, if we look at the actual function in `src/code/code_800E8EA0.c` (found by searching), we find that it should be
```C
-s32 func_800E9250(GlobalContext* globalCtx, Actor* actor, Vec3s* param_3, Vec3s* param_4, Vec3f param_5)
+s32 Actor_TrackPlayer(GlobalContext* globalCtx, Actor* actor, Vec3s* headRot, Vec3s* torsoRot, Vec3f focusPos)
```
So mips2c has made a bit of a mess here:
- the third argument should be a `Vec3s`. Hence `this + 0x2AE` is a `Vec3s*`, and so `this->unk_2AE` is a `Vec3s`
@@ -460,7 +460,7 @@ void EnRecepgirl_Update(EnRecepgirl *this, GlobalContext *globalCtx) {
Vec3s sp30;
this->actionFunc(this, globalCtx);
- func_800E9250(globalCtx, &this->actor, &this->unk_2AE, &sp30, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_2AE, &sp30, this->actor.focus.pos);
func_80C100DC(this);
}
```
@@ -490,7 +490,7 @@ void EnRecepgirl_Update(Actor *thisx, GlobalContext *globalCtx) {
Vec3s sp30;
this->actionFunc(this, globalCtx);
- func_800E9250(globalCtx, &this->actor, &this->unk_2AE, &sp30, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_2AE, &sp30, this->actor.focus.pos);
func_80C100DC(this);
}
```
diff --git a/include/PR/gbi.h b/include/PR/gbi.h
index 8e5aefe8e..f7b249af8 100644
--- a/include/PR/gbi.h
+++ b/include/PR/gbi.h
@@ -216,6 +216,7 @@
#define GPACK_RGBA5551(r, g, b, a) ((((r)<<8) & 0xf800) | \
(((g)<<3) & 0x7c0) | \
(((b)>>2) & 0x3e) | ((a) & 0x1))
+#define GPACK_IA16(i, a) (((i) << 8) | (a))
#define GPACK_ZDZ(z, dz) ((z) << 2 | (dz))
/*
@@ -283,6 +284,7 @@
#define G_TEXTURE_GEN 0x00040000
#define G_TEXTURE_GEN_LINEAR 0x00080000
#define G_LOD 0x00100000 /* NOT IMPLEMENTED */
+#define G_LIGHTING_POSITIONAL 0x00400000
#if (defined(F3DEX_GBI)||defined(F3DLP_GBI))
# define G_CLIPPING 0x00800000
#else
@@ -3877,7 +3879,7 @@ _DW({ \
#define gDPLoadTextureBlock_4b(pkt, timg, fmt, width, height, \
pal, cms, cmt, masks, maskt, shifts, shiftt) \
-{ \
+_DW({ \
gDPSetTextureImage(pkt, fmt, G_IM_SIZ_16b, 1, timg); \
gDPSetTile(pkt, fmt, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, \
cmt, maskt, shiftt, cms, masks, shifts); \
@@ -3892,7 +3894,7 @@ _DW({ \
gDPSetTileSize(pkt, G_TX_RENDERTILE, 0, 0, \
((width)-1) << G_TEXTURE_IMAGE_FRAC, \
((height)-1) << G_TEXTURE_IMAGE_FRAC); \
-}
+})
/* Load fix rww 27jun95 */
/* The S at the end means odd lines are already word Swapped */
@@ -4245,7 +4247,7 @@ _DW({ \
#define gDPLoadMultiTile_4b(pkt, timg, tmem, rtile, fmt, width, height, \
uls, ult, lrs, lrt, pal, \
cms, cmt, masks, maskt, shifts, shiftt) \
-{ \
+_DW({ \
gDPSetTextureImage(pkt, fmt, G_IM_SIZ_8b, ((width)>>1), timg); \
gDPSetTile(pkt, fmt, G_IM_SIZ_8b, \
(((((lrs)-(uls)+1)>>1)+7)>>3), tmem, \
@@ -4267,7 +4269,7 @@ _DW({ \
(ult)<state.input[0])
-#define CONTROLLER2(globalCtx) (&(globalCtx)->state.input[1])
-#define CONTROLLER3(globalCtx) (&(globalCtx)->state.input[2])
-#define CONTROLLER4(globalCtx) (&(globalCtx)->state.input[3])
+#define CONTROLLER1(gameState) (&(gameState)->input[0])
+#define CONTROLLER2(gameState) (&(gameState)->input[1])
+#define CONTROLLER3(gameState) (&(gameState)->input[2])
+#define CONTROLLER4(gameState) (&(gameState)->input[3])
#define CHECK_BTN_ALL(state, combo) (~((state) | ~(combo)) == 0)
#define CHECK_BTN_ANY(state, combo) (((state) & (combo)) != 0)
diff --git a/include/os_internal.h b/include/os_internal.h
index 3c6d4eee4..b4f98bffa 100644
--- a/include/os_internal.h
+++ b/include/os_internal.h
@@ -1,7 +1,7 @@
#ifndef _OS_INTERNAL_H_
#define _OS_INTERNAL_H_
-typedef struct {
+typedef struct {
/* 0x00 */ OSMesgQueue* queue;
/* 0x04 */ OSMesg msg;
} __osHwInt; // size = 0x08
diff --git a/include/ultra64.h b/include/ultra64.h
index 49323cc2b..6ffb26ff6 100644
--- a/include/ultra64.h
+++ b/include/ultra64.h
@@ -13,6 +13,7 @@
#include "ultra64/rcp.h"
#include "ultra64/rdp.h"
#include "ultra64/rsp.h"
+#include "ultra64/r4300.h"
#include "ultra64/vi.h"
#endif
diff --git a/include/ultra64/r4300.h b/include/ultra64/r4300.h
new file mode 100644
index 000000000..30e8a9ea8
--- /dev/null
+++ b/include/ultra64/r4300.h
@@ -0,0 +1,367 @@
+#ifndef ULTRA64_R4300_H
+#define ULTRA64_R4300_H
+
+#ifdef _LANGUAGE_C
+#include "PR/ultratypes.h"
+#define U32(x) ((u32)x)
+#define C_REG(x) (x)
+#else
+#define U32(x) (x)
+#define C_REG(x) $x
+#endif
+
+// Segment base addresses and sizes
+#define KUBASE 0
+#define KUSIZE 0x80000000
+#define K0BASE 0x80000000
+#define K0SIZE 0x20000000
+#define K1BASE 0xA0000000
+#define K1SIZE 0x20000000
+#define K2BASE 0xC0000000
+#define K2SIZE 0x20000000
+
+// Exception vectors
+#define SIZE_EXCVEC 0x80 // Size of an exc. vec
+#define UT_VEC K0BASE // utlbmiss vector
+#define R_VEC (K1BASE + 0x1FC00000) // reset vector
+#define XUT_VEC (K0BASE + 0x80) // extended address tlbmiss
+#define ECC_VEC (K0BASE + 0x100) // Ecc exception vector
+#define E_VEC (K0BASE + 0x180) // Gen. exception vector
+
+// Address conversion macros
+#define K0_TO_K1(x) (U32(x) | 0xA0000000) // kseg0 to kseg1
+#define K1_TO_K0(x) (U32(x) & 0x9FFFFFFF) // kseg1 to kseg0
+#define K0_TO_PHYS(x) (U32(x) & 0x1FFFFFFF) // kseg0 to physical
+#define K1_TO_PHYS(x) (U32(x) & 0x1FFFFFFF) // kseg1 to physical
+#define KDM_TO_PHYS(x) (U32(x) & 0x1FFFFFFF) // direct mapped to physical
+#define PHYS_TO_K0(x) (U32(x) | 0x80000000) // physical to kseg0
+#define PHYS_TO_K1(x) (U32(x) | 0xA0000000) // physical to kseg1
+
+// Address predicates
+#define IS_KSEG0(x) (U32(x) >= K0BASE && U32(x) < K1BASE)
+#define IS_KSEG1(x) (U32(x) >= K1BASE && U32(x) < K2BASE)
+#define IS_KSEGDM(x) (U32(x) >= K0BASE && U32(x) < K2BASE)
+#define IS_KSEG2(x) (U32(x) >= K2BASE && U32(x) < KPTE_SHDUBASE)
+#define IS_KPTESEG(x) (U32(x) >= KPTE_SHDUBASE)
+#define IS_KUSEG(x) (U32(x) < K0BASE)
+
+// TLB size constants
+#define NTLBENTRIES 31 /* entry 31 is reserved by rdb */
+
+#define TLBHI_VPN2MASK 0xFFFFE000
+#define TLBHI_VPN2SHIFT 13
+#define TLBHI_PIDMASK 0xFF
+#define TLBHI_PIDSHIFT 0
+#define TLBHI_NPID 255 // 255 to fit in 8 bits
+
+#define TLBLO_PFNMASK 0x3FFFFFC0
+#define TLBLO_PFNSHIFT 6
+#define TLBLO_CACHMASK 0x38 // cache coherency algorithm
+#define TLBLO_CACHSHIFT 3
+#define TLBLO_UNCACHED 0x10 // not cached
+#define TLBLO_NONCOHRNT 0x18 // Cacheable non-coherent
+#define TLBLO_EXLWR 0x28 // Exclusive write
+#define TLBLO_D 0x4 // writeable
+#define TLBLO_V 0x2 // valid bit
+#define TLBLO_G 0x1 // global access bit
+
+#define TLBINX_PROBE 0x80000000
+#define TLBINX_INXMASK 0x3F
+#define TLBINX_INXSHIFT 0
+
+#define TLBRAND_RANDMASK 0x3F
+#define TLBRAND_RANDSHIFT 0
+
+#define TLBWIRED_WIREDMASK 0x3F
+
+#define TLBCTXT_BASEMASK 0xFF800000
+#define TLBCTXT_BASESHIFT 23
+#define TLBCTXT_BASEBITS 9
+
+#define TLBCTXT_VPNMASK 0x7FFFF0
+#define TLBCTXT_VPNSHIFT 4
+
+#define TLBPGMASK_4K 0x0
+#define TLBPGMASK_16K 0x6000
+#define TLBPGMASK_64K 0x1E000
+
+/*
+ * Status register
+ */
+#define SR_CUMASK 0xF0000000 // coproc usable bits
+
+#define SR_CU3 0x80000000 // Coprocessor 3 usable
+#define SR_CU2 0x40000000 // Coprocessor 2 usable
+#define SR_CU1 0x20000000 // Coprocessor 1 usable
+#define SR_CU0 0x10000000 // Coprocessor 0 usable
+#define SR_RP 0x08000000 // Reduced power (quarter speed)
+#define SR_FR 0x04000000 // MIPS III FP register mode
+#define SR_RE 0x02000000 // Reverse endian
+#define SR_ITS 0x01000000 // Instruction trace support
+#define SR_BEV 0x00400000 // Use boot exception vectors
+#define SR_TS 0x00200000 // TLB shutdown
+#define SR_SR 0x00100000 // Soft reset occured
+#define SR_CH 0x00040000 // Cache hit for last 'cache' op
+#define SR_CE 0x00020000 // Create ECC
+#define SR_DE 0x00010000 // ECC of parity does not cause error
+
+// Interrupt enable bits
+// (NOTE: bits set to 1 enable the corresponding level interrupt)
+#define SR_IMASK 0x0000FF00 // Interrupt mask
+#define SR_IMASK8 0x00000000 // mask level 8
+#define SR_IMASK7 0x00008000 // mask level 7
+#define SR_IMASK6 0x0000C000 // mask level 6
+#define SR_IMASK5 0x0000E000 // mask level 5
+#define SR_IMASK4 0x0000F000 // mask level 4
+#define SR_IMASK3 0x0000F800 // mask level 3
+#define SR_IMASK2 0x0000FC00 // mask level 2
+#define SR_IMASK1 0x0000FE00 // mask level 1
+#define SR_IMASK0 0x0000FF00 // mask level 0
+
+#define SR_IBIT8 0x00008000 // bit level 8
+#define SR_IBIT7 0x00004000 // bit level 7
+#define SR_IBIT6 0x00002000 // bit level 6
+#define SR_IBIT5 0x00001000 // bit level 5
+#define SR_IBIT4 0x00000800 // bit level 4
+#define SR_IBIT3 0x00000400 // bit level 3
+#define SR_IBIT2 0x00000200 // bit level 2
+#define SR_IBIT1 0x00000100 // bit level 1
+
+#define SR_IMASKSHIFT 8
+
+#define SR_KX 0x00000080 // extended-addr TLB vec in kernel
+#define SR_SX 0x00000040 // xtended-addr TLB vec supervisor
+#define SR_UX 0x00000020 // xtended-addr TLB vec in user mode
+#define SR_KSU_MASK 0x00000018 // mode mask
+#define SR_KSU_USR 0x00000010 // user mode
+#define SR_KSU_SUP 0x00000008 // supervisor mode
+#define SR_KSU_KER 0x00000000 // kernel mode
+#define SR_ERL 0x00000004 // Error level, 1=>cache error
+#define SR_EXL 0x00000002 // Exception level, 1=>exception
+#define SR_IE 0x00000001 // interrupt enable, 1=>enable
+
+// Cause Register
+#define CAUSE_BD 0x80000000 // Branch delay slot
+#define CAUSE_CEMASK 0x30000000 // coprocessor error
+#define CAUSE_CESHIFT 28
+
+// Interrupt pending bits
+#define CAUSE_IP8 0x00008000 // External level 8 pending - COMPARE
+#define CAUSE_IP7 0x00004000 // External level 7 pending - INT4
+#define CAUSE_IP6 0x00002000 // External level 6 pending - INT3
+#define CAUSE_IP5 0x00001000 // External level 5 pending - INT2
+#define CAUSE_IP4 0x00000800 // External level 4 pending - INT1
+#define CAUSE_IP3 0x00000400 // External level 3 pending - INT0
+#define CAUSE_SW2 0x00000200 // Software level 2 pending
+#define CAUSE_SW1 0x00000100 // Software level 1 pending
+
+#define CAUSE_IPMASK 0x0000FF00 // Pending interrupt mask
+#define CAUSE_IPSHIFT 8
+
+#define CAUSE_EXCMASK 0x0000007C // Cause code bits
+#define CAUSE_EXCSHIFT 2
+
+// Cause register exception codes
+
+#define EXC_CODE(x) ((x) << 2)
+
+// Hardware exception codes
+#define EXC_INT EXC_CODE(0) // interrupt
+#define EXC_MOD EXC_CODE(1) // TLB mod
+#define EXC_RMISS EXC_CODE(2) // Read TLB Miss
+#define EXC_WMISS EXC_CODE(3) // Write TLB Miss
+#define EXC_RADE EXC_CODE(4) // Read Address Error
+#define EXC_WADE EXC_CODE(5) // Write Address Error
+#define EXC_IBE EXC_CODE(6) // Instruction Bus Error
+#define EXC_DBE EXC_CODE(7) // Data Bus Error
+#define EXC_SYSCALL EXC_CODE(8) // SYSCALL
+#define EXC_BREAK EXC_CODE(9) // BREAKpoint
+#define EXC_II EXC_CODE(10) // Illegal Instruction
+#define EXC_CPU EXC_CODE(11) // CoProcessor Unusable
+#define EXC_OV EXC_CODE(12) // OVerflow
+#define EXC_TRAP EXC_CODE(13) // Trap exception
+#define EXC_VCEI EXC_CODE(14) // Virt. Coherency on Inst. fetch
+#define EXC_FPE EXC_CODE(15) // Floating Point Exception
+#define EXC_WATCH EXC_CODE(23) // Watchpoint reference
+#define EXC_VCED EXC_CODE(31) // Virt. Coherency on data read
+
+// C0_PRID Defines
+#define C0_IMPMASK 0xFF00
+#define C0_IMPSHIFT 8
+#define C0_REVMASK 0xFF
+#define C0_MAJREVMASK 0xF0
+#define C0_MAJREVSHIFT 4
+#define C0_MINREVMASK 0xF
+
+// Coprocessor 0 operations
+#define C0_READI 0x1 // read ITLB entry addressed by C0_INDEX
+#define C0_WRITEI 0x2 // write ITLB entry addressed by C0_INDEX
+#define C0_WRITER 0x6 // write ITLB entry addressed by C0_RAND
+#define C0_PROBE 0x8 // probe for ITLB entry addressed by TLBHI
+#define C0_RFE 0x10 // restore for exception
+
+// 'cache' instruction definitions
+
+// Target cache
+#define CACH_PI 0x0 // specifies primary inst. cache
+#define CACH_PD 0x1 // primary data cache
+#define CACH_SI 0x2 // secondary instruction cache
+#define CACH_SD 0x3 // secondary data cache
+
+// Cache operations
+#define C_IINV 0x0 // index invalidate (inst, 2nd inst)
+#define C_IWBINV 0x0 // index writeback inval (d, sd)
+#define C_ILT 0x4 // index load tag (all)
+#define C_IST 0x8 // index store tag (all)
+#define C_CDX 0xC // create dirty exclusive (d, sd)
+#define C_HINV 0x10 // hit invalidate (all)
+#define C_HWBINV 0x14 // hit writeback inv. (d, sd)
+#define C_FILL 0x14 // fill (i)
+#define C_HWB 0x18 // hit writeback (i, d, sd)
+#define C_HSV 0x1C // hit set virt. (si, sd)
+
+// Cache size definitions
+#define ICACHE_SIZE 0x4000 // 16K
+#define ICACHE_LINESIZE 32 // 8 words
+#define ICACHE_LINEMASK (ICACHE_LINESIZE - 1)
+
+#define DCACHE_SIZE 0x2000 // 8K
+#define DCACHE_LINESIZE 16 // 4 words
+#define DCACHE_LINEMASK (DCACHE_LINESIZE - 1)
+
+// C0_CONFIG register definitions
+#define CONFIG_CM 0x80000000 // 1 == Master-Checker enabled
+#define CONFIG_EC 0x70000000 // System Clock ratio
+#define CONFIG_EC_1_1 0x6 // System Clock ratio 1 :1
+#define CONFIG_EC_3_2 0x7 // System Clock ratio 1.5 :1
+#define CONFIG_EC_2_1 0x0 // System Clock ratio 2 :1
+#define CONFIG_EC_3_1 0x1 // System Clock ratio 3 :1
+#define CONFIG_EP 0x0F000000 // Transmit Data Pattern
+#define CONFIG_SB 0x00C00000 // Secondary cache block size
+
+#define CONFIG_SS 0x00200000 // Split scache: 0 == I&D combined
+#define CONFIG_SW 0x00100000 // scache port: 0==128, 1==64
+#define CONFIG_EW 0x000C0000 // System Port width: 0==64, 1==32
+#define CONFIG_SC 0x00020000 // 0 -> 2nd cache present
+#define CONFIG_SM 0x00010000 // 0 -> Dirty Shared Coherency enable
+#define CONFIG_BE 0x00008000 // Endian-ness: 1 --> BE
+#define CONFIG_EM 0x00004000 // 1 -> ECC mode, 0 -> parity
+#define CONFIG_EB 0x00002000 // Block order:1->sequent,0->subblock
+
+#define CONFIG_IC 0x00000E00 // Primary Icache size
+#define CONFIG_DC 0x000001C0 // Primary Dcache size
+#define CONFIG_IB 0x00000020 // Icache block size
+#define CONFIG_DB 0x00000010 // Dcache block size
+#define CONFIG_CU 0x00000008 // Update on Store-conditional
+#define CONFIG_K0 0x00000007 // K0SEG Coherency algorithm
+
+#define CONFIG_UNCACHED 0x00000002 // K0 is uncached
+#define CONFIG_NONCOHRNT 0x00000003
+#define CONFIG_COHRNT_EXLWR 0x00000005
+#define CONFIG_SB_SHFT 22 // shift SB to bit position 0
+#define CONFIG_IC_SHFT 9 // shift IC to bit position 0
+#define CONFIG_DC_SHFT 6 // shift DC to bit position 0
+#define CONFIG_BE_SHFT 15 // shift BE to bit position 0
+
+// C0_TAGLO definitions for setting/getting cache states and physaddr bits
+#define SADDRMASK 0xFFFFE000 // 31..13 -> scache paddr bits 35..17
+#define SVINDEXMASK 0x00000380 // 9..7: prim virt index bits 14..12
+#define SSTATEMASK 0x00001C00 // bits 12..10 hold scache line state
+#define SINVALID 0x00000000 // invalid --> 000 == state 0
+#define SCLEANEXCL 0x00001000 // clean exclusive --> 100 == state 4
+#define SDIRTYEXCL 0x00001400 // dirty exclusive --> 101 == state 5
+#define SECC_MASK 0x0000007F // low 7 bits are ecc for the tag
+#define SADDR_SHIFT 4 // shift STagLo (31..13) to 35..17
+
+#define PADDRMASK 0xFFFFFF00 // PTagLo31..8->prim paddr bits35..12
+#define PADDR_SHIFT 4 // roll bits 35..12 down to 31..8
+#define PSTATEMASK 0x00C0 // bits 7..6 hold primary line state
+#define PINVALID 0x0000 // invalid --> 000 == state 0
+#define PCLEANEXCL 0x0080 // clean exclusive --> 10 == state 2
+#define PDIRTYEXCL 0x00C0 // dirty exclusive --> 11 == state 3
+#define PPARITY_MASK 0x0001 // low bit is parity bit (even).
+
+// C0_CACHE_ERR definitions.
+#define CACHERR_ER 0x80000000 // 0: inst ref, 1: data ref
+#define CACHERR_EC 0x40000000 // 0: primary, 1: secondary
+#define CACHERR_ED 0x20000000 // 1: data error
+#define CACHERR_ET 0x10000000 // 1: tag error
+#define CACHERR_ES 0x08000000 // 1: external ref, e.g. snoo
+#define CACHERR_EE 0x04000000 // error on SysAD bus
+#define CACHERR_EB 0x02000000 // complicated, see spec.
+#define CACHERR_EI 0x01000000 // complicated, see spec.
+#define CACHERR_SIDX_MASK 0x003FFFF8 // secondary cache index
+#define CACHERR_PIDX_MASK 0x00000007 // primary cache index
+#define CACHERR_PIDX_SHIFT 12 // bits 2..0 are paddr14..12
+
+/*
+ * R4000 family supports hardware watchpoints:
+ * C0_WATCHLO:
+ * bits 31..3 are bits 31..3 of physaddr to watch
+ * bit 2: reserved; must be written as 0.
+ * bit 1: when set causes a watchpoint trap on load accesses to paddr.
+ * bit 0: when set traps on stores to paddr;
+ * C0_WATCHHI
+ * bits 31..4 are reserved and must be written as zeros.
+ * bits 3..0 are bits 35..32 of the physaddr to watch
+ */
+#define WATCHLO_WTRAP 0x00000001
+#define WATCHLO_RTRAP 0x00000002
+#define WATCHLO_ADDRMASK 0xFFFFFFF8
+#define WATCHLO_VALIDMASK 0xFFFFFFFB
+#define WATCHHI_VALIDMASK 0x0000000F
+
+// Coprocessor 0 registers
+#define C0_INX C_REG(0)
+#define C0_RAND C_REG(1)
+#define C0_ENTRYLO0 C_REG(2)
+#define C0_ENTRYLO1 C_REG(3)
+#define C0_CONTEXT C_REG(4)
+#define C0_PAGEMASK C_REG(5) // page mask
+#define C0_WIRED C_REG(6) // # wired entries in tlb
+#define C0_BADVADDR C_REG(8)
+#define C0_COUNT C_REG(9) // free-running counter
+#define C0_ENTRYHI C_REG(10)
+#define C0_COMPARE C_REG(11) // counter comparison reg.
+#define C0_SR C_REG(12)
+#define C0_CAUSE C_REG(13)
+#define C0_EPC C_REG(14)
+#define C0_PRID C_REG(15) // revision identifier
+#define C0_CONFIG C_REG(16) // hardware configuration
+#define C0_LLADDR C_REG(17) // load linked address
+#define C0_WATCHLO C_REG(18) // watchpoint
+#define C0_WATCHHI C_REG(19) // watchpoint
+#define C0_ECC C_REG(26) // S-cache ECC and primary parity
+#define C0_CACHE_ERR C_REG(27) // cache error status
+#define C0_TAGLO C_REG(28) // cache operations
+#define C0_TAGHI C_REG(29) // cache operations
+#define C0_ERROR_EPC C_REG(30) // ECC error prg. counter
+
+// floating-point status register
+#define C1_FPCSR C_REG(31)
+
+#define FPCSR_FS 0x01000000 // flush denorm to zero
+#define FPCSR_C 0x00800000 // condition bit
+#define FPCSR_CE 0x00020000 // cause: unimplemented operation
+#define FPCSR_CV 0x00010000 // cause: invalid operation
+#define FPCSR_CZ 0x00008000 // cause: division by zero
+#define FPCSR_CO 0x00004000 // cause: overflow
+#define FPCSR_CU 0x00002000 // cause: underflow
+#define FPCSR_CI 0x00001000 // cause: inexact operation
+#define FPCSR_EV 0x00000800 // enable: invalid operation
+#define FPCSR_EZ 0x00000400 // enable: division by zero
+#define FPCSR_EO 0x00000200 // enable: overflow
+#define FPCSR_EU 0x00000100 // enable: underflow
+#define FPCSR_EI 0x00000080 // enable: inexact operation
+#define FPCSR_FV 0x00000040 // flag: invalid operation
+#define FPCSR_FZ 0x00000020 // flag: division by zero
+#define FPCSR_FO 0x00000010 // flag: overflow
+#define FPCSR_FU 0x00000008 // flag: underflow
+#define FPCSR_FI 0x00000004 // flag: inexact operation
+#define FPCSR_RM_MASK 0x00000003 // rounding mode mask
+#define FPCSR_RM_RN 0x00000000 // round to nearest
+#define FPCSR_RM_RZ 0x00000001 // round to zero
+#define FPCSR_RM_RP 0x00000002 // round to positive infinity
+#define FPCSR_RM_RM 0x00000003 // round to negative infinity
+
+#endif
diff --git a/include/variables.h b/include/variables.h
index 7dd9aaeb6..7155c7bd5 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -35,13 +35,13 @@ extern const char* sCpuExceptions[18];
extern const char* sFpuExceptions[6];
extern FaultDrawer* sFaultDrawContext;
extern FaultDrawer sFaultDrawerDefault;
-// extern UNK_TYPE4 D_80096C20;
-extern UNK_TYPE4 D_80096C30;
+extern s32 gLoadLogSeverity;
+extern s32 gLoad2LogSeverity;
extern StackEntry* sStackInfoListStart;
extern StackEntry* sStackInfoListEnd;
// extern UNK_TYPE1 sGfxPrintFontTLUT;
-// extern UNK_TYPE1 sGfxPrintUnkTLUT;
-// extern UNK_TYPE1 sGfxPrintUnkData;
+// extern UNK_TYPE1 sGfxPrintRainbowTLUT;
+// extern UNK_TYPE1 sGfxPrintRainbowData;
// extern UNK_TYPE1 sGfxPrintFontData;
// extern UNK_TYPE4 D_80097524;
// extern u32 sRandInt;
@@ -1503,7 +1503,7 @@ extern KaleidoMgrOverlay* gKaleidoMgrCurOvl;
extern const TransitionInit TransitionFade_InitVars;
// extern UNK_TYPE1 D_801D0D00;
extern const TransitionInit TransitionCircle_InitVars;
-extern UNK_TYPE4 D_801D0D50;
+extern s32 gDbgCamEnabled;
// extern UNK_TYPE1 D_801D0D54;
// extern UNK_TYPE2 D_801D0D58;
// extern UNK_TYPE2 D_801D0D5C;
@@ -3562,7 +3562,7 @@ extern u16 gFramebuffer0[SCREEN_HEIGHT][SCREEN_WIDTH];
// other segments
extern GfxMasterList D_0E000000;
extern Mtx D_01000000;
-extern UNK_TYPE D_0F000000;
+extern u16 D_0F000000[];
#endif
diff --git a/include/z64.h b/include/z64.h
index 4dbb98bfa..655966e3f 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -23,12 +23,14 @@
#include "sfx.h"
#include "message_data_static.h"
+#include "gfxprint.h"
#include "sys_matrix.h"
#include "z64actor.h"
#include "z64animation.h"
#include "z64audio.h"
#include "z64bgcheck.h"
#include "z64collision_check.h"
+#include "z64curve.h"
#include "z64cutscene.h"
#include "z64dma.h"
#include "z64effect.h"
@@ -292,15 +294,6 @@ typedef enum IRQ_TYPE {
IRQ_PRENMI_4 = 0x2A1
} IRQ_TYPE;
-typedef struct {
- /* 0x00 */ u32 textSize;
- /* 0x04 */ u32 dataSize;
- /* 0x08 */ u32 rodataSize;
- /* 0x0C */ u32 bssSize;
- /* 0x10 */ u32 nRelocations;
- /* 0x14 */ u32 relocations[1];
-} OverlayRelocationSection; // size >= 0x18
-
typedef struct {
/* 0x00 */ u32 resetting;
/* 0x04 */ u32 resetCount;
@@ -419,27 +412,6 @@ typedef struct {
/* 0x38 */ FaultDrawerCallback inputCallback;
} FaultDrawer; // size = 0x3C
-typedef struct GfxPrint {
- /* 0x00 */ struct GfxPrint *(*callback)(struct GfxPrint*, const char*, size_t);
- /* 0x04 */ Gfx* dlist;
- /* 0x08 */ u16 posX;
- /* 0x0A */ u16 posY;
- /* 0x0C */ u16 baseX;
- /* 0x0E */ u8 baseY;
- /* 0x0F */ u8 flag;
- /* 0x10 */ Color_RGBA8_u32 color;
- /* 0x14 */ char unk_14[0x1C]; // unused
-} GfxPrint; // size = 0x30
-
-typedef enum {
- GFXPRINT_FLAG1 = 1,
- GFXPRINT_USE_RGBA16 = 2,
- GFXPRINT_FLAG4 = 4,
- GFXPRINT_UPDATE_MODE = 8,
- GFXPRINT_FLAG64 = 0x40,
- GFXPRINT_OPEN = 0x80
-} GfxPrintFlag;
-
typedef struct {
/* 0x00 */ u8 countdown;
/* 0x01 */ u8 playSfxEachFrame;
@@ -782,7 +754,7 @@ typedef struct {
/* 0xEC */ u8 unk_EC;
/* 0xED */ u8 unk_ED;
/* 0xEE */ u8 unk_EE[4];
- /* 0xF2 */ u8 unk_F2[8]; // [3] is used by both DemoKankyo and ObjectKankyo particle count
+ /* 0xF2 */ u8 unk_F2[8]; // [3] is used by both DemoKankyo and ObjectKankyo effect count
/* 0xFA */ u8 unk_FA[4];
} EnvironmentContext; // size = 0x100
@@ -863,12 +835,18 @@ typedef struct {
/* 0x24 */ u32 flags;
} PreRenderParams; // size = 0x28
+typedef struct {
+ /* 0x00 */ u8 unk00;
+ /* 0x01 */ u8 unk01;
+} MsgCtx11F00;
+
typedef struct {
/* 0x00000 */ View view;
/* 0x00168 */ Font font;
/* 0x11EF4 */ char unk_11EF4[0x4];
/* 0x11EF8 */ UNK_PTR unk11EF8;
- /* 0x11EFC */ UNK_TYPE1 unk11EFC[0x8];
+ /* 0x11EFC */ UNK_TYPE1 unk11EFC[0x4];
+ /* 0x11F00 */ MsgCtx11F00* unk11F00;
/* 0x11F04 */ u16 currentTextId;
/* 0x11F06 */ UNK_TYPE1 pad11F06[0x4];
/* 0x11F0A */ u8 unk11F0A;
@@ -1455,10 +1433,10 @@ typedef struct {
typedef struct {
/* 0x00 */ u32 unk_00;
/* 0x04 */ u32 setScissor;
- /* 0x08 */ Color_RGBA8 primColor;
- /* 0x0C */ Color_RGBA8 envColor;
+ /* 0x08 */ Color_RGBA8_u32 primColor;
+ /* 0x0C */ Color_RGBA8_u32 envColor;
/* 0x10 */ u16* tlut;
- /* 0x14 */ Gfx* monoDl;
+ /* 0x14 */ Gfx* dList;
} VisMono; // size = 0x18
typedef struct DebugDispObject {
diff --git a/include/z64animation.h b/include/z64animation.h
index 58ddb34df..ced59e457 100644
--- a/include/z64animation.h
+++ b/include/z64animation.h
@@ -224,56 +224,6 @@ typedef void (*AnimationEntryCallback)(struct GlobalContext*, AnimationEntryData
extern u32 link_animetion_segment;
-// fcurve_skelanime structs
-typedef struct {
- /* 0x0000 */ u16 unk00; // appears to be flags
- /* 0x0002 */ s16 unk02;
- /* 0x0004 */ s16 unk04;
- /* 0x0006 */ s16 unk06;
- /* 0x0008 */ f32 unk08;
-} TransformData; // size = 0xC
-
-typedef struct {
- /* 0x0000 */ u8* refIndex;
- /* 0x0004 */ TransformData* transformData;
- /* 0x0008 */ s16* copyValues;
- /* 0x000C */ s16 unk0C;
- /* 0x000E */ s16 unk10;
-} TransformUpdateIndex; // size 0x10
-
-typedef struct {
- /* 0x0000 */ u8 firstChildIdx;
- /* 0x0001 */ u8 nextLimbIdx;
- /* 0x0004 */ Gfx* dList[2];
-} SkelCurveLimb; // size >= 0x8
-
-typedef struct {
- /* 0x0000 */ SkelCurveLimb** limbs;
- /* 0x0004 */ u8 limbCount;
-} SkelCurveLimbList; // size = 0x8
-
-typedef struct {
- /* 0x0000 */ Vec3s scale;
- /* 0x0006 */ Vec3s rot;
- /* 0x000C */ Vec3s pos;
-} LimbTransform; // size = 0x12
-
-typedef struct {
- /* 0x0000 */ u8 limbCount;
- /* 0x0004 */ SkelCurveLimb** limbList;
- /* 0x0008 */ TransformUpdateIndex* transUpdIdx;
- /* 0x000C */ f32 unk0C; // seems to be unused
- /* 0x0010 */ f32 animFinalFrame;
- /* 0x0014 */ f32 animSpeed;
- /* 0x0018 */ f32 animCurFrame;
- /* 0x001C */ LimbTransform* transforms;
-} SkelAnimeCurve; // size = 0x20
-
-typedef s32 (*OverrideCurveLimbDraw)(struct GlobalContext* globalCtx, SkelAnimeCurve* skelCuve, s32 limbIndex,
- struct Actor* actor);
-typedef void (*PostCurveLimbDraw)(struct GlobalContext* globalCtx, SkelAnimeCurve* skelCuve, s32 limbIndex,
- struct Actor* actor);
-
typedef struct {
/* 0x00 */ AnimationHeader* animation;
/* 0x04 */ f32 playSpeed;
diff --git a/include/z64curve.h b/include/z64curve.h
new file mode 100644
index 000000000..2e6e539ba
--- /dev/null
+++ b/include/z64curve.h
@@ -0,0 +1,68 @@
+#ifndef Z64_CURVE_H
+#define Z64_CURVE_H
+
+#include "PR/ultratypes.h"
+#include "z64math.h"
+
+struct GlobalContext;
+
+typedef struct {
+ /* 0x0 */ u16 flags; // Only the bottom two bits are used, although others are set in objects
+ /* 0x2 */ s16 abscissa; // knot input value
+ /* 0x4 */ s16 leftGradient; // left derivative at the point
+ /* 0x6 */ s16 rightGradient; // right derivative at the point
+ /* 0x8 */ f32 ordinate; // output value
+} CurveInterpKnot; // size = 0xC
+
+typedef struct {
+ /* 0x0 */ u8* knotCounts;
+ /* 0x4 */ CurveInterpKnot* interpolationData;
+ /* 0x8 */ s16* constantData;
+ /* 0xC */ s16 unk_0C; // Set but not used, always 1 in objects
+ /* 0xE */ s16 frameCount; // Not used, inferred from use in objects
+} CurveAnimationHeader; // size = 0x10
+
+typedef struct {
+ /* 0x0 */ u8 child;
+ /* 0x1 */ u8 sibling;
+ /* 0x4 */ Gfx* dList[2];
+} SkelCurveLimb; // size = 0xC
+
+typedef struct {
+ /* 0x0 */ SkelCurveLimb** limbs;
+ /* 0x4 */ u8 limbCount;
+} CurveSkeletonHeader; // size = 0x8
+
+typedef struct {
+ /* 0x00 */ u8 limbCount;
+ /* 0x04 */ SkelCurveLimb** skeleton;
+ /* 0x08 */ CurveAnimationHeader* animation;
+ /* 0x0C */ f32 unk_0C; // set but not used
+ /* 0x10 */ f32 endFrame;
+ /* 0x14 */ f32 playSpeed;
+ /* 0x18 */ f32 curFrame;
+ /* 0x1C */ s16 (*jointTable)[9];
+} SkelCurve; // size = 0x20
+
+typedef s32 (*OverrideCurveLimbDraw)(struct GlobalContext* globalCtx, SkelCurve* skelCuve, s32 limbIndex, struct Actor* actor);
+typedef void (*PostCurveLimbDraw)(struct GlobalContext* globalCtx, SkelCurve* skelCuve, s32 limbIndex, struct Actor* actor);
+
+
+
+f32 Curve_Interpolate(f32 x, CurveInterpKnot* knots, s32 knotCount);
+
+void SkelCurve_Clear(SkelCurve* skelCurve);
+s32 SkelCurve_Init(struct GlobalContext* globalCtx, SkelCurve* skelCurve, CurveSkeletonHeader* skeletonHeaderSeg, CurveAnimationHeader* animation);
+void SkelCurve_Destroy(struct GlobalContext* globalCtx, SkelCurve* skelCurve);
+void SkelCurve_SetAnim(SkelCurve* skelCurve, CurveAnimationHeader* animation, f32 arg2, f32 endFrame, f32 curFrame, f32 playSpeed);
+s32 SkelCurve_Update(struct GlobalContext* globalCtx, SkelCurve* skelCurve);
+void SkelCurve_Draw(Actor* actor, struct GlobalContext* globalCtx, SkelCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw, PostCurveLimbDraw postLimbDraw, s32 lod, Actor* thisx);
+
+
+// ZAPD compatibility typedefs
+// TODO: Remove when ZAPD adds support for them
+typedef CurveInterpKnot TransformData;
+typedef CurveAnimationHeader TransformUpdateIndex;
+typedef CurveSkeletonHeader SkelCurveLimbList;
+
+#endif // Z64_CURVE_H
diff --git a/include/z64item.h b/include/z64item.h
index 7c2cd3e2d..833d6717f 100644
--- a/include/z64item.h
+++ b/include/z64item.h
@@ -310,7 +310,10 @@ typedef enum {
/* 0x0A */ GI_RECOVERY_HEART,
/* 0x0C */ GI_HEART_PIECE = 0x0C,
/* 0x0D */ GI_HEART_CONTAINER,
- /* 0x16 */ GI_BOMBS_10 = 0x16,
+ /* 0x11 */ GI_STRAY_FAIRY = 0x11,
+ /* 0x14 */ GI_BOMBS_1 = 0x14,
+ /* 0x15 */ GI_BOMBS_5,
+ /* 0x16 */ GI_BOMBS_10,
/* 0x19 */ GI_STICKS_1 = 0x19,
/* 0x1A */ GI_BOMBCHUS_10,
/* 0x1B */ GI_BOMB_BAG_20,
@@ -328,23 +331,28 @@ typedef enum {
/* 0x32 */ GI_SHIELD_HERO = 0x32,
/* 0x33 */ GI_SHIELD_MIRROR,
/* 0x35 */ GI_MAGIC_BEANS = 0x35,
+ /* 0x36 */ GI_BOMBCHUS_1,
+ /* 0x3A */ GI_BOMBCHUS_5 = 0x3A,
/* 0x3C */ GI_KEY_SMALL = 0x3C,
- /* 0x3E */ GI_MAP = 0x3E,
+ /* 0x3D */ GI_KEY_BOSS,
+ /* 0x3E */ GI_MAP,
/* 0x3F */ GI_COMPASS,
/* 0x50 */ GI_50 = 0x50,
/* 0x52 */ GI_SCALE_GOLD = 0x52, // Assumed, used in En_Fishing
/* 0x59 */ GI_BOTTLE_POTION_RED = 0x59,
- /* 0x5B */ GI_POTION_RED = 0x5B,
+ /* 0x5A */ GI_BOTTLE,
+ /* 0x5B */ GI_POTION_RED,
/* 0x5C */ GI_POTION_GREEN,
/* 0x5D */ GI_POTION_BLUE,
/* 0x5E */ GI_FAIRY,
/* 0x60 */ GI_MILK_BOTTLE = 0x60,
+ /* 0x76 */ GI_ICE_TRAP = 0x76,
/* 0x78 */ GI_MASK_DEKU = 0x78,
/* 0x79 */ GI_MASK_GORON,
/* 0x7A */ GI_MASK_ZORA,
/* 0x7B */ GI_MASK_FIERCE_DEITY,
- /* 0x7C */ GI_MASK_TRUTH,
- /* 0x7D */ GI_MASK_KAFEIS_MASK,
+ /* 0x7C */ GI_MASK_CAPTAIN,
+ /* 0x7D */ GI_MASK_GIANT,
/* 0x7E */ GI_MASK_ALL_NIGHT,
/* 0x7F */ GI_MASK_BUNNY,
/* 0x80 */ GI_MASK_KEATON,
@@ -357,27 +365,31 @@ typedef enum {
/* 0x87 */ GI_MASK_GIBDO,
/* 0x88 */ GI_MASK_DON_GERO,
/* 0x89 */ GI_MASK_KAMARO,
- /* 0x8A */ GI_MASK_CAPTAIN,
+ /* 0x8A */ GI_MASK_TRUTH,
/* 0x8B */ GI_MASK_STONE,
/* 0x8C */ GI_MASK_BREMEN,
/* 0x8D */ GI_MASK_BLAST,
/* 0x8E */ GI_MASK_SCENTS,
- /* 0x8F */ GI_MASK_GIANT,
- /* 0x92 */ GI_MILK = 0x92,
- /* 0x95 */ GI_95 = 0x95,
+ /* 0x8F */ GI_MASK_KAFEIS_MASK,
+ /* 0x91 */ GI_CHATEAU = 0x91,
+ /* 0x92 */ GI_MILK,
+ /* 0x93 */ GI_GOLD_DUST,
+ /* 0x94 */ GI_EEL, // Unused bottled eel
+ /* 0x95 */ GI_SEAHORSE,
/* 0x96 */ GI_MOON_TEAR,
/* 0x97 */ GI_DEED_LAND,
/* 0x98 */ GI_DEED_SWAMP,
/* 0x99 */ GI_DEED_MOUNTAIN,
/* 0x9A */ GI_DEED_OCEAN,
- /* 0x9B */ GI_SWORD_GREAT_FAIRY = 0x9B,
+ /* 0x9B */ GI_SWORD_GREAT_FAIRY,
/* 0x9C */ GI_SWORD_KOKIRI,
/* 0x9D */ GI_SWORD_RAZOR,
/* 0x9E */ GI_SWORD_GILDED,
/* 0x9F */ GI_SHIELD_HERO_2, // Code that treats this as hero's shield is unused, so take with a grain of salt
/* 0xA1 */ GI_LETTER_TO_MAMA = 0xA1,
- /* 0xA9 */ GI_BOTTLE = 0xA9,
- /* 0xAB */ GI_PENDANT_OF_MEMORIES = 0xAB,
+ /* 0xA9 */ GI_BOTTLE_STOLEN = 0xA9, // buy back stolen bottle
+ /* 0xAA */ GI_LETTER_TO_KAFEI,
+ /* 0xAB */ GI_PENDANT_OF_MEMORIES,
/* 0xBA */ GI_MAX = 0xBA
} GetItemID;
diff --git a/include/z64load.h b/include/z64load.h
new file mode 100644
index 000000000..8570faf25
--- /dev/null
+++ b/include/z64load.h
@@ -0,0 +1,31 @@
+#ifndef Z64LOAD_H
+#define Z64LOAD_H
+
+#include "PR/ultratypes.h"
+
+#define RELOCATE_ADDR(addr, vRamStart, allocu32) ((addr) - (vRamStart) + (allocu32))
+
+#define RELOC_SECTION(reloc) ((reloc) >> 30)
+#define RELOC_OFFSET(reloc) ((reloc) & 0xFFFFFF)
+#define RELOC_TYPE_MASK(reloc) ((reloc) & 0x3F000000)
+#define RELOC_TYPE_SHIFT 24
+
+/* MIPS Relocation Types */
+#define R_MIPS_32 2
+#define R_MIPS_26 4
+#define R_MIPS_HI16 5
+#define R_MIPS_LO16 6
+
+typedef struct {
+ /* 0x00 */ u32 textSize;
+ /* 0x04 */ u32 dataSize;
+ /* 0x08 */ u32 rodataSize;
+ /* 0x0C */ u32 bssSize;
+ /* 0x10 */ u32 nRelocations;
+ /* 0x14 */ u32 relocations[1];
+} OverlayRelocationSection; // size >= 0x18
+
+size_t Load2_LoadOverlay(uintptr_t vRomStart, uintptr_t vRomEnd, uintptr_t vRamStart, uintptr_t vRamEnd, void* allocatedVRamAddr);
+void* Load2_AllocateAndLoad(uintptr_t vRomStart, uintptr_t vRomEnd, uintptr_t vRamStart, uintptr_t vRamEnd);
+
+#endif
diff --git a/include/z64math.h b/include/z64math.h
index 33f05bb0a..0095e12ab 100644
--- a/include/z64math.h
+++ b/include/z64math.h
@@ -109,17 +109,19 @@ typedef struct {
#define IS_ZERO(f) (fabsf(f) < 0.008f)
-// Trig macros
-#define DEGF_TO_BINANG(degreesf) (s16)(degreesf * 182.04167f + .5f)
-#define RADF_TO_BINANG(radf) (s16)(radf * (0x8000 / M_PI))
-#define RADF_TO_DEGF(radf) (radf * (180.0f / M_PI))
-#define DEGF_TO_RADF(degf) (degf * (M_PI / 180.0f))
+// Angle conversion macros
+#define DEG_TO_BINANG(degrees) (s16)((degrees) * (0x8000 / 180.0f))
+#define DEGF_TO_BINANG(degreesf) (s16)((degreesf) * 182.04167f + .5f)
+#define RADF_TO_BINANG(radf) (s16)((radf) * (0x8000 / M_PI))
+#define RADF_TO_DEGF(radf) ((radf) * (180.0f / M_PI))
+#define DEGF_TO_RADF(degf) ((degf) * (M_PI / 180.0f))
+#define BINANG_TO_DEGF(binang) ((f32)binang * (360.0001525f / 65535.0f))
+#define BINANG_TO_RAD(binang) (((f32)binang / 0x8000) * M_PI)
+
+// Angle arithmetic macros
#define BINANG_ROT180(angle) ((s16)(angle + 0x8000))
#define BINANG_SUB(a, b) ((s16)(a - b))
#define BINANG_ADD(a, b) ((s16)(a + b))
-#define DEG_TO_RAD(degrees) ((degrees) * (M_PI / 180.0f))
-#define BINANG_TO_DEGF(binang) ((f32)binang * (360.0001525f / 65535.0f))
-#define BINANG_TO_RAD(binang) (((f32)binang / 0x8000) * M_PI)
// Vector macros
#define SQXZ(vec) ((vec.x) * (vec.x) + (vec.z) * (vec.z))
diff --git a/include/z64player.h b/include/z64player.h
index 4066e2baf..3a3d10dc9 100644
--- a/include/z64player.h
+++ b/include/z64player.h
@@ -188,7 +188,6 @@ typedef struct {
typedef void (*PlayerFuncD58)(struct GlobalContext*, struct Player*);
-
typedef struct Player {
/* 0x000 */ Actor actor;
/* 0x144 */ s8 currentShield;
diff --git a/include/z64skin.h b/include/z64skin.h
index adb2f9b0f..3d0969fb2 100644
--- a/include/z64skin.h
+++ b/include/z64skin.h
@@ -78,8 +78,8 @@ typedef struct {
/* 0x04C */ SkelAnime skelAnime;
} Skin; // size = 0x90
-typedef void (*SkinPostDraw)(struct Actor*, struct GlobalContext*, Skin*);
-typedef s32 (*SkinOverrideLimbDraw)(struct Actor*, struct GlobalContext*, s32, Skin*);
+typedef void (*SkinPostDraw)(struct Actor* thisx, struct GlobalContext* globalCtx, Skin* skin);
+typedef s32 (*SkinOverrideLimbDraw)(struct Actor* thisx, struct GlobalContext* globalCtx, s32 limbIndex, Skin* skin);
#define SKIN_DRAW_FLAG_CUSTOM_TRANSFORMS (1 << 0)
#define SKIN_DRAW_FLAG_CUSTOM_MATRIX (1 << 1)
diff --git a/include/z64subs.h b/include/z64subs.h
index 3b13d2add..96e0366bf 100644
--- a/include/z64subs.h
+++ b/include/z64subs.h
@@ -8,6 +8,8 @@
extern Vec3f gOneVec3f;
+#define SUBS_TIME_PATHING_ORDER 3
+
typedef enum {
/* 0 */ SUBS_CUTSCENE_SET_UNK_LINK_FIELDS,
/* 1 */ SUBS_CUTSCENE_NORMAL,
@@ -23,6 +25,20 @@ typedef s32 (*VerifyActor)(struct GlobalContext*, Actor*, Actor*, void*);
#define SUBS_SHADOW_TEX_HEIGHT 64
#define SUBS_SHADOW_TEX_SIZE ((s32)sizeof(u8[SUBS_SHADOW_TEX_HEIGHT][SUBS_SHADOW_TEX_WIDTH]))
+typedef struct TrackOptions {
+ /* 0x0 */ u16 rotMax; // binary angles
+ /* 0x2 */ u16 slowness; // larger for slower rotation, cannot be 0
+ /* 0x4 */ u16 rotStepMin; // degrees
+ /* 0x6 */ u16 rotStepMax; // degrees
+} TrackOptions; // size = 0x8
+
+typedef struct TrackOptionsSet {
+ /* 0x00 */ TrackOptions headRotX;
+ /* 0x08 */ TrackOptions headRotY;
+ /* 0x10 */ TrackOptions torsoRotX;
+ /* 0x18 */ TrackOptions torsoRotY;
+} TrackOptionsSet; // size = 0x20
+
#define ACTOR_PATHING_RETURN_TO_START (1 << 0)
#define ACTOR_PATHING_SWITCH_DIRECTION (1 << 1)
#define ACTOR_PATHING_MOVE_BACKWARDS (1 << 3)
@@ -38,20 +54,6 @@ typedef s32 (*VerifyActor)(struct GlobalContext*, Actor*, Actor*, void*);
#define ACTOR_PATHING_REACHED_END \
(ACTOR_PATHING_REACHED_END_PERMANENT | ACTOR_PATHING_REACHED_END_TEMPORARY)
-typedef struct TurnOptions {
- /* 0x0 */ u16 rotMax; // binary angles
- /* 0x2 */ u16 slowness; // larger for slower rotation, cannot be 0
- /* 0x4 */ u16 rotStepMin; // degrees
- /* 0x6 */ u16 rotStepMax; // degrees
-} TurnOptions; // size = 0x8
-
-typedef struct TurnOptionsSet {
- /* 0x00 */ TurnOptions headRotX;
- /* 0x08 */ TurnOptions headRotY;
- /* 0x10 */ TurnOptions torsoRotX;
- /* 0x18 */ TurnOptions torsoRotY;
-} TurnOptionsSet; // size = 0x20
-
struct ActorPathing;
typedef void (*ActorPathingComputeFunc)(struct GlobalContext*, struct ActorPathing*);
typedef s32 (*ActorPathingUpdateFunc)(struct GlobalContext*, struct ActorPathing*);
@@ -80,4 +82,89 @@ typedef struct ActorPathing {
/* 0x68 */ ActorPathingUpdateFunc setNextPointFunc; // Return true if should compute and update again
} ActorPathing; // size = 0x6C
+struct EnDoor* SubS_FindDoor(struct GlobalContext* globalCtx, s32 switchFlag);
+
+Gfx* SubS_DrawTransformFlexLimb(struct GlobalContext* globalCtx, s32 limbIndex, void** skeleton, Vec3s* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, TransformLimbDraw transformLimbDraw, Actor* actor, Mtx** mtx, Gfx* gfx);
+Gfx* SubS_DrawTransformFlex(struct GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, s32 dListCount, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, TransformLimbDraw transformLimbDraw, Actor* actor, Gfx* gfx);
+
+s32 SubS_InCsMode(struct GlobalContext* globalCtx);
+
+s32 SubS_UpdateLimb(s16 newRotZ, s16 newRotY, Vec3f* pos, Vec3s* rot, s32 stepRot, s32 overrideRot);
+
+void SubS_UpdateFlags(u16* flags, u16 setBits, u16 unsetBits);
+
+void SubS_TimePathing_FillKnots(f32 knots[], s32 order, s32 numPoints);
+s32 SubS_TimePathing_ComputeProgress(f32* progress, s32 elapsedTime, s32 waypointTime, s32 totalTime, s32 pathCount, s32 order, f32 knots[]);
+void SubS_TimePathing_ComputeWeights(s32 order, f32 progress, s32 waypoint, f32 knots[], f32 weights[]);
+void SubS_TimePathing_ComputeTargetPosXZ(f32* x, f32* z, f32 progress, s32 order, s32 waypoint, Vec3s points[], f32 knots[]);
+s32 SubS_TimePathing_Update(Path* path, f32* progress, s32* elapsedTime, s32 waypointTime, s32 totalTime, s32* waypoint, f32 knots[], Vec3f* targetPos, s32 timeSpeed);
+void SubS_TimePathing_ComputeInitialY(struct GlobalContext* globalCtx, Path* path, s32 waypoint, Vec3f* targetPos);
+
+Path* SubS_GetAdditionalPath(struct GlobalContext* globalCtx, u8 pathIndex, s32 max);
+
+Actor* SubS_FindNearestActor(Actor* actor, struct GlobalContext* globalCtx, u8 actorCategory, s16 actorId);
+
+s32 SubS_ChangeAnimationByInfoS(SkelAnime* skelAnime, AnimationInfoS* animations, s32 index);
+
+s32 SubS_HasReachedPoint(Actor* actor, Path* path, s32 pointIndex);
+
+Path* SubS_GetDayDependentPath(struct GlobalContext* globalCtx, u8 pathIndex, u8 max, s32* startPointIndex);
+
+s32 SubS_WeightPathing_ComputePoint(Path* path, s32 waypoint, Vec3f* point, f32 progress, s32 direction);
+s32 SubS_WeightPathing_Move(Actor* actor, Path* path, s32* waypoint, f32* progress, s32 direction, s32 returnStart);
+
+s32 SubS_CopyPointFromPathCheckBounds(Path* path, s32 pointIndex, Vec3f* dst);
+
+s32 func_8013C964(Actor* actor, struct GlobalContext* globalCtx, f32 xzRange, f32 yRange, s32 itemId, s32 type);
+
+void SubS_FillShadowTex(s32 startCol, s32 startRow, u8* tex, s32 size);
+void SubS_GenShadowTex(Vec3f bodyPartsPos[], Vec3f* worldPos, u8* tex, f32 tween, u8 bodyPartsNum, u8 sizes[], s8 parentBodyParts[]);
+void SubS_DrawShadowTex(Actor* actor, struct GameState* gameState, u8* tex);
+
+s16 SubS_ComputeTrackPointRot(s16* rot, s16 rotMax, s16 target, f32 slowness, f32 stepMin, f32 stepMax);
+s32 SubS_TrackPoint(Vec3f* point, Vec3f* focusPos, Vec3s* shapeRot, Vec3s* turnTarget, Vec3s* headRot, Vec3s* torsoRot, TrackOptionsSet* options);
+
+s32 SubS_AngleDiffLessEqual(s16 angleA, s16 threshold, s16 angleB);
+
+Path* SubS_GetPathByIndex(struct GlobalContext* globalCtx, s16 pathIndex, s16 max);
+s32 SubS_CopyPointFromPath(Path* path, s32 pointIndex, Vec3f* dst);
+s16 SubS_GetDistSqAndOrientPoints(Vec3f* vecA, Vec3f* vecB, f32* distSq);
+s32 SubS_MoveActorToPoint(Actor* actor, Vec3f* point, s16 rotStep);
+s16 SubS_GetDistSqAndOrientPath(Path* path, s32 pointIdx, Vec3f* pos, f32* distSq);
+
+s8 SubS_IsObjectLoaded(s8 index, struct GlobalContext* globalCtx);
+s8 SubS_GetObjectIndex(s16 id, struct GlobalContext* globalCtx);
+
+Actor* SubS_FindActor(struct GlobalContext* globalCtx, Actor* actorListStart, u8 actorCategory, s16 actorId);
+
+s32 SubS_FillLimbRotTables(struct GlobalContext* globalCtx, s16* limbRotTableY, s16* limbRotTableZ, s32 numLimbs);
+
+s32 SubS_IsFloorAbove(struct GlobalContext* globalCtx, Vec3f* pos, f32 distAbove);
+
+s32 SubS_CopyPointFromPathList(Path* paths, s32 pathIndex, s32 pointIndex, Vec3f* dst);
+u8 SubS_GetPathCountFromPathList(Path* paths, s32 pathIndex);
+
+void SubS_ActorPathing_Init(struct GlobalContext* globalCtx, Vec3f* worldPos, Actor* actor, ActorPathing* actorPath, Path* paths, s32 pathIndex, s32 begPointIndex, s32 endPointIndex, s32 curPointIndex, u8 flags);
+s32 SubS_ActorPathing_Update(struct GlobalContext* globalCtx, ActorPathing* actorPath, ActorPathingComputeFunc computePointInfoFunc, ActorPathingUpdateFunc updateActorInfoFunc, ActorPathingUpdateFunc moveFunc, ActorPathingUpdateFunc setNextPointFunc);
+void SubS_ActorPathing_ComputePointInfo(struct GlobalContext* globalCtx, ActorPathing* actorPath);
+s32 SubS_ActorPathing_MoveWithGravity(struct GlobalContext* globalCtx, ActorPathing* actorPath);
+s32 SubS_ActorPathing_MoveWithoutGravityReverse(struct GlobalContext* globalCtx, ActorPathing* actorPath);
+s32 SubS_ActorPathing_SetNextPoint(struct GlobalContext* globalCtx, ActorPathing* actorPath);
+
+void SubS_ChangeAnimationBySpeedInfo(SkelAnime* skelAnime, AnimationSpeedInfo* animations, s32 nextIndex, s32* curIndex);
+
+s32 SubS_StartActorCutscene(Actor* actor, s16 nextCutscene, s16 curCutscene, s32 type);
+s32 SubS_FillCutscenesList(Actor* actor, s16 cutscenes[], s16 numCutscenes);
+
+void SubS_ConstructPlane(Vec3f* point, Vec3f* unitVec, Vec3s* rot, Plane* plane);
+s32 SubS_LineSegVsPlane(Vec3f* point, Vec3s* rot, Vec3f* unitVec, Vec3f* linePointA, Vec3f* linePointB, Vec3f* intersect);
+
+Actor* SubS_FindActorCustom(struct GlobalContext* globalCtx, Actor* actor, Actor* actorListStart, u8 actorCategory, s16 actorId, void* verifyData, VerifyActor verifyActor);
+
+s32 func_8013E748(Actor* actor, struct GlobalContext* globalCtx, f32 xzRange, f32 yRange, s32 exchangeItemId, void* data, func_8013E748_VerifyFunc verifyFunc);
+s32 SubS_ActorAndPlayerFaceEachOther(struct GlobalContext* globalCtx, Actor* actor, void* data);
+s32 func_8013E8F8(Actor* actor, struct GlobalContext* globalCtx, f32 xzRange, f32 yRange, s32 exhangeItemId, s16 playerYawTol, s16 actorYawTol);
+
+s32 SubS_TrackPointStep(Vec3f* worldPos, Vec3f* focusPos, s16 shapeYRot, Vec3f* yawTarget, Vec3f* pitchTarget, s16* headZRotStep, s16* headXRotStep, s16* torsoZRotStep, s16* torsoXRotStep, u16 headZRotStepMax, u16 headXRotStepMax, u16 torsoZRotStepMax, u16 torsoXRotStepMax);
+
#endif
diff --git a/include/z_en_hy_code.h b/include/z_en_hy_code.h
index a0f9bcdd4..7c67226cf 100644
--- a/include/z_en_hy_code.h
+++ b/include/z_en_hy_code.h
@@ -57,10 +57,10 @@ typedef struct EnHy {
/* 0x205 */ u8 isRightFootOnGround;
/* 0x206 */ Vec3s jointTable[ENHY_LIMB_MAX];
/* 0x266 */ Vec3s morphTable[ENHY_LIMB_MAX];
- /* 0x2C6 */ Vec3s turnTarget;
+ /* 0x2C6 */ Vec3s trackTarget;
/* 0x2CC */ Vec3s headRot;
/* 0x2D2 */ Vec3s torsoRot;
- /* 0x2D8 */ Vec3s tmpTurnTarget;
+ /* 0x2D8 */ Vec3s tmptrackTarget;
/* 0x2DE */ Vec3s tmpHeadRot;
/* 0x2E4 */ Vec3s tmpTorsoRot;
/* 0x2EA */ s16 limbRotTableY[16];
diff --git a/spec b/spec
index b085406e8..a001b42d6 100644
--- a/spec
+++ b/spec
@@ -29,7 +29,6 @@ beginseg
include "build/src/boot_O2_g3/fault_drawer.o"
include "build/src/boot_O2/boot_80084940.o"
include "build/src/boot_O2/loadfragment.o"
- include "build/data/boot/loadfragment.data.o"
include "build/src/boot_O2/loadfragment2.o"
include "build/src/boot_O2/padutils.o"
include "build/src/boot_O2/stackcheck.o"
@@ -766,8 +765,7 @@ beginseg
name "ovl_En_Box"
compress
include "build/src/overlays/actors/ovl_En_Box/z_en_box.o"
- include "build/data/ovl_En_Box/ovl_En_Box.data.o"
- include "build/data/ovl_En_Box/ovl_En_Box.reloc.o"
+ include "build/src/overlays/actors/ovl_En_Box/ovl_En_Box_reloc.o"
endseg
beginseg
@@ -877,8 +875,7 @@ beginseg
name "ovl_En_Hata"
compress
include "build/src/overlays/actors/ovl_En_Hata/z_en_hata.o"
- include "build/data/ovl_En_Hata/ovl_En_Hata.data.o"
- include "build/data/ovl_En_Hata/ovl_En_Hata.reloc.o"
+ include "build/src/overlays/actors/ovl_En_Hata/ovl_En_Hata_reloc.o"
endseg
beginseg
@@ -1168,8 +1165,7 @@ beginseg
name "ovl_En_Horse_Link_Child"
compress
include "build/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.o"
- include "build/data/ovl_En_Horse_Link_Child/ovl_En_Horse_Link_Child.data.o"
- include "build/data/ovl_En_Horse_Link_Child/ovl_En_Horse_Link_Child.reloc.o"
+ include "build/src/overlays/actors/ovl_En_Horse_Link_Child/ovl_En_Horse_Link_Child_reloc.o"
endseg
beginseg
@@ -1191,8 +1187,7 @@ beginseg
name "ovl_Demo_Tre_Lgt"
compress
include "build/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.o"
- include "build/data/ovl_Demo_Tre_Lgt/ovl_Demo_Tre_Lgt.data.o"
- include "build/data/ovl_Demo_Tre_Lgt/ovl_Demo_Tre_Lgt.reloc.o"
+ include "build/src/overlays/actors/ovl_Demo_Tre_Lgt/ovl_Demo_Tre_Lgt_reloc.o"
endseg
beginseg
@@ -1910,8 +1905,7 @@ beginseg
name "ovl_Effect_Ss_K_Fire"
compress
include "build/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.o"
- include "build/data/ovl_Effect_Ss_K_Fire/ovl_Effect_Ss_K_Fire.data.o"
- include "build/data/ovl_Effect_Ss_K_Fire/ovl_Effect_Ss_K_Fire.reloc.o"
+ include "build/src/overlays/effects/ovl_Effect_Ss_K_Fire/ovl_Effect_Ss_K_Fire_reloc.o"
endseg
beginseg
@@ -1933,8 +1927,7 @@ beginseg
name "ovl_Effect_Ss_Ice_Piece"
compress
include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.o"
- include "build/data/ovl_Effect_Ss_Ice_Piece/ovl_Effect_Ss_Ice_Piece.data.o"
- include "build/data/ovl_Effect_Ss_Ice_Piece/ovl_Effect_Ss_Ice_Piece.reloc.o"
+ include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/ovl_Effect_Ss_Ice_Piece_reloc.o"
endseg
beginseg
@@ -1965,8 +1958,7 @@ beginseg
name "ovl_Effect_Ss_Extra"
compress
include "build/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.o"
- include "build/data/ovl_Effect_Ss_Extra/ovl_Effect_Ss_Extra.data.o"
- include "build/data/ovl_Effect_Ss_Extra/ovl_Effect_Ss_Extra.reloc.o"
+ include "build/src/overlays/effects/ovl_Effect_Ss_Extra/ovl_Effect_Ss_Extra_reloc.o"
endseg
beginseg
@@ -2156,8 +2148,7 @@ beginseg
name "ovl_Effect_Ss_Ice_Smoke"
compress
include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.o"
- include "build/data/ovl_Effect_Ss_Ice_Smoke/ovl_Effect_Ss_Ice_Smoke.data.o"
- include "build/data/ovl_Effect_Ss_Ice_Smoke/ovl_Effect_Ss_Ice_Smoke.reloc.o"
+ include "build/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/ovl_Effect_Ss_Ice_Smoke_reloc.o"
endseg
beginseg
@@ -2216,8 +2207,7 @@ beginseg
name "ovl_Obj_Toge"
compress
include "build/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.o"
- include "build/data/ovl_Obj_Toge/ovl_Obj_Toge.data.o"
- include "build/data/ovl_Obj_Toge/ovl_Obj_Toge.reloc.o"
+ include "build/src/overlays/actors/ovl_Obj_Toge/ovl_Obj_Toge_reloc.o"
endseg
beginseg
@@ -2711,8 +2701,7 @@ beginseg
name "ovl_Dm_Zl"
compress
include "build/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.o"
- include "build/data/ovl_Dm_Zl/ovl_Dm_Zl.data.o"
- include "build/data/ovl_Dm_Zl/ovl_Dm_Zl.reloc.o"
+ include "build/src/overlays/actors/ovl_Dm_Zl/ovl_Dm_Zl_reloc.o"
endseg
beginseg
@@ -2900,8 +2889,7 @@ beginseg
name "ovl_Bg_Keikoku_Saku"
compress
include "build/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.o"
- include "build/data/ovl_Bg_Keikoku_Saku/ovl_Bg_Keikoku_Saku.data.o"
- include "build/data/ovl_Bg_Keikoku_Saku/ovl_Bg_Keikoku_Saku.reloc.o"
+ include "build/src/overlays/actors/ovl_Bg_Keikoku_Saku/ovl_Bg_Keikoku_Saku_reloc.o"
endseg
beginseg
@@ -3142,8 +3130,7 @@ beginseg
name "ovl_Dm_Opstage"
compress
include "build/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.o"
- include "build/data/ovl_Dm_Opstage/ovl_Dm_Opstage.data.o"
- include "build/data/ovl_Dm_Opstage/ovl_Dm_Opstage.reloc.o"
+ include "build/src/overlays/actors/ovl_Dm_Opstage/ovl_Dm_Opstage_reloc.o"
endseg
beginseg
@@ -3388,8 +3375,7 @@ beginseg
name "ovl_En_Time_Tag"
compress
include "build/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.o"
- include "build/data/ovl_En_Time_Tag/ovl_En_Time_Tag.data.o"
- include "build/data/ovl_En_Time_Tag/ovl_En_Time_Tag.reloc.o"
+ include "build/src/overlays/actors/ovl_En_Time_Tag/ovl_En_Time_Tag_reloc.o"
endseg
beginseg
@@ -4212,8 +4198,7 @@ beginseg
name "ovl_Obj_Tokei_Turret"
compress
include "build/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.o"
- include "build/data/ovl_Obj_Tokei_Turret/ovl_Obj_Tokei_Turret.data.o"
- include "build/data/ovl_Obj_Tokei_Turret/ovl_Obj_Tokei_Turret.reloc.o"
+ include "build/src/overlays/actors/ovl_Obj_Tokei_Turret/ovl_Obj_Tokei_Turret_reloc.o"
endseg
beginseg
@@ -4242,8 +4227,7 @@ beginseg
name "ovl_Obj_Rotlift"
compress
include "build/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.o"
- include "build/data/ovl_Obj_Rotlift/ovl_Obj_Rotlift.data.o"
- include "build/data/ovl_Obj_Rotlift/ovl_Obj_Rotlift.reloc.o"
+ include "build/src/overlays/actors/ovl_Obj_Rotlift/ovl_Obj_Rotlift_reloc.o"
endseg
beginseg
@@ -4294,8 +4278,7 @@ beginseg
name "ovl_Obj_Boat"
compress
include "build/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.o"
- include "build/data/ovl_Obj_Boat/ovl_Obj_Boat.data.o"
- include "build/data/ovl_Obj_Boat/ovl_Obj_Boat.reloc.o"
+ include "build/src/overlays/actors/ovl_Obj_Boat/ovl_Obj_Boat_reloc.o"
endseg
beginseg
@@ -4638,8 +4621,7 @@ beginseg
name "ovl_En_Sc_Ruppe"
compress
include "build/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.o"
- include "build/data/ovl_En_Sc_Ruppe/ovl_En_Sc_Ruppe.data.o"
- include "build/data/ovl_En_Sc_Ruppe/ovl_En_Sc_Ruppe.reloc.o"
+ include "build/src/overlays/actors//ovl_En_Sc_Ruppe/ovl_En_Sc_Ruppe_reloc.o"
endseg
beginseg
@@ -4818,9 +4800,7 @@ beginseg
name "ovl_Bg_Ikana_Dharma"
compress
include "build/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.o"
- include "build/data/ovl_Bg_Ikana_Dharma/ovl_Bg_Ikana_Dharma.data.o"
- include "build/data/ovl_Bg_Ikana_Dharma/ovl_Bg_Ikana_Dharma.bss.o"
- include "build/data/ovl_Bg_Ikana_Dharma/ovl_Bg_Ikana_Dharma.reloc.o"
+ include "build/src/overlays/actors/ovl_Bg_Ikana_Dharma/ovl_Bg_Ikana_Dharma_reloc.o"
endseg
beginseg
@@ -4951,8 +4931,7 @@ beginseg
name "ovl_Bg_Ikninside"
compress
include "build/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.o"
- include "build/data/ovl_Bg_Ikninside/ovl_Bg_Ikninside.data.o"
- include "build/data/ovl_Bg_Ikninside/ovl_Bg_Ikninside.reloc.o"
+ include "build/src/overlays/actors/ovl_Bg_Ikninside/ovl_Bg_Ikninside_reloc.o"
endseg
beginseg
@@ -5011,8 +4990,7 @@ beginseg
name "ovl_Bg_Astr_Bombwall"
compress
include "build/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.o"
- include "build/data/ovl_Bg_Astr_Bombwall/ovl_Bg_Astr_Bombwall.data.o"
- include "build/data/ovl_Bg_Astr_Bombwall/ovl_Bg_Astr_Bombwall.reloc.o"
+ include "build/src/overlays/actors/ovl_Bg_Astr_Bombwall/ovl_Bg_Astr_Bombwall_reloc.o"
endseg
beginseg
@@ -5177,8 +5155,7 @@ beginseg
name "ovl_Dm_Bal"
compress
include "build/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.o"
- include "build/data/ovl_Dm_Bal/ovl_Dm_Bal.data.o"
- include "build/data/ovl_Dm_Bal/ovl_Dm_Bal.reloc.o"
+ include "build/src/overlays/actors/ovl_Dm_Bal/ovl_Dm_Bal_reloc.o"
endseg
beginseg
diff --git a/src/boot_O2/gfxprint.c b/src/boot_O2/gfxprint.c
index a6f84a7a4..557887abd 100644
--- a/src/boot_O2/gfxprint.c
+++ b/src/boot_O2/gfxprint.c
@@ -1,50 +1,50 @@
#include "global.h"
+#define GFXP_FLAG_HIRAGANA (1 << 0)
+#define GFXP_FLAG_RAINBOW (1 << 1)
+#define GFXP_FLAG_SHADOW (1 << 2)
+#define GFXP_FLAG_UPDATE (1 << 3)
+#define GFXP_FLAG_ENLARGE (1 << 6)
+#define GFXP_FLAG_OPEN (1 << 7)
+
+//! TODO: Need to extract
extern u16 sGfxPrintFontTLUT[64];
-extern u16 sGfxPrintUnkTLUT[16];
-extern u8 sGfxPrintUnkData[8];
+extern u16 sGfxPrintRainbowTLUT[16];
+extern u8 sGfxPrintRainbowData[8];
extern u8 sGfxPrintFontData[2048];
-#define gDPSetPrimColorMod(pkt, m, l, rgba) \
- { \
- Gfx* _g = (Gfx*)(pkt); \
- \
- _g->words.w0 = (_SHIFTL(G_SETPRIMCOLOR, 24, 8) | _SHIFTL(m, 8, 8) | _SHIFTL(l, 0, 8)); \
- _g->words.w1 = (rgba); \
- }
-
-void GfxPrint_InitDlist(GfxPrint* this) {
+void GfxPrint_Setup(GfxPrint* this) {
s32 width = 16;
s32 height = 256;
s32 i;
- gDPPipeSync(this->dlist++);
- gDPSetOtherMode(this->dlist++,
+ gDPPipeSync(this->dList++);
+ gDPSetOtherMode(this->dList++,
G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_IA16 | G_TL_TILE |
G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE,
G_AC_NONE | G_ZS_PRIM | G_RM_XLU_SURF | G_RM_XLU_SURF2);
- gDPSetCombineMode(this->dlist++, G_CC_DECALRGBA, G_CC_DECALRGBA);
- gDPLoadTextureBlock_4b(this->dlist++, sGfxPrintFontData, G_IM_FMT_CI, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
+ gDPSetCombineMode(this->dList++, G_CC_DECALRGBA, G_CC_DECALRGBA);
+ gDPLoadTextureBlock_4b(this->dList++, sGfxPrintFontData, G_IM_FMT_CI, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
- gDPLoadTLUT(this->dlist++, 64, 256, sGfxPrintFontTLUT);
+ gDPLoadTLUT(this->dList++, 64, 256, sGfxPrintFontTLUT);
for (i = 1; i < 4; i++) {
- gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, i * 2, i, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
+ gDPSetTile(this->dList++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, i * 2, i, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
- gDPSetTileSize(this->dlist++, i * 2, 0, 0, 60, 1020);
+ gDPSetTileSize(this->dList++, i * 2, 0, 0, 60, 1020);
}
- gDPSetPrimColorMod(this->dlist++, 0, 0, this->color.rgba);
+ gDPSetColor(this->dList++, G_SETPRIMCOLOR, this->color.rgba);
- gDPLoadMultiTile_4b(this->dlist++, sGfxPrintUnkData, 0, 1, G_IM_FMT_CI, 2, 8, 0, 0, 1, 7, 4,
+ gDPLoadMultiTile_4b(this->dList++, sGfxPrintRainbowData, 0, 1, G_IM_FMT_CI, 2, 8, 0, 0, 1, 7, 4,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 1, 3, G_TX_NOLOD, G_TX_NOLOD);
- gDPLoadTLUT(this->dlist++, 16, 320, sGfxPrintUnkTLUT);
+ gDPLoadTLUT(this->dList++, 16, 320, sGfxPrintRainbowTLUT);
for (i = 1; i < 4; i++) {
- gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, i * 2 + 1, 4, G_TX_NOMIRROR | G_TX_WRAP, 3,
+ gDPSetTile(this->dList++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, i * 2 + 1, 4, G_TX_NOMIRROR | G_TX_WRAP, 3,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 1, G_TX_NOLOD);
- gDPSetTileSize(this->dlist++, i * 2 + 1, 0, 0, 4, 28);
+ gDPSetTileSize(this->dList++, i * 2 + 1, 0, 0, 4, 28);
}
}
@@ -53,8 +53,8 @@ void GfxPrint_SetColor(GfxPrint* this, u32 r, u32 g, u32 b, u32 a) {
this->color.g = g;
this->color.b = b;
this->color.a = a;
- gDPPipeSync(this->dlist++);
- gDPSetPrimColorMod(this->dlist++, 0, 0, this->color.rgba);
+ gDPPipeSync(this->dList++);
+ gDPSetColor(this->dList++, G_SETPRIMCOLOR, this->color.rgba);
}
void GfxPrint_SetPosPx(GfxPrint* this, s32 x, s32 y) {
@@ -71,108 +71,156 @@ void GfxPrint_SetBasePosPx(GfxPrint* this, s32 x, s32 y) {
this->baseY = y << 2;
}
-/* regalloc in the final gSPTextureRectangle */
-#ifdef NON_MATCHING
void GfxPrint_PrintCharImpl(GfxPrint* this, u8 c) {
u32 tile = (c & 0xFF) * 2;
+ u16 s = c & 4;
+ u16 t = c >> 3;
- if (this->flag & GFXPRINT_UPDATE_MODE) {
- this->flag &= ~GFXPRINT_UPDATE_MODE;
+ if (this->flags & GFXP_FLAG_UPDATE) {
+ this->flags &= ~GFXP_FLAG_UPDATE;
- gDPPipeSync(this->dlist++);
- if (this->flag & GFXPRINT_USE_RGBA16) {
- gDPSetTextureLUT(this->dlist++, G_TT_RGBA16);
- gDPSetCycleType(this->dlist++, G_CYC_2CYCLE);
- gDPSetRenderMode(this->dlist++, G_RM_OPA_CI, G_RM_XLU_SURF2);
- gDPSetCombineMode(this->dlist++, G_CC_INTERFERENCE, G_CC_PASS2);
+ gDPPipeSync(this->dList++);
+ if (this->flags & GFXP_FLAG_RAINBOW) {
+ gDPSetTextureLUT(this->dList++, G_TT_RGBA16);
+ gDPSetCycleType(this->dList++, G_CYC_2CYCLE);
+ gDPSetRenderMode(this->dList++, G_RM_OPA_CI, G_RM_XLU_SURF2);
+ gDPSetCombineMode(this->dList++, G_CC_INTERFERENCE, G_CC_PASS2);
} else {
- gDPSetTextureLUT(this->dlist++, G_TT_IA16);
- gDPSetCycleType(this->dlist++, G_CYC_1CYCLE);
- gDPSetRenderMode(this->dlist++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
- gDPSetCombineMode(this->dlist++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM);
+ gDPSetTextureLUT(this->dList++, G_TT_IA16);
+ gDPSetCycleType(this->dList++, G_CYC_1CYCLE);
+ gDPSetRenderMode(this->dList++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
+ gDPSetCombineMode(this->dList++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM);
}
}
- if (this->flag & GFXPRINT_FLAG4) {
- gDPSetPrimColorMod(this->dlist++, 0, 0, 0);
+ if (this->flags & GFXP_FLAG_SHADOW) {
+ gDPSetColor(this->dList++, G_SETPRIMCOLOR, 0);
- gSPTextureRectangle(this->dlist++, this->posX + 4, this->posY + 4, this->posX + 4 + 32, this->posY + 4 + 32,
- (c & 3) << 1, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1024, 1024);
+ gSPTextureRectangle(this->dList++, this->posX + 4, this->posY + 4, this->posX + 4 + 32, this->posY + 4 + 32,
+ tile, s << 6, t << 8, 1 << 10, 1 << 10);
- gDPSetPrimColorMod(this->dlist++, 0, 0, this->color.rgba);
+ gDPSetColor(this->dList++, G_SETPRIMCOLOR, this->color.rgba);
}
- gSPTextureRectangle(this->dlist++, this->posX, this->posY, this->posX + 32, this->posY + 32, (u16)(tile & 7),
- (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1024, 1024);
+ gSPTextureRectangle(this->dList++, this->posX, this->posY, this->posX + 32, this->posY + 32, tile, s << 6, t << 8,
+ 1 << 10, 1 << 10);
this->posX += 32;
}
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/boot/gfxprint/GfxPrint_PrintCharImpl.s")
-#endif
-#pragma GLOBAL_ASM("asm/non_matchings/boot/gfxprint/GfxPrint_PrintChar.s")
+void GfxPrint_PrintChar(GfxPrint* this, u8 c) {
+ if (c == ' ') {
+ this->posX += 32;
+ } else if (c > ' ' && c < 0x7F) {
+ GfxPrint_PrintCharImpl(this, c);
+ } else if (c >= 0xA0 && c < 0xE0) {
+ if (this->flags & GFXP_FLAG_HIRAGANA) {
+ if (c < 0xC0) {
+ c -= 0x20;
+ } else {
+ c += 0x20;
+ }
+ }
+ GfxPrint_PrintCharImpl(this, c);
+ } else {
+ switch (c) {
+ case '\0':
+ break;
+ case '\n':
+ this->posY += 32;
+ case '\r':
+ this->posX = this->baseX;
+ break;
+ case '\t':
+ do {
+ GfxPrint_PrintCharImpl(this, ' ');
+ } while ((this->posX - this->baseX) % 256);
+ break;
+ case GFXP_HIRAGANA_CHAR:
+ this->flags |= GFXP_FLAG_HIRAGANA;
+ break;
+ case GFXP_KATAKANA_CHAR:
+ this->flags &= ~GFXP_FLAG_HIRAGANA;
+ break;
+ case GFXP_RAINBOW_ON_CHAR:
+ this->flags |= GFXP_FLAG_RAINBOW;
+ this->flags |= GFXP_FLAG_UPDATE;
+ break;
+ case GFXP_RAINBOW_OFF_CHAR:
+ this->flags &= ~GFXP_FLAG_RAINBOW;
+ this->flags |= GFXP_FLAG_UPDATE;
+ break;
+ case GFXP_UNUSED_CHAR:
+ default:
+ break;
+ }
+ }
+}
void GfxPrint_PrintStringWithSize(GfxPrint* this, const void* buffer, size_t charSize, size_t charCount) {
const char* str = (const char*)buffer;
size_t count = charSize * charCount;
- while (count) {
+ while (count != 0) {
GfxPrint_PrintChar(this, *str++);
count--;
}
}
void GfxPrint_PrintString(GfxPrint* this, const char* str) {
- while (*str) {
- GfxPrint_PrintChar(this, *(str++));
+ while (*str != '\0') {
+ GfxPrint_PrintChar(this, *str++);
}
}
-GfxPrint* GfxPrint_Callback(GfxPrint* this, const char* str, size_t size) {
+void* GfxPrint_Callback(void* arg, const char* str, size_t size) {
+ GfxPrint* this = arg;
+
GfxPrint_PrintStringWithSize(this, str, sizeof(char), size);
+
return this;
}
void GfxPrint_Init(GfxPrint* this) {
- this->flag &= ~GFXPRINT_OPEN;
+ this->flags &= ~GFXP_FLAG_OPEN;
this->callback = GfxPrint_Callback;
-
- this->dlist = NULL;
+ this->dList = NULL;
this->posX = 0;
this->posY = 0;
this->baseX = 0;
this->baseY = 0;
this->color.rgba = 0;
- this->flag &= ~GFXPRINT_FLAG1;
- this->flag &= ~GFXPRINT_USE_RGBA16;
- this->flag |= GFXPRINT_FLAG4;
- this->flag |= GFXPRINT_UPDATE_MODE;
+
+ this->flags &= ~GFXP_FLAG_HIRAGANA;
+ this->flags &= ~GFXP_FLAG_RAINBOW;
+ this->flags |= GFXP_FLAG_SHADOW;
+ this->flags |= GFXP_FLAG_UPDATE;
}
void GfxPrint_Destroy(GfxPrint* this) {
}
-void GfxPrint_Open(GfxPrint* this, Gfx* dlist) {
- if (!(this->flag & GFXPRINT_OPEN)) {
- this->flag |= GFXPRINT_OPEN;
- this->dlist = dlist;
- GfxPrint_InitDlist(this);
+void GfxPrint_Open(GfxPrint* this, Gfx* dList) {
+ if (!(this->flags & GFXP_FLAG_OPEN)) {
+ this->flags |= GFXP_FLAG_OPEN;
+ this->dList = dList;
+ GfxPrint_Setup(this);
}
}
Gfx* GfxPrint_Close(GfxPrint* this) {
Gfx* ret;
- this->flag &= ~GFXPRINT_OPEN;
- ret = this->dlist;
- this->dlist = NULL;
+ this->flags &= ~GFXP_FLAG_OPEN;
+ ret = this->dList;
+ this->dList = NULL;
+
return ret;
}
s32 GfxPrint_VPrintf(GfxPrint* this, const char* fmt, va_list args) {
- return PrintUtils_VPrintf((PrintCallback*)&this->callback, fmt, args);
+ return PrintUtils_VPrintf(&this->callback, fmt, args);
}
s32 GfxPrint_Printf(GfxPrint* this, const char* fmt, ...) {
diff --git a/src/boot_O2/loadfragment.c b/src/boot_O2/loadfragment.c
index 968fb464a..17ed6b8ef 100644
--- a/src/boot_O2/loadfragment.c
+++ b/src/boot_O2/loadfragment.c
@@ -1,8 +1,190 @@
+/**
+ * @file loadfragment.c
+ *
+ * Functions used to process and relocate overlays
+ *
+ * @note:
+ * These are completly unused in favor of the functions in `loadfragment2.c`.
+ *
+ * The main difference between them seems to be the lack of vRamEnd arguments here.
+ * Instead they are calculated on the fly.
+ */
#include "global.h"
#include "system_malloc.h"
+#include "z64load.h"
-#pragma GLOBAL_ASM("asm/non_matchings/boot/loadfragment/Load_Relocate.s")
+s32 gLoadLogSeverity = 2;
-#pragma GLOBAL_ASM("asm/non_matchings/boot/loadfragment/Load_LoadOverlay.s")
+void Load_Relocate(void* allocatedVRamAddr, OverlayRelocationSection* ovl, uintptr_t vRamStart) {
+ u32 sections[4];
+ u32* relocDataP;
+ u32 reloc;
+ uintptr_t relocatedAddress;
+ u32 i;
+ u32* luiInstRef;
+ uintptr_t allocu32 = (uintptr_t)allocatedVRamAddr;
+ u32* regValP;
+ u32* luiRefs[32];
+ u32 luiVals[32];
+ u32 isLoNeg;
-#pragma GLOBAL_ASM("asm/non_matchings/boot/loadfragment/Load_AllocateAndLoad.s")
+ if (gLoadLogSeverity >= 3) {}
+
+ sections[0] = 0;
+ sections[1] = allocu32;
+ sections[2] = allocu32 + ovl->textSize;
+ sections[3] = sections[2] + ovl->dataSize;
+
+ for (i = 0; i < ovl->nRelocations; i++) {
+ reloc = ovl->relocations[i];
+ relocDataP = (u32*)(sections[RELOC_SECTION(reloc)] + RELOC_OFFSET(reloc));
+
+ switch (RELOC_TYPE_MASK(reloc)) {
+ case R_MIPS_32 << RELOC_TYPE_SHIFT:
+ // Handles 32-bit address relocation, used for things such as jump tables and pointers in data.
+ // Just relocate the full address
+
+ // Check address is valid for relocation
+ if ((*relocDataP & 0x0F000000) == 0) {
+ *relocDataP = RELOCATE_ADDR(*relocDataP, vRamStart, allocu32);
+ } else if (gLoadLogSeverity >= 3) {
+ }
+ break;
+
+ case R_MIPS_26 << RELOC_TYPE_SHIFT:
+ // Handles 26-bit address relocation, used for jumps and jals.
+ // Extract the address from the target field of the J-type MIPS instruction.
+ // Relocate the address and update the instruction.
+
+ *relocDataP =
+ (*relocDataP & 0xFC000000) |
+ ((RELOCATE_ADDR(PHYS_TO_K0((*relocDataP & 0x03FFFFFF) << 2), vRamStart, allocu32) & 0x0FFFFFFF) >>
+ 2);
+ break;
+
+ case R_MIPS_HI16 << RELOC_TYPE_SHIFT:
+ // Handles relocation for a hi/lo pair, part 1.
+ // Store the reference to the LUI instruction (hi) using the `rt` register of the instruction.
+ // This will be updated later in the `R_MIPS_LO16` section.
+
+ luiRefs[(*relocDataP >> 0x10) & 0x1F] = relocDataP;
+ luiVals[(*relocDataP >> 0x10) & 0x1F] = *relocDataP;
+ break;
+
+ case R_MIPS_LO16 << RELOC_TYPE_SHIFT:
+ // Handles relocation for a hi/lo pair, part 2.
+ // Grab the stored LUI (hi) from the `R_MIPS_HI16` section using the `rs` register of the instruction.
+ // The full address is calculated, relocated, and then used to update both the LUI and lo instructions.
+ // If the lo part is negative, add 1 to the LUI value.
+ // Note: The lo instruction is assumed to have a signed immediate.
+
+ luiInstRef = luiRefs[(*relocDataP >> 0x15) & 0x1F];
+ regValP = &luiVals[(*relocDataP >> 0x15) & 0x1F];
+
+ // Check address is valid for relocation
+ if ((((*luiInstRef << 0x10) + (s16)*relocDataP) & 0x0F000000) == 0) {
+ relocatedAddress = RELOCATE_ADDR((*regValP << 0x10) + (s16)*relocDataP, vRamStart, allocu32);
+ isLoNeg = (relocatedAddress & 0x8000) ? 1 : 0;
+ *luiInstRef = (*luiInstRef & 0xFFFF0000) | (((relocatedAddress >> 0x10) & 0xFFFF) + isLoNeg);
+ *relocDataP = (*relocDataP & 0xFFFF0000) | (relocatedAddress & 0xFFFF);
+ } else if (gLoadLogSeverity >= 3) {
+ }
+ break;
+ }
+ }
+}
+
+size_t Load_LoadOverlay(uintptr_t vRomStart, uintptr_t vRomEnd, uintptr_t vRamStart, void* allocatedVRamAddr,
+ size_t allocatedBytes) {
+ size_t size = vRomEnd - vRomStart;
+ void* end;
+ s32 pad;
+ OverlayRelocationSection* ovl;
+
+ if (gLoadLogSeverity >= 3) {}
+ if (gLoadLogSeverity >= 3) {}
+
+ end = (uintptr_t)allocatedVRamAddr + size;
+ DmaMgr_SendRequest0(allocatedVRamAddr, vRomStart, size);
+
+ ovl = (OverlayRelocationSection*)((uintptr_t)end - ((s32*)end)[-1]);
+
+ if (gLoadLogSeverity >= 3) {}
+
+ if (allocatedBytes < ovl->bssSize + size) {
+ if (gLoadLogSeverity >= 3) {}
+ return 0;
+ }
+
+ allocatedBytes = ovl->bssSize + size;
+
+ if (gLoadLogSeverity >= 3) {}
+
+ Load_Relocate(allocatedVRamAddr, ovl, vRamStart);
+
+ if (ovl->bssSize != 0) {
+ if (gLoadLogSeverity >= 3) {}
+ bzero(end, ovl->bssSize);
+ }
+
+ osWritebackDCache(allocatedVRamAddr, allocatedBytes);
+ osInvalICache(allocatedVRamAddr, allocatedBytes);
+
+ if (gLoadLogSeverity >= 3) {}
+
+ return allocatedBytes;
+}
+
+void* Load_AllocateAndLoad(uintptr_t vRomStart, uintptr_t vRomEnd, uintptr_t vRamStart) {
+ size_t size = vRomEnd - vRomStart;
+ void* end;
+ void* allocatedVRamAddr;
+ uintptr_t ovlOffset;
+ OverlayRelocationSection* ovl;
+ size_t allocatedBytes;
+
+ if (gLoadLogSeverity >= 3) {}
+
+ allocatedVRamAddr = SystemArena_MallocR(size);
+ end = (uintptr_t)allocatedVRamAddr + size;
+
+ if (gLoadLogSeverity >= 3) {}
+
+ DmaMgr_SendRequest0(allocatedVRamAddr, vRomStart, size);
+
+ if (gLoadLogSeverity >= 3) {}
+
+ ovlOffset = (uintptr_t)end - 4;
+ ovl = (OverlayRelocationSection*)((uintptr_t)end - ((s32*)end)[-1]);
+
+ if (1) {}
+
+ allocatedBytes = ovl->bssSize + size;
+
+ allocatedVRamAddr = SystemArena_Realloc(allocatedVRamAddr, allocatedBytes);
+
+ if (gLoadLogSeverity >= 3) {}
+
+ if (allocatedVRamAddr == NULL) {
+ if (gLoadLogSeverity >= 3) {}
+ return allocatedVRamAddr;
+ }
+
+ end = (uintptr_t)allocatedVRamAddr + size;
+ ovl = (OverlayRelocationSection*)((uintptr_t)end - *(uintptr_t*)ovlOffset);
+
+ if (gLoadLogSeverity >= 3) {}
+
+ Load_Relocate(allocatedVRamAddr, ovl, vRamStart);
+
+ if (ovl->bssSize != 0) {
+ if (gLoadLogSeverity >= 3) {}
+ bzero(end, ovl->bssSize);
+ }
+
+ osInvalICache(allocatedVRamAddr, allocatedBytes);
+
+ if (gLoadLogSeverity >= 3) {}
+
+ return allocatedVRamAddr;
+}
diff --git a/src/boot_O2/loadfragment2.c b/src/boot_O2/loadfragment2.c
index c324b80d5..51b651c2b 100644
--- a/src/boot_O2/loadfragment2.c
+++ b/src/boot_O2/loadfragment2.c
@@ -1,120 +1,134 @@
+/**
+ * @file loadfragment2.c
+ *
+ * Functions used to process and relocate overlays
+ *
+ */
#include "global.h"
#include "system_malloc.h"
+#include "z64load.h"
-UNK_TYPE4 D_80096C30 = 2;
+s32 gLoad2LogSeverity = 2;
-#ifdef NON_MATCHING
-// This needs lots of work. Mostly regalloc and getting the address of D_80096C30 placed in s5 at the beginning of the
-// function
-void Load2_Relocate(u32 allocatedVRamAddr, OverlayRelocationSection* overlayInfo, u32 vRamStart) {
- s32 sectionLocations[4];
- u32* regReferences[32];
- u32 regValues[32];
+void Load2_Relocate(void* allocatedVRamAddr, OverlayRelocationSection* ovl, uintptr_t vRamStart) {
+ u32 sections[4];
+ u32* relocDataP;
+ u32 reloc;
+ uintptr_t relocatedAddress;
u32 i;
- u32 relocatedAddress;
- s32 signedOffset;
- u32* lastInst;
- u32* inst;
- u32 relocation;
- u32 relocationIndex;
+ u32* luiInstRef;
+ uintptr_t allocu32 = (uintptr_t)allocatedVRamAddr;
+ u32* regValP;
+ u32* luiRefs[32];
+ u32 luiVals[32];
+ u32 isLoNeg;
- sectionLocations[0] = 0;
- sectionLocations[1] = allocatedVRamAddr;
- sectionLocations[2] = overlayInfo->textSize + allocatedVRamAddr;
- sectionLocations[3] = sectionLocations[2] + overlayInfo->dataSize;
- for (i = 0, relocationIndex = 0; i < overlayInfo->nRelocations; relocationIndex++) {
- relocation = overlayInfo->relocations[relocationIndex];
- i++;
- inst = (u32*)(sectionLocations[relocation >> 0x1e] + (relocation & 0xffffff));
+ if (gLoad2LogSeverity >= 3) {}
- switch (relocation & 0x3f000000) {
- case 0x2000000:
- if ((*inst & 0xf000000) == 0) {
- *inst = (*inst - vRamStart) + allocatedVRamAddr;
+ sections[0] = 0;
+ sections[1] = allocu32;
+ sections[2] = allocu32 + ovl->textSize;
+ sections[3] = sections[2] + ovl->dataSize;
+
+ for (i = 0; i < ovl->nRelocations; i++) {
+ reloc = ovl->relocations[i];
+ relocDataP = (u32*)(sections[RELOC_SECTION(reloc)] + RELOC_OFFSET(reloc));
+
+ switch (RELOC_TYPE_MASK(reloc)) {
+ case R_MIPS_32 << RELOC_TYPE_SHIFT:
+ // Handles 32-bit address relocation, used for things such as jump tables and pointers in data.
+ // Just relocate the full address
+
+ // Check address is valid for relocation
+ if ((*relocDataP & 0x0F000000) == 0) {
+ *relocDataP = RELOCATE_ADDR(*relocDataP, vRamStart, allocu32);
+ } else if (gLoad2LogSeverity >= 3) {
}
- /*
- else {
- if (D_80096C30 > 2) {
- ;
- }
- }
- */
break;
- case 0x4000000:
- *inst =
- (*inst & 0xfc000000) |
- ((((((*inst & 0x3ffffff) << 2 | 0x80000000) - vRamStart) + allocatedVRamAddr) & 0xfffffff) >> 2);
+
+ case R_MIPS_26 << RELOC_TYPE_SHIFT:
+ // Handles 26-bit address relocation, used for jumps and jals.
+ // Extract the address from the target field of the J-type MIPS instruction.
+ // Relocate the address and update the instruction.
+
+ *relocDataP =
+ (*relocDataP & 0xFC000000) |
+ ((RELOCATE_ADDR(PHYS_TO_K0((*relocDataP & 0x03FFFFFF) << 2), vRamStart, allocu32) & 0x0FFFFFFF) >>
+ 2);
break;
- case 0x5000000:
- regReferences[*inst >> 0x10 & 0x1f] = inst;
- regValues[*inst >> 0x10 & 0x1f] = *inst;
+
+ case R_MIPS_HI16 << RELOC_TYPE_SHIFT:
+ // Handles relocation for a hi/lo pair, part 1.
+ // Store the reference to the LUI instruction (hi) using the `rt` register of the instruction.
+ // This will be updated later in the `R_MIPS_LO16` section.
+
+ luiRefs[(*relocDataP >> 0x10) & 0x1F] = relocDataP;
+ luiVals[(*relocDataP >> 0x10) & 0x1F] = *relocDataP;
break;
- case 0x6000000:
- lastInst = regReferences[*inst >> 0x15 & 0x1f];
- signedOffset = (s16)*inst;
- if (((signedOffset + *lastInst * 0x10000) & 0xf000000) == 0) {
- relocatedAddress =
- ((signedOffset + regValues[*inst >> 0x15 & 0x1f] * 0x10000) - vRamStart) + allocatedVRamAddr;
- *lastInst = (((relocatedAddress >> 0x10) & 0xFFFF) + ((relocatedAddress & 0x8000) ? 1 : 0)) |
- (*lastInst & 0xffff0000);
- *inst = (*inst & 0xffff0000) | (relocatedAddress & 0xffff);
+
+ case R_MIPS_LO16 << RELOC_TYPE_SHIFT:
+ // Handles relocation for a hi/lo pair, part 2.
+ // Grab the stored LUI (hi) from the `R_MIPS_HI16` section using the `rs` register of the instruction.
+ // The full address is calculated, relocated, and then used to update both the LUI and lo instructions.
+ // If the lo part is negative, add 1 to the LUI value.
+ // Note: The lo instruction is assumed to have a signed immediate.
+
+ luiInstRef = luiRefs[(*relocDataP >> 0x15) & 0x1F];
+ regValP = &luiVals[(*relocDataP >> 0x15) & 0x1F];
+
+ // Check address is valid for relocation
+ if ((((*luiInstRef << 0x10) + (s16)*relocDataP) & 0x0F000000) == 0) {
+ relocatedAddress = RELOCATE_ADDR((*regValP << 0x10) + (s16)*relocDataP, vRamStart, allocu32);
+ isLoNeg = (relocatedAddress & 0x8000) ? 1 : 0;
+ *luiInstRef = (*luiInstRef & 0xFFFF0000) | (((relocatedAddress >> 0x10) & 0xFFFF) + isLoNeg);
+ *relocDataP = (*relocDataP & 0xFFFF0000) | (relocatedAddress & 0xFFFF);
+ } else if (gLoad2LogSeverity >= 3) {
}
break;
}
}
}
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/boot/loadfragment2/Load2_Relocate.s")
-#endif
-#ifdef NON_MATCHING
-// Very minor stack stuff with a saved value
-s32 Load2_LoadOverlay(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u32 allocatedVRamAddr) {
- int nbytes;
- u32 pad;
- size_t size;
+size_t Load2_LoadOverlay(uintptr_t vRomStart, uintptr_t vRomEnd, uintptr_t vRamStart, uintptr_t vRamEnd,
+ void* allocatedVRamAddr) {
+ s32 pad[2];
+ s32 size = vRomEnd - vRomStart;
void* end;
- OverlayRelocationSection* overlayInfo;
+ OverlayRelocationSection* ovl;
- size = vRomEnd - vRomStart;
-
- if (1) {
- ;
- }
+ if (gLoad2LogSeverity >= 3) {}
+ if (gLoad2LogSeverity >= 3) {}
+ end = (uintptr_t)allocatedVRamAddr + size;
DmaMgr_SendRequest0(allocatedVRamAddr, vRomStart, size);
- end = (void*)(allocatedVRamAddr + size);
- overlayInfo = (OverlayRelocationSection*)((int)end - *(int*)((int)end + -4));
+ ovl = (OverlayRelocationSection*)((uintptr_t)end - ((s32*)end)[-1]);
- if (1) {
- ;
+ if (gLoad2LogSeverity >= 3) {}
+ if (gLoad2LogSeverity >= 3) {}
+
+ Load2_Relocate(allocatedVRamAddr, ovl, vRamStart);
+
+ if (ovl->bssSize != 0) {
+ if (gLoad2LogSeverity >= 3) {}
+ bzero(end, ovl->bssSize);
}
- Load2_Relocate(allocatedVRamAddr, overlayInfo, vRamStart);
-
- if (overlayInfo->bssSize != 0) {
- bzero(end, overlayInfo->bssSize);
- }
-
- nbytes = vRamEnd - vRamStart;
-
- osWritebackDCache((void*)allocatedVRamAddr, nbytes);
- osInvalICache((void*)allocatedVRamAddr, nbytes);
- return nbytes;
-}
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/boot/loadfragment2/Load2_LoadOverlay.s")
-#endif
-
-void* Overlay_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd) {
- void* allocatedVRamAddr;
- size_t size;
-
size = vRamEnd - vRamStart;
- allocatedVRamAddr = SystemArena_MallocR(size);
+
+ osWritebackDCache(allocatedVRamAddr, size);
+ osInvalICache(allocatedVRamAddr, size);
+
+ if (gLoad2LogSeverity >= 3) {}
+
+ return size;
+}
+
+void* Load2_AllocateAndLoad(uintptr_t vRomStart, uintptr_t vRomEnd, uintptr_t vRamStart, uintptr_t vRamEnd) {
+ void* allocatedVRamAddr = SystemArena_MallocR(vRamEnd - vRamStart);
+
if (allocatedVRamAddr != NULL) {
- Load2_LoadOverlay(vRomStart, vRomEnd, vRamStart, vRamEnd, (u32)allocatedVRamAddr);
+ Load2_LoadOverlay(vRomStart, vRomEnd, vRamStart, vRamEnd, allocatedVRamAddr);
}
return allocatedVRamAddr;
diff --git a/src/boot_O2/rand.c b/src/boot_O2/rand.c
index de603590e..2db64e9d5 100644
--- a/src/boot_O2/rand.c
+++ b/src/boot_O2/rand.c
@@ -1,33 +1,39 @@
#include "global.h"
-// The latest generated random number, used to generate the next number in the sequence.
+//! The latest generated random number, used to generate the next number in the sequence.
static u32 sRandInt = 1;
-// Space to store a value to be re-interpreted as a float.
-// This can't be static because it is used in z_kankyo
+//! Space to store a value to be re-interpreted as a float.
+//! This can't be static because it is used in z_kankyo.
u32 sRandFloat;
+//! These values are recommended by the algorithms book *Numerical Recipes in C. The Art of Scientific Computing*, 2nd
+//! Edition, 1992, ISBN 0-521-43108-5. (p. 284):
+//! > This is about as good as any 32-bit linear congruential generator, entirely adequate for many uses.
#define RAND_MULTIPLIER 1664525
#define RAND_INCREMENT 1013904223
/**
- * Gets the next integer in the sequence of pseudo-random numbers.
+ * Generates the next pseudo-random integer.
*/
-s32 Rand_Next(void) {
- return sRandInt = (sRandInt * 1664525) + 1013904223;
+u32 Rand_Next(void) {
+ return sRandInt = (sRandInt * RAND_MULTIPLIER) + RAND_INCREMENT;
}
/**
- * Seeds the pseudo-random number generator by providing a starting value.
+ * Seeds the internal pseudo-random number generator with a provided starting value.
*/
void Rand_Seed(u32 seed) {
sRandInt = seed;
}
/**
- * Returns a pseudo-random floating-point number between 0.0f and 1.0f, by generating
- * the next integer and masking it to an IEEE-754 compliant floating-point number
- * between 1.0f and 2.0f, returning the result subtract 1.0f.
+ * Returns a pseudo-random float between 0.0f and 1.0f from the internal PRNG.
+ *
+ * @note Works by generating the next integer, masking it to an IEEE-754 compliant float between 1.0f and 2.0f, and
+ * subtracting 1.0f.
+ *
+ * @remark This is also recommended by Numerical Recipes, pp. 284-5.
*/
f32 Rand_ZeroOne(void) {
sRandInt = (sRandInt * RAND_MULTIPLIER) + RAND_INCREMENT;
@@ -36,8 +42,7 @@ f32 Rand_ZeroOne(void) {
}
/**
- * Returns a pseudo-random floating-point number between -0.5f and 0.5f by the same
- * manner in which Rand_ZeroOne generates its result.
+ * Returns a pseudo-random float between -0.5f and 0.5f in the same way as Rand_ZeroOne().
*/
f32 Rand_Centered(void) {
sRandInt = (sRandInt * RAND_MULTIPLIER) + RAND_INCREMENT;
@@ -45,40 +50,47 @@ f32 Rand_Centered(void) {
return *((f32*)&sRandFloat) - 1.5f;
}
+//! All functions below are unused variants of the above four, that use a provided random number variable instead of the
+//! internal `sRandInt`
+
/**
- * Seeds a pseudo-random number at rndNum with a provided seed.
+ * Seeds a provided pseudo-random number with a provided starting value.
+ *
+ * @see Rand_Seed
*/
void Rand_Seed_Variable(u32* rndNum, u32 seed) {
*rndNum = seed;
}
/**
- * Generates the next pseudo-random integer from the provided rndNum.
+ * Generates the next pseudo-random number from the provided rndNum.
+ *
+ * @see Rand_Next
*/
u32 Rand_Next_Variable(u32* rndNum) {
return *rndNum = (*rndNum * RAND_MULTIPLIER) + RAND_INCREMENT;
}
/**
- * Generates the next pseudo-random floating-point number between 0.0f and
- * 1.0f from the provided rndNum.
+ * Generates the next pseudo-random float between 0.0f and 1.0f from the provided rndNum.
+ *
+ * @see Rand_ZeroOne
*/
f32 Rand_ZeroOne_Variable(u32* rndNum) {
u32 next = (*rndNum * RAND_MULTIPLIER) + RAND_INCREMENT;
- // clang-format off
- *rndNum = next; sRandFloat = (next >> 9) | 0x3F800000;
- // clang-format on
+
+ sRandFloat = ((*rndNum = next) >> 9) | 0x3F800000;
return *((f32*)&sRandFloat) - 1.0f;
}
/**
- * Generates the next pseudo-random floating-point number between -0.5f and
- * 0.5f from the provided rndNum.
+ * Generates the next pseudo-random float between -0.5f and 0.5f from the provided rndNum.
+ *
+ * @see Rand_ZeroOne, Rand_Centered
*/
f32 Rand_Centered_Variable(u32* rndNum) {
u32 next = (*rndNum * RAND_MULTIPLIER) + RAND_INCREMENT;
- // clang-format off
- *rndNum = next; sRandFloat = (next >> 9) | 0x3F800000;
- // clang-format on
+
+ sRandFloat = ((*rndNum = next) >> 9) | 0x3F800000;
return *((f32*)&sRandFloat) - 1.5f;
}
diff --git a/src/boot_O2_g3/fault_drawer.c b/src/boot_O2_g3/fault_drawer.c
index eacfc56d1..8efc930ec 100644
--- a/src/boot_O2_g3/fault_drawer.c
+++ b/src/boot_O2_g3/fault_drawer.c
@@ -41,6 +41,7 @@ FaultDrawer sFaultDrawerDefault = {
NULL, // inputCallback
};
+//! TODO: Needs to be extracted
#pragma GLOBAL_ASM("asm/non_matchings/boot/fault_drawer/sFaultDrawerFont.s")
void FaultDrawer_SetOsSyncPrintfEnabled(u32 enabled) {
diff --git a/src/code/code_800E8EA0.c b/src/code/code_800E8EA0.c
index d95f53269..6fb787451 100644
--- a/src/code/code_800E8EA0.c
+++ b/src/code/code_800E8EA0.c
@@ -1,107 +1,148 @@
#include "global.h"
-void func_800E8EA0(GlobalContext* globalCtx, Actor* actor, u16 textId) {
+void Actor_ContinueText(GlobalContext* globalCtx, Actor* actor, u16 textId) {
func_80151938(globalCtx, textId);
actor->textId = textId;
}
-s32 nop_800E8ED0(UNK_TYPE4 param_1) {
- return 0;
+/**
+ * EventCheckInf does not exist, so this always returns false
+ */
+s32 Flags_GetEventChkInf(s32 flag) {
+ return false;
}
-void nop_800E8EE0(UNK_TYPE4 param_1) {
+/**
+ * EventCheckInf does not exist, so this does nothing
+ */
+void Flags_SetEventChkInf(s32 flag) {
}
-s32 nop_800E8EEC(UNK_TYPE4 param_1) {
- return 0;
+/**
+ * InfTable does not exist, so this always returns false
+ */
+s32 Flags_GetInfTable(s32 flag) {
+ return false;
}
-void nop_800E8EFC(UNK_TYPE4 param_1) {
+/**
+ * InfTable does not exist, so this does nothing
+ */
+void Flags_SetInfTable(s32 flag) {
}
-s32 func_800E8F08(Vec3s* param_1, Vec3s* param_2) {
- Math_SmoothStepToS(¶m_1->y, 0, 6, 6200, 100);
- Math_SmoothStepToS(¶m_1->x, 0, 6, 6200, 100);
- Math_SmoothStepToS(¶m_2->y, 0, 6, 6200, 100);
- Math_SmoothStepToS(¶m_2->x, 0, 6, 6200, 100);
- return 1;
+s32 Actor_TrackNone(Vec3s* headRot, Vec3s* torsoRot) {
+ Math_SmoothStepToS(&headRot->y, 0, 6, 0x1838, 0x64);
+ Math_SmoothStepToS(&headRot->x, 0, 6, 0x1838, 0x64);
+ Math_SmoothStepToS(&torsoRot->y, 0, 6, 0x1838, 0x64);
+ Math_SmoothStepToS(&torsoRot->x, 0, 6, 0x1838, 0x64);
+ return true;
}
-s32 func_800E8FA4(Actor* actor, Vec3f* param_2, Vec3s* param_3, Vec3s* param_4) {
+s32 Actor_TrackPoint(Actor* actor, Vec3f* target, Vec3s* headRot, Vec3s* torsoRot) {
s16 targetPitch;
s16 targetYaw;
- s16 yawDiffFromTarget;
+ s16 yawDiff;
- targetPitch = Math_Vec3f_Pitch(&actor->focus.pos, param_2);
- targetYaw = Math_Vec3f_Yaw(&actor->focus.pos, param_2) - actor->world.rot.y;
+ targetPitch = Math_Vec3f_Pitch(&actor->focus.pos, target);
+ targetYaw = Math_Vec3f_Yaw(&actor->focus.pos, target) - actor->world.rot.y;
- Math_SmoothStepToS(¶m_3->x, targetPitch, 6, 2000, 1);
- param_3->x = CLAMP(param_3->x, -6000, 6000);
+ Math_SmoothStepToS(&headRot->x, targetPitch, 6, 0x7D0, 1);
+ headRot->x = CLAMP(headRot->x, -0x1770, 0x1770);
- yawDiffFromTarget = Math_SmoothStepToS(¶m_3->y, targetYaw, 6, 2000, 1);
- param_3->y = CLAMP(param_3->y, -8000, 8000);
+ yawDiff = Math_SmoothStepToS(&headRot->y, targetYaw, 6, 0x7D0, 1);
+ headRot->y = CLAMP(headRot->y, -0x1F40, 0x1F40);
- if (yawDiffFromTarget != 0) {
- if (ABS_ALT(param_3->y) < 8000) {
- return 0;
- }
+ if ((yawDiff != 0) && (ABS_ALT(headRot->y) < 0x1F40)) {
+ return false;
}
- Math_SmoothStepToS(¶m_4->y, targetYaw - param_3->y, 4, 2000, 1);
- param_4->y = CLAMP(param_4->y, -12000, 12000);
+ Math_SmoothStepToS(&torsoRot->y, targetYaw - headRot->y, 4, 0x7D0, 1);
+ torsoRot->y = CLAMP(torsoRot->y, -0x2EE0, 0x2EE0);
- return 1;
+ return true;
}
-s32 func_800E9138(GlobalContext* globalCtx, Actor* actor, Vec3s* param_3, Vec3s* param_4, f32 param_5) {
+/**
+ * Same as Actor_TrackPlayer, except use the actor's world position as the focus point, with the height
+ * specified.
+ *
+ * @param play
+ * @param actor
+ * @param headRot the computed actor's head's rotation step
+ * @param torsoRot the computed actor's torso's rotation step
+ * @param focusHeight the height of the focus point relative to their world position
+ *
+ * @return true if rotated towards player, false if rotations were stepped back to zero.
+ *
+ * @note same note as Actor_TrackPlayer
+ */
+s32 Actor_TrackPlayerSetFocusHeight(GlobalContext* globalCtx, Actor* actor, Vec3s* headRot, Vec3s* torsoRot,
+ f32 focusHeight) {
Player* player = GET_PLAYER(globalCtx);
- s16 sVar3;
- Vec3f local_14;
+ s16 yaw;
+ Vec3f target;
actor->focus.pos = actor->world.pos;
- actor->focus.pos.y += param_5;
+ actor->focus.pos.y += focusHeight;
- if (((globalCtx->csCtx).state == 0) && (D_801D0D50 == 0)) {
- sVar3 = ABS_ALT(BINANG_SUB(actor->yawTowardsPlayer, actor->shape.rot.y));
- if (sVar3 >= 0x4300) {
- func_800E8F08(param_3, param_4);
- return 0;
+ if (!((globalCtx->csCtx.state != 0) || gDbgCamEnabled)) {
+ yaw = ABS_ALT(BINANG_SUB(actor->yawTowardsPlayer, actor->shape.rot.y));
+ if (yaw >= 0x4300) {
+ Actor_TrackNone(headRot, torsoRot);
+ return false;
}
}
- if (((globalCtx->csCtx).state != 0) || (D_801D0D50 != 0)) {
- local_14 = globalCtx->view.eye;
+ if ((globalCtx->csCtx.state != 0) || gDbgCamEnabled) {
+ target = globalCtx->view.eye;
} else {
- local_14 = player->actor.focus.pos;
+ target = player->actor.focus.pos;
}
- func_800E8FA4(actor, &local_14, param_3, param_4);
+ Actor_TrackPoint(actor, &target, headRot, torsoRot);
- return 1;
+ return true;
}
-s32 func_800E9250(GlobalContext* globalCtx, Actor* actor, Vec3s* param_3, Vec3s* param_4, Vec3f param_5) {
+/**
+ * Computes the necessary HeadRot and TorsoRot steps to be added to the normal rotation to smoothly turn an actors's
+ * head and torso towards the player if within a certain yaw, else smoothly returns the rotations back to zero.
+ * Also sets the focus position with the specified point.
+ *
+ * @param play
+ * @param actor
+ * @param headRot the computed actor's head's rotation step
+ * @param torsoRot the computed actor's torso's rotation step
+ * @param focusPos the point to set as the actor's focus position
+ *
+ * @return true if rotated towards player, false if rotations were stepped back to zero.
+ *
+ * @note if in a cutscene or debug camera is enabled, the computed rotation will instead turn towards the view eye no
+ * matter the yaw.
+ */
+s32 Actor_TrackPlayer(GlobalContext* globalCtx, Actor* actor, Vec3s* headRot, Vec3s* torsoRot, Vec3f focusPos) {
Player* player = GET_PLAYER(globalCtx);
- s16 sVar3;
- Vec3f local_14;
+ s16 yaw;
+ Vec3f target;
- actor->focus.pos = param_5;
+ actor->focus.pos = focusPos;
- if (((globalCtx->csCtx).state == 0) && (D_801D0D50 == 0)) {
- sVar3 = ABS_ALT(BINANG_SUB(actor->yawTowardsPlayer, actor->shape.rot.y));
- if (sVar3 >= 0x4300) {
- func_800E8F08(param_3, param_4);
- return 0;
+ if (!((globalCtx->csCtx.state != 0) || gDbgCamEnabled)) {
+ yaw = ABS_ALT(BINANG_SUB(actor->yawTowardsPlayer, actor->shape.rot.y));
+ if (yaw >= 0x4300) {
+ Actor_TrackNone(headRot, torsoRot);
+ return false;
}
}
- if (((globalCtx->csCtx).state != 0) || (D_801D0D50 != 0)) {
- local_14 = globalCtx->view.eye;
+ if ((globalCtx->csCtx.state != 0) || gDbgCamEnabled) {
+ target = globalCtx->view.eye;
} else {
- local_14 = player->actor.focus.pos;
+ target = player->actor.focus.pos;
}
- func_800E8FA4(actor, &local_14, param_3, param_4);
+ Actor_TrackPoint(actor, &target, headRot, torsoRot);
- return 1;
+ return true;
}
diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index 53be7b68d..715d3756f 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -135,7 +135,7 @@ static s32 sTimer = 0;
void FlagSet_Update(GameState* gameState) {
GlobalContext* globalCtx = (GlobalContext*)gameState;
- Input* input = CONTROLLER1(globalCtx);
+ Input* input = CONTROLLER1(&globalCtx->state);
/* Intra-byte navigation */
diff --git a/src/code/game.c b/src/code/game.c
index 2713be299..6f796bc12 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -52,7 +52,7 @@ void GameState_SetFBFilter(Gfx** gfx, u32 arg1) {
sMonoColors.envColor.g = R_FB_FILTER_ENV_COLOR(1);
sMonoColors.envColor.b = R_FB_FILTER_ENV_COLOR(2);
sMonoColors.envColor.a = R_FB_FILTER_A;
- VisMono_Draw(&sMonoColors, &dlist, arg1);
+ VisMono_Draw(&sMonoColors, &dlist);
}
}
}
@@ -213,7 +213,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g
func_80140CE0(&D_801F8010);
func_801420C0(&D_801F8020);
- func_801418B0(&sMonoColors);
+ VisMono_Init(&sMonoColors);
func_80140898(&D_801F8048);
func_801773A0(&D_801F7FF0);
func_8013ED9C();
@@ -235,7 +235,7 @@ void GameState_Destroy(GameState* gameState) {
func_801773C4(&D_801F7FF0);
func_80140D04(&D_801F8010);
func_801420F4(&D_801F8020);
- func_80141900(&sMonoColors);
+ VisMono_Destroy(&sMonoColors);
func_80140900(&D_801F8048);
THA_Dt(&gameState->heap);
GameAlloc_Cleanup(&gameState->alloc);
diff --git a/src/code/sys_math_atan.c b/src/code/sys_math_atan.c
index 09f355d64..d68e1e293 100644
--- a/src/code/sys_math_atan.c
+++ b/src/code/sys_math_atan.c
@@ -77,57 +77,57 @@ u16 sATan2Tbl[] = {
0x1FF6, 0x1FFB, 0x2000,
};
-u16 Math_GetAtan2Tbl(f32 opposite, f32 adjacent) {
- return sATan2Tbl[(s32)((opposite / adjacent) * 0x400)];
+u16 Math_GetAtan2Tbl(f32 y, f32 x) {
+ return sATan2Tbl[(s32)((y / x) * 0x400)];
}
-s16 Math_Atan2S(f32 opposite, f32 adjacent) {
+s16 Math_Atan2S(f32 y, f32 x) {
s32 angle;
- if (opposite == 0.0f) {
- if (adjacent >= 0.0f) {
+ if (y == 0.0f) {
+ if (x >= 0.0f) {
angle = 0;
} else {
angle = 0x8000;
}
- } else if (adjacent == 0.0f) {
- if (opposite >= 0.0f) {
+ } else if (x == 0.0f) {
+ if (y >= 0.0f) {
angle = 0x4000;
} else {
angle = 0xC000;
}
- } else if (opposite >= 0.0f) {
- if (adjacent >= 0.0f) {
- if (opposite <= adjacent) {
- angle = Math_GetAtan2Tbl(opposite, adjacent);
+ } else if (y >= 0.0f) {
+ if (x >= 0.0f) {
+ if (y <= x) {
+ angle = Math_GetAtan2Tbl(y, x);
} else {
- angle = 0x4000 - Math_GetAtan2Tbl(adjacent, opposite);
+ angle = 0x4000 - Math_GetAtan2Tbl(x, y);
}
} else {
- if (-adjacent < opposite) {
- angle = Math_GetAtan2Tbl(-adjacent, opposite) + 0x4000;
+ if (-x < y) {
+ angle = Math_GetAtan2Tbl(-x, y) + 0x4000;
} else {
- angle = 0x8000 - Math_GetAtan2Tbl(opposite, -adjacent);
+ angle = 0x8000 - Math_GetAtan2Tbl(y, -x);
}
}
- } else if (adjacent < 0.0f) {
- if (-opposite <= -adjacent) {
- angle = Math_GetAtan2Tbl(-opposite, -adjacent) + 0x8000;
+ } else if (x < 0.0f) {
+ if (-y <= -x) {
+ angle = Math_GetAtan2Tbl(-y, -x) + 0x8000;
} else {
- angle = 0xC000 - Math_GetAtan2Tbl(-adjacent, -opposite);
+ angle = 0xC000 - Math_GetAtan2Tbl(-x, -y);
}
} else {
- if (adjacent < -opposite) {
- angle = Math_GetAtan2Tbl(adjacent, -opposite) + 0xC000;
+ if (x < -y) {
+ angle = Math_GetAtan2Tbl(x, -y) + 0xC000;
} else {
- angle = -Math_GetAtan2Tbl(-opposite, adjacent);
+ angle = -Math_GetAtan2Tbl(-y, x);
}
}
return angle;
}
-f32 Math_Atan2F(f32 opposite, f32 adjacent) {
- return Math_Atan2S(opposite, adjacent) * (M_PI / 0x8000);
+f32 Math_Atan2F(f32 y, f32 x) {
+ return Math_Atan2S(y, x) * (M_PI / 0x8000);
}
s16 Math_FAtan2F(f32 adjacent, f32 opposite) {
diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c
index f2ed19c38..4e517c810 100644
--- a/src/code/sys_matrix.c
+++ b/src/code/sys_matrix.c
@@ -38,7 +38,7 @@
* Throughout this file, `mode` indicates whether to multiply the matrix on top of the stack by the new construction
* (APPLY), or to just overwrite it (NEW).
*/
-
+#include "prevent_bss_reordering.h"
#include "global.h"
/* data */
diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c
index 4c57aca01..862463b76 100644
--- a/src/code/z_DLF.c
+++ b/src/code/z_DLF.c
@@ -1,5 +1,6 @@
#include "global.h"
#include "system_malloc.h"
+#include "z64load.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/z_DLF/Overlay_LoadGameState.s")
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index d933843c5..a937dc865 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -4,6 +4,7 @@
*/
#include "global.h"
+#include "z64load.h"
#include "overlays/actors/ovl_En_Horse/z_en_horse.h"
#include "overlays/actors/ovl_En_Part/z_en_part.h"
#include "overlays/actors/ovl_En_Box/z_en_box.h"
@@ -2003,11 +2004,11 @@ s32 Actor_PickUp(Actor* actor, GlobalContext* globalCtx, s32 getItemId, f32 xzRa
if (!(player->stateFlags1 & 0x3C7080) && Player_GetExplosiveHeld(player) < 0) {
if ((actor->xzDistToPlayer <= xzRange) && (fabsf(actor->playerHeightRel) <= fabsf(yRange))) {
- if (((getItemId == GI_MASK_CIRCUS_LEADER) || (getItemId == GI_PENDANT_OF_MEMORIES) ||
- (getItemId == GI_DEED_LAND) ||
- (((player->heldActor != NULL) || (actor == player->targetActor)) &&
+ if ((getItemId == GI_MASK_CIRCUS_LEADER || getItemId == GI_PENDANT_OF_MEMORIES ||
+ getItemId == GI_DEED_LAND ||
+ ((player->heldActor != NULL || actor == player->targetActor) &&
(getItemId > GI_NONE && getItemId < GI_MAX))) ||
- (!(player->stateFlags1 & 0x20000800))) {
+ !(player->stateFlags1 & 0x20000800)) {
s16 yawDiff = actor->yawTowardsPlayer - player->actor.shape.rot.y;
s32 absYawDiff = ABS_ALT(yawDiff);
@@ -4281,7 +4282,7 @@ s16 func_800BDB6C(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) {
Player* player = GET_PLAYER(globalCtx);
f32 phi_f2;
- if ((globalCtx->csCtx.state != 0) || (D_801D0D50 != 0)) {
+ if ((globalCtx->csCtx.state != 0) || gDbgCamEnabled) {
phi_f2 = Math_Vec3f_DistXYZ(&actor->world.pos, &globalCtx->view.eye) * 0.25f;
} else {
phi_f2 = Math_Vec3f_DistXYZ(&actor->world.pos, &player->actor.world.pos);
@@ -4483,9 +4484,10 @@ void func_800BE5CC(Actor* actor, ColliderJntSph* collider, s32 colliderIndex) {
}
}
-s32 func_800BE63C(struct EnBox* chest) {
- if ((chest->unk_1F1 == 5) || (chest->unk_1F1 == 6) || (chest->unk_1F1 == 7) || (chest->unk_1F1 == 8) ||
- (chest->unk_1F1 == 0xC)) {
+s32 Actor_IsSmallChest(struct EnBox* chest) {
+ if (chest->type == ENBOX_TYPE_SMALL || chest->type == ENBOX_TYPE_SMALL_INVISIBLE ||
+ chest->type == ENBOX_TYPE_SMALL_ROOM_CLEAR || chest->type == ENBOX_TYPE_SMALL_SWITCH_FLAG_FALL ||
+ chest->type == ENBOX_TYPE_SMALL_SWITCH_FLAG) {
return true;
}
return false;
@@ -4781,7 +4783,7 @@ void Actor_SpawnIceEffects(GlobalContext* globalCtx, Actor* actor, Vec3f limbPos
yaw = Actor_YawToPoint(actor, limbPos);
for (j = 0; j < effectsPerLimb; j++) {
- randomYaw = (Rand_Next() >> 0x13) + yaw;
+ randomYaw = ((s32)Rand_Next() >> 0x13) + yaw;
velocity.z = Rand_ZeroFloat(5.0f);
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index d4c9ad97a..32f193a41 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -917,7 +917,7 @@ s32 Cutscene_Command_Camera(GlobalContext* globalCtx, u8* cmd) {
bcopy(cmd, &sp1C, sizeof(s32));
cmd += sizeof(s32);
- if (func_8016A168() == 0) {
+ if (!Play_IsDebugCamEnabled()) {
func_80161998(cmd, &sCutsceneCameraInfo);
}
return sp1C + sizeof(s32);
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index fd1d0212c..56eab9e8a 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "z64load.h"
EffectSsInfo sEffectSsInfo = { NULL, 0, 0 };
diff --git a/src/code/z_fcurve_data.c b/src/code/z_fcurve_data.c
index a0bf887e1..5c0aa066a 100644
--- a/src/code/z_fcurve_data.c
+++ b/src/code/z_fcurve_data.c
@@ -1,5 +1,86 @@
+/**
+ * @file z_fcurve_data.c
+ * @brief Interpolation functions for use with Curve SkelAnime
+ */
#include "global.h"
+#include "z64curve.h"
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data/func_800F23E0.s")
+#define FCURVE_INTERP_CUBIC 0 // Interpolate using a Hermite cubic spline
+#define FCURVE_INTERP_NONE 1 // Return the value at the left endpoint instead of interpolating
+#define FCURVE_INTERP_LINEAR 2 // Interpolate linearly
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data/func_800F2478.s")
+/**
+ * Hermite cubic spline interpolation between two endpoints, a,b. More information available at
+ * https://en.wikipedia.org/wiki/Cubic_Hermite_spline
+ *
+ * @param t interpolation parameter rescaled to lie in [0,1], (x-a)/(b-a)
+ * @param interval distance (b-a) between the endpoints
+ * @param y0 p(a)
+ * @param y1 p(b)
+ * @param m0 p'(a)
+ * @param m1 p'(b)
+ * @return f32 p(t), value of the cubic interpolating polynomial
+ */
+f32 Curve_CubicHermiteSpline(f32 t, f32 interval, f32 y0, f32 y1, f32 m0, f32 m1) {
+ f32 t2 = t * t;
+ f32 t3 = t2 * t;
+ f32 t3x2 = t3 * 2.0f;
+ f32 t2x3 = t2 * 3.0f;
+
+ // Hermite basis cubics h_{ij} satisfy h_{ij}^{(j)}(i) = 1, the other three values being 0
+ f32 h00 = t3x2 - t2x3 + 1.0f; // h_{00}(t) = 2t^3 - 3t^2 + 1
+ f32 h01 = t2x3 - t3x2; // h_{01}(t) = 3t^2 - 2t^3
+ f32 h10 = t3 - t2 * 2.0f + t; // h_{10}(t) = t^3 - 2t^2 + t
+ f32 h11 = t3 - t2; // h_{11}(t) = t^3 - t^2
+
+ f32 ret = h00 * y0;
+
+ ret += h01 * y1;
+ ret += h10 * m0 * interval;
+ ret += h11 * m1 * interval;
+
+ return ret;
+}
+
+/**
+ * Interpolates based on an array of CurveInterpKnot.
+ *
+ * @param x point at which to interpolate.
+ * @param knots Beginning of CurveInterpKnot array to use.
+ * @param knotCount number of knots to read from the array.
+ * @return f32 interpolated value
+ */
+f32 Curve_Interpolate(f32 x, CurveInterpKnot* knots, s32 knotCount) {
+ // If outside the entire interpolation interval, return the value at the near endpoint.
+ if (x <= knots[0].abscissa) {
+ return knots[0].ordinate;
+ } else if (x >= knots[knotCount - 1].abscissa) {
+ return knots[knotCount - 1].ordinate;
+ } else {
+ s32 cur;
+
+ for (cur = 0;; cur++) {
+ s32 next = cur + 1;
+
+ // Find the subinterval in which x lies
+ if (x < knots[next].abscissa) {
+ if (knots[cur].flags & FCURVE_INTERP_NONE) {
+ // No interpolation
+ return knots[cur].ordinate;
+ } else if (knots[cur].flags & FCURVE_INTERP_LINEAR) {
+ // Linear interpolation
+ return knots[cur].ordinate +
+ ((x - (f32)knots[cur].abscissa) / ((f32)knots[next].abscissa - (f32)knots[cur].abscissa)) *
+ (knots[next].ordinate - knots[cur].ordinate);
+ } else {
+ // Cubic interpolation
+ f32 diff = (f32)knots[next].abscissa - (f32)knots[cur].abscissa;
+ f32 t = (x - (f32)knots[cur].abscissa) / ((f32)knots[next].abscissa - (f32)knots[cur].abscissa);
+
+ return Curve_CubicHermiteSpline(t, diff * (1.0f / 30.0f), knots[cur].ordinate, knots[next].ordinate,
+ knots[cur].rightGradient, knots[next].leftGradient);
+ }
+ }
+ }
+ }
+}
diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c
index c8eb927fa..b40a1c351 100644
--- a/src/code/z_fcurve_data_skelanime.c
+++ b/src/code/z_fcurve_data_skelanime.c
@@ -1,130 +1,187 @@
+/**
+ * @file z_fcurve_data_skelanime.c
+ * @brief Curve skeleton animation system
+ *
+ * A curve skeleton has a fixed number of limbs, each of which has 9 properties that may be changed by the animation:
+ * - 3 scales,
+ * - 3 rotations,
+ * - 3 positions
+ * (note the position is stored in the animations instead of being stored in the limbs like SkelAnime would). Otherwise
+ * the structure is similar to an ordinary SkelAnime-compatible skeleton.
+ *
+ * The animations are significantly more complex than SkelAnime. A curve animation consists of 4 parts:
+ * - a header (CurveAnimationHeader)
+ * - a list of counts, one for each of the 9 properties of each limb (u8)
+ * - a list of interpolation data (CurveInterpKnot). The length is the sum of the counts.
+ * - a list of constant data (s16[9]). The length is the number of 0s in counts.
+ *
+ * If the interpolation count for a property is 0, the value of the property is copied from the next number in the
+ * constant data; there are no gaps for nonzero interpolation count.
+ * If the interpolation count N for a property is larger than 0, the next N elements of the interpolation data array
+ * are used to interpolate the value of the property, using Curve_Interpolate.
+ *
+ * Curve limbs may use LOD:
+ * - lower detail draws only the first displaylist
+ * - higher detail draws both.
+ */
+
#include "global.h"
+#include "z64curve.h"
-void SkelCurve_Clear(SkelAnimeCurve* skelCurve) {
+void SkelCurve_Clear(SkelCurve* skelCurve) {
skelCurve->limbCount = 0;
- skelCurve->limbList = NULL;
- skelCurve->transUpdIdx = NULL;
- skelCurve->animCurFrame = 0.0f;
- skelCurve->animSpeed = 0.0f;
- skelCurve->animFinalFrame = 0.0f;
- skelCurve->unk0C = 0.0f;
- skelCurve->transforms = NULL;
+ skelCurve->skeleton = NULL;
+ skelCurve->animation = NULL;
+ skelCurve->curFrame = 0.0f;
+ skelCurve->playSpeed = 0.0f;
+ skelCurve->endFrame = 0.0f;
+ skelCurve->unk_0C = 0.0f;
+ skelCurve->jointTable = NULL;
}
-s32 SkelCurve_Init(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, SkelCurveLimbList* limbListSeg,
- TransformUpdateIndex* transUpdIdx) {
+/**
+ * Initialises the SkelCurve struct and mallocs the joint table.
+ *
+ * @return bool always true
+ */
+s32 SkelCurve_Init(GlobalContext* globalCtx, SkelCurve* skelCurve, CurveSkeletonHeader* skeletonHeaderSeg,
+ CurveAnimationHeader* animation) {
SkelCurveLimb** limbs;
- SkelCurveLimbList* limbList = Lib_SegmentedToVirtual(limbListSeg);
+ CurveSkeletonHeader* skeletonHeader = Lib_SegmentedToVirtual(skeletonHeaderSeg);
- skelCurve->limbCount = limbList->limbCount;
- skelCurve->limbList = Lib_SegmentedToVirtual(limbList->limbs);
+ skelCurve->limbCount = skeletonHeader->limbCount;
+ skelCurve->skeleton = Lib_SegmentedToVirtual(skeletonHeader->limbs);
- skelCurve->transforms = ZeldaArena_Malloc(sizeof(*skelCurve->transforms) * skelCurve->limbCount);
+ skelCurve->jointTable = ZeldaArena_Malloc(sizeof(*skelCurve->jointTable) * skelCurve->limbCount);
- do {
- skelCurve->animCurFrame = 0.0f;
- } while (0);
- return 1;
+ skelCurve->curFrame = 0.0f;
+ return true;
}
-void SkelCurve_Destroy(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve) {
- if (skelCurve->transforms != NULL) {
- ZeldaArena_Free(skelCurve->transforms);
+/**
+ * Frees the joint table.
+ */
+void SkelCurve_Destroy(GlobalContext* globalCtx, SkelCurve* skelCurve) {
+ if (skelCurve->jointTable != NULL) {
+ ZeldaArena_Free(skelCurve->jointTable);
}
}
-void SkelCurve_SetAnim(SkelAnimeCurve* skelCurve, TransformUpdateIndex* transUpdIdx, f32 arg2, f32 animFinalFrame,
- f32 animCurFrame, f32 animSpeed) {
- skelCurve->unk0C = arg2 - skelCurve->animSpeed;
- skelCurve->animFinalFrame = animFinalFrame;
- skelCurve->animCurFrame = animCurFrame;
- skelCurve->animSpeed = animSpeed;
- skelCurve->transUpdIdx = transUpdIdx;
+void SkelCurve_SetAnim(SkelCurve* skelCurve, CurveAnimationHeader* animation, f32 arg2, f32 endFrame, f32 curFrame,
+ f32 playSpeed) {
+ skelCurve->unk_0C = arg2 - skelCurve->playSpeed;
+ skelCurve->endFrame = endFrame;
+ skelCurve->curFrame = curFrame;
+ skelCurve->playSpeed = playSpeed;
+ skelCurve->animation = animation;
}
-#ifdef NON_MATCHING
-/* Should be functionally equivalent, also migrating rodata makes it a lot cleaner */
-s32 SkelCurve_Update(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve) {
- s16* transforms;
- u8* transformRefIdx;
- TransformUpdateIndex* transformIndex;
- u16* transformCopyValues;
- s32 i;
- s32 ret = 0;
- s32 k;
- TransformData* transData;
- f32 transformValue;
- s32 j;
+typedef enum {
+ /* 0 */ SKELCURVE_VEC_TYPE_SCALE,
+ /* 1 */ SKELCURVE_VEC_TYPE_ROTATION,
+ /* 2 */ SKELCURVE_VEC_TYPE_POSIITON,
+ /* 3 */ SKELCURVE_VEC_TYPE_MAX
+} SkelCurveVecType;
- transformIndex = Lib_SegmentedToVirtual(skelCurve->transUpdIdx);
- transformRefIdx = Lib_SegmentedToVirtual(transformIndex->refIndex);
- transData = Lib_SegmentedToVirtual(transformIndex->transformData);
- transformCopyValues = Lib_SegmentedToVirtual(transformIndex->copyValues);
- transforms = (s16*)skelCurve->transforms;
+#define SKELCURVE_SCALE_SCALE 1024.0f
+#define SKELCURVE_SCALE_POSITION 100
- skelCurve->animCurFrame += skelCurve->animSpeed * (globalCtx->state.framerateDivisor * 0.5f);
+/**
+ * The only animation updating function.
+ *
+ * @return bool true when the animation has finished.
+ */
+s32 SkelCurve_Update(GlobalContext* globalCtx, SkelCurve* skelCurve) {
+ s16* jointData;
+ u8* knotCounts;
+ CurveAnimationHeader* animation;
+ u16* constantData;
+ s32 curLimb;
+ s32 ret = false;
+ s32 coord;
+ CurveInterpKnot* startKnot;
+ s32 vecType;
- if ((skelCurve->animSpeed >= 0.0f && skelCurve->animCurFrame > skelCurve->animFinalFrame) ||
- (skelCurve->animSpeed < 0.0f && skelCurve->animCurFrame < skelCurve->animFinalFrame)) {
- skelCurve->animCurFrame = skelCurve->animFinalFrame;
- ret = 1;
+ animation = Lib_SegmentedToVirtual(skelCurve->animation);
+ knotCounts = Lib_SegmentedToVirtual(animation->knotCounts);
+ startKnot = Lib_SegmentedToVirtual(animation->interpolationData);
+ constantData = Lib_SegmentedToVirtual(animation->constantData);
+ jointData = *skelCurve->jointTable;
+
+ skelCurve->curFrame += skelCurve->playSpeed * ((s32)globalCtx->state.framerateDivisor * 0.5f);
+
+ if (((skelCurve->playSpeed >= 0.0f) && (skelCurve->curFrame > skelCurve->endFrame)) ||
+ ((skelCurve->playSpeed < 0.0f) && (skelCurve->curFrame < skelCurve->endFrame))) {
+ skelCurve->curFrame = skelCurve->endFrame;
+ ret = true;
}
- for (i = 0; i < skelCurve->limbCount; i++) {
- for (j = 0; j < 3; j++) {
- for (k = 0; k < 3; k++, transformRefIdx++, transforms++) {
- if (*transformRefIdx == 0) {
- transformValue = *transformCopyValues;
- *transforms = transformValue;
- transformCopyValues++;
+ for (curLimb = 0; curLimb < skelCurve->limbCount; curLimb++) {
+
+ // scale/rotation/position
+ for (vecType = SKELCURVE_VEC_TYPE_SCALE; vecType < SKELCURVE_VEC_TYPE_MAX; vecType++) {
+
+ // x/y/z
+ for (coord = 0; coord < 3; coord++) {
+ f32 transformValue;
+
+ if (*knotCounts == 0) {
+ transformValue = *constantData;
+ *jointData = transformValue;
+ constantData++;
} else {
- transformValue = func_800F2478(skelCurve->animCurFrame, transData, *transformRefIdx);
- transData += *transformRefIdx;
- if (j == 0) {
- *transforms = transformValue * 1024.0f;
- } else if (j == 1) {
- *transforms = transformValue * (32768.0f / 180.0f);
- } else {
- *transforms = transformValue * 100.0f;
+ transformValue = Curve_Interpolate(skelCurve->curFrame, startKnot, *knotCounts);
+ startKnot += *knotCounts;
+ if (vecType == SKELCURVE_VEC_TYPE_SCALE) {
+ // Rescaling allows for more refined scaling using an s16
+ *jointData = transformValue * SKELCURVE_SCALE_SCALE;
+ } else if (vecType == SKELCURVE_VEC_TYPE_ROTATION) {
+ // Convert value from degrees to a binary angle
+ *jointData = DEG_TO_BINANG(transformValue);
+ } else { // SKELCURVE_VEC_TYPE_POSIITON
+ // Model to world scale conversion
+ *jointData = transformValue * SKELCURVE_SCALE_POSITION;
}
}
+ knotCounts++;
+ jointData++;
}
}
}
return ret;
}
-#else
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data_skelanime/SkelCurve_Update.s")
-#endif
-void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve* skelCurve,
+/**
+ * Recursively draws limbs with appropriate properties.
+ */
+void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelCurve* skelCurve,
OverrideCurveLimbDraw overrideLimbDraw, PostCurveLimbDraw postLimbDraw, s32 lod, Actor* thisx) {
- SkelCurveLimb* limb = Lib_SegmentedToVirtual(skelCurve->limbList[limbIndex]);
+ SkelCurveLimb* limb = Lib_SegmentedToVirtual(skelCurve->skeleton[limbIndex]);
OPEN_DISPS(globalCtx->state.gfxCtx);
Matrix_Push();
- if (overrideLimbDraw == NULL ||
- (overrideLimbDraw != NULL && overrideLimbDraw(globalCtx, skelCurve, limbIndex, thisx))) {
+ if ((overrideLimbDraw == NULL) ||
+ ((overrideLimbDraw != NULL) && overrideLimbDraw(globalCtx, skelCurve, limbIndex, thisx))) {
Vec3f scale;
Vec3s rot;
Vec3f pos;
Gfx* dList;
- Vec3s* transform = (Vec3s*)&skelCurve->transforms[limbIndex];
+ s16* jointData = skelCurve->jointTable[limbIndex];
- scale.x = transform->x / 1024.0f;
- scale.y = transform->y / 1024.0f;
- scale.z = transform->z / 1024.0f;
- transform++;
- rot.x = transform->x;
- rot.y = transform->y;
- rot.z = transform->z;
- transform++;
- pos.x = transform->x;
- pos.y = transform->y;
- pos.z = transform->z;
+ scale.x = jointData[0] / SKELCURVE_SCALE_SCALE;
+ scale.y = jointData[1] / SKELCURVE_SCALE_SCALE;
+ scale.z = jointData[2] / SKELCURVE_SCALE_SCALE;
+ jointData += 3;
+ rot.x = jointData[0];
+ rot.y = jointData[1];
+ rot.z = jointData[2];
+ jointData += 3;
+ pos.x = jointData[0];
+ pos.y = jointData[1];
+ pos.z = jointData[2];
Matrix_TranslateRotateZYX(&pos, &rot);
Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY);
@@ -160,22 +217,22 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve*
postLimbDraw(globalCtx, skelCurve, limbIndex, thisx);
}
- if (limb->firstChildIdx != LIMB_DONE) {
- SkelCurve_DrawLimb(globalCtx, limb->firstChildIdx, skelCurve, overrideLimbDraw, postLimbDraw, lod, thisx);
+ if (limb->child != LIMB_DONE) {
+ SkelCurve_DrawLimb(globalCtx, limb->child, skelCurve, overrideLimbDraw, postLimbDraw, lod, thisx);
}
Matrix_Pop();
- if (limb->nextLimbIdx != LIMB_DONE) {
- SkelCurve_DrawLimb(globalCtx, limb->nextLimbIdx, skelCurve, overrideLimbDraw, postLimbDraw, lod, thisx);
+ if (limb->sibling != LIMB_DONE) {
+ SkelCurve_DrawLimb(globalCtx, limb->sibling, skelCurve, overrideLimbDraw, postLimbDraw, lod, thisx);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
-void SkelCurve_Draw(Actor* actor, GlobalContext* globalCtx, SkelAnimeCurve* skelCurve,
+void SkelCurve_Draw(Actor* actor, GlobalContext* globalCtx, SkelCurve* skelCurve,
OverrideCurveLimbDraw overrideLimbDraw, PostCurveLimbDraw postLimbDraw, s32 lod, Actor* thisx) {
- if (skelCurve->transforms != NULL) {
+ if (skelCurve->jointTable != NULL) {
SkelCurve_DrawLimb(globalCtx, 0, skelCurve, overrideLimbDraw, postLimbDraw, lod, thisx);
}
}
diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c
index 5e89f49e9..73656d65d 100644
--- a/src/code/z_kaleido_manager.c
+++ b/src/code/z_kaleido_manager.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "z64load.h"
#define KALEIDO_OVERLAY(name) \
{ \
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index 3c9db3638..cf533bd88 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -60,7 +60,7 @@ void func_800F4A10(GlobalContext* globalCtx) {
}
void KaleidoSetup_Update(GlobalContext* globalCtx) {
- Input* input = CONTROLLER1(globalCtx);
+ Input* input = CONTROLLER1(&globalCtx->state);
MessageContext* msgCtx = &globalCtx->msgCtx;
Player* player = GET_PLAYER(globalCtx);
PauseContext* pauseCtx = &globalCtx->pauseCtx;
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 96ce89379..104a1bfa9 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -67,7 +67,7 @@ void func_80147564(GlobalContext* globalCtx) {
s32 Message_ShouldAdvance(GlobalContext* globalCtx) {
MessageContext* msgCtx = &globalCtx->msgCtx;
- Input* controller = CONTROLLER1(globalCtx);
+ Input* controller = CONTROLLER1(&globalCtx->state);
if ((msgCtx->unk12020 == 0x10) || (msgCtx->unk12020 == 0x11)) {
if (CHECK_BTN_ALL(controller->press.button, BTN_A)) {
@@ -86,7 +86,7 @@ s32 Message_ShouldAdvance(GlobalContext* globalCtx) {
s32 Message_ShouldAdvanceSilent(GlobalContext* globalCtx) {
MessageContext* msgCtx = &globalCtx->msgCtx;
- Input* controller = CONTROLLER1(globalCtx);
+ Input* controller = CONTROLLER1(&globalCtx->state);
if (msgCtx->unk12020 == 0x10 || msgCtx->unk12020 == 0x11) {
return CHECK_BTN_ALL(controller->press.button, BTN_A);
@@ -117,7 +117,7 @@ void func_801477B4(GlobalContext* globalCtx) {
void func_80148B98(GlobalContext* globalCtx, u8 arg1) {
static s16 held = 0;
MessageContext* msgCtx = &globalCtx->msgCtx;
- Input* curInput = CONTROLLER1(globalCtx);
+ Input* curInput = CONTROLLER1(&globalCtx->state);
if ((curInput->rel.stick_y > 29) && held == 0) {
held = 1;
diff --git a/src/code/z_overlay.c b/src/code/z_overlay.c
index f635331c9..a358cefe6 100644
--- a/src/code/z_overlay.c
+++ b/src/code/z_overlay.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "z64load.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/z_overlay/func_801651B0.s")
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 2dc2b15c6..d673ed714 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -2069,13 +2069,14 @@ void func_80111CB4(GlobalContext* globalCtx) {
interfaceCtx->unk_222 = interfaceCtx->unk_224;
sp28 = true;
D_801BF884 = 0;
- } else if (CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_B)) {
+ } else if (CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_B)) {
globalCtx->actorCtx.unk5 &= ~4;
interfaceCtx->unk_224 = 0;
interfaceCtx->unk_222 = interfaceCtx->unk_224;
sp28 = true;
D_801BF884 = 0;
- } else if (CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A) || (func_801A5100() == 1)) {
+ } else if (CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A) ||
+ (func_801A5100() == 1)) {
if (!(gSaveContext.eventInf[4] & 2) ||
((gSaveContext.eventInf[4] & 2) && (ActorCutscene_GetCurrentIndex() == -1))) {
play_sound(NA_SE_SY_CAMERA_SHUTTER);
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 6227eb3bd..b398849b6 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -309,10 +309,8 @@ s32 Play_IsUnderwater(GlobalContext* globalCtx, Vec3f* pos) {
}
}
-// z_demo and EnTest4
-// This data appears to be a boolean. It is only set by Play_Init.
-s32 func_8016A168(void) {
- return D_801D0D50;
+s32 Play_IsDebugCamEnabled(void) {
+ return gDbgCamEnabled;
}
// A mapping from playerActorCsIds to sGlobalCamDataSettings indices.
diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c
index f4ffd43c1..1d13be316 100644
--- a/src/code/z_rcp.c
+++ b/src/code/z_rcp.c
@@ -1239,11 +1239,11 @@ void func_8012CF0C(GraphicsContext* gfxCtx, s32 clearFb, s32 clearZb, u8 r, u8 g
gSPDisplayList(&masterGfx[0], D_0E000000.syncSegments);
gSPDisplayList(&masterGfx[1], sFillSetupDL);
- gDPSetColorImage(&masterGfx[2], G_IM_FMT_RGBA, G_IM_SIZ_16b, D_801FBBCC, &D_0F000000);
+ gDPSetColorImage(&masterGfx[2], G_IM_FMT_RGBA, G_IM_SIZ_16b, D_801FBBCC, D_0F000000);
if (zbuffer != NULL) {
gDPSetDepthImage(&masterGfx[3], zbuffer);
} else {
- gDPSetDepthImage(&masterGfx[3], &D_0F000000);
+ gDPSetDepthImage(&masterGfx[3], D_0F000000);
}
gSPEndDisplayList(&masterGfx[4]);
@@ -1267,7 +1267,7 @@ void func_8012CF0C(GraphicsContext* gfxCtx, s32 clearFb, s32 clearZb, u8 r, u8 g
gDPSetRenderMode(&masterGfx[3], G_RM_NOOP, G_RM_NOOP2);
gDPSetFillColor(&masterGfx[4], (GPACK_RGBA5551(255, 255, 240, 0) << 16) | GPACK_RGBA5551(255, 255, 240, 0));
gSPDisplayList(&masterGfx[5], D_0E000000.clearFillRect);
- gDPSetColorImage(&masterGfx[6], G_IM_FMT_RGBA, G_IM_SIZ_16b, D_801FBBCC, &D_0F000000);
+ gDPSetColorImage(&masterGfx[6], G_IM_FMT_RGBA, G_IM_SIZ_16b, D_801FBBCC, D_0F000000);
gSPEndDisplayList(&masterGfx[7]);
}
@@ -1275,7 +1275,7 @@ void func_8012CF0C(GraphicsContext* gfxCtx, s32 clearFb, s32 clearZb, u8 r, u8 g
masterGfx = gGfxMasterDL->clearFrameBuffer;
- gDPSetColorImage(&masterGfx[0], G_IM_FMT_RGBA, G_IM_SIZ_16b, D_801FBBCC, &D_0F000000);
+ gDPSetColorImage(&masterGfx[0], G_IM_FMT_RGBA, G_IM_SIZ_16b, D_801FBBCC, D_0F000000);
gDPSetCycleType(&masterGfx[1], G_CYC_FILL);
gDPSetRenderMode(&masterGfx[2], G_RM_NOOP, G_RM_NOOP2);
gDPSetFillColor(&masterGfx[3], (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1));
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index 0a3334bc8..4c77b3669 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -627,9 +627,7 @@ void SkelAnime_GetFrameData(AnimationHeader* animation, s32 frame, s32 limbCount
for (i = 0; i < limbCount; i++) {
// Debug prints here, this is needed to prevent loop unrolling
- if (0) {
- if (0) {};
- }
+ if ((frameTable == NULL) || (jointIndices == NULL) || (dynamicData == NULL)) {}
frameTable->x = jointIndices->x >= staticIndexMax ? dynamicData[jointIndices->x] : frameData[jointIndices->x];
frameTable->y = jointIndices->y >= staticIndexMax ? dynamicData[jointIndices->y] : frameData[jointIndices->y];
frameTable->z = jointIndices->z >= staticIndexMax ? dynamicData[jointIndices->z] : frameData[jointIndices->z];
diff --git a/src/code/z_sub_s.c b/src/code/z_sub_s.c
index 3e5443bc6..4968185d0 100644
--- a/src/code/z_sub_s.c
+++ b/src/code/z_sub_s.c
@@ -178,8 +178,7 @@ s32 SubS_InCsMode(GlobalContext* globalCtx) {
* @param[in] stepRot boolean, step towards newRot instead of setting directly
* @param[in] overrideRot boolean, override newRot with the specified input.
*
- * Note:
- * If overrideRot is true, the rotation will automatically step instead of setting directly
+ * @note if overrideRot is true, the rotation will automatically step instead of setting directly
*/
s32 SubS_UpdateLimb(s16 newRotZ, s16 newRotY, Vec3f* pos, Vec3s* rot, s32 stepRot, s32 overrideRot) {
Vec3f newPos;
@@ -214,17 +213,273 @@ void SubS_UpdateFlags(u16* flags, u16 setBits, u16 unsetBits) {
*flags = (*flags & ~unsetBits) | setBits;
}
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_sub_s/func_8013AF00.s")
+/**
+ * Fills the knot array to be used with time paths
+ *
+ * The default knot array just pads with `order` duplicate knots of the first knot at the front and of the last knot
+ * at the end.
+ *
+ * @param[out] knots an array of values that are used to compute the progress and the individual weights
+ * @param[in] order the order of the interpolation i.e. the number of points in the interpolation
+ * @param[in] numPoints the number of points to fill, generally the path count + order
+ *
+ * @note Same note as SubS_TimePathing_Update()
+ */
+void SubS_TimePathing_FillKnots(f32 knots[], s32 order, s32 numPoints) {
+ s32 i;
+ f32 val = 0.0f;
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_sub_s/func_8013B010.s")
+ for (i = 0; i < numPoints; i++) {
+ if ((i >= order) && (i < (numPoints - order + 1))) {
+ val += 1.0f;
+ }
+ knots[i] = val;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_sub_s/func_8013B0C8.s")
+typedef enum {
+ /* 0 */ SUBS_TIME_PATHING_PROGRESS_STATUS_ERROR,
+ /* 1 */ SUBS_TIME_PATHING_PROGRESS_STATUS_STILL_ON_PATH,
+ /* 2 */ SUBS_TIME_PATHING_PROGRESS_STATUS_SHOULD_REACH_END
+} SUBS_TIME_PATHING_PROGRESS_STATUS;
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_sub_s/func_8013B350.s")
+/**
+ * Computes the progress to be used with time paths
+ *
+ * @param[out] progress the progress along the path, used to compute the weights
+ * @param[in] elapsedTime how much time has passed
+ * @param[in] waypointTime how much time per each waypoint
+ * @param[in] totalTime how much time the path should take to travel
+ * @param[in] pathCount the path count
+ * @param[in] order the order of the interpolation i.e. the number of points in the interpolation
+ * @param[in] knots see SubS_TimePathing_FillKnots()
+ *
+ * @return see SUBS_TIME_PATHING_PROGRESS_STATUS
+ */
+s32 SubS_TimePathing_ComputeProgress(f32* progress, s32 elapsedTime, s32 waypointTime, s32 totalTime, s32 pathCount,
+ s32 order, f32 knots[]) {
+ s32 i;
+ s32 j;
+ s32 k;
+ f32 waypointTimeInv; // The fraction of a waypoint a single unit of time contains
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_sub_s/func_8013B6B0.s")
+ *progress = 0.0f;
+ if ((waypointTime <= 0) || (elapsedTime < 0)) {
+ return SUBS_TIME_PATHING_PROGRESS_STATUS_ERROR;
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_sub_s/func_8013B878.s")
+ // When using the knots from SubS_TimePathing_FillKnots() these nested loops seem to simplify to
+ // *progress = (f32)elapsedTime / (f32)waypointTime;
+ waypointTimeInv = 1.0f / waypointTime;
+ k = 0;
+ for (i = order - 1; i < pathCount; i++) {
+ for (j = 0; j < waypointTime; j++) {
+ if (k == elapsedTime) {
+ break;
+ }
+ *progress += (knots[i + 1] - knots[i]) * waypointTimeInv;
+ k++;
+ }
+ }
+
+ return (elapsedTime == totalTime) ? SUBS_TIME_PATHING_PROGRESS_STATUS_SHOULD_REACH_END
+ : SUBS_TIME_PATHING_PROGRESS_STATUS_STILL_ON_PATH;
+}
+
+/**
+ * Computes the interpolation weights to be used with time paths
+ *
+ * Seems to use some kind of B-Spline interpolation algorithm
+ *
+ * @param[in] order the order of the interpolation i.e. the number of points in the interpolation, max is 10
+ * @param[in] progress see SubS_TimePathing_ComputeProgress()
+ * @param[in] waypoint the current waypoint
+ * @param[in] knots see SubS_TimePathing_FillKnots()
+ * @param[out] weights how much to weight each point considered
+ */
+void SubS_TimePathing_ComputeWeights(s32 order, f32 progress, s32 waypoint, f32 knots[], f32 weights[]) {
+ f32 weightsTemp[10][11];
+ s32 i;
+ s32 j;
+ s32 k;
+
+ for (i = 0; i < order; i++) {
+ for (j = 0; j < order + 1; j++) {
+ weightsTemp[i][j] = 0.0f;
+ }
+ }
+
+ weightsTemp[0][order - 1] = 1.0f;
+
+ for (i = 1; i < order; i++) {
+ for (j = waypoint - i, k = (order - 1) - i; j <= waypoint; j++, k++) {
+ if (knots[j + i] != knots[j]) {
+ weightsTemp[i][k] = ((progress - knots[j]) / (knots[j + i] - knots[j])) * weightsTemp[i - 1][k];
+ } else {
+ weightsTemp[i][k] = 0.0f;
+ }
+
+ if (knots[j + i + 1] != knots[j + 1]) {
+ weightsTemp[i][k] +=
+ ((knots[j + i + 1] - progress) / (knots[j + i + 1] - knots[j + 1])) * weightsTemp[i - 1][k + 1];
+ }
+ }
+ }
+ for (j = 0; j < order; j++) {
+ weights[j] = weightsTemp[order - 1][j];
+ }
+}
+
+/**
+ * Computes the X and Z component of the position to move to in time based paths
+ *
+ * @param[out] x computed x position
+ * @param[out] z computed z position
+ * @param[in] progress see SubS_TimePathing_ComputeProgress()
+ * @param[in] order the order of the interpolation i.e. the number of points in the interpolation, max is 10
+ * @param[in] waypoint the current waypoint
+ * @param[in] points the path's points
+ * @param[in] knots see SubS_TimePathing_FillKnots()
+ */
+void SubS_TimePathing_ComputeTargetPosXZ(f32* x, f32* z, f32 progress, s32 order, s32 waypoint, Vec3s points[],
+ f32 knots[]) {
+ f32 xPos;
+ f32 zPos;
+ f32 weights[11];
+ f32 weightedX;
+ f32 weightedZ;
+ f32 weightedTotal;
+ s32 i;
+
+ SubS_TimePathing_ComputeWeights(order, progress, waypoint, knots, weights);
+ weightedTotal = 0.0f;
+ weightedZ = 0.0f;
+ weightedX = 0.0f;
+
+ for (i = 0; i < order; i++) {
+ xPos = points[waypoint - order + i + 1].x;
+ zPos = points[waypoint - order + i + 1].z;
+
+ weightedX += weights[i] * xPos;
+ weightedZ += weights[i] * zPos;
+ weightedTotal += weights[i];
+ }
+ *x = weightedX / weightedTotal;
+ *z = weightedZ / weightedTotal;
+}
+
+/**
+ * Updates a time based path that an actor follows by:
+ * - Computing the X and Z components of the next point to move to
+ * - Updating the waypoint
+ * - Updating the time
+ *
+ * @param[in] path
+ * @param[out] progress see SubS_TimePathing_ComputeProgress()
+ * @param[in,out] elapsedTime how much time has passed
+ * @param[in] waypointTime how much time per each waypoint
+ * @param[in] totalTime how much time the path should take to travel
+ * @param[in,out] waypoint the current waypoint, this and the previous two points will be used to compute the targetPos
+ * @param[in] knots see SubS_TimePathing_FillKnots()
+ * @param[out] targetPos the computed position to move to
+ * @param[in] timeSpeed how fast time moves
+ *
+ * @return s32 returns true when the end has been reached.
+ *
+ * @note This system/function makes a couple of assumptions about the order used:
+ * 1. the order is assumed to be 3, see SUBS_TIME_PATHING_ORDER
+ * 2. even if SUBS_TIME_PATHING_ORDER is updated, the order can only be a max of 10
+ */
+s32 SubS_TimePathing_Update(Path* path, f32* progress, s32* elapsedTime, s32 waypointTime, s32 totalTime, s32* waypoint,
+ f32 knots[], Vec3f* targetPos, s32 timeSpeed) {
+ Vec3s* points = Lib_SegmentedToVirtual(path->points);
+ s32 state;
+ f32 endX;
+ f32 endZ;
+ s32 reachedEnd = false;
+
+ if (*waypoint >= path->count) {
+ state = SUBS_TIME_PATHING_PROGRESS_STATUS_SHOULD_REACH_END;
+ } else {
+ state = SubS_TimePathing_ComputeProgress(progress, *elapsedTime, waypointTime, totalTime, path->count,
+ SUBS_TIME_PATHING_ORDER, knots);
+ }
+
+ switch (state) {
+ case SUBS_TIME_PATHING_PROGRESS_STATUS_STILL_ON_PATH:
+ reachedEnd = false;
+ SubS_TimePathing_ComputeTargetPosXZ(&targetPos->x, &targetPos->z, *progress, SUBS_TIME_PATHING_ORDER,
+ *waypoint, points, knots);
+ break;
+ case SUBS_TIME_PATHING_PROGRESS_STATUS_SHOULD_REACH_END:
+ endX = points[path->count - 1].x;
+ endZ = points[path->count - 1].z;
+ targetPos->x = endX * 1;
+ targetPos->z = endZ * 1;
+ reachedEnd = true;
+ break;
+ }
+
+ *elapsedTime += timeSpeed;
+ if (*elapsedTime >= totalTime) {
+ *elapsedTime = totalTime;
+ } else if (*elapsedTime < 0) {
+ *elapsedTime = 0;
+ }
+ *waypoint = (*elapsedTime / waypointTime) + (SUBS_TIME_PATHING_ORDER - 1);
+
+ return reachedEnd;
+}
+
+/**
+ * Computes the initial Y component of a time based path
+ *
+ * @param[in] globalCtx
+ * @param[in] path
+ * @param[in] waypoint the current waypoint, this and the previous two points will be used to compute the target pos
+ * @param[out] targetPos the computed position to move to, only the Y component has meaning
+ *
+ * @note Same note as SubS_TimePathing_Update()
+ */
+void SubS_TimePathing_ComputeInitialY(GlobalContext* globalCtx, Path* path, s32 waypoint, Vec3f* targetPos) {
+ Vec3s* points = Lib_SegmentedToVirtual(path->points);
+ Vec3f posA;
+ Vec3f posB;
+ Vec3f posResult;
+ s32 i = waypoint - (SUBS_TIME_PATHING_ORDER - 1);
+ s16 max;
+ s16 min;
+ s32 isSetup;
+ CollisionPoly* outPoly = NULL;
+ s32 bgId = 0;
+
+ max = 0;
+ min = 0;
+ isSetup = false;
+ for (; i <= waypoint; i++) {
+ if (isSetup) {
+ if (max < points[i].y) {
+ max = points[i].y;
+ }
+ if (points[i].y < min) {
+ min = points[i].y;
+ }
+ } else {
+ max = min = points[i].y;
+ }
+ isSetup = true;
+ }
+ max += 30;
+ min -= 30;
+ posA = *targetPos;
+ posB = *targetPos;
+ posA.y = max;
+ posB.y = min;
+ if (BgCheck_EntityLineTest1(&globalCtx->colCtx, &posA, &posB, &posResult, &outPoly, true, true, true, true,
+ &bgId)) {
+ targetPos->y = posResult.y;
+ }
+}
Path* SubS_GetAdditionalPath(GlobalContext* globalCtx, u8 pathIndex, s32 max) {
Path* path;
@@ -362,9 +617,189 @@ Path* SubS_GetDayDependentPath(GlobalContext* globalCtx, u8 pathIndex, u8 max, s
return path;
}
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_sub_s/func_8013C068.s")
+/**
+ * Computes the point to move toward using a weight based algorithm that considers 4 points along the path
+ *
+ * @param path
+ * @param waypoint the current waypoint, this and the previous three points will be used to compute the point
+ * @param point the point computed
+ * @param progress the main weight value used to compute the weights for the points considered
+ * @param direction the direciton along the path to move, 1 for forwards, anything else for backwards
+ *
+ * @note only computes X and Z components of the point
+ */
+s32 SubS_WeightPathing_ComputePoint(Path* path, s32 waypoint, Vec3f* point, f32 progress, s32 direction) {
+ s32 i;
+ f32 weight0;
+ f32 weight1;
+ f32 weight2;
+ f32 weight3;
+ s32 lastPoint;
+ s32 secondLastPoint;
+ s32 secondPoint;
+ s32 firstPoint;
+ f32 xPoints[4];
+ f32 zPoints[4];
+ f32 oneMinusProgress;
+ f32 squared;
+ f32 cubed;
+ Vec3s* points;
+ s32 count = path->count;
+ s32 pointIndex;
+ s32 tmp;
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_sub_s/func_8013C624.s")
+ if (path == NULL) {
+ return false;
+ }
+ if (direction == 1) {
+ if (waypoint <= 2) {
+ pointIndex = 2;
+ } else {
+ pointIndex = (waypoint == 3) ? 3 : waypoint;
+ }
+ for (i = 0; i < 4; i++, pointIndex--) {
+ if (pointIndex <= 0) {
+ pointIndex = 0;
+ }
+ points = Lib_SegmentedToVirtual(path->points);
+ points = &points[pointIndex];
+ xPoints[i] = points->x;
+ zPoints[i] = points->z;
+ }
+ lastPoint = count - 1;
+ secondLastPoint = count - 2;
+ secondPoint = 3;
+ firstPoint = 2;
+ } else {
+ if (waypoint >= count - 3) {
+ pointIndex = count - 3;
+ } else {
+ tmp = waypoint + 4;
+ pointIndex = (count == tmp) ? count - 4 : waypoint;
+ }
+ for (i = 0; i < 4; i++, pointIndex++) {
+ if (pointIndex >= path->count) {
+ pointIndex = path->count - 1;
+ }
+ points = Lib_SegmentedToVirtual(path->points);
+ points = &points[pointIndex];
+ xPoints[i] = points->x;
+ zPoints[i] = points->z;
+ }
+ lastPoint = 0;
+ secondLastPoint = 1;
+ secondPoint = count - 4;
+ firstPoint = count - 3;
+ }
+ if (waypoint == lastPoint) {
+ oneMinusProgress = 1.0f - progress;
+ squared = progress * progress;
+ cubed = progress * squared;
+ weight0 = oneMinusProgress * oneMinusProgress * oneMinusProgress;
+ weight1 = (1.75f * cubed) - (4.5f * squared) + (3.0f * progress);
+ weight2 = ((-11.0f / 12.0f) * cubed) + (1.5f * squared);
+ weight3 = (1.0f / 6.0f) * cubed;
+ } else if (waypoint == secondLastPoint) {
+ oneMinusProgress = 1.0f - progress;
+ squared = progress * progress;
+ cubed = progress * squared;
+ weight0 = oneMinusProgress * oneMinusProgress * oneMinusProgress * ((void)0, 0.25f); //! FAKE:
+ weight1 = ((7.0f / 12.0f) * cubed) - (1.25f * squared) + (0.25f * progress) + (7.0f / 12.0f);
+ weight2 = (-0.5f * cubed) + (0.5f * squared) + (progress * 0.5f) + (1.0f / 6.0f);
+ weight3 = cubed * (1.0f / 6.0f);
+ } else if (waypoint == secondPoint) {
+ oneMinusProgress = 1.0f - progress;
+ squared = oneMinusProgress * oneMinusProgress;
+ cubed = oneMinusProgress * squared;
+ weight0 = (1.0f / 6.0f) * cubed;
+ weight1 = (-0.5f * cubed) + (0.5f * squared) + (0.5f * oneMinusProgress) + (1.0f / 6.0f);
+ weight2 = ((7.0f / 12.0f) * cubed) - (1.25f * squared) + (0.25f * oneMinusProgress) + (7.0f / 12.0f);
+ weight3 = progress * progress * progress * 0.25f;
+ } else if (((direction == 1) && (firstPoint >= waypoint)) || ((direction != 1) && (waypoint >= firstPoint))) {
+ oneMinusProgress = 1.0f - progress;
+ squared = oneMinusProgress * oneMinusProgress;
+ cubed = oneMinusProgress * squared;
+ weight0 = (1.0f / 6.0f) * cubed;
+ weight1 = ((-11.0f / 12.0f) * cubed) + (1.5f * squared);
+ weight2 = (1.75f * cubed) - (4.5f * squared) + (3.0f * oneMinusProgress);
+ weight3 = progress * progress * progress;
+ } else {
+ oneMinusProgress = 1.0f - progress;
+ squared = progress * progress;
+ cubed = squared * progress;
+ weight0 = oneMinusProgress * oneMinusProgress;
+ weight0 = oneMinusProgress * weight0 / 6.0f;
+ weight1 = (cubed * 0.5f) - squared + (2.0f / 3.0f);
+ weight2 = (cubed / -2.0f) + (squared * 0.5f) + (progress * 0.5f) + (1.0f / 6.0f);
+ weight3 = cubed / 6.0f;
+ }
+ point->x = (weight0 * xPoints[0]) + (weight1 * xPoints[1]) + (weight2 * xPoints[2]) + (weight3 * xPoints[3]);
+ point->z = (weight0 * zPoints[0]) + (weight1 * zPoints[1]) + (weight2 * zPoints[2]) + (weight3 * zPoints[3]);
+
+ return true;
+}
+
+// WeightPathing System is completely unused
+/**
+ * Moves an actor based on a weight based algorithm that takes into account 4 points along the path
+ *
+ * @param actor
+ * @param path
+ * @param waypoint the current waypoint, this and the previous three points will be used to move forward
+ * @param progress the progress towards a given waypoint, used to compute the weights
+ * @param direction the direction along the path to move, 1 for forwards, anything else for backwards
+ * @param returnStart boolean, true if the actor should wrap back to start when reaching the end
+ *
+ * @return s32 true if actor reached the end of the path in this iteration, false otherwise
+ */
+s32 SubS_WeightPathing_Move(Actor* actor, Path* path, s32* waypoint, f32* progress, s32 direction, s32 returnStart) {
+ Vec3f worldPos = actor->world.pos;
+ Vec3f velocity = actor->velocity;
+ Vec3f point;
+ f32 dist;
+
+ if (((direction != 1) && (*waypoint >= (path->count - 2))) || ((direction == 1) && (*waypoint < 2))) {
+ return false;
+ }
+ while (true) {
+ if (!SubS_WeightPathing_ComputePoint(path, *waypoint, &point, *progress, direction) ||
+ ((s32)(actor->speedXZ * 10000.0f) == 0)) {
+ return false;
+ }
+ dist = Math_Vec3f_DistXZ(&actor->world.pos, &point);
+ actor->world.rot.y = Math_Vec3f_Yaw(&actor->world.pos, &point);
+ Actor_MoveWithGravity(actor);
+ if (Math_Vec3f_DistXZ(&actor->world.pos, &point) < dist) {
+ break;
+ }
+ *progress += 0.1f;
+ if (*progress >= 1.1f) {
+ if (direction != 1) {
+ (*waypoint)++;
+ if (*waypoint >= (path->count - 2)) {
+ if (returnStart) {
+ *waypoint = 0;
+ } else {
+ return true;
+ }
+ }
+ } else {
+ (*waypoint)--;
+ if (*waypoint < 2) {
+ if (returnStart) {
+ *waypoint = path->count - 2;
+ } else {
+ return true;
+ }
+ }
+ }
+ *progress = 0.0f;
+ }
+ actor->world.pos = worldPos;
+ actor->velocity = velocity;
+ }
+ return false;
+}
s32 SubS_CopyPointFromPathCheckBounds(Path* path, s32 pointIndex, Vec3f* dst) {
Vec3s* point;
@@ -557,10 +992,10 @@ void SubS_DrawShadowTex(Actor* actor, GameState* gameState, u8* tex) {
Matrix_Translate(actor->world.pos.x, 0.0f, actor->world.pos.z, MTXMODE_NEW);
Matrix_Scale(0.6f, 1.0f, 0.6f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, gShadowDL);
+ gSPDisplayList(POLY_OPA_DISP++, gShadowMaterialDL);
gDPLoadTextureBlock(POLY_OPA_DISP++, tex, G_IM_FMT_I, G_IM_SIZ_8b, SUBS_SHADOW_TEX_WIDTH, SUBS_SHADOW_TEX_HEIGHT, 0,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
- gSPDisplayList(POLY_OPA_DISP++, gShadowVtxDL);
+ gSPDisplayList(POLY_OPA_DISP++, gShadowModelDL);
CLOSE_DISPS(gfxCtx);
}
@@ -575,7 +1010,7 @@ void SubS_DrawShadowTex(Actor* actor, GameState* gameState, u8* tex) {
* @param[in] stepMin the minimun step in degrees
* @param[in] stepMax the maximum step in degrees
*/
-s16 SubS_ComputeTurnToPointRot(s16* rot, s16 rotMax, s16 target, f32 slowness, f32 stepMin, f32 stepMax) {
+s16 SubS_ComputeTrackPointRot(s16* rot, s16 rotMax, s16 target, f32 slowness, f32 stepMin, f32 stepMax) {
s16 prevRot = *rot;
f32 step;
f32 prevRotStep;
@@ -611,44 +1046,42 @@ s16 SubS_ComputeTurnToPointRot(s16* rot, s16 rotMax, s16 target, f32 slowness, f
/**
* Computes the necessary HeadRot and TorsoRot to smoothly turn an actors's head and torso to a point
*
- * @param[in] point the point to turn to
+ * @param[in] target the point to turn to
* @param[in] focusPos the actor's focus postion
* @param[in] shapeRot the actor's shape rotation
- * @param[in,out] turnTarget the intermediate target step that headRot and torsoRot step towards
+ * @param[in,out] trackTarget the intermediate target step that headRot and torsoRot step towards
* @param[in,out] headRot the computed head rotation
* @param[in,out] torsoRot the computed torso rotation
- * @param[in] options various options to adjust how the actor turns, see `SubS_ComputeTurnToPointRot and
- * TurnOptions/TurnOptionsSet`
- *
+ * @param[in] options various options to adjust how the actor turns, see SubS_ComputeTrackPointRot()
*/
-s32 SubS_TurnToPoint(Vec3f* point, Vec3f* focusPos, Vec3s* shapeRot, Vec3s* turnTarget, Vec3s* headRot, Vec3s* torsoRot,
- TurnOptionsSet* options) {
+s32 SubS_TrackPoint(Vec3f* target, Vec3f* focusPos, Vec3s* shapeRot, Vec3s* trackTarget, Vec3s* headRot,
+ Vec3s* torsoRot, TrackOptionsSet* options) {
s16 pitch;
s16 yaw;
s16 pad;
s16 targetY;
- f32 diffX = point->x - focusPos->x;
+ f32 diffX = target->x - focusPos->x;
s16 targetX;
- f32 diffZ = point->z - focusPos->z;
+ f32 diffZ = target->z - focusPos->z;
yaw = Math_FAtan2F(diffZ, diffX);
- pitch = Math_FAtan2F(sqrtf(SQ(diffX) + SQ(diffZ)), point->y - focusPos->y);
- Math_SmoothStepToS(&turnTarget->x, pitch, 4, 0x2710, 0);
- Math_SmoothStepToS(&turnTarget->y, yaw, 4, 0x2710, 0);
+ pitch = Math_FAtan2F(sqrtf(SQ(diffX) + SQ(diffZ)), target->y - focusPos->y);
+ Math_SmoothStepToS(&trackTarget->x, pitch, 4, 0x2710, 0);
+ Math_SmoothStepToS(&trackTarget->y, yaw, 4, 0x2710, 0);
targetX =
- SubS_ComputeTurnToPointRot(&headRot->x, options->headRotX.rotMax, turnTarget->x, options->headRotX.slowness,
- options->headRotX.rotStepMin, options->headRotX.rotStepMax);
+ SubS_ComputeTrackPointRot(&headRot->x, options->headRotX.rotMax, trackTarget->x, options->headRotX.slowness,
+ options->headRotX.rotStepMin, options->headRotX.rotStepMax);
//! @bug: torsoRotX uses headRotX slowness
- SubS_ComputeTurnToPointRot(&torsoRot->x, options->torsoRotX.rotMax, targetX, options->headRotX.slowness,
- options->torsoRotX.rotStepMin, options->torsoRotX.rotStepMax);
+ SubS_ComputeTrackPointRot(&torsoRot->x, options->torsoRotX.rotMax, targetX, options->headRotX.slowness,
+ options->torsoRotX.rotStepMin, options->torsoRotX.rotStepMax);
- targetY = turnTarget->y - shapeRot->y;
- SubS_ComputeTurnToPointRot(&headRot->y, options->headRotY.rotMax, targetY - torsoRot->y, options->headRotY.slowness,
- options->headRotY.rotStepMin, options->headRotY.rotStepMax);
- SubS_ComputeTurnToPointRot(&torsoRot->y, options->torsoRotY.rotMax, targetY - headRot->y,
- options->torsoRotY.slowness, options->torsoRotY.rotStepMin,
- options->torsoRotY.rotStepMax);
+ targetY = trackTarget->y - shapeRot->y;
+ SubS_ComputeTrackPointRot(&headRot->y, options->headRotY.rotMax, targetY - torsoRot->y, options->headRotY.slowness,
+ options->headRotY.rotStepMin, options->headRotY.rotStepMax);
+ SubS_ComputeTrackPointRot(&torsoRot->y, options->torsoRotY.rotMax, targetY - headRot->y,
+ options->torsoRotY.slowness, options->torsoRotY.rotStepMin,
+ options->torsoRotY.rotStepMax);
return true;
}
@@ -781,8 +1214,8 @@ s32 SubS_CopyPointFromPathList(Path* paths, s32 pathIndex, s32 pointIndex, Vec3f
return false;
}
-u8 SubS_GetPathCount(Path* paths, s32 index) {
- Path* path = &paths[index];
+u8 SubS_GetPathCountFromPathList(Path* paths, s32 pathIndex) {
+ Path* path = &paths[pathIndex];
return path->count;
}
@@ -1004,9 +1437,7 @@ s32 SubS_FillCutscenesList(Actor* actor, s16 cutscenes[], s16 numCutscenes) {
* @param[in] rot the angles to rotate with, uses just the x and y components
* @param[out] plane the computed plane
*
- * Notes:
- * The unit input vector is expected to already be normalized (only uses are with the z unit vector)
- *
+ * @note the unit input vector is expected to already be normalized (only uses are with the z unit vector)
*/
void SubS_ConstructPlane(Vec3f* point, Vec3f* unitVec, Vec3s* rot, Plane* plane) {
f32 sin;
@@ -1129,9 +1560,9 @@ s32 func_8013E8F8(Actor* actor, GlobalContext* globalCtx, f32 xzRange, f32 yRang
* @param[in] torsoZRotStepMax the max torso's Z rotation step
* @param[in] torsoXRotStepMax the max torso's X rotation step
*/
-s32 SubS_TurnToPointStep(Vec3f* worldPos, Vec3f* focusPos, s16 shapeYRot, Vec3f* yawTarget, Vec3f* pitchTarget,
- s16* headZRotStep, s16* headXRotStep, s16* torsoZRotStep, s16* torsoXRotStep,
- u16 headZRotStepMax, u16 headXRotStepMax, u16 torsoZRotStepMax, u16 torsoXRotStepMax) {
+s32 SubS_TrackPointStep(Vec3f* worldPos, Vec3f* focusPos, s16 shapeYRot, Vec3f* yawTarget, Vec3f* pitchTarget,
+ s16* headZRotStep, s16* headXRotStep, s16* torsoZRotStep, s16* torsoXRotStep,
+ u16 headZRotStepMax, u16 headXRotStepMax, u16 torsoZRotStepMax, u16 torsoXRotStepMax) {
s16 yaw = Math_Vec3f_Yaw(worldPos, yawTarget) - shapeYRot;
s16 pad;
s16 pad2;
diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c
index 6c0d1ef22..b28ed2aa6 100644
--- a/src/code/z_vismono.c
+++ b/src/code/z_vismono.c
@@ -1,14 +1,179 @@
+/*
+ * File: z_vismono.c
+ * Description: Color frame buffer effect to desaturate the colors.
+ */
+
#include "global.h"
#include "system_malloc.h"
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_vismono/func_801418B0.s")
+// Height of the fragments the color frame buffer (CFB) is split into.
+// It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into
+// the half of tmem (0x800 bytes) dedicated to color-indexed data.
+#define VISMONO_CFBFRAG_HEIGHT (0x800 / (SCREEN_WIDTH * G_IM_SIZ_16b_BYTES))
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_vismono/func_80141900.s")
+// Maximum size of the dlist written by `VisMono_DesaturateDList`.
+// `VisMono_DesaturateDList` consistently uses `VISMONO_DLSIZE - 2` double words, so this can be 2 less.
+#define VISMONO_DLSIZE (3 + SCREEN_HEIGHT / VISMONO_CFBFRAG_HEIGHT * (7 + 2 + 2 + 3) + 2 + 2)
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_vismono/func_80141924.s")
+// How much each color component contributes to the desaturated result.
+// These coefficients are close to what the YUV color space defines Y (luminance) as:
+// https://en.wikipedia.org/wiki/YUV#Conversion_to/from_RGB
+#define VISMONO_FAC_RED 2
+#define VISMONO_FAC_GREEN 4
+#define VISMONO_FAC_BLUE 1
+#define VISMONO_FAC_NORM (0x1F * VISMONO_FAC_RED + 0x1F * VISMONO_FAC_GREEN + 0x1F * VISMONO_FAC_BLUE)
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_vismono/func_80141C34.s")
+void VisMono_Init(VisMono* this) {
+ bzero(this, sizeof(VisMono));
+ this->unk_00 = 0;
+ this->setScissor = false;
+ this->primColor.r = 255;
+ this->primColor.g = 255;
+ this->primColor.b = 255;
+ this->primColor.a = 255;
+ this->envColor.r = 0;
+ this->envColor.g = 0;
+ this->envColor.b = 0;
+ this->envColor.a = 0;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_vismono/VisMono_Draw.s")
+void VisMono_Destroy(VisMono* this) {
+ SystemArena_Free(this->dList);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_vismono/func_8014204C.s")
+void VisMono_DesaturateTLUT(u16* tlut) {
+ s32 i;
+
+ for (i = 0; i < 256; i++) {
+ // `tlut[i]` is a IA16 color
+ // `i` corresponds to either byte of a RGBA16 color RRRR_RGGG GGBB_BBBA from the color frame buffer
+
+ // The high byte I (intensity) corresponds to `i` being interpreted as the high byte RRRR_RGGG
+ // I = (RRRRR * FAC_RED + GGG00 * FAC_GREEN) * (255 / FAC_NORM)
+
+ // The low byte A (alpha) corresponds to `i` being interpreted as the low byte GGBB_BBBA
+ // A = (000GG * FAC_GREEN + BBBBB * FAC_BLUE) * (255 / FAC_NORM)
+
+ // Note: I + A = (RRRRR * FAC_RED + GGGGG * FAC_GREEN + BBBBB * FAC_BLUE) * (255 / FAC_NORM)
+
+ tlut[i] = GPACK_IA16(
+ (((i >> 3) & 0x1F) * VISMONO_FAC_RED + ((i << 2) & 0x1F) * VISMONO_FAC_GREEN) * 255 / VISMONO_FAC_NORM,
+ (((i >> 6) & 0x1F) * VISMONO_FAC_GREEN + ((i >> 1) & 0x1F) * VISMONO_FAC_BLUE) * 255 / VISMONO_FAC_NORM);
+ }
+}
+
+Gfx* VisMono_DesaturateDList(Gfx* gfx) {
+ s32 y;
+ s32 height = VISMONO_CFBFRAG_HEIGHT;
+ u16* cfbFrag = D_0F000000;
+
+ gDPPipeSync(gfx++);
+ // `G_TT_IA16`: use color-indexed images, and IA16 palettes
+ gDPSetOtherMode(gfx++,
+ G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_IA16 | G_TL_TILE |
+ G_TD_CLAMP | G_TP_NONE | G_CYC_2CYCLE | G_PM_1PRIMITIVE,
+ G_AC_NONE | G_ZS_PRIM | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | G_RM_CLD_SURF2);
+ // First color cycle sums texel 1 alpha and texel 0 color
+ // By using IA16 palettes, this means summing A (from the IA16 color texel 1 maps to)
+ // with I (from the IA16 color texel 0 maps to)
+ gDPSetCombineLERP(gfx++, 1, 0, TEXEL1_ALPHA, TEXEL0, 0, 0, 0, 1, PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, 0,
+ 0, 0, PRIMITIVE);
+
+ for (y = 0; y <= SCREEN_HEIGHT - height; y += height) {
+ // Load a few lines of the color frame buffer
+ gDPLoadTextureBlock(gfx++, cfbFrag, G_IM_FMT_CI, G_IM_SIZ_8b, SCREEN_WIDTH * 2, height, 0,
+ G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK,
+ G_TX_NOLOD, G_TX_NOLOD);
+
+ // Set texel 0 to be a CI8 image with width `SCREEN_WIDTH * 2` and height `VISMONO_CFBFRAG_HEIGHT`
+ // Its position in texture image space is shifted along +S by 2
+ gDPSetTile(gfx++, G_IM_FMT_CI, G_IM_SIZ_8b, SCREEN_WIDTH * 2 * G_IM_SIZ_8b_LINE_BYTES / 8, 0x0, G_TX_RENDERTILE,
+ 0, G_TX_NOMIRROR | G_TX_CLAMP, 0, 0, G_TX_NOMIRROR | G_TX_CLAMP, 0, 0);
+ gDPSetTileSize(gfx++, G_TX_RENDERTILE, 2 << 2, 0, (SCREEN_WIDTH * 2 + 1) << 2,
+ (VISMONO_CFBFRAG_HEIGHT - 1) << 2);
+
+ // Set texel 1 to be a CI8 image with width `SCREEN_WIDTH * 2` and height `VISMONO_CFBFRAG_HEIGHT`
+ // Its position in texture image space is shifted along +S by 1
+ gDPSetTile(gfx++, G_IM_FMT_CI, G_IM_SIZ_8b, SCREEN_WIDTH * 2 * G_IM_SIZ_8b_LINE_BYTES / 8, 0x0, 1, 1,
+ G_TX_NOMIRROR | G_TX_CLAMP, 0, 0, G_TX_NOMIRROR | G_TX_CLAMP, 0, 0);
+ gDPSetTileSize(gfx++, 1, 1 << 2, 0, (SCREEN_WIDTH * 2) << 2, (VISMONO_CFBFRAG_HEIGHT - 1) << 2);
+
+ // Draw a `SCREEN_WIDTH` wide, `height` high rectangle.
+ // Texture coordinate T (vertical) starts at 0 and changes by one each line (dtdy = 1)
+ // Texture coordinate S (horizontal) starts at 2 and changes by two each column (dsdx = 2)
+
+ // Because texel 0 is shifted by 2 and texel 1 only by 1 along +S,
+ // a pixel at S coordinates s = 2+2*n will look at the 2*n-th byte of texel 0 and the 2*n+1-th byte of texel 1.
+ // (in "s = 2+2*n" the first "2" is the starting S coordinate and the second "2" is the dsdx value)
+
+ // The 2*n-th byte of texel 0 is the high byte of the n-th RGBA16 color of the color frame buffer.
+ // The 2*n+1-th byte of texel 1 is the low byte of the n-th RGBA16 color of the color frame buffer.
+
+ // With the TLUT computed by `VisMono_DesaturateTLUT`:
+ // The 2*n-th byte of texel 0 maps to a IA16 color where the high byte I (intensity) corresponds to
+ // the high byte of the n-th RGBA16 color of the color frame buffer.
+ // The 2*n+1-th byte of texel 1 maps to a IA16 color where the low byte A (alpha) corresponds to
+ // the low byte of the n-th RGBA16 color of the color frame buffer.
+
+ // Since the combiner is in part set up to sum texel 0 color (I, intensity) with texel 1 alpha (A, alpha),
+ // the resulting color in the drawn rectangle is a desaturated color as defined by the `VISMONO_FAC_*` values.
+
+ gSPTextureRectangle(gfx++, 0, y << 2, SCREEN_WIDTH << 2, (y + height) << 2, G_TX_RENDERTILE, 2 << 5, 0, 2 << 10,
+ 1 << 10);
+ cfbFrag += SCREEN_WIDTH * height;
+ }
+
+ gDPPipeSync(gfx++);
+ gSPEndDisplayList(gfx++);
+ return gfx;
+}
+
+void VisMono_Draw(VisMono* this, Gfx** gfxp) {
+ Gfx* gfx = *gfxp;
+ u16* tlut;
+ Gfx* dList;
+ Gfx* dListEnd;
+
+ if (this->tlut) {
+ tlut = this->tlut;
+ } else {
+ tlut = Graph_DlistAlloc(&gfx, 256 * G_IM_SIZ_16b_BYTES);
+ VisMono_DesaturateTLUT(tlut);
+ }
+
+ if (this->dList) {
+ dList = this->dList;
+ } else {
+ dList = Graph_DlistAlloc(&gfx, VISMONO_DLSIZE * sizeof(Gfx));
+ dListEnd = VisMono_DesaturateDList(dList);
+ }
+
+ gDPPipeSync(gfx++);
+
+ if (this->setScissor == true) {
+ gSPDisplayList(gfx++, D_0E000000.setScissor);
+ }
+
+ gDPSetColor(gfx++, G_SETPRIMCOLOR, this->primColor.rgba);
+ gDPSetColor(gfx++, G_SETENVCOLOR, this->envColor.rgba);
+
+ gDPLoadTLUT_pal256(gfx++, tlut);
+
+ gSPDisplayList(gfx++, dList);
+
+ gDPPipeSync(gfx++);
+
+ *gfxp = gfx;
+}
+
+void VisMono_DrawOld(VisMono* this) {
+ if (this->tlut == NULL) {
+ this->tlut = SystemArena_Malloc(256 * G_IM_SIZ_16b_BYTES);
+ VisMono_DesaturateTLUT(this->tlut);
+ }
+
+ if (this->dList == NULL) {
+ this->dList = SystemArena_Malloc(VISMONO_DLSIZE * sizeof(Gfx));
+ VisMono_DesaturateDList(this->dList);
+ }
+}
diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
index 16aa93bd9..18d5792d6 100644
--- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
+++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
@@ -271,7 +271,7 @@ void ArmsHook_Shoot(ArmsHook* this, GlobalContext* globalCtx) {
Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_IT_HOOKSHOT_REFLECT);
}
} else {
- if (CHECK_BTN_ANY(CONTROLLER1(globalCtx)->press.button,
+ if (CHECK_BTN_ANY(CONTROLLER1(&globalCtx->state)->press.button,
BTN_A | BTN_B | BTN_R | BTN_CUP | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)) {
s32 pad;
this->timer = 1;
diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c
index f2608b583..1e4a9b3d0 100644
--- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c
+++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_astr_bombwall.h"
+#include "objects/object_astr_obj/object_astr_obj.h"
#define FLAGS 0x00000000
@@ -15,7 +16,13 @@ void BgAstrBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgAstrBombwall_Update(Actor* thisx, GlobalContext* globalCtx);
void BgAstrBombwall_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
+void func_80C0A378(BgAstrBombwall* this);
+void func_80C0A38C(BgAstrBombwall* this, GlobalContext* globalCtx);
+void func_80C0A400(BgAstrBombwall* this, GlobalContext* globalCtx);
+void func_80C0A418(BgAstrBombwall* this, GlobalContext* globalCtx);
+void func_80C0A458(BgAstrBombwall* this, GlobalContext* globalCtx);
+void func_80C0A4BC(BgAstrBombwall* this, GlobalContext* globalCtx);
+
const ActorInit Bg_Astr_Bombwall_InitVars = {
ACTOR_BG_ASTR_BOMBWALL,
ACTORCAT_BG,
@@ -28,59 +35,191 @@ const ActorInit Bg_Astr_Bombwall_InitVars = {
(ActorFunc)BgAstrBombwall_Draw,
};
-// static ColliderTrisElementInit sTrisElementsInit[2] = {
-static ColliderTrisElementInit D_80C0A620[2] = {
+static ColliderTrisElementInit sTrisElementsInit[2] = {
{
- { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
+ {
+ ELEMTYPE_UNK0,
+ { 0x00000000, 0x00, 0x00 },
+ { 0x00000008, 0x00, 0x00 },
+ TOUCH_NONE | TOUCH_SFX_NORMAL,
+ BUMP_ON,
+ OCELEM_NONE,
+ },
{ { { -70.0f, 0.0f, 3.0f }, { 70.0f, 0.0f, 3.0f }, { -70.0f, 200.0f, 3.0f } } },
},
{
- { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
+ {
+ ELEMTYPE_UNK0,
+ { 0x00000000, 0x00, 0x00 },
+ { 0x00000008, 0x00, 0x00 },
+ TOUCH_NONE | TOUCH_SFX_NORMAL,
+ BUMP_ON,
+ OCELEM_NONE,
+ },
{ { { 70.0f, 0.0f, 3.0f }, { 70.0f, 200.0f, 3.0f }, { -70.0f, 200.0f, 3.0f } } },
},
};
-// static ColliderTrisInit sTrisInit = {
-static ColliderTrisInit D_80C0A698 = {
- { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_NONE, COLSHAPE_TRIS, },
- 2, D_80C0A620, // sTrisElementsInit,
+static ColliderTrisInit sTrisInit = {
+ {
+ COLTYPE_NONE,
+ AT_NONE,
+ AC_ON | AC_TYPE_PLAYER,
+ OC1_NONE,
+ OC2_NONE,
+ COLSHAPE_TRIS,
+ },
+ 2,
+ sTrisElementsInit,
};
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80C0A6A8[] = {
+static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
};
-#endif
+void BgAstrBombwall_InitCollider(ColliderTrisInit* init, Vec3f* pos, Vec3s* rot, ColliderTris* collider) {
+ s32 i;
+ s32 j;
+ Vec3f sp54[3];
-extern ColliderTrisElementInit D_80C0A620[2];
-extern ColliderTrisInit D_80C0A698;
-extern InitChainEntry D_80C0A6A8[];
+ Matrix_RotateYS(rot->y, MTXMODE_NEW);
+ Matrix_RotateXS(rot->x, MTXMODE_APPLY);
+ Matrix_RotateZS(rot->z, MTXMODE_APPLY);
-extern UNK_TYPE D_06002178;
-extern UNK_TYPE D_06002380;
-extern UNK_TYPE D_06002498;
+ for (i = 0; i < init->count; i++) {
+ for (j = 0; j < 3; j++) { // https://decomp.me/scratch/JrEnl
+ Matrix_MultVec3f(&(init->elements + i)->dim.vtx[j], &sp54[j]); //! FAKE MATCH:
+ Math_Vec3f_Sum(&sp54[j], pos, &sp54[j]);
+ }
+ Collider_SetTrisVertices(collider, i, &sp54[0], &sp54[1], &sp54[2]);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C09ED0.s")
+void BgAstrBombwall_Init(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ BgAstrBombwall* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/BgAstrBombwall_Init.s")
+ Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
+ DynaPolyActor_Init(&this->dyna, 1);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_astr_obj_Colheader_002498);
+ Collider_InitTris(globalCtx, &this->collider);
+ if (Flags_GetSwitch(globalCtx, BGASTRBOMBWALL_GET_SWITCHFLAG(thisx))) {
+ Actor_MarkForDeath(&this->dyna.actor);
+ return;
+ }
+ this->dyna.actor.flags |= ACTOR_FLAG_10000000;
+ if (!Collider_SetTris(globalCtx, &this->collider, &this->dyna.actor, &sTrisInit, this->colliderElements)) {
+ Actor_MarkForDeath(&this->dyna.actor);
+ return;
+ }
+ BgAstrBombwall_InitCollider(&sTrisInit, &this->dyna.actor.world.pos, &this->dyna.actor.shape.rot, &this->collider);
+ SubS_FillCutscenesList(&this->dyna.actor, this->cutscenes, ARRAY_COUNT(this->cutscenes));
+ func_80C0A378(this);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/BgAstrBombwall_Destroy.s")
+void BgAstrBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ BgAstrBombwall* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A120.s")
+ DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A378.s")
+void func_80C0A120(BgAstrBombwall* this, GlobalContext* globalCtx) {
+ s32 i;
+ Vec3f vec;
+ Vec3f pos;
+ s16 var_v0;
+ Vec3f velocity;
+ f32 rand;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A38C.s")
+ Matrix_RotateYS(this->dyna.actor.shape.rot.y, MTXMODE_NEW);
+ for (i = 0; i < 30; i++) {
+ vec.x = Rand_Centered() * 140.0f;
+ vec.y = Rand_ZeroOne() * 200.0f;
+ vec.z = 0.0f;
+ Matrix_MultVec3f(&vec, &pos);
+ Math_Vec3f_Sum(&this->dyna.actor.world.pos, &pos, &pos);
+ func_800BBFB0(globalCtx, &pos, 50.0f, 2, Rand_ZeroOne() * 120.0f + 20.0f, Rand_ZeroOne() * 240.0f + 20.0f, 0);
+ velocity.x = Rand_ZeroOne() * 2.5f;
+ velocity.y = (Rand_ZeroOne() * 2.5f) + 1.0f;
+ velocity.z = Rand_ZeroOne() * 2.5f;
+ rand = Rand_ZeroOne();
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A400.s")
+ if (rand < 0.2f) {
+ var_v0 = 0x60;
+ } else if (rand < 0.6f) {
+ var_v0 = 0x40;
+ } else {
+ var_v0 = 0x20;
+ }
+ EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -260, var_v0, 20, 0, 0, 10, 0, 0, 50, -1,
+ OBJECT_ASTR_OBJ, object_astr_obj_DL_002178);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A418.s")
+void func_80C0A378(BgAstrBombwall* this) {
+ this->actionFunc = func_80C0A38C;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A458.s")
+void func_80C0A38C(BgAstrBombwall* this, GlobalContext* globalCtx) {
+ if (this->collider.base.acFlags & AC_HIT) {
+ this->collider.base.acFlags &= ~AC_HIT;
+ Flags_SetSwitch(globalCtx, BGASTRBOMBWALL_GET_SWITCHFLAG(&this->dyna.actor));
+ func_80C0A400(this, globalCtx);
+ } else {
+ CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A4BC.s")
+void func_80C0A400(BgAstrBombwall* this, GlobalContext* globalCtx) {
+ this->actionFunc = func_80C0A418;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/BgAstrBombwall_Update.s")
+void func_80C0A418(BgAstrBombwall* this, GlobalContext* globalCtx) {
+ if (SubS_StartActorCutscene(&this->dyna.actor, this->cutscenes[0], -1, SUBS_CUTSCENE_SET_UNK_LINK_FIELDS)) {
+ func_80C0A458(this, globalCtx);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/BgAstrBombwall_Draw.s")
+void func_80C0A458(BgAstrBombwall* this, GlobalContext* globalCtx) {
+ func_800C62BC(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+ this->dyna.actor.draw = NULL;
+ func_80C0A120(this, globalCtx);
+ Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WALL_BROKEN);
+ this->actionFunc = func_80C0A4BC;
+}
+
+void func_80C0A4BC(BgAstrBombwall* this, GlobalContext* globalCtx) {
+}
+
+void BgAstrBombwall_Update(Actor* thisx, GlobalContext* globalCtx) {
+ BgAstrBombwall* this = THIS;
+
+ this->actionFunc(this, globalCtx);
+}
+
+void BgAstrBombwall_Draw(Actor* thixs, GlobalContext* globalCtx) {
+ {
+ Gfx* opa;
+
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+ opa = POLY_OPA_DISP;
+ gSPDisplayList(&opa[0], &sSetupDL[25 * 6]);
+ gSPMatrix(&opa[1], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ gSPSetGeometryMode(&opa[2], G_LIGHTING_POSITIONAL);
+ gSPDisplayList(&opa[3], object_astr_obj_DL_002380);
+ POLY_OPA_DISP = &opa[4];
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+ }
+ {
+ Gfx* xlu;
+
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+ xlu = POLY_XLU_DISP;
+ gSPDisplayList(&xlu[0], &sSetupDL[25 * 6]);
+ gSPMatrix(&xlu[1], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ gSPSetGeometryMode(&xlu[2], G_LIGHTING_POSITIONAL);
+ gSPDisplayList(&xlu[3], object_astr_obj_DL_0022E0);
+ POLY_XLU_DISP = &xlu[4];
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+ }
+}
diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h
index 89b891f9b..413f14cdd 100644
--- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h
+++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h
@@ -5,15 +5,16 @@
struct BgAstrBombwall;
+#define BGASTRBOMBWALL_GET_SWITCHFLAG(thisx) ((thisx)->params & 0x7F)
+
typedef void (*BgAstrBombwallActionFunc)(struct BgAstrBombwall*, GlobalContext*);
-
typedef struct BgAstrBombwall {
- /* 0x0000 */ Actor actor;
- /* 0x0144 */ char unk_144[0x18];
- /* 0x015C */ BgAstrBombwallActionFunc actionFunc;
- /* 0x0160 */ char unk_160[0xDC];
-} BgAstrBombwall; // size = 0x23C
-
+ /* 0x000 */ DynaPolyActor dyna;
+ /* 0x15C */ BgAstrBombwallActionFunc actionFunc;
+ /* 0x160 */ ColliderTris collider;
+ /* 0x180 */ ColliderTrisElement colliderElements[2];
+ /* 0x238 */ s16 cutscenes[1];
+} BgAstrBombwall;
extern const ActorInit Bg_Astr_Bombwall_InitVars;
#endif // Z_BG_ASTR_BOMBWALL_H
diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
index 6ac390ce5..2bcc31b5b 100644
--- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
+++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c
@@ -78,7 +78,7 @@ void BgCtowerGear_Splash(BgCtowerGear* this, GlobalContext* globalCtx) {
Matrix_RotateXS(this->dyna.actor.home.rot.x, MTXMODE_APPLY);
Matrix_RotateZS(this->dyna.actor.home.rot.z, MTXMODE_APPLY);
for (i = 0; i < 4; i++) {
- if ((u32)Rand_Next() >= 0x40000000) {
+ if (Rand_Next() >= 0x40000000) {
splashOffset.x = sExitSplashOffsets[i].x - (Rand_ZeroOne() * 30.0f);
splashOffset.y = sExitSplashOffsets[i].y;
splashOffset.z = sExitSplashOffsets[i].z;
@@ -86,7 +86,7 @@ void BgCtowerGear_Splash(BgCtowerGear* this, GlobalContext* globalCtx) {
splashSpawnPos.x += this->dyna.actor.world.pos.x + ((Rand_ZeroOne() * 20.0f) - 10.0f);
splashSpawnPos.y += this->dyna.actor.world.pos.y;
splashSpawnPos.z += this->dyna.actor.world.pos.z + ((Rand_ZeroOne() * 20.0f) - 10.0f);
- EffectSsGSplash_Spawn(globalCtx, &splashSpawnPos, NULL, NULL, 0, ((u32)Rand_Next() >> 25) + 340);
+ EffectSsGSplash_Spawn(globalCtx, &splashSpawnPos, NULL, NULL, 0, (Rand_Next() >> 25) + 340);
}
}
}
@@ -104,7 +104,7 @@ void BgCtowerGear_Splash(BgCtowerGear* this, GlobalContext* globalCtx) {
splashSpawnPos.x += this->dyna.actor.world.pos.x + ((Rand_ZeroOne() * 20.0f) - 10.0f);
splashSpawnPos.y += this->dyna.actor.world.pos.y;
splashSpawnPos.z += this->dyna.actor.world.pos.z + ((Rand_ZeroOne() * 20.0f) - 10.0f);
- EffectSsGSplash_Spawn(globalCtx, &splashSpawnPos, NULL, NULL, 0, ((u32)Rand_Next() >> 25) + 280);
+ EffectSsGSplash_Spawn(globalCtx, &splashSpawnPos, NULL, NULL, 0, (Rand_Next() >> 25) + 280);
}
}
}
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c
index 0c5b92496..da3943141 100644
--- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c
+++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c
@@ -276,7 +276,7 @@ void func_80B8296C(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2) {
for (i = 0; i < ARRAY_COUNT(D_80B83A94); i++) {
temp_f0 = Rand_ZeroOne();
temp_f20 = 1.0f - SQ(temp_f0);
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
temp_f20 = -temp_f20;
}
@@ -285,7 +285,7 @@ void func_80B8296C(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2) {
temp_f0 = Rand_ZeroOne();
temp_f20 = 1.0f - SQ(temp_f0);
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
temp_f20 = -temp_f20;
}
sp60.z = (temp_f20 * arg2) + arg1->z;
diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c
index fcec4ebb3..a9777972d 100644
--- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c
+++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c
@@ -295,7 +295,7 @@ void func_80B84610(BgDblueWaterfall* this, GlobalContext* globalCtx) {
if (this->unk_1A7 <= 0) {
this->unk_1A7 = 16;
} else {
- this->unk_1A7 -= (s8)((u32)Rand_Next() >> 0x1F);
+ this->unk_1A7 -= (s8)(Rand_Next() >> 0x1F);
}
if (this->unk_1A7 >= 6) {
diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
index d064a3cb4..aae5930ed 100644
--- a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
+++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c
@@ -20,7 +20,7 @@ void func_80B40100(BgGoronOyu* this, GlobalContext* globalCtx);
void func_80B400C8(BgGoronOyu* this, GlobalContext* globalCtx);
void func_80B401F8(BgGoronOyu* this, GlobalContext* globalCtx);
void BgGoronOyu_UpdateWaterBoxInfo(BgGoronOyu* this, GlobalContext* globalCtx);
-void BgGoronOyu_SpawnParticles(BgGoronOyu* this, GlobalContext* globalCtx);
+void BgGoronOyu_SpawnEffects(BgGoronOyu* this, GlobalContext* globalCtx);
void func_80B40160(BgGoronOyu* this, GlobalContext* globalCtx);
const ActorInit Bg_Goron_Oyu_InitVars = {
@@ -108,7 +108,7 @@ void BgGoronOyu_UpdateWaterBoxInfo(BgGoronOyu* this, GlobalContext* globalCtx) {
}
}
-void BgGoronOyu_SpawnParticles(BgGoronOyu* this, GlobalContext* globalCtx) {
+void BgGoronOyu_SpawnEffects(BgGoronOyu* this, GlobalContext* globalCtx) {
s16 scale;
Vec3f pos1;
Vec3f pos2;
@@ -178,7 +178,7 @@ void BgGoronOyu_Update(Actor* thisx, GlobalContext* globalCtx) {
BgGoronOyu* this = THIS;
this->actionFunc(this, globalCtx);
- BgGoronOyu_SpawnParticles(this, globalCtx);
+ BgGoronOyu_SpawnEffects(this, globalCtx);
}
void BgGoronOyu_Draw(Actor* thisx, GlobalContext* globalCtx) {
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c
index 20d68e7a4..1103c6d81 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c
@@ -138,7 +138,7 @@ void func_80ABBFC0(BgHakuginBombwall* this, GlobalContext* globalCtx) {
for (i = 0; i < 6; i++) {
temp = (i + 1) * (80.0f / 3.0f);
for (j = 0; j < ARRAY_COUNT(D_80ABD020); j++) {
- spD8.x = D_80ABD020[j] + (s32)((u32)Rand_Next() >> 0x1C);
+ spD8.x = D_80ABD020[j] + (s32)(Rand_Next() >> 0x1C);
spD8.y = ((Rand_ZeroOne() - 0.5f) * 15.0f) + temp;
spD8.z = (Rand_ZeroOne() * 20.0f) - 10.0f;
@@ -159,11 +159,11 @@ void func_80ABBFC0(BgHakuginBombwall* this, GlobalContext* globalCtx) {
phi_s0 = 64;
}
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
phi_s0 |= 1;
phi_s1 = 1;
func_800B0E48(globalCtx, &spF0, &gZeroVec3f, &D_80ABCFB4, &D_80ABCFAC, &D_80ABCFB0,
- ((u32)Rand_Next() >> 0x1B) + 70, ((u32)Rand_Next() >> 0x1A) + 60);
+ (Rand_Next() >> 0x1B) + 70, (Rand_Next() >> 0x1A) + 60);
} else {
phi_s1 = 0;
}
@@ -224,7 +224,7 @@ void func_80ABC2E0(BgHakuginBombwall* this, GlobalContext* globalCtx) {
if ((i & 1) == 0) {
func_800B0E48(globalCtx, &spC8, &D_80ABD034, &D_80ABCFB4, &D_80ABCFAC, &D_80ABCFB0,
- ((u32)Rand_Next() >> 0x1B) + 60, ((u32)Rand_Next() >> 0x1A) + 50);
+ (Rand_Next() >> 0x1B) + 60, (Rand_Next() >> 0x1A) + 50);
}
}
}
@@ -269,8 +269,8 @@ void func_80ABC58C(BgHakuginBombwall* this, GlobalContext* globalCtx) {
spC0.y += this->dyna.actor.world.pos.y;
spC0.z += this->dyna.actor.world.pos.z;
- func_800B0E48(globalCtx, &spC0, &spCC, &spD8, &D_80ABCFAC, &D_80ABCFB0, ((u32)Rand_Next() >> 0x1A) + 60,
- ((u32)Rand_Next() >> 0x1B) + 60);
+ func_800B0E48(globalCtx, &spC0, &spCC, &spD8, &D_80ABCFAC, &D_80ABCFB0, (Rand_Next() >> 0x1A) + 60,
+ (Rand_Next() >> 0x1B) + 60);
}
}
@@ -303,8 +303,8 @@ void func_80ABC7FC(BgHakuginBombwall* this, GlobalContext* globalCtx) {
spB8.x = spAC.x * -0.095f;
spB8.z = spAC.z * -0.095f;
- func_800B0E48(globalCtx, &spA0, &spAC, &spB8, &D_80ABCFAC, &D_80ABCFB0, ((u32)Rand_Next() >> 0x1A) + 60,
- ((u32)Rand_Next() >> 0x1B) + 60);
+ func_800B0E48(globalCtx, &spA0, &spAC, &spB8, &D_80ABCFAC, &D_80ABCFB0, (Rand_Next() >> 0x1A) + 60,
+ (Rand_Next() >> 0x1B) + 60);
}
}
diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
index a7f20b7b4..f0831055f 100644
--- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
+++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c
@@ -343,9 +343,9 @@ void func_80A9B554(BgHakuginPost* this, GlobalContext* globalCtx, BgHakuginPostU
temp_f0 = spAC.z;
unkStruct2->unk_10.z = ((Rand_ZeroOne() * 60.0f - 30.0f) + temp_f28 * 50.0f) * temp_f22 + temp_f0 * temp_f20;
unkStruct2->unk_1C = 0.90999997f - (0.04f - unkStruct2->unk_00) * (500.0f / 19.0f) * 0.02f;
- unkStruct2->unk_20.x = Rand_Next() >> 0x10;
- unkStruct2->unk_20.y = Rand_Next() >> 0x10;
- unkStruct2->unk_20.z = Rand_Next() >> 0x10;
+ unkStruct2->unk_20.x = (s32)Rand_Next() >> 0x10;
+ unkStruct2->unk_20.y = (s32)Rand_Next() >> 0x10;
+ unkStruct2->unk_20.z = (s32)Rand_Next() >> 0x10;
unkStruct2->unk_26 = (Rand_Next() & 0x3FFF) - 0x1FFF;
unkStruct2->unk_28 = (Rand_Next() & 0x1FFF) - 0xFFF;
unkStruct2->unk_2A = (Rand_Next() & 0x1FFF) - 0xFFF;
@@ -359,7 +359,7 @@ void func_80A9B554(BgHakuginPost* this, GlobalContext* globalCtx, BgHakuginPostU
spA0.y = (Rand_ZeroOne() * 1.2f - 0.1f) * spE4 + spB8.y;
spA0.z = Math_CosS(val) * temp_f20 + spB8.z;
func_800B0E48(globalCtx, &spA0, &gZeroVec3f, &D_80A9D8EC, &D_80A9D8E4, &D_80A9D8E8,
- (Rand_Next() >> 0x1A) + 0x82, (Rand_Next() >> 0x1A) + 0x6E);
+ ((s32)Rand_Next() >> 0x1A) + 0x82, ((s32)Rand_Next() >> 0x1A) + 0x6E);
}
unkStruct1Temp = func_80A9B32C(unkStruct, unkStruct1);
@@ -386,9 +386,9 @@ void func_80A9B554(BgHakuginPost* this, GlobalContext* globalCtx, BgHakuginPostU
unkStruct2->unk_10.y = 0.0f;
unkStruct2->unk_10.z = Rand_ZeroOne() + temp_f28 * 7.0f;
unkStruct2->unk_1C = 0.90999997f - (0.04f - unkStruct2->unk_00) * (500.0f / 19.0f) * 0.075f;
- unkStruct2->unk_20.x = Rand_Next() >> 0x10;
- unkStruct2->unk_20.y = Rand_Next() >> 0x10;
- unkStruct2->unk_20.z = Rand_Next() >> 0x10;
+ unkStruct2->unk_20.x = (s32)Rand_Next() >> 0x10;
+ unkStruct2->unk_20.y = (s32)Rand_Next() >> 0x10;
+ unkStruct2->unk_20.z = (s32)Rand_Next() >> 0x10;
unkStruct2->unk_26 = (Rand_Next() & 0x1FFF) - 0xFFF;
unkStruct2->unk_28 = (Rand_Next() & 0x1FFF) - 0xFFF;
unkStruct2->unk_2A = (Rand_Next() & 0x1FFF) - 0xFFF;
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c
index 2fb508c79..6048a8c9c 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c
+++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_ikana_dharma.h"
+#include "assets/objects/object_ikana_obj/object_ikana_obj.h"
#define FLAGS (ACTOR_FLAG_10)
@@ -15,7 +16,13 @@ void BgIkanaDharma_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgIkanaDharma_Update(Actor* thisx, GlobalContext* globalCtx);
void BgIkanaDharma_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
+void BgIkanaDharma_SetupWaitForHit(BgIkanaDharma* this);
+void BgIkanaDharma_WaitForHit(BgIkanaDharma* this, GlobalContext* globalCtx);
+void BgIkanaDharma_SetupStartCutscene(BgIkanaDharma* this);
+void BgIkanaDharma_StartCutscene(BgIkanaDharma* this, GlobalContext* globalCtx);
+void BgIkanaDharma_SetupWaitForCutsceneToEnd(BgIkanaDharma* this);
+void BgIkanaDharma_WaitForCutsceneToEnd(BgIkanaDharma* this, GlobalContext* globalCtx);
+
const ActorInit Bg_Ikana_Dharma_InitVars = {
ACTOR_BG_IKANA_DHARMA,
ACTORCAT_BG,
@@ -28,47 +35,226 @@ const ActorInit Bg_Ikana_Dharma_InitVars = {
(ActorFunc)BgIkanaDharma_Draw,
};
-// static ColliderCylinderInit sCylinderInit = {
-static ColliderCylinderInit D_80BECAD0 = {
- { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_NONE, COLSHAPE_CYLINDER, },
- { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000100, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
+static ColliderCylinderInit sCylinderInit = {
+ {
+ COLTYPE_NONE,
+ AT_NONE,
+ AC_ON | AC_TYPE_PLAYER,
+ OC1_NONE,
+ OC2_NONE,
+ COLSHAPE_CYLINDER,
+ },
+ {
+ ELEMTYPE_UNK0,
+ { 0x00000000, 0x00, 0x00 },
+ { 0x00000100, 0x00, 0x00 },
+ TOUCH_NONE | TOUCH_SFX_NORMAL,
+ BUMP_ON,
+ OCELEM_NONE,
+ },
{ 98, 10, 25, { 0, 0, 0 } },
};
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80BECAFC[] = {
+static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 320, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 320, ICHAIN_CONTINUE),
ICHAIN_F32_DIV1000(gravity, -1100, ICHAIN_STOP),
};
-#endif
+static BgIkanaDharma* sFirstHitBgIkanaDharma;
-extern ColliderCylinderInit D_80BECAD0;
-extern InitChainEntry D_80BECAFC[];
+void BgIkanaDharma_SpawnEffects(BgIkanaDharma* this, GlobalContext* globalCtx) {
+ s32 pad;
+ Vec3f pos;
+ Vec3f velocity;
+ Vec3f accel;
+ s32 i;
+ f32 initialRadius = this->dyna.actor.scale.x * 200.0f;
+ f32 initialY = this->dyna.actor.scale.y * 50.0f;
-extern UNK_TYPE D_060008C8;
-extern UNK_TYPE D_06000C50;
+ for (i = 0; i < 4; i++) {
+ f32 speed = (Rand_ZeroOne() * 5.0f) + 5.0f;
+ s16 angle = ((u32)Rand_Next() >> 0x12) + this->dyna.actor.world.rot.y + 0x6000;
+ f32 dirX = Math_SinS(angle);
+ f32 dirZ = Math_CosS(angle);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/func_80BEC240.s")
+ pos.x = (dirX * initialRadius) + this->dyna.actor.world.pos.x;
+ pos.y = this->dyna.actor.world.pos.y + initialY;
+ pos.z = (dirZ * initialRadius) + this->dyna.actor.world.pos.z;
+ velocity.x = speed * dirX;
+ velocity.y = Rand_ZeroOne() + 0.5f;
+ velocity.z = speed * dirZ;
+ accel.x = velocity.x * -0.05f;
+ accel.y = -0.15f;
+ accel.z = velocity.z * -0.05f;
+ EffectSsKirakira_SpawnSmallYellow(globalCtx, &pos, &velocity, &accel);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/BgIkanaDharma_Init.s")
+void BgIkanaDharma_Init(Actor* thisx, GlobalContext* globalCtx2) {
+ GlobalContext* globalCtx = globalCtx2;
+ BgIkanaDharma* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/BgIkanaDharma_Destroy.s")
+ Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
+ this->dyna.actor.scale.x = 0.3f;
+ this->dyna.actor.scale.y = 0.1f;
+ this->dyna.actor.scale.z = 0.3f;
+ DynaPolyActor_Init(&this->dyna, 0);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &gStoneTowerTemplePunchablePillarCol);
+ Collider_InitCylinder(globalCtx, &this->collider);
+ Collider_SetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit);
+ if (!BGIKANADHARMA_IS_CHILD(&this->dyna.actor)) {
+ f32 segmentY = this->dyna.actor.world.pos.y;
+ s32 numSegments = BGIKANADHARMA_NUM_SEGMENTS(&this->dyna.actor);
+ s32 i;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/func_80BEC5C4.s")
+ for (i = 0; i < numSegments; i++) {
+ segmentY += 60.0f;
+ Actor_SpawnAsChildAndCutscene(&globalCtx->actorCtx, globalCtx, ACTOR_BG_IKANA_DHARMA,
+ this->dyna.actor.world.pos.x, segmentY, this->dyna.actor.world.pos.z,
+ this->dyna.actor.shape.rot.x, this->dyna.actor.shape.rot.y,
+ this->dyna.actor.shape.rot.z, BGIKANADHARMA_PARAMS(0, true, 0),
+ this->dyna.actor.cutscene, this->dyna.actor.unk20, NULL);
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/func_80BEC5E0.s")
+ this->dyna.actor.bgCheckFlags |= 1;
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/func_80BEC758.s")
+ BgIkanaDharma_SetupWaitForHit(this);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/func_80BEC790.s")
+void BgIkanaDharma_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ BgIkanaDharma* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/func_80BEC7EC.s")
+ DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+ Collider_DestroyCylinder(globalCtx, &this->collider);
+ if (sFirstHitBgIkanaDharma == this) {
+ sFirstHitBgIkanaDharma = NULL;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/func_80BEC808.s")
+void BgIkanaDharma_SetupWaitForHit(BgIkanaDharma* this) {
+ this->actionFunc = BgIkanaDharma_WaitForHit;
+ this->dyna.actor.speedXZ = 0.0f;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/BgIkanaDharma_Update.s")
+void BgIkanaDharma_WaitForHit(BgIkanaDharma* this, GlobalContext* globalCtx) {
+ s32 wasHit = (this->collider.base.acFlags & AC_HIT) != 0;
+ Player* player = GET_PLAYER(globalCtx);
+ BgIkanaDharma* this2 = this;
+ s32 tempAngle1;
+ s32 tempAngle2;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikana_Dharma/BgIkanaDharma_Draw.s")
+ if (wasHit) {
+ this->collider.base.acFlags &= ~AC_HIT;
+ }
+
+ if (wasHit && sFirstHitBgIkanaDharma == NULL) {
+ sFirstHitBgIkanaDharma = this2;
+ Flags_SetSwitch(globalCtx, BGIKANADHARMA_GET_SWITCHFLAG(&this->dyna.actor));
+ tempAngle1 = BINANG_ADD(this->dyna.actor.yawTowardsPlayer, 0x8000);
+ tempAngle2 = (BINANG_SUB(player->actor.shape.rot.y, tempAngle1) >> 1);
+ this->dyna.actor.world.rot.y = tempAngle1 + tempAngle2 + 0xF000;
+ this->dyna.actor.speedXZ = 20.0f;
+ Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_DARUMA_VANISH);
+ BgIkanaDharma_SetupStartCutscene(this);
+ } else if ((this->dyna.actor.flags & ACTOR_FLAG_40) == ACTOR_FLAG_40 && sFirstHitBgIkanaDharma == NULL &&
+ this->dyna.actor.xzDistToPlayer < 420.0f) {
+ tempAngle1 = BINANG_SUB(this->dyna.actor.yawTowardsPlayer, player->actor.shape.rot.y);
+ tempAngle1 = ABS_ALT(tempAngle1);
+
+ if (tempAngle1 > 0x4000) {
+ Collider_UpdateCylinder(&this->dyna.actor, &this->collider);
+ CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+ }
+ }
+}
+
+void BgIkanaDharma_SetupStartCutscene(BgIkanaDharma* this) {
+ ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene);
+ this->actionFunc = BgIkanaDharma_StartCutscene;
+}
+
+void BgIkanaDharma_StartCutscene(BgIkanaDharma* this, GlobalContext* globalCtx) {
+ if (ActorCutscene_GetCanPlayNext(this->dyna.actor.cutscene)) {
+ ActorCutscene_StartAndSetUnkLinkFields(this->dyna.actor.cutscene, &this->dyna.actor);
+ BgIkanaDharma_SetupWaitForCutsceneToEnd(this);
+ } else {
+ ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene);
+ }
+}
+
+void BgIkanaDharma_SetupWaitForCutsceneToEnd(BgIkanaDharma* this) {
+ this->cutsceneFramesRemaining = 10;
+ this->actionFunc = BgIkanaDharma_WaitForCutsceneToEnd;
+}
+
+void BgIkanaDharma_WaitForCutsceneToEnd(BgIkanaDharma* this, GlobalContext* globalCtx) {
+ if (this->cutsceneFramesRemaining > 0) {
+ this->cutsceneFramesRemaining--;
+
+ if (this->cutsceneFramesRemaining == 0) {
+ if (sFirstHitBgIkanaDharma == this) {
+ sFirstHitBgIkanaDharma = NULL;
+ }
+
+ ActorCutscene_Stop(this->dyna.actor.cutscene);
+ }
+ }
+
+ if (Math_StepToF(&this->dyna.actor.scale.y, 0.0f, 1.0f / 300.0f) != 0) {
+ Actor_MarkForDeath(&this->dyna.actor);
+ } else {
+ this->dyna.actor.scale.x = this->dyna.actor.scale.y * 3.0f;
+ this->dyna.actor.scale.z = this->dyna.actor.scale.y * 3.0f;
+ BgIkanaDharma_SpawnEffects(this, globalCtx);
+ }
+}
+
+void BgIkanaDharma_Update(Actor* thisx, GlobalContext* globalCtx) {
+ BgIkanaDharma* this = THIS;
+
+ this->actionFunc(this, globalCtx);
+ if (this->actionFunc == BgIkanaDharma_WaitForHit) {
+ DynaPolyActor* actorBelow;
+ s32 pad[2];
+
+ func_800B4AEC(globalCtx, &this->dyna.actor, 30.0f);
+ actorBelow = DynaPoly_GetActor(&globalCtx->colCtx, this->dyna.actor.floorBgId);
+ if (actorBelow == NULL) {
+ Actor_MoveWithGravity(&this->dyna.actor);
+ Actor_UpdateBgCheckInfo(globalCtx, &this->dyna.actor, 0.0f, 0.0f, 0.0f, 4);
+ if (this->dyna.actor.bgCheckFlags & 2) {
+ s16 quake = Quake_Add(globalCtx->cameraPtrs[globalCtx->activeCamera], 3);
+
+ Quake_SetSpeed(quake, 21536);
+ Quake_SetQuakeValues(quake, 4, 0, 0, 0);
+ Quake_SetCountdown(quake, 12);
+ Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND);
+ }
+ } else {
+ if (actorBelow->actor.id == ACTOR_BG_IKANA_DHARMA) {
+ this->dyna.actor.world.pos.y = actorBelow->actor.world.pos.y + 60.0f;
+ } else {
+ this->dyna.actor.world.pos.y = this->dyna.actor.floorHeight;
+ }
+
+ this->dyna.actor.velocity.y = 0.0f;
+ }
+ } else {
+ f32 wallCheckRadius = this->dyna.actor.scale.x * 300.0f;
+ wallCheckRadius = CLAMP_MIN(wallCheckRadius, 2.0f);
+
+ Actor_MoveWithGravity(&this->dyna.actor);
+ Actor_UpdateBgCheckInfo(globalCtx, &this->dyna.actor, 20.0f, wallCheckRadius, 0.0f, 5);
+ }
+
+ Actor_SetFocus(&this->dyna.actor, 40.0f);
+}
+
+void BgIkanaDharma_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ BgIkanaDharma* this = THIS;
+
+ Gfx_DrawDListOpa(globalCtx, gStoneTowerTemplePunchablePillarDL);
+}
diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h
index ddd81e7d8..bf769a1a1 100644
--- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h
+++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.h
@@ -3,15 +3,20 @@
#include "global.h"
+#define BGIKANADHARMA_GET_SWITCHFLAG(thisx) (((thisx)->params >> 8) & 0x7F)
+#define BGIKANADHARMA_IS_CHILD(thisx) (((thisx)->params >> 5) & 1)
+#define BGIKANADHARMA_NUM_SEGMENTS(thisx) ((thisx)->params & 0xF)
+#define BGIKANADHARMA_PARAMS(switchFlag, isChild, numSegments) (((switchFlag & 0x7F) << 8) | ((isChild & 1) << 5) | (numSegments & 0xF))
+
struct BgIkanaDharma;
typedef void (*BgIkanaDharmaActionFunc)(struct BgIkanaDharma*, GlobalContext*);
typedef struct BgIkanaDharma {
- /* 0x0000 */ Actor actor;
- /* 0x0144 */ char unk_144[0x64];
+ /* 0x0000 */ DynaPolyActor dyna;
+ /* 0x015C */ ColliderCylinder collider;
/* 0x01A8 */ BgIkanaDharmaActionFunc actionFunc;
- /* 0x01AC */ char unk_1AC[0x4];
+ /* 0x01AC */ s8 cutsceneFramesRemaining;
} BgIkanaDharma; // size = 0x1B0
extern const ActorInit Bg_Ikana_Dharma_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c
index a09bcba87..2c2244425 100644
--- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c
+++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_ikninside.h"
+#include "objects/object_ikninside_obj/object_ikninside_obj.h"
#define FLAGS (ACTOR_FLAG_10)
@@ -15,7 +16,8 @@ void BgIkninside_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgIkninside_Update(Actor* thisx, GlobalContext* globalCtx);
void BgIkninside_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
+void func_80C072D0(BgIkninside* this, GlobalContext* globalCtx);
+
const ActorInit Bg_Ikninside_InitVars = {
ACTOR_BG_IKNINSIDE,
ACTORCAT_BG,
@@ -28,30 +30,128 @@ const ActorInit Bg_Ikninside_InitVars = {
(ActorFunc)BgIkninside_Draw,
};
-// static ColliderCylinderInit sCylinderInit = {
-static ColliderCylinderInit D_80C076A8 = {
- { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_CYLINDER, },
- { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x80000008, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
+static Gfx* D_80C076A0[] = { object_ikninside_obj_DL_00A748, object_ikninside_obj_DL_00A5A8 };
+
+static ColliderCylinderInit sCylinderInit = {
+ {
+ COLTYPE_NONE,
+ AT_NONE,
+ AC_ON | AC_TYPE_PLAYER,
+ OC1_ON | OC1_TYPE_PLAYER,
+ OC2_TYPE_1,
+ COLSHAPE_CYLINDER,
+ },
+ {
+ ELEMTYPE_UNK0,
+ { 0x00000000, 0x00, 0x00 },
+ { 0x80000008, 0x00, 0x00 },
+ TOUCH_NONE | TOUCH_SFX_NORMAL,
+ BUMP_ON,
+ OCELEM_NONE,
+ },
{ 32, 32, 0, { 0, 0, 0 } },
};
-#endif
+void BgIkninside_Init(Actor* thisx, GlobalContext* globalCtx) {
+ BgIkninside* this = THIS;
+ CollisionHeader* colHeader = NULL;
+ s32 pad;
-extern ColliderCylinderInit D_80C076A8;
+ Actor_SetScale(&this->dyna.actor, 0.1f);
+ this->actionFunc = func_80C072D0;
+ DynaPolyActor_Init(&this->dyna, 0);
+ CollisionHeader_GetVirtual(&object_ikninside_obj_Colheader_00DE48, &colHeader);
+ this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
+ Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit);
+ Collider_UpdateCylinder(&this->dyna.actor, &this->collider);
+ if (Flags_GetSwitch(globalCtx, DMIKNINSIDE_GET_SWITCH(thisx))) {
+ Actor_MarkForDeath(&this->dyna.actor);
+ }
+}
-extern UNK_TYPE D_0600CC78;
-extern UNK_TYPE D_0600DE48;
+void BgIkninside_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ BgIkninside* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikninside/BgIkninside_Init.s")
+ Collider_DestroyCylinder(globalCtx, &this->collider);
+ DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikninside/BgIkninside_Destroy.s")
+void func_80C07220(BgIkninside* this, GlobalContext* globalCtx) {
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikninside/func_80C07220.s")
+void func_80C07230(BgIkninside* this, GlobalContext* globalCtx) {
+ if (this->dyna.actor.cutscene == -1) {
+ this->actionFunc = func_80C07220;
+ } else if (ActorCutscene_GetCurrentIndex() == 0x7C) {
+ ActorCutscene_Stop(0x7C);
+ ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene);
+ } else if (ActorCutscene_GetCanPlayNext(this->dyna.actor.cutscene)) {
+ ActorCutscene_StartAndSetUnkLinkFields(this->dyna.actor.cutscene, &this->dyna.actor);
+ this->actionFunc = func_80C07220;
+ } else {
+ ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikninside/func_80C07230.s")
+static Vec3f D_80C076D4 = { 0.0f, -1.0f, 0.0f };
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikninside/func_80C072D0.s")
+void func_80C072D0(BgIkninside* this, GlobalContext* globalCtx) {
+ s16 altitude;
+ s16 azimuth;
+ Vec3f pos;
+ Vec3f velocity;
+ f32 speed;
+ s32 i;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikninside/BgIkninside_Update.s")
+ if (this->collider.base.acFlags & AC_HIT) {
+ if ((this->collider.info.acHitInfo != NULL) && (this->collider.info.acHitInfo->toucher.dmgFlags & 0x80000000)) {
+ for (i = 0; i < 20; i++) {
+ altitude = Rand_S16Offset(0x1800, 0x2800);
+ azimuth = (u32)Rand_Next() >> 0x10;
+ speed = Rand_ZeroFloat(3.0f) + 8.0f;
+ velocity.x = speed * Math_CosS(altitude) * Math_SinS(azimuth);
+ velocity.y = speed * Math_SinS(altitude) + Rand_ZeroFloat(5.0f);
+ velocity.z = speed * Math_CosS(altitude) * Math_CosS(azimuth);
+ pos.x = Rand_ZeroFloat(10.0f) * velocity.x + this->dyna.actor.world.pos.x;
+ pos.y = Rand_ZeroFloat(1.0f) * velocity.y + this->dyna.actor.world.pos.y;
+ pos.z = Rand_ZeroFloat(10.0f) * velocity.z + this->dyna.actor.world.pos.z;
+ EffectSsHahen_Spawn(globalCtx, &pos, &velocity, &D_80C076D4, 0, 30, OBJECT_IKNINSIDE_OBJ, 25,
+ D_80C076A0[i & 1]);
+ }
+ Flags_SetSwitch(globalCtx, DMIKNINSIDE_GET_SWITCH(&this->dyna.actor));
+ this->actionFunc = func_80C07230;
+ this->dyna.actor.draw = NULL;
+ func_800C62BC(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+ } else {
+ this->timer = 20;
+ }
+ }
+ if (this->timer > 0) {
+ if ((this->timer % 2) != 0) {
+ this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 1.0f;
+ } else {
+ this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y;
+ }
+ this->timer--;
+ } else {
+ this->timer = 0;
+ this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y;
+ }
+ CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Ikninside/BgIkninside_Draw.s")
+void BgIkninside_Update(Actor* thisx, GlobalContext* globalCtx) {
+ BgIkninside* this = THIS;
+
+ this->actionFunc(this, globalCtx);
+}
+
+void BgIkninside_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+
+ gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ func_8012C28C(globalCtx->state.gfxCtx);
+ gSPDisplayList(POLY_OPA_DISP++, object_ikninside_obj_DL_00CC78);
+
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.h b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.h
index a9253f419..954b15b0c 100644
--- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.h
+++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.h
@@ -5,14 +5,16 @@
struct BgIkninside;
+#define DMIKNINSIDE_GET_SWITCH(thisx) (((thisx)->params & 0xFE00) >> 9)
+
typedef void (*BgIkninsideActionFunc)(struct BgIkninside*, GlobalContext*);
typedef struct BgIkninside {
- /* 0x0000 */ Actor actor;
- /* 0x0144 */ char unk_144[0x68];
- /* 0x01AC */ BgIkninsideActionFunc actionFunc;
+ /* 0x000 */ DynaPolyActor dyna;
+ /* 0x15C */ ColliderCylinder collider;
+ /* 0x1A8 */ UNK_TYPE1 pad_1A8[2];
+ /* 0x1AA */ s16 timer;
+ /* 0x1AC */ BgIkninsideActionFunc actionFunc;
} BgIkninside; // size = 0x1B0
-extern const ActorInit Bg_Ikninside_InitVars;
-
#endif // Z_BG_IKNINSIDE_H
diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
index 0e68e6d93..44b752e4e 100644
--- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
@@ -73,45 +73,47 @@ void func_80953B40(BgIngate* this) {
s32 temp;
if (!(gSaveContext.eventInf[3] & 0x20)) {
- this->unk180 = 0xFA0;
- this->unk168 = 4;
+ this->timePathTotalTime = 4 * 1000;
+ this->timePathTimeSpeed = 4;
} else {
- this->unk180 = 0x7D0;
- this->unk168 = 1;
+ this->timePathTotalTime = 1 * 2000;
+ this->timePathTimeSpeed = 1;
}
- temp = this->unk164->count - 2;
- this->unk184 = this->unk180 / temp;
- this->unk188 = 2;
- this->unk18C = 0;
+ temp = this->timePath->count - (SUBS_TIME_PATHING_ORDER - 1);
+ this->timePathWaypointTime = this->timePathTotalTime / temp;
+ this->timePathWaypoint = SUBS_TIME_PATHING_ORDER - 1;
+ this->timePathElapsedTime = 0;
this->unk160 &= ~0x1;
this->unk160 &= ~0x2;
}
s32 func_80953BEC(BgIngate* this) {
- f32 sp74[265];
+ f32 knots[265];
Vec3f sp68;
Vec3f sp5C;
- Vec3f unkVec;
+ Vec3f timePathTargetPos;
s16 yaw;
- func_8013AF00(sp74, 3, this->unk164->count + 3);
+ SubS_TimePathing_FillKnots(knots, SUBS_TIME_PATHING_ORDER, this->timePath->count + SUBS_TIME_PATHING_ORDER);
if (!(this->unk160 & 1)) {
- unkVec = gZeroVec3f;
- func_8013B6B0(this->unk164, &this->unk17C, &this->unk18C, this->unk184, this->unk180, &this->unk188, sp74,
- &unkVec, this->unk168);
+ timePathTargetPos = gZeroVec3f;
+ SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &timePathTargetPos, this->timePathTimeSpeed);
this->unk160 |= 1;
} else {
- unkVec = this->unk170;
+ timePathTargetPos = this->timePathTargetPos;
}
- this->dyna.actor.world.pos.x = unkVec.x;
- this->dyna.actor.world.pos.z = unkVec.z;
- this->unk170 = gZeroVec3f;
- if (func_8013B6B0(this->unk164, &this->unk17C, &this->unk18C, this->unk184, this->unk180, &this->unk188, sp74,
- &this->unk170, this->unk168) != 0) {
+ this->dyna.actor.world.pos.x = timePathTargetPos.x;
+ this->dyna.actor.world.pos.z = timePathTargetPos.z;
+ this->timePathTargetPos = gZeroVec3f;
+ if (SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &this->timePathTargetPos, this->timePathTimeSpeed)) {
this->unk160 |= 2;
} else {
sp68 = this->dyna.actor.world.pos;
- sp5C = this->unk170;
+ sp5C = this->timePathTargetPos;
yaw = Math_Vec3f_Yaw(&sp68, &sp5C);
this->dyna.actor.world.rot.y = yaw;
this->dyna.actor.shape.rot.y = yaw;
@@ -164,7 +166,7 @@ void func_80953F14(BgIngate* this, GlobalContext* globalCtx) {
player->actor.focus.rot.y = player->actor.shape.rot.y;
this->unk160 |= 0x10;
func_80953DA8(this, globalCtx);
- if (this->unk164 != NULL) {
+ if (this->timePath != NULL) {
func_80953B40(this);
}
this->unk16E = -1;
@@ -188,7 +190,7 @@ void func_80953F9C(BgIngate* this, GlobalContext* globalCtx) {
if (this->unk160 & 2) {
- if (this->unk164->unk1 != 0xFF) {
+ if (this->timePath->unk1 != 0xFF) {
func_80953E38(globalCtx);
func_800B7298(globalCtx, &this->dyna.actor, 7);
this->dyna.actor.textId = 0x9E4;
@@ -205,7 +207,7 @@ void func_80953F9C(BgIngate* this, GlobalContext* globalCtx) {
}
this->actionFunc = func_809542A0;
}
- } else if ((ActorCutscene_GetCurrentIndex() == -1) && (this->unk164 != NULL)) {
+ } else if ((ActorCutscene_GetCurrentIndex() == -1) && (this->timePath != NULL)) {
Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_CRUISER - SFX_FLAG);
func_80953BEC(this);
}
@@ -259,9 +261,9 @@ void func_809542A0(BgIngate* this, GlobalContext* globalCtx) {
void func_80954340(BgIngate* this, GlobalContext* globalCtx) {
if (!DECR(this->unk16A)) {
- if (this->unk164 != NULL) {
+ if (this->timePath != NULL) {
func_800B7298(globalCtx, &this->dyna.actor, 6);
- this->unk164 = &globalCtx->setupPathList[this->unk164->unk1];
+ this->timePath = &globalCtx->setupPathList[this->timePath->unk1];
func_80953F14(this, globalCtx);
func_800FE484();
}
@@ -285,8 +287,8 @@ void func_809543D4(BgIngate* this, GlobalContext* globalCtx) {
func_800FE498();
func_8019F208();
} else {
- if (this->unk164 != NULL) {
- this->unk164 = &globalCtx->setupPathList[this->unk164->unk1];
+ if (this->timePath != NULL) {
+ this->timePath = &globalCtx->setupPathList[this->timePath->unk1];
}
func_80953F14(this, globalCtx);
gSaveContext.save.weekEventReg[90] &= (u8)~0x40;
@@ -327,7 +329,7 @@ void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx2) {
this->unk160 |= 0x8;
this->unk160 |= 0x10;
Actor_SetScale(&this->dyna.actor, 1.0f);
- this->unk164 = SubS_GetAdditionalPath(globalCtx, BGINGATE_GET_FF(&this->dyna.actor), 0);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, BGINGATE_GET_FF(&this->dyna.actor), 0);
this->dyna.actor.room = -1;
if (gSaveContext.save.weekEventReg[20] & 2) {
gSaveContext.save.weekEventReg[90] &= (u8)~0x40;
@@ -349,9 +351,9 @@ void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx2) {
this->actionFunc = func_80953F8C;
}
}
- this->unk164 = SubS_GetAdditionalPath(globalCtx, BGINGATE_GET_FF(&this->dyna.actor), phi_a2);
- if (this->unk164 != NULL) {
- sp38 = Lib_SegmentedToVirtual(this->unk164->points);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, BGINGATE_GET_FF(&this->dyna.actor), phi_a2);
+ if (this->timePath != NULL) {
+ sp38 = Lib_SegmentedToVirtual(this->timePath->points);
Math_Vec3s_ToVec3f(&sp2C, &sp38[0]);
Math_Vec3s_ToVec3f(&sp20, &sp38[1]);
this->dyna.actor.world.rot.y = Math_Vec3f_Yaw(&sp2C, &sp20);
@@ -360,7 +362,7 @@ void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx2) {
this->dyna.actor.world.pos.y = -15.0f;
this->dyna.actor.world.pos.z = sp2C.z;
}
- this->unk164 = SubS_GetAdditionalPath(globalCtx, BGINGATE_GET_FF(&this->dyna.actor), 0);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, BGINGATE_GET_FF(&this->dyna.actor), 0);
} else {
Actor_MarkForDeath(&this->dyna.actor);
}
diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
index 08d062e6c..81b7bec9b 100644
--- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
+++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
@@ -13,17 +13,17 @@ typedef struct BgIngate {
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ BgIngateActionFunc actionFunc;
/* 0x160 */ u16 unk160;
- /* 0x164 */ Path* unk164;
- /* 0x168 */ s16 unk168;
+ /* 0x164 */ Path* timePath;
+ /* 0x168 */ s16 timePathTimeSpeed;
/* 0x16A */ s16 unk16A;
/* 0x16C */ s16 unk16C;
/* 0x16E */ s16 unk16E;
- /* 0x170 */ Vec3f unk170;
- /* 0x17C */ f32 unk17C;
- /* 0x180 */ s32 unk180;
- /* 0x184 */ s32 unk184;
- /* 0x188 */ s32 unk188;
- /* 0x18C */ s32 unk18C;
+ /* 0x170 */ Vec3f timePathTargetPos;
+ /* 0x17C */ f32 timePathProgress;
+ /* 0x180 */ s32 timePathTotalTime;
+ /* 0x184 */ s32 timePathWaypointTime;
+ /* 0x188 */ s32 timePathWaypoint;
+ /* 0x18C */ s32 timePathElapsedTime;
} BgIngate; // size = 0x190
extern const ActorInit Bg_Ingate_InitVars;
diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c
index 0e7488a9a..24f18bb2f 100644
--- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c
+++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c
@@ -5,6 +5,7 @@
*/
#include "z_bg_keikoku_saku.h"
+#include "objects/object_keikoku_obj/object_keikoku_obj.h"
#define FLAGS 0x00000000
@@ -15,7 +16,10 @@ void BgKeikokuSaku_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgKeikokuSaku_Update(Actor* thisx, GlobalContext* globalCtx);
void BgKeikokuSaku_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
+void func_80A5389C(BgKeikokuSaku* this, GlobalContext* globalCtx);
+void func_80A538E0(BgKeikokuSaku* this, GlobalContext* globalCtx);
+void func_80A53994(BgKeikokuSaku* this, GlobalContext* globalCtx);
+
const ActorInit Bg_Keikoku_Saku_InitVars = {
ACTOR_BG_KEIKOKU_SAKU,
ACTORCAT_ITEMACTION,
@@ -28,21 +32,71 @@ const ActorInit Bg_Keikoku_Saku_InitVars = {
(ActorFunc)BgKeikokuSaku_Draw,
};
-#endif
+void BgKeikokuSaku_Init(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ BgKeikokuSaku* this = THIS;
+ CollisionHeader* colHeader = NULL;
-extern UNK_TYPE D_06001640;
-extern UNK_TYPE D_06002300;
+ DynaPolyActor_Init(&this->dyna, 0);
+ CollisionHeader_GetVirtual(&object_keikoku_obj_Colheader_002300, &colHeader);
+ this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
+ this->switchFlag = BGKEIKOKUSAKU_GET_SWITCHFLAG(thisx);
+ if (Flags_GetSwitch(globalCtx, this->switchFlag)) {
+ this->dyna.actor.world.pos.z = 2659.0f;
+ } else {
+ this->actionFunc = func_80A5389C;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku/BgKeikokuSaku_Init.s")
+void BgKeikokuSaku_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ BgKeikokuSaku* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku/BgKeikokuSaku_Destroy.s")
+ DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku/func_80A5389C.s")
+void func_80A5389C(BgKeikokuSaku* this, GlobalContext* globalCtx) {
+ if (Flags_GetSwitch(globalCtx, this->switchFlag)) {
+ this->actionFunc = func_80A538E0;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku/func_80A538E0.s")
+void func_80A538E0(BgKeikokuSaku* this, GlobalContext* globalCtx) {
+ Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_METALGATE_OPEN - SFX_FLAG);
+ this->dyna.actor.world.pos.z -= 2.0f + BREG(8);
+ if (this->dyna.actor.world.pos.z < (BREG(9) + 2660.0f)) {
+ Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN_STOP);
+ this->timer = 30;
+ this->actionFunc = func_80A53994;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku/func_80A53994.s")
+void func_80A53994(BgKeikokuSaku* this, GlobalContext* globalCtx) {
+ if (this->timer == 0) {
+ this->actionFunc = func_80A5389C;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku/BgKeikokuSaku_Update.s")
+void BgKeikokuSaku_Update(Actor* thisx, GlobalContext* globalCtx) {
+ BgKeikokuSaku* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Keikoku_Saku/BgKeikokuSaku_Draw.s")
+ if (this->timer) {
+ this->timer--;
+ }
+ this->dyna.actor.world.pos.x = BREG(5) + this->dyna.actor.home.pos.x;
+ this->dyna.actor.world.pos.y = BREG(6) + this->dyna.actor.home.pos.y;
+ this->dyna.actor.world.pos.z = BREG(7) + this->dyna.actor.home.pos.z;
+ this->dyna.actor.scale.x = (BREG(10) / 1000.0f) + 0.1f;
+ this->dyna.actor.scale.y = (BREG(11) / 1000.0f) + 0.1f;
+ this->dyna.actor.scale.z = (BREG(12) / 1000.0f) + 0.1f;
+ this->actionFunc(this, globalCtx);
+}
+
+void BgKeikokuSaku_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+
+ func_8012C2DC(globalCtx->state.gfxCtx);
+ gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ gSPDisplayList(POLY_XLU_DISP++, object_keikoku_obj_DL_001640);
+
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h
index 6092edcb4..8fa663460 100644
--- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h
+++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.h
@@ -3,17 +3,18 @@
#include "global.h"
+#define BGKEIKOKUSAKU_GET_SWITCHFLAG(thisx) ((thisx)->params & 0x7F)
+
struct BgKeikokuSaku;
typedef void (*BgKeikokuSakuActionFunc)(struct BgKeikokuSaku*, GlobalContext*);
typedef struct BgKeikokuSaku {
- /* 0x0000 */ Actor actor;
- /* 0x0144 */ char unk_144[0x18];
- /* 0x015C */ BgKeikokuSakuActionFunc actionFunc;
- /* 0x0160 */ char unk_160[0x4];
-} BgKeikokuSaku; // size = 0x164
-
+ /* 0x000 */ DynaPolyActor dyna;
+ /* 0x15C */ BgKeikokuSakuActionFunc actionFunc;
+ /* 0x160 */ s16 switchFlag;
+ /* 0x162 */ s16 timer;
+} BgKeikokuSaku; // Size = 0x164
extern const ActorInit Bg_Keikoku_Saku_InitVars;
#endif // Z_BG_KEIKOKU_SAKU_H
diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
index 71f1d2b6a..ccf8e2d43 100644
--- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
+++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c
@@ -47,7 +47,7 @@ void BgLotus_Init(Actor* thisx, GlobalContext* globalCtx) {
this->dyna.actor.floorHeight = BgCheck_EntityRaycastFloor5(&globalCtx->colCtx, &thisx->floorPoly, &bgId,
&this->dyna.actor, &this->dyna.actor.world.pos);
this->timer2 = 96;
- this->dyna.actor.world.rot.y = Rand_Next() >> 0x10;
+ this->dyna.actor.world.rot.y = (s32)Rand_Next() >> 0x10;
this->actionFunc = BgLotus_Wait;
}
@@ -82,7 +82,7 @@ void BgLotus_Wait(BgLotus* this, GlobalContext* globalCtx) {
if (this->timer2 == 0) {
this->timer2 = 96;
- this->dyna.actor.world.rot.y += (s16)(Rand_Next() >> 0x12);
+ this->dyna.actor.world.rot.y += (s16)((s32)Rand_Next() >> 0x12);
}
}
diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c
index bbd1062f2..1e2726aea 100644
--- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c
+++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c
@@ -32,15 +32,15 @@ void func_809DD2F8(GlobalContext* globalCtx);
void func_809DD934(Boss02* this, GlobalContext* globalCtx);
void func_809DEAC4(Boss02* this, GlobalContext* globalCtx);
-static u8 D_809E0420;
-static u8 D_809E0421;
-static u8 D_809E0422;
-static Boss02* D_809E0424;
-static Boss02* D_809E0428;
-static Boss02* D_809E042C;
-static u8 D_809E0430;
-static DoorWarp1* D_809E0434;
-static Boss02Effects D_809E0438[150];
+u8 D_809E0420;
+u8 D_809E0421;
+u8 D_809E0422;
+Boss02* D_809E0424;
+Boss02* D_809E0428;
+Boss02* D_809E042C;
+u8 D_809E0430;
+DoorWarp1* D_809E0434;
+Boss02Effects D_809E0438[150];
static DamageTable sDamageTable1 = {
/* Deku Nut */ DMG_ENTRY(0, 0x0),
@@ -1664,7 +1664,7 @@ void func_809DD934(Boss02* this, GlobalContext* globalCtx) {
case 1:
if ((this->unk_1D14 < 80U) && (D_809E0420 != 0) &&
- CHECK_BTN_ANY(CONTROLLER1(globalCtx)->press.button,
+ CHECK_BTN_ANY(CONTROLLER1(&globalCtx->state)->press.button,
BTN_A | BTN_B | BTN_CUP | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT)) {
this->unk_1D18++;
this->unk_1D78 = 1;
@@ -1713,7 +1713,7 @@ void func_809DD934(Boss02* this, GlobalContext* globalCtx) {
case 10:
if ((this->unk_1D14 < 30U) && (D_809E0421 != 0) &&
- CHECK_BTN_ANY(CONTROLLER1(globalCtx)->press.button,
+ CHECK_BTN_ANY(CONTROLLER1(&globalCtx->state)->press.button,
BTN_A | BTN_B | BTN_CUP | BTN_CDOWN | BTN_CLEFT | BTN_CRIGHT)) {
this->unk_1D18++;
this->unk_1D78 = 1;
diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c
index 1959ba26b..9691940d1 100644
--- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c
+++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c
@@ -848,7 +848,7 @@ void Boss03_SetupChewPlayer(Boss03* this, GlobalContext* globalCtx) {
void Boss03_ChewPlayer(Boss03* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
- Input* input = CONTROLLER1(globalCtx);
+ Input* input = CONTROLLER1(&globalCtx->state);
f32 jawZRotTarget;
f32 xDiff;
f32 yDiff;
diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h
index 3b5882692..3aa7d122a 100644
--- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h
+++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h
@@ -7,21 +7,23 @@ struct BossHakugin;
typedef void (*BossHakuginActionFunc)(struct BossHakugin*, GlobalContext*);
-typedef struct BossHakuginParticle {
+typedef struct BossHakuginEffect {
/* 0x00 */ Vec3f unk_0;
/* 0x0C */ Vec3f unk_C;
/* 0x18 */ s16 unk_18;
/* 0x1A */ s16 unk_1A;
/* 0x1C */ Vec3s unk_1C;
/* 0x24 */ f32 unk_24;
-} BossHakuginParticle; // size = 0x28
+} BossHakuginEffect; // size = 0x28
+
+#define BOSS_HAKUGIN_EFFECT_COUNT 180
typedef struct BossHakugin {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_0144[0x44];
/* 0x0188 */ BossHakuginActionFunc actionFunc;
/* 0x018C */ char unk_018C[0x86C];
- /* 0x09F8 */ BossHakuginParticle unk_9F8[180];
+ /* 0x09F8 */ BossHakuginEffect unk_9F8[BOSS_HAKUGIN_EFFECT_COUNT];
/* 0x2618 */ char unk_2618[0x11F8];
} BossHakugin; // size = 0x3810
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index 48ef3cd3d..01e8852fc 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -38,59 +38,64 @@ const ActorInit Demo_Effect_InitVars = {
};
void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx) {
- static s16 D_808CE2C0[] = {
+ static s16 sEffectTypeObjects[] = {
OBJECT_EFC_TW, OBJECT_EFC_TW, OBJECT_EFC_TW, OBJECT_EFC_TW, GAMEPLAY_KEEP,
GAMEPLAY_KEEP, GAMEPLAY_KEEP, GAMEPLAY_KEEP, GAMEPLAY_KEEP,
};
s32 pad;
DemoEffect* this = THIS;
- s32 sp3C = DEMOEFFECT_GET_FF(&this->actor);
- s32 phi_v1;
+ s32 type = DEMO_EFFECT_GET_TYPE(&this->actor);
+ s32 objectIndex;
s32 pad2;
- Color_RGB8 sp24[] = {
+ Color_RGB8 colors[] = {
{ 200, 200, 0 }, { 255, 40, 100 }, { 50, 255, 0 }, { 0, 0, 255 }, { 255, 255, 80 },
};
- if (D_808CE2C0[sp3C] == 1) {
- phi_v1 = 0;
+ if (sEffectTypeObjects[type] == GAMEPLAY_KEEP) {
+ objectIndex = 0;
} else {
- phi_v1 = Object_GetIndex(&globalCtx->objectCtx, D_808CE2C0[sp3C]);
+ objectIndex = Object_GetIndex(&globalCtx->objectCtx, sEffectTypeObjects[type]);
}
- if (phi_v1 >= 0) {
- this->unk_164 = phi_v1;
+ if (objectIndex < 0) {
+ // assert on debug
+ } else {
+ this->initObjectIndex = objectIndex;
}
Actor_SetScale(&this->actor, 0.2f);
- switch (sp3C) {
- case 0:
- case 1:
+ switch (type) {
+ case DEMO_EFFECT_TYPE_0:
+ case DEMO_EFFECT_TYPE_1:
this->actor.flags |= ACTOR_FLAG_2000000;
- case 2:
- case 3:
- this->unk_174 = func_808CDFF8;
- this->unk_170 = func_808CD998;
- this->unk_168[0] = 0;
- this->unk_168[1] = 100;
- this->unk_168[2] = 255;
+ case DEMO_EFFECT_TYPE_2:
+ case DEMO_EFFECT_TYPE_3:
+ this->initDrawFunc = func_808CDFF8;
+ this->initActionFunc = func_808CD998;
+ this->envXluColor[0] = 0;
+ this->envXluColor[1] = 100;
+ this->envXluColor[2] = 255;
SkelCurve_Clear(&this->skelCurve);
- this->unk_16C = 0;
+ this->timer = 0;
break;
- case 4:
- case 5:
- case 6:
- case 7:
- case 8:
- this->unk_168[0] = sp24[sp3C - 4].r;
- this->unk_168[1] = sp24[sp3C - 4].g;
- this->unk_168[2] = sp24[sp3C - 4].b;
+ case DEMO_EFFECT_TYPE_4:
+ case DEMO_EFFECT_TYPE_5:
+ case DEMO_EFFECT_TYPE_6:
+ case DEMO_EFFECT_TYPE_7:
+ case DEMO_EFFECT_TYPE_8:
+ this->envXluColor[0] = colors[type - 4].r;
+ this->envXluColor[1] = colors[type - 4].g;
+ this->envXluColor[2] = colors[type - 4].b;
Actor_SetScale(&this->actor, 0.0f);
- this->unk_174 = func_808CE078;
- this->unk_170 = func_808CDDE0;
- this->unk_16C = 0;
+ this->initDrawFunc = func_808CE078;
+ this->initActionFunc = func_808CDDE0;
+ this->timer = 0;
+ break;
+
+ default:
break;
}
@@ -98,33 +103,32 @@ void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc = func_808CD940;
}
-u8 D_808CE2D4[] = {
- 1, 1, 2, 0, 1, 1, 2, 0, 1, 2, 0, 2, 1, 0, 1, 0, 2, 0, 2, 2, 0,
-};
-
void DemoEffect_Destroy(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
- switch (DEMOEFFECT_GET_FF(&this->actor)) {
- case 0:
- case 1:
- case 2:
- case 3:
+ switch (DEMO_EFFECT_GET_TYPE(&this->actor)) {
+ case DEMO_EFFECT_TYPE_0:
+ case DEMO_EFFECT_TYPE_1:
+ case DEMO_EFFECT_TYPE_2:
+ case DEMO_EFFECT_TYPE_3:
SkelCurve_Destroy(globalCtx, &this->skelCurve);
break;
+
+ default:
+ break;
}
}
void func_808CD940(DemoEffect* this, GlobalContext* globalCtx) {
- if (Object_IsLoaded(&globalCtx->objectCtx, this->unk_164)) {
- this->actor.objBankIndex = this->unk_164;
- this->actor.draw = this->unk_174;
- this->actionFunc = this->unk_170;
+ if (Object_IsLoaded(&globalCtx->objectCtx, this->initObjectIndex)) {
+ this->actor.objBankIndex = this->initObjectIndex;
+ this->actor.draw = this->initDrawFunc;
+ this->actionFunc = this->initActionFunc;
}
}
void func_808CD998(DemoEffect* this, GlobalContext* globalCtx) {
- s32 sp34 = DEMOEFFECT_GET_FF(&this->actor);
+ s32 type = DEMO_EFFECT_GET_TYPE(&this->actor);
if (SkelCurve_Init(globalCtx, &this->skelCurve, &object_efc_tw_Skel_0012E8, &object_efc_tw_CurveAnim_000050)) {}
@@ -132,20 +136,20 @@ void func_808CD998(DemoEffect* this, GlobalContext* globalCtx) {
SkelCurve_Update(globalCtx, &this->skelCurve);
this->actionFunc = func_808CDCEC;
- switch (sp34) {
- case 0:
+ switch (type) {
+ case DEMO_EFFECT_TYPE_0:
Actor_SetScale(&this->actor, 0.16800001f);
break;
- case 1:
+ case DEMO_EFFECT_TYPE_1:
Actor_SetScale(&this->actor, 0.08400001f);
break;
- case 2:
+ case DEMO_EFFECT_TYPE_2:
Actor_SetScale(&this->actor, 0.16800001f);
break;
- case 3:
+ case DEMO_EFFECT_TYPE_3:
Actor_SetScale(&this->actor, 0.28f);
break;
@@ -155,53 +159,57 @@ void func_808CD998(DemoEffect* this, GlobalContext* globalCtx) {
}
}
-void func_808CDAD0(f32 arg0) {
+void func_808CDAD0(f32 alphaScale) {
+ static u8 sAlphaTypes[] = { 1, 1, 2, 0, 1, 1, 2, 0, 1, 2, 0, 2, 1, 0, 1, 0, 2, 0, 2, 2, 0 };
+ Vtx* vtx = Lib_SegmentedToVirtual(object_efc_tw_Vtx_000060);
s32 i;
- Vtx* temp_v0 = Lib_SegmentedToVirtual(object_efc_tw_Vtx_000060);
- u8 sp24[3];
+ u8 alphas[3];
- sp24[0] = 0;
- sp24[1] = (s8)(202.0f * arg0);
- sp24[2] = (s8)(255.0f * arg0);
+ alphas[0] = 0;
+ alphas[1] = (s32)(202.0f * alphaScale);
+ alphas[2] = (s32)(255.0f * alphaScale);
- for (i = 0; i < ARRAY_COUNT(D_808CE2D4); i++) {
- if (D_808CE2D4[i] != 0) {
- temp_v0[i].v.cn[3] = sp24[D_808CE2D4[i]];
+ for (i = 0; i < ARRAY_COUNT(sAlphaTypes); i++) {
+ if (sAlphaTypes[i] != 0) {
+ vtx[i].v.cn[3] = alphas[sAlphaTypes[i]];
}
}
}
void func_808CDBDC(DemoEffect* this, GlobalContext* globalCtx) {
- s32 params = DEMOEFFECT_GET_FF(&this->actor);
- f32 temp_f0;
- f32 temp_f12;
+ s32 type = DEMO_EFFECT_GET_TYPE(&this->actor);
+ f32 scale;
+ f32 alphaScale;
- this->unk_16C++;
- if (this->unk_16C <= 100) {
- temp_f12 = (100 - this->unk_16C) * 0.01f;
- temp_f0 = temp_f12 * 0.14f;
+ this->timer++;
+ if (this->timer <= 100) {
+ alphaScale = (100 - this->timer) * 0.01f;
+ scale = alphaScale * 0.14f;
- switch (params) {
- case 0:
- temp_f0 *= 1.2f;
+ switch (type) {
+ case DEMO_EFFECT_TYPE_0:
+ scale *= 1.2f;
break;
- case 1:
- temp_f0 *= 0.6f;
+ case DEMO_EFFECT_TYPE_1:
+ scale *= 0.6f;
break;
- case 2:
- temp_f0 *= 1.2f;
+ case DEMO_EFFECT_TYPE_2:
+ scale *= 1.2f;
break;
- case 3:
- temp_f0 *= 2.0f;
+ case DEMO_EFFECT_TYPE_3:
+ scale *= 2.0f;
+ break;
+
+ default:
break;
}
- this->actor.scale.x = temp_f0;
- this->actor.scale.z = temp_f0;
- func_808CDAD0(temp_f12);
+ this->actor.scale.x = scale;
+ this->actor.scale.z = scale;
+ func_808CDAD0(alphaScale);
func_800B8FE8(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG);
} else {
func_808CDAD0(1.0f);
@@ -215,14 +223,14 @@ void func_808CDCEC(DemoEffect* this, GlobalContext* globalCtx) {
if (SkelCurve_Update(globalCtx, &this->skelCurve)) {
SkelCurve_SetAnim(&this->skelCurve, &object_efc_tw_CurveAnim_000050, 1.0f, 60.0f, 59.0f, 0.0f);
this->actionFunc = func_808CDBDC;
- this->unk_16C = 0;
+ this->timer = 0;
}
}
void func_808CDD70(DemoEffect* this, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, this->actor.scale.x - 0.02f);
- this->unk_16C++;
+ this->timer++;
if (this->actor.scale.x < 0.02f) {
Actor_MarkForDeath(&this->actor);
}
@@ -231,8 +239,8 @@ void func_808CDD70(DemoEffect* this, GlobalContext* globalCtx) {
void func_808CDDE0(DemoEffect* this, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, (this->actor.scale.x * 0.5f) + 0.2f);
- this->unk_16C++;
- if (this->unk_16C >= 3) {
+ this->timer++;
+ if (this->timer >= 3) {
this->actionFunc = func_808CDD70;
}
}
@@ -243,29 +251,28 @@ void DemoEffect_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
}
-s32 func_808CDE78(GlobalContext* globalCtx, SkelAnimeCurve* skelCuve, s32 limbIndex, Actor* thisx) {
+s32 func_808CDE78(GlobalContext* globalCtx, SkelCurve* skelCurve, s32 limbIndex, Actor* thisx) {
s32 pad;
DemoEffect* this = THIS;
- u32 sp4C = globalCtx->gameplayFrames;
+ u32 frames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C2DC(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 170, 255, 255, 255);
- gDPSetEnvColor(POLY_XLU_DISP++, this->unk_168[0], this->unk_168[1], this->unk_168[2], 255);
+ gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255);
gSPSegment(POLY_XLU_DISP++, 0x08,
- Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (sp4C * 6) % 1024, 255 - ((sp4C * 16) % 256), 0x100, 0x40,
- 1, (sp4C * 4) % 512, 127 - ((sp4C * 12) % 128), 0x80, 0x20));
+ Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 6) % 1024, 255 - ((frames * 16) % 256), 0x100,
+ 0x40, 1, (frames * 4) % 512, 127 - ((frames * 12) % 128), 0x80, 0x20));
CLOSE_DISPS(globalCtx->state.gfxCtx);
if (limbIndex == 0) {
- LimbTransform* transform = skelCuve->transforms;
+ s16* transform = skelCurve->jointTable[0];
- transform->scale.x = 0x400;
- transform->scale.y = 0x400;
- transform->scale.z = transform->scale.x;
+ transform[2] = transform[0] = 1024;
+ transform[1] = 1024;
}
return true;
@@ -288,24 +295,24 @@ void func_808CDFF8(Actor* thisx, GlobalContext* globalCtx) {
void func_808CE078(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
DemoEffect* this = THIS;
- s16 sp46 = (this->unk_16C * 0x400) & 0xFFFF;
+ s16 zRot = (this->timer * 0x400) & 0xFFFF;
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C2DC(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, 255);
- gDPSetEnvColor(POLY_XLU_DISP++, this->unk_168[0], this->unk_168[1], this->unk_168[2], 255);
+ gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255);
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_Push();
- Matrix_RotateZS(sp46, MTXMODE_APPLY);
+ Matrix_RotateZS(zRot, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023288);
Matrix_Pop();
- Matrix_RotateZS(sp46 * -1, MTXMODE_APPLY);
+ Matrix_RotateZS(-zRot, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023288);
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
index 8216708c5..775bfcb0f 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
@@ -2,24 +2,35 @@
#define Z_DEMO_EFFECT_H
#include "global.h"
+#include "z64curve.h"
struct DemoEffect;
typedef void (*DemoEffectActionFunc)(struct DemoEffect*, GlobalContext*);
-typedef void (*DemoEffectUnkFunc)(struct DemoEffect*, GlobalContext*);
-typedef void (*DemoEffectUnkFunc2)(Actor*, GlobalContext*);
-#define DEMOEFFECT_GET_FF(thisx) ((thisx)->params & 0xFF)
+#define DEMO_EFFECT_GET_TYPE(thisx) ((thisx)->params & 0xFF)
+
+typedef enum {
+ /* 0 */ DEMO_EFFECT_TYPE_0,
+ /* 1 */ DEMO_EFFECT_TYPE_1,
+ /* 2 */ DEMO_EFFECT_TYPE_2,
+ /* 3 */ DEMO_EFFECT_TYPE_3,
+ /* 4 */ DEMO_EFFECT_TYPE_4,
+ /* 5 */ DEMO_EFFECT_TYPE_5,
+ /* 6 */ DEMO_EFFECT_TYPE_6,
+ /* 7 */ DEMO_EFFECT_TYPE_7,
+ /* 8 */ DEMO_EFFECT_TYPE_8
+} DemoEffectType;
typedef struct DemoEffect {
/* 0x0000 */ Actor actor;
- /* 0x0144 */ SkelAnimeCurve skelCurve;
- /* 0x0164 */ u8 unk_164;
- /* 0x0165 */ UNK_TYPE1 unk_165[3];
- /* 0x0168 */ u8 unk_168[3];
- /* 0x016C */ s16 unk_16C;
- /* 0x0170 */ DemoEffectUnkFunc unk_170;
- /* 0x0174 */ DemoEffectUnkFunc2 unk_174;
+ /* 0x0144 */ SkelCurve skelCurve;
+ /* 0x0164 */ u8 initObjectIndex;
+ /* 0x0165 */ u8 primXluColor[3];
+ /* 0x0168 */ u8 envXluColor[3];
+ /* 0x016C */ s16 timer;
+ /* 0x0170 */ DemoEffectActionFunc initActionFunc;
+ /* 0x0174 */ ActorFunc initDrawFunc;
/* 0x0178 */ DemoEffectActionFunc actionFunc;
} DemoEffect; // size = 0x17C
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 2c676abbf..179d480de 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -1,7 +1,7 @@
/*
* File: z_demo_kankyo.c
* Overlay: ovl_Demo_Kankyo
- * Description: Background Lost Woods/Giant's Chamber/Moon Particles
+ * Description: Background Lost Woods/Giant's Chamber/Moon Effects
*/
#include "z_demo_kankyo.h"
@@ -44,7 +44,7 @@ void DemoKakyo_LostWoodsSparkleActionFunc(DemoKankyo* this, GlobalContext* globa
s32 pad;
s32 i;
f32 randSkyfishParticleNum;
- f32 repositionLimit; // Distance from posCenter when particles are relocated. Always set to 130.0f
+ f32 repositionLimit; // Distance from posCenter when effects are relocated. Always set to 130.0f
f32 eyeToAtNormX;
f32 eyeToAtNormY;
f32 eyeToAtNormZ;
@@ -61,13 +61,13 @@ void DemoKakyo_LostWoodsSparkleActionFunc(DemoKankyo* this, GlobalContext* globa
} else {
Actor_MarkForDeath(&this->actor);
}
- } else if (globalCtx->envCtx.unk_F2[3] < DEMOKANKYO_PARTICLE_COUNT) {
+ } else if (globalCtx->envCtx.unk_F2[3] < DEMOKANKYO_EFFECT_COUNT) {
globalCtx->envCtx.unk_F2[3] += 16;
}
// note: DemoKankyo can crash if placed in an area that snows (ObjectKankyo)
- // because they both use unk_F2 as a particle counter,
- // causing DemoKankyo to write beyond its particle array boundry
+ // because they both use unk_F2 as an effect counter,
+ // causing DemoKankyo to write beyond its efffect array boundry
// this crash can occur if the two actors are in different scenes connected by an exit
// e.g. if you add DemoKankyo to GoronShrine, you will crash entering/leaving through door
for (i = 0; i < globalCtx->envCtx.unk_F2[3]; i++) {
@@ -81,53 +81,53 @@ void DemoKakyo_LostWoodsSparkleActionFunc(DemoKankyo* this, GlobalContext* globa
eyeToAtNormY = eyeToAt.y / eyeToAtMag;
eyeToAtNormZ = eyeToAt.z / eyeToAtMag;
- switch (this->particles[i].state) {
+ switch (this->effects[i].state) {
case DEMO_KANKYO_STATE_INIT:
- this->particles[i].posBase.x = globalCtx->view.eye.x + (eyeToAtNormX * 80.0f);
- this->particles[i].posBase.y = globalCtx->view.eye.y + (eyeToAtNormY * 80.0f);
- this->particles[i].posBase.z = globalCtx->view.eye.z + (eyeToAtNormZ * 80.0f);
+ this->effects[i].posBase.x = globalCtx->view.eye.x + (eyeToAtNormX * 80.0f);
+ this->effects[i].posBase.y = globalCtx->view.eye.y + (eyeToAtNormY * 80.0f);
+ this->effects[i].posBase.z = globalCtx->view.eye.z + (eyeToAtNormZ * 80.0f);
- this->particles[i].posOffset.x = (Rand_ZeroOne() - 0.5f) * 160.0f;
- this->particles[i].posOffset.y = 30.0f;
- this->particles[i].posOffset.z = (Rand_ZeroOne() - 0.5f) * 160.0f;
+ this->effects[i].posOffset.x = (Rand_ZeroOne() - 0.5f) * 160.0f;
+ this->effects[i].posOffset.y = 30.0f;
+ this->effects[i].posOffset.z = (Rand_ZeroOne() - 0.5f) * 160.0f;
- this->particles[i].speedTarget = (Rand_ZeroOne() * 1.6f) + 0.5f;
- this->particles[i].alpha = 0;
- this->particles[i].alphaClock = Rand_ZeroOne() * 65535; // random 0 to max of u16
- this->particles[i].scale = 0.1f;
+ this->effects[i].speedTarget = (Rand_ZeroOne() * 1.6f) + 0.5f;
+ this->effects[i].alpha = 0;
+ this->effects[i].alphaClock = Rand_ZeroOne() * 65535; // random 0 to max of u16
+ this->effects[i].scale = 0.1f;
// speedClock is angles in radians,
// should have used Rand_ZeroOne() * 2 * M_PI
// however, due to properties of sine waves, this is effectively still random
- this->particles[i].speedClock.x = Rand_ZeroOne() * 360.0f;
- this->particles[i].speedClock.y = Rand_ZeroOne() * 360.0f;
- this->particles[i].speedClock.z = Rand_ZeroOne() * 360.0f;
- this->particles[i].pad50 = 0;
- this->particles[i].state += DEMO_KANKYO_STATE_SINGLE;
+ this->effects[i].speedClock.x = Rand_ZeroOne() * 360.0f;
+ this->effects[i].speedClock.y = Rand_ZeroOne() * 360.0f;
+ this->effects[i].speedClock.z = Rand_ZeroOne() * 360.0f;
+ this->effects[i].pad50 = 0;
+ this->effects[i].state += DEMO_KANKYO_STATE_SINGLE;
break;
case DEMO_KANKYO_STATE_SINGLE:
case DEMO_KANKYO_STATE_SKYFISH:
- this->particles[i].alphaClock++;
+ this->effects[i].alphaClock++;
posCenterX = globalCtx->view.eye.x + (eyeToAtNormX * 80.0f);
posCenterY = globalCtx->view.eye.y + (eyeToAtNormY * 80.0f);
posCenterZ = globalCtx->view.eye.z + (eyeToAtNormZ * 80.0f);
- this->particles[i].posOffsetPrev.x = this->particles[i].posOffset.x;
- this->particles[i].posOffsetPrev.y = this->particles[i].posOffset.y;
- this->particles[i].posOffsetPrev.z = this->particles[i].posOffset.z;
+ this->effects[i].posOffsetPrev.x = this->effects[i].posOffset.x;
+ this->effects[i].posOffsetPrev.y = this->effects[i].posOffset.y;
+ this->effects[i].posOffsetPrev.z = this->effects[i].posOffset.z;
- if (this->particles[i].state == DEMO_KANKYO_STATE_SINGLE) {
+ if (this->effects[i].state == DEMO_KANKYO_STATE_SINGLE) {
- // The first 32 particles will become skyfish particles
+ // The first 32 effects will become skyfish particles
// This block is also init code and only runs once
if (i < 32) {
if (Rand_ZeroOne() < 0.5f) {
- this->particles[i].LostWoodsSkyFishSpeedXZ = (s16)(Rand_ZeroOne() * 200.0f) + 200;
+ this->effects[i].LostWoodsSkyFishSpeedXZ = (s16)(Rand_ZeroOne() * 200.0f) + 200;
} else {
- this->particles[i].LostWoodsSkyFishSpeedXZ = -200 - (s16)(Rand_ZeroOne() * 200.0f);
+ this->effects[i].LostWoodsSkyFishSpeedXZ = -200 - (s16)(Rand_ZeroOne() * 200.0f);
}
- this->particles[i].LostWoodsSkyFishPosOffsetMax = (s16)(Rand_ZeroOne() * 50.0f) + 15;
- this->particles[i].LostWoodsSkyFishSpeedY = ((Rand_ZeroOne() * 10.0f) + 10.0f) * 0.01f;
+ this->effects[i].LostWoodsSkyFishPosOffsetMax = (s16)(Rand_ZeroOne() * 50.0f) + 15;
+ this->effects[i].LostWoodsSkyFishSpeedY = ((Rand_ZeroOne() * 10.0f) + 10.0f) * 0.01f;
// Only the 31st particle matters as sLostWoodsSkyFishParticleNum will be overwritten
// every particle until the last skyfish particle is initialized
@@ -145,147 +145,134 @@ void DemoKakyo_LostWoodsSparkleActionFunc(DemoKankyo* this, GlobalContext* globa
if ((i & sLostWoodsSkyFishParticleNum) == 0) {
// Head particle
- this->particles[i].posOffset.y = 0.0f;
+ this->effects[i].posOffset.y = 0.0f;
}
- this->particles[i].state = DEMO_KANKYO_STATE_SKYFISH;
- this->particles[i].speedTarget = 0.0f;
+ this->effects[i].state = DEMO_KANKYO_STATE_SKYFISH;
+ this->effects[i].speedTarget = 0.0f;
}
- Math_SmoothStepToF(&this->particles[i].scale, 0.1, 0.1f, 0.001f, 0.00001f);
- Math_SmoothStepToF(&this->particles[i].speed, this->particles[i].speedTarget, 0.5f, 0.2f, 0.02f);
- this->particles[i].posOffset.x += sinf(this->particles[i].speedClock.x) * this->particles[i].speed;
- this->particles[i].posOffset.y += sinf(this->particles[i].speedClock.y) * this->particles[i].speed;
- this->particles[i].posOffset.z += sinf(this->particles[i].speedClock.z) * this->particles[i].speed;
+ Math_SmoothStepToF(&this->effects[i].scale, 0.1, 0.1f, 0.001f, 0.00001f);
+ Math_SmoothStepToF(&this->effects[i].speed, this->effects[i].speedTarget, 0.5f, 0.2f, 0.02f);
+ this->effects[i].posOffset.x += sinf(this->effects[i].speedClock.x) * this->effects[i].speed;
+ this->effects[i].posOffset.y += sinf(this->effects[i].speedClock.y) * this->effects[i].speed;
+ this->effects[i].posOffset.z += sinf(this->effects[i].speedClock.z) * this->effects[i].speed;
switch ((i >> 1) & 3) {
case 0:
- this->particles[i].speedClock.x += 0.008f;
- this->particles[i].speedClock.y += 0.05f * Rand_ZeroOne();
- this->particles[i].speedClock.z += 0.015f;
+ this->effects[i].speedClock.x += 0.008f;
+ this->effects[i].speedClock.y += 0.05f * Rand_ZeroOne();
+ this->effects[i].speedClock.z += 0.015f;
break;
case 1:
- this->particles[i].speedClock.x += 0.01f * Rand_ZeroOne();
- this->particles[i].speedClock.y += 0.05f * Rand_ZeroOne();
- this->particles[i].speedClock.z += 0.005f * Rand_ZeroOne();
+ this->effects[i].speedClock.x += 0.01f * Rand_ZeroOne();
+ this->effects[i].speedClock.y += 0.05f * Rand_ZeroOne();
+ this->effects[i].speedClock.z += 0.005f * Rand_ZeroOne();
break;
case 2:
- this->particles[i].speedClock.x += 0.01f * Rand_ZeroOne();
- this->particles[i].speedClock.y += 0.4f * Rand_ZeroOne();
- this->particles[i].speedClock.z += 0.004f * Rand_ZeroOne();
+ this->effects[i].speedClock.x += 0.01f * Rand_ZeroOne();
+ this->effects[i].speedClock.y += 0.4f * Rand_ZeroOne();
+ this->effects[i].speedClock.z += 0.004f * Rand_ZeroOne();
break;
case 3:
- this->particles[i].speedClock.x += 0.01f * Rand_ZeroOne();
- this->particles[i].speedClock.y += 0.08f * Rand_ZeroOne();
- this->particles[i].speedClock.z += 0.05f * Rand_ZeroOne();
+ this->effects[i].speedClock.x += 0.01f * Rand_ZeroOne();
+ this->effects[i].speedClock.y += 0.08f * Rand_ZeroOne();
+ this->effects[i].speedClock.z += 0.05f * Rand_ZeroOne();
break;
}
- } else if (this->particles[i].state == DEMO_KANKYO_STATE_SKYFISH) {
+ } else if (this->effects[i].state == DEMO_KANKYO_STATE_SKYFISH) {
if ((i & sLostWoodsSkyFishParticleNum) == 0) {
// Head particle
- Math_SmoothStepToF(&this->particles[i].scale, 0.25f, 0.1f, 0.001f, 0.00001f);
+ Math_SmoothStepToF(&this->effects[i].scale, 0.25f, 0.1f, 0.001f, 0.00001f);
- Math_SmoothStepToF(&this->particles[i].posBase.x, player->actor.world.pos.x, 0.5f, 1.0f, 0.2f);
- Math_SmoothStepToF(&this->particles[i].posBase.y, player->actor.world.pos.y + 50.0f, 0.5f, 1.0f,
+ Math_SmoothStepToF(&this->effects[i].posBase.x, player->actor.world.pos.x, 0.5f, 1.0f, 0.2f);
+ Math_SmoothStepToF(&this->effects[i].posBase.y, player->actor.world.pos.y + 50.0f, 0.5f, 1.0f,
0.2f);
- Math_SmoothStepToF(&this->particles[i].posBase.z, player->actor.world.pos.z, 0.5f, 1.0f, 0.2f);
+ Math_SmoothStepToF(&this->effects[i].posBase.z, player->actor.world.pos.z, 0.5f, 1.0f, 0.2f);
- Math_SmoothStepToF(&this->particles[i].posOffset.x,
- Math_SinS(this->particles[i].LostWoodsSkyFishSpeedXZClock - 0x8000) *
- this->particles[i].LostWoodsSkyFishPosOffsetMax,
+ Math_SmoothStepToF(&this->effects[i].posOffset.x,
+ Math_SinS(this->effects[i].LostWoodsSkyFishSpeedXZClock - 0x8000) *
+ this->effects[i].LostWoodsSkyFishPosOffsetMax,
0.5f, 2.0f, 0.2f);
- Math_SmoothStepToF(&this->particles[i].posOffset.z,
- Math_CosS(this->particles[i].LostWoodsSkyFishSpeedXZClock - 0x8000) *
- this->particles[i].LostWoodsSkyFishPosOffsetMax,
+ Math_SmoothStepToF(&this->effects[i].posOffset.z,
+ Math_CosS(this->effects[i].LostWoodsSkyFishSpeedXZClock - 0x8000) *
+ this->effects[i].LostWoodsSkyFishPosOffsetMax,
0.5f, 2.0f, 0.2f);
- this->particles[i].LostWoodsSkyFishSpeedXZClock += this->particles[i].LostWoodsSkyFishSpeedXZ;
- this->particles[i].posOffset.y += sinf(this->particles[i].speedClock.y);
- this->particles[i].speedClock.x += 0.2f * Rand_ZeroOne(); // unused calculation
- this->particles[i].speedClock.y += this->particles[i].LostWoodsSkyFishSpeedY;
- this->particles[i].speedClock.z += 0.1f * Rand_ZeroOne(); // unused calculation
+ this->effects[i].LostWoodsSkyFishSpeedXZClock += this->effects[i].LostWoodsSkyFishSpeedXZ;
+ this->effects[i].posOffset.y += sinf(this->effects[i].speedClock.y);
+ this->effects[i].speedClock.x += 0.2f * Rand_ZeroOne(); // unused calculation
+ this->effects[i].speedClock.y += this->effects[i].LostWoodsSkyFishSpeedY;
+ this->effects[i].speedClock.z += 0.1f * Rand_ZeroOne(); // unused calculation
- this->particles[i].posOffset.x =
- Math_SinS(this->particles[i].LostWoodsSkyFishSpeedXZClock - 0x8000) *
- this->particles[i].LostWoodsSkyFishPosOffsetMax;
- this->particles[i].posOffset.z =
- Math_CosS(this->particles[i].LostWoodsSkyFishSpeedXZClock - 0x8000) *
- this->particles[i].LostWoodsSkyFishPosOffsetMax;
+ this->effects[i].posOffset.x =
+ Math_SinS(this->effects[i].LostWoodsSkyFishSpeedXZClock - 0x8000) *
+ this->effects[i].LostWoodsSkyFishPosOffsetMax;
+ this->effects[i].posOffset.z =
+ Math_CosS(this->effects[i].LostWoodsSkyFishSpeedXZClock - 0x8000) *
+ this->effects[i].LostWoodsSkyFishPosOffsetMax;
} else {
// Tail Particles
- Math_SmoothStepToF(&this->particles[i].scale, 0.1, 0.1f, 0.001f, 0.00001f);
+ Math_SmoothStepToF(&this->effects[i].scale, 0.1, 0.1f, 0.001f, 0.00001f);
// Unused calculation, speed only used in posOffset calculations,
// but posOffset gets overwritten for tail particles immediately below
- Math_SmoothStepToF(&this->particles[i].speed, 1.5f, 0.5f, 0.1f, 0.0002f);
+ Math_SmoothStepToF(&this->effects[i].speed, 1.5f, 0.5f, 0.1f, 0.0002f);
// particles in the skyfish's tail are moved to the previous position of the particle directly
// in front
- this->particles[i].posOffset.x =
- this->particles[i - 1].posOffsetPrev.x +
- (this->particles[i - 1].posBase.x - this->particles[i].posBase.x);
- this->particles[i].posOffset.y =
- this->particles[i - 1].posOffsetPrev.y +
- (this->particles[i - 1].posBase.y - this->particles[i].posBase.y);
- this->particles[i].posOffset.z =
- this->particles[i - 1].posOffsetPrev.z +
- (this->particles[i - 1].posBase.z - this->particles[i].posBase.z);
+ this->effects[i].posOffset.x = this->effects[i - 1].posOffsetPrev.x +
+ (this->effects[i - 1].posBase.x - this->effects[i].posBase.x);
+ this->effects[i].posOffset.y = this->effects[i - 1].posOffsetPrev.y +
+ (this->effects[i - 1].posBase.y - this->effects[i].posBase.y);
+ this->effects[i].posOffset.z = this->effects[i - 1].posOffsetPrev.z +
+ (this->effects[i - 1].posBase.z - this->effects[i].posBase.z);
}
}
- if ((this->particles[i].state != DEMO_KANKYO_STATE_SKYFISH) &&
- ((((this->particles[i].posBase.x + this->particles[i].posOffset.x) - posCenterX) >
- repositionLimit) ||
- (((this->particles[i].posBase.x + this->particles[i].posOffset.x) - posCenterX) <
- -repositionLimit) ||
- (((this->particles[i].posBase.y + this->particles[i].posOffset.y) - posCenterY) >
- repositionLimit) ||
- (((this->particles[i].posBase.y + this->particles[i].posOffset.y) - posCenterY) <
- -repositionLimit) ||
- (((this->particles[i].posBase.z + this->particles[i].posOffset.z) - posCenterZ) >
- repositionLimit) ||
- (((this->particles[i].posBase.z + this->particles[i].posOffset.z) - posCenterZ) <
- -repositionLimit))) {
- if (((this->particles[i].posOffset.x + this->particles[i].posBase.x) - posCenterX) >
- repositionLimit) {
- this->particles[i].posOffset.x = 0.0f;
- this->particles[i].posBase.x = posCenterX - repositionLimit;
+ if ((this->effects[i].state != DEMO_KANKYO_STATE_SKYFISH) &&
+ ((((this->effects[i].posBase.x + this->effects[i].posOffset.x) - posCenterX) > repositionLimit) ||
+ (((this->effects[i].posBase.x + this->effects[i].posOffset.x) - posCenterX) < -repositionLimit) ||
+ (((this->effects[i].posBase.y + this->effects[i].posOffset.y) - posCenterY) > repositionLimit) ||
+ (((this->effects[i].posBase.y + this->effects[i].posOffset.y) - posCenterY) < -repositionLimit) ||
+ (((this->effects[i].posBase.z + this->effects[i].posOffset.z) - posCenterZ) > repositionLimit) ||
+ (((this->effects[i].posBase.z + this->effects[i].posOffset.z) - posCenterZ) < -repositionLimit))) {
+ if (((this->effects[i].posOffset.x + this->effects[i].posBase.x) - posCenterX) > repositionLimit) {
+ this->effects[i].posOffset.x = 0.0f;
+ this->effects[i].posBase.x = posCenterX - repositionLimit;
}
- if (((this->particles[i].posBase.x + this->particles[i].posOffset.x) - posCenterX) <
- -repositionLimit) {
- this->particles[i].posOffset.x = 0.0f;
- this->particles[i].posBase.x = posCenterX + repositionLimit;
+ if (((this->effects[i].posBase.x + this->effects[i].posOffset.x) - posCenterX) < -repositionLimit) {
+ this->effects[i].posOffset.x = 0.0f;
+ this->effects[i].posBase.x = posCenterX + repositionLimit;
}
- if (((this->particles[i].posBase.y + this->particles[i].posOffset.y) - posCenterY) > 50.0f) {
- this->particles[i].posOffset.y = 0.0f;
- this->particles[i].posBase.y = posCenterY - 50.0f;
+ if (((this->effects[i].posBase.y + this->effects[i].posOffset.y) - posCenterY) > 50.0f) {
+ this->effects[i].posOffset.y = 0.0f;
+ this->effects[i].posBase.y = posCenterY - 50.0f;
}
- if (((this->particles[i].posBase.y + this->particles[i].posOffset.y) - posCenterY) < -50.0f) {
- this->particles[i].posOffset.y = 0.0f;
- this->particles[i].posBase.y = posCenterY + 50.0f;
+ if (((this->effects[i].posBase.y + this->effects[i].posOffset.y) - posCenterY) < -50.0f) {
+ this->effects[i].posOffset.y = 0.0f;
+ this->effects[i].posBase.y = posCenterY + 50.0f;
}
- if (((this->particles[i].posBase.z + this->particles[i].posOffset.z) - posCenterZ) >
- repositionLimit) {
- this->particles[i].posOffset.z = 0.0f;
- this->particles[i].posBase.z = posCenterZ - repositionLimit;
+ if (((this->effects[i].posBase.z + this->effects[i].posOffset.z) - posCenterZ) > repositionLimit) {
+ this->effects[i].posOffset.z = 0.0f;
+ this->effects[i].posBase.z = posCenterZ - repositionLimit;
}
- if (((this->particles[i].posBase.z + this->particles[i].posOffset.z) - posCenterZ) <
- -repositionLimit) {
- this->particles[i].posOffset.z = 0.0f;
- this->particles[i].posBase.z = posCenterZ + repositionLimit;
+ if (((this->effects[i].posBase.z + this->effects[i].posOffset.z) - posCenterZ) < -repositionLimit) {
+ this->effects[i].posOffset.z = 0.0f;
+ this->effects[i].posBase.z = posCenterZ + repositionLimit;
}
}
break;
case DEMO_KANKYO_STATE_DISABLED:
- this->particles[i].state = DEMO_KANKYO_STATE_INIT;
+ this->effects[i].state = DEMO_KANKYO_STATE_INIT;
break;
}
}
@@ -317,7 +304,7 @@ void DemoKakyo_MoonSparklesActionFunc(DemoKankyo* this, GlobalContext* globalCtx
s32 pad1;
Vec3f worldPos;
- if (globalCtx->envCtx.unk_F2[3] < DEMOKANKYO_PARTICLE_COUNT) {
+ if (globalCtx->envCtx.unk_F2[3] < DEMOKANKYO_EFFECT_COUNT) {
globalCtx->envCtx.unk_F2[3] += 16;
}
@@ -332,38 +319,38 @@ void DemoKakyo_MoonSparklesActionFunc(DemoKankyo* this, GlobalContext* globalCtx
halfScreenHeight = SCREEN_HEIGHT / 2;
for (i = 0; i < globalCtx->envCtx.unk_F2[3]; i++) {
- switch (this->particles[i].state) {
+ switch (this->effects[i].state) {
case DEMO_KANKYO_STATE_INIT:
- this->particles[i].posBase.x = globalCtx->view.eye.x + (eyeToAtNormX * halfScreenHeight);
- this->particles[i].posBase.y = globalCtx->view.eye.y + (eyeToAtNormY * halfScreenHeight);
- this->particles[i].posBase.z = globalCtx->view.eye.z + (eyeToAtNormZ * halfScreenHeight);
+ this->effects[i].posBase.x = globalCtx->view.eye.x + (eyeToAtNormX * halfScreenHeight);
+ this->effects[i].posBase.y = globalCtx->view.eye.y + (eyeToAtNormY * halfScreenHeight);
+ this->effects[i].posBase.z = globalCtx->view.eye.z + (eyeToAtNormZ * halfScreenHeight);
- this->particles[i].posOffset.x = (Rand_ZeroOne() - 0.5f) * (2.0f * halfScreenHeight);
- this->particles[i].posOffset.y = (Rand_ZeroOne() - 0.5f) * (2.0f * halfScreenHeight);
- this->particles[i].posOffset.z = (Rand_ZeroOne() - 0.5f) * (2.0f * halfScreenHeight);
+ this->effects[i].posOffset.x = (Rand_ZeroOne() - 0.5f) * (2.0f * halfScreenHeight);
+ this->effects[i].posOffset.y = (Rand_ZeroOne() - 0.5f) * (2.0f * halfScreenHeight);
+ this->effects[i].posOffset.z = (Rand_ZeroOne() - 0.5f) * (2.0f * halfScreenHeight);
- this->particles[i].speedTarget = (Rand_ZeroOne() * 1.6f) + 0.5f;
- this->particles[i].alpha = 0;
- this->particles[i].alphaClock = (Rand_ZeroOne() * 65535);
- this->particles[i].scale = 0.2f;
+ this->effects[i].speedTarget = (Rand_ZeroOne() * 1.6f) + 0.5f;
+ this->effects[i].alpha = 0;
+ this->effects[i].alphaClock = (Rand_ZeroOne() * 65535);
+ this->effects[i].scale = 0.2f;
// speedClock is angles in radians,
// should have used Rand_ZeroOne() * 2 * M_PI
// however, due to properties of sine waves, this is effectively still random
- this->particles[i].speedClock.x = Rand_ZeroOne() * 360.0f;
- this->particles[i].speedClock.y = Rand_ZeroOne() * 360.0f;
- this->particles[i].speedClock.z = Rand_ZeroOne() * 360.0f;
+ this->effects[i].speedClock.x = Rand_ZeroOne() * 360.0f;
+ this->effects[i].speedClock.y = Rand_ZeroOne() * 360.0f;
+ this->effects[i].speedClock.z = Rand_ZeroOne() * 360.0f;
- this->particles[i].pad50 = 0;
- this->particles[i].state += DEMO_KANKYO_STATE_SINGLE;
+ this->effects[i].pad50 = 0;
+ this->effects[i].state += DEMO_KANKYO_STATE_SINGLE;
break;
case DEMO_KANKYO_STATE_SINGLE:
case DEMO_KANKYO_STATE_SKYFISH:
- this->particles[i].alphaClock++;
+ this->effects[i].alphaClock++;
if (this->actor.params == DEMO_KANKYO_TYPE_MOON) { // this function gets reused for giants too
- this->particles[i].posBase.y =
+ this->effects[i].posBase.y =
globalCtx->view.eye.y + (eyeToAtNormY * halfScreenHeight) + (SCREEN_HEIGHT / 3);
}
@@ -371,76 +358,76 @@ void DemoKakyo_MoonSparklesActionFunc(DemoKankyo* this, GlobalContext* globalCtx
newEye.y = globalCtx->view.eye.y + (eyeToAtNormY * halfScreenHeight);
newEye.z = globalCtx->view.eye.z + (eyeToAtNormZ * halfScreenHeight);
- Math_SmoothStepToF(&this->particles[i].scale, 0.2f, 0.1f, 0.001f, 0.00001f);
- Math_SmoothStepToF(&this->particles[i].speed, this->particles[i].speedTarget, 0.5f, 0.2f, 0.02f);
+ Math_SmoothStepToF(&this->effects[i].scale, 0.2f, 0.1f, 0.001f, 0.00001f);
+ Math_SmoothStepToF(&this->effects[i].speed, this->effects[i].speedTarget, 0.5f, 0.2f, 0.02f);
- this->particles[i].posOffset.x += sinf(this->particles[i].speedClock.x) * this->particles[i].speed;
- this->particles[i].posOffset.y += sinf(this->particles[i].speedClock.y) * this->particles[i].speed;
- this->particles[i].posOffset.z += sinf(this->particles[i].speedClock.z) * this->particles[i].speed;
+ this->effects[i].posOffset.x += sinf(this->effects[i].speedClock.x) * this->effects[i].speed;
+ this->effects[i].posOffset.y += sinf(this->effects[i].speedClock.y) * this->effects[i].speed;
+ this->effects[i].posOffset.z += sinf(this->effects[i].speedClock.z) * this->effects[i].speed;
switch ((i >> 1) & 3) {
case 0:
- this->particles[i].speedClock.x += 0.008f;
- this->particles[i].speedClock.y += 0.05f * Rand_ZeroOne();
- this->particles[i].speedClock.z += 0.015f;
+ this->effects[i].speedClock.x += 0.008f;
+ this->effects[i].speedClock.y += 0.05f * Rand_ZeroOne();
+ this->effects[i].speedClock.z += 0.015f;
break;
case 1:
- this->particles[i].speedClock.x += 0.01f * Rand_ZeroOne();
- this->particles[i].speedClock.y += 0.05f * Rand_ZeroOne();
- this->particles[i].speedClock.z += 0.005f * Rand_ZeroOne();
+ this->effects[i].speedClock.x += 0.01f * Rand_ZeroOne();
+ this->effects[i].speedClock.y += 0.05f * Rand_ZeroOne();
+ this->effects[i].speedClock.z += 0.005f * Rand_ZeroOne();
break;
case 2:
- this->particles[i].speedClock.x += 0.01f * Rand_ZeroOne();
- this->particles[i].speedClock.y += 0.4f * Rand_ZeroOne();
- this->particles[i].speedClock.z += 0.004f * Rand_ZeroOne();
+ this->effects[i].speedClock.x += 0.01f * Rand_ZeroOne();
+ this->effects[i].speedClock.y += 0.4f * Rand_ZeroOne();
+ this->effects[i].speedClock.z += 0.004f * Rand_ZeroOne();
break;
case 3:
- this->particles[i].speedClock.x += 0.01f * Rand_ZeroOne();
- this->particles[i].speedClock.y += 0.08f * Rand_ZeroOne();
- this->particles[i].speedClock.z += 0.05f * Rand_ZeroOne();
+ this->effects[i].speedClock.x += 0.01f * Rand_ZeroOne();
+ this->effects[i].speedClock.y += 0.08f * Rand_ZeroOne();
+ this->effects[i].speedClock.z += 0.05f * Rand_ZeroOne();
break;
}
- if (((this->particles[i].posBase.x + this->particles[i].posOffset.x) - newEye.x) > halfScreenHeight) {
- this->particles[i].posBase.x = newEye.x - halfScreenHeight;
+ if (((this->effects[i].posBase.x + this->effects[i].posOffset.x) - newEye.x) > halfScreenHeight) {
+ this->effects[i].posBase.x = newEye.x - halfScreenHeight;
}
- if (((this->particles[i].posBase.x + this->particles[i].posOffset.x) - newEye.x) < -halfScreenHeight) {
- this->particles[i].posBase.x = newEye.x + halfScreenHeight;
+ if (((this->effects[i].posBase.x + this->effects[i].posOffset.x) - newEye.x) < -halfScreenHeight) {
+ this->effects[i].posBase.x = newEye.x + halfScreenHeight;
}
- worldPos.x = this->particles[i].posBase.x + this->particles[i].posOffset.x;
- worldPos.y = this->particles[i].posBase.y + this->particles[i].posOffset.y;
- worldPos.z = this->particles[i].posBase.z + this->particles[i].posOffset.z;
+ worldPos.x = this->effects[i].posBase.x + this->effects[i].posOffset.x;
+ worldPos.y = this->effects[i].posBase.y + this->effects[i].posOffset.y;
+ worldPos.z = this->effects[i].posBase.z + this->effects[i].posOffset.z;
randZeroOne = Math_Vec3f_DistXZ(&worldPos, &globalCtx->view.eye) / 200.0f;
randZeroOne = CLAMP(randZeroOne, 0.0f, 1.0f);
halfScreenWidth = 100.0f + randZeroOne + 60.0f; // range 160 to 161...? thats about half screen width
- // I think this code is shifting the particles 1 frame -> half screen at a time to keep it in-view
- if (halfScreenWidth < ((this->particles[i].posBase.y + this->particles[i].posOffset.y) - newEye.y)) {
- this->particles[i].posBase.y = newEye.y - halfScreenWidth;
+ // I think this code is shifting the effects 1 frame -> half screen at a time to keep it in-view
+ if (halfScreenWidth < ((this->effects[i].posBase.y + this->effects[i].posOffset.y) - newEye.y)) {
+ this->effects[i].posBase.y = newEye.y - halfScreenWidth;
}
- if (((this->particles[i].posBase.y + this->particles[i].posOffset.y) - newEye.y) < -halfScreenWidth) {
- this->particles[i].posBase.y = newEye.y + halfScreenWidth;
+ if (((this->effects[i].posBase.y + this->effects[i].posOffset.y) - newEye.y) < -halfScreenWidth) {
+ this->effects[i].posBase.y = newEye.y + halfScreenWidth;
}
- if (((this->particles[i].posBase.z + this->particles[i].posOffset.z) - newEye.z) > halfScreenHeight) {
- this->particles[i].posBase.z = newEye.z - halfScreenHeight;
+ if (((this->effects[i].posBase.z + this->effects[i].posOffset.z) - newEye.z) > halfScreenHeight) {
+ this->effects[i].posBase.z = newEye.z - halfScreenHeight;
}
- if (((this->particles[i].posBase.z + this->particles[i].posOffset.z) - newEye.z) < -halfScreenHeight) {
- this->particles[i].posBase.z = newEye.z + halfScreenHeight;
+ if (((this->effects[i].posBase.z + this->effects[i].posOffset.z) - newEye.z) < -halfScreenHeight) {
+ this->effects[i].posBase.z = newEye.z + halfScreenHeight;
}
break;
case DEMO_KANKYO_STATE_DISABLED:
- this->particles[i].state = DEMO_KANKYO_STATE_INIT;
+ this->effects[i].state = DEMO_KANKYO_STATE_INIT;
break;
}
}
@@ -454,7 +441,7 @@ void DemoKankyo_Init(Actor* thisx, GlobalContext* globalCtx) {
// This must be a single line to match, possibly a macro?
// clang-format off
- for (i = 0; i < ARRAY_COUNT(this->particles); i++) { this->particles[i].state = DEMO_KANKYO_STATE_INIT; }
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++) { this->effects[i].state = DEMO_KANKYO_STATE_INIT; }
// clang-format on
if (1) {};
@@ -524,9 +511,9 @@ void DemoKakyo_DrawLostWoodsSparkle(Actor* thisx, GlobalContext* globalCtx2) {
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_07AB10);
for (i = 0; i < globalCtx->envCtx.unk_F2[3]; i++) {
- worldPos.x = this->particles[i].posBase.x + this->particles[i].posOffset.x;
- worldPos.y = this->particles[i].posBase.y + this->particles[i].posOffset.y;
- worldPos.z = this->particles[i].posBase.z + this->particles[i].posOffset.z;
+ worldPos.x = this->effects[i].posBase.x + this->effects[i].posOffset.x;
+ worldPos.y = this->effects[i].posBase.y + this->effects[i].posOffset.y;
+ worldPos.z = this->effects[i].posBase.z + this->effects[i].posOffset.z;
func_80169474(globalCtx, &worldPos, &screenPos); // unnamed Play_ function, func_800C016C from OoT
@@ -534,52 +521,52 @@ void DemoKakyo_DrawLostWoodsSparkle(Actor* thisx, GlobalContext* globalCtx2) {
if (screenPos.x >= 0.0f && screenPos.x < SCREEN_WIDTH && screenPos.y >= 0.0f &&
screenPos.y < SCREEN_HEIGHT) {
Matrix_Translate(worldPos.x, worldPos.y, worldPos.z, MTXMODE_NEW);
- scaleAlpha = this->particles[i].alpha / 50.0f;
+ scaleAlpha = this->effects[i].alpha / 50.0f;
if (scaleAlpha > 1.0f) {
scaleAlpha = 1.0f;
}
- Matrix_Scale(this->particles[i].scale * scaleAlpha, this->particles[i].scale * scaleAlpha,
- this->particles[i].scale * scaleAlpha, MTXMODE_APPLY);
+ Matrix_Scale(this->effects[i].scale * scaleAlpha, this->effects[i].scale * scaleAlpha,
+ this->effects[i].scale * scaleAlpha, MTXMODE_APPLY);
// adjust transparency of this particle
if (i < 32) {
// Skyfish particles
- if (this->particles[i].state != DEMO_KANKYO_STATE_SKYFISH) {
+ if (this->effects[i].state != DEMO_KANKYO_STATE_SKYFISH) {
// still initializing
- if (this->particles[i].alpha > 0) { // NOT DECR
- this->particles[i].alpha--;
+ if (this->effects[i].alpha > 0) { // NOT DECR
+ this->effects[i].alpha--;
}
- } else if (this->particles[i].alpha < 100) {
- this->particles[i].alpha++;
+ } else if (this->effects[i].alpha < 100) {
+ this->effects[i].alpha++;
}
- } else if (this->particles[i].state != DEMO_KANKYO_STATE_SKYFISH) {
- if ((this->particles[i].alphaClock & 31) < 16) {
- if (this->particles[i].alpha < 235) {
- this->particles[i].alpha += 20;
+ } else if (this->effects[i].state != DEMO_KANKYO_STATE_SKYFISH) {
+ if ((this->effects[i].alphaClock & 31) < 16) {
+ if (this->effects[i].alpha < 235) {
+ this->effects[i].alpha += 20;
}
- } else if (this->particles[i].alpha > 20) {
- this->particles[i].alpha -= 20;
+ } else if (this->effects[i].alpha > 20) {
+ this->effects[i].alpha -= 20;
}
- } else if ((this->particles[i].alphaClock & 15) < 8) {
- if (this->particles[i].alpha < 255) {
- this->particles[i].alpha += 100;
+ } else if ((this->effects[i].alphaClock & 15) < 8) {
+ if (this->effects[i].alpha < 255) {
+ this->effects[i].alpha += 100;
}
- } else if (this->particles[i].alpha > 10) {
- this->particles[i].alpha -= 10;
+ } else if (this->effects[i].alpha > 10) {
+ this->effects[i].alpha -= 10;
}
gDPPipeSync(POLY_XLU_DISP++);
switch (i & 1) {
case 0: // gold particles
- gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 155, this->particles[i].alpha);
- gDPSetEnvColor(POLY_XLU_DISP++, 250, 180, 0, this->particles[i].alpha);
+ gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 155, this->effects[i].alpha);
+ gDPSetEnvColor(POLY_XLU_DISP++, 250, 180, 0, this->effects[i].alpha);
break;
case 1: // silver particles
- gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, this->particles[i].alpha);
- gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, this->particles[i].alpha);
+ gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, this->effects[i].alpha);
+ gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, this->effects[i].alpha);
break;
}
@@ -613,42 +600,42 @@ void DemoKankyo_DrawMoonAndGiant(Actor* thisx, GlobalContext* globalCtx2) {
func_8012C2DC(gfxCtx);
for (i = 0; i < globalCtx->envCtx.unk_F2[3]; i++) {
- worldPos.x = this->particles[i].posBase.x + this->particles[i].posOffset.x;
- worldPos.y = this->particles[i].posBase.y + this->particles[i].posOffset.y;
- worldPos.z = this->particles[i].posBase.z + this->particles[i].posOffset.z;
+ worldPos.x = this->effects[i].posBase.x + this->effects[i].posOffset.x;
+ worldPos.y = this->effects[i].posBase.y + this->effects[i].posOffset.y;
+ worldPos.z = this->effects[i].posBase.z + this->effects[i].posOffset.z;
func_80169474(globalCtx, &worldPos, &screenPos); // unnamed Play_ function, func_800C016C from OoT
- // checking if particle is on screen
+ // checking if effect is on screen
if (screenPos.x >= 0.0f && screenPos.x < SCREEN_WIDTH && screenPos.y >= 0.0f &&
screenPos.y < SCREEN_HEIGHT) {
Matrix_Translate(worldPos.x, worldPos.y, worldPos.z, MTXMODE_NEW);
- alphaScale = this->particles[i].alpha / 50.0f;
+ alphaScale = this->effects[i].alpha / 50.0f;
if (alphaScale > 1.0f) {
alphaScale = 1.0f;
}
- Matrix_Scale(this->particles[i].scale * alphaScale, this->particles[i].scale * alphaScale,
- this->particles[i].scale * alphaScale, MTXMODE_APPLY);
+ Matrix_Scale(this->effects[i].scale * alphaScale, this->effects[i].scale * alphaScale,
+ this->effects[i].scale * alphaScale, MTXMODE_APPLY);
alphaScale = Math_Vec3f_DistXYZ(&worldPos, &globalCtx->view.eye) / 300.0f;
alphaScale = CLAMP(1.0f - alphaScale, 0.0f, 1.0f);
if (this->actor.params == DEMO_KANKYO_TYPE_GIANTS) {
- this->particles[i].alpha = 255.0f * alphaScale;
+ this->effects[i].alpha = 255.0f * alphaScale;
} else {
- this->particles[i].alpha = 160.0f * alphaScale;
+ this->effects[i].alpha = 160.0f * alphaScale;
}
gDPPipeSync(POLY_XLU_DISP++);
switch (i & 1) { // half/half slightly different shades of yellow/tan
case 0:
- gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 230, 230, 220, this->particles[i].alpha);
- gDPSetEnvColor(POLY_XLU_DISP++, 230, 230, 30, this->particles[i].alpha);
+ gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 230, 230, 220, this->effects[i].alpha);
+ gDPSetEnvColor(POLY_XLU_DISP++, 230, 230, 30, this->effects[i].alpha);
break;
case 1:
- gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 200, 190, this->particles[i].alpha);
- gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 30, this->particles[i].alpha);
+ gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 200, 190, this->effects[i].alpha);
+ gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 30, this->effects[i].alpha);
break;
}
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
index d70616ed6..e614117ee 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
@@ -18,18 +18,18 @@ typedef struct {
/* 0x03C */ u16 alphaClock;
/* 0x03E */ u16 LostWoodsSkyFishSpeedXZClock;
/* 0x040 */ u8 alpha;
- /* 0x044 */ f32 scale; // size of the particle
+ /* 0x044 */ f32 scale; // size of the effect
/* 0x048 */ u16 LostWoodsSkyFishSpeedXZ; // the x-z speed (angular velocity) the lost woods skyfish oscillates around player. pos or neg 200-400
/* 0x04A */ u16 LostWoodsSkyFishPosOffsetMax; // The x-z range the lost woods skyfish oscillates around player. random value between 15-65
/* 0x04C */ f32 LostWoodsSkyFishSpeedY; // the y speed (angular velocity) the lost woods skyfish oscillates around player.
/* 0x050 */ u16 pad50; // unused, always assigned to 0, nothing else in this actor uses it
-} DemoKankyoParticle; // size = 0x54
+} DemoKankyoEffect; // size = 0x54
-#define DEMOKANKYO_PARTICLE_COUNT 64
+#define DEMOKANKYO_EFFECT_COUNT 64
typedef struct DemoKankyo {
/* 0x0000 */ Actor actor;
- /* 0x0144 */ DemoKankyoParticle particles[DEMOKANKYO_PARTICLE_COUNT];
+ /* 0x0144 */ DemoKankyoEffect effects[DEMOKANKYO_EFFECT_COUNT];
/* 0x1644 */ DemoKankyoActionFunc actionFunc;
/* 0x1648 */ s32 objectId;
/* 0x164C */ u8 isSafeToDrawGiants;
diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
index 060a201d7..d76de38a3 100644
--- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
+++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
@@ -5,6 +5,8 @@
*/
#include "z_demo_tre_lgt.h"
+#include "overlays/actors/ovl_En_Box/z_en_box.h"
+#include "objects/object_box/object_box.h"
#define FLAGS (ACTOR_FLAG_10)
@@ -15,7 +17,24 @@ void DemoTreLgt_Destroy(Actor* thisx, GlobalContext* globalCtx);
void DemoTreLgt_Update(Actor* thisx, GlobalContext* globalCtx);
void DemoTreLgt_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
+void DemoTreLgt_SetupWait(DemoTreLgt* this);
+
+void DemoTreLgt_Wait(DemoTreLgt* this, GlobalContext* globalCtx);
+void DemoTreLgt_SetupAnimate(DemoTreLgt* this, GlobalContext* globalCtx, f32 frame);
+void DemoTreLgt_Animate(DemoTreLgt* this, GlobalContext* globalCtx);
+
+typedef struct {
+ f32 unk0;
+ f32 unk4;
+ f32 unk8;
+ f32 unkC;
+} DemoTreLgtInfo;
+
+static DemoTreLgtInfo D_808E1490[2] = {
+ { 1.0f, 136.0f, 190.0f, 40.0f },
+ { 1.0f, 136.0f, 220.0f, 50.0f },
+};
+
const ActorInit Demo_Tre_Lgt_InitVars = {
ACTOR_DEMO_TRE_LGT,
ACTORCAT_ITEMACTION,
@@ -28,24 +47,131 @@ const ActorInit Demo_Tre_Lgt_InitVars = {
(ActorFunc)DemoTreLgt_Draw,
};
-#endif
+static TransformUpdateIndex* sBoxLightAnimations[] = {
+ &gBoxLightAdultCurveAnim,
+ &gBoxLightChildCurveAnim,
+};
-extern UNK_TYPE D_06007D78;
+typedef enum {
+ /* 0x00 */ DEMO_TRE_LGT_ACTION_WAIT, // wait until animation is needed
+ /* 0x01 */ DEMO_TRE_LGT_ACTION_ANIMATE
+} DemoTreLgtAction;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Demo_Tre_Lgt/DemoTreLgt_Init.s")
+static DemoTreLgtActionFunc sActionFuncs[] = {
+ DemoTreLgt_Wait,
+ DemoTreLgt_Animate,
+};
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Demo_Tre_Lgt/DemoTreLgt_Destroy.s")
+void DemoTreLgt_Init(Actor* thisx, GlobalContext* globalCtx) {
+ DemoTreLgt* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Demo_Tre_Lgt/func_808E0EE8.s")
+ SkelCurve_Init(globalCtx, &this->skelCurve, &gBoxLightCurveSkel, sBoxLightAnimations[0]);
+ this->colorAlpha1 = 255;
+ this->colorAlpha2 = 255;
+ this->status = 0;
+ //! @bug Zora Link should also use animationType 0
+ if (gSaveContext.save.playerForm == PLAYER_FORM_FIERCE_DEITY) {
+ this->animationType = 0;
+ } else {
+ this->animationType = 1;
+ }
+ DemoTreLgt_SetupWait(this);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Demo_Tre_Lgt/func_808E0EF4.s")
+void DemoTreLgt_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ DemoTreLgt* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Demo_Tre_Lgt/func_808E0F4C.s")
+ SkelCurve_Destroy(globalCtx, &this->skelCurve);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Demo_Tre_Lgt/func_808E0FE0.s")
+void DemoTreLgt_SetupWait(DemoTreLgt* this) {
+ this->action = DEMO_TRE_LGT_ACTION_WAIT;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Demo_Tre_Lgt/DemoTreLgt_Update.s")
+void DemoTreLgt_Wait(DemoTreLgt* this, GlobalContext* globalCtx) {
+ EnBox* chest = (EnBox*)this->actor.parent;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Demo_Tre_Lgt/func_808E12A4.s")
+ if (chest != NULL) {
+ if (Animation_OnFrame(&chest->skelAnime, 10.0f)) {
+ DemoTreLgt_SetupAnimate(this, globalCtx, chest->skelAnime.curFrame);
+ }
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s")
+void DemoTreLgt_SetupAnimate(DemoTreLgt* this, GlobalContext* globalCtx, f32 frame) {
+ this->action = DEMO_TRE_LGT_ACTION_ANIMATE;
+ SkelCurve_SetAnim(&this->skelCurve, sBoxLightAnimations[this->animationType], 1.0f,
+ D_808E1490[this->animationType].unk4 + D_808E1490[this->animationType].unk8, frame, 1.0f);
+ SkelCurve_Update(globalCtx, &this->skelCurve);
+}
+
+void DemoTreLgt_Animate(DemoTreLgt* this, GlobalContext* globalCtx) {
+ f32 curFrame = this->skelCurve.curFrame;
+
+ if (curFrame < D_808E1490[this->animationType].unk4) {
+ this->colorAlpha1 = 255;
+ } else if (curFrame <= (D_808E1490[this->animationType].unk4 + D_808E1490[this->animationType].unk8)) {
+ this->colorAlpha1 =
+ ((D_808E1490[this->animationType].unk4 - curFrame) / D_808E1490[this->animationType].unk8) * 255 + 255;
+ } else {
+ this->colorAlpha1 = 0;
+ }
+
+ if (curFrame < D_808E1490[this->animationType].unkC) {
+ this->colorAlpha2 = 255;
+ } else if (curFrame < (D_808E1490[this->animationType].unkC + 10.0f)) {
+ this->colorAlpha2 = ((D_808E1490[this->animationType].unkC - curFrame) / 10.0f) * 255 + 255;
+ } else {
+ this->colorAlpha2 = 0;
+ }
+ if (curFrame > 30.0f) {
+ if (!(this->status & 1)) {
+ this->status |= 1;
+ Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_TRE_BOX_FLASH);
+ }
+ }
+ if (SkelCurve_Update(globalCtx, &this->skelCurve)) {
+ Actor_MarkForDeath(&this->actor);
+ }
+}
+
+void DemoTreLgt_Update(Actor* thisx, GlobalContext* globalCtx) {
+ DemoTreLgt* this = THIS;
+
+ sActionFuncs[this->action](this, globalCtx);
+}
+
+s32 DemoTreLgt_OverrideLimbDraw(GlobalContext* globalCtx, SkelCurve* skelCuve, s32 limbIndex, Actor* thisx) {
+ s32 pad;
+ DemoTreLgt* this = THIS;
+
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+
+ gSPSegment(POLY_XLU_DISP++, 0x08,
+ Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (globalCtx->state.frames * 2) % 256, 0, 64, 32, 1,
+ (globalCtx->state.frames * -2) % 256, 0, 64, 32));
+
+ if (limbIndex == OBJECT_BOX_LIGHT_LIMB_01) {
+ gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 180, this->colorAlpha1);
+ } else if ((limbIndex == OBJECT_BOX_LIGHT_LIMB_13) || (limbIndex == OBJECT_BOX_LIGHT_LIMB_07) ||
+ (limbIndex == OBJECT_BOX_LIGHT_LIMB_04) || (limbIndex == OBJECT_BOX_LIGHT_LIMB_10)) {
+ gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 180, this->colorAlpha2);
+ }
+
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+
+ return true;
+}
+
+void DemoTreLgt_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
+ DemoTreLgt* this = THIS;
+
+ OPEN_DISPS(gfxCtx);
+ if (this->action == DEMO_TRE_LGT_ACTION_ANIMATE) {
+ func_8012C2DC(gfxCtx);
+ gDPSetEnvColor(POLY_XLU_DISP++, 200, 255, 0, 0);
+ SkelCurve_Draw(&this->actor, globalCtx, &this->skelCurve, DemoTreLgt_OverrideLimbDraw, NULL, 1, &this->actor);
+ }
+ CLOSE_DISPS(gfxCtx);
+}
diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
index 07e2a9bc8..27f6d09b1 100644
--- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
+++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
@@ -2,12 +2,20 @@
#define Z_DEMO_TRE_LGT_H
#include "global.h"
+#include "z64curve.h"
struct DemoTreLgt;
+typedef void (*DemoTreLgtActionFunc)(struct DemoTreLgt* this, GlobalContext* globalCtx);
+
typedef struct DemoTreLgt {
/* 0x000 */ Actor actor;
- /* 0x144 */ char unk_144[0x34];
+ /* 0x144 */ SkelCurve skelCurve;
+ /* 0x164 */ s32 action;
+ /* 0x168 */ u32 colorAlpha1;
+ /* 0x16C */ u32 colorAlpha2;
+ /* 0x170 */ u8 status;
+ /* 0x174 */ s32 animationType;
} DemoTreLgt; // size = 0x178
extern const ActorInit Demo_Tre_Lgt_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c
index aa4abb91d..93845cc5c 100644
--- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c
+++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c
@@ -15,9 +15,9 @@ void DmBal_Destroy(Actor* thisx, GlobalContext* globalCtx);
void DmBal_Update(Actor* thisx, GlobalContext* globalCtx);
void DmBal_Draw(Actor* thisx, GlobalContext* globalCtx);
+void func_80C1EAC4(DmBal* this);
void func_80C1EAD8(DmBal* this, GlobalContext* globalCtx);
-#if 0
const ActorInit Dm_Bal_InitVars = {
ACTOR_DM_BAL,
ACTORCAT_NPC,
@@ -30,31 +30,176 @@ const ActorInit Dm_Bal_InitVars = {
(ActorFunc)DmBal_Draw,
};
-#endif
+static AnimationInfo D_80C1F170[] = {
+ { &object_bal_Anim_0005FC, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f },
+ { &object_bal_Anim_000840, 1.5f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f },
+ { &object_bal_Anim_000840, 1.5f, 0.0f, 0.0f, ANIMMODE_ONCE, -4.0f },
+ { &object_bal_Anim_00A7DC, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -4.0f },
+ { &object_bal_Anim_00B1E8, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f },
+ { &object_bal_Anim_00B604, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f },
+ { &object_bal_Anim_00C498, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -8.0f },
+ { &object_bal_Anim_00C8D8, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f },
+ { &object_bal_Anim_00C8D8, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -8.0f },
+ { &object_bal_Anim_00C498, 1.0f, 23.0f, 0.0f, ANIMMODE_ONCE, -8.0f },
+ { &object_bal_Anim_00D530, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -8.0f },
+ { &object_bal_Anim_000C78, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -2.0f },
+ { &object_bal_Anim_00CB78, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -2.0f },
+ { &object_bal_Anim_001804, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -2.0f },
+};
-extern UNK_TYPE D_060005FC;
-extern UNK_TYPE D_06001804;
+void DmBal_Init(Actor* thisx, GlobalContext* globalCtx) {
+ DmBal* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/DmBal_Init.s")
+ this->actor.targetMode = 1;
+ this->actor.uncullZoneForward = 3000.0f;
+ Actor_SetScale(&this->actor, 0.02f);
+ ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bal_Skel_00A6D0, &object_bal_Anim_0005FC, this->jointTable,
+ this->morphTable, OBJECT_BAL_LIMB_MAX);
+ Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
+ this->timer = 60;
+ this->eyeIndex = 0;
+ this->unk_336 = 0;
+ func_80C1EAC4(this);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/DmBal_Destroy.s")
+void DmBal_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/func_80C1EAC4.s")
+void func_80C1EAC4(DmBal* this) {
+ this->actionFunc = func_80C1EAD8;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/func_80C1EAD8.s")
+void func_80C1EAD8(DmBal* this, GlobalContext* globalCtx) {
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/func_80C1EAE8.s")
+void func_80C1EAE8(DmBal* this, GlobalContext* globalCtx) {
+ static u16 D_80C1F2C0 = 0x63;
+ s32 actionIndex;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/func_80C1EC60.s")
+ if (Cutscene_CheckActorAction(globalCtx, 0x238)) {
+ actionIndex = Cutscene_GetActorActionIndex(globalCtx, 0x238);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/func_80C1ED0C.s")
+ if (D_80C1F2C0 != globalCtx->csCtx.actorActions[actionIndex]->action) {
+ D_80C1F2C0 = globalCtx->csCtx.actorActions[actionIndex]->action;
+ switch (globalCtx->csCtx.actorActions[actionIndex]->action) {
+ case 1:
+ this->unk_336 = 0;
+ this->eyeIndex = 0;
+ Actor_ChangeAnimationByInfo(&this->skelAnime, D_80C1F170, 0);
+ break;
+ case 2:
+ this->unk_336 = 1;
+ Actor_ChangeAnimationByInfo(&this->skelAnime, D_80C1F170, 12);
+ break;
+ case 3:
+ Actor_ChangeAnimationByInfo(&this->skelAnime, D_80C1F170, 13);
+ break;
+ }
+ } else if (D_80C1F2C0 == 3) {
+ if (Animation_OnFrame(&this->skelAnime, 0.0f)) {
+ this->unk_336 = 1;
+ } else if (Animation_OnFrame(&this->skelAnime, 29.0f)) {
+ this->unk_336 = 0;
+ this->eyeIndex = 0;
+ }
+ }
+ Cutscene_ActorTranslateAndYaw(&this->actor, globalCtx, actionIndex);
+ this->actor.home.pos = this->actor.world.pos;
+ } else {
+ this->unk_336 = 0;
+ this->eyeIndex = 0;
+ D_80C1F2C0 = 0x63;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/func_80C1ED64.s")
+void func_80C1EC60(DmBal* this, GlobalContext* globalCtx) {
+ f32 temp_fv1_2;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/DmBal_Update.s")
+ this->unk_338 += 0x320;
+ this->unk_33A += 0x3E8;
+ this->scale.y = this->scale.z = Math_CosS(this->unk_338) * 0.1f + 1.0f;
+ temp_fv1_2 = (Math_SinS(this->unk_338) * 0.1f) + 1.0f;
+ this->scale.x = SQ(temp_fv1_2);
+ this->actor.world.pos.y = this->actor.home.pos.y + (Math_SinS(this->unk_338) * 25.0f);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/func_80C1EF80.s")
+void func_80C1ED0C(DmBal* this) {
+ if (this->unk_336 == 1) {
+ this->eyeIndex = 1;
+ } else if (this->timer >= 4) {
+ this->timer--;
+ } else if (this->timer != 0) {
+ this->eyeIndex = 1;
+ this->timer--;
+ } else {
+ this->eyeIndex = 0;
+ this->timer = 60;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/func_80C1F060.s")
+void func_80C1ED64(DmBal* this, GlobalContext* globalCtx, Vec3f* arg2, Vec3f* arg3, f32 arg4) {
+ Actor* paper = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_PAPER, arg2->x, arg2->y, arg2->z, 0, 0, 0, 0);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Bal/DmBal_Draw.s")
+ if (paper != NULL) {
+ paper->velocity = *arg3;
+ paper->gravity = arg4;
+ }
+}
+
+Vec3f D_80C1F2C4 = { 0.0f, 9.0f, 0.0f };
+
+void DmBal_Update(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ DmBal* this = THIS;
+ Vec3f sp3C;
+ Vec3f sp30;
+
+ if (Animation_OnFrame(&this->skelAnime, 29.0f) && (this->skelAnime.animation == &object_bal_Anim_001804)) {
+ sp3C = this->actor.world.pos;
+ sp30 = D_80C1F2C4;
+ sp3C.x += 7.0f * Math_SinS(this->actor.shape.rot.y);
+ sp3C.y += 2.5f;
+ sp3C.z += 7.0f * Math_CosS(this->actor.shape.rot.y);
+ sp30.x = Math_SinS(this->actor.shape.rot.y) * 5.0f;
+ sp30.z = Math_CosS(this->actor.shape.rot.y) * 5.0f;
+ func_80C1ED64(this, globalCtx, &sp3C, &sp30, -0.4f);
+ func_80C1ED64(this, globalCtx, &sp3C, &sp30, -0.5f);
+ }
+ this->actionFunc(this, globalCtx);
+ func_80C1EAE8(this, globalCtx);
+ func_80C1EC60(this, globalCtx);
+ func_80C1ED0C(this);
+ SkelAnime_Update(&this->skelAnime);
+}
+
+s32 DmBal_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
+ DmBal* this = THIS;
+ Vec3s rots;
+
+ if (limbIndex == 6) {
+ rots.x = Math_SinS(this->unk_33A) * 3640.0f;
+ rots.z = Math_CosS(this->unk_33A) * 3640.0f;
+ Matrix_RotateZYX(rots.x, 0, rots.z, MTXMODE_APPLY);
+ Matrix_Scale(this->scale.x, this->scale.y, this->scale.z, MTXMODE_APPLY);
+ Matrix_RotateZS(-rots.z, MTXMODE_APPLY);
+ Matrix_RotateXS(-rots.x, MTXMODE_APPLY);
+ }
+ return false;
+}
+
+void DmBal_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
+}
+
+TexturePtr sEyeTextures[] = { object_bal_Tex_006050, object_bal_Tex_0094D0 };
+
+void DmBal_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ DmBal* this = THIS;
+
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+ func_8012C28C(globalCtx->state.gfxCtx);
+ gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex]));
+ SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+ DmBal_OverrideLimbDraw, DmBal_PostLimbDraw, &this->actor);
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h
index 19c481ab6..1a09abb1b 100644
--- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h
+++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.h
@@ -2,17 +2,26 @@
#define Z_DM_BAL_H
#include "global.h"
+#include "objects/object_bal/object_bal.h"
struct DmBal;
typedef void (*DmBalActionFunc)(struct DmBal*, GlobalContext*);
typedef struct DmBal {
- /* 0x0000 */ Actor actor;
- /* 0x0144 */ char unk_144[0x44];
- /* 0x0188 */ DmBalActionFunc actionFunc;
- /* 0x018C */ char unk_18C[0x1B0];
-} DmBal; // size = 0x33C
+ /* 0x000 */ Actor actor;
+ /* 0x144 */ SkelAnime skelAnime;
+ /* 0x188 */ DmBalActionFunc actionFunc;
+ /* 0x18C */ Vec3f scale;
+ /* 0x198 */ s32 eyeIndex;
+ /* 0x262 */ Vec3s jointTable[OBJECT_BAL_LIMB_MAX];
+ /* 0x19C */ Vec3s morphTable[OBJECT_BAL_LIMB_MAX];
+ /* 0x328 */ UNK_TYPE1 pad_328[12];
+ /* 0x334 */ s16 timer;
+ /* 0x336 */ s16 unk_336;
+ /* 0x338 */ s16 unk_338;
+ /* 0x33A */ s16 unk_33A;
+} DmBal; /* size = 0x33C */
extern const ActorInit Dm_Bal_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c
index ef81bc467..565c14ea3 100644
--- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c
+++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c
@@ -5,6 +5,7 @@
*/
#include "z_dm_opstage.h"
+#include "objects/object_keikoku_demo/object_keikoku_demo.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)
@@ -15,11 +16,8 @@ void DmOpstage_Destroy(Actor* thisx, GlobalContext* globalCtx);
void DmOpstage_Update(Actor* thisx, GlobalContext* globalCtx);
void DmOpstage_Draw(Actor* thisx, GlobalContext* globalCtx);
-void func_80A9FA58(DmOpstage* this, GlobalContext* globalCtx);
+void DmOpstage_FollowCutsceneScript(DmOpstage* this, GlobalContext* globalCtx);
-void DmOpstage_SetupAction(DmOpstage* this, DmOpstageActionFunc actionFunc);
-
-#if 0
const ActorInit Dm_Opstage_InitVars = {
ACTOR_DM_OPSTAGE,
ACTORCAT_ITEMACTION,
@@ -32,26 +30,102 @@ const ActorInit Dm_Opstage_InitVars = {
(ActorFunc)DmOpstage_Draw,
};
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80A9FD30[] = {
+static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneScale, 300, ICHAIN_STOP),
};
-#endif
+void DmOpstage_SetupAction(DmOpstage* this, DmOpstageActionFunc actionFunc) {
+ this->actionFunc = actionFunc;
+}
-extern InitChainEntry D_80A9FD30[];
+void DmOpstage_Init(Actor* thisx, GlobalContext* globalCtx) {
+ DmOpstage* this = THIS;
-extern UNK_TYPE D_06000978;
-extern UNK_TYPE D_06001C98;
+ Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
+ DmOpstage_SetupAction(this, DmOpstage_FollowCutsceneScript);
+ Actor_SetScale(&this->dyna.actor, 0.1f);
+ if (DMOPSTAGE_GET_TYPE(&this->dyna.actor) == DM_OPSTAGE_TYPE_FLOOR) {
+ DynaPolyActor_Init(&this->dyna, 0);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_keikoku_demo_Colheader_001C98);
+ }
+ if (DMOPSTAGE_GET_TYPE(&this->dyna.actor) > DM_OPSTAGE_TYPE_FLOOR) {
+ this->pos.x = this->dyna.actor.world.pos.x;
+ this->pos.y = this->dyna.actor.world.pos.y;
+ this->pos.z = this->dyna.actor.world.pos.z;
+ this->dyna.actor.world.pos.x = 0.0f;
+ this->dyna.actor.world.pos.y = 0.0f;
+ this->dyna.actor.world.pos.z = 0.0f;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Opstage/DmOpstage_SetupAction.s")
+void DmOpstage_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ DmOpstage* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Opstage/DmOpstage_Init.s")
+ if (DMOPSTAGE_GET_TYPE(&this->dyna.actor) == DM_OPSTAGE_TYPE_FLOOR) {
+ DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Opstage/DmOpstage_Destroy.s")
+void DmOpstage_FollowCutsceneScript(DmOpstage* this, GlobalContext* globalCtx) {
+ s32 actionIndex;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Opstage/func_80A9FA58.s")
+ if (DMOPSTAGE_GET_TYPE(&this->dyna.actor) == DM_OPSTAGE_TYPE_FLOOR) {
+ if (Cutscene_CheckActorAction(globalCtx, 0x73)) {
+ actionIndex = Cutscene_GetActorActionIndex(globalCtx, 0x73);
+ if (globalCtx->csCtx.actorActions[actionIndex]->action == 2) {
+ this->dyna.actor.scale.x = 0.075f;
+ this->dyna.actor.scale.z = 0.3f;
+ } else {
+ this->dyna.actor.scale.x = 0.1f;
+ this->dyna.actor.scale.z = 0.1f;
+ }
+ Cutscene_ActorTranslateAndYaw(&this->dyna.actor, globalCtx, actionIndex);
+ }
+ } else if (Cutscene_CheckActorAction(globalCtx, DMOPSTAGE_GET_08(&this->dyna.actor) + 0x74)) {
+ Cutscene_ActorTranslateAndYaw(
+ &this->dyna.actor, globalCtx,
+ Cutscene_GetActorActionIndex(globalCtx, DMOPSTAGE_GET_08(&this->dyna.actor) + 0x74));
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Opstage/DmOpstage_Update.s")
+void DmOpstage_Update(Actor* thisx, GlobalContext* globalCtx) {
+ DmOpstage* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Opstage/DmOpstage_Draw.s")
+ this->actionFunc(this, globalCtx);
+ if ((globalCtx->sceneNum == SCENE_SPOT00) && (gSaveContext.sceneSetupIndex == 0) &&
+ (globalCtx->csCtx.frames == 480)) {
+ func_8019F128(NA_SE_EV_NAVY_FLY_REBIRTH);
+ }
+}
+
+void DmOpstage_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ DmOpstage* this = THIS;
+
+ if (DMOPSTAGE_GET_TYPE(&this->dyna.actor) > DM_OPSTAGE_TYPE_FLOOR) {
+ Matrix_Translate(this->dyna.actor.world.pos.x + this->pos.x, this->dyna.actor.world.pos.y + this->pos.y,
+ this->dyna.actor.world.pos.z + this->pos.z, MTXMODE_NEW);
+ Matrix_RotateYS(this->dyna.actor.world.rot.y, MTXMODE_APPLY);
+ Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY);
+ }
+ switch (DMOPSTAGE_GET_TYPE(&this->dyna.actor)) {
+ case DM_OPSTAGE_TYPE_FLOOR:
+ Gfx_DrawDListOpa(globalCtx, object_keikoku_demo_DL_000978);
+ Gfx_DrawDListXlu(globalCtx, object_keikoku_demo_DL_000970);
+ break;
+
+ case DM_OPSTAGE_TYPE_TREE1:
+ Gfx_DrawDListOpa(globalCtx, object_keikoku_demo_DL_002878);
+ Gfx_DrawDListXlu(globalCtx, object_keikoku_demo_DL_002870);
+ break;
+
+ case DM_OPSTAGE_TYPE_TREE2:
+ Gfx_DrawDListOpa(globalCtx, object_keikoku_demo_DL_003068);
+ Gfx_DrawDListXlu(globalCtx, object_keikoku_demo_DL_003060);
+ break;
+
+ case DM_OPSTAGE_TYPE_TREE3:
+ Gfx_DrawDListOpa(globalCtx, object_keikoku_demo_DL_003728);
+ Gfx_DrawDListXlu(globalCtx, object_keikoku_demo_DL_003720);
+ break;
+ }
+}
diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h
index b0d0637e6..96fa6d31b 100644
--- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h
+++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h
@@ -3,17 +3,26 @@
#include "global.h"
+#define DMOPSTAGE_GET_TYPE(thisx) (((thisx)->params & 0xFF))
+#define DMOPSTAGE_GET_08(thisx) (((thisx)->params >> 8) & 0xFF)
+
struct DmOpstage;
typedef void (*DmOpstageActionFunc)(struct DmOpstage*, GlobalContext*);
-
typedef struct DmOpstage {
- /* 0x0000 */ Actor actor;
- /* 0x0144 */ char unk_144[0x5C];
- /* 0x01A0 */ DmOpstageActionFunc actionFunc;
- /* 0x01A4 */ char unk_1A4[0xC];
+ /* 0x000 */ DynaPolyActor dyna;
+ /* 0x15C */ UNK_TYPE1 pad_15C[0x44];
+ /* 0x1A0 */ DmOpstageActionFunc actionFunc;
+ /* 0x1A4 */ Vec3f pos;
} DmOpstage; // size = 0x1B0
+typedef enum {
+ /* 0 */ DM_OPSTAGE_TYPE_FLOOR,
+ /* 1 */ DM_OPSTAGE_TYPE_TREE1,
+ /* 2 */ DM_OPSTAGE_TYPE_TREE2,
+ /* 3 */ DM_OPSTAGE_TYPE_TREE3,
+} DmOpStageTypes;
+
extern const ActorInit Dm_Opstage_InitVars;
#endif // Z_DM_OPSTAGE_H
diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c
index 4d5a20114..88932cd71 100644
--- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c
+++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c
@@ -30,7 +30,7 @@ const ActorInit Dm_Sa_InitVars = {
(ActorFunc)DmSa_Draw,
};
-static AnimationInfo D_80A2ED00[] = { { &object_stk_Anim_00CC94, 1.0f, 0, -1.0f, ANIMMODE_LOOP, 0 } };
+static AnimationInfo D_80A2ED00[] = { { &gSkullKidTPoseAnim, 1.0f, 0, -1.0f, ANIMMODE_LOOP, 0 } };
void func_80A2E960(SkelAnime* arg0, AnimationInfo* animations, u16 index) {
f32 frameCount;
@@ -52,7 +52,7 @@ void DmSa_Init(Actor* thisx, GlobalContext* globalCtx) {
this->alpha = 0xFF;
this->actor.targetArrowOffset = 3000.0f;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_stk_Skel_013328, NULL, NULL, NULL, 0);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gSkullKidSkel, NULL, NULL, NULL, 0);
func_80A2E960(&this->skelAnime, D_80A2ED00, 0);
Actor_SetScale(&this->actor, 0.01f);
this->actionFunc = DmSa_DoNothing;
diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
index 6b63a474e..81e4f0bf4 100644
--- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
+++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
@@ -1,11 +1,14 @@
/*
* File: z_dm_stk.c
* Overlay: ovl_Dm_Stk
- * Description: Skull Kid (cutscene)
+ * Description: Skull Kid. Also manages Majora's Mask in the cutscene where its backstory is explained.
+ *
+ * This actor is responsible for some somewhat unintuitive things. For example, during certain cutscenes,
+ * it is responsible for handling the player's sound effects as well. As another example, this actor makes
+ * time pass when the player looks through the Astral Observatory telescope.
*/
#include "z_dm_stk.h"
-#include "objects/object_stk/object_stk.h"
#include "objects/object_stk2/object_stk2.h"
#include "objects/object_stk3/object_stk3.h"
@@ -18,20 +21,134 @@ void DmStk_Destroy(Actor* thisx, GlobalContext* globalCtx);
void DmStk_Update(Actor* thisx, GlobalContext* globalCtx);
void DmStk_Draw(Actor* thisx, GlobalContext* globalCtx);
-void func_80AA16F4(DmStk* this, GlobalContext* globalCtx);
-void func_80AA1704(DmStk* this, GlobalContext* globalCtx);
-void func_80AA1714(DmStk* this, GlobalContext* globalCtx);
-void func_80AA17F8(DmStk* this, GlobalContext* globalCtx);
-void func_80AA18D8(DmStk* this, GlobalContext* globalCtx);
-void func_80AA192C(DmStk* this, GlobalContext* globalCtx);
-void func_80AA1998(DmStk* this, GlobalContext* globalCtx);
-void func_80AA19EC(DmStk* this, GlobalContext* globalCtx);
-void func_80AA1A50(DmStk* this, GlobalContext* globalCtx);
-void func_80AA1AC8(DmStk* this, GlobalContext* globalCtx);
-void func_80AA1B9C(DmStk* this, GlobalContext* globalCtx);
-void func_80AA1C64(DmStk* this, GlobalContext* globalCtx);
-void func_80AA2720(DmStk* this, GlobalContext* globalCtx);
-void func_80AA27EC(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_DoNothing(DmStk* this, GlobalContext* globalCtx);
+void DmStk_DoNothing(DmStk* this, GlobalContext* globalCtx);
+void DmStk_WaitForTelescope(DmStk* this, GlobalContext* globalCtx);
+void DmStk_StartTelescopeCutscene(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_StartIntroCutsceneVersion1(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_WaitForIntroCutsceneVersion1ToEnd(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_StartIntroCutsceneVersion2(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_WaitForIntroCutsceneVersion2ToEnd(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_StartDropOcarinaCutscene(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_WaitForDropOcarinaCutsceneToEnd(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_DeflectHit(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_WaitForDeflectionToEnd(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_IdleWithOcarina(DmStk* this, GlobalContext* globalCtx);
+void DmStk_ClockTower_Idle(DmStk* this, GlobalContext* globalCtx);
+
+typedef enum {
+ /* 0 */ SK_ANIMATION_SHAKE_HEAD,
+ /* 1 */ SK_ANIMATION_WALK,
+ /* 2 */ SK_ANIMATION_LOOK_AROUND, // Not used in the final game
+ /* 3 */ SK_ANIMATION_IDLE,
+ /* 4 */ SK_ANIMATION_UNUSED_IDLE, // Unused duplicate of SK_ANIMATION_IDLE
+ /* 5 */ SK_ANIMATION_BENT_OVER_HEAD_TWITCH,
+ /* 6 */ SK_ANIMATION_GLITCHY_HORSE_RIDE_START, // Not used in the final game
+ /* 7 */ SK_ANIMATION_RECLINING_FLOAT,
+ /* 8 */ SK_ANIMATION_CURSE_START,
+ /* 9 */ SK_ANIMATION_CURSE_LOOP,
+ /* 10 */ SK_ANIMATION_LAUGH_START,
+ /* 11 */ SK_ANIMATION_LAUGH_LOOP,
+ /* 12 */ SK_ANIMATION_HIDE_OCARINA_START,
+ /* 13 */ SK_ANIMATION_HIDE_OCARINA_LOOP,
+ /* 14 */ SK_ANIMATION_PICK_UP_OCARINA_AND_START_PLAYING,
+ /* 15 */ SK_ANIMATION_PLAY_OCARINA_AND_LAUGH,
+ /* 16 */ SK_ANIMATION_PICK_UP_OCARINA, // Not used in the final game
+ /* 17 */ SK_ANIMATION_LOOK_AT_OCARINA, // Not used in the final game
+ /* 18 */ SK_ANIMATION_KICK_OVER_LINK,
+ /* 19 */ SK_ANIMATION_SEARCH_LINK,
+ /* 20 */ SK_ANIMATION_UNUSED_KICK_OVER_LINK, // Unused duplicate of SK_ANIMATION_KICK_OVER_LINK
+ /* 21 */ SK_ANIMATION_UNUSED_SEARCH_LINK, // Unused duplicate of SK_ANIMATION_SEARCH_LINK
+ /* 22 */ SK_ANIMATION_HORSE_RIDE_START,
+ /* 23 */ SK_ANIMATION_HORSE_RIDE_LOOP,
+ /* 24 */ SK_ANIMATION_RAISE_MASK_START,
+ /* 25 */ SK_ANIMATION_RAISE_MASK_LOOP,
+ /* 26 */ SK_ANIMATION_LOWER_MASK,
+ /* 27 */ SK_ANIMATION_JUMP_WHILE_HIDING_OCARINA,
+ /* 28 */ SK_ANIMATION_HORSE_RIDE_AND_ROTATE, // Used when Link gets thrown off his horse
+ /* 29 */ SK_ANIMATION_PLAY_OCARINA_WHILE_FLOATING,
+ /* 30 */ SK_ANIMATION_FLOATING_TURN_AROUND,
+ /* 31 */ SK_ANIMATION_OCARINA_JUGGLE,
+ /* 32 */ SK_ANIMATION_CALL_DOWN_MOON_START,
+ /* 33 */ SK_ANIMATION_CALL_DOWN_MOON_LOOP,
+ /* 34 */ SK_ANIMATION_SMACK_FAIRY_START,
+ /* 35 */ SK_ANIMATION_SMACK_FAIRY_LOOP,
+ /* 36 */ SK_ANIMATION_HIT_BY_BUBBLE,
+ /* 37 */ SK_ANIMATION_DROP_OCARINA,
+ /* 38 */ SK_ANIMATION_FLOATING_ARMS_CROSSED,
+ /* 39 */ SK_ANIMATION_DEFLECT_ATTACK,
+ /* 40 */ SK_ANIMATION_TELESCOPE_LOOK_UP_START,
+ /* 41 */ SK_ANIMATION_TELESCOPE_LOOK_UP_LOOP,
+ /* 42 */ SK_ANIMATION_SURPRISE_START,
+ /* 43 */ SK_ANIMATION_SURPRISE_LOOP,
+ /* 44 */ SK_ANIMATION_LOOK_AROUND_FOR_GIANTS_START,
+ /* 45 */ SK_ANIMATION_LOOK_AROUND_FOR_GIANTS_LOOP,
+ /* 46 */ SK_ANIMATION_HOLD_HEAD_AND_SHAKE_START,
+ /* 47 */ SK_ANIMATION_HOLD_HEAD_AND_SHAKE_LOOP,
+ /* 48 */ SK_ANIMATION_HOLD_HEAD_AND_SCREAM_START,
+ /* 49 */ SK_ANIMATION_HOLD_HEAD_AND_SCREAM_LOOP,
+ /* 50 */ SK_ANIMATION_HUDDLE_WITH_FAIRIES,
+ /* 51 */ SK_ANIMATION_SEARCH_MASK_SALESMAN,
+ /* 52 */ SK_ANIMATION_HOLD_UP_MASK_START,
+ /* 53 */ SK_ANIMATION_HOLD_UP_MASK_LOOP,
+ /* 54 */ SK_ANIMATION_SHIVER,
+ /* 55 */ SK_ANIMATION_DRAW,
+ /* 56 */ SK_ANIMATION_BENT_OVER_LOOK_UP,
+ /* 57 */ SK_ANIMATION_SPANK,
+ /* 58 */ SK_ANIMATION_HIP_SHAKE_AND_JUMP,
+ /* 59 */ SK_ANIMATION_PLAY_FLUTE,
+ /* 60 */ SK_ANIMATION_CARTWHEEL,
+ /* 61 */ SK_ANIMATION_LIE_FLAT,
+ /* 62 */ SK_ANIMATION_DANGLE_FROM_MASK_START,
+ /* 63 */ SK_ANIMATION_DANGLE_FROM_MASK_LOOP,
+ /* 64 */ SK_ANIMATION_DROPPED_FROM_MASK,
+ /* 65 */ SK_ANIMATION_LOOK_UP_AT_GIANTS,
+ /* 66 */ SK_ANIMATION_ASHAMED_START,
+ /* 67 */ SK_ANIMATION_ASHAMED_LOOP,
+ /* 68 */ SK_ANIMATION_LOOK_LEFT_START,
+ /* 69 */ SK_ANIMATION_LOOK_LEFT_LOOP,
+ /* 70 */ SK_ANIMATION_SNIFF,
+ /* 71 */ SK_ANIMATION_LAUGH_AFTER_SNIFF,
+} SkullKidAnimationIndex;
+
+typedef enum {
+ /* 0 */ SK_MASK_TYPE_NO_MASK,
+ /* 1 */ SK_MASK_TYPE_NORMAL,
+ /* 2 */ SK_MASK_TYPE_GLOWING_EYES,
+ /* 3 */ SK_MASK_TYPE_FADING_OUT,
+ /* 9 */ SK_MASK_TYPE_RAISED = 9,
+} SkullKidMaskType;
+
+typedef enum {
+ /* 0 */ SK_HAND_TYPE_HOLDING_LINK_MASK_AND_FLUTE,
+ /* 1 */ SK_HAND_TYPE_HOLDING_LINK_MASK,
+ /* 2 */ SK_HAND_TYPE_HOLDING_MAJORAS_MASK,
+ /* 3 */ SK_HAND_TYPE_HOLDING_OCARINA,
+ /* 4 */ SK_HAND_TYPE_JUGGLING_OR_DROPPING_OCARINA,
+ /* 5 */ SK_HAND_TYPE_HOLDING_MAJORAS_MASK_AND_FLUTE,
+ /* 6 */ SK_HAND_TYPE_HOLDING_FLUTE,
+ /* 9 */ SK_HAND_TYPE_DEFAULT = 9,
+} SkullKidHandType;
+
+typedef enum {
+ /* 0 */ SK_FADE_IN_STATE_NONE,
+ /* 1 */ SK_FADE_IN_STATE_START,
+ /* 2 */ SK_FADE_IN_STATE_INCREASE_FOG,
+ /* 3 */ SK_FADE_IN_STATE_INCREASE_ALPHA,
+} SkullKidFadeInState;
+
+typedef enum {
+ /* 0 */ SK_FADE_OUT_STATE_NONE,
+ /* 1 */ SK_FADE_OUT_STATE_FADING_OUT,
+} SkullKidFadeOutState;
+
+typedef enum {
+ /* 0 */ SK_DEKU_PIPES_CS_STATE_NOT_READY,
+ /* 1 */ SK_DEKU_PIPES_CS_STATE_READY,
+ /* 2 */ SK_DEKU_PIPES_CS_STATE_PLAYER_USED_OCARINA,
+ /* 3 */ SK_DEKU_PIPES_CS_STATE_START,
+ /* 4 */ SK_DEKU_PIPES_CS_STATE_END
+} SkullKidDekuPipesCutsceneState;
const ActorInit Dm_Stk_InitVars = {
ACTOR_DM_STK,
@@ -103,101 +220,111 @@ static DamageTable sDamageTable = {
};
static AnimationInfo sAnimations[] = {
- { &object_stk_Anim_01C21C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk_Anim_01D3D0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk_Anim_001030, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk_Anim_01D008, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk_Anim_01D008, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk_Anim_015C14, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_0070DC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_00D830, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_00055C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_00130C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_00C270, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_00CBB8, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_01AA80, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_01D07C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_016910, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_018ED0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_01DDE0, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_01EF50, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_02DC64, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_02E9A0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_02DC64, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_02E9A0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_0035C8, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_0049C8, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_0259F4, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_0266C8, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_026CF4, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_01C114, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_004580, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_020CAC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_02200C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_02336C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk_Anim_002774, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk_Anim_003068, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_0101A4, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_010B60, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_02A2D8, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_01F9E4, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_029A04, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_02AD54, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk_Anim_00BB2C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk_Anim_00C964, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_0110B4, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_011FB0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_012A58, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_0141E4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_00E6EC, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_00EEC0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_027CF4, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_028F28, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_03323C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_031210, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_0322FC, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_032AE0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_03021C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_036964, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk_Anim_016508, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk_Anim_015028, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk_Anim_014920, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_02FA70, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_037B94, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_03967C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_03967C, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk2_Anim_03A8F8, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk2_Anim_034FD8, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk3_Anim_005F44, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk3_Anim_002CD8, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk3_Anim_0039F0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk3_Anim_004554, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk3_Anim_0051C0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
- { &object_stk3_Anim_001374, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
- { &object_stk3_Anim_001EDC, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidShakeHeadAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidWalkAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidLookAroundAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidIdleAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidIdleAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidBentOverHeadTwitchAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidGlitchyHorseRideStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidRecliningFloatAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidCurseStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidCurseLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidLaughStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidLaughLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidHideOcarinaStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidHideOcarinaLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidPickUpOcarinaAndStartPlayingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidPlayOcarinaAndLaughAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidPickUpOcarinaAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidLookAtOcarinaAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidKickOverLinkAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidSearchLinkAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidKickOverLinkAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidSearchLinkAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidHorseRideStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidHorseRideLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidRaiseMaskStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidRaiseMaskLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidLowerMaskAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidJumpWhileHidingOcarinaAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidHorseRideAndRotateAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidPlayOcarinaWhileFloatingAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidFloatingTurnAroundAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidOcarinaJuggleAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidCallDownMoonStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidCallDownMoonLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidSmackFairyStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidSmackFairyLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidHitByBubbleAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidDropOcarinaAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidFloatingArmsCrossedAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidDeflectAttackAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidTelescopeLookUpStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidTelescopeLookUpLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidSurpriseStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidSurpriseLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidLookAroundForGiantsStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidLookAroundForGiantsLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidHoldHeadAndShakeStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidHoldHeadAndShakeLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidHoldHeadAndScreamStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidHoldHeadAndScreamLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidHuddleWithFairiesAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidSearchMaskSalesmanAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidHoldUpMaskStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidHoldUpMaskLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidShiverAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidDrawAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidBentOverLookUpAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidSpankAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidHipShakeAndJumpAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidPlayFluteAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidCartwheelAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidDangleFromMaskStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidDangleFromMaskStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidDangleFromMaskLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidDroppedFromMaskAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidLookUpAtGiantsAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidAshamedStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidAshamedLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidLookLeftStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidLookLeftLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
+ { &gSkullKidSniffAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+ { &gSkullKidLaughAfterSniffAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },
};
-void func_80A9FDB0(DmStk* this, GlobalContext* globalCtx) {
- s32 objectIdx;
+/**
+ * Ensures the correct object for the current animation is in segment 6.
+ */
+void DmStk_LoadObjectForAnimation(DmStk* this, GlobalContext* globalCtx) {
+ s32 objectIndex;
- if (((this->unk_2E0 >= 0) && (this->unk_2E0 <= 5)) || (this->unk_2E0 == 32) || (this->unk_2E0 == 33) ||
- (this->unk_2E0 == 40) || (this->unk_2E0 == 41)) {
- objectIdx = this->unk_336;
- } else if (this->unk_2E0 > 64) {
- objectIdx = this->unk_338;
+ if (((this->animationId >= SK_ANIMATION_SHAKE_HEAD) && (this->animationId <= SK_ANIMATION_BENT_OVER_HEAD_TWITCH)) ||
+ (this->animationId == SK_ANIMATION_CALL_DOWN_MOON_START) ||
+ (this->animationId == SK_ANIMATION_CALL_DOWN_MOON_LOOP) ||
+ (this->animationId == SK_ANIMATION_TELESCOPE_LOOK_UP_START) ||
+ (this->animationId == SK_ANIMATION_TELESCOPE_LOOK_UP_LOOP)) {
+ objectIndex = this->objectStkObjectIndex;
+ } else if (this->animationId >= SK_ANIMATION_LOOK_UP_AT_GIANTS) {
+ objectIndex = this->objectStk3ObjectIndex;
} else {
- objectIdx = this->unk_337;
+ objectIndex = this->objectStk2ObjectIndex;
}
- if (objectIdx >= 0) {
- gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objectIdx].segment);
+ if (objectIndex >= 0) {
+ gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objectIndex].segment);
}
}
-void func_80A9FE3C(DmStk* this, GlobalContext* globalCtx, SkelAnime* skelAnime, AnimationInfo* animation, u16 index) {
- func_80A9FDB0(this, globalCtx);
+/**
+ * This function is always called with unusedExtraOffset = 0.
+ */
+void DmStk_ChangeAnimation(DmStk* this, GlobalContext* globalCtx, SkelAnime* skelAnime, AnimationInfo* animation,
+ u16 unusedExtraOffset) {
+ DmStk_LoadObjectForAnimation(this, globalCtx);
- animation += index;
+ animation += unusedExtraOffset;
Animation_Change(skelAnime, animation->animation, animation->playSpeed, animation->startFrame,
(animation->frameCount < 0.0f) ? Animation_GetLastFrame(&animation->animation->common)
@@ -205,7 +332,12 @@ void func_80A9FE3C(DmStk* this, GlobalContext* globalCtx, SkelAnime* skelAnime,
animation->mode, animation->morphFrames);
}
-void func_80A9FED8(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the first part of the intro cutscene, i.e., the cutscene
+ * that starts when the player start a new game and ends when the screen fades to white
+ * after Skull Kid steals Epona.
+ */
+void DmStk_PlaySfxForIntroCutsceneFirstPart(DmStk* this, GlobalContext* globalCtx) {
switch (globalCtx->csCtx.frames + 20) {
case 1195:
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR);
@@ -291,13 +423,22 @@ void func_80A9FED8(DmStk* this, GlobalContext* globalCtx) {
}
}
-void func_80AA00CC(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * This is supposed to play a bell sound in the title cutscene where the Skull Kid is
+ * looking at the moon on top of the Clock Tower. However, it doesn't actually play
+ * any sound in-game, since all sound effects are muted when it plays.
+ */
+void DmStk_PlaySfxForTitleCutscene(DmStk* this, GlobalContext* globalCtx) {
if (globalCtx->csCtx.frames == 535) {
func_8019F128(NA_SE_EV_CLOCK_TOWER_BELL);
}
}
-void func_80AA0100(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the second part of the intro cutscene, i.e., the cutscene
+ * that starts after the fade-to-white and ends when the player gains control.
+ */
+void DmStk_PlaySfxForIntroCutsceneSecondPart(DmStk* this, GlobalContext* globalCtx) {
switch (globalCtx->csCtx.frames) {
case 78:
case 89:
@@ -325,7 +466,11 @@ void func_80AA0100(DmStk* this, GlobalContext* globalCtx) {
}
}
-void func_80AA0158(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the cutscene where Skull Kid steals Majora's Mask from
+ * the Happy Mask Salesman.
+ */
+void DmStk_PlaySfxForObtainingMajorasMaskCutscene(DmStk* this, GlobalContext* globalCtx) {
switch (globalCtx->csCtx.frames) {
case 18:
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_GASAGOSO);
@@ -341,7 +486,12 @@ void func_80AA0158(DmStk* this, GlobalContext* globalCtx) {
}
}
-void func_80AA01C0(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the first part of the curse cutscene, i.e., the cutscene
+ * that starts when Link falls down the large hole and ends with a fade-to-black to
+ * the hallucinatory Deku Scrubs scene.
+ */
+void DmStk_PlaySfxForCurseCutsceneFirstPart(DmStk* this, GlobalContext* globalCtx) {
switch (globalCtx->csCtx.frames) {
case 415:
func_801A479C(&this->actor.projectedPos, NA_SE_EN_STALKIDS_FLOAT, 100);
@@ -362,7 +512,12 @@ void func_80AA01C0(DmStk* this, GlobalContext* globalCtx) {
}
}
-void func_80AA0264(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the second part of the curse cutscene, i.e., the cutscene
+ * that starts once the hallucinatory Deku Scrubs scene is over and ends when the player
+ * gains control.
+ */
+void DmStk_PlaySfxForCurseCutsceneSecondPart(DmStk* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
switch (globalCtx->csCtx.frames) {
@@ -410,8 +565,13 @@ void func_80AA0264(DmStk* this, GlobalContext* globalCtx) {
}
}
-void func_80AA0420(DmStk* this, GlobalContext* globalCtx) {
- static s32 D_80AA3CB8 = 0;
+/**
+ * Handles sound effects for the intro cutscene at the top of the Clock Tower. Specifically,
+ * it handles the variation of the cutscene that plays the first time the player reaches the
+ * top of the Clock Tower, which is slightly longer.
+ */
+void DmStk_PlaySfxForClockTowerIntroCutsceneVersion1(DmStk* this, GlobalContext* globalCtx) {
+ static s32 sMoonCallTimer = 0;
switch (globalCtx->csCtx.frames) {
case 140:
@@ -436,7 +596,7 @@ void func_80AA0420(DmStk* this, GlobalContext* globalCtx) {
break;
}
- if ((this->unk_2E0 == 31) && (globalCtx->csCtx.frames < 700)) {
+ if ((this->animationId == SK_ANIMATION_OCARINA_JUGGLE) && (globalCtx->csCtx.frames < 700)) {
if (Animation_OnFrame(&this->skelAnime, 5.0f) || Animation_OnFrame(&this->skelAnime, 25.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_OTEDAMA1);
} else if (Animation_OnFrame(&this->skelAnime, 17.0f) || Animation_OnFrame(&this->skelAnime, 40.0f)) {
@@ -445,33 +605,44 @@ void func_80AA0420(DmStk* this, GlobalContext* globalCtx) {
}
if (globalCtx->csCtx.frames >= 700) {
- if (D_80AA3CB8 < 128) {
- if ((D_80AA3CB8 & 0x1F) == 0) {
+ if (sMoonCallTimer < 128) {
+ if ((sMoonCallTimer & 0x1F) == 0) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL20_CALL_MOON);
- } else if ((D_80AA3CB8 & 0x1F) == 16) {
+ } else if ((sMoonCallTimer & 0x1F) == 16) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL20_CALL_MOON2);
}
- D_80AA3CB8++;
+
+ sMoonCallTimer++;
}
} else {
- D_80AA3CB8 = 0;
+ sMoonCallTimer = 0;
}
}
-void func_80AA05F0(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the cutscene where Skull Kid drops the Ocarina of Time.
+ */
+void DmStk_PlaySfxForDroppingOcarinaCutscene(DmStk* this, GlobalContext* globalCtx) {
if (globalCtx->csCtx.frames == 3) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL06_SURPRISED);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_DOWN_K);
}
}
-void func_80AA0634(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the cutscene where Skull Kid is shivering in the rain.
+ */
+void DmStk_PlaySfxForShiveringInRainCutscene(DmStk* this, GlobalContext* globalCtx) {
if ((globalCtx->csCtx.frames >= 642) && (globalCtx->csCtx.frames < 845)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_NE_STAL23_COLD - SFX_FLAG);
}
}
-void func_80AA066C(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the cutscene where Skull Kid is playing with Tatl and Tael
+ * in Termina Field.
+ */
+void DmStk_PlaySfxForPlayingWithFairiesCutscene(DmStk* this, GlobalContext* globalCtx) {
switch (globalCtx->csCtx.frames) {
case 58:
case 61:
@@ -493,7 +664,12 @@ void func_80AA066C(DmStk* this, GlobalContext* globalCtx) {
}
}
-void func_80AA071C(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the first part of the ending cutscene, i.e., the cutscene
+ * that starts after the Dawn of the New Day screen and ends with a fade to black as
+ * the Giants are walking away.
+ */
+void DmStk_PlaySfxForEndingCutsceneFirstPart(DmStk* this, GlobalContext* globalCtx) {
switch (globalCtx->csCtx.frames) {
case 5:
func_801A4A28(12);
@@ -505,7 +681,11 @@ void func_80AA071C(DmStk* this, GlobalContext* globalCtx) {
}
}
-void func_80AA076C(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the second part of the ending cutscene, i.e., the cutscene
+ * that starts after a fade-to-black and ends after the credits start.
+ */
+void DmStk_PlaySfxForEndingCutsceneSecondPart(DmStk* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
switch (globalCtx->csCtx.frames) {
@@ -554,7 +734,7 @@ void func_80AA076C(DmStk* this, GlobalContext* globalCtx) {
break;
}
- if (this->unk_2E0 == 0) {
+ if (this->animationId == SK_ANIMATION_SHAKE_HEAD) {
if (Animation_OnFrame(&this->skelAnime, 8.0f) || Animation_OnFrame(&this->skelAnime, 17.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF);
}
@@ -562,19 +742,24 @@ void func_80AA076C(DmStk* this, GlobalContext* globalCtx) {
if (Animation_OnFrame(&this->skelAnime, 28.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_RIDE);
}
- } else if (this->unk_2E0 == 71) {
+ } else if (this->animationId == SK_ANIMATION_LAUGH_AFTER_SNIFF) {
if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 6.0f) ||
Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 18.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF);
}
- } else if ((this->unk_2E0 == 70) &&
+ } else if ((this->animationId == SK_ANIMATION_SNIFF) &&
(Animation_OnFrame(&this->skelAnime, 16.0f) || Animation_OnFrame(&this->skelAnime, 23.0f))) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_NOSE);
}
}
-void func_80AA09DC(DmStk* this, GlobalContext* globalCtx) {
- static s32 D_80AA3CBC = 0;
+/**
+ * Handles sound effects for the intro cutscene at the top of the Clock Tower. Specifically,
+ * it handles the variation of the cutscene that plays the second or later time the player
+ * reaches the top of the Clock Tower, which is slightly shorter.
+ */
+void DmStk_PlaySfxForClockTowerIntroCutsceneVersion2(DmStk* this, GlobalContext* globalCtx) {
+ static s32 sMoonCallTimer = 0;
switch (globalCtx->csCtx.frames) {
case 40:
@@ -596,27 +781,32 @@ void func_80AA09DC(DmStk* this, GlobalContext* globalCtx) {
}
if (globalCtx->csCtx.frames >= 408) {
- if (D_80AA3CBC < 128) {
- if ((D_80AA3CBC & 0x1F) == 0) {
+ if (sMoonCallTimer < 128) {
+ if ((sMoonCallTimer & 0x1F) == 0) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL20_CALL_MOON);
- } else if ((D_80AA3CBC & 0x1F) == 16) {
+ } else if ((sMoonCallTimer & 0x1F) == 16) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STAL20_CALL_MOON2);
}
- D_80AA3CBC++;
+
+ sMoonCallTimer++;
}
} else {
- D_80AA3CBC = 0;
+ sMoonCallTimer = 0;
}
}
-void func_80AA0B08(DmStk* this, GlobalContext* globalCtx) {
- this->unk_310.x = this->actor.projectedPos.x;
- this->unk_310.y = this->actor.projectedPos.y;
- this->unk_310.z = this->actor.projectedPos.z;
+/**
+ * Handles sound effects for the cutscene that plays after the player plays the
+ * Oath to Order at the top of the Clock Tower.
+ */
+void DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder(DmStk* this, GlobalContext* globalCtx) {
+ this->oathToOrderCutsceneVoicePos.x = this->actor.projectedPos.x;
+ this->oathToOrderCutsceneVoicePos.y = this->actor.projectedPos.y;
+ this->oathToOrderCutsceneVoicePos.z = this->actor.projectedPos.z;
switch (globalCtx->csCtx.frames) {
case 64:
- Audio_PlaySfxAtPos(&this->unk_310, NA_SE_EN_STAL06_SURPRISED);
+ Audio_PlaySfxAtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL06_SURPRISED);
break;
case 327:
@@ -636,11 +826,11 @@ void func_80AA0B08(DmStk* this, GlobalContext* globalCtx) {
case 486:
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_MASK_OFF);
- Audio_PlaySfxAtPos(&this->unk_310, NA_SE_EN_STAL08_CRY_BIG);
+ Audio_PlaySfxAtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL08_CRY_BIG);
break;
case 496:
- Audio_PlaySfxAtPos(&this->unk_310, NA_SE_EN_STAL09_SCREAM);
+ Audio_PlaySfxAtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL09_SCREAM);
break;
case 590:
@@ -652,7 +842,7 @@ void func_80AA0B08(DmStk* this, GlobalContext* globalCtx) {
break;
case 594:
- Audio_PlaySfxAtPos(&this->unk_310, NA_SE_EN_STAL24_SCREAM2);
+ Audio_PlaySfxAtPos(&this->oathToOrderCutsceneVoicePos, NA_SE_EN_STAL24_SCREAM2);
break;
}
@@ -679,7 +869,12 @@ void func_80AA0B08(DmStk* this, GlobalContext* globalCtx) {
}
}
-void func_80AA0DA8(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the cutscene before the player warps to the moon. Specifically,
+ * it handles the variation of the cutscene that plays the first time the player warps to the
+ * moon, which is slightly longer.
+ */
+void DmStk_PlaySfxForMoonWarpCutsceneVersion1(DmStk* this, GlobalContext* globalCtx) {
switch (globalCtx->csCtx.frames) {
case 551:
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_PULLED);
@@ -696,7 +891,12 @@ void func_80AA0DA8(DmStk* this, GlobalContext* globalCtx) {
}
}
-void func_80AA0E1C(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for the cutscene before the player warps to the moon. Specifically,
+ * it handles the variation of the cutscene that plays the second or later time the player
+ * warps to the moon, which is slightly shorter.
+ */
+void DmStk_PlaySfxForMoonWarpCutsceneVersion2(DmStk* this, GlobalContext* globalCtx) {
switch (globalCtx->csCtx.frames) {
case 311:
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_PULLED);
@@ -713,31 +913,34 @@ void func_80AA0E1C(DmStk* this, GlobalContext* globalCtx) {
}
}
-void func_80AA0E90(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles sound effects for all cutscenes.
+ */
+void DmStk_PlaySfxForCutscenes(DmStk* this, GlobalContext* globalCtx) {
if (globalCtx->csCtx.state != 0) {
switch (globalCtx->sceneNum) {
case SCENE_LOST_WOODS:
if (gSaveContext.sceneSetupIndex == 1) {
- func_80A9FED8(this, globalCtx);
+ DmStk_PlaySfxForIntroCutsceneFirstPart(this, globalCtx);
} else if (gSaveContext.sceneSetupIndex == 0) {
- func_80AA0100(this, globalCtx);
+ DmStk_PlaySfxForIntroCutsceneSecondPart(this, globalCtx);
} else if ((gSaveContext.sceneSetupIndex == 2) && (globalCtx->csCtx.currentCsIndex == 0)) {
- func_80AA0158(this, globalCtx);
+ DmStk_PlaySfxForObtainingMajorasMaskCutscene(this, globalCtx);
}
break;
case SCENE_CLOCKTOWER:
if (gSaveContext.sceneSetupIndex == 1) {
- func_80AA00CC(this, globalCtx);
+ DmStk_PlaySfxForTitleCutscene(this, globalCtx);
}
break;
case SCENE_OPENINGDAN:
if (gSaveContext.sceneSetupIndex == 0) {
if (globalCtx->csCtx.currentCsIndex == 0) {
- func_80AA01C0(this, globalCtx);
+ DmStk_PlaySfxForCurseCutsceneFirstPart(this, globalCtx);
} else if (globalCtx->csCtx.currentCsIndex == 1) {
- func_80AA0264(this, globalCtx);
+ DmStk_PlaySfxForCurseCutsceneSecondPart(this, globalCtx);
}
}
break;
@@ -745,19 +948,19 @@ void func_80AA0E90(DmStk* this, GlobalContext* globalCtx) {
case SCENE_OKUJOU:
if (gSaveContext.sceneSetupIndex == 0) {
if (globalCtx->csCtx.currentCsIndex == 0) {
- func_80AA0420(this, globalCtx);
+ DmStk_PlaySfxForClockTowerIntroCutsceneVersion1(this, globalCtx);
} else if (globalCtx->csCtx.currentCsIndex == 1) {
- func_80AA05F0(this, globalCtx);
+ DmStk_PlaySfxForDroppingOcarinaCutscene(this, globalCtx);
} else if (globalCtx->csCtx.currentCsIndex == 2) {
- func_80AA09DC(this, globalCtx);
+ DmStk_PlaySfxForClockTowerIntroCutsceneVersion2(this, globalCtx);
} else if (globalCtx->csCtx.currentCsIndex == 3) {
- func_80AA0B08(this, globalCtx);
+ DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder(this, globalCtx);
}
} else if (gSaveContext.sceneSetupIndex == 2) {
if (globalCtx->csCtx.currentCsIndex == 0) {
- func_80AA0DA8(this, globalCtx);
+ DmStk_PlaySfxForMoonWarpCutsceneVersion1(this, globalCtx);
} else if (globalCtx->csCtx.currentCsIndex == 1) {
- func_80AA0E1C(this, globalCtx);
+ DmStk_PlaySfxForMoonWarpCutsceneVersion2(this, globalCtx);
}
}
break;
@@ -765,35 +968,35 @@ void func_80AA0E90(DmStk* this, GlobalContext* globalCtx) {
case SCENE_00KEIKOKU:
if (gSaveContext.sceneSetupIndex == 3) {
if (globalCtx->csCtx.currentCsIndex == 0) {
- func_80AA0634(this, globalCtx);
+ DmStk_PlaySfxForShiveringInRainCutscene(this, globalCtx);
} else if (globalCtx->csCtx.currentCsIndex == 2) {
- func_80AA066C(this, globalCtx);
+ DmStk_PlaySfxForPlayingWithFairiesCutscene(this, globalCtx);
}
} else if (gSaveContext.sceneSetupIndex == 7) {
if (globalCtx->csCtx.currentCsIndex == 0) {
- func_80AA071C(this, globalCtx);
+ DmStk_PlaySfxForEndingCutsceneFirstPart(this, globalCtx);
} else if (globalCtx->csCtx.currentCsIndex == 1) {
- func_80AA076C(this, globalCtx);
+ DmStk_PlaySfxForEndingCutsceneSecondPart(this, globalCtx);
}
}
break;
}
}
- if (this->unk_2E0 == 1) {
+ if (this->animationId == SK_ANIMATION_WALK) {
if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 6.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_WALK);
}
- } else if (this->unk_2E0 == 19) {
+ } else if (this->animationId == SK_ANIMATION_SEARCH_LINK) {
if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 13.0f) ||
Animation_OnFrame(&this->skelAnime, 20.0f) || Animation_OnFrame(&this->skelAnime, 27.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_CALM_HIT);
}
- } else if (this->unk_2E0 == 14) {
+ } else if (this->animationId == SK_ANIMATION_PICK_UP_OCARINA_AND_START_PLAYING) {
if (Animation_OnFrame(&this->skelAnime, 3.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_PL_PUT_OUT_ITEM);
}
- } else if (this->unk_2E0 == 15) {
+ } else if (this->animationId == SK_ANIMATION_PLAY_OCARINA_AND_LAUGH) {
if (Animation_OnFrame(&this->skelAnime, 14.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_UNSKILLFUL_OCARINA);
}
@@ -808,42 +1011,43 @@ void DmStk_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
DmStk* this = THIS;
- this->unk_33B = 1;
- if (this->actor.params != 1) {
- this->unk_33A = 0;
- this->unk_336 = Object_GetIndex(&globalCtx->objectCtx, OBJECT_STK);
- this->unk_337 = Object_GetIndex(&globalCtx->objectCtx, OBJECT_STK2);
- this->unk_338 = Object_GetIndex(&globalCtx->objectCtx, OBJECT_STK3);
- if (this->unk_336 < 0) {
+ this->shouldDraw = true;
+ if (DM_STK_GET_TYPE(&this->actor) != DM_STK_TYPE_MAJORAS_MASK) {
+ this->dekuPipesCutsceneState = SK_DEKU_PIPES_CS_STATE_NOT_READY;
+ this->objectStkObjectIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_STK);
+ this->objectStk2ObjectIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_STK2);
+ this->objectStk3ObjectIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_STK3);
+ if (this->objectStkObjectIndex < 0) {
Actor_MarkForDeath(&this->actor);
}
- this->unk_328 = 0;
- this->unk_339 = 0;
- this->unk_32C = 1;
- this->unk_2E0 = 3;
- this->unk_2E8 = globalCtx->lightCtx.unk7;
- this->unk_2EC = globalCtx->lightCtx.unk8;
- this->unk_2F0 = globalCtx->lightCtx.unk9;
+ this->tatlMessageTimer = 0;
+ this->deflectCount = 0;
+ this->maskType = SK_MASK_TYPE_NORMAL;
+ this->animationId = SK_ANIMATION_IDLE;
+ this->fogR = globalCtx->lightCtx.unk7;
+ this->fogG = globalCtx->lightCtx.unk8;
+ this->fogB = globalCtx->lightCtx.unk9;
if ((globalCtx->sceneNum == SCENE_LOST_WOODS) && (gSaveContext.sceneSetupIndex == 1)) {
- this->unk_2E4 = 0;
- this->unk_2F8 = 0;
- this->unk_2FC = 1000;
- this->unk_300 = 1.0f;
- this->actionFunc = func_80AA1704;
+ this->alpha = 0;
+ this->fogN = 0;
+ this->fogF = 1000;
+ this->fogScale = 1.0f;
+ this->actionFunc = DmStk_DoNothing;
} else if (globalCtx->sceneNum == SCENE_OKUJOU) {
- this->unk_2E4 = 255;
- this->unk_2F8 = 996;
- this->unk_2FC = 1000;
- this->unk_300 = 0.7f;
- this->unk_335 = 0;
+ this->alpha = 255;
+ this->fogN = 996;
+ this->fogF = 1000;
+ this->fogScale = 0.7f;
+ this->hasBeenHit = false;
Collider_InitCylinder(globalCtx, &this->collider);
if (gSaveContext.save.entranceIndex == 0x2C00) {
if (gSaveContext.sceneSetupIndex == 0) {
if (gSaveContext.unk_3DD0[3] == 0) {
+ // Starts a 5 minute (300 second) timer until the moon falls.
func_8010E9F0(3, 300);
XREG(80) = 200;
XREG(81) = 115;
@@ -851,32 +1055,35 @@ void DmStk_Init(Actor* thisx, GlobalContext* globalCtx) {
if (gSaveContext.save.inventory.items[SLOT_OCARINA] == ITEM_NONE) {
sCylinderInit.base.colType = COLTYPE_WOOD;
- this->actionFunc = func_80AA18D8;
+ this->actionFunc = DmStk_ClockTower_StartIntroCutsceneVersion1;
} else {
sCylinderInit.base.colType = COLTYPE_WOOD;
- this->actionFunc = func_80AA1998;
+ this->actionFunc = DmStk_ClockTower_StartIntroCutsceneVersion2;
}
} else if (gSaveContext.sceneSetupIndex == 3) {
- this->unk_2E0 = 38;
+ this->animationId = SK_ANIMATION_FLOATING_ARMS_CROSSED;
if (gSaveContext.unk_3DD0[3] == 0) {
+ // This code is called when the Giants fail to stop the moon.
+ // Starts a 1 minute (60 second) timer until the moon falls.
func_8010E9F0(3, 60);
XREG(80) = 200;
XREG(81) = 115;
}
+
this->actor.world.pos.y = 120.0f;
sCylinderInit.base.colType = COLTYPE_WOOD;
- this->actionFunc = func_80AA27EC;
+ this->actionFunc = DmStk_ClockTower_Idle;
} else {
- this->unk_2E0 = 38;
- this->actionFunc = func_80AA16F4;
+ this->animationId = SK_ANIMATION_FLOATING_ARMS_CROSSED;
+ this->actionFunc = DmStk_ClockTower_DoNothing;
}
} else {
- this->unk_33A = 1;
- this->unk_2E0 = 38;
+ this->dekuPipesCutsceneState = SK_DEKU_PIPES_CS_STATE_READY;
+ this->animationId = SK_ANIMATION_FLOATING_ARMS_CROSSED;
this->actor.world.pos.y = 120.0f;
sCylinderInit.base.colType = COLTYPE_WOOD;
- this->actionFunc = func_80AA27EC;
+ this->actionFunc = DmStk_ClockTower_Idle;
}
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -886,35 +1093,37 @@ void DmStk_Init(Actor* thisx, GlobalContext* globalCtx) {
if (!(globalCtx->actorCtx.unk5 & 2)) {
Actor_MarkForDeath(&this->actor);
}
- this->unk_32C = 2;
- this->unk_2E4 = 255;
- this->unk_2F8 = 996;
- this->unk_2FC = 1000;
- this->unk_300 = 0.7f;
- this->unk_2E0 = 5;
- this->actionFunc = func_80AA1714;
+
+ this->maskType = SK_MASK_TYPE_GLOWING_EYES;
+ this->alpha = 255;
+ this->fogN = 996;
+ this->fogF = 1000;
+ this->fogScale = 0.7f;
+ this->animationId = SK_ANIMATION_BENT_OVER_HEAD_TWITCH;
+ this->actionFunc = DmStk_WaitForTelescope;
} else {
if ((globalCtx->sceneNum == SCENE_LOST_WOODS) && !Cutscene_IsPlaying(globalCtx)) {
Actor_MarkForDeath(&this->actor);
}
- this->unk_32C = 2;
- this->unk_2E4 = 255;
- this->unk_2F8 = 996;
- this->unk_2FC = 1000;
- this->unk_300 = 0.7f;
- this->actionFunc = func_80AA1704;
+
+ this->maskType = SK_MASK_TYPE_GLOWING_EYES;
+ this->alpha = 255;
+ this->fogN = 996;
+ this->fogF = 1000;
+ this->fogScale = 0.7f;
+ this->actionFunc = DmStk_DoNothing;
}
- this->unk_32D = 9;
- this->unk_32E = 0;
- this->unk_32F = 0;
- this->unk_330 = 0;
- this->unk_2E4 = this->unk_2E4;
+ this->handType = SK_HAND_TYPE_DEFAULT;
+ this->fadeInState = SK_FADE_IN_STATE_NONE;
+ this->fadeOutState = SK_FADE_OUT_STATE_NONE;
+ this->fadeOutTimer = 0;
+ this->alpha = this->alpha;
this->actor.targetArrowOffset = 1100.0f;
- this->unk_334 = 99;
+ this->csAction = 99;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_stk_Skel_013328, NULL, NULL, NULL, 0);
- func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gSkullKidSkel, NULL, NULL, NULL, 0);
+ DmStk_ChangeAnimation(this, globalCtx, &this->skelAnime, &sAnimations[this->animationId], 0);
}
Actor_SetScale(&this->actor, 0.01f);
@@ -929,111 +1138,121 @@ void DmStk_Init(Actor* thisx, GlobalContext* globalCtx) {
void DmStk_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
-void func_80AA16F4(DmStk* this, GlobalContext* globalCtx) {
+void DmStk_ClockTower_DoNothing(DmStk* this, GlobalContext* globalCtx) {
}
-void func_80AA1704(DmStk* this, GlobalContext* globalCtx) {
+void DmStk_DoNothing(DmStk* this, GlobalContext* globalCtx) {
}
-void func_80AA1714(DmStk* this, GlobalContext* globalCtx) {
- Vec3f sp1C;
+/**
+ * Waits around until the player zooms the telescope in on Skull Kid,
+ * then starts the telescope cutscene.
+ */
+void DmStk_WaitForTelescope(DmStk* this, GlobalContext* globalCtx) {
+ Vec3f screenPos;
if (!(gSaveContext.save.weekEventReg[74] & 0x20)) {
- func_80169474(globalCtx, &this->actor.world.pos, &sp1C);
+ func_80169474(globalCtx, &this->actor.world.pos, &screenPos);
if (globalCtx->view.fovy < 25.0f) {
- if ((sp1C.x >= 70.0f) && (sp1C.x < 250.0f) && (sp1C.y >= 30.0f) && (sp1C.y < 210.0f)) {
+ if ((screenPos.x >= 70.0f) && (screenPos.x < 250.0f) && (screenPos.y >= 30.0f) && (screenPos.y < 210.0f)) {
func_800FE484();
- this->actionFunc = func_80AA17F8;
+ this->actionFunc = DmStk_StartTelescopeCutscene;
}
}
}
}
-void func_80AA17F8(DmStk* this, GlobalContext* globalCtx) {
- s16 sp1E = this->actor.cutscene;
- s16 sp1C = ActorCutscene_GetAdditionalCutscene(sp1E);
- s16 sp18 = ActorCutscene_GetAdditionalCutscene(sp1C);
+/**
+ * Plays the cutscene in the telescope where the Moon's Tear falls.
+ */
+void DmStk_StartTelescopeCutscene(DmStk* this, GlobalContext* globalCtx) {
+ s16 dayOneAndTwoCutscene = this->actor.cutscene;
+ s16 dayThreeCutscene = ActorCutscene_GetAdditionalCutscene(dayOneAndTwoCutscene);
+ s16 finalHoursCutscene = ActorCutscene_GetAdditionalCutscene(dayThreeCutscene);
s16 cutscene;
if (gSaveContext.save.day < 3) {
- cutscene = sp1E;
+ cutscene = dayOneAndTwoCutscene;
} else if ((gSaveContext.save.weekEventReg[8] & 0x40) ||
((CURRENT_DAY == 3) && (gSaveContext.save.time < CLOCK_TIME(6, 0)))) {
- cutscene = sp18;
+ cutscene = finalHoursCutscene;
} else {
- cutscene = sp1C;
+ cutscene = dayThreeCutscene;
}
if (ActorCutscene_GetCanPlayNext(cutscene)) {
ActorCutscene_Start(cutscene, &this->actor);
func_800FE498();
- this->actionFunc = func_80AA1704;
+ this->actionFunc = DmStk_DoNothing;
} else {
ActorCutscene_SetIntentToPlay(cutscene);
}
}
-void func_80AA18D8(DmStk* this, GlobalContext* globalCtx) {
+void DmStk_ClockTower_StartIntroCutsceneVersion1(DmStk* this, GlobalContext* globalCtx) {
if (ActorCutscene_GetCanPlayNext(9)) {
ActorCutscene_Start(9, &this->actor);
- this->actionFunc = func_80AA192C;
+ this->actionFunc = DmStk_ClockTower_WaitForIntroCutsceneVersion1ToEnd;
} else {
ActorCutscene_SetIntentToPlay(9);
}
}
-void func_80AA192C(DmStk* this, GlobalContext* globalCtx) {
+void DmStk_ClockTower_WaitForIntroCutsceneVersion1ToEnd(DmStk* this, GlobalContext* globalCtx) {
if (globalCtx->csCtx.state == 0) {
- this->unk_2E0 = 33;
- this->unk_32D = 3;
- func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
- this->actionFunc = func_80AA2720;
+ this->animationId = SK_ANIMATION_CALL_DOWN_MOON_LOOP;
+ this->handType = SK_HAND_TYPE_HOLDING_OCARINA;
+ DmStk_ChangeAnimation(this, globalCtx, &this->skelAnime, &sAnimations[this->animationId], 0);
+ this->actionFunc = DmStk_ClockTower_IdleWithOcarina;
}
}
-void func_80AA1998(DmStk* this, GlobalContext* globalCtx) {
- if (ActorCutscene_GetCanPlayNext(0xB)) {
- ActorCutscene_Start(0xB, &this->actor);
- this->actionFunc = func_80AA19EC;
+void DmStk_ClockTower_StartIntroCutsceneVersion2(DmStk* this, GlobalContext* globalCtx) {
+ if (ActorCutscene_GetCanPlayNext(11)) {
+ ActorCutscene_Start(11, &this->actor);
+ this->actionFunc = DmStk_ClockTower_WaitForIntroCutsceneVersion2ToEnd;
} else {
- ActorCutscene_SetIntentToPlay(0xB);
+ ActorCutscene_SetIntentToPlay(11);
}
}
-void func_80AA19EC(DmStk* this, GlobalContext* globalCtx) {
+void DmStk_ClockTower_WaitForIntroCutsceneVersion2ToEnd(DmStk* this, GlobalContext* globalCtx) {
if (globalCtx->csCtx.state == 0) {
- this->unk_2E0 = 38;
- func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
- this->actionFunc = func_80AA27EC;
+ this->animationId = SK_ANIMATION_FLOATING_ARMS_CROSSED;
+ DmStk_ChangeAnimation(this, globalCtx, &this->skelAnime, &sAnimations[this->animationId], 0);
+ this->actionFunc = DmStk_ClockTower_Idle;
}
}
-void func_80AA1A50(DmStk* this, GlobalContext* globalCtx) {
- if (ActorCutscene_GetCanPlayNext(0xA)) {
+void DmStk_ClockTower_StartDropOcarinaCutscene(DmStk* this, GlobalContext* globalCtx) {
+ if (ActorCutscene_GetCanPlayNext(10)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_DAMAGE);
- ActorCutscene_Start(0xA, &this->actor);
+ ActorCutscene_Start(10, &this->actor);
this->actor.shape.rot.x = 0;
this->actor.world.rot.x = this->actor.shape.rot.x;
this->actor.shape.rot.y = this->actor.shape.rot.x;
this->actor.world.rot.y = this->actor.shape.rot.x;
- this->actionFunc = func_80AA1AC8;
+ this->actionFunc = DmStk_ClockTower_WaitForDropOcarinaCutsceneToEnd;
} else {
- ActorCutscene_SetIntentToPlay(0xA);
+ ActorCutscene_SetIntentToPlay(10);
}
}
-void func_80AA1AC8(DmStk* this, GlobalContext* globalCtx) {
+void DmStk_ClockTower_WaitForDropOcarinaCutsceneToEnd(DmStk* this, GlobalContext* globalCtx) {
if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.frames > 20)) {
- this->actionFunc = func_80AA27EC;
+ this->actionFunc = DmStk_ClockTower_Idle;
}
}
-void func_80AA1AF8(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Makes Skull Kid bob up and down and face the player.
+ */
+void DmStk_ClockTower_AdjustHeightAndRotation(DmStk* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
f32 sin;
- this->unk_32A += 0x4B0;
- sin = Math_SinS(this->unk_32A) * 10.0f;
+ this->bobPhase += 0x4B0;
+ sin = Math_SinS(this->bobPhase) * 10.0f;
Math_SmoothStepToF(&this->actor.world.pos.y, 160.0f + sin, 0.2f, 1.0f, 0.0001f);
this->actor.world.rot.y = Actor_YawBetweenActors(&this->actor, &player->actor);
@@ -1043,148 +1262,161 @@ void func_80AA1AF8(DmStk* this, GlobalContext* globalCtx) {
this->actor.shape.rot.x = this->actor.world.rot.x;
}
-void func_80AA1B9C(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Starts the deflection animation and, depending on how many times Skull Kid has been hit,
+ * prints a message taunting the player.
+ */
+void DmStk_ClockTower_DeflectHit(DmStk* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
- func_80AA1AF8(this, globalCtx);
- this->unk_339++;
- if (this->unk_339 >= 3) {
- this->unk_339 = 0;
+ DmStk_ClockTower_AdjustHeightAndRotation(this, globalCtx);
+ this->deflectCount++;
+ if (this->deflectCount >= 3) {
+ this->deflectCount = 0;
if (!(player->stateFlags2 & 0x8000000)) {
+ // That won't do you any good
Message_StartTextbox(globalCtx, 0x2013, &this->actor);
}
}
- this->unk_2E0 = 39;
- func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
+ this->animationId = SK_ANIMATION_DEFLECT_ATTACK;
+ DmStk_ChangeAnimation(this, globalCtx, &this->skelAnime, &sAnimations[this->animationId], 0);
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_DOWN_K);
- this->actionFunc = func_80AA1C64;
+ this->actionFunc = DmStk_ClockTower_WaitForDeflectionToEnd;
}
-void func_80AA1C64(DmStk* this, GlobalContext* globalCtx) {
- func_80AA1AF8(this, globalCtx);
+/**
+ * Resets Skull Kid back to his idle state once the deflection animation ends.
+ * If he is hit again before the animation ends, this function will make his deflection restart.
+ */
+void DmStk_ClockTower_WaitForDeflectionToEnd(DmStk* this, GlobalContext* globalCtx) {
+ DmStk_ClockTower_AdjustHeightAndRotation(this, globalCtx);
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
- this->unk_2E0 = 38;
- func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
- this->actionFunc = func_80AA27EC;
+ this->animationId = SK_ANIMATION_FLOATING_ARMS_CROSSED;
+ DmStk_ChangeAnimation(this, globalCtx, &this->skelAnime, &sAnimations[this->animationId], 0);
+ this->actionFunc = DmStk_ClockTower_Idle;
}
if ((this->collider.base.acFlags & AC_HIT) && (this->actor.colChkInfo.damageEffect == 0xF)) {
- this->actionFunc = func_80AA1B9C;
+ this->actionFunc = DmStk_ClockTower_DeflectHit;
}
}
-void func_80AA1D1C(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Updates a variety of states based on Skull Kid's current cutscene, including his current
+ * animation, his hand/mask type, his fade in/fade out state, and his current cutscene action.
+ */
+void DmStk_UpdateCutscenes(DmStk* this, GlobalContext* globalCtx) {
s32 pad;
- s32 temp_v0;
+ s32 actorActionIndex;
if (Cutscene_CheckActorAction(globalCtx, 107)) {
- temp_v0 = Cutscene_GetActorActionIndex(globalCtx, 107);
+ actorActionIndex = Cutscene_GetActorActionIndex(globalCtx, 107);
- if (globalCtx->csCtx.frames == globalCtx->csCtx.actorActions[temp_v0]->startFrame) {
- if (this->unk_334 != globalCtx->csCtx.actorActions[temp_v0]->action) {
- this->unk_334 = globalCtx->csCtx.actorActions[temp_v0]->action;
+ if (globalCtx->csCtx.frames == globalCtx->csCtx.actorActions[actorActionIndex]->startFrame) {
+ if (this->csAction != globalCtx->csCtx.actorActions[actorActionIndex]->action) {
+ this->csAction = globalCtx->csCtx.actorActions[actorActionIndex]->action;
if (globalCtx->sceneNum == SCENE_CLOCKTOWER) {
- this->unk_32D = 6;
+ this->handType = SK_HAND_TYPE_HOLDING_FLUTE;
} else {
- this->unk_32D = 9;
+ this->handType = SK_HAND_TYPE_DEFAULT;
}
- switch (globalCtx->csCtx.actorActions[temp_v0]->action) {
+ switch (globalCtx->csCtx.actorActions[actorActionIndex]->action) {
case 0:
case 1:
- this->unk_2E0 = 3;
+ this->animationId = SK_ANIMATION_IDLE;
break;
case 2:
- this->unk_2E0 = 1;
+ this->animationId = SK_ANIMATION_WALK;
break;
case 3:
- this->unk_2E0 = 20;
+ this->animationId = SK_ANIMATION_UNUSED_KICK_OVER_LINK;
break;
case 4:
- this->unk_2E0 = 18;
+ this->animationId = SK_ANIMATION_KICK_OVER_LINK;
break;
case 6:
- this->unk_2E0 = 16;
- this->unk_32D = 3;
+ this->animationId = SK_ANIMATION_PICK_UP_OCARINA;
+ this->handType = SK_HAND_TYPE_HOLDING_OCARINA;
break;
case 7:
- this->unk_2E0 = 14;
- this->unk_32D = 3;
+ this->animationId = SK_ANIMATION_PICK_UP_OCARINA_AND_START_PLAYING;
+ this->handType = SK_HAND_TYPE_HOLDING_OCARINA;
break;
case 8:
- this->unk_2E0 = 0;
+ this->animationId = SK_ANIMATION_SHAKE_HEAD;
break;
case 9:
- this->unk_2E0 = 3;
- this->unk_32E = 1;
+ this->animationId = SK_ANIMATION_IDLE;
+ this->fadeInState = SK_FADE_IN_STATE_START;
break;
case 12:
- this->unk_2E0 = 12;
- this->unk_32D = 3;
+ this->animationId = SK_ANIMATION_HIDE_OCARINA_START;
+ this->handType = SK_HAND_TYPE_HOLDING_OCARINA;
break;
case 13:
- this->unk_2E0 = 27;
- this->unk_32D = 3;
+ this->animationId = SK_ANIMATION_JUMP_WHILE_HIDING_OCARINA;
+ this->handType = SK_HAND_TYPE_HOLDING_OCARINA;
break;
case 14:
- this->unk_2E0 = 22;
+ this->animationId = SK_ANIMATION_HORSE_RIDE_START;
break;
case 15:
- this->unk_2E0 = 23;
+ this->animationId = SK_ANIMATION_HORSE_RIDE_LOOP;
break;
case 16:
- this->unk_2E0 = 28;
+ this->animationId = SK_ANIMATION_HORSE_RIDE_AND_ROTATE;
break;
case 17:
- this->unk_2E0 = 7;
+ this->animationId = SK_ANIMATION_RECLINING_FLOAT;
break;
case 18:
- this->unk_2E0 = 8;
+ this->animationId = SK_ANIMATION_CURSE_START;
break;
case 19:
- this->unk_2E0 = 10;
+ this->animationId = SK_ANIMATION_LAUGH_START;
break;
case 20:
- this->unk_2E0 = 24;
+ this->animationId = SK_ANIMATION_RAISE_MASK_START;
break;
case 21:
- this->unk_2E0 = 26;
+ this->animationId = SK_ANIMATION_LOWER_MASK;
break;
case 22:
- this->unk_2E0 = 29;
+ this->animationId = SK_ANIMATION_PLAY_OCARINA_WHILE_FLOATING;
if (gSaveContext.save.inventory.items[SLOT_OCARINA] == ITEM_NONE) {
- this->unk_32D = 3;
+ this->handType = SK_HAND_TYPE_HOLDING_OCARINA;
}
break;
case 23:
- this->unk_2E0 = 30;
- this->unk_32D = 4;
+ this->animationId = SK_ANIMATION_FLOATING_TURN_AROUND;
+ this->handType = SK_HAND_TYPE_JUGGLING_OR_DROPPING_OCARINA;
break;
case 24:
- this->unk_2E0 = 32;
+ this->animationId = SK_ANIMATION_CALL_DOWN_MOON_START;
if (gSaveContext.save.inventory.items[SLOT_OCARINA] == ITEM_NONE) {
- this->unk_32D = 3;
+ this->handType = SK_HAND_TYPE_HOLDING_OCARINA;
}
break;
@@ -1193,148 +1425,148 @@ void func_80AA1D1C(DmStk* this, GlobalContext* globalCtx) {
break;
case 26:
- this->unk_2E0 = 34;
+ this->animationId = SK_ANIMATION_SMACK_FAIRY_START;
if (gSaveContext.save.inventory.items[SLOT_OCARINA] == ITEM_NONE) {
- this->unk_32D = 3;
+ this->handType = SK_HAND_TYPE_HOLDING_OCARINA;
}
break;
case 27:
- this->unk_2E0 = 36;
+ this->animationId = SK_ANIMATION_HIT_BY_BUBBLE;
if (gSaveContext.save.inventory.items[SLOT_OCARINA] == ITEM_NONE) {
- this->unk_32D = 3;
+ this->handType = SK_HAND_TYPE_HOLDING_OCARINA;
}
break;
case 28:
- this->unk_2E0 = 37;
- this->unk_32D = 4;
+ this->animationId = SK_ANIMATION_DROP_OCARINA;
+ this->handType = SK_HAND_TYPE_JUGGLING_OR_DROPPING_OCARINA;
break;
case 30:
- this->unk_2E0 = 38;
+ this->animationId = SK_ANIMATION_FLOATING_ARMS_CROSSED;
break;
case 31:
- this->unk_2E0 = 39;
+ this->animationId = SK_ANIMATION_DEFLECT_ATTACK;
break;
case 32:
- this->unk_2E0 = 42;
+ this->animationId = SK_ANIMATION_SURPRISE_START;
break;
case 33:
- this->unk_2E0 = 44;
+ this->animationId = SK_ANIMATION_LOOK_AROUND_FOR_GIANTS_START;
break;
case 34:
- this->unk_2E0 = 46;
+ this->animationId = SK_ANIMATION_HOLD_HEAD_AND_SHAKE_START;
break;
case 35:
- this->unk_2E0 = 48;
+ this->animationId = SK_ANIMATION_HOLD_HEAD_AND_SCREAM_START;
break;
case 36:
- this->unk_2E0 = 50;
+ this->animationId = SK_ANIMATION_HUDDLE_WITH_FAIRIES;
break;
case 37:
- this->unk_2E0 = 51;
+ this->animationId = SK_ANIMATION_SEARCH_MASK_SALESMAN;
break;
case 38:
- this->unk_2E0 = 52;
+ this->animationId = SK_ANIMATION_HOLD_UP_MASK_START;
break;
case 39:
- this->unk_2E0 = 54;
+ this->animationId = SK_ANIMATION_SHIVER;
break;
case 40:
- this->unk_2E0 = 55;
+ this->animationId = SK_ANIMATION_DRAW;
break;
case 41:
- this->unk_2E0 = 40;
+ this->animationId = SK_ANIMATION_TELESCOPE_LOOK_UP_START;
break;
case 42:
- this->unk_2E0 = 5;
+ this->animationId = SK_ANIMATION_BENT_OVER_HEAD_TWITCH;
break;
case 43:
- this->unk_2E0 = 56;
+ this->animationId = SK_ANIMATION_BENT_OVER_LOOK_UP;
break;
case 44:
- this->unk_2E0 = 57;
+ this->animationId = SK_ANIMATION_SPANK;
break;
case 45:
- this->unk_2E0 = 58;
- this->unk_32F = 1;
+ this->animationId = SK_ANIMATION_HIP_SHAKE_AND_JUMP;
+ this->fadeOutState = SK_FADE_OUT_STATE_FADING_OUT;
break;
case 46:
- this->unk_32D = 6;
- this->unk_2E0 = 59;
+ this->handType = SK_HAND_TYPE_HOLDING_FLUTE;
+ this->animationId = SK_ANIMATION_PLAY_FLUTE;
break;
case 47:
- this->unk_2E0 = 60;
+ this->animationId = SK_ANIMATION_CARTWHEEL;
break;
case 48:
- this->unk_2E0 = 60;
+ this->animationId = SK_ANIMATION_CARTWHEEL;
break;
case 49:
- this->unk_2E0 = 65;
+ this->animationId = SK_ANIMATION_LOOK_UP_AT_GIANTS;
break;
case 50:
- this->unk_2E0 = 66;
+ this->animationId = SK_ANIMATION_ASHAMED_START;
break;
case 51:
- this->unk_2E0 = 68;
+ this->animationId = SK_ANIMATION_LOOK_LEFT_START;
break;
case 52:
- this->unk_2E0 = 70;
+ this->animationId = SK_ANIMATION_SNIFF;
break;
case 53:
- this->unk_2E0 = 60;
+ this->animationId = SK_ANIMATION_CARTWHEEL;
break;
case 54:
- this->unk_2E0 = 61;
+ this->animationId = SK_ANIMATION_LIE_FLAT;
break;
case 55:
- this->unk_2E0 = 62;
+ this->animationId = SK_ANIMATION_DANGLE_FROM_MASK_START;
break;
case 56:
- this->unk_2E0 = 64;
+ this->animationId = SK_ANIMATION_DROPPED_FROM_MASK;
break;
case 57:
- this->unk_2E0 = 65;
+ this->animationId = SK_ANIMATION_LOOK_UP_AT_GIANTS;
break;
case 58:
- this->unk_2E0 = 66;
+ this->animationId = SK_ANIMATION_ASHAMED_START;
break;
case 59:
- this->unk_2E0 = 68;
+ this->animationId = SK_ANIMATION_LOOK_LEFT_START;
break;
case 60:
- this->unk_2E0 = 70;
+ this->animationId = SK_ANIMATION_SNIFF;
break;
case 5:
@@ -1342,129 +1574,131 @@ void func_80AA1D1C(DmStk* this, GlobalContext* globalCtx) {
break;
default:
- this->unk_2E0 = 0;
+ this->animationId = SK_ANIMATION_SHAKE_HEAD;
break;
}
- func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
+ DmStk_ChangeAnimation(this, globalCtx, &this->skelAnime, &sAnimations[this->animationId], 0);
}
}
- Cutscene_ActorTranslateAndYaw(&this->actor, globalCtx, temp_v0);
+ Cutscene_ActorTranslateAndYaw(&this->actor, globalCtx, actorActionIndex);
} else {
- this->unk_334 = 99;
+ this->csAction = 99;
}
- if (this->unk_32E == 1) {
- Math_SmoothStepToF(&this->unk_300, 0.7f, 0.1f, 0.007f, 0.005f);
- if (this->unk_300 < 0.71f) {
- this->unk_300 = 0.7f;
- this->unk_2F8 = 800;
- this->unk_32E++;
- }
- this->unk_2E8 = globalCtx->lightCtx.unk7 * this->unk_300;
- this->unk_2EC = globalCtx->lightCtx.unk8 * this->unk_300;
- this->unk_2F0 = globalCtx->lightCtx.unk9 * this->unk_300;
-
- } else if (this->unk_32E == 2) {
- if (this->unk_2F8 < 996) {
- this->unk_2F8 += 10;
+ if (this->fadeInState == SK_FADE_IN_STATE_START) {
+ Math_SmoothStepToF(&this->fogScale, 0.7f, 0.1f, 0.007f, 0.005f);
+ if (this->fogScale < 0.71f) {
+ this->fogScale = 0.7f;
+ this->fogN = 800;
+ this->fadeInState++;
}
- if (this->unk_2F8 > 996) {
- this->unk_32E++;
- this->unk_2F8 = 996;
- }
- } else if (this->unk_32E == 3) {
- if (this->unk_2E4 < 128) {
- this->unk_2E4 += 3;
+ this->fogR = globalCtx->lightCtx.unk7 * this->fogScale;
+ this->fogG = globalCtx->lightCtx.unk8 * this->fogScale;
+ this->fogB = globalCtx->lightCtx.unk9 * this->fogScale;
+ } else if (this->fadeInState == SK_FADE_IN_STATE_INCREASE_FOG) {
+ if (this->fogN < 996) {
+ this->fogN += 10;
}
- if (this->unk_2E4 < 255) {
- this->unk_2E4 += 20;
+ if (this->fogN > 996) {
+ this->fadeInState++;
+ this->fogN = 996;
+ }
+ } else if (this->fadeInState == SK_FADE_IN_STATE_INCREASE_ALPHA) {
+ if (this->alpha < 128) {
+ this->alpha += 3;
+ }
+
+ if (this->alpha < 255) {
+ this->alpha += 20;
} else {
- this->unk_2E4 = 255;
- this->unk_32E = 0;
+ this->alpha = 255;
+ this->fadeInState = SK_FADE_IN_STATE_NONE;
}
}
- if (this->unk_32F == 1) {
- if (this->unk_330 > 40) {
- this->unk_32C = 3;
+ if (this->fadeOutState == SK_FADE_OUT_STATE_FADING_OUT) {
+ if (this->fadeOutTimer > 40) {
+ this->maskType = SK_MASK_TYPE_FADING_OUT;
}
- this->unk_330++;
- if (this->unk_330 >= 44) {
- this->unk_2E4 -= 35;
- if (this->unk_2E4 < 0) {
- this->unk_2E4 = 0;
- this->unk_32F = 0;
+ this->fadeOutTimer++;
+ if (this->fadeOutTimer >= 44) {
+ this->alpha -= 35;
+ if (this->alpha < 0) {
+ this->alpha = 0;
+ this->fadeOutState = SK_FADE_OUT_STATE_NONE;
gSaveContext.save.weekEventReg[12] |= 4;
if (!(globalCtx->actorCtx.unk5 & 2)) {
Actor_MarkForDeath(&this->actor);
} else {
- this->unk_33B = 0;
+ this->shouldDraw = false;
}
}
}
}
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
- switch (this->unk_2E0) {
- case 2:
- case 8:
- case 10:
- case 12:
- case 14:
- case 16:
- case 18:
- case 20:
- case 22:
- case 24:
- case 30:
- case 32:
- case 34:
- case 40:
- case 42:
- case 44:
- case 46:
- case 48:
- case 52:
- case 62:
- case 66:
- case 68:
- case 70:
- this->unk_2E0++;
- func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
+ switch (this->animationId) {
+ case SK_ANIMATION_LOOK_AROUND:
+ case SK_ANIMATION_CURSE_START:
+ case SK_ANIMATION_LAUGH_START:
+ case SK_ANIMATION_HIDE_OCARINA_START:
+ case SK_ANIMATION_PICK_UP_OCARINA_AND_START_PLAYING:
+ case SK_ANIMATION_PICK_UP_OCARINA:
+ case SK_ANIMATION_KICK_OVER_LINK:
+ case SK_ANIMATION_UNUSED_KICK_OVER_LINK:
+ case SK_ANIMATION_HORSE_RIDE_START:
+ case SK_ANIMATION_RAISE_MASK_START:
+ case SK_ANIMATION_FLOATING_TURN_AROUND:
+ case SK_ANIMATION_CALL_DOWN_MOON_START:
+ case SK_ANIMATION_SMACK_FAIRY_START:
+ case SK_ANIMATION_TELESCOPE_LOOK_UP_START:
+ case SK_ANIMATION_SURPRISE_START:
+ case SK_ANIMATION_LOOK_AROUND_FOR_GIANTS_START:
+ case SK_ANIMATION_HOLD_HEAD_AND_SHAKE_START:
+ case SK_ANIMATION_HOLD_HEAD_AND_SCREAM_START:
+ case SK_ANIMATION_HOLD_UP_MASK_START:
+ case SK_ANIMATION_DANGLE_FROM_MASK_START:
+ case SK_ANIMATION_ASHAMED_START:
+ case SK_ANIMATION_LOOK_LEFT_START:
+ case SK_ANIMATION_SNIFF:
+ this->animationId++;
+ DmStk_ChangeAnimation(this, globalCtx, &this->skelAnime, &sAnimations[this->animationId], 0);
break;
- case 26:
- this->unk_2E0 = 3;
- this->unk_32C = 1;
- this->unk_32D = 9;
- func_80A9FE3C(this, globalCtx, &this->skelAnime, &sAnimations[this->unk_2E0], 0);
+ case SK_ANIMATION_LOWER_MASK:
+ this->animationId = SK_ANIMATION_IDLE;
+ this->maskType = SK_MASK_TYPE_NORMAL;
+ this->handType = SK_HAND_TYPE_DEFAULT;
+ DmStk_ChangeAnimation(this, globalCtx, &this->skelAnime, &sAnimations[this->animationId], 0);
break;
}
}
- if (((this->unk_2E0 == 24) && (this->skelAnime.curFrame >= 16.0f)) || (this->unk_2E0 == 25) ||
- (this->unk_2E0 == 26)) {
- this->unk_32C = 9;
- this->unk_32D = 2;
- } else if (((this->unk_2E0 >= 50) && (this->unk_2E0 < 56)) || ((this->unk_2E0 > 58) && (this->unk_2E0 <= 60)) ||
+ if (((this->animationId == SK_ANIMATION_RAISE_MASK_START) && (this->skelAnime.curFrame >= 16.0f)) ||
+ (this->animationId == SK_ANIMATION_RAISE_MASK_LOOP) || (this->animationId == SK_ANIMATION_LOWER_MASK)) {
+ this->maskType = SK_MASK_TYPE_RAISED;
+ this->handType = SK_HAND_TYPE_HOLDING_MAJORAS_MASK;
+ } else if (((this->animationId >= SK_ANIMATION_HUDDLE_WITH_FAIRIES) && (this->animationId <= SK_ANIMATION_DRAW)) ||
+ ((this->animationId >= SK_ANIMATION_PLAY_FLUTE) && (this->animationId <= SK_ANIMATION_CARTWHEEL)) ||
((globalCtx->sceneNum == SCENE_00KEIKOKU) && (gSaveContext.sceneSetupIndex == 7))) {
- this->unk_32C = 0;
- if ((this->unk_2E0 == 52) || (this->unk_2E0 == 53)) {
- this->unk_32D = 5;
+ this->maskType = SK_MASK_TYPE_NO_MASK;
+ if ((this->animationId == SK_ANIMATION_HOLD_UP_MASK_START) ||
+ (this->animationId == SK_ANIMATION_HOLD_UP_MASK_LOOP)) {
+ this->handType = SK_HAND_TYPE_HOLDING_MAJORAS_MASK_AND_FLUTE;
}
}
- if (this->unk_2E0 == 64) {
- this->unk_32C = 0;
+ if (this->animationId == SK_ANIMATION_DROPPED_FROM_MASK) {
+ this->maskType = SK_MASK_TYPE_NO_MASK;
}
}
-void func_80AA26CC(DmStk* this, GlobalContext* globalCtx) {
+void DmStk_UpdateCollision(DmStk* this, GlobalContext* globalCtx) {
s32 pad;
Collider_UpdateCylinder(&this->actor, &this->collider);
@@ -1472,40 +1706,54 @@ void func_80AA26CC(DmStk* this, GlobalContext* globalCtx) {
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
}
-void func_80AA2720(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles Skull Kid when he is at the top of the Clock Tower with the Ocarina of Time.
+ * If he is hit in this state, he will drop the Ocarina.
+ *
+ * If the player waits a while while Skull Kid is in this state, they will see a message
+ * from Tatl telling them to hurry up and do something.
+ */
+void DmStk_ClockTower_IdleWithOcarina(DmStk* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
if (globalCtx->csCtx.state == 0) {
- func_80AA1AF8(this, globalCtx);
+ DmStk_ClockTower_AdjustHeightAndRotation(this, globalCtx);
this->actor.flags |= ACTOR_FLAG_1;
- this->unk_328++;
- if (this->unk_328 > 800) {
- this->unk_328 = 0;
+ this->tatlMessageTimer++;
+ if (this->tatlMessageTimer > 800) {
+ this->tatlMessageTimer = 0;
if (!(player->stateFlags2 & 0x8000000)) {
+ // Why are you just standing around?
Message_StartTextbox(globalCtx, 0x2014, &this->actor);
}
}
+
if ((this->collider.base.acFlags & AC_HIT) && (this->actor.colChkInfo.damageEffect == 0xF)) {
- this->unk_335 = 1;
- this->actionFunc = func_80AA1A50;
+ this->hasBeenHit = true;
+ this->actionFunc = DmStk_ClockTower_StartDropOcarinaCutscene;
}
}
}
-void func_80AA27EC(DmStk* this, GlobalContext* globalCtx) {
+/**
+ * Handles Skull Kid when he is at the top of the Clock Tower after the Ocarina of Time
+ * has been returned to the player.
+ * If he is hit in this state, he will just deflect the attack.
+ */
+void DmStk_ClockTower_Idle(DmStk* this, GlobalContext* globalCtx) {
if (globalCtx->csCtx.state == 0) {
- func_80AA1AF8(this, globalCtx);
+ DmStk_ClockTower_AdjustHeightAndRotation(this, globalCtx);
this->actor.flags |= ACTOR_FLAG_1;
- if (this->unk_2E0 == 33) {
+ if (this->animationId == SK_ANIMATION_CALL_DOWN_MOON_LOOP) {
this->actor.targetArrowOffset = 3100.0f;
} else {
this->actor.targetArrowOffset = 200.0f;
}
if ((this->collider.base.acFlags & AC_HIT) && (this->actor.colChkInfo.damageEffect == 0xF)) {
- this->unk_335 = 1;
- this->actionFunc = func_80AA1B9C;
+ this->hasBeenHit = true;
+ this->actionFunc = DmStk_ClockTower_DeflectHit;
}
}
}
@@ -1513,57 +1761,60 @@ void func_80AA27EC(DmStk* this, GlobalContext* globalCtx) {
void DmStk_Update(Actor* thisx, GlobalContext* globalCtx) {
DmStk* this = THIS;
- if (this->actor.params != 1) {
- if (this->unk_2E0 == 33) {
+ if (DM_STK_GET_TYPE(&this->actor) != DM_STK_TYPE_MAJORAS_MASK) {
+ if (this->animationId == SK_ANIMATION_CALL_DOWN_MOON_LOOP) {
Actor_SetFocus(&this->actor, 40.0f);
} else {
Actor_SetFocus(&this->actor, 6.0f);
}
- func_80A9FDB0(this, globalCtx);
+ DmStk_LoadObjectForAnimation(this, globalCtx);
- if (this->unk_2E0 != 61) {
+ if (this->animationId != SK_ANIMATION_LIE_FLAT) {
SkelAnime_Update(&this->skelAnime);
}
- this->unk_2E4 = this->unk_2E4;
+ this->alpha = this->alpha;
this->actionFunc(this, globalCtx);
if (globalCtx->sceneNum == SCENE_OKUJOU) {
- func_80AA26CC(this, globalCtx);
+ DmStk_UpdateCollision(this, globalCtx);
}
- func_80AA1D1C(this, globalCtx);
- func_80AA0E90(this, globalCtx);
+ DmStk_UpdateCutscenes(this, globalCtx);
+ DmStk_PlaySfxForCutscenes(this, globalCtx);
- switch (this->unk_33A) {
- case 1:
+ // This handles the cutscene where the player takes out the Deku Pipes for the first time.
+ switch (this->dekuPipesCutsceneState) {
+ case SK_DEKU_PIPES_CS_STATE_READY:
if (func_800B8718(&this->actor, &globalCtx->state)) {
- this->unk_33A = 2;
+ this->dekuPipesCutsceneState = SK_DEKU_PIPES_CS_STATE_PLAYER_USED_OCARINA;
} else {
func_800B874C(&this->actor, globalCtx, this->actor.xzDistToPlayer,
fabsf(this->actor.playerHeightRel));
}
break;
- case 2:
- if (ActorCutscene_GetCanPlayNext(0x10)) {
- this->unk_33A = 3;
- ActorCutscene_Start(0x10, &this->actor);
- this->actionFunc = func_80AA27EC;
+ case SK_DEKU_PIPES_CS_STATE_PLAYER_USED_OCARINA:
+ if (ActorCutscene_GetCanPlayNext(16)) {
+ this->dekuPipesCutsceneState = SK_DEKU_PIPES_CS_STATE_START;
+ ActorCutscene_Start(16, &this->actor);
+ this->actionFunc = DmStk_ClockTower_Idle;
} else {
- ActorCutscene_SetIntentToPlay(0x10);
+ ActorCutscene_SetIntentToPlay(16);
}
break;
- case 3:
+ case SK_DEKU_PIPES_CS_STATE_START:
if (globalCtx->csCtx.state == 0) {
- this->unk_33A = 4;
+ this->dekuPipesCutsceneState = SK_DEKU_PIPES_CS_STATE_END;
}
break;
}
+ // This code is responsible for making in-game time pass while using the telescope in the Astral Observatory.
+ // Skull Kid is always loaded in the scene, even if he isn't visible, hence why time always passes.
if ((globalCtx->actorCtx.unk5 & 2) && (globalCtx->msgCtx.msgMode != 0) &&
(globalCtx->msgCtx.currentTextId == 0x5E6) && !FrameAdvance_IsEnabled(&globalCtx->state) &&
(globalCtx->transitionTrigger == 0) && (ActorCutscene_GetCurrentIndex() == -1) &&
@@ -1585,27 +1836,28 @@ void DmStk_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 DmStk_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
DmStk* this = THIS;
- if (limbIndex == 15) {
- if ((this->unk_32D == 0) || (this->unk_32D == 1) || (this->unk_32D == 3)) {
+ if (limbIndex == SKULL_KID_LIMB_RIGHT_HAND) {
+ if ((this->handType == SK_HAND_TYPE_HOLDING_LINK_MASK_AND_FLUTE) ||
+ (this->handType == SK_HAND_TYPE_HOLDING_LINK_MASK) || (this->handType == SK_HAND_TYPE_HOLDING_OCARINA)) {
*dList = NULL;
}
- } else if (limbIndex == 12) {
- switch (this->unk_32D) {
- case 1:
- case 2:
- case 3:
- case 4:
- case 6:
+ } else if (limbIndex == SKULL_KID_LIMB_LEFT_HAND) {
+ switch (this->handType) {
+ case SK_HAND_TYPE_HOLDING_LINK_MASK:
+ case SK_HAND_TYPE_HOLDING_MAJORAS_MASK:
+ case SK_HAND_TYPE_HOLDING_OCARINA:
+ case SK_HAND_TYPE_JUGGLING_OR_DROPPING_OCARINA:
+ case SK_HAND_TYPE_HOLDING_FLUTE:
*dList = NULL;
break;
- case 9:
- if (this->unk_2E4 == 255) {
+ case SK_HAND_TYPE_DEFAULT:
+ if (this->alpha == 255) {
*dList = NULL;
}
break;
}
- } else if (limbIndex == 17) {
+ } else if (limbIndex == SKULL_KID_LIMB_HEAD) {
*dList = NULL;
}
@@ -1617,58 +1869,60 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
s32 pad2;
DmStk* this = THIS;
- if (limbIndex == 17) {
- Matrix_MultZero(&this->unk_304);
+ if (limbIndex == SKULL_KID_LIMB_HEAD) {
+ Matrix_MultZero(&this->headPos);
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- if ((this->unk_2E0 == 69) || (this->unk_2E0 == 11) || (this->unk_2E0 == 71)) {
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00AEC0);
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00AE30);
+ if ((this->animationId == SK_ANIMATION_LOOK_LEFT_LOOP) || (this->animationId == SK_ANIMATION_LAUGH_LOOP) ||
+ (this->animationId == SK_ANIMATION_LAUGH_AFTER_SNIFF)) {
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidLaughingHeadDL);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidLaughingEyesDL);
} else {
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00A5C0);
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00A530);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidNormalHeadDL);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidNormalEyesDL);
}
- switch (this->unk_32C) {
- case 0:
+ switch (this->maskType) {
+ case SK_MASK_TYPE_NO_MASK:
break;
- case 1:
+ case SK_MASK_TYPE_NORMAL:
if ((globalCtx->sceneNum == SCENE_LOST_WOODS) && (gSaveContext.sceneSetupIndex == 1) &&
(globalCtx->csCtx.frames < 1400)) {
- if (this->unk_2F8 == this->unk_2FC) {
- this->unk_2FC = this->unk_2F8;
+ if (this->fogN == this->fogF) {
+ this->fogF = this->fogN;
}
- POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, this->unk_2E8, this->unk_2EC, this->unk_2F0,
- this->unk_2F4, this->unk_2F8, this->unk_2FC);
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
+ POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, this->fogR, this->fogG, this->fogB, this->fogA,
+ this->fogN, this->fogF);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidMajorasMask1DL);
POLY_OPA_DISP = func_801660B8(globalCtx, POLY_OPA_DISP);
} else {
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidMajorasMask1DL);
}
break;
- case 2:
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_005870);
+ case SK_MASK_TYPE_GLOWING_EYES:
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidMajorasMask1DL);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidMajorasMaskEyesDL);
if (Cutscene_CheckActorAction(globalCtx, 513) &&
(globalCtx->csCtx.actorActions[Cutscene_GetActorActionIndex(globalCtx, 513)]->action == 2) &&
- (this->unk_337 >= 0)) {
+ (this->objectStk2ObjectIndex >= 0)) {
Matrix_Push();
Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY);
- gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->unk_337].segment);
+ gSegments[6] =
+ PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objectStk2ObjectIndex].segment);
- gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->unk_337].segment);
+ gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->objectStk2ObjectIndex].segment);
- AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(object_stk2_Matanimheader_008658));
- Gfx_DrawDListOpa(globalCtx, object_stk2_DL_007840);
- gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->unk_336].segment);
+ AnimatedMat_Draw(globalCtx, Lib_SegmentedToVirtual(gSkullKidMajorasMaskCurseOverlayTexAnim));
+ Gfx_DrawDListOpa(globalCtx, gSkullKidMajorasMaskCurseOverlayDL);
+ gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objectStkObjectIndex].segment);
- gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->unk_336].segment);
+ gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->objectStkObjectIndex].segment);
Matrix_Pop();
}
@@ -1677,85 +1931,85 @@ void DmStk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
CLOSE_DISPS(globalCtx->state.gfxCtx);
- } else if (limbIndex == 15) {
+ } else if (limbIndex == SKULL_KID_LIMB_RIGHT_HAND) {
OPEN_DISPS(globalCtx->state.gfxCtx);
- if (this->unk_32D != 5) {
+ if (this->handType != SK_HAND_TYPE_HOLDING_MAJORAS_MASK_AND_FLUTE) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
}
- switch (this->unk_32D) {
- case 0:
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009AC0);
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0046B0);
+ switch (this->handType) {
+ case SK_HAND_TYPE_HOLDING_LINK_MASK_AND_FLUTE:
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidUntexturedRightHand);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidLinkMask2DL);
break;
- case 1:
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009710);
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0053C0);
+ case SK_HAND_TYPE_HOLDING_LINK_MASK:
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidMaskHoldingRightHand);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidLinkMask3DL);
break;
- case 3:
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_009DA0);
+ case SK_HAND_TYPE_HOLDING_OCARINA:
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidOcarinaHoldingRightHand);
if ((globalCtx->sceneNum == SCENE_LOST_WOODS) && (gSaveContext.sceneSetupIndex == 1)) {
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00CAD0);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidOcarinaOfTimeDL);
}
break;
- case 5:
+ case SK_HAND_TYPE_HOLDING_MAJORAS_MASK_AND_FLUTE:
Matrix_Translate(-20.0f, -660.0f, 860.0f, MTXMODE_APPLY);
Matrix_RotateYS(0x6142, MTXMODE_APPLY);
Matrix_RotateXS(-0x1988, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_006BB0);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidMajorasMask1DL);
break;
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
- } else if (limbIndex == 12) {
+ } else if (limbIndex == SKULL_KID_LIMB_LEFT_HAND) {
OPEN_DISPS(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- switch (this->unk_32D) {
- case 0:
+ switch (this->handType) {
+ case SK_HAND_TYPE_HOLDING_LINK_MASK_AND_FLUTE:
break;
- case 1:
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0084C0);
+ case SK_HAND_TYPE_HOLDING_LINK_MASK:
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidUntexturedLeftHand);
break;
- case 2:
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0079F0);
+ case SK_HAND_TYPE_HOLDING_MAJORAS_MASK:
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidTwoFingersExtendedLeftHand);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidMajorasMask2DL);
break;
- case 3:
+ case SK_HAND_TYPE_HOLDING_OCARINA:
if ((globalCtx->sceneNum != SCENE_LOST_WOODS) || (gSaveContext.sceneSetupIndex != 1)) {
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_00CAD0);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidOcarinaOfTimeDL);
}
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidTwoFingersExtendedLeftHand);
break;
- case 4:
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0090C0);
+ case SK_HAND_TYPE_JUGGLING_OR_DROPPING_OCARINA:
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidTwoFingersExtendedLeftHand);
break;
- case 6:
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_008A80);
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_016620);
+ case SK_HAND_TYPE_HOLDING_FLUTE:
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidFluteHoldingLeftHand);
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidFluteDL);
break;
- case 9:
- if (this->unk_2E4 == 255) {
- gSPDisplayList(POLY_OPA_DISP++, object_stk_DL_0087B0);
+ case SK_HAND_TYPE_DEFAULT:
+ if (this->alpha == 255) {
+ gSPDisplayList(POLY_OPA_DISP++, gSkullKidOpenLeftHand);
}
break;
}
@@ -1773,25 +2027,25 @@ void DmStk_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
void DmStk_Draw(Actor* thisx, GlobalContext* globalCtx) {
DmStk* this = THIS;
- if (this->unk_33B != 0) {
- if (this->actor.params == 1) {
- Gfx_DrawDListOpa(globalCtx, object_stk_DL_006BB0);
+ if (this->shouldDraw) {
+ if (DM_STK_GET_TYPE(&this->actor) == DM_STK_TYPE_MAJORAS_MASK) {
+ Gfx_DrawDListOpa(globalCtx, gSkullKidMajorasMask1DL);
return;
}
- gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->unk_336].segment);
+ gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objectStkObjectIndex].segment);
OPEN_DISPS(globalCtx->state.gfxCtx);
- this->unk_2E4 = this->unk_2E4;
+ this->alpha = this->alpha;
func_8012C28C(globalCtx->state.gfxCtx);
- if (this->unk_2E4 < 255) {
+ if (this->alpha < 255) {
func_8012C2DC(globalCtx->state.gfxCtx);
Scene_SetRenderModeXlu(globalCtx, 1, 2);
gDPPipeSync(POLY_XLU_DISP++);
- gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->unk_2E4);
+ gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
POLY_XLU_DISP =
SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h
index 2b8c54383..4e69c1dfc 100644
--- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h
+++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.h
@@ -2,44 +2,53 @@
#define Z_DM_STK_H
#include "global.h"
+#include "objects/object_stk/object_stk.h"
struct DmStk;
typedef void (*DmStkActionFunc)(struct DmStk*, GlobalContext*);
+#define DM_STK_GET_TYPE(thisx) ((thisx)->params)
+
+typedef enum {
+ /* 0 */ DM_STK_TYPE_SKULL_KID,
+ /* 1 */ DM_STK_TYPE_MAJORAS_MASK,
+} DmStkType;
+
typedef struct DmStk {
- /* 0x0000 */ Actor actor;
- /* 0x0144 */ SkelAnime skelAnime;
- /* 0x0188 */ UNK_TYPE1 unk_188[0x108];
- /* 0x0290 */ DmStkActionFunc actionFunc;
- /* 0x0294 */ ColliderCylinder collider;
- /* 0x02E0 */ s16 unk_2E0;
- /* 0x02E4 */ s32 unk_2E4;
- /* 0x02E8 */ u32 unk_2E8;
- /* 0x02EC */ u32 unk_2EC;
- /* 0x02F0 */ u32 unk_2F0;
- /* 0x02F4 */ s32 unk_2F4;
- /* 0x02F8 */ s32 unk_2F8;
- /* 0x02FC */ s32 unk_2FC;
- /* 0x0300 */ f32 unk_300;
- /* 0x0304 */ Vec3f unk_304;
- /* 0x0310 */ Vec3f unk_310;
- /* 0x031C */ UNK_TYPE1 unk31C[0xC];
- /* 0x0328 */ u16 unk_328;
- /* 0x032A */ u16 unk_32A;
- /* 0x032C */ u8 unk_32C;
- /* 0x032D */ u8 unk_32D;
- /* 0x032E */ u8 unk_32E;
- /* 0x032F */ u8 unk_32F;
- /* 0x0330 */ s32 unk_330;
- /* 0x0334 */ u8 unk_334;
- /* 0x0335 */ u8 unk_335;
- /* 0x0336 */ s8 unk_336;
- /* 0x0337 */ s8 unk_337;
- /* 0x0338 */ s8 unk_338;
- /* 0x0339 */ u8 unk_339;
- /* 0x033A */ u8 unk_33A;
- /* 0x033B */ u8 unk_33B;
+ /* 0x000 */ Actor actor;
+ /* 0x144 */ SkelAnime skelAnime;
+ /* 0x188 */ Vec3s jointTable[SKULL_KID_LIMB_MAX]; // Not used, since it's allocated dynamically instead.
+ /* 0x20C */ Vec3s morphTable[SKULL_KID_LIMB_MAX]; // Not used, since it's allocated dynamically instead.
+ /* 0x290 */ DmStkActionFunc actionFunc;
+ /* 0x294 */ ColliderCylinder collider;
+ /* 0x2E0 */ s16 animationId;
+ /* 0x2E4 */ s32 alpha;
+ /* 0x2E8 */ u32 fogR;
+ /* 0x2EC */ u32 fogG;
+ /* 0x2F0 */ u32 fogB;
+ /* 0x2F4 */ s32 fogA;
+ /* 0x2F8 */ s32 fogN;
+ /* 0x2FC */ s32 fogF;
+ /* 0x300 */ f32 fogScale;
+ /* 0x304 */ Vec3f headPos; // set but never used
+ /* 0x310 */ Vec3f oathToOrderCutsceneVoicePos;
+ /* 0x31C */ UNK_TYPE1 unk31C[0xC];
+ /* 0x328 */ u16 tatlMessageTimer;
+ /* 0x32A */ u16 bobPhase;
+ /* 0x32C */ u8 maskType;
+ /* 0x32D */ u8 handType;
+ /* 0x32E */ u8 fadeInState;
+ /* 0x32F */ u8 fadeOutState;
+ /* 0x330 */ s32 fadeOutTimer;
+ /* 0x334 */ u8 csAction;
+ /* 0x335 */ u8 hasBeenHit; // set but never used
+ /* 0x336 */ s8 objectStkObjectIndex;
+ /* 0x337 */ s8 objectStk2ObjectIndex;
+ /* 0x338 */ s8 objectStk3ObjectIndex;
+ /* 0x339 */ u8 deflectCount;
+ /* 0x33A */ u8 dekuPipesCutsceneState;
+ /* 0x33B */ u8 shouldDraw;
} DmStk; // size = 0x33C
extern const ActorInit Dm_Stk_InitVars;
diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c
index fc9d21b3d..a4c285233 100644
--- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c
+++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c
@@ -1,7 +1,7 @@
/*
* File: z_dm_zl.c
* Overlay: ovl_Dm_Zl
- * Description: Child Zelda (Cutscenes)
+ * Description: Child Zelda (Re-learning Song of Time cutscene)
*/
#include "z_dm_zl.h"
@@ -15,9 +15,8 @@ void DmZl_Destroy(Actor* thisx, GlobalContext* globalCtx);
void DmZl_Update(Actor* thisx, GlobalContext* globalCtx);
void DmZl_Draw(Actor* thisx, GlobalContext* globalCtx);
-void func_80A382FC(DmZl* this, GlobalContext* globalCtx);
+void DmZl_DoNothing(DmZl* this, GlobalContext* globalCtx);
-#if 0
const ActorInit Dm_Zl_InitVars = {
ACTOR_DM_ZL,
ACTORCAT_ITEMACTION,
@@ -30,27 +29,269 @@ const ActorInit Dm_Zl_InitVars = {
(ActorFunc)DmZl_Draw,
};
-#endif
+static AnimationInfo sAnimations[] = {
+ { &gDmZl4FacingAwayHandsOverEmblemLoop, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
+ { &gDmZl4TurningAround2Anim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -10.0f },
+ { &gDmZl4HandsOverEmblemLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
+ { &gDmZl4GivingItemStartAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -10.0f },
+ { &gDmZl4GivingItemLoopAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
+ { &gDmZl4RaisingOcarinaToPlayAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -10.0f },
+ { &gDmZl4PlayingOcarinaAnim, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
+};
-extern UNK_TYPE D_0600DE08;
-extern UNK_TYPE D_0600E038;
+typedef enum {
+ /* 0 */ ZELDA_ANIM_FACING_AWAY,
+ /* 1 */ ZELDA_ANIM_TURNING_TOWARD_PLAYER,
+ /* 2 */ ZELDA_ANIM_FACING_PLAYER,
+ /* 3 */ ZELDA_ANIM_GIVING_OCARINA_START,
+ /* 4 */ ZELDA_ANIM_GIVING_OCARINA,
+ /* 5 */ ZELDA_ANIM_PLAYING_OCARINA_START,
+ /* 6 */ ZELDA_ANIM_PLAYING_OCARINA,
+ /* 7 */ ZELDA_ANIM_MAX,
+} DmZlAnimations;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Zl/func_80A38190.s")
+static TexturePtr sMouthTextures[] = {
+ gZl4MouthNeutralTex,
+ gZl4MouthOpenSmilingTex,
+ gZl4MouthFrowningTex,
+ gZl4MouthOpenTex,
+};
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Zl/DmZl_Init.s")
+typedef enum {
+ /* 0 */ ZELDA_MOUTH_NEUTRAL,
+ /* 1 */ ZELDA_MOUTH_SMILING,
+ /* 2 */ ZELDA_MOUTH_FROWNING,
+ /* 3 */ ZELDA_MOUTH_OPEN,
+} DmZlMouthTextures;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Zl/DmZl_Destroy.s")
+static TexturePtr sEyeTextures[] = {
+ gDmZl4EyeOpenNormalTex,
+ gDmZl4EyeHalfTex,
+ gDmZl4EyeClosedTex,
+ gDmZl4EyeWideTex,
+ gDmZl4EyeHappyTex,
+ gDmZl4EyeOpenLookingLeftTex,
+ gDmZl4EyeOpenLookingRightTex,
+};
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Zl/func_80A382FC.s")
+typedef enum {
+ /* 0 */ ZELDA_EYE_OPEN_NORMAL,
+ /* 1 */ ZELDA_EYE_BLINKING,
+ /* 2 */ ZELDA_EYE_CLOSED,
+ /* 3 */ ZELDA_EYE_WIDE,
+ /* 4 */ ZELDA_EYE_HAPPY,
+ /* 5 */ ZELDA_EYE_OPEN_LOOKING_LEFT,
+ /* 6 */ ZELDA_EYE_OPEN_LOOKING_RIGHT,
+} DmZlEyeTextures;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Zl/func_80A3830C.s")
+// Unused in MM
+typedef enum {
+ /* 0 */ ZELDA_EYE_STATE_NORMAL,
+ /* 1 */ ZELDA_EYE_STATE_CLOSED,
+ /* 2 */ ZELDA_EYE_STATE_LOOKING_LEFT,
+ /* 3 */ ZELDA_EYE_STATE_LOOKING_RIGHT,
+ /* 4 */ ZELDA_EYE_STATE_WIDE,
+ /* 5 */ ZELDA_EYE_STATE_HAPPY,
+ /* 6 */ ZELDA_EYE_STATE_CLOSED2,
+} DmZlEyeStates;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Zl/func_80A38468.s")
+/**
+ * This function is always called with unusedExtraOffset = 0.
+ */
+void DmZl_ChangeAnimation(SkelAnime* skelAnime, AnimationInfo animation[], u16 unusedExtraOffset) {
+ f32 endFrame;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Zl/DmZl_Update.s")
+ animation += unusedExtraOffset;
+ endFrame = (animation->frameCount < 0.0f) ? Animation_GetLastFrame(animation->animation) : animation->frameCount;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Zl/func_80A3862C.s")
+ Animation_Change(skelAnime, animation->animation, animation->playSpeed, animation->startFrame, endFrame,
+ animation->mode, animation->morphFrames);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Zl/func_80A38648.s")
+void DmZl_Init(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ DmZl* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Dm_Zl/DmZl_Draw.s")
+ this->animationIndex = ZELDA_ANIM_FACING_AWAY;
+ this->unk_2BA = 0;
+ this->actor.targetArrowOffset = 1000.0f;
+ ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f);
+ // these three set to NULL should mean they are dynamically allocated
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gZl4Skeleton, NULL, NULL, NULL, 0);
+ DmZl_ChangeAnimation(&this->skelAnime, &sAnimations[this->animationIndex], 0);
+ Actor_SetScale(&this->actor, 0.01f);
+ this->actionFunc = DmZl_DoNothing;
+}
+
+void DmZl_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
+
+void DmZl_DoNothing(DmZl* this, GlobalContext* globalCtx) {
+}
+
+void DmZl_UpdateCutscene(DmZl* this, GlobalContext* globalCtx) {
+ s32 actionIndex;
+
+ if (Cutscene_CheckActorAction(globalCtx, 0x66)) {
+ actionIndex = Cutscene_GetActorActionIndex(globalCtx, 0x66);
+ if (globalCtx->csCtx.frames == globalCtx->csCtx.actorActions[actionIndex]->startFrame) {
+ s16 nextAnimationIndex = ZELDA_ANIM_FACING_AWAY;
+
+ switch (globalCtx->csCtx.actorActions[actionIndex]->action) {
+ default:
+ case 1:
+ break;
+ case 2:
+ nextAnimationIndex = ZELDA_ANIM_TURNING_TOWARD_PLAYER;
+ break;
+ case 3:
+ nextAnimationIndex = ZELDA_ANIM_GIVING_OCARINA_START;
+ break;
+ case 4:
+ nextAnimationIndex = ZELDA_ANIM_PLAYING_OCARINA_START;
+ break;
+ }
+
+ if (nextAnimationIndex != this->animationIndex) {
+ this->animationIndex = nextAnimationIndex;
+ DmZl_ChangeAnimation(&this->skelAnime, &sAnimations[this->animationIndex], 0);
+ }
+ }
+
+ Cutscene_ActorTranslateAndYaw(&this->actor, globalCtx, actionIndex);
+ }
+
+ if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+ actionIndex = this->animationIndex;
+
+ if ((actionIndex == ZELDA_ANIM_TURNING_TOWARD_PLAYER) || (actionIndex == ZELDA_ANIM_GIVING_OCARINA_START) ||
+ (actionIndex == ZELDA_ANIM_PLAYING_OCARINA_START)) {
+ // these animations don't loop at the end, they lead into the next animation
+ this->animationIndex++;
+ DmZl_ChangeAnimation(&this->skelAnime, &sAnimations[this->animationIndex], 0);
+ }
+ }
+}
+
+/**
+ * Updates the eye blinking and state, and mouth textures.
+ */
+void DmZl_UpdateFace(DmZl* this) {
+ if (this->blinkTimer > 0) {
+ this->blinkTimer--;
+ } else {
+ this->blinkTimer = 0;
+ }
+
+ if (this->blinkTimer < 3) {
+ this->eyeTextureIndexRight = this->blinkTimer;
+ this->eyeTextureIndexLeft = this->blinkTimer;
+ }
+
+ // nextEyeState is never changed by this actor in MM, only ZELDA_EYE_STATE_NORMAL used.
+ switch (this->nextEyeState) {
+ case ZELDA_EYE_STATE_NORMAL:
+ if (this->blinkTimer == 0) {
+ this->blinkTimer = Rand_S16Offset(30, 30);
+ }
+ break;
+ case ZELDA_EYE_STATE_CLOSED:
+ if (this->blinkTimer == 0) {
+ this->eyeTextureIndexLeft = this->eyeTextureIndexRight = ZELDA_EYE_CLOSED;
+ }
+ break;
+ case ZELDA_EYE_STATE_LOOKING_LEFT:
+ if (this->blinkTimer == 0) {
+ this->eyeTextureIndexLeft = ZELDA_EYE_OPEN_LOOKING_LEFT;
+ this->eyeTextureIndexRight = ZELDA_EYE_OPEN_LOOKING_RIGHT;
+ }
+ break;
+ case ZELDA_EYE_STATE_LOOKING_RIGHT:
+ if (this->blinkTimer == 0) {
+ this->eyeTextureIndexLeft = ZELDA_EYE_OPEN_LOOKING_RIGHT;
+ this->eyeTextureIndexRight = ZELDA_EYE_OPEN_LOOKING_LEFT;
+ }
+ break;
+ case ZELDA_EYE_STATE_WIDE:
+ if (this->blinkTimer == 0) {
+ this->eyeTextureIndexLeft = this->eyeTextureIndexRight = ZELDA_EYE_WIDE;
+ }
+ break;
+ case ZELDA_EYE_STATE_HAPPY:
+ if (this->blinkTimer == 0) {
+ this->eyeTextureIndexLeft = this->eyeTextureIndexRight = ZELDA_EYE_HAPPY;
+ }
+ break;
+ case ZELDA_EYE_STATE_CLOSED2:
+ if (this->blinkTimer >= 3) {
+ this->blinkTimer = 0;
+ }
+ break;
+ }
+
+ // nextMouthState is never changed by this actor in MM, only ZELDA_MOUTH_NEUTRAL used.
+ switch (this->nextMouthState) {
+ default:
+ this->mouthTextureIndex = ZELDA_MOUTH_NEUTRAL;
+ break;
+ case ZELDA_MOUTH_SMILING:
+ this->mouthTextureIndex = ZELDA_MOUTH_SMILING;
+ break;
+ case ZELDA_MOUTH_FROWNING:
+ this->mouthTextureIndex = ZELDA_MOUTH_FROWNING;
+ break;
+ case ZELDA_MOUTH_OPEN:
+ this->mouthTextureIndex = ZELDA_MOUTH_OPEN;
+ break;
+ }
+
+ if (this->animationIndex == ZELDA_ANIM_PLAYING_OCARINA) {
+ this->eyeTextureIndexLeft = this->eyeTextureIndexRight = ZELDA_EYE_CLOSED;
+ }
+}
+
+void DmZl_Update(Actor* thisx, GlobalContext* globalCtx) {
+ DmZl* this = THIS;
+
+ DmZl_UpdateFace(this);
+ SkelAnime_Update(&this->skelAnime);
+ DmZl_UpdateCutscene(this, globalCtx);
+ this->actionFunc(this, globalCtx);
+}
+
+s32 DmZl_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
+ return false;
+}
+
+void DmZl_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
+ DmZl* this = THIS;
+
+ if (limbIndex == ZL4_LIMB_RIGHT_HAND) {
+ if ((this->animationIndex >= ZELDA_ANIM_GIVING_OCARINA_START) &&
+ (this->animationIndex <= ZELDA_ANIM_PLAYING_OCARINA)) {
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+
+ gSPDisplayList(POLY_OPA_DISP++, gDmZl4OcarinaDL);
+
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+ }
+ }
+}
+
+void DmZl_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ DmZl* this = THIS;
+
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(sEyeTextures[this->eyeTextureIndexRight]));
+
+ gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(sEyeTextures[this->eyeTextureIndexLeft]));
+
+ gSPSegment(POLY_OPA_DISP++, 0x0A, Lib_SegmentedToVirtual(sMouthTextures[this->mouthTextureIndex]));
+
+ func_8012C28C(globalCtx->state.gfxCtx);
+ SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+ DmZl_OverrideLimbDraw, DmZl_PostLimbDraw, &this->actor);
+
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h
index c3b985850..ec3e44296 100644
--- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h
+++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.h
@@ -2,16 +2,28 @@
#define Z_DM_ZL_H
#include "global.h"
+#include "objects/object_zl4/object_zl4.h"
struct DmZl;
typedef void (*DmZlActionFunc)(struct DmZl*, GlobalContext*);
typedef struct DmZl {
- /* 0x0000 */ Actor actor;
- /* 0x0144 */ char unk_144[0x11C];
- /* 0x0260 */ DmZlActionFunc actionFunc;
- /* 0x0264 */ char unk_264[0x70];
+ /* 0x000 */ Actor actor;
+ /* 0x144 */ SkelAnime skelAnime;
+ /* 0x188 */ Vec3s jointTable[ZL4_LIMB_MAX]; // these tables are not referenced directly, loaded dynamically
+ /* 0x1F4 */ Vec3s morphTable[ZL4_LIMB_MAX];
+ /* 0x260 */ DmZlActionFunc actionFunc;
+ /* 0x264 */ ColliderCylinder collider; // unused, assumed to be here based on OoT documentation
+ /* 0x2B0 */ s16 animationIndex;
+ /* 0x2B2 */ u8 eyeTextureIndexLeft;
+ /* 0x2B3 */ u8 eyeTextureIndexRight;
+ /* 0x2B4 */ u8 mouthTextureIndex;
+ /* 0x2B5 */ u8 nextEyeState; // used to control eye state, but not set by our actor, outside of actor?
+ /* 0x2B6 */ u8 nextMouthState; // used to control mouth state, but not set by our actor, outside of actor?
+ /* 0x2B8 */ s16 blinkTimer;
+ /* 0x2BA */ s16 unk_2BA; // set but not used by this actor.
+ /* 0x2BC */ UNK_TYPE1 pad2BC[0x18]; // unused by DmZl
} DmZl; // size = 0x2D4
extern const ActorInit Dm_Zl_InitVars;
diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c
index 098d91be4..2f03bec06 100644
--- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c
+++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c
@@ -292,7 +292,7 @@ void EnAni_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
this->actionFunc(this, globalCtx);
if (this->actor.xzDistToPlayer < 100.0f && !(this->stateFlags & ANI_STATE_CLIMBING)) {
- func_800E9250(globalCtx, &this->actor, &this->headRot, &this->chestRot, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->headRot, &this->chestRot, this->actor.focus.pos);
this->chestRot.x = this->chestRot.y = this->chestRot.z = 0;
} else {
Math_SmoothStepToS(&this->headRot.x, 0, 0x6, 0x1838, 0x64);
diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
index 7ae9bb01d..965f885ba 100644
--- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
@@ -462,7 +462,7 @@ void func_809C1D64(EnAob01* this, GlobalContext* globalCtx) {
}
void func_809C1EC8(EnAob01* this, GlobalContext* globalCtx) {
- static TurnOptionsSet sTurnOptions = {
+ static TrackOptionsSet sTrackOptions = {
{ 0xFA0, 4, 1, 3 },
{ 0x1770, 4, 1, 6 },
{ 0xFA0, 4, 1, 3 },
@@ -476,11 +476,11 @@ void func_809C1EC8(EnAob01* this, GlobalContext* globalCtx) {
point.x = player->actor.world.pos.x;
point.y = player->bodyPartsPos[7].y + 3.0f;
point.z = player->actor.world.pos.z;
- SubS_TurnToPoint(&point, &this->actor.focus.pos, &this->actor.shape.rot, &this->turnTarget, &this->headRot,
- &this->torsoRot, &sTurnOptions);
+ SubS_TrackPoint(&point, &this->actor.focus.pos, &this->actor.shape.rot, &this->trackTarget, &this->headRot,
+ &this->torsoRot, &sTrackOptions);
} else {
- Math_SmoothStepToS(&this->turnTarget.x, 0, 4, 0x3E8, 1);
- Math_SmoothStepToS(&this->turnTarget.y, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->trackTarget.x, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->trackTarget.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->headRot.x, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->headRot.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->torsoRot.x, 0, 4, 0x3E8, 1);
@@ -505,7 +505,7 @@ void func_809C2060(EnAob01* this, GlobalContext* globalCtx) {
}
} else if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state) && (this->unk_2D2 & 0x100)) {
this->unk_2D2 &= ~0x100;
- this->unk_2E6 = this->turnTarget;
+ this->unk_2E6 = this->trackTarget;
this->unk_2EC = this->headRot;
this->unk_2F2 = this->torsoRot;
func_809C16DC(this, globalCtx);
@@ -756,7 +756,7 @@ void func_809C2A64(EnAob01* this, GlobalContext* globalCtx) {
}
if (Actor_HasParent(&this->actor, globalCtx)) {
- this->turnTarget = this->unk_2E6;
+ this->trackTarget = this->unk_2E6;
this->headRot = this->unk_2EC;
this->torsoRot = this->unk_2F2;
this->actor.parent = NULL;
@@ -827,7 +827,7 @@ void func_809C2D0C(EnAob01* this, GlobalContext* globalCtx) {
Message_StartTextbox(globalCtx, this->unk_210, &this->actor);
this->actionFunc = func_809C2A64;
} else {
- this->turnTarget = this->unk_2E6;
+ this->trackTarget = this->unk_2E6;
this->headRot = this->unk_2EC;
this->torsoRot = this->unk_2F2;
diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h
index d4ed3e71e..3f8558744 100644
--- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h
+++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.h
@@ -21,7 +21,7 @@ typedef struct EnAob01 {
/* 0x212 */ Vec3s jointTable[MAMAMU_YAN_LIMB_MAX];
/* 0x272 */ Vec3s morphTable[MAMAMU_YAN_LIMB_MAX];
/* 0x2D2 */ u16 unk_2D2;
- /* 0x2D4 */ Vec3s turnTarget;
+ /* 0x2D4 */ Vec3s trackTarget;
/* 0x2DA */ Vec3s headRot;
/* 0x2E0 */ Vec3s torsoRot;
/* 0x2E6 */ Vec3s unk_2E6;
diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c
index a70f608ff..b177bb2a4 100644
--- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c
+++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c
@@ -121,7 +121,7 @@ static u8 D_80BAA488[] = {
s32 D_80BAA4A8[] = { -1, -1, 0 };
-static TurnOptionsSet sTurnOptions = {
+static TrackOptionsSet sTrackOptions = {
{ 0xFA0, 4, 1, 3 },
{ 0x1770, 4, 1, 6 },
{ 0xFA0, 4, 1, 3 },
@@ -300,11 +300,11 @@ void func_80BA8DF4(EnBaba* this, GlobalContext* globalCtx) {
point.y = player->bodyPartsPos[7].y + 3.0f;
point.z = player->actor.world.pos.z;
- SubS_TurnToPoint(&point, &this->actor.focus.pos, &this->actor.shape.rot, &this->turnTarget, &this->headRot,
- &this->torsoRot, &sTurnOptions);
+ SubS_TrackPoint(&point, &this->actor.focus.pos, &this->actor.shape.rot, &this->trackTarget, &this->headRot,
+ &this->torsoRot, &sTrackOptions);
} else {
- Math_SmoothStepToS(&this->turnTarget.x, 0, 4, 0x3E8, 1);
- Math_SmoothStepToS(&this->turnTarget.y, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->trackTarget.x, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->trackTarget.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->headRot.x, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->headRot.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->torsoRot.x, 0, 4, 0x3E8, 1);
@@ -319,35 +319,35 @@ void func_80BA8DF4(EnBaba* this, GlobalContext* globalCtx) {
}
s32 func_80BA8F88(EnBaba* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
- u16 sp26 = (u16)(gSaveContext.save.time - 0x3FFC);
+ u16 sp26 = SCHEDULE_TIME_NOW;
u16 temp;
u8 sp23 = ENBABA_GET_3F00(&this->actor);
if (D_80BAA4A8[arg2->result] >= 0) {
- this->unk_410 = SubS_GetAdditionalPath(globalCtx, sp23, D_80BAA4A8[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp23, D_80BAA4A8[arg2->result]);
}
- if (this->unk_410 == NULL) {
+ if (this->timePath == NULL) {
return false;
}
- if ((this->unk_434 != 0) && (this->unk_436 >= 0)) {
+ if ((this->unk_434 != 0) && (this->timePathTimeSpeed >= 0)) {
temp = sp26;
} else {
temp = arg2->time0;
}
if (arg2->time1 < temp) {
- this->unk_424 = (temp - arg2->time1) + 0xFFFF;
+ this->timePathTotalTime = (temp - arg2->time1) + 0xFFFF;
} else {
- this->unk_424 = arg2->time1 - temp;
+ this->timePathTotalTime = arg2->time1 - temp;
}
- this->unk_430 = sp26 - temp;
- temp = this->unk_410->count - 2;
- this->unk_428 = this->unk_424 / temp;
+ this->timePathElapsedTime = sp26 - temp;
+ temp = this->timePath->count - (SUBS_TIME_PATHING_ORDER - 1);
+ this->timePathWaypointTime = this->timePathTotalTime / temp;
this->unk_438 = 0;
- this->unk_42C = (this->unk_430 / this->unk_428) + 2;
+ this->timePathWaypoint = (this->timePathElapsedTime / this->timePathWaypointTime) + (SUBS_TIME_PATHING_ORDER - 1);
this->unk_43C = 0;
return true;
}
@@ -372,52 +372,54 @@ s32 func_80BA9110(EnBaba* this, GlobalContext* globalCtx, ScheduleResult* arg2)
}
s32 func_80BA9160(EnBaba* this, GlobalContext* globalCtx) {
- f32 sp7C[265];
+ f32 knots[265];
Vec3f sp70;
Vec3f sp64;
- Vec3f sp58;
+ Vec3f timePathTargetPos;
s32 sp54 = 0;
s32 sp50 = 0;
s32 pad;
- func_8013AF00(sp7C, 3, this->unk_410->count + 3);
+ SubS_TimePathing_FillKnots(knots, SUBS_TIME_PATHING_ORDER, this->timePath->count + SUBS_TIME_PATHING_ORDER);
if (this->unk_438 == 0) {
- sp58 = gZeroVec3f;
+ timePathTargetPos = gZeroVec3f;
- func_8013B6B0(this->unk_410, &this->unk_420, &this->unk_430, this->unk_428, this->unk_424, &this->unk_42C, sp7C,
- &sp58, this->unk_436);
- func_8013B878(globalCtx, this->unk_410, this->unk_42C, &sp58);
- this->actor.world.pos.y = sp58.y;
+ SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &timePathTargetPos, this->timePathTimeSpeed);
+ SubS_TimePathing_ComputeInitialY(globalCtx, this->timePath, this->timePathWaypoint, &timePathTargetPos);
+ this->actor.world.pos.y = timePathTargetPos.y;
this->unk_438 = 1;
} else {
- sp58 = this->unk_414;
+ timePathTargetPos = this->timePathTargetPos;
}
- this->actor.world.pos.x = sp58.x;
- this->actor.world.pos.z = sp58.z;
+ this->actor.world.pos.x = timePathTargetPos.x;
+ this->actor.world.pos.z = timePathTargetPos.z;
if (SubS_InCsMode(globalCtx)) {
- sp54 = this->unk_430;
- sp50 = this->unk_42C;
- sp58 = this->actor.world.pos;
+ sp54 = this->timePathElapsedTime;
+ sp50 = this->timePathWaypoint;
+ timePathTargetPos = this->actor.world.pos;
}
- this->unk_414 = gZeroVec3f;
+ this->timePathTargetPos = gZeroVec3f;
- if (func_8013B6B0(this->unk_410, &this->unk_420, &this->unk_430, this->unk_428, this->unk_424, &this->unk_42C, sp7C,
- &this->unk_414, this->unk_436)) {
+ if (SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &this->timePathTargetPos, this->timePathTimeSpeed)) {
this->unk_43C = 1;
} else {
sp70 = this->actor.world.pos;
- sp64 = this->unk_414;
+ sp64 = this->timePathTargetPos;
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp70, &sp64);
}
if (SubS_InCsMode(globalCtx)) {
- this->unk_430 = sp54;
- this->unk_42C = sp50;
- this->unk_414 = sp58;
+ this->timePathElapsedTime = sp54;
+ this->timePathWaypoint = sp50;
+ this->timePathTargetPos = timePathTargetPos;
}
return false;
@@ -598,7 +600,7 @@ void func_80BA9B24(EnBaba* this, GlobalContext* globalCtx) {
void func_80BA9B80(EnBaba* this, GlobalContext* globalCtx) {
ScheduleResult sp20;
- this->unk_436 = REG(15) + ((void)0, gSaveContext.save.daySpeed);
+ this->timePathTimeSpeed = REG(15) + ((void)0, gSaveContext.save.daySpeed);
if (!Schedule_RunScript(globalCtx, D_80BAA488, &sp20) ||
((this->unk_434 != sp20.result) && !func_80BA9110(this, globalCtx, &sp20))) {
diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.h b/src/overlays/actors/ovl_En_Baba/z_en_baba.h
index 6a21168b6..f95020f95 100644
--- a/src/overlays/actors/ovl_En_Baba/z_en_baba.h
+++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.h
@@ -32,7 +32,7 @@ typedef struct EnBaba {
/* 0x01EA */ UNK_TYPE1 unk1EA[0x1C];
/* 0x0206 */ Vec3s jointTable[18];
/* 0x0272 */ Vec3s morphTable[18];
- /* 0x02DE */ Vec3s turnTarget;
+ /* 0x02DE */ Vec3s trackTarget;
/* 0x02E4 */ Vec3s headRot;
/* 0x02EA */ Vec3s torsoRot;
/* 0x02F0 */ UNK_TYPE1 unk2F0[0x12];
@@ -43,15 +43,15 @@ typedef struct EnBaba {
/* 0x0406 */ UNK_TYPE1 unk406[4];
/* 0x040A */ u16 unk_40A;
/* 0x040C */ s32 unk_40C;
- /* 0x0410 */ Path* unk_410;
- /* 0x0414 */ Vec3f unk_414;
- /* 0x0420 */ f32 unk_420;
- /* 0x0424 */ s32 unk_424;
- /* 0x0428 */ s32 unk_428;
- /* 0x042C */ s32 unk_42C;
- /* 0x0430 */ s32 unk_430;
+ /* 0x0410 */ Path* timePath;
+ /* 0x0414 */ Vec3f timePathTargetPos;
+ /* 0x0420 */ f32 timePathProgress;
+ /* 0x0424 */ s32 timePathTotalTime;
+ /* 0x0428 */ s32 timePathWaypointTime;
+ /* 0x042C */ s32 timePathWaypoint;
+ /* 0x0430 */ s32 timePathElapsedTime;
/* 0x0434 */ u8 unk_434;
- /* 0x0436 */ s16 unk_436;
+ /* 0x0436 */ s16 timePathTimeSpeed;
/* 0x0438 */ s32 unk_438;
/* 0x043C */ s32 unk_43C;
} EnBaba; // size = 0x440
diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
index 88fc11072..66ba49919 100644
--- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
+++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
@@ -22,10 +22,9 @@ void EnBaguo_Roll(EnBaguo* this, GlobalContext* globalCtx);
void EnBaguo_SetupRetreatUnderground(EnBaguo* this);
void EnBaguo_RetreatUnderground(EnBaguo* this, GlobalContext* globalCtx);
void EnBaguo_DrawBody(Actor* thisx, GlobalContext* globalCtx);
-void EnBaguo_InitializeParticle(EnBaguo* this, Vec3f* position, Vec3f* velocity, Vec3f* acceleration, f32 scale,
- s16 timer);
-void EnBaguo_UpdateParticles(EnBaguo* this, GlobalContext* globalCtx);
-void EnBaguo_DrawRockParticles(EnBaguo* this, GlobalContext* globalCtx);
+void EnBaguo_InitializeEffect(EnBaguo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale, s16 timer);
+void EnBaguo_UpdateEffects(EnBaguo* this, GlobalContext* globalCtx);
+void EnBaguo_DrawEffects(EnBaguo* this, GlobalContext* globalCtx);
typedef enum {
/* 0x0 */ NEJIRON_ACTION_INACTIVE, // The Nejiron is either underground or emerging from underground
@@ -311,7 +310,7 @@ void EnBaguo_PostDetonation(EnBaguo* this, GlobalContext* globalCtx) {
void EnBaguo_CheckForDetonation(EnBaguo* this, GlobalContext* globalCtx) {
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
- Vec3f acceleration = { 0.0f, 0.0f, 0.0f };
+ Vec3f accel = { 0.0f, 0.0f, 0.0f };
s32 i;
// In order to match, this variable must act as both a boolean to check if
@@ -335,15 +334,15 @@ void EnBaguo_CheckForDetonation(EnBaguo* this, GlobalContext* globalCtx) {
this->actor.speedXZ = 0.0f;
this->actor.shape.shadowScale = 0.0f;
- for (i = 0; i < ARRAY_COUNT(this->particles); i++) {
- acceleration.x = (Rand_ZeroOne() - 0.5f) * 8.0f;
- acceleration.y = -1.0f;
- acceleration.z = (Rand_ZeroOne() - 0.5f) * 8.0f;
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
+ accel.x = (Rand_ZeroOne() - 0.5f) * 8.0f;
+ accel.y = -1.0f;
+ accel.z = (Rand_ZeroOne() - 0.5f) * 8.0f;
velocity.x = (Rand_ZeroOne() - 0.5f) * 14.0f;
velocity.y = Rand_ZeroOne() * 30.0f;
velocity.z = (Rand_ZeroOne() - 0.5f) * 14.0f;
- EnBaguo_InitializeParticle(this, &this->actor.focus.pos, &velocity, &acceleration,
- (Rand_ZeroFloat(1.0f) * 0.01f) + 0.003f, 90);
+ EnBaguo_InitializeEffect(this, &this->actor.focus.pos, &velocity, &accel,
+ (Rand_ZeroFloat(1.0f) * 0.01f) + 0.003f, 90);
}
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, this->actor.world.pos.x,
@@ -368,7 +367,7 @@ void EnBaguo_Update(Actor* thisx, GlobalContext* globalCtx) {
EnBaguo* this = THIS;
Actor_SetFocus(&this->actor, 30.0f);
- EnBaguo_UpdateParticles(this, globalCtx);
+ EnBaguo_UpdateEffects(this, globalCtx);
EnBaguo_CheckForDetonation(this, globalCtx);
this->actionFunc(this, globalCtx);
@@ -432,77 +431,76 @@ void EnBaguo_DrawBody(Actor* thisx, GlobalContext* globalCtx) {
CLOSE_DISPS(globalCtx->state.gfxCtx);
- EnBaguo_DrawRockParticles(this, globalCtx);
+ EnBaguo_DrawEffects(this, globalCtx);
}
-void EnBaguo_InitializeParticle(EnBaguo* this, Vec3f* position, Vec3f* velocity, Vec3f* acceleration, f32 scale,
- s16 timer) {
+void EnBaguo_InitializeEffect(EnBaguo* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale, s16 timer) {
s16 i;
- NejironParticle* particle = this->particles;
+ NejironEffect* effect = this->effects;
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
- if (!particle->isVisible) {
- particle->isVisible = true;
- particle->position = *position;
- particle->velocity = *velocity;
- particle->acceleration = *acceleration;
- particle->scale = scale;
- particle->timer = timer;
- particle->rotation.x = (s16)randPlusMinusPoint5Scaled(30000.0f);
- particle->rotation.y = (s16)randPlusMinusPoint5Scaled(30000.0f);
- particle->rotation.z = (s16)randPlusMinusPoint5Scaled(30000.0f);
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
+ if (!effect->isEnabled) {
+ effect->isEnabled = true;
+ effect->pos = *pos;
+ effect->velocity = *velocity;
+ effect->accel = *accel;
+ effect->scale = scale;
+ effect->timer = timer;
+ effect->rotation.x = (s16)randPlusMinusPoint5Scaled(30000.0f);
+ effect->rotation.y = (s16)randPlusMinusPoint5Scaled(30000.0f);
+ effect->rotation.z = (s16)randPlusMinusPoint5Scaled(30000.0f);
return;
}
}
}
-void EnBaguo_UpdateParticles(EnBaguo* this, GlobalContext* globalCtx) {
+void EnBaguo_UpdateEffects(EnBaguo* this, GlobalContext* globalCtx) {
s32 i;
- NejironParticle* particle = this->particles;
+ NejironEffect* effect = this->effects;
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
- if (particle->isVisible) {
- particle->position.x += particle->velocity.x;
- particle->position.y += particle->velocity.y;
- particle->position.z += particle->velocity.z;
- particle->rotation.x += 0xBB8;
- particle->rotation.y += 0xBB8;
- particle->rotation.z += 0xBB8;
- particle->velocity.x += particle->acceleration.x;
- particle->velocity.y += particle->acceleration.y;
- particle->velocity.z += particle->acceleration.z;
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
+ if (effect->isEnabled) {
+ effect->pos.x += effect->velocity.x;
+ effect->pos.y += effect->velocity.y;
+ effect->pos.z += effect->velocity.z;
+ effect->rotation.x += 0xBB8;
+ effect->rotation.y += 0xBB8;
+ effect->rotation.z += 0xBB8;
+ effect->velocity.x += effect->accel.x;
+ effect->velocity.y += effect->accel.y;
+ effect->velocity.z += effect->accel.z;
- if (particle->position.y < (this->actor.world.pos.y - 10.0f)) {
- Math_ApproachZeroF(&particle->scale, 0.2f, 0.001f);
- if (particle->scale <= 0.0001f) {
- particle->timer = 0;
+ if (effect->pos.y < (this->actor.world.pos.y - 10.0f)) {
+ Math_ApproachZeroF(&effect->scale, 0.2f, 0.001f);
+ if (effect->scale <= 0.0001f) {
+ effect->timer = 0;
}
}
- if (particle->timer != 0) {
- particle->timer--;
+ if (effect->timer != 0) {
+ effect->timer--;
} else {
- particle->isVisible = false;
+ effect->isEnabled = false;
}
}
}
}
-void EnBaguo_DrawRockParticles(EnBaguo* this, GlobalContext* globalCtx) {
+void EnBaguo_DrawEffects(EnBaguo* this, GlobalContext* globalCtx) {
s16 i;
- NejironParticle* particle = this->particles;
+ NejironEffect* effect = this->effects;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
- if (particle->isVisible) {
- Matrix_Translate(particle->position.x, particle->position.y, particle->position.z, MTXMODE_NEW);
- Matrix_RotateXS(particle->rotation.x, MTXMODE_APPLY);
- Matrix_RotateYS(particle->rotation.y, MTXMODE_APPLY);
- Matrix_RotateZS(particle->rotation.z, MTXMODE_APPLY);
- Matrix_Scale(particle->scale, particle->scale, particle->scale, MTXMODE_APPLY);
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
+ if (effect->isEnabled) {
+ Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
+ Matrix_RotateXS(effect->rotation.x, MTXMODE_APPLY);
+ Matrix_RotateYS(effect->rotation.y, MTXMODE_APPLY);
+ Matrix_RotateZS(effect->rotation.z, MTXMODE_APPLY);
+ Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 1, 255, 255, 255, 255);
diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h
index 133e68b3d..553a77f48 100644
--- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h
+++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.h
@@ -12,15 +12,17 @@ typedef void (*EnBaguoActionFunc)(struct EnBaguo*, GlobalContext*);
* When a Nejiron explodes, rock particles fly out from where it exploded.
* This struct governs how these rock particles behave.
*/
-typedef struct NejironParticle {
- /* 0x00 */ u8 isVisible;
- /* 0x04 */ Vec3f position;
+typedef struct NejironEffect {
+ /* 0x00 */ u8 isEnabled;
+ /* 0x04 */ Vec3f pos;
/* 0x10 */ Vec3f velocity;
- /* 0x1C */ Vec3f acceleration;
+ /* 0x1C */ Vec3f accel;
/* 0x28 */ Vec3s rotation;
/* 0x30 */ f32 scale;
/* 0x34 */ s16 timer;
-} NejironParticle; // size = 0x38
+} NejironEffect; // size = 0x38
+
+#define EN_BAGUO_EFFECT_COUNT 30
typedef struct EnBaguo {
/* 0x000 */ Actor actor;
@@ -39,7 +41,7 @@ typedef struct EnBaguo {
/* 0x1D0 */ Vec3f targetRotation;
/* 0x1DC */ ColliderJntSph collider;
/* 0x1FC */ ColliderJntSphElement colliderElements[1];
- /* 0x23C */ NejironParticle particles[30];
+ /* 0x23C */ NejironEffect effects[EN_BAGUO_EFFECT_COUNT];
} EnBaguo; // size = 0x8CC
extern const ActorInit En_Baguo_InitVars;
diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
index f48976cd6..65d582eb3 100644
--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c
+++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
@@ -241,7 +241,7 @@ void EnBb_SetupFlyIdle(EnBb* this) {
if ((this->actor.xzDistToPlayer < (this->attackRange + 120.0f)) ||
(Actor_XZDistanceToPoint(&this->actor, &this->actor.home.pos) < 300.0f)) {
- this->targetYRotation += (s16)(Rand_Next() >> 0x11);
+ this->targetYRotation += (s16)((s32)Rand_Next() >> 0x11);
}
this->collider.base.atFlags |= AT_ON;
diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c
index f2c70dac8..2f932023a 100644
--- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c
+++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c
@@ -97,7 +97,7 @@ static DamageTable sDamageTable = {
/* Powder Keg */ DMG_ENTRY(0, 0),
};
-static TurnOptionsSet sTurnOptions = {
+static TrackOptionsSet sTrackOptions = {
{ 0xFA0, 4, 1, 3 },
{ 0x1770, 4, 1, 6 },
{ 0xFA0, 4, 1, 3 },
@@ -113,11 +113,11 @@ void EnBba01_UpdateModel(EnBba01* this, GlobalContext* globalCtx) {
point.x = player->actor.world.pos.x;
point.y = player->bodyPartsPos[7].y + 3.0f;
point.z = player->actor.world.pos.z;
- SubS_TurnToPoint(&point, &this->enHy.actor.focus.pos, &this->enHy.actor.shape.rot, &this->enHy.turnTarget,
- &this->enHy.headRot, &this->enHy.torsoRot, &sTurnOptions);
+ SubS_TrackPoint(&point, &this->enHy.actor.focus.pos, &this->enHy.actor.shape.rot, &this->enHy.trackTarget,
+ &this->enHy.headRot, &this->enHy.torsoRot, &sTrackOptions);
} else {
- Math_SmoothStepToS(&this->enHy.turnTarget.x, 0, 4, 0x3E8, 1);
- Math_SmoothStepToS(&this->enHy.turnTarget.y, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->enHy.trackTarget.x, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->enHy.trackTarget.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->enHy.headRot.x, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->enHy.headRot.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->enHy.torsoRot.x, 0, 4, 0x3E8, 1);
@@ -134,7 +134,7 @@ s32 EnBba01_TestIsTalking(EnBba01* this, GlobalContext* globalCtx) {
if (Actor_ProcessTalkRequest(&this->enHy.actor, &globalCtx->state)) {
isTalking = true;
this->enHy.textId = 0x10B9; // Invalid textId, produces empty textbox
- this->enHy.tmpTurnTarget = this->enHy.turnTarget;
+ this->enHy.tmptrackTarget = this->enHy.trackTarget;
this->enHy.tmpHeadRot = this->enHy.headRot;
this->enHy.tmpTorsoRot = this->enHy.torsoRot;
this->enHy.tmpActionFunc = this->enHy.actionFunc;
@@ -197,7 +197,7 @@ void EnBba01_Talk(EnHy* this, GlobalContext* globalCtx) {
break;
case 2:
this->actor.textId = 0;
- this->turnTarget = this->tmpTurnTarget;
+ this->trackTarget = this->tmptrackTarget;
this->headRot = this->tmpHeadRot;
this->torsoRot = this->tmpTorsoRot;
this->actor.shape.rot.y = this->actor.world.rot.y;
diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
index acf465f83..4c4261a4c 100644
--- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
+++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
@@ -505,7 +505,7 @@ void EnBigpo_WarpingOut(EnBigpo* this, GlobalContext* globalCtx) {
void EnBigpo_SetupWarpIn(EnBigpo* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
f32 distance = CLAMP_MIN(this->actor.xzDistToPlayer, 200.0f);
- s16 randomYaw = (Rand_Next() >> 0x14) + this->actor.yawTowardsPlayer;
+ s16 randomYaw = ((s32)Rand_Next() >> 0x14) + this->actor.yawTowardsPlayer;
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_STALKIDS_APPEAR);
Animation_PlayLoop(&this->skelAnime, &gBigpoAwakenStretchAnim);
@@ -565,7 +565,7 @@ void EnBigpo_IdleFlying(EnBigpo* this, GlobalContext* globalCtx) {
}
if (Math_ScaledStepToS(&this->actor.shape.rot.y, this->unk208, 0x200) && (Rand_ZeroOne() < 0.075f)) {
- this->unk208 += (s16)((((u32)Rand_Next() >> 0x14) + 0x1000) * ((Rand_ZeroOne() < 0.5f) ? -1 : 1));
+ this->unk208 += (s16)(((Rand_Next() >> 0x14) + 0x1000) * ((Rand_ZeroOne() < 0.5f) ? -1 : 1));
}
this->actor.world.rot.y = this->actor.shape.rot.y;
diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
index 1a507b5b6..c546ba780 100644
--- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
@@ -2089,9 +2089,9 @@ void EnBigslime_SetupIdleLookAround(EnBigslime* this) {
this->idleTimer = 60;
this->actor.speedXZ = 0.0f;
if (BINANG_SUB(Actor_YawToPoint(&this->actor, &this->actor.home.pos), this->gekkoRot.y) > 0) {
- this->gekkoYaw = this->gekkoRot.y + ((u32)Rand_Next() >> 20) + 0x2000;
+ this->gekkoYaw = this->gekkoRot.y + (Rand_Next() >> 20) + 0x2000;
} else {
- this->gekkoYaw = this->gekkoRot.y - ((u32)Rand_Next() >> 20) - 0x2000;
+ this->gekkoYaw = this->gekkoRot.y - (Rand_Next() >> 20) - 0x2000;
}
this->actionFunc = EnBigslime_IdleLookAround;
}
@@ -2111,9 +2111,9 @@ void EnBigslime_IdleLookAround(EnBigslime* this, GlobalContext* globalCtx) {
if ((this->skelAnime.animation == &gGekkoNervousIdleAnim) &&
Math_ScaledStepToS(&this->gekkoRot.y, this->gekkoYaw, 0x400)) {
if (BINANG_SUB(Actor_YawToPoint(&this->actor, &this->actor.home.pos), this->gekkoRot.y) > 0) {
- this->gekkoYaw = this->gekkoRot.y + ((u32)Rand_Next() >> 20) + 0x2000;
+ this->gekkoYaw = this->gekkoRot.y + (Rand_Next() >> 20) + 0x2000;
} else {
- this->gekkoYaw = this->gekkoRot.y - ((u32)Rand_Next() >> 20) - 0x2000;
+ this->gekkoYaw = this->gekkoRot.y - (Rand_Next() >> 20) - 0x2000;
}
}
@@ -2700,10 +2700,10 @@ void EnBigslime_AddIceShardEffect(EnBigslime* this, GlobalContext* globalCtx) {
iceShardEffect->pos.x = (targetVtx->n.ob[0] * this->actor.scale.x) + this->actor.world.pos.x;
iceShardEffect->pos.y = (targetVtx->n.ob[1] * this->actor.scale.y) + this->actor.world.pos.y;
iceShardEffect->pos.z = (targetVtx->n.ob[2] * this->actor.scale.z) + this->actor.world.pos.z;
- iceShardEffect->rotation.x = Rand_Next() >> 0x10;
- iceShardEffect->rotation.y = Rand_Next() >> 0x10;
- iceShardEffect->rotation.z = Rand_Next() >> 0x10;
- iceShardEffect->isActive = true;
+ iceShardEffect->rot.x = (s32)Rand_Next() >> 0x10;
+ iceShardEffect->rot.y = (s32)Rand_Next() >> 0x10;
+ iceShardEffect->rot.z = (s32)Rand_Next() >> 0x10;
+ iceShardEffect->isEnabled = true;
randPitch = Rand_S16Offset(0x1000, 0x3000);
vtxZ = targetVtx->n.ob[2];
vtxX = targetVtx->n.ob[0];
@@ -2715,9 +2715,9 @@ void EnBigslime_AddIceShardEffect(EnBigslime* this, GlobalContext* globalCtx) {
xzDist = Math_CosS(randPitch) * randFloat;
}
- iceShardEffect->vel.x = targetVtx->n.ob[0] * xzDist;
- iceShardEffect->vel.y = Math_SinS(randPitch) * randFloat;
- iceShardEffect->vel.z = targetVtx->n.ob[2] * xzDist;
+ iceShardEffect->velocity.x = targetVtx->n.ob[0] * xzDist;
+ iceShardEffect->velocity.y = Math_SinS(randPitch) * randFloat;
+ iceShardEffect->velocity.z = targetVtx->n.ob[2] * xzDist;
iceShardEffect->scale = 0.001f * (Rand_ZeroFloat(6.0f) + 2.0f);
}
}
@@ -2736,15 +2736,15 @@ void EnBigslime_UpdateEffects(EnBigslime* this) {
// Update ice shards
for (i = 0; i < BIGSLIME_NUM_ICE_SHARD; i++) {
iceShardEffect = &this->iceShardEffect[i];
- if (iceShardEffect->isActive > false) {
- iceShardEffect->vel.y += -1.0f;
- Math_Vec3f_Sum(&iceShardEffect->pos, &iceShardEffect->vel, &iceShardEffect->pos);
+ if (iceShardEffect->isEnabled > false) {
+ iceShardEffect->velocity.y += -1.0f;
+ Math_Vec3f_Sum(&iceShardEffect->pos, &iceShardEffect->velocity, &iceShardEffect->pos);
if (iceShardEffect->pos.y < (GBT_ROOM_5_MIN_Y - 20.0f)) {
- iceShardEffect->isActive = false;
+ iceShardEffect->isEnabled = false;
}
- iceShardEffect->rotation.x += (s16)(((u32)Rand_Next() >> 0x17) + 0x700);
- iceShardEffect->rotation.y += (s16)(((u32)Rand_Next() >> 0x17) + 0x900);
- iceShardEffect->rotation.z += (s16)(((u32)Rand_Next() >> 0x17) + 0xB00);
+ iceShardEffect->rot.x += (s16)((Rand_Next() >> 0x17) + 0x700);
+ iceShardEffect->rot.y += (s16)((Rand_Next() >> 0x17) + 0x900);
+ iceShardEffect->rot.z += (s16)((Rand_Next() >> 0x17) + 0xB00);
}
}
@@ -3143,9 +3143,9 @@ void EnBigslime_DrawShatteringEffects(EnBigslime* this, GlobalContext* globalCtx
for (i = 0; i < BIGSLIME_NUM_ICE_SHARD; i++) {
iceShardEffect = &this->iceShardEffect[i];
- if (iceShardEffect->isActive > false) {
+ if (iceShardEffect->isEnabled > false) {
Matrix_SetTranslateRotateYXZ(iceShardEffect->pos.x, iceShardEffect->pos.y, iceShardEffect->pos.z,
- &iceShardEffect->rotation);
+ &iceShardEffect->rot);
Matrix_Scale(iceShardEffect->scale, iceShardEffect->scale, iceShardEffect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h
index 579ec5d50..1005ccff5 100644
--- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h
+++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.h
@@ -42,9 +42,9 @@ typedef struct {
typedef struct {
/* 0x00 */ Vec3f pos;
- /* 0x0C */ Vec3f vel;
- /* 0x18 */ s16 isActive;
- /* 0x1A */ Vec3s rotation;
+ /* 0x0C */ Vec3f velocity;
+ /* 0x18 */ s16 isEnabled;
+ /* 0x1A */ Vec3s rot;
/* 0x20 */ f32 scale;
} EnBigslimeIceShardEffect; // size = 0x24
diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
index c60971034..3524343d8 100644
--- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
+++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
@@ -78,9 +78,9 @@ void func_809CCDE0(EnBji01* this, GlobalContext* globalCtx) {
Math_Vec3f_Copy(&pitchTarget, &player->actor.world.pos);
pitchTarget.y = player->bodyPartsPos[7].y + 3.0f;
- SubS_TurnToPointStep(&this->actor.world.pos, &this->actor.focus.pos, this->actor.shape.rot.y,
- &player->actor.world.pos, &pitchTarget, &this->headZRotStep, &this->headXRotStep,
- &this->torsoZRotStep, &this->torsoXRotStep, 0x1554, 0x1FFE, 0xE38, 0x1C70);
+ SubS_TrackPointStep(&this->actor.world.pos, &this->actor.focus.pos, this->actor.shape.rot.y,
+ &player->actor.world.pos, &pitchTarget, &this->headZRotStep, &this->headXRotStep,
+ &this->torsoZRotStep, &this->torsoXRotStep, 0x1554, 0x1FFE, 0xE38, 0x1C70);
}
void func_809CCE98(EnBji01* this, GlobalContext* globalCtx) {
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c
index 7367f49bc..2b01b6e05 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.c
@@ -5,9 +5,39 @@
*/
#include "z_en_box.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_box/object_box.h"
+#include "overlays/actors/ovl_En_Elforg/z_en_elforg.h"
#define FLAGS 0x00000000
+/*
+set on init unless treasure flag is set
+if clear, chest moves (Actor_MoveForward) (falls, likely)
+ends up cleared from SWITCH_FLAG_FALL types when switch flag is set
+*/
+#define ENBOX_MOVE_IMMOBILE (1 << 0)
+/*
+set in the logic for SWITCH_FLAG_FALL types
+otherwise unused
+*/
+#define ENBOX_MOVE_UNUSED (1 << 1)
+/*
+set with 50% chance on init for SWITCH_FLAG_FALL types
+only used for SWITCH_FLAG_FALL types
+ends up "blinking" (set/clear every frame) once switch flag is set,
+if some collision-related condition (?) is met
+only used for signum of z rotation
+*/
+#define ENBOX_MOVE_FALL_ANGLE_SIDE (1 << 2)
+/*
+when set, gets cleared next EnBox_Update call and clip to the floor
+*/
+#define ENBOX_MOVE_STICK_TO_GROUND (1 << 4)
+#define ENBOX_MOVE_0x20 (1 << 5)
+#define ENBOX_MOVE_0x40 (1 << 6)
+#define ENBOX_MOVE_0x80 (1 << 7)
+
#define THIS ((EnBox*)thisx)
void EnBox_Init(Actor* thisx, GlobalContext* globalCtx);
@@ -15,7 +45,17 @@ void EnBox_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnBox_Update(Actor* thisx, GlobalContext* globalCtx);
void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
+void EnBox_FallOnSwitchFlag(EnBox* this, GlobalContext* globalCtx);
+void EnBox_AppearSwitchFlag(EnBox* this, GlobalContext* globalCtx);
+void EnBox_AppearOnRoomClear(EnBox* this, GlobalContext* globalCtx);
+void func_80868AFC(EnBox* this, GlobalContext* globalCtx);
+void func_80868B74(EnBox* this, GlobalContext* globalCtx);
+void EnBox_WaitOpen(EnBox* this, GlobalContext* globalCtx);
+void EnBox_Open(EnBox* this, GlobalContext* globalCtx);
+
+void func_80867FBC(func_80867BDC_a0* arg0, GlobalContext* globalCtx, s32 arg2);
+void func_80867FE4(func_80867BDC_a0* arg0, GlobalContext* globalCtx);
+
const ActorInit En_Box_InitVars = {
ACTOR_EN_BOX,
ACTORCAT_CHEST,
@@ -28,66 +68,654 @@ const ActorInit En_Box_InitVars = {
(ActorFunc)EnBox_Draw,
};
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80869B50[] = {
+static InitChainEntry sInitChain[] = {
ICHAIN_U8(targetMode, 0, ICHAIN_STOP),
};
-#endif
+typedef struct {
+ f32 data[5];
+} EnBox_PlaybackSpeed; // 0x14
-extern InitChainEntry D_80869B50[];
+static EnBox_PlaybackSpeed sPlaybackSpeed = { { 1.5f, 1.0f, 1.5f, 1.0f, 1.5f } };
-extern UNK_TYPE D_0600043C;
-extern UNK_TYPE D_06000DB0;
+static AnimationHeader* sBigChestAnimations[5] = {
+ &gBoxBigChestOpenAdultAnim, &gBoxBigChestOpenGoronAnim, &gBoxBigChestOpenAdultAnim,
+ &gBoxBigChestOpenDekuAnim, &gBoxBigChestOpenChildAnim,
+};
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80867BD0.s")
+void EnBox_SetupAction(EnBox* this, EnBoxActionFunc func) {
+ this->actionFunc = func;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80867BDC.s")
+void func_80867BDC(func_80867BDC_a0* arg0, GlobalContext* globalCtx, Vec3f* pos) {
+ arg0->pos = *pos;
+ arg0->unk_0C = NULL;
+ arg0->unk_10 = NULL;
+ arg0->unk_14 = 0;
+ arg0->unk_18 = 0;
+ arg0->unk_1C = 0;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80867C14.s")
+void func_80867C14(func_80867BDC_a0* arg0, GlobalContext* globalCtx) {
+ arg0->unk_18++;
+ if (arg0->unk_18 > 85) {
+ arg0->unk_18 = 85;
+ }
+ if (arg0->unk_18 != 85) {
+ arg0->unk_1C = arg0->unk_18 - 28;
+ if (arg0->unk_18 - 28 < 0) {
+ arg0->unk_1C = 0;
+ }
+ } else {
+ arg0->unk_1C++;
+ if (arg0->unk_1C > 85) {
+ func_80867FE4(arg0, globalCtx);
+ }
+ }
+ arg0->unk_14++;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80867C8C.s")
+void func_80867C8C(func_80867BDC_a0* arg0, GlobalContext* globalCtx) {
+ s32 temp_s6 = arg0->unk_18 - arg0->unk_1C;
+ s32 i;
+ f32 pad;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80867FBC.s")
+ if (temp_s6 > 0) {
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+ Matrix_Push();
+ for (i = 0; i < temp_s6; i++) {
+ f32 temp_f0 = (f32)i / temp_s6;
+ s16 temp_s0 = ((f32)arg0->unk_18 - arg0->unk_1C) * temp_f0 + arg0->unk_1C;
+ f32 temp_f24 = 1.0f - (temp_s0 * (1 / 85.0f));
+ f32 temp_f26 = Rand_ZeroOne() * 0.03f * temp_f0 * temp_f24;
+ f32 temp_f28;
+ f32 temp_f30 = Math_SinS(temp_s0 * 0x9A6) * 45.0f + arg0->pos.x;
+ f32 phi_f24;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80867FE4.s")
+ if (arg0->unk_20 != 0) {
+ phi_f24 = arg0->pos.y - (0.03f * temp_s0) - (0.01f * temp_s0 * temp_s0);
+ } else {
+ phi_f24 = arg0->pos.y + (0.03f * temp_s0) + (0.01f * temp_s0 * temp_s0);
+ }
+ temp_f28 = (Math_CosS(temp_s0 * 0x9A6) * 45.0f) + arg0->pos.z;
+ Matrix_Translate(2.0f * Rand_Centered() + temp_f30, 2.0f * Rand_Centered() + phi_f24,
+ 2.0f * Rand_Centered() + temp_f28, MTXMODE_NEW);
+ Matrix_Scale(temp_f26, temp_f26, temp_f26, MTXMODE_APPLY);
+ gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, 255);
+ gDPSetEnvColor(POLY_XLU_DISP++, 255, 150, 0, 255);
+ func_8012C2DC(globalCtx->state.gfxCtx);
+ Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
+ gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
+ G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
+ }
+ Matrix_Pop();
+ gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_8086800C.s")
+void func_80867FBC(func_80867BDC_a0* arg0, GlobalContext* globalCtx, s32 arg2) {
+ arg0->unk_0C = func_80867C14;
+ arg0->unk_10 = func_80867C8C;
+ arg0->unk_20 = arg2;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/EnBox_Init.s")
+void func_80867FE4(func_80867BDC_a0* arg0, GlobalContext* globalCtx) {
+ arg0->unk_0C = NULL;
+ arg0->unk_10 = NULL;
+ func_80867BDC(arg0, globalCtx, &arg0->pos);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/EnBox_Destroy.s")
+void EnBox_ClipToGround(EnBox* this, GlobalContext* globalCtx) {
+ s32 pad;
+ CollisionPoly* poly;
+ s32 bgId;
+ Vec3f pos;
+ f32 floorHeight;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80868630.s")
+ if (!(this->movementFlags & ENBOX_MOVE_0x80)) {
+ pos = this->dyna.actor.world.pos;
+ pos.y += 1.0f;
+ floorHeight = BgCheck_EntityRaycastFloor5(&globalCtx->colCtx, &poly, &bgId, &this->dyna.actor, &pos);
+ if (floorHeight != BGCHECK_Y_MIN) {
+ this->dyna.actor.world.pos.y = floorHeight;
+ this->dyna.actor.floorHeight = floorHeight;
+ }
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80868734.s")
+void EnBox_Init(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ EnBox* this = THIS;
+ s16 cutsceneIdx;
+ CollisionHeader* colHeader;
+ f32 animFrame;
+ f32 animFrameEnd;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_808687E8.s")
+ colHeader = NULL;
+ animFrame = 0.0f;
+ animFrameEnd = Animation_GetLastFrame(&gBoxChestOpenAnim);
+ Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
+ DynaPolyActor_Init(&this->dyna, 0);
+ CollisionHeader_GetVirtual(&gBoxChestCol, &colHeader);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80868944.s")
+ this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
+ this->movementFlags = 0;
+ this->type = ENBOX_GET_TYPE(&this->dyna.actor);
+ this->iceSmokeTimer = 0;
+ this->unk_1F3 = 0;
+ this->dyna.actor.gravity = -5.5f;
+ this->dyna.actor.terminalVelocity = -50.0f;
+ this->switchFlag = ENBOX_GET_SWITCH_FLAG(&this->dyna.actor);
+ this->dyna.actor.floorHeight = this->dyna.actor.world.pos.y;
+ if (this->dyna.actor.world.rot.x == 180) {
+ this->movementFlags |= ENBOX_MOVE_0x80;
+ this->dyna.actor.world.rot.x = 0x7FFF;
+ this->collectableFlag = 0;
+ } else {
+ func_800C636C(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+ this->collectableFlag = (this->dyna.actor.world.rot.x & 0x7F);
+ this->dyna.actor.world.rot.x = 0;
+ }
+ thisx->shape.rot.x = this->dyna.actor.world.rot.x;
+ this->getItem = ENBOX_GET_ITEM(thisx);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_808689E8.s")
+ if (Flags_GetTreasure(globalCtx, ENBOX_GET_CHEST_FLAG(&this->dyna.actor)) || this->getItem == GI_NONE) {
+ this->alpha = 255;
+ this->iceSmokeTimer = 100;
+ EnBox_SetupAction(this, EnBox_Open);
+ this->movementFlags |= ENBOX_MOVE_STICK_TO_GROUND;
+ animFrame = animFrameEnd;
+ } else if (((this->type == ENBOX_TYPE_BIG_SWITCH_FLAG_FALL) || (this->type == ENBOX_TYPE_SMALL_SWITCH_FLAG_FALL)) &&
+ !Flags_GetSwitch(globalCtx, this->switchFlag)) {
+ func_800C62BC(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+ if (Rand_ZeroOne() < 0.5f) {
+ this->movementFlags |= ENBOX_MOVE_FALL_ANGLE_SIDE;
+ }
+ this->unk_1A0 = -12;
+ EnBox_SetupAction(this, EnBox_FallOnSwitchFlag);
+ this->alpha = 0;
+ this->movementFlags |= ENBOX_MOVE_IMMOBILE;
+ this->dyna.actor.flags |= ACTOR_FLAG_10;
+ } else if (((this->type == ENBOX_TYPE_BIG_ROOM_CLEAR) || (this->type == ENBOX_TYPE_SMALL_ROOM_CLEAR)) &&
+ !Flags_GetClear(globalCtx, this->dyna.actor.room)) {
+ EnBox_SetupAction(this, EnBox_AppearOnRoomClear);
+ func_800C62BC(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+ if (this->movementFlags & ENBOX_MOVE_0x80) {
+ this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + 50.0f;
+ } else {
+ this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 50.0f;
+ }
+ this->alpha = 0;
+ this->movementFlags |= ENBOX_MOVE_IMMOBILE;
+ this->dyna.actor.flags |= ACTOR_FLAG_10;
+ } else if ((this->type == ENBOX_TYPE_BIG_SONG_ZELDAS_LULLABY) || (this->type == ENBOX_TYPE_BIG_SONG_SUNS)) {
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80868A6C.s")
+ } else if (((this->type == ENBOX_TYPE_BIG_SWITCH_FLAG) || (this->type == ENBOX_TYPE_SMALL_SWITCH_FLAG)) &&
+ !Flags_GetSwitch(globalCtx, this->switchFlag)) {
+ EnBox_SetupAction(this, EnBox_AppearSwitchFlag);
+ func_800C62BC(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+ if (this->movementFlags & ENBOX_MOVE_0x80) {
+ this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y + 50.0f;
+ } else {
+ this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 50.0f;
+ }
+ this->alpha = 0;
+ this->movementFlags |= ENBOX_MOVE_IMMOBILE;
+ this->dyna.actor.flags |= ACTOR_FLAG_10;
+ } else {
+ if ((this->type == ENBOX_TYPE_BIG_INVISIBLE) || (this->type == ENBOX_TYPE_SMALL_INVISIBLE)) {
+ this->dyna.actor.flags |= ACTOR_FLAG_80;
+ }
+ EnBox_SetupAction(this, EnBox_WaitOpen);
+ this->movementFlags |= ENBOX_MOVE_IMMOBILE;
+ this->movementFlags |= ENBOX_MOVE_STICK_TO_GROUND;
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80868AFC.s")
+ if ((this->getItem == GI_STRAY_FAIRY) && !Flags_GetTreasure(globalCtx, ENBOX_GET_CHEST_FLAG(&this->dyna.actor))) {
+ this->dyna.actor.flags |= ACTOR_FLAG_10;
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80868B74.s")
+ this->dyna.actor.shape.rot.y += 0x8000;
+ this->dyna.actor.home.rot.z = this->dyna.actor.world.rot.z = this->dyna.actor.shape.rot.z = 0;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80868CC8.s")
+ SkelAnime_Init(globalCtx, &this->skelAnime, &gBoxChestSkel, &gBoxChestOpenAnim, this->jointTable, this->morphTable,
+ OBJECT_BOX_CHEST_LIMB_MAX);
+ Animation_Change(&this->skelAnime, &gBoxChestOpenAnim, 1.5f, animFrame, animFrameEnd, ANIMMODE_ONCE, 0.0f);
+ if (Actor_IsSmallChest(this)) {
+ Actor_SetScale(&this->dyna.actor, 0.0075f);
+ Actor_SetFocus(&this->dyna.actor, 20.0f);
+ } else {
+ Actor_SetScale(&this->dyna.actor, 0.01f);
+ Actor_SetFocus(&this->dyna.actor, 40.0f);
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80869020.s")
+ this->cutsceneIdxA = -1;
+ this->cutsceneIdxB = -1;
+ cutsceneIdx = this->dyna.actor.cutscene;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_808692E0.s")
+ while (cutsceneIdx != -1) {
+ if (func_800F2178(cutsceneIdx) == 1) {
+ this->cutsceneIdxB = cutsceneIdx;
+ } else {
+ this->cutsceneIdxA = cutsceneIdx;
+ }
+ cutsceneIdx = ActorCutscene_GetAdditionalCutscene(cutsceneIdx);
+ }
+ func_80867BDC(&this->unk_1F4, globalCtx, &this->dyna.actor.home.pos);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/EnBox_Update.s")
+void EnBox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ EnBox* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80869600.s")
+ DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80869850.s")
+void EnBox_RandomDustKinematic(EnBox* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel) {
+ f32 randomRadius = Rand_ZeroOne() * 25.0f;
+ s16 randomAngle = Rand_ZeroOne() * 0x10000;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_80869874.s")
+ *pos = this->dyna.actor.world.pos;
+ pos->x += Math_SinS(randomAngle) * randomRadius;
+ pos->z += Math_CosS(randomAngle) * randomRadius;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/func_808698B4.s")
+ velocity->y = 1.0f;
+ velocity->x = Math_SinS(randomAngle);
+ velocity->z = Math_CosS(randomAngle);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Box/EnBox_Draw.s")
+ accel->x = 0.0f;
+ accel->y = 0.0f;
+ accel->z = 0.0f;
+}
+
+void EnBox_SpawnDust(EnBox* this, GlobalContext* globalCtx) {
+ s32 i;
+ Vec3f pos;
+ Vec3f velocity;
+ Vec3f accel;
+
+ for (i = 0; i < 20; i++) {
+ EnBox_RandomDustKinematic(this, &pos, &velocity, &accel);
+ func_800B1280(globalCtx, &pos, &velocity, &accel, 100, 30, 15);
+ }
+}
+
+void EnBox_Fall(EnBox* this, GlobalContext* globalCtx) {
+ f32 yDiff;
+
+ this->alpha = 255;
+ this->movementFlags &= ~ENBOX_MOVE_IMMOBILE;
+ if (this->dyna.actor.bgCheckFlags & 1) {
+ this->movementFlags |= ENBOX_MOVE_UNUSED;
+ if (this->movementFlags & ENBOX_MOVE_FALL_ANGLE_SIDE) {
+ this->movementFlags &= ~ENBOX_MOVE_FALL_ANGLE_SIDE;
+ } else {
+ this->movementFlags |= ENBOX_MOVE_FALL_ANGLE_SIDE;
+ }
+ if (this->type == ENBOX_TYPE_BIG_SWITCH_FLAG_FALL) {
+ this->dyna.actor.velocity.y = -this->dyna.actor.velocity.y * 0.55f;
+ } else {
+ this->dyna.actor.velocity.y = -this->dyna.actor.velocity.y * 0.65f;
+ }
+ if (this->dyna.actor.velocity.y < 5.5f) {
+ this->dyna.actor.shape.rot.z = 0;
+ this->dyna.actor.world.pos.y = this->dyna.actor.floorHeight;
+ EnBox_SetupAction(this, EnBox_WaitOpen);
+ }
+ Audio_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TRE_BOX_BOUND);
+ EnBox_SpawnDust(this, globalCtx);
+ }
+ yDiff = this->dyna.actor.world.pos.y - this->dyna.actor.floorHeight;
+ if (this->movementFlags & ENBOX_MOVE_FALL_ANGLE_SIDE) {
+ this->dyna.actor.shape.rot.z = yDiff * 50.0f;
+ } else {
+ this->dyna.actor.shape.rot.z = -yDiff * 50.0f;
+ }
+}
+
+void EnBox_FallOnSwitchFlag(EnBox* this, GlobalContext* globalCtx) {
+ func_800B8C50(&this->dyna.actor, globalCtx);
+ if (this->unk_1A0 >= 0) {
+ EnBox_SetupAction(this, EnBox_Fall);
+ func_800C6314(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+ } else if (this->unk_1A0 >= -11) {
+ this->unk_1A0++;
+ } else if (Flags_GetSwitch(globalCtx, this->switchFlag)) {
+ this->unk_1A0++;
+ }
+}
+
+void EnBox_AppearSwitchFlag(EnBox* this, GlobalContext* globalCtx) {
+ func_800B8C50(&this->dyna.actor, globalCtx);
+ if (Flags_GetSwitch(globalCtx, this->switchFlag)) {
+ if (ActorCutscene_GetCanPlayNext(this->cutsceneIdxA)) {
+ ActorCutscene_StartAndSetUnkLinkFields(this->cutsceneIdxA, &this->dyna.actor);
+ EnBox_SetupAction(this, func_80868AFC);
+ this->unk_1A0 = -30;
+ } else {
+ ActorCutscene_SetIntentToPlay(this->cutsceneIdxA);
+ }
+ }
+}
+
+void EnBox_AppearOnRoomClear(EnBox* this, GlobalContext* globalCtx) {
+ func_800B8C50(&this->dyna.actor, globalCtx);
+ if (Flags_GetClearTemp(globalCtx, this->dyna.actor.room)) {
+ if (ActorCutscene_GetCanPlayNext(this->cutsceneIdxA)) {
+ ActorCutscene_StartAndSetUnkLinkFields(this->cutsceneIdxA, &this->dyna.actor);
+ Flags_SetClear(globalCtx, this->dyna.actor.room);
+ EnBox_SetupAction(this, func_80868AFC);
+ this->unk_1A0 = -30;
+ } else {
+ ActorCutscene_SetIntentToPlay(this->cutsceneIdxA);
+ }
+ }
+}
+
+void func_80868AFC(EnBox* this, GlobalContext* globalCtx) {
+ if ((func_800F22C4(this->cutsceneIdxA, &this->dyna.actor) != 0) || (this->unk_1A0 != 0)) {
+ EnBox_SetupAction(this, func_80868B74);
+ this->unk_1A0 = 0;
+ func_80867FBC(&this->unk_1F4, globalCtx, (this->movementFlags & ENBOX_MOVE_0x80) != 0);
+ Audio_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TRE_BOX_APPEAR);
+ }
+}
+
+void func_80868B74(EnBox* this, GlobalContext* globalCtx) {
+ func_800C6314(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+ if (this->unk_1A0 < 0) {
+ this->unk_1A0++;
+ } else if (this->unk_1A0 < 40) {
+ if (this->movementFlags & ENBOX_MOVE_0x80) {
+ this->dyna.actor.world.pos.y -= 1.25f;
+ } else {
+ this->dyna.actor.world.pos.y += 1.25f;
+ }
+ this->unk_1A0++;
+ if ((this->cutsceneIdxA != -1) && ActorCutscene_GetCurrentIndex() == this->cutsceneIdxA) {
+ if (this->unk_1A0 == 2) {
+ func_800B724C(globalCtx, &this->dyna.actor, 4);
+ } else if (this->unk_1A0 == 22) {
+ func_800B724C(globalCtx, &this->dyna.actor, 1);
+ }
+ }
+ } else if (this->unk_1A0 < 60) {
+ this->alpha += 12;
+ this->unk_1A0++;
+ this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y;
+ } else {
+ EnBox_SetupAction(this, EnBox_WaitOpen);
+ ActorCutscene_Stop(this->dyna.actor.cutscene);
+ }
+}
+
+void EnBox_WaitOpen(EnBox* this, GlobalContext* globalCtx) {
+ s32 pad;
+ AnimationHeader* animHeader;
+ f32 frameCount;
+ f32 playbackSpeed;
+ EnBox_PlaybackSpeed playbackSpeedTable;
+ Player* player;
+ Vec3f offset;
+
+ this->alpha = 255;
+ this->movementFlags |= ENBOX_MOVE_IMMOBILE;
+ if ((this->unk_1EC != 0) && ((this->cutsceneIdxB < 0) || (ActorCutscene_GetCurrentIndex() == this->cutsceneIdxB) ||
+ (ActorCutscene_GetCurrentIndex() == -1))) {
+ if (this->unk_1EC < 0) {
+ animHeader = &gBoxChestOpenAnim;
+ playbackSpeed = 1.5f;
+ } else {
+ u8 playerForm;
+
+ playbackSpeedTable = sPlaybackSpeed;
+ playerForm = gSaveContext.save.playerForm;
+ animHeader = sBigChestAnimations[playerForm];
+ playbackSpeed = playbackSpeedTable.data[playerForm];
+ }
+
+ frameCount = Animation_GetLastFrame(animHeader);
+ Animation_Change(&this->skelAnime, animHeader, playbackSpeed, 0.0f, frameCount, ANIMMODE_ONCE, 0.0f);
+ EnBox_SetupAction(this, EnBox_Open);
+ if (this->unk_1EC > 0) {
+ Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_DEMO_TRE_LGT,
+ this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z,
+ this->dyna.actor.shape.rot.x, this->dyna.actor.shape.rot.y, this->dyna.actor.shape.rot.z,
+ -1);
+ func_801A3098(0x2B | 0x900);
+ }
+
+ if (this->getItem == GI_STRAY_FAIRY) {
+ this->movementFlags |= ENBOX_MOVE_0x20;
+ } else {
+ if ((this->getItem == GI_HEART_PIECE) || (this->getItem == GI_BOTTLE)) {
+ Flags_SetCollectible(globalCtx, this->collectableFlag);
+ }
+ Flags_SetTreasure(globalCtx, ENBOX_GET_CHEST_FLAG(&this->dyna.actor));
+ }
+ } else {
+ player = GET_PLAYER(globalCtx);
+ Actor_OffsetOfPointInActorCoords(&this->dyna.actor, &offset, &player->actor.world.pos);
+ if (offset.z > -50.0f && offset.z < 0.0f && fabsf(offset.y) < 10.0f && fabsf(offset.x) < 20.0f &&
+ Player_IsFacingActor(&this->dyna.actor, 0x3000, globalCtx)) {
+ if (((this->getItem == GI_HEART_PIECE) || (this->getItem == GI_BOTTLE)) &&
+ Flags_GetCollectible(globalCtx, this->collectableFlag)) {
+ this->getItem = GI_RECOVERY_HEART;
+ }
+ if ((this->getItem == GI_MASK_CAPTAIN) && (INV_CONTENT(ITEM_MASK_CAPTAIN) == ITEM_MASK_CAPTAIN)) {
+ this->getItem = GI_RECOVERY_HEART;
+ }
+ if ((this->getItem == GI_MASK_GIANT) && (INV_CONTENT(ITEM_MASK_GIANT) == ITEM_MASK_GIANT)) {
+ this->getItem = GI_RECOVERY_HEART;
+ }
+ Actor_PickUpNearby(&this->dyna.actor, globalCtx, -this->getItem);
+ }
+ if (Flags_GetTreasure(globalCtx, ENBOX_GET_CHEST_FLAG(&this->dyna.actor))) {
+ EnBox_SetupAction(this, EnBox_Open);
+ }
+ }
+}
+
+void EnBox_Open(EnBox* this, GlobalContext* globalCtx) {
+ s32 pad;
+
+ this->dyna.actor.flags &= ~ACTOR_FLAG_80;
+
+ if (SkelAnime_Update(&this->skelAnime)) {
+ if (this->unk_1EC > 0) {
+ if (this->unk_1EC < 120) {
+ this->unk_1EC++;
+ } else {
+ Math_StepToF(&this->unk_1A8, 0.0f, 0.05f);
+ }
+ } else if (this->unk_1EC > -120) {
+ this->unk_1EC--;
+ } else {
+ Math_StepToF(&this->unk_1A8, 0.0f, 0.05f);
+ }
+ if (this->movementFlags & ENBOX_MOVE_0x20) {
+ this->movementFlags &= ~ENBOX_MOVE_0x20;
+ Actor_SpawnAsChild(&globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_EN_ELFORG,
+ this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z,
+ this->dyna.actor.world.rot.x, this->dyna.actor.world.rot.y, this->dyna.actor.world.rot.z,
+ ((ENBOX_GET_CHEST_FLAG(&this->dyna.actor) & 0x7F) << 9) | STRAY_FAIRY_TYPE_CHEST);
+ } else if (this->movementFlags & ENBOX_MOVE_0x40) {
+ this->movementFlags &= ~ENBOX_MOVE_0x40;
+ }
+ } else {
+ f32 waterSurface;
+ WaterBox* waterBox;
+ s32 bgId;
+ u16 sfxId = 0;
+
+ if (Animation_OnFrame(&this->skelAnime, gSaveContext.save.playerForm == PLAYER_FORM_DEKU ? 14.0f : 30.0f)) {
+ sfxId = NA_SE_EV_TBOX_UNLOCK;
+ } else if (Animation_OnFrame(&this->skelAnime,
+ gSaveContext.save.playerForm == PLAYER_FORM_DEKU ? 15.0f : 90.0f)) {
+ sfxId = NA_SE_EV_TBOX_OPEN;
+ }
+ if (sfxId != 0) {
+ Audio_PlaySfxAtPos(&this->dyna.actor.projectedPos, sfxId);
+ }
+ if (this->skelAnime.jointTable[3].z > 0) {
+ this->unk_1A8 = (0x7D00 - this->skelAnime.jointTable[3].z) * 0.00006f;
+ if (this->unk_1A8 < 0.0f) {
+ this->unk_1A8 = 0.0f;
+ } else if (this->unk_1A8 > 1.0f) {
+ this->unk_1A8 = 1.0f;
+ }
+ }
+ if (WaterBox_GetSurfaceImpl(globalCtx, &globalCtx->colCtx, this->dyna.actor.world.pos.x,
+ this->dyna.actor.world.pos.z, &waterSurface, &waterBox, &bgId) &&
+ (this->dyna.actor.floorHeight < waterSurface)) {
+ EffectSsBubble_Spawn(globalCtx, &this->dyna.actor.world.pos, 5.0f, 2.0f, 20.0f, 0.3f);
+ }
+ }
+}
+
+void EnBox_SpawnIceSmoke(EnBox* this, GlobalContext* globalCtx) {
+ Vec3f pos;
+ Vec3f velocity = { 0, 1.0f, 0 };
+ Vec3f accel = { 0, 0, 0 };
+ f32 randomf;
+
+ this->iceSmokeTimer++;
+ //! @bug sfxId should be NA_SE_EN_MIMICK_BREATH, but uses OoT's sfxId value
+ func_800B9010(&this->dyna.actor, NA_SE_EN_LAST3_COIL_ATTACK_OLD - SFX_FLAG);
+ if (Rand_ZeroOne() < 0.3f) {
+ randomf = 2.0f * Rand_ZeroOne() - 1.0f;
+ pos = this->dyna.actor.world.pos;
+ pos.x += randomf * 20.0f * Math_SinS(this->dyna.actor.world.rot.y + 0x4000);
+ pos.z += randomf * 20.0f * Math_CosS(this->dyna.actor.world.rot.y + 0x4000);
+
+ randomf = 2.0f * Rand_ZeroOne() - 1.0f;
+ velocity.x = randomf * 1.6f * Math_SinS(this->dyna.actor.world.rot.y);
+ velocity.y = 1.8f;
+ velocity.z = randomf * 1.6f * Math_CosS(this->dyna.actor.world.rot.y);
+ EffectSsIceSmoke_Spawn(globalCtx, &pos, &velocity, &accel, 150);
+ }
+}
+
+void EnBox_Update(Actor* thisx, GlobalContext* globalCtx) {
+ EnBox* this = THIS;
+
+ if (this->movementFlags & ENBOX_MOVE_STICK_TO_GROUND) {
+ this->movementFlags &= ~ENBOX_MOVE_STICK_TO_GROUND;
+ EnBox_ClipToGround(this, globalCtx);
+ }
+ if ((this->getItem == GI_STRAY_FAIRY) && !Flags_GetTreasure(globalCtx, ENBOX_GET_CHEST_FLAG(&this->dyna.actor))) {
+ globalCtx->actorCtx.unk5 |= 8;
+ }
+ this->actionFunc(this, globalCtx);
+ if (this->movementFlags & ENBOX_MOVE_0x80) {
+ this->movementFlags |= ENBOX_MOVE_IMMOBILE;
+ }
+ if (!(this->movementFlags & ENBOX_MOVE_IMMOBILE)) {
+ Actor_MoveWithGravity(&this->dyna.actor);
+ Actor_UpdateBgCheckInfo(globalCtx, &this->dyna.actor, 0.0f, 0.0f, 0.0f, 0x1C);
+ }
+ Actor_SetFocus(&this->dyna.actor, 40.0f);
+ if ((this->getItem == GI_ICE_TRAP) && (this->actionFunc == EnBox_Open) && (this->skelAnime.curFrame > 45.0f) &&
+ (this->iceSmokeTimer < 100)) {
+ EnBox_SpawnIceSmoke(this, globalCtx);
+ }
+ if (this->unk_1F4.unk_0C != NULL) {
+ this->unk_1F4.unk_0C(&this->unk_1F4, globalCtx);
+ }
+}
+
+void EnBox_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx, Gfx** gfx) {
+ s32 pad;
+ EnBox* this = THIS;
+
+ if (limbIndex == OBJECT_BOX_CHEST_LIMB_01) {
+ gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ if (this->type == ENBOX_TYPE_BIG_ORNATE) {
+ gSPDisplayList((*gfx)++, &gBoxChestBaseOrnateDL);
+ } else if (Actor_IsSmallChest(this)) {
+ if (this->getItem == GI_KEY_SMALL) {
+ gSPDisplayList((*gfx)++, &gBoxChestBaseGildedDL);
+ } else {
+ gSPDisplayList((*gfx)++, &gBoxChestBaseDL);
+ }
+ } else {
+ gSPDisplayList((*gfx)++, &gBoxChestBaseGildedDL);
+ }
+ } else if (limbIndex == OBJECT_BOX_CHEST_LIMB_03) {
+ gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ if (this->type == ENBOX_TYPE_BIG_ORNATE) {
+ gSPDisplayList((*gfx)++, &gBoxChestLidOrnateDL);
+ } else if (Actor_IsSmallChest(this)) {
+ if (this->getItem == GI_KEY_SMALL) {
+ gSPDisplayList((*gfx)++, &gBoxChestLidGildedDL);
+ } else {
+ gSPDisplayList((*gfx)++, &gBoxChestLidDL);
+ }
+ } else {
+ gSPDisplayList((*gfx)++, &gBoxChestLidGildedDL);
+ }
+ }
+}
+
+Gfx* EnBox_SetRenderMode1(GraphicsContext* gfxCtx) {
+ Gfx* dl = GRAPH_ALLOC(gfxCtx, sizeof(Gfx) * 2);
+
+ gSPEndDisplayList(dl);
+ return dl;
+}
+
+Gfx* EnBox_SetRenderMode2(GraphicsContext* gfxCtx) {
+ Gfx* dl = GRAPH_ALLOC(gfxCtx, sizeof(Gfx) * 2);
+ Gfx* cur = dl;
+
+ gDPSetRenderMode(
+ cur++, AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | G_RM_FOG_SHADE_A,
+ AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL |
+ GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA));
+
+ gSPEndDisplayList(cur++);
+ return dl;
+}
+
+Gfx* EnBox_SetRenderMode3(GraphicsContext* gfxCtx) {
+ Gfx* dl = GRAPH_ALLOC(gfxCtx, sizeof(Gfx) * 2);
+ Gfx* cur = dl;
+
+ gDPSetRenderMode(cur++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2);
+ gSPEndDisplayList(cur++);
+ return dl;
+}
+
+void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ EnBox* this = THIS;
+
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+ if (this->unk_1F4.unk_10 != NULL) {
+ this->unk_1F4.unk_10(&this->unk_1F4, globalCtx);
+ }
+ if (((this->alpha == 255) && (this->type != ENBOX_TYPE_BIG_INVISIBLE) &&
+ (this->type != ENBOX_TYPE_SMALL_INVISIBLE)) ||
+ (!CHECK_FLAG_ALL(this->dyna.actor.flags, ACTOR_FLAG_80) &&
+ ((this->type == ENBOX_TYPE_BIG_INVISIBLE) || (this->type == ENBOX_TYPE_SMALL_INVISIBLE)))) {
+ gDPPipeSync(POLY_OPA_DISP++);
+ gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
+ gSPSegment(POLY_OPA_DISP++, 0x08, EnBox_SetRenderMode1(globalCtx->state.gfxCtx));
+ func_8012C28C(globalCtx->state.gfxCtx);
+ POLY_OPA_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL,
+ EnBox_PostLimbDraw, &this->dyna.actor, POLY_OPA_DISP);
+ } else if (this->alpha != 0) {
+ gDPPipeSync(POLY_XLU_DISP++);
+ func_8012C2DC(globalCtx->state.gfxCtx);
+ gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
+ if ((this->type == ENBOX_TYPE_BIG_INVISIBLE) || (this->type == ENBOX_TYPE_SMALL_INVISIBLE)) {
+ gSPSegment(POLY_XLU_DISP++, 0x08, EnBox_SetRenderMode3(globalCtx->state.gfxCtx));
+ } else {
+ gSPSegment(POLY_XLU_DISP++, 0x08, EnBox_SetRenderMode2(globalCtx->state.gfxCtx));
+ }
+ POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL,
+ EnBox_PostLimbDraw, &this->dyna.actor, POLY_XLU_DISP);
+ }
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h
index aa7c425d2..6d7da31a5 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.h
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.h
@@ -2,22 +2,71 @@
#define Z_EN_BOX_H
#include "global.h"
+#include "objects/object_box/object_box.h"
struct EnBox;
+struct func_80867BDC_a0;
typedef void (*EnBoxActionFunc)(struct EnBox*, GlobalContext*);
+typedef void (*EnBoxUnkFunc)(struct func_80867BDC_a0* arg0, GlobalContext* globalCtx);
+
+typedef struct func_80867BDC_a0 {
+ /* 0x00 */ Vec3f pos;
+ /* 0x0C */ EnBoxUnkFunc unk_0C;
+ /* 0x10 */ EnBoxUnkFunc unk_10;
+ /* 0x14 */ s32 unk_14;
+ /* 0x18 */ s32 unk_18;
+ /* 0x1C */ s32 unk_1C;
+ /* 0x20 */ s32 unk_20;
+} func_80867BDC_a0; //size 0x24
+
+typedef enum {
+ /* 0 */ ENBOX_TYPE_BIG, // big
+ /* 1 */ ENBOX_TYPE_BIG_ROOM_CLEAR, // appear on room clear, store temp clear as permanent clear
+ /* 2 */ ENBOX_TYPE_BIG_ORNATE, // boss key chest
+ /* 3 */ ENBOX_TYPE_BIG_SWITCH_FLAG_FALL, // falling, appear on switch flag set
+ /* 4 */ ENBOX_TYPE_BIG_INVISIBLE, // big, revealed with lens of truth or when opened
+ /* 5 */ ENBOX_TYPE_SMALL, // small
+ /* 6 */ ENBOX_TYPE_SMALL_INVISIBLE, // small, revealed with lens of truth or when opened
+ /* 7 */ ENBOX_TYPE_SMALL_ROOM_CLEAR, // use room clear, store temp clear as perm clear
+ /* 8 */ ENBOX_TYPE_SMALL_SWITCH_FLAG_FALL, // falling, appear on switch flag set
+ /* 9 */ ENBOX_TYPE_BIG_SONG_ZELDAS_LULLABY,// NOT IMPLEMENTED, behaves like big chest
+ /* 10 */ ENBOX_TYPE_BIG_SONG_SUNS, // NOT IMPLEMENTED, behaves like big chest
+ /* 11 */ ENBOX_TYPE_BIG_SWITCH_FLAG, // big, appear on switch flag set
+ /* 12 */ ENBOX_TYPE_SMALL_SWITCH_FLAG // small, appear on switch flag set
+} EnBoxType;
+
+#define ENBOX_GET_TYPE(thisx) (((thisx)->params >> 12) & 0xF)
+#define ENBOX_GET_ITEM(thisx) (((thisx)->params >> 5) & 0x7F)
+#define ENBOX_GET_CHEST_FLAG(thisx) ((thisx)->params & 0x1F)
+#define ENBOX_GET_SWITCH_FLAG(thisx) ((thisx)->world.rot.z)
+// Codegen in EnTorch_Init() requires leaving out the & 0x7F for `item`
+#define ENBOX_PARAMS(type, item, chestFlag) ((((type) & 0xF) << 12) | ((item) << 5) | ((chestFlag) & 0x1F))
typedef struct EnBox {
- /* 0x0000 */ Actor actor;
- /* 0x0144 */ char unk_144[0xAC];
- /* 0x01F0 */ char unk_1F0[0x01];
- /* 0x01F1 */ u8 unk_1F1;
- /* 0x01F2 */ char unk_1F2[0x02];
- /* 0x01F4 */ char unk_1F4[0x0C];
- /* 0x0200 */ EnBoxActionFunc actionFunc;
- /* 0x0204 */ char unk_204[0x20];
+ /* 0x0000 */ DynaPolyActor dyna;
+ /* 0x015C */ SkelAnime skelAnime;
+ /* 0x01A0 */ s32 unk_1A0;
+ /* 0x01A4 */ UNK_TYPE1 unk_1A4[0x04];
+ /* 0x01A8 */ f32 unk_1A8;
+ /* 0x01AC */ EnBoxActionFunc actionFunc;
+ /* 0x01B0 */ Vec3s jointTable[OBJECT_BOX_CHEST_LIMB_MAX];
+ /* 0x01CE */ Vec3s morphTable[OBJECT_BOX_CHEST_LIMB_MAX];
+ /* 0x01EC */ s16 unk_1EC;
+ /* 0x01EE */ u8 movementFlags;
+ /* 0x01EF */ u8 alpha;
+ /* 0x01F0 */ u8 switchFlag;
+ /* 0x01F1 */ u8 type;
+ /* 0x01F2 */ u8 iceSmokeTimer;
+ /* 0x01F3 */ s8 unk_1F3;
+ /* 0x01F4 */ func_80867BDC_a0 unk_1F4;
+ /* 0x0218 */ s16 cutsceneIdxA;
+ /* 0x021A */ s16 cutsceneIdxB;
+ /* 0x021C */ s32 getItem;
+ /* 0x0220 */ s32 collectableFlag;
} EnBox; // size = 0x224
extern const ActorInit En_Box_InitVars;
+
#endif // Z_EN_BOX_H
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
index beb2f2d17..dd20b9a25 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
@@ -11,6 +11,18 @@
#define THIS ((EnClearTag*)thisx)
+typedef enum {
+ /* 0x00 */ CLEAR_TAG_EFFECT_AVAILABLE,
+ /* 0x01 */ CLEAR_TAG_EFFECT_DEBRIS,
+ /* 0x02 */ CLEAR_TAG_EFFECT_FIRE, // never set to, remnant of OoT
+ /* 0x03 */ CLEAR_TAG_EFFECT_SMOKE,
+ /* 0x04 */ CLEAR_TAG_EFFECT_FLASH,
+ /* 0x05 */ CLEAR_TAG_EFFECT_LIGHT_RAYS,
+ /* 0x06 */ CLEAR_TAG_EFFECT_SHOCKWAVE,
+ /* 0x07 */ CLEAR_TAG_EFFECT_SPLASH,
+ /* 0x08 */ CLEAR_TAG_EFFECT_ISOLATED_SMOKE,
+} ClearTagEffectType;
+
void EnClearTag_Init(Actor* thisx, GlobalContext* globalCtx);
void EnClearTag_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnClearTag_Update(Actor* thisx, GlobalContext* globalCtx);
@@ -82,15 +94,15 @@ static f32 sLightRayMaxScale[] = {
25.0f, 100.0f, 48.0f, 20.0f, 32.0f,
};
-static TexturePtr sSplashTex[] = {
- gExplosionSplashTex1,
- gExplosionSplashTex2,
- gExplosionSplashTex3,
- gExplosionSplashTex4,
- gExplosionSplashTex5,
- gExplosionSplashTex6,
- gExplosionSplashTex7,
- gExplosionSplashTex8,
+static TexturePtr sWaterSplashTextures[] = {
+ gEffWaterSplash1Tex,
+ gEffWaterSplash2Tex,
+ gEffWaterSplash3Tex,
+ gEffWaterSplash4Tex,
+ gEffWaterSplash5Tex,
+ gEffWaterSplash6Tex,
+ gEffWaterSplash7Tex,
+ gEffWaterSplash8Tex,
NULL,
NULL,
NULL,
@@ -102,7 +114,7 @@ static TexturePtr sSplashTex[] = {
* Creates a debris effect.
* Debris effects are spawned by an explosion.
*/
-void EnClearTag_CreateDebrisEffect(EnClearTag* this, Vec3f* position, Vec3f* velocity, Vec3f* acceleration, f32 scale,
+void EnClearTag_CreateDebrisEffect(EnClearTag* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale,
f32 rotationZ) {
EnClearTagEffect* effect = this->effect;
s16 i;
@@ -112,9 +124,9 @@ void EnClearTag_CreateDebrisEffect(EnClearTag* this, Vec3f* position, Vec3f* vel
if (effect->type == CLEAR_TAG_EFFECT_AVAILABLE) {
effect->type = CLEAR_TAG_EFFECT_DEBRIS;
- effect->position = *position;
+ effect->pos = *pos;
effect->velocity = *velocity;
- effect->acceleration = *acceleration;
+ effect->accel = *accel;
effect->scale = scale;
@@ -137,7 +149,7 @@ void EnClearTag_CreateDebrisEffect(EnClearTag* this, Vec3f* position, Vec3f* vel
* Creates a smoke effect.
* Smoke effects are spawned by an explosion.
*/
-void EnClearTag_CreateSmokeEffect(EnClearTag* this, Vec3f* position, f32 scale) {
+void EnClearTag_CreateSmokeEffect(EnClearTag* this, Vec3f* pos, f32 scale) {
s16 i;
EnClearTagEffect* effect = this->effect;
@@ -147,9 +159,9 @@ void EnClearTag_CreateSmokeEffect(EnClearTag* this, Vec3f* position, f32 scale)
effect->actionTimer = Rand_ZeroFloat(100.0f);
effect->type = CLEAR_TAG_EFFECT_SMOKE;
- effect->position = *position;
+ effect->pos = *pos;
effect->velocity = sZeroVector;
- effect->acceleration = sZeroVector;
+ effect->accel = sZeroVector;
effect->scale = scale;
effect->maxScale = 2.0f * scale;
@@ -173,7 +185,7 @@ void EnClearTag_CreateSmokeEffect(EnClearTag* this, Vec3f* position, f32 scale)
* Creates an isolated smoke effect without an explosion.
* Smoke effects are spawned directly.
*/
-void EnClearTag_CreateIsolatedSmokeEffect(EnClearTag* this, Vec3f* position, f32 scale) {
+void EnClearTag_CreateIsolatedSmokeEffect(EnClearTag* this, Vec3f* pos, f32 scale) {
s16 i;
EnClearTagEffect* effect = this->effect;
@@ -183,9 +195,9 @@ void EnClearTag_CreateIsolatedSmokeEffect(EnClearTag* this, Vec3f* position, f32
effect->actionTimer = Rand_ZeroFloat(100.0f);
effect->type = CLEAR_TAG_EFFECT_ISOLATED_SMOKE;
- effect->position = *position;
+ effect->pos = *pos;
effect->velocity = sZeroVector;
- effect->acceleration = sZeroVector;
+ effect->accel = sZeroVector;
effect->scale = scale;
effect->maxScale = 2.0f * scale;
@@ -217,7 +229,7 @@ void EnClearTag_CreateIsolatedSmokeEffect(EnClearTag* this, Vec3f* position, f32
* Flash effects are spawned by an explosion or a pop.
* Flash effects have two components: 1) a billboard flash, and 2) a light effect on the ground.
*/
-void EnClearTag_CreateFlashEffect(EnClearTag* this, Vec3f* position, f32 scale, f32 floorHeight) {
+void EnClearTag_CreateFlashEffect(EnClearTag* this, Vec3f* pos, f32 scale, f32 floorHeight) {
EnClearTagEffect* effect = this->effect;
s16 i;
@@ -226,9 +238,9 @@ void EnClearTag_CreateFlashEffect(EnClearTag* this, Vec3f* position, f32 scale,
if (effect->type == CLEAR_TAG_EFFECT_AVAILABLE) {
effect->type = CLEAR_TAG_EFFECT_FLASH;
- effect->position = *position;
+ effect->pos = *pos;
effect->velocity = sZeroVector;
- effect->acceleration = sZeroVector;
+ effect->accel = sZeroVector;
effect->scale = 0.0f;
effect->maxScale = scale * 3.0f;
@@ -247,7 +259,7 @@ void EnClearTag_CreateFlashEffect(EnClearTag* this, Vec3f* position, f32 scale,
* Creates a light ray effect.
* Light ray effects are spawned by an explosion or pop.
*/
-void EnClearTag_CreateLightRayEffect(EnClearTag* this, Vec3f* position, Vec3f* velocity, Vec3f* acceleration, f32 scale,
+void EnClearTag_CreateLightRayEffect(EnClearTag* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale,
f32 maxScaleTarget, s16 alphaDecrementSpeed) {
EnClearTagEffect* effect = this->effect;
s16 i;
@@ -259,9 +271,9 @@ void EnClearTag_CreateLightRayEffect(EnClearTag* this, Vec3f* position, Vec3f* v
effect->type = CLEAR_TAG_EFFECT_LIGHT_RAYS;
- effect->position = *position;
+ effect->pos = *pos;
effect->velocity = *velocity;
- effect->acceleration = *acceleration;
+ effect->accel = *accel;
effect->scale = scale / 1000.0f;
effect->maxScale = 1.0f;
@@ -291,8 +303,8 @@ void EnClearTag_CreateLightRayEffect(EnClearTag* this, Vec3f* position, Vec3f* v
* Creates an isolated light ray effect without an explosion or pop.
* Light ray effects are spawned directly.
*/
-void EnClearTag_CreateIsolatedLightRayEffect(EnClearTag* this, Vec3f* position, Vec3f* velocity, Vec3f* acceleration,
- f32 scale, f32 maxScaleTarget, s16 colorIndex, s16 alphaDecrementSpeed) {
+void EnClearTag_CreateIsolatedLightRayEffect(EnClearTag* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale,
+ f32 maxScaleTarget, s16 colorIndex, s16 alphaDecrementSpeed) {
EnClearTagEffect* effect = this->effect;
s16 i;
@@ -301,9 +313,9 @@ void EnClearTag_CreateIsolatedLightRayEffect(EnClearTag* this, Vec3f* position,
if (effect->type == CLEAR_TAG_EFFECT_AVAILABLE) {
effect->type = CLEAR_TAG_EFFECT_LIGHT_RAYS;
- effect->position = *position;
+ effect->pos = *pos;
effect->velocity = *velocity;
- effect->acceleration = *acceleration;
+ effect->accel = *accel;
effect->scale = scale / 1000.0f;
effect->maxScale = 1.0f;
@@ -333,7 +345,7 @@ void EnClearTag_CreateIsolatedLightRayEffect(EnClearTag* this, Vec3f* position,
* Creates a shockwave effect
* This effect uses concentric ring floor shadows that travel radially outward along the floor poly
*/
-void EnClearTag_CreateShockwaveEffect(EnClearTag* this, Vec3f* position, f32 maxScale, s16 actionTimer) {
+void EnClearTag_CreateShockwaveEffect(EnClearTag* this, Vec3f* pos, f32 maxScale, s16 actionTimer) {
EnClearTagEffect* effect = this->effect;
s16 i;
@@ -342,9 +354,9 @@ void EnClearTag_CreateShockwaveEffect(EnClearTag* this, Vec3f* position, f32 max
if (effect->type == CLEAR_TAG_EFFECT_AVAILABLE) {
effect->type = CLEAR_TAG_EFFECT_SHOCKWAVE;
- effect->position = *position;
+ effect->pos = *pos;
effect->velocity = sZeroVector;
- effect->acceleration = sZeroVector;
+ effect->accel = sZeroVector;
effect->maxScale = maxScale;
effect->scale = 0.0f;
@@ -362,7 +374,7 @@ void EnClearTag_CreateShockwaveEffect(EnClearTag* this, Vec3f* position, f32 max
* Creates a splash effect
* This effect is used when EnClearTag is spawned above a waterbox
*/
-void EnClearTag_CreateSplashEffect(EnClearTag* this, Vec3f* position, s16 effectsTimer) {
+void EnClearTag_CreateSplashEffect(EnClearTag* this, Vec3f* pos, s16 effectsTimer) {
s16 i;
EnClearTagEffect* effect = this->effect;
@@ -373,9 +385,9 @@ void EnClearTag_CreateSplashEffect(EnClearTag* this, Vec3f* position, s16 effect
effect->actionTimer = Rand_ZeroFloat(100.0f);
effect->type = CLEAR_TAG_EFFECT_SPLASH;
- effect->position = *position;
+ effect->pos = *pos;
effect->velocity = sZeroVector;
- effect->acceleration = sZeroVector;
+ effect->accel = sZeroVector;
effect->scale = 0.0f;
effect->maxScale = 0.0f;
@@ -633,13 +645,13 @@ void EnClearTag_UpdateEffects(EnClearTag* this, GlobalContext* globalCtx) {
effect->actionTimer++;
// Perform effect physics.
- effect->position.x += effect->velocity.x;
- originalYPosition = effect->position.y;
- effect->position.y += effect->velocity.y;
- effect->position.z += effect->velocity.z;
- effect->velocity.x += effect->acceleration.x;
- effect->velocity.y += effect->acceleration.y;
- effect->velocity.z += effect->acceleration.z;
+ effect->pos.x += effect->velocity.x;
+ originalYPosition = effect->pos.y;
+ effect->pos.y += effect->velocity.y;
+ effect->pos.z += effect->velocity.z;
+ effect->velocity.x += effect->accel.x;
+ effect->velocity.y += effect->accel.y;
+ effect->velocity.z += effect->accel.z;
if (effect->type == CLEAR_TAG_EFFECT_DEBRIS) {
// Clamp the velocity to -5.0
@@ -649,12 +661,12 @@ void EnClearTag_UpdateEffects(EnClearTag* this, GlobalContext* globalCtx) {
// While the effect is falling check if it has hit the ground.
if (effect->velocity.y < 0.0f) {
- sphereCenter = effect->position;
+ sphereCenter = effect->pos;
sphereCenter.y += 5.0f;
// Check if the debris has hit the ground.
if (BgCheck_SphVsFirstPoly(&globalCtx->colCtx, &sphereCenter, 11.0f)) {
- effect->position.y = originalYPosition;
+ effect->pos.y = originalYPosition;
// Bounce the debris effect.
if (effect->bounces <= 0) {
@@ -663,14 +675,13 @@ void EnClearTag_UpdateEffects(EnClearTag* this, GlobalContext* globalCtx) {
effect->effectsTimer = Rand_ZeroFloat(20.0f) + 25.0f;
} else {
// The Debris effect is done bouncing. Set its velocity and acceleration to 0.
- effect->velocity.x = effect->velocity.z = effect->acceleration.y = effect->velocity.y =
- 0.0f;
+ effect->velocity.x = effect->velocity.z = effect->accel.y = effect->velocity.y = 0.0f;
}
}
}
// Rotate the debris effect.
- if (effect->acceleration.y != 0.0f) {
+ if (effect->accel.y != 0.0f) {
effect->rotationY += 0.5f;
effect->rotationX += 0.35f;
}
@@ -809,7 +820,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
}
// Draw the debris effect.
- Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW);
+ Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
Matrix_RotateYF(effect->rotationY, MTXMODE_APPLY);
Matrix_RotateXFApply(effect->rotationX);
@@ -827,11 +838,11 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, (s8)effect->primColor.a);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)effect->primColor.a);
- func_800C0094(this->actor.floorPoly, effect->position.x, effect->position.y, effect->position.z, &mtxF);
+ func_800C0094(this->actor.floorPoly, effect->pos.x, effect->pos.y, effect->pos.z, &mtxF);
Matrix_Put(&mtxF);
Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_030100);
+ gSPDisplayList(POLY_XLU_DISP++, gEffShockwaveDL);
}
}
}
@@ -851,8 +862,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
// Draw the ground flash effect.
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 200, (s8)(effect->primColor.a * 0.7f));
- func_800C0094(this->actor.floorPoly, effect->position.x, this->actor.floorHeight, effect->position.z,
- &mtxF);
+ func_800C0094(this->actor.floorPoly, effect->pos.x, this->actor.floorHeight, effect->pos.z, &mtxF);
Matrix_Put(&mtxF);
Matrix_Scale(effect->scale * 3.0f, 1.0f, effect->scale * 3.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -881,7 +891,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
gSPSegment(
POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, -effect->actionTimer * 5, 32, 64, 1, 0, 0, 32, 32));
- Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW);
+ Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(effect->smokeScaleX * effect->scale, effect->smokeScaleY * effect->scale, 1.0f, MTXMODE_APPLY);
Matrix_Translate(0.0f, 20.0f, 0.0f, MTXMODE_APPLY);
@@ -907,7 +917,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
gSPSegment(
POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, -effect->actionTimer * 15, 32, 64, 1, 0, 0, 32, 32));
- Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW);
+ Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -929,7 +939,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
// Draw the flash billboard effect.
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 200, (s8)effect->primColor.a);
- Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW);
+ Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(2.0f * effect->scale, 2.0f * effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -954,7 +964,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
// Draw the light ray effect.
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, (u8)effect->primColor.r, (u8)effect->primColor.g,
(u8)effect->primColor.b, (u8)effect->primColor.a);
- Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW);
+ Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_RotateYF(effect->rotationY, MTXMODE_APPLY);
Matrix_RotateXFApply(effect->rotationX);
Matrix_RotateZF(effect->rotationZ, MTXMODE_APPLY);
@@ -972,7 +982,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 200);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 200);
- gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(sSplashTex[effect->actionTimer]));
+ gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(sWaterSplashTextures[effect->actionTimer]));
func_8012C9BC(gfxCtx);
gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BACK);
isMaterialApplied++;
@@ -986,17 +996,17 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
* returns true if point is within the xz boundaries of an active water box, else false
* `ySurface` returns the water box's surface, while `outWaterBox` returns a pointer to the WaterBox
*/
- ySurface = effect->position.y;
- if (WaterBox_GetSurface1(globalCtx, &globalCtx->colCtx, effect->position.x + vec.x,
- effect->position.z + vec.z, &ySurface, &waterBox)) {
- if ((effect->position.y - ySurface) < 200.0f) {
+ ySurface = effect->pos.y;
+ if (WaterBox_GetSurface1(globalCtx, &globalCtx->colCtx, effect->pos.x + vec.x, effect->pos.z + vec.z,
+ &ySurface, &waterBox)) {
+ if ((effect->pos.y - ySurface) < 200.0f) {
// Draw the splash effect.
- Matrix_Translate(effect->position.x + vec.x, ySurface, effect->position.z + vec.z, MTXMODE_NEW);
+ Matrix_Translate(effect->pos.x + vec.x, ySurface, effect->pos.z + vec.z, MTXMODE_NEW);
Matrix_RotateYF(2.0f * (j * M_PI) * (1.0f / 16.0f), MTXMODE_APPLY);
Matrix_RotateXFApply(effect->rotationX);
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, gExplosionSplashDL);
+ gSPDisplayList(POLY_XLU_DISP++, gEffWaterSplashDL);
}
}
}
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
index 61c4a638b..c14cc36fd 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
@@ -5,24 +5,12 @@
struct EnClearTag;
-typedef enum {
- /* 0x00 */ CLEAR_TAG_EFFECT_AVAILABLE,
- /* 0x01 */ CLEAR_TAG_EFFECT_DEBRIS,
- /* 0x02 */ CLEAR_TAG_EFFECT_FIRE, // never set to, remnant of OoT
- /* 0x03 */ CLEAR_TAG_EFFECT_SMOKE,
- /* 0x04 */ CLEAR_TAG_EFFECT_FLASH,
- /* 0x05 */ CLEAR_TAG_EFFECT_LIGHT_RAYS,
- /* 0x06 */ CLEAR_TAG_EFFECT_SHOCKWAVE,
- /* 0x07 */ CLEAR_TAG_EFFECT_SPLASH,
- /* 0x08 */ CLEAR_TAG_EFFECT_ISOLATED_SMOKE,
-} ClearTagEffectType;
-
typedef struct EnClearTagEffect {
/* 0x00 */ u8 type;
/* 0x01 */ u8 actionTimer;
- /* 0x04 */ Vec3f position;
+ /* 0x04 */ Vec3f pos;
/* 0x10 */ Vec3f velocity;
- /* 0x1C */ Vec3f acceleration;
+ /* 0x1C */ Vec3f accel;
/* 0x28 */ Color_RGBAf primColor;
/* 0x38 */ Color_RGBAf envColor;
/* 0x48 */ s16 bounces;
@@ -39,9 +27,11 @@ typedef struct EnClearTagEffect {
/* 0x6C */ f32 smokeScaleX;
} EnClearTagEffect; // size = 0x70
+#define EN_CLEAR_TAG_EFFECT_COUNT 103
+
typedef struct EnClearTag {
/* 0x0000 */ Actor actor;
- /* 0x0144 */ EnClearTagEffect effect[103];
+ /* 0x0144 */ EnClearTagEffect effect[EN_CLEAR_TAG_EFFECT_COUNT];
/* 0x2E54 */ u8 cameraState;
/* 0x2E56 */ s16 activeTimer; // Actor Marked for Death when timer runs out
/* 0x2E58 */ UNK_TYPE1 unk2E58[0xC];
diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c
index 1a35e8e50..3d96cd494 100644
--- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c
+++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c
@@ -89,7 +89,7 @@ static DamageTable sDamageTable = {
/* Powder Keg */ DMG_ENTRY(0, 0),
};
-static TurnOptionsSet sTurnOptions = {
+static TrackOptionsSet sTrackOptions = {
{ 0xFA0, 4, 1, 3 },
{ 0x1770, 4, 1, 6 },
{ 0xFA0, 4, 1, 3 },
@@ -105,11 +105,11 @@ void EnCne01_UpdateModel(EnCne01* this, GlobalContext* globalCtx) {
point.x = player->actor.world.pos.x;
point.y = player->bodyPartsPos[7].y + 3.0f;
point.z = player->actor.world.pos.z;
- SubS_TurnToPoint(&point, &this->enHy.actor.focus.pos, &this->enHy.actor.shape.rot, &this->enHy.turnTarget,
- &this->enHy.headRot, &this->enHy.torsoRot, &sTurnOptions);
+ SubS_TrackPoint(&point, &this->enHy.actor.focus.pos, &this->enHy.actor.shape.rot, &this->enHy.trackTarget,
+ &this->enHy.headRot, &this->enHy.torsoRot, &sTrackOptions);
} else {
- Math_SmoothStepToS(&this->enHy.turnTarget.x, 0, 4, 0x3E8, 1);
- Math_SmoothStepToS(&this->enHy.turnTarget.y, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->enHy.trackTarget.x, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->enHy.trackTarget.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->enHy.headRot.x, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->enHy.headRot.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->enHy.torsoRot.x, 0, 4, 0x3E8, 1);
@@ -126,7 +126,7 @@ s32 EnCne01_TestIsTalking(EnCne01* this, GlobalContext* globalCtx) {
if (Actor_ProcessTalkRequest(&this->enHy.actor, &globalCtx->state)) {
isTalking = true;
this->enHy.textId = 0x10B9; // Invalid textId, produces empty textbox
- this->enHy.tmpTurnTarget = this->enHy.turnTarget;
+ this->enHy.tmptrackTarget = this->enHy.trackTarget;
this->enHy.tmpHeadRot = this->enHy.headRot;
this->enHy.tmpTorsoRot = this->enHy.torsoRot;
this->enHy.tmpActionFunc = this->enHy.actionFunc;
@@ -187,7 +187,7 @@ void EnCne01_Talk(EnHy* this, GlobalContext* globalCtx) {
break;
case 2:
this->actor.textId = 0;
- this->turnTarget = this->tmpTurnTarget;
+ this->trackTarget = this->tmptrackTarget;
this->headRot = this->tmpHeadRot;
this->torsoRot = this->tmpTorsoRot;
this->actor.shape.rot.y = this->actor.world.rot.y;
diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.c b/src/overlays/actors/ovl_En_Dai/z_en_dai.c
index 184a8b81b..9d7304ec4 100644
--- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c
+++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c
@@ -33,28 +33,27 @@ const ActorInit En_Dai_InitVars = {
static Vec3f D_80B3FBF0 = { 1.0f, 1.0f, 1.0f };
-EnDaiParticle* func_80B3DFF0(EnDaiParticle* particle, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 arg4, f32 arg5,
- s32 arg6) {
+EnDaiEffect* func_80B3DFF0(EnDaiEffect* effect, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 arg4, f32 arg5, s32 arg6) {
s32 i;
- for (i = 0; i < 32; i++, particle++) {
- if (!particle->isEnabled) {
- particle->isEnabled = true;
- particle->unk_01 = (Rand_ZeroOne() * (2.0f * (arg6 / 3.0f))) + (arg6 / 3.0f);
- particle->unk_02 = particle->unk_01;
- particle->unk_10 = arg1;
- particle->unk_1C = arg2;
- particle->unk_28 = arg3;
- particle->unk_34 = arg4;
- particle->unk_38 = arg5;
- return particle;
+ for (i = 0; i < EN_DAI_EFFECT_COUNT; i++, effect++) {
+ if (!effect->isEnabled) {
+ effect->isEnabled = true;
+ effect->unk_01 = (Rand_ZeroOne() * (2.0f * (arg6 / 3.0f))) + (arg6 / 3.0f);
+ effect->unk_02 = effect->unk_01;
+ effect->unk_10 = arg1;
+ effect->unk_1C = arg2;
+ effect->unk_28 = arg3;
+ effect->unk_34 = arg4;
+ effect->unk_38 = arg5;
+ return effect;
}
}
return NULL;
}
-void func_80B3E168(EnDaiParticle* particle, GlobalContext* globalCtx2) {
+void func_80B3E168(EnDaiEffect* effect, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
s32 pad;
s32 isDisplayListSet = false;
@@ -65,8 +64,8 @@ void func_80B3E168(EnDaiParticle* particle, GlobalContext* globalCtx2) {
func_8012C2DC(globalCtx->state.gfxCtx);
- for (i = 0; i < 32; i++, particle++) {
- if (particle->isEnabled == true) {
+ for (i = 0; i < EN_DAI_EFFECT_COUNT; i++, effect++) {
+ if (effect->isEnabled == true) {
gDPPipeSync(POLY_XLU_DISP++);
if (!isDisplayListSet) {
@@ -76,18 +75,18 @@ void func_80B3E168(EnDaiParticle* particle, GlobalContext* globalCtx2) {
Matrix_Push();
- alpha = (particle->unk_02 / (f32)particle->unk_01);
+ alpha = (effect->unk_02 / (f32)effect->unk_01);
alpha *= 255.0f;
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 225, 235, (u8)alpha);
gSPSegment(POLY_XLU_DISP++, 0x08,
- Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (particle->unk_02 + (i * 3)) * 3,
- (particle->unk_02 + (i * 3)) * 15, 0x20, 0x40, 1, 0, 0, 0x20, 0x20));
+ Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (effect->unk_02 + (i * 3)) * 3,
+ (effect->unk_02 + (i * 3)) * 15, 0x20, 0x40, 1, 0, 0, 0x20, 0x20));
- Matrix_Translate(particle->unk_10.x, particle->unk_10.y, particle->unk_10.z, MTXMODE_NEW);
+ Matrix_Translate(effect->unk_10.x, effect->unk_10.y, effect->unk_10.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
- Matrix_Scale(particle->unk_34, particle->unk_34, 1.0f, MTXMODE_APPLY);
+ Matrix_Scale(effect->unk_34, effect->unk_34, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -101,23 +100,23 @@ void func_80B3E168(EnDaiParticle* particle, GlobalContext* globalCtx2) {
}
s32 func_80B3E460(EnDai* this) {
- EnDaiParticle* particle = &this->particles[0];
+ EnDaiEffect* effect = this->effects;
s32 i;
s32 count;
- for (i = 0, count = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
- if (particle->isEnabled && particle->unk_02) {
- particle->unk_10.x += particle->unk_28.x;
- particle->unk_02--;
- particle->unk_10.y += particle->unk_28.y;
- particle->unk_10.z += particle->unk_28.z;
- particle->unk_28.x += particle->unk_1C.x;
- particle->unk_28.y += particle->unk_1C.y;
- particle->unk_28.z += particle->unk_1C.z;
- particle->unk_34 += particle->unk_38;
+ for (i = 0, count = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
+ if (effect->isEnabled && effect->unk_02) {
+ effect->unk_10.x += effect->unk_28.x;
+ effect->unk_02--;
+ effect->unk_10.y += effect->unk_28.y;
+ effect->unk_10.z += effect->unk_28.z;
+ effect->unk_28.x += effect->unk_1C.x;
+ effect->unk_28.y += effect->unk_1C.y;
+ effect->unk_28.z += effect->unk_1C.z;
+ effect->unk_34 += effect->unk_38;
count++;
- } else if (particle->isEnabled) {
- particle->isEnabled = false;
+ } else if (effect->isEnabled) {
+ effect->isEnabled = false;
}
}
@@ -125,7 +124,7 @@ s32 func_80B3E460(EnDai* this) {
}
s32 func_80B3E5B4(EnDai* this, GlobalContext* globalCtx) {
- func_80B3E168(this->particles, globalCtx);
+ func_80B3E168(this->effects, globalCtx);
return 0;
}
@@ -325,7 +324,7 @@ s32 func_80B3E96C(EnDai* this, GlobalContext* globalCtx) {
sp5C.y = -40.0f;
Lib_Vec3f_TranslateAndRotateY(&this->unk_1E4, this->unk_1D4, &sp50, &sp74);
- func_80B3DFF0(this->particles, sp74, sp68, sp5C, 0.03f, 0.04f, 0x10);
+ func_80B3DFF0(this->effects, sp74, sp68, sp5C, 0.03f, 0.04f, 0x10);
}
return 0;
diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.h b/src/overlays/actors/ovl_En_Dai/z_en_dai.h
index 758cd1bc4..4c7e167b9 100644
--- a/src/overlays/actors/ovl_En_Dai/z_en_dai.h
+++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.h
@@ -7,7 +7,7 @@ struct EnDai;
typedef void (*EnDaiActionFunc)(struct EnDai*, GlobalContext*);
-typedef struct EnDaiParticle {
+typedef struct EnDaiEffect {
/* 0x00 */ u8 isEnabled;
/* 0x01 */ u8 unk_01;
/* 0x02 */ u8 unk_02;
@@ -17,7 +17,9 @@ typedef struct EnDaiParticle {
/* 0x28 */ Vec3f unk_28;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
-} EnDaiParticle; // size = 0x3C
+} EnDaiEffect; // size = 0x3C
+
+#define EN_DAI_EFFECT_COUNT 32
typedef struct EnDai {
/* 0x000 */ Actor actor;
@@ -39,7 +41,7 @@ typedef struct EnDai {
/* 0x1FC */ Vec3f unk_1FC;
/* 0x208 */ Vec3s jointTable[19];
/* 0x27A */ Vec3s morphTable[19];
- /* 0x2EC */ EnDaiParticle particles[32];
+ /* 0x2EC */ EnDaiEffect effects[EN_DAI_EFFECT_COUNT];
/* 0xA6C */ s32 unk_A6C;
/* 0xA70 */ s32 unk_A70;
} EnDai; // size = 0xA74
diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
index 167c11835..a8d4df8e6 100644
--- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
+++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c
@@ -493,19 +493,19 @@ void EnDaiku2_Draw(Actor* thisx, GlobalContext* globalCtx) {
void func_80BE7504(EnDaiku2* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, f32 arg4, s16 arg5) {
s16 i;
- EnDaiku2Particle* particle = &this->particles[0];
+ EnDaiku2Effect* effect = this->effects;
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
- if (!particle->isEnabled) {
- particle->isEnabled = true;
- particle->unk_04 = *arg1;
- particle->unk_10 = *arg2;
- particle->unk_1C = *arg3;
- particle->unk_30 = arg4;
- particle->unk_34 = arg5;
- particle->unk_28.x = randPlusMinusPoint5Scaled(30000.0f);
- particle->unk_28.y = randPlusMinusPoint5Scaled(30000.0f);
- particle->unk_28.z = randPlusMinusPoint5Scaled(30000.0f);
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
+ if (!effect->isEnabled) {
+ effect->isEnabled = true;
+ effect->unk_04 = *arg1;
+ effect->unk_10 = *arg2;
+ effect->unk_1C = *arg3;
+ effect->unk_30 = arg4;
+ effect->unk_34 = arg5;
+ effect->unk_28.x = randPlusMinusPoint5Scaled(30000.0f);
+ effect->unk_28.y = randPlusMinusPoint5Scaled(30000.0f);
+ effect->unk_28.z = randPlusMinusPoint5Scaled(30000.0f);
break;
}
}
@@ -513,20 +513,20 @@ void func_80BE7504(EnDaiku2* this, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, f32 ar
void func_80BE7600(EnDaiku2* this, GlobalContext* globalCtx) {
s32 i;
- EnDaiku2Particle* particle = &this->particles[0];
+ EnDaiku2Effect* effect = this->effects;
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
- if (particle->isEnabled) {
- particle->unk_04.x += particle->unk_10.x;
- particle->unk_28.x += 0x100;
- particle->unk_28.z += 0x130;
- particle->unk_04.y += particle->unk_10.y;
- particle->unk_04.z += particle->unk_10.z;
- particle->unk_10.y += particle->unk_1C.y;
- if (particle->unk_34 != 0) {
- particle->unk_34 -= 1;
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
+ if (effect->isEnabled) {
+ effect->unk_04.x += effect->unk_10.x;
+ effect->unk_28.x += 0x100;
+ effect->unk_28.z += 0x130;
+ effect->unk_04.y += effect->unk_10.y;
+ effect->unk_04.z += effect->unk_10.z;
+ effect->unk_10.y += effect->unk_1C.y;
+ if (effect->unk_34 != 0) {
+ effect->unk_34 -= 1;
} else {
- particle->isEnabled = false;
+ effect->isEnabled = false;
}
}
}
@@ -535,7 +535,7 @@ void func_80BE7600(EnDaiku2* this, GlobalContext* globalCtx) {
void func_80BE7718(EnDaiku2* this, GlobalContext* globalCtx) {
s32 i;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
- EnDaiku2Particle* particle = &this->particles[0];
+ EnDaiku2Effect* effect = this->effects;
s32 objectIdx;
OPEN_DISPS(globalCtx->state.gfxCtx);
@@ -547,14 +547,14 @@ void func_80BE7718(EnDaiku2* this, GlobalContext* globalCtx) {
gDPPipeSync(POLY_OPA_DISP++);
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[objectIdx].segment);
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
- if (particle->isEnabled) {
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
+ if (effect->isEnabled) {
Matrix_Push();
- Matrix_Translate(particle->unk_04.x, particle->unk_04.y, particle->unk_04.z, MTXMODE_NEW);
- Matrix_RotateXS(particle->unk_28.x, MTXMODE_APPLY);
- Matrix_RotateYS(particle->unk_28.y, MTXMODE_APPLY);
- Matrix_RotateZS(particle->unk_28.z, MTXMODE_APPLY);
- Matrix_Scale(particle->unk_30, particle->unk_30, particle->unk_30, MTXMODE_APPLY);
+ Matrix_Translate(effect->unk_04.x, effect->unk_04.y, effect->unk_04.z, MTXMODE_NEW);
+ Matrix_RotateXS(effect->unk_28.x, MTXMODE_APPLY);
+ Matrix_RotateYS(effect->unk_28.y, MTXMODE_APPLY);
+ Matrix_RotateZS(effect->unk_28.z, MTXMODE_APPLY);
+ Matrix_Scale(effect->unk_30, effect->unk_30, effect->unk_30, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_bombiwa_DL_0009E0);
diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h
index 5baadf2f0..3a0cc5ca3 100644
--- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h
+++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.h
@@ -17,7 +17,7 @@ enum {
/* 127 */ ENDAIKU2_GET_7F_127 = 127,
};
-typedef struct EnDaiku2Particle {
+typedef struct EnDaiku2Effect {
/* 0x00 */ u8 isEnabled;
/* 0x04 */ Vec3f unk_04;
/* 0x10 */ Vec3f unk_10;
@@ -25,7 +25,9 @@ typedef struct EnDaiku2Particle {
/* 0x28 */ Vec3s unk_28;
/* 0x30 */ f32 unk_30;
/* 0x34 */ s16 unk_34;
-} EnDaiku2Particle; // size = 0x38
+} EnDaiku2Effect; // size = 0x38
+
+#define EN_DAIKU2_EFFECT_COUNT 50
typedef struct EnDaiku2 {
/* 0x000 */ Actor actor;
@@ -47,7 +49,7 @@ typedef struct EnDaiku2 {
/* 0x284 */ f32 unk_284;
/* 0x288 */ s16 unk_288;
/* 0x28A */ s16 unk_28A;
- /* 0x28C */ EnDaiku2Particle particles[50];
+ /* 0x28C */ EnDaiku2Effect effects[EN_DAIKU2_EFFECT_COUNT];
/* 0xD7C */ ColliderCylinder collider;
} EnDaiku2; // size = 0xDC8
diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c
index 914e0f355..50970a4be 100644
--- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c
+++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c
@@ -33,50 +33,50 @@ const ActorInit En_Dnb_InitVars = {
(ActorFunc)EnDnb_Draw,
};
-void func_80A4FDD0(EnDnbParticle* particle, EnDnb* this, s16* alloc, s32 idx) {
+void func_80A4FDD0(EnDnbEffect* effect, EnDnb* this, s16* alloc, s32 idx) {
Vec3f sp1C;
s32 idx2 = idx * 3;
sp1C.x = alloc[idx2 + 0] + this->dyna.actor.world.pos.x;
sp1C.y = alloc[idx2 + 1] + this->dyna.actor.world.pos.y;
sp1C.z = alloc[idx2 + 2] + this->dyna.actor.world.pos.z;
- particle->unk_00 = sp1C;
- particle->unk_0C = sp1C;
- particle->unk_24 = Math_Vec3f_Yaw(&this->dyna.actor.world.pos, &sp1C);
- particle->unk_18 = gZeroVec3s;
+ effect->unk_00 = sp1C;
+ effect->unk_0C = sp1C;
+ effect->unk_24 = Math_Vec3f_Yaw(&this->dyna.actor.world.pos, &sp1C);
+ effect->unk_18 = gZeroVec3s;
}
-s32 func_80A4FEBC(EnDnbParticle* particle, f32 arg1) {
+s32 func_80A4FEBC(EnDnbEffect* effect, f32 arg1) {
s32 ret = false;
- if ((DECR(particle->unk_26) == 0) && (arg1 < particle->unk_0C.y)) {
- Math_ApproachF(&particle->unk_30, 1.0f, 0.4f, 1.0f);
- particle->unk_2C += particle->unk_34;
- particle->unk_0C.x += particle->unk_30 * Math_SinS(particle->unk_24);
- particle->unk_0C.z += particle->unk_30 * Math_CosS(particle->unk_24);
- particle->unk_0C.y += particle->unk_2C;
- if (particle->unk_0C.y <= arg1) {
- particle->unk_0C.y = arg1;
+ if ((DECR(effect->unk_26) == 0) && (arg1 < effect->unk_0C.y)) {
+ Math_ApproachF(&effect->unk_30, 1.0f, 0.4f, 1.0f);
+ effect->unk_2C += effect->unk_34;
+ effect->unk_0C.x += effect->unk_30 * Math_SinS(effect->unk_24);
+ effect->unk_0C.z += effect->unk_30 * Math_CosS(effect->unk_24);
+ effect->unk_0C.y += effect->unk_2C;
+ if (effect->unk_0C.y <= arg1) {
+ effect->unk_0C.y = arg1;
}
- particle->unk_18.x += particle->unk_1E.x;
- particle->unk_18.y += particle->unk_1E.y;
- particle->unk_18.z += particle->unk_1E.z;
+ effect->unk_18.x += effect->unk_1E.x;
+ effect->unk_18.y += effect->unk_1E.y;
+ effect->unk_18.z += effect->unk_1E.z;
ret = true;
}
return ret;
}
-void func_80A4FFE8(EnDnbParticle* particle, s16 arg1) {
- particle->unk_0C = particle->unk_00;
- particle->unk_1E.x = (Rand_ZeroOne() - 0.5f) * 400.0f;
- particle->unk_1E.y = (Rand_ZeroOne() - 0.5f) * 400.0f;
- particle->unk_1E.z = (Rand_ZeroOne() - 0.5f) * 400.0f;
- particle->unk_18 = gZeroVec3s;
- particle->unk_30 = 40.0f;
- particle->unk_2C = 0.0f;
- particle->unk_26 = arg1;
- particle->unk_34 = (Rand_ZeroOne() * -2.0f) - 2.0f;
+void func_80A4FFE8(EnDnbEffect* effect, s16 arg1) {
+ effect->unk_0C = effect->unk_00;
+ effect->unk_1E.x = (Rand_ZeroOne() - 0.5f) * 400.0f;
+ effect->unk_1E.y = (Rand_ZeroOne() - 0.5f) * 400.0f;
+ effect->unk_1E.z = (Rand_ZeroOne() - 0.5f) * 400.0f;
+ effect->unk_18 = gZeroVec3s;
+ effect->unk_30 = 40.0f;
+ effect->unk_2C = 0.0f;
+ effect->unk_26 = arg1;
+ effect->unk_34 = (Rand_ZeroOne() * -2.0f) - 2.0f;
}
s32 func_80A500F8(EnDnb* this) {
@@ -108,8 +108,8 @@ void EnDnb_Init(Actor* thisx, GlobalContext* globalCtx) {
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_hanareyama_obj_Colheader_004D8C);
alloc = Lib_SegmentedToVirtual(object_hanareyama_obj_Vec_004710);
- for (i = 0; i < ARRAY_COUNT(this->particles); i++) {
- func_80A4FDD0(&this->particles[i], this, alloc, i);
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
+ func_80A4FDD0(&this->effects[i], this, alloc, i);
}
Actor_SetScale(&this->dyna.actor, 1.0f);
@@ -126,8 +126,8 @@ void EnDnb_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 i;
if (this->unk_0D30 == 0) {
- for (i = 0; i < ARRAY_COUNT(this->particles); i++) {
- func_80A4FFE8(&this->particles[i], ((53 - i) / 18) * 4);
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
+ func_80A4FFE8(&this->effects[i], ((53 - i) / 18) * 4);
}
for (i = 0; i < ARRAY_COUNT(this->unk_0D38); i++) {
@@ -141,8 +141,8 @@ void EnDnb_Update(Actor* thisx, GlobalContext* globalCtx) {
func_80A500F8(this);
}
- for (i = 0; i < ARRAY_COUNT(this->particles); i++) {
- func_80A4FEBC(&this->particles[i], this->dyna.actor.world.pos.y);
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
+ func_80A4FEBC(&this->effects[i], this->dyna.actor.world.pos.y);
}
this->unk_0D30--;
@@ -158,13 +158,12 @@ void func_80A50510(EnDnb* this, GlobalContext* globalCtx) {
func_8012C2DC(globalCtx->state.gfxCtx);
- for (i = 0; i < ARRAY_COUNT(this->particles); i++) {
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
Matrix_Push();
- Matrix_Translate(this->particles[i].unk_0C.x, this->particles[i].unk_0C.y, this->particles[i].unk_0C.z,
- MTXMODE_NEW);
- Matrix_RotateXS(this->particles[i].unk_18.x, MTXMODE_APPLY);
- Matrix_RotateYS(this->particles[i].unk_18.y, MTXMODE_APPLY);
- Matrix_RotateZS(this->particles[i].unk_18.z, MTXMODE_APPLY);
+ Matrix_Translate(this->effects[i].unk_0C.x, this->effects[i].unk_0C.y, this->effects[i].unk_0C.z, MTXMODE_NEW);
+ Matrix_RotateXS(this->effects[i].unk_18.x, MTXMODE_APPLY);
+ Matrix_RotateYS(this->effects[i].unk_18.y, MTXMODE_APPLY);
+ Matrix_RotateZS(this->effects[i].unk_18.z, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gfx[i]);
@@ -183,13 +182,12 @@ void func_80A5063C(EnDnb* this, GlobalContext* globalCtx) {
func_8012C28C(globalCtx->state.gfxCtx);
- for (i = 0; i < ARRAY_COUNT(this->particles); i++) {
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
Matrix_Push();
- Matrix_Translate(this->particles[i].unk_0C.x, this->particles[i].unk_0C.y, this->particles[i].unk_0C.z,
- MTXMODE_NEW);
- Matrix_RotateXS(this->particles[i].unk_18.x, MTXMODE_APPLY);
- Matrix_RotateYS(this->particles[i].unk_18.y, MTXMODE_APPLY);
- Matrix_RotateZS(this->particles[i].unk_18.z, MTXMODE_APPLY);
+ Matrix_Translate(this->effects[i].unk_0C.x, this->effects[i].unk_0C.y, this->effects[i].unk_0C.z, MTXMODE_NEW);
+ Matrix_RotateXS(this->effects[i].unk_18.x, MTXMODE_APPLY);
+ Matrix_RotateYS(this->effects[i].unk_18.y, MTXMODE_APPLY);
+ Matrix_RotateZS(this->effects[i].unk_18.z, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gfx[i]);
diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h
index d5ec9554a..17ee19abe 100644
--- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h
+++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.h
@@ -16,7 +16,7 @@ typedef struct {
/* 0x2C */ f32 unk_2C;
/* 0x30 */ f32 unk_30;
/* 0x34 */ f32 unk_34;
-} EnDnbParticle; // size = 0x38
+} EnDnbEffect; // size = 0x38
typedef struct {
/* 0x00 */ u8 isEnabled;
@@ -29,10 +29,12 @@ typedef struct {
/* 0x24 */ f32 unk_24;
} EnDnbUnkStruct; // size = 0x28
+#define EN_DNB_EFFECT_COUNT 54
+
typedef struct EnDnb {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ UNK_TYPE1 unk_015C[0x4];
- /* 0x0160 */ EnDnbParticle particles[54];
+ /* 0x0160 */ EnDnbEffect effects[EN_DNB_EFFECT_COUNT];
/* 0x0D30 */ s16 unk_0D30;
/* 0x0D32 */ s16 unk_0D32;
/* 0x0D34 */ s16 unk_0D34;
diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
index 914ee2bca..c31b534a1 100644
--- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
@@ -449,7 +449,7 @@ void func_80876DC4(EnDodongo* this, GlobalContext* globalCtx) {
f32 temp_f20;
Math_Vec3f_Copy(&sp68, &this->limbPos[0]);
- sp66 = (Rand_Next() >> 0x12) + this->actor.shape.rot.y;
+ sp66 = ((s32)Rand_Next() >> 0x12) + this->actor.shape.rot.y;
temp_f20 = Math_CosS(sp66);
temp_f22 = Math_SinS(sp66);
@@ -482,7 +482,7 @@ void func_80876DC4(EnDodongo* this, GlobalContext* globalCtx) {
sp62 = this->unk_334 * 25.0f;
func_800B0EB0(globalCtx, &sp68, &sp80, &sp74, &this->unk_32C, &this->unk_330, sp64, sp62, 0x14);
- sp66 = ((u32)Rand_Next() >> 0x13) + this->actor.shape.rot.y;
+ sp66 = (Rand_Next() >> 0x13) + this->actor.shape.rot.y;
temp_f20 = Math_CosS(sp66);
temp_f22 = Math_SinS(sp66);
diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
index ea7ee7aa4..62d33b0ea 100644
--- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
+++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
@@ -21,9 +21,9 @@ void EnEncount2_Idle(EnEncount2* this, GlobalContext* globalCtx);
void EnEncount2_Popped(EnEncount2* this, GlobalContext* globalCtx);
void EnEncount2_Die(EnEncount2* this, GlobalContext* globalCtx);
void EnEncount2_SetIdle(EnEncount2* this);
-void EnEncount2_InitParticles(EnEncount2* this, Vec3f* pos, s16 fadeDelay);
-void EnEncount2_UpdateParticles(EnEncount2* this, GlobalContext* globalCtx);
-void EnEncount2_DrawParticles(EnEncount2* this, GlobalContext* globalCtx);
+void EnEncount2_InitEffects(EnEncount2* this, Vec3f* pos, s16 fadeDelay);
+void EnEncount2_UpdateEffects(EnEncount2* this, GlobalContext* globalCtx);
+void EnEncount2_DrawEffects(EnEncount2* this, GlobalContext* globalCtx);
const ActorInit En_Encount2_InitVars = {
ACTOR_EN_ENCOUNT2,
@@ -166,8 +166,8 @@ void EnEncount2_Popped(EnEncount2* this, GlobalContext* globalCtx) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, curPos.x, curPos.y, curPos.z, 255, 255, 200,
CLEAR_TAG_LARGE_EXPLOSION);
- for (i = 0; i < ARRAY_COUNT(this->particles) / 2; ++i) {
- EnEncount2_InitParticles(this, &curPos, 10);
+ for (i = 0; i < ARRAY_COUNT(this->effects) / 2; ++i) {
+ EnEncount2_InitEffects(this, &curPos, 10);
}
Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_MUJURA_BALLOON_BROKEN);
@@ -195,7 +195,7 @@ void EnEncount2_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->dyna.actor, this->scale);
this->actionFunc(this, globalCtx);
Actor_MoveWithGravity(&this->dyna.actor);
- EnEncount2_UpdateParticles(this, globalCtx);
+ EnEncount2_UpdateEffects(this, globalCtx);
if (!this->isPopped) {
Collider_UpdateSpheresElement(&this->collider, 0, &this->dyna.actor);
@@ -210,16 +210,16 @@ void EnEncount2_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, object_fusen_DL_000A00);
Gfx_DrawDListOpa(globalCtx, object_fusen_DL_000D78);
}
- EnEncount2_DrawParticles(this, globalCtx);
+ EnEncount2_DrawEffects(this, globalCtx);
}
-void EnEncount2_InitParticles(EnEncount2* this, Vec3f* pos, s16 fadeDelay) {
+void EnEncount2_InitEffects(EnEncount2* this, Vec3f* pos, s16 fadeDelay) {
s16 i;
- EnEncount2Particle* sPtr = this->particles;
+ EnEncount2Effect* sPtr = this->effects;
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, sPtr++) {
- if (!sPtr->enabled) {
- sPtr->enabled = true;
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, sPtr++) {
+ if (!sPtr->isEnabled) {
+ sPtr->isEnabled = true;
sPtr->pos = *pos;
sPtr->alphaFadeDelay = fadeDelay;
sPtr->alpha = 0xFF;
@@ -228,9 +228,9 @@ void EnEncount2_InitParticles(EnEncount2* this, Vec3f* pos, s16 fadeDelay) {
sPtr->accel.y = (Rand_ZeroOne() - 0.5f) * 10.0f;
sPtr->accel.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
- sPtr->vel.x = Rand_ZeroOne() - 0.5f;
- sPtr->vel.y = Rand_ZeroOne() - 0.5f;
- sPtr->vel.z = Rand_ZeroOne() - 0.5f;
+ sPtr->velocity.x = Rand_ZeroOne() - 0.5f;
+ sPtr->velocity.y = Rand_ZeroOne() - 0.5f;
+ sPtr->velocity.z = Rand_ZeroOne() - 0.5f;
sPtr->scale = (Rand_ZeroFloat(1.0f) * 0.5f) + 2.0f;
return;
@@ -238,42 +238,42 @@ void EnEncount2_InitParticles(EnEncount2* this, Vec3f* pos, s16 fadeDelay) {
}
}
-void EnEncount2_UpdateParticles(EnEncount2* this, GlobalContext* globalCtx) {
+void EnEncount2_UpdateEffects(EnEncount2* this, GlobalContext* globalCtx) {
s32 i;
- EnEncount2Particle* sPtr = this->particles;
+ EnEncount2Effect* sPtr = this->effects;
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, sPtr++) {
- if (sPtr->enabled) {
- sPtr->pos.x += sPtr->vel.x;
- sPtr->pos.y += sPtr->vel.y;
- sPtr->pos.z += sPtr->vel.z;
- sPtr->vel.x += sPtr->accel.x;
- sPtr->vel.y += sPtr->accel.y;
- sPtr->vel.z += sPtr->accel.z;
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, sPtr++) {
+ if (sPtr->isEnabled) {
+ sPtr->pos.x += sPtr->velocity.x;
+ sPtr->pos.y += sPtr->velocity.y;
+ sPtr->pos.z += sPtr->velocity.z;
+ sPtr->velocity.x += sPtr->accel.x;
+ sPtr->velocity.y += sPtr->accel.y;
+ sPtr->velocity.z += sPtr->accel.z;
if (sPtr->alphaFadeDelay != 0) {
sPtr->alphaFadeDelay--;
} else {
sPtr->alpha -= 10;
if (sPtr->alpha < 10) {
- sPtr->enabled = 0;
+ sPtr->isEnabled = 0;
}
}
}
}
}
-void EnEncount2_DrawParticles(EnEncount2* this, GlobalContext* globalCtx) {
+void EnEncount2_DrawEffects(EnEncount2* this, GlobalContext* globalCtx) {
s16 i;
- EnEncount2Particle* sPtr;
+ EnEncount2Effect* sPtr;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx);
- sPtr = this->particles;
+ sPtr = this->effects;
func_8012C28C(gfxCtx);
func_8012C2DC(globalCtx->state.gfxCtx);
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, sPtr++) {
- if (sPtr->enabled) {
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, sPtr++) {
+ if (sPtr->isEnabled) {
Matrix_Translate(sPtr->pos.x, sPtr->pos.y, sPtr->pos.z, MTXMODE_NEW);
Matrix_Scale(sPtr->scale, sPtr->scale, sPtr->scale, MTXMODE_APPLY);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 20);
diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
index f2ce8832f..a95c1e014 100644
--- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
+++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h
@@ -7,16 +7,18 @@ struct EnEncount2;
typedef void (*EnEncount2ActionFunc)(struct EnEncount2*, GlobalContext*);
-typedef struct EnEncount2Particle{
- /* 0x00 */ u8 enabled;
+typedef struct EnEncount2Effect{
+ /* 0x00 */ u8 isEnabled;
/* 0x04 */ Vec3f pos;
/* 0x10 */ UNK_TYPE4 unk10;
/* 0x14 */ s16 alpha;
/* 0x16 */ s16 alphaFadeDelay; // frame count before alpha fade starts
- /* 0x18 */ Vec3f vel;
+ /* 0x18 */ Vec3f velocity;
/* 0x24 */ Vec3f accel;
/* 0x30 */ f32 scale;
-} EnEncount2Particle; // size = 0x34
+} EnEncount2Effect; // size = 0x34
+
+#define EN_ENCOUNT2_EFFECT_COUNT 200
typedef struct EnEncount2 {
/* 0x0000 */ DynaPolyActor dyna;
@@ -28,7 +30,7 @@ typedef struct EnEncount2 {
/* 0x016C */ f32 oscillationAngle;
/* 0x0170 */ ColliderJntSph collider;
/* 0x0190 */ ColliderJntSphElement colElement;
- /* 0x01D0 */ EnEncount2Particle particles[200];
+ /* 0x01D0 */ EnEncount2Effect effects[EN_ENCOUNT2_EFFECT_COUNT];
} EnEncount2; // size = 0x2A70
#define GET_ENCOUNT2_SWITCH_FLAG(actor) ((s16)(((Actor*)actor)->params & 0x7F))
diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c
index f787d083e..7f07bf918 100644
--- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c
+++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c
@@ -56,9 +56,11 @@ typedef struct {
Vec3f pos;
Vec3f velocity;
Vec3s rot;
-} EnFallDebrisParticle;
+} EnFallDebrisEffect;
-EnFallDebrisParticle debrisParticles[50];
+#define EN_FALL_DEBRIS_EFFECT_COUNT 50
+
+EnFallDebrisEffect debrisEffects[EN_FALL_DEBRIS_EFFECT_COUNT];
const ActorInit En_Fall_InitVars = {
ACTOR_EN_FALL,
@@ -115,13 +117,13 @@ void EnFall_Moon_AdjustScaleAndPosition(EnFall* this, GlobalContext* globalCtx)
}
}
-void EnFall_RisingDebris_ResetParticles(EnFall* this) {
+void EnFall_RisingDebris_ResetEffects(EnFall* this) {
s32 i;
- for (i = 0; i < ARRAY_COUNT(debrisParticles); i++) {
- debrisParticles[i].modelIndex = 3;
+ for (i = 0; i < ARRAY_COUNT(debrisEffects); i++) {
+ debrisEffects[i].modelIndex = 3;
}
- this->activeDebrisParticleCount = 0;
+ this->activeDebrisEffectCount = 0;
}
void EnFall_Init(Actor* thisx, GlobalContext* globalCtx) {
@@ -252,7 +254,7 @@ void EnFall_Setup(EnFall* this, GlobalContext* globalCtx) {
this->actor.update = EnFall_RisingDebris_Update;
this->actor.draw = EnFall_RisingDebris_Draw;
this->scale = 1.0f;
- EnFall_RisingDebris_ResetParticles(this);
+ EnFall_RisingDebris_ResetEffects(this);
Actor_SetScale(&this->actor, 1.0f);
this->actor.shape.rot.x = 0;
break;
@@ -631,47 +633,47 @@ void EnFall_Fireball_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, this->scale * 1.74f);
}
-void EnFall_RisingDebris_UpdateParticles(EnFall* this) {
+void EnFall_RisingDebris_UpdateEffects(EnFall* this) {
s32 i;
- for (i = 0; i < ARRAY_COUNT(debrisParticles); i++) {
- if (debrisParticles[i].modelIndex < 3) {
- debrisParticles[i].pos.x += debrisParticles[i].velocity.x;
- debrisParticles[i].pos.y += debrisParticles[i].velocity.y;
- debrisParticles[i].pos.z += debrisParticles[i].velocity.z;
- debrisParticles[i].rot.x += 0x64;
- debrisParticles[i].rot.y += 0xC8;
- debrisParticles[i].rot.z += 0x12C;
- if ((this->actor.world.pos.y + 3000.0f) < debrisParticles[i].pos.y) {
- debrisParticles[i].modelIndex = 3;
- this->activeDebrisParticleCount--;
+ for (i = 0; i < ARRAY_COUNT(debrisEffects); i++) {
+ if (debrisEffects[i].modelIndex < 3) {
+ debrisEffects[i].pos.x += debrisEffects[i].velocity.x;
+ debrisEffects[i].pos.y += debrisEffects[i].velocity.y;
+ debrisEffects[i].pos.z += debrisEffects[i].velocity.z;
+ debrisEffects[i].rot.x += 0x64;
+ debrisEffects[i].rot.y += 0xC8;
+ debrisEffects[i].rot.z += 0x12C;
+ if ((this->actor.world.pos.y + 3000.0f) < debrisEffects[i].pos.y) {
+ debrisEffects[i].modelIndex = 3;
+ this->activeDebrisEffectCount--;
}
}
}
}
-s32 EnFall_RisingDebris_InitializeParticles(EnFall* this) {
+s32 EnFall_RisingDebris_InitializeEffect(EnFall* this) {
s16 angle;
s32 i;
f32 scale;
- for (i = 0; i < ARRAY_COUNT(debrisParticles); i++) {
- if (debrisParticles[i].modelIndex >= 3) {
- debrisParticles[i].modelIndex = (s32)Rand_ZeroFloat(3.0f);
- debrisParticles[i].pos.x = this->actor.world.pos.x;
- debrisParticles[i].pos.y = this->actor.world.pos.y;
- debrisParticles[i].pos.z = this->actor.world.pos.z;
+ for (i = 0; i < ARRAY_COUNT(debrisEffects); i++) {
+ if (debrisEffects[i].modelIndex >= 3) {
+ debrisEffects[i].modelIndex = (s32)Rand_ZeroFloat(3.0f);
+ debrisEffects[i].pos.x = this->actor.world.pos.x;
+ debrisEffects[i].pos.y = this->actor.world.pos.y;
+ debrisEffects[i].pos.z = this->actor.world.pos.z;
angle = randPlusMinusPoint5Scaled(0x10000);
scale = (1.0f - (Rand_ZeroFloat(1.0f) * Rand_ZeroFloat(1.0f))) * 3000.0f;
- debrisParticles[i].pos.x += Math_SinS(angle) * scale;
- debrisParticles[i].pos.z += Math_CosS(angle) * scale;
- debrisParticles[i].velocity.x = 0.0f;
- debrisParticles[i].velocity.z = 0.0f;
- debrisParticles[i].velocity.y = 80.0f;
- debrisParticles[i].rot.x = randPlusMinusPoint5Scaled(0x10000);
- debrisParticles[i].rot.y = randPlusMinusPoint5Scaled(0x10000);
- debrisParticles[i].rot.z = randPlusMinusPoint5Scaled(0x10000);
- this->activeDebrisParticleCount++;
+ debrisEffects[i].pos.x += Math_SinS(angle) * scale;
+ debrisEffects[i].pos.z += Math_CosS(angle) * scale;
+ debrisEffects[i].velocity.x = 0.0f;
+ debrisEffects[i].velocity.z = 0.0f;
+ debrisEffects[i].velocity.y = 80.0f;
+ debrisEffects[i].rot.x = randPlusMinusPoint5Scaled(0x10000);
+ debrisEffects[i].rot.y = randPlusMinusPoint5Scaled(0x10000);
+ debrisEffects[i].rot.z = randPlusMinusPoint5Scaled(0x10000);
+ this->activeDebrisEffectCount++;
return true;
}
}
@@ -685,14 +687,14 @@ void EnFall_RisingDebris_Update(Actor* thisx, GlobalContext* globalCtx) {
if (Cutscene_CheckActorAction(globalCtx, 451)) {
if (Cutscene_CheckActorAction(globalCtx, 451) &&
globalCtx->csCtx.actorActions[Cutscene_GetActorActionIndex(globalCtx, 451)]->action == 2) {
- EnFall_RisingDebris_UpdateParticles(this);
- EnFall_RisingDebris_InitializeParticles(this);
- } else if (this->activeDebrisParticleCount != 0) {
- EnFall_RisingDebris_ResetParticles(this);
+ EnFall_RisingDebris_UpdateEffects(this);
+ EnFall_RisingDebris_InitializeEffect(this);
+ } else if (this->activeDebrisEffectCount != 0) {
+ EnFall_RisingDebris_ResetEffects(this);
}
} else if (thisx->home.rot.x != 0) {
- EnFall_RisingDebris_UpdateParticles(this);
- EnFall_RisingDebris_InitializeParticles(this);
+ EnFall_RisingDebris_UpdateEffects(this);
+ EnFall_RisingDebris_InitializeEffect(this);
}
}
@@ -868,15 +870,14 @@ void EnFall_RisingDebris_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
- for (i = 0; i < ARRAY_COUNT(debrisParticles); i++) {
- if (debrisParticles[i].modelIndex < 3) {
- Matrix_Translate(debrisParticles[i].pos.x, debrisParticles[i].pos.y, debrisParticles[i].pos.z, MTXMODE_NEW);
+ for (i = 0; i < ARRAY_COUNT(debrisEffects); i++) {
+ if (debrisEffects[i].modelIndex < 3) {
+ Matrix_Translate(debrisEffects[i].pos.x, debrisEffects[i].pos.y, debrisEffects[i].pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
- Matrix_RotateZYX(debrisParticles[i].rot.x, debrisParticles[i].rot.y, debrisParticles[i].rot.z,
- MTXMODE_APPLY);
+ Matrix_RotateZYX(debrisEffects[i].rot.x, debrisEffects[i].rot.y, debrisEffects[i].rot.z, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, sDebrisModelDLists[debrisParticles[i].modelIndex]);
+ gSPDisplayList(POLY_OPA_DISP++, sDebrisModelDLists[debrisEffects[i].modelIndex]);
}
}
diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.h b/src/overlays/actors/ovl_En_Fall/z_en_fall.h
index 620c0590a..308b8ba9b 100644
--- a/src/overlays/actors/ovl_En_Fall/z_en_fall.h
+++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.h
@@ -40,7 +40,7 @@ typedef struct EnFall {
/* 0x154 */ u16 flags;
/* 0x158 */ union {
s32 fireballAlpha;
- s32 activeDebrisParticleCount;
+ s32 activeDebrisEffectCount;
};
/* 0x15C */ union {
s16 fireballYTexScroll1;
diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c
index 42ff95aba..32ce1988f 100644
--- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c
+++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c
@@ -226,15 +226,15 @@ void EnFamos_SetupAttackDebris(EnFamos* this) {
this->debrisTimer = 40;
rock = &this->rocks[0];
for (i = 0; i < ARRAY_COUNT(this->rocks); i++, rock++) {
- randVelDirection = Rand_Next() >> 0x10;
+ randVelDirection = (s32)Rand_Next() >> 0x10;
randOffset = Rand_S16Offset(0x1800, 0x2800);
randFloat = Rand_ZeroFloat(5.0f) + 5.0f;
rock->velocity.x = randFloat * Math_CosS(randOffset) * Math_SinS(randVelDirection);
rock->velocity.y = Math_SinS(randOffset) * randFloat + 3.0f;
rock->velocity.z = randFloat * Math_CosS(randOffset) * Math_CosS(randVelDirection);
- rock->rotation.x = Rand_Next() >> 0x10;
- rock->rotation.y = Rand_Next() >> 0x10;
- rock->rotation.z = Rand_Next() >> 0x10;
+ rock->rotation.x = (s32)Rand_Next() >> 0x10;
+ rock->rotation.y = (s32)Rand_Next() >> 0x10;
+ rock->rotation.z = (s32)Rand_Next() >> 0x10;
rock->pos.x = (Math_SinS(randVelDirection) * 20.0f) + this->actor.world.pos.x;
rock->pos.y = this->actor.floorHeight;
rock->pos.z = (Math_CosS(randVelDirection) * 20.0f) + this->actor.world.pos.z;
@@ -255,15 +255,15 @@ void EnFamos_SetupDeathDebris(EnFamos* this) {
this->debrisTimer = 40;
rock = &this->rocks[0];
for (i = 0; i < ARRAY_COUNT(this->rocks); i++, rock++) {
- randVelDirection = Rand_Next() >> 0x10;
- randSmaller = (u32)Rand_Next() >> 0x12;
+ randVelDirection = (s32)Rand_Next() >> 0x10;
+ randSmaller = Rand_Next() >> 0x12;
randFloat = Rand_ZeroFloat(6.0f) + 7.0f;
rock->velocity.x = randFloat * Math_CosS(randSmaller) * Math_SinS(randVelDirection);
rock->velocity.y = Math_SinS(randSmaller) * randFloat + 4.5f;
rock->velocity.z = randFloat * Math_CosS(randSmaller) * Math_CosS(randVelDirection);
- rock->rotation.x = Rand_Next() >> 0x10;
- rock->rotation.y = Rand_Next() >> 0x10;
- rock->rotation.z = Rand_Next() >> 0x10;
+ rock->rotation.x = (s32)Rand_Next() >> 0x10;
+ rock->rotation.y = (s32)Rand_Next() >> 0x10;
+ rock->rotation.z = (s32)Rand_Next() >> 0x10;
rock->pos.x = Math_SinS(randVelDirection) * 20.0f + this->actor.world.pos.x;
rock->pos.y = randPlusMinusPoint5Scaled(60.0f) + (this->actor.world.pos.y + 40.0f);
rock->pos.z = Math_CosS(randVelDirection) * 20.0f + this->actor.world.pos.z;
@@ -735,10 +735,9 @@ void EnFamos_UpdateDebrisPosRot(EnFamos* this) {
for (i = 0; i < ARRAY_COUNT(this->rocks); i++, rock++) {
rock->velocity.y -= 1.0f;
Math_Vec3f_Sum(&rock->pos, &rock->velocity, &rock->pos);
- // all casts seem required
- rock->rotation.x += (s16)(((u32)Rand_Next() >> 0x17) + 0x700);
- rock->rotation.y += (s16)(((u32)Rand_Next() >> 0x17) + 0x900);
- rock->rotation.z += (s16)(((u32)Rand_Next() >> 0x17) + 0xB00);
+ rock->rotation.x += (s16)((Rand_Next() >> 0x17) + 0x700);
+ rock->rotation.y += (s16)((Rand_Next() >> 0x17) + 0x900);
+ rock->rotation.z += (s16)((Rand_Next() >> 0x17) + 0xB00);
}
}
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index 6c9f813fd..d456f48ed 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -210,8 +210,8 @@ void EnFish_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->colliderElements);
this->actor.colChkInfo.mass = this->unk_25C * 30.0f;
- this->unk_244 = (u32)Rand_Next() >> 0x10;
- this->unk_246 = (u32)Rand_Next() >> 0x10;
+ this->unk_244 = Rand_Next() >> 0x10;
+ this->unk_246 = Rand_Next() >> 0x10;
if (sp36 == ENFISH_0) {
this->actor.flags |= ACTOR_FLAG_10;
@@ -707,12 +707,12 @@ void func_8091EFE8(Actor* thisx, GlobalContext* globalCtx) {
this->actor.speedXZ *= 0.5f;
}
- if (!((u32)Rand_Next() >> 0x1B) || ((this->actor.bgCheckFlags & 8) && !((u32)Rand_Next() >> 0x1E)) ||
+ if (((Rand_Next() >> 0x1B) == 0) || ((this->actor.bgCheckFlags & 8) && ((Rand_Next() >> 0x1E) == 0)) ||
!(this->actor.bgCheckFlags & 0x20)) {
temp_f0 = Rand_ZeroOne();
sp34 = (1.0f - SQ(temp_f0)) * sp3C->home.rot.x;
sp30 = Rand_ZeroOne() * sp3C->home.rot.z;
- sp2E = (u32)Rand_Next() >> 0x10;
+ sp2E = Rand_Next() >> 0x10;
this->actor.home.pos.x = (Math_SinS(sp2E) * sp34) + sp3C->world.pos.x;
this->actor.home.pos.y = sp3C->world.pos.y + sp30;
this->actor.home.pos.z = (Math_CosS(sp2E) * sp34) + sp3C->world.pos.z;
diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
index cf8c72ef3..bd8f0d08a 100644
--- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
+++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
@@ -1923,7 +1923,7 @@ void EnFishing_DrawRod(GlobalContext* globalCtx) {
f32 spC8;
f32 spC4;
f32 spC0;
- Input* input = CONTROLLER1(globalCtx);
+ Input* input = CONTROLLER1(&globalCtx->state);
Player* player = GET_PLAYER(globalCtx);
s32 pad;
@@ -2075,7 +2075,7 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
Vec3f spA8;
Vec3f sp9C;
Vec3f sp90;
- Input* input = CONTROLLER1(globalCtx);
+ Input* input = CONTROLLER1(&globalCtx->state);
D_809171FE++;
@@ -2864,7 +2864,7 @@ void EnFishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
EnFishing* this = THIS;
GlobalContext* globalCtx = globalCtx2;
Player* player = GET_PLAYER(globalCtx);
- Input* input = CONTROLLER1(globalCtx);
+ Input* input = CONTROLLER1(&globalCtx->state);
f32 spD8;
f32 phi_f0;
f32 phi_f2;
@@ -5052,7 +5052,7 @@ void EnFishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
f32 lureDistXZ;
Camera* camera;
Player* player = GET_PLAYER(globalCtx);
- Input* input = CONTROLLER1(globalCtx);
+ Input* input = CONTROLLER1(&globalCtx->state);
playerShadowAlpha = player->actor.shape.shadowAlpha;
@@ -5621,7 +5621,7 @@ TexturePtr sFishingOwnerEyeTexs[] = {
void EnFishing_DrawOwner(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnFishing* this = THIS;
- Input* input = CONTROLLER1(globalCtx);
+ Input* input = CONTROLLER1(&globalCtx->state);
OPEN_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
index fde14cf02..141e9601a 100644
--- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
+++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
@@ -127,11 +127,11 @@ s32 EnFsn_TestItemSelected(GlobalContext* globalCtx) {
MessageContext* msgCtx = &globalCtx->msgCtx;
if (msgCtx->unk12020 == 0x10 || msgCtx->unk12020 == 0x11) {
- return CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A);
+ return CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A);
}
- return CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_B) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_CUP);
+ return CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_B) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_CUP);
}
u16 EnFsn_GetWelcome(GlobalContext* globalCtx) {
@@ -483,8 +483,8 @@ s32 EnFsn_HasPlayerSelectedItem(EnFsn* this, GlobalContext* globalCtx, Input* in
}
void EnFsn_UpdateJoystickInputState(EnFsn* this, GlobalContext* globalCtx) {
- s8 stickX = CONTROLLER1(globalCtx)->rel.stick_x;
- s8 stickY = CONTROLLER1(globalCtx)->rel.stick_y;
+ s8 stickX = CONTROLLER1(&globalCtx->state)->rel.stick_x;
+ s8 stickY = CONTROLLER1(&globalCtx->state)->rel.stick_y;
if (this->stickAccumX == 0) {
if (stickX > 30 || stickX < -30) {
@@ -882,7 +882,8 @@ void EnFsn_AskBuyOrSell(EnFsn* this, GlobalContext* globalCtx) {
}
} else if (talkState == 4) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnFsn_TestEndInteraction(this, globalCtx, CONTROLLER1(globalCtx)) && Message_ShouldAdvance(globalCtx)) {
+ if (!EnFsn_TestEndInteraction(this, globalCtx, CONTROLLER1(&globalCtx->state)) &&
+ Message_ShouldAdvance(globalCtx)) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
func_8019F208();
@@ -1108,7 +1109,7 @@ void EnFsn_BrowseShelf(EnFsn* this, GlobalContext* globalCtx) {
EnFsn_UpdateCursorPos(this, globalCtx);
if (talkstate == 5) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnFsn_HasPlayerSelectedItem(this, globalCtx, CONTROLLER1(globalCtx))) {
+ if (!EnFsn_HasPlayerSelectedItem(this, globalCtx, CONTROLLER1(&globalCtx->state))) {
EnFsn_CursorLeftRight(this);
if (this->cursorIdx != prevCursorIdx) {
play_sound(NA_SE_SY_CURSOR);
@@ -1210,7 +1211,8 @@ void EnFsn_SelectItem(EnFsn* this, GlobalContext* globalCtx) {
if (EnFsn_TakeItemOffShelf(this) && talkState == 4) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnFsn_TestCancelOption(this, globalCtx, CONTROLLER1(globalCtx)) && Message_ShouldAdvance(globalCtx)) {
+ if (!EnFsn_TestCancelOption(this, globalCtx, CONTROLLER1(&globalCtx->state)) &&
+ Message_ShouldAdvance(globalCtx)) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
EnFsn_HandleCanPlayerBuyItem(this, globalCtx);
@@ -1330,7 +1332,7 @@ void EnFsn_FaceShopkeeperSelling(EnFsn* this, GlobalContext* globalCtx) {
if (talkState == 4) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnFsn_TestEndInteraction(this, globalCtx, CONTROLLER1(globalCtx)) &&
+ if (!EnFsn_TestEndInteraction(this, globalCtx, CONTROLLER1(&globalCtx->state)) &&
(!Message_ShouldAdvance(globalCtx) || !EnFsn_FacingShopkeeperDialogResult(this, globalCtx)) &&
this->stickAccumX > 0) {
cursorIdx = EnFsn_SetCursorIndexFromNeutral(this);
@@ -1410,6 +1412,8 @@ void EnFsn_Init(Actor* thisx, GlobalContext* globalCtx) {
EnFsn* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
+
+ // Note: adding 1 to FSN_LIMB_MAX due to bug in object_fsn, see bug in object_fsn.xml
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gFsnSkel, &gFsnIdleAnim, this->jointTable, this->morphTable,
FSN_LIMB_MAX + 1);
if (ENFSN_IS_SHOP(&this->actor)) {
@@ -1445,7 +1449,7 @@ void EnFsn_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
Actor_MoveWithGravity(&this->actor);
- func_800E9250(globalCtx, &this->actor, &this->headRot, &this->unk27A, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->headRot, &this->unk27A, this->actor.focus.pos);
SubS_FillLimbRotTables(globalCtx, this->limbRotYTable, this->limbRotZTable, ARRAY_COUNT(this->limbRotYTable));
EnFsn_Blink(this);
if (ENFSN_IS_SHOP(&this->actor) && EnFsn_HasItemsToSell()) {
diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h
index 5fabf59ad..66cde7a2a 100644
--- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h
+++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h
@@ -28,7 +28,7 @@ typedef struct EnFsn {
/* 0x24E */ s16 limbRotZTable[19];
/* 0x274 */ Vec3s headRot;
/* 0x27A */ Vec3s unk27A; // Set but never used
- /* 0x280 */ Vec3s jointTable[FSN_LIMB_MAX + 1];
+ /* 0x280 */ Vec3s jointTable[FSN_LIMB_MAX + 1]; // Note: adding 1 to FSN_LIMB_MAX due to bug in object_fsn, see bug in object_fsn.xml
/* 0x2F2 */ Vec3s morphTable[FSN_LIMB_MAX + 1];
/* 0x364 */ s16 eyeTextureIdx;
/* 0x366 */ s16 blinkTimer;
diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c
index 4591eab65..7fe1d6e58 100644
--- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c
+++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c
@@ -201,7 +201,7 @@ void func_80ACE850(EnFuMato* this, GlobalContext* globalCtx) {
s32 phi_s2;
s32 i;
- this->unk_308 = (u32)Rand_Next() % ARRAY_COUNT(this->unk_1B8);
+ this->unk_308 = Rand_Next() % ARRAY_COUNT(this->unk_1B8);
this->unk_302 = 1;
this->dyna.actor.gravity = -1.0f;
this->dyna.actor.velocity.y = Rand_ZeroOne();
diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c
index 354a343bb..d0993bb00 100644
--- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c
+++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c
@@ -974,7 +974,7 @@ void EnGb2_Update(Actor* thisx, GlobalContext* globalCtx) {
if (!(this->unk_26C & 0x100)) {
func_80B0F5E0(this, globalCtx);
}
- func_800E9250(globalCtx, &this->actor, &this->unk_270, &this->unk_276, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_270, &this->unk_276, this->actor.focus.pos);
}
s32 EnGb2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx,
diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c
index 79e5a3480..a2efb787a 100644
--- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c
+++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c
@@ -126,14 +126,14 @@ static DamageTable sDamageTable = {
};
static AnimationInfoS sAnimations[] = {
- { &object_oF1d_map_Anim_011D98, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
- { &object_oF1d_map_Anim_011D98, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
- { &object_oF1d_map_Anim_012DE0, 2.0f, 0, -1, ANIMMODE_ONCE, 0 },
- { &object_oF1d_map_Anim_012DE0, 2.0f, 0, -1, ANIMMODE_ONCE, -4 },
- { &object_oF1d_map_Anim_012DE0, -2.0f, 0, -1, ANIMMODE_ONCE, -4 },
- { &object_oF1d_map_Anim_003E28, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
- { &object_oF1d_map_Anim_003E28, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
- { &object_oF1d_map_Anim_0039D8, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
+ { &gGoronLyingDownIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
+ { &gGoronLyingDownIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
+ { &gGoronUnrollAnim, 2.0f, 0, -1, ANIMMODE_ONCE, 0 },
+ { &gGoronUnrollAnim, 2.0f, 0, -1, ANIMMODE_ONCE, -4 },
+ { &gGoronUnrollAnim, -2.0f, 0, -1, ANIMMODE_ONCE, -4 },
+ { &gGoronShiverAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
+ { &gGoronShiverAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
+ { &gGoronDropKegAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &object_taisou_Anim_0016C8, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &object_taisou_Anim_004DD4, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &object_taisou_Anim_00283C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
@@ -142,11 +142,11 @@ static AnimationInfoS sAnimations[] = {
{ &object_taisou_Anim_002C48, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &object_taisou_Anim_0031D8, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &object_taisou_Anim_005790, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
- { &object_oF1d_map_Anim_003650, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
+ { &gGoronCoverEarsAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &object_hakugin_demo_Anim_002704, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
{ &object_hakugin_demo_Anim_003378, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
- { &object_oF1d_map_Anim_0135E8, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
- { &object_oF1d_map_Anim_014CE0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
+ { &gGoronShiveringSurprisedAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
+ { &gGoronStandingIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
};
u16 func_80BB16D0(EnGeg* this) {
@@ -866,8 +866,8 @@ void EnGeg_Init(Actor* thisx, GlobalContext* globalCtx) {
}
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_oF1d_map_Skel_011AC8, &object_oF1d_map_Anim_012DE0,
- this->jointTable, this->morphTable, 18);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, &gGoronUnrollAnim, this->jointTable, this->morphTable,
+ GORON_LIMB_MAX);
Collider_InitCylinder(globalCtx, &this->colliderCylinder);
Collider_SetCylinder(globalCtx, &this->colliderCylinder, &this->actor, &sCylinderInit);
@@ -954,7 +954,7 @@ void EnGeg_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
OPEN_DISPS(globalCtx->state.gfxCtx);
- gSPDisplayList(POLY_OPA_DISP++, object_oF1d_map_DL_004DB0);
+ gSPDisplayList(POLY_OPA_DISP++, gGoronDonGeroMaskDL);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -1035,10 +1035,10 @@ void EnGeg_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thi
void func_80BB3BE0(EnGeg* this, GlobalContext* globalCtx) {
static TexturePtr D_80BB4088[] = {
- object_oF1d_map_Tex_010438,
- object_oF1d_map_Tex_010C38,
- object_oF1d_map_Tex_011038,
- object_oF1d_map_Tex_010838,
+ gGoronEyeOpenTex,
+ gGoronEyeHalfTex,
+ gGoronEyeClosedTex,
+ gGoronEyeClosed2Tex,
};
s32 pad;
@@ -1072,7 +1072,7 @@ void func_80BB3CB4(EnGeg* this, GlobalContext* globalCtx) {
Matrix_RotateXS(sp24, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, object_oF1d_map_DL_0091A8);
+ gSPDisplayList(POLY_OPA_DISP++, gGoronRolledUpDL);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.c b/src/overlays/actors/ovl_En_Gg/z_en_gg.c
index ad9517273..12a80e3cb 100644
--- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c
+++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c
@@ -730,7 +730,7 @@ void EnGg_Update(Actor* thisx, GlobalContext* globalCtx) {
}
func_80B35634(this, globalCtx);
- func_800E9250(globalCtx, &this->actor, &this->unk_1D8, &this->unk_1DE, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_1D8, &this->unk_1DE, this->actor.focus.pos);
func_80B351A4(this);
}
diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c
index 46f0b657c..03f50e7aa 100644
--- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c
+++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c
@@ -439,7 +439,7 @@ void EnGg2_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_MoveWithoutGravity(&this->actor);
SkelAnime_Update(&this->skelAnime);
func_80B3B8A4(this);
- func_800E9250(globalCtx, &this->actor, &this->unk_1E0, &this->unk_1E6, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_1E0, &this->unk_1E6, this->actor.focus.pos);
if ((this->unk_2EE == 5) || (this->unk_2EE == 7)) {
func_800B9010(&this->actor, NA_SE_EN_SHARP_FLOAT - SFX_FLAG);
diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
index c1c98fee0..2e4462027 100644
--- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
@@ -612,9 +612,9 @@ void EnGinkoMan_SwitchAnimation(EnGinkoMan* this, GlobalContext* globalCtx) {
void EnGinkoMan_FacePlayer(EnGinkoMan* this, GlobalContext* globalCtx) {
SkelAnime_Update(&this->skelAnime);
if (this->skelAnime.animation != &object_boj_Anim_004A7C) {
- func_800E9250(globalCtx, &this->actor, &this->limb15Rot, &this->limb8Rot, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->limb15Rot, &this->limb8Rot, this->actor.focus.pos);
} else {
- func_800E8F08(&this->limb15Rot, &this->limb8Rot);
+ Actor_TrackNone(&this->limb15Rot, &this->limb8Rot);
}
}
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index fd7ed047f..885911aec 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -31,7 +31,7 @@ s32 EnGirlA_CanBuyBombBag20BombShop(GlobalContext* globalCtx, EnGirlA* this);
s32 EnGirlA_CanBuyBombBag30BombShop(GlobalContext* globalCtx, EnGirlA* this);
s32 EnGirlA_CanBuyBombchus(GlobalContext* globalCtx, EnGirlA* this);
s32 EnGirlA_CanBuyBombs(GlobalContext* globalCtx, EnGirlA* this);
-s32 EnGirlA_CanBuyBottle(GlobalContext* globalCtx, EnGirlA* this);
+s32 EnGirlA_CanBuyBottleStolen(GlobalContext* globalCtx, EnGirlA* this);
s32 EnGirlA_CanBuySword(GlobalContext* globalCtx, EnGirlA* this);
s32 EnGirlA_CanBuyShieldMirror(GlobalContext* globalCtx, EnGirlA* this);
s32 EnGirlA_CanBuyFairy(GlobalContext* globalCtx, EnGirlA* this);
@@ -64,91 +64,91 @@ const ActorInit En_GirlA_InitVars = {
};
static ShopItemEntry sShopItemEntries[] = {
- { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0X083F, 0X0840, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
+ { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0x083F, 0x0840, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_LIQUID, GID_POTION_GREEN, func_800B8050, 1, 0X0841, 0X0842, GI_POTION_GREEN, EnGirlA_CanBuyPotionGreen,
+ { OBJECT_GI_LIQUID, GID_POTION_GREEN, func_800B8050, 1, 0x0841, 0x0842, GI_POTION_GREEN, EnGirlA_CanBuyPotionGreen,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_LIQUID, GID_POTION_BLUE, func_800B8050, 1, 0X0843, 0X0844, GI_POTION_BLUE, EnGirlA_CanBuyPotionBlue,
+ { OBJECT_GI_LIQUID, GID_POTION_BLUE, func_800B8050, 1, 0x0843, 0x0844, GI_POTION_BLUE, EnGirlA_CanBuyPotionBlue,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOTTLE_04, GID_FAIRY, func_800B8050, 1, 0X06B6, 0X06B7, GI_FAIRY, EnGirlA_CanBuyFairy,
+ { OBJECT_GI_BOTTLE_04, GID_FAIRY, func_800B8050, 1, 0x06B6, 0x06B7, GI_FAIRY, EnGirlA_CanBuyFairy,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_ARROW, GID_ARROWS_LARGE, func_800B8050, 50, 0X06BA, 0X06BB, GI_ARROWS_40, EnGirlA_CanBuyArrows,
+ { OBJECT_GI_ARROW, GID_ARROWS_LARGE, func_800B8050, 50, 0x06BA, 0x06BB, GI_ARROWS_40, EnGirlA_CanBuyArrows,
EnGirlA_BuyArrows, EnGirlA_BuyFanfare },
- { OBJECT_GI_LIQUID, GID_POTION_GREEN, func_800B8050, 1, 0X06B2, 0X06B3, GI_POTION_GREEN, EnGirlA_CanBuyPotionGreen,
+ { OBJECT_GI_LIQUID, GID_POTION_GREEN, func_800B8050, 1, 0x06B2, 0x06B3, GI_POTION_GREEN, EnGirlA_CanBuyPotionGreen,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, func_800B8050, 1, 0X06AE, 0X06AF, GI_SHIELD_HERO, EnGirlA_CanBuyShieldHero,
+ { OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, func_800B8050, 1, 0x06AE, 0x06AF, GI_SHIELD_HERO, EnGirlA_CanBuyShieldHero,
EnGirlA_BuyShieldHero, EnGirlA_BuyFanfare },
- { OBJECT_GI_STICK, GID_STICK, NULL, 1, 0X06B4, 0X06B5, GI_STICKS_1, EnGirlA_CanBuyStick, EnGirlA_BuyStick,
+ { OBJECT_GI_STICK, GID_STICK, NULL, 1, 0x06B4, 0x06B5, GI_STICKS_1, EnGirlA_CanBuyStick, EnGirlA_BuyStick,
EnGirlA_BuyFanfare },
- { OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, func_800B8050, 30, 0X06B8, 0X06B9, GI_ARROWS_30, EnGirlA_CanBuyArrows,
+ { OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, func_800B8050, 30, 0x06B8, 0x06B9, GI_ARROWS_30, EnGirlA_CanBuyArrows,
EnGirlA_BuyArrows, EnGirlA_BuyFanfare },
- { OBJECT_GI_NUTS, GID_NUTS, func_800B8118, 10, 0X06B0, 0X06B1, GI_NUTS_10, EnGirlA_CanBuyNuts, EnGirlA_BuyNuts,
+ { OBJECT_GI_NUTS, GID_NUTS, func_800B8118, 10, 0x06B0, 0x06B1, GI_NUTS_10, EnGirlA_CanBuyNuts, EnGirlA_BuyNuts,
EnGirlA_BuyFanfare },
- { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0X06AC, 0X06AD, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
+ { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0x06AC, 0x06AD, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOTTLE_04, GID_FAIRY, func_800B8050, 1, 0X06D3, 0X06D4, GI_FAIRY, EnGirlA_CanBuyFairy,
+ { OBJECT_GI_BOTTLE_04, GID_FAIRY, func_800B8050, 1, 0x06D3, 0x06D4, GI_FAIRY, EnGirlA_CanBuyFairy,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, func_800B8050, 30, 0X06D5, 0X06D6, GI_ARROWS_30, EnGirlA_CanBuyArrows,
+ { OBJECT_GI_ARROW, GID_ARROWS_MEDIUM, func_800B8050, 30, 0x06D5, 0x06D6, GI_ARROWS_30, EnGirlA_CanBuyArrows,
EnGirlA_BuyArrows, EnGirlA_BuyFanfare },
- { OBJECT_GI_ARROW, GID_ARROWS_LARGE, func_800B8050, 50, 0X06D7, 0X06D8, GI_ARROWS_40, EnGirlA_CanBuyArrows,
+ { OBJECT_GI_ARROW, GID_ARROWS_LARGE, func_800B8050, 50, 0x06D7, 0x06D8, GI_ARROWS_40, EnGirlA_CanBuyArrows,
EnGirlA_BuyArrows, EnGirlA_BuyFanfare },
- { OBJECT_GI_LIQUID, GID_POTION_GREEN, func_800B8050, 1, 0X06CF, 0X06D0, GI_POTION_GREEN, EnGirlA_CanBuyPotionGreen,
+ { OBJECT_GI_LIQUID, GID_POTION_GREEN, func_800B8050, 1, 0x06CF, 0x06D0, GI_POTION_GREEN, EnGirlA_CanBuyPotionGreen,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_NUTS, GID_NUTS, func_800B8118, 10, 0X06CD, 0X06CE, GI_NUTS_10, EnGirlA_CanBuyNuts, EnGirlA_BuyNuts,
+ { OBJECT_GI_NUTS, GID_NUTS, func_800B8118, 10, 0x06CD, 0x06CE, GI_NUTS_10, EnGirlA_CanBuyNuts, EnGirlA_BuyNuts,
EnGirlA_BuyFanfare },
- { OBJECT_GI_STICK, GID_STICK, NULL, 1, 0X06D1, 0X06D2, GI_STICKS_1, EnGirlA_CanBuyStick, EnGirlA_BuyStick,
+ { OBJECT_GI_STICK, GID_STICK, NULL, 1, 0x06D1, 0x06D2, GI_STICKS_1, EnGirlA_CanBuyStick, EnGirlA_BuyStick,
EnGirlA_BuyFanfare },
- { OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, func_800B8050, 1, 0X06CB, 0X06CC, GI_SHIELD_HERO, EnGirlA_CanBuyShieldHero,
+ { OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, func_800B8050, 1, 0x06CB, 0x06CC, GI_SHIELD_HERO, EnGirlA_CanBuyShieldHero,
EnGirlA_BuyShieldHero, EnGirlA_BuyFanfare },
- { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0X06C9, 0X06CA, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
+ { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0x06C9, 0x06CA, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_MASK06, GID_MASK_ALL_NIGHT, func_800B8050, 1, 0X29D9, 0X29DA, GI_MASK_ALL_NIGHT,
+ { OBJECT_GI_MASK06, GID_MASK_ALL_NIGHT, func_800B8050, 1, 0x29D9, 0x29DA, GI_MASK_ALL_NIGHT,
EnGirlA_CanBuyMaskAllNight, EnGirlA_BuyMaskAllNight, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_20, func_800B8050, 1, 0X29DB, 0X29DC, GI_BOMB_BAG_20,
+ { OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_20, func_800B8050, 1, 0x29DB, 0x29DC, GI_BOMB_BAG_20,
EnGirlA_CanBuyBombBagCuriosityShop, EnGirlA_BuyBombBag, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_30, func_800B8050, 2, 0X29DB, 0X29DC, GI_BOMB_BAG_30,
+ { OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_30, func_800B8050, 2, 0x29DB, 0x29DC, GI_BOMB_BAG_30,
EnGirlA_CanBuyBombBagCuriosityShop, EnGirlA_BuyBombBag, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_40, func_800B8050, 3, 0X29DB, 0X29DC, GI_BOMB_BAG_40,
+ { OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_40, func_800B8050, 3, 0x29DB, 0x29DC, GI_BOMB_BAG_40,
EnGirlA_CanBuyBombBagCuriosityShop, EnGirlA_BuyBombBag, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_20, func_800B8050, 1, 0X0654, 0X0655, GI_BOMB_BAG_20,
+ { OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_20, func_800B8050, 1, 0x0654, 0x0655, GI_BOMB_BAG_20,
EnGirlA_CanBuyBombBag20BombShop, EnGirlA_BuyBombBag, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_30, func_800B8050, 2, 0X0656, 0X0657, GI_BOMB_BAG_30,
+ { OBJECT_GI_BOMBPOUCH, GID_BOMB_BAG_30, func_800B8050, 2, 0x0656, 0x0657, GI_BOMB_BAG_30,
EnGirlA_CanBuyBombBag30BombShop, EnGirlA_BuyBombBag, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_800B8050, 10, 0X0652, 0X0653, GI_BOMBCHUS_10, EnGirlA_CanBuyBombchus,
+ { OBJECT_GI_BOMB_2, GID_BOMBCHU, func_800B8050, 10, 0x0652, 0x0653, GI_BOMBCHUS_10, EnGirlA_CanBuyBombchus,
EnGirlA_BuyBombchus, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOMB_1, GID_BOMB, func_800B8050, 10, 0X0650, 0X0651, GI_BOMBS_10, EnGirlA_CanBuyBombs, EnGirlA_BuyBombs,
+ { OBJECT_GI_BOMB_1, GID_BOMB, func_800B8050, 10, 0x0650, 0x0651, GI_BOMBS_10, EnGirlA_CanBuyBombs, EnGirlA_BuyBombs,
EnGirlA_BuyFanfare },
- { OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, func_800B8050, 1, 0X12DB, 0X12DC, GI_SHIELD_HERO, EnGirlA_CanBuyShieldHero,
+ { OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, func_800B8050, 1, 0x12DB, 0x12DC, GI_SHIELD_HERO, EnGirlA_CanBuyShieldHero,
EnGirlA_BuyShieldHero, EnGirlA_BuyFanfare },
- { OBJECT_GI_ARROW, GID_ARROWS_SMALL, func_800B8050, 10, 0X12DD, 0X12DE, GI_ARROWS_10, EnGirlA_CanBuyArrows,
+ { OBJECT_GI_ARROW, GID_ARROWS_SMALL, func_800B8050, 10, 0x12DD, 0x12DE, GI_ARROWS_10, EnGirlA_CanBuyArrows,
EnGirlA_BuyArrows, EnGirlA_BuyFanfare },
- { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0X12DF, 0X12E0, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
+ { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0x12DF, 0x12E0, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOMB_1, GID_BOMB, func_800B8050, 10, 0X0BC5, 0X0BC6, GI_BOMBS_10, EnGirlA_CanBuyBombs, EnGirlA_BuyBombs,
+ { OBJECT_GI_BOMB_1, GID_BOMB, func_800B8050, 10, 0x0BC5, 0x0BC6, GI_BOMBS_10, EnGirlA_CanBuyBombs, EnGirlA_BuyBombs,
EnGirlA_BuyFanfare },
- { OBJECT_GI_ARROW, GID_ARROWS_SMALL, func_800B8050, 10, 0X0BC7, 0X0BC8, GI_ARROWS_10, EnGirlA_CanBuyArrows,
+ { OBJECT_GI_ARROW, GID_ARROWS_SMALL, func_800B8050, 10, 0x0BC7, 0x0BC8, GI_ARROWS_10, EnGirlA_CanBuyArrows,
EnGirlA_BuyArrows, EnGirlA_BuyFanfare },
- { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0X0BC9, 0X0BCA, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
+ { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0x0BC9, 0x0BCA, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOMB_1, GID_BOMB, func_800B8050, 10, 0X0BCB, 0X0BCC, GI_BOMBS_10, EnGirlA_CanBuyBombs, EnGirlA_BuyBombs,
+ { OBJECT_GI_BOMB_1, GID_BOMB, func_800B8050, 10, 0x0BCB, 0x0BCC, GI_BOMBS_10, EnGirlA_CanBuyBombs, EnGirlA_BuyBombs,
EnGirlA_BuyFanfare },
- { OBJECT_GI_ARROW, GID_ARROWS_SMALL, func_800B8050, 10, 0X0BCD, 0X0BCE, GI_ARROWS_10, EnGirlA_CanBuyArrows,
+ { OBJECT_GI_ARROW, GID_ARROWS_SMALL, func_800B8050, 10, 0x0BCD, 0x0BCE, GI_ARROWS_10, EnGirlA_CanBuyArrows,
EnGirlA_BuyArrows, EnGirlA_BuyFanfare },
- { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0X0BCF, 0X0BD0, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
+ { OBJECT_GI_LIQUID, GID_POTION_RED, func_800B8050, 1, 0x0BCF, 0x0BD0, GI_POTION_RED, EnGirlA_CanBuyPotionRed,
EnGirlA_BuyBottleItem, EnGirlA_BuyFanfare },
- { OBJECT_GI_BOTTLE, GID_BOTTLE, func_800B8050, 1, 0X29F8, 0X29F9, GI_BOTTLE, EnGirlA_CanBuyBottle,
+ { OBJECT_GI_BOTTLE, GID_BOTTLE, func_800B8050, 1, 0x29F8, 0x29F9, GI_BOTTLE_STOLEN, EnGirlA_CanBuyBottleStolen,
EnGirlA_BuyBottle, EnGirlA_BuyFanfare },
- { OBJECT_GI_SWORD_4, GID_SWORD_GREAT_FAIRY, func_800B8050, 4, 0X29F2, 0X29F3, GI_SWORD_GREAT_FAIRY,
+ { OBJECT_GI_SWORD_4, GID_SWORD_GREAT_FAIRY, func_800B8050, 4, 0x29F2, 0x29F3, GI_SWORD_GREAT_FAIRY,
EnGirlA_CanBuySword, EnGirlA_BuySword, EnGirlA_BuyFanfare },
- { OBJECT_GI_SWORD_1, GID_SWORD_KOKIRI, func_800B8050, 1, 0X29F4, 0X29F5, GI_SWORD_KOKIRI, EnGirlA_CanBuySword,
+ { OBJECT_GI_SWORD_1, GID_SWORD_KOKIRI, func_800B8050, 1, 0x29F4, 0x29F5, GI_SWORD_KOKIRI, EnGirlA_CanBuySword,
EnGirlA_BuySword, EnGirlA_BuyFanfare },
- { OBJECT_GI_SWORD_2, GID_SWORD_RAZOR, func_800B8050, 2, 0X29F4, 0X29F5, GI_SWORD_RAZOR, EnGirlA_CanBuySword,
+ { OBJECT_GI_SWORD_2, GID_SWORD_RAZOR, func_800B8050, 2, 0x29F4, 0x29F5, GI_SWORD_RAZOR, EnGirlA_CanBuySword,
EnGirlA_BuySword, EnGirlA_BuyFanfare },
- { OBJECT_GI_SWORD_3, GID_SWORD_GILDED, func_800B8050, 3, 0X29F4, 0X29F5, GI_SWORD_GILDED, EnGirlA_CanBuySword,
+ { OBJECT_GI_SWORD_3, GID_SWORD_GILDED, func_800B8050, 3, 0x29F4, 0x29F5, GI_SWORD_GILDED, EnGirlA_CanBuySword,
EnGirlA_BuySword, EnGirlA_BuyFanfare },
- { OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, func_800B8050, 1, 0X29F6, 0X29F7, GI_SHIELD_HERO_2, EnGirlA_CanBuyShieldHero,
+ { OBJECT_GI_SHIELD_2, GID_SHIELD_HERO, func_800B8050, 1, 0x29F6, 0x29F7, GI_SHIELD_HERO_2, EnGirlA_CanBuyShieldHero,
EnGirlA_BuyShieldHero, EnGirlA_BuyFanfare },
- { OBJECT_GI_SHIELD_3, GID_SHIELD_MIRROR, func_800B8050, 1, 0X29F6, 0X29F7, GI_SHIELD_MIRROR,
+ { OBJECT_GI_SHIELD_3, GID_SHIELD_MIRROR, func_800B8050, 1, 0x29F6, 0x29F7, GI_SHIELD_MIRROR,
EnGirlA_CanBuyShieldMirror, EnGirlA_BuyShieldMirror, EnGirlA_BuyFanfare },
};
@@ -341,7 +341,7 @@ s32 EnGirlA_CanBuyBombs(GlobalContext* globalCtx, EnGirlA* this) {
return CANBUY_RESULT_SUCCESS_2;
}
-s32 EnGirlA_CanBuyBottle(GlobalContext* globalCtx, EnGirlA* this) {
+s32 EnGirlA_CanBuyBottleStolen(GlobalContext* globalCtx, EnGirlA* this) {
if (gSaveContext.save.playerData.rupees < globalCtx->msgCtx.unk1206C) {
return CANBUY_RESULT_NEED_RUPEES;
}
diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c
index 443b98b12..b299d8e77 100644
--- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c
+++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c
@@ -1083,7 +1083,7 @@ void EnGk_Update(Actor* thisx, GlobalContext* globalCtx) {
((ENGK_GET_F(&this->actor) == ENGK_F_0) && !(gSaveContext.save.weekEventReg[22] & 4))) {
func_80B507A0(this, globalCtx);
SkelAnime_Update(&this->skelAnime);
- func_800E9250(globalCtx, &this->actor, &this->unk_1D8, &this->unk_1DE, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_1D8, &this->unk_1DE, this->actor.focus.pos);
if (ENGK_GET_F(&this->actor) == ENGK_F_1) {
func_80B5123C(this, globalCtx);
}
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index 07699e7de..8e43a095a 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -979,18 +979,18 @@ s32 func_8094F7D0(EnGm* this, GlobalContext* globalCtx, ScheduleResult* arg2, u8
s32 pad;
s32 ret = false;
- this->unk_234 = NULL;
+ this->timePath = NULL;
actor = func_8094DEE0(this, globalCtx, arg3, arg4);
if (D_80951A0C[arg2->result] >= 0) {
- this->unk_234 = SubS_GetAdditionalPath(globalCtx, sp4F, D_80951A0C[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp4F, D_80951A0C[arg2->result]);
}
if ((actor != NULL) && (actor->update != NULL)) {
- if (this->unk_234 != NULL) {
- sp48 = Lib_SegmentedToVirtual(this->unk_234->points);
- Math_Vec3s_ToVec3f(&sp3C, &sp48[this->unk_234->count - 2]);
- Math_Vec3s_ToVec3f(&sp30, &sp48[this->unk_234->count - 1]);
+ if (this->timePath != NULL) {
+ sp48 = Lib_SegmentedToVirtual(this->timePath->points);
+ Math_Vec3s_ToVec3f(&sp3C, &sp48[this->timePath->count - 2]);
+ Math_Vec3s_ToVec3f(&sp30, &sp48[this->timePath->count - 1]);
this->actor.shape.shadowDraw = NULL;
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp3C, &sp30);
Math_Vec3f_Copy(&this->actor.world.pos, &sp30);
@@ -1010,16 +1010,16 @@ s32 func_8094F904(EnGm* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
s32 pad;
s32 ret = false;
- this->unk_234 = NULL;
+ this->timePath = NULL;
door = func_8094DF90(globalCtx, arg2->result);
if (D_80951A0C[arg2->result] >= 0) {
- this->unk_234 = SubS_GetAdditionalPath(globalCtx, sp55, D_80951A0C[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp55, D_80951A0C[arg2->result]);
}
if ((door != NULL) && (door->dyna.actor.update != NULL)) {
- if (this->unk_234 != NULL) {
- sp4C = Lib_SegmentedToVirtual(this->unk_234->points);
+ if (this->timePath != NULL) {
+ sp4C = Lib_SegmentedToVirtual(this->timePath->points);
Math_Vec3s_ToVec3f(&sp40, &sp4C[0]);
Math_Vec3s_ToVec3f(&sp34, &sp4C[1]);
Math_Vec3f_Copy(&this->unk_278, &sp40);
@@ -1053,32 +1053,33 @@ s32 func_8094FAC4(EnGm* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
s32 pad;
s32 ret = false;
- this->unk_234 = NULL;
+ this->timePath = NULL;
if (D_80951A0C[arg2->result] >= 0) {
- this->unk_234 = SubS_GetAdditionalPath(globalCtx, sp2B, D_80951A0C[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp2B, D_80951A0C[arg2->result]);
}
- if ((this->unk_234 != NULL) && (this->unk_234->count < 3)) {
- this->unk_234 = NULL;
+ if ((this->timePath != NULL) && (this->timePath->count < 3)) {
+ this->timePath = NULL;
}
- if (this->unk_234 != NULL) {
- if ((this->unk_258 < 9) && (this->unk_258 != 0) && (this->unk_3C4 >= 0)) {
+ if (this->timePath != NULL) {
+ if ((this->unk_258 < 9) && (this->unk_258 != 0) && (this->timePathTimeSpeed >= 0)) {
phi_v1 = sp2E;
} else {
phi_v1 = arg2->time0;
}
if (arg2->time1 < phi_v1) {
- this->unk_248 = (phi_v1 - arg2->time1) + 0xFFFF;
+ this->timePathTotalTime = (phi_v1 - arg2->time1) + 0xFFFF;
} else {
- this->unk_248 = arg2->time1 - phi_v1;
+ this->timePathTotalTime = arg2->time1 - phi_v1;
}
- this->unk_254 = sp2E - phi_v1;
- phi_v1 = this->unk_234->count - 2;
- this->unk_24C = this->unk_248 / phi_v1;
- this->unk_250 = (this->unk_254 / this->unk_24C) + 2;
+ this->timePathElapsedTime = sp2E - phi_v1;
+ phi_v1 = this->timePath->count - (SUBS_TIME_PATHING_ORDER - 1);
+ this->timePathWaypointTime = this->timePathTotalTime / phi_v1;
+ this->timePathWaypoint =
+ (this->timePathElapsedTime / this->timePathWaypointTime) + (SUBS_TIME_PATHING_ORDER - 1);
this->unk_3A4 &= ~0x8;
this->unk_3A4 &= ~0x10;
SubS_UpdateFlags(&this->unk_3A4, 3, 7);
@@ -1154,16 +1155,16 @@ s32 func_8094FF04(EnGm* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
s32 pad;
s32 ret = false;
- this->unk_234 = NULL;
+ this->timePath = NULL;
if (D_80951A0C[arg2->result] >= 0) {
- this->unk_234 = SubS_GetAdditionalPath(globalCtx, sp4F, D_80951A0C[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp4F, D_80951A0C[arg2->result]);
}
- if (this->unk_234 != NULL) {
- sp48 = Lib_SegmentedToVirtual(this->unk_234->points);
- Math_Vec3s_ToVec3f(&sp3C, &sp48[this->unk_234->count - 2]);
- Math_Vec3s_ToVec3f(&sp30, &sp48[this->unk_234->count - 1]);
+ if (this->timePath != NULL) {
+ sp48 = Lib_SegmentedToVirtual(this->timePath->points);
+ Math_Vec3s_ToVec3f(&sp3C, &sp48[this->timePath->count - 2]);
+ Math_Vec3s_ToVec3f(&sp30, &sp48[this->timePath->count - 1]);
this->actor.shape.shadowDraw = NULL;
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp3C, &sp30);
if (this->unk_258 == 0) {
@@ -1444,7 +1445,7 @@ s32 func_80950804(EnGm* this, GlobalContext* globalCtx) {
f32 temp_f0;
door = func_8094DF90(globalCtx, this->unk_258);
- if (!SubS_InCsMode(globalCtx) && (this->unk_3C4 != 0)) {
+ if (!SubS_InCsMode(globalCtx) && (this->timePathTimeSpeed != 0)) {
if ((door != NULL) && (door->dyna.actor.update != NULL)) {
if ((this->unk_3BA / (f32)this->unk_3B8) <= 0.9f) {
door->unk_1A7 = this->unk_261;
@@ -1459,7 +1460,7 @@ s32 func_80950804(EnGm* this, GlobalContext* globalCtx) {
sp38.y = 0.0f;
sp38.z = this->unk_3BA * temp_f0;
Lib_Vec3f_TranslateAndRotateY(&this->unk_278, this->actor.world.rot.y, &sp38, &this->actor.world.pos);
- this->unk_3BA += this->unk_3C4;
+ this->unk_3BA += this->timePathTimeSpeed;
if (Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PIRATE_WALK);
}
@@ -1469,51 +1470,53 @@ s32 func_80950804(EnGm* this, GlobalContext* globalCtx) {
}
s32 func_8095097C(EnGm* this, GlobalContext* globalCtx) {
- f32 sp7C[0x109];
+ f32 knots[265];
Vec3f sp70;
Vec3f sp64;
- Vec3f sp58;
+ Vec3f timePathTargetPos;
s32 sp54 = 0;
s32 sp50 = 0;
s32 pad2;
- func_8013AF00(sp7C, 3, this->unk_234->count + 3);
+ SubS_TimePathing_FillKnots(knots, SUBS_TIME_PATHING_ORDER, this->timePath->count + SUBS_TIME_PATHING_ORDER);
if (!(this->unk_3A4 & 8)) {
- sp58 = gZeroVec3f;
- func_8013B6B0(this->unk_234, &this->unk_244, &this->unk_254, this->unk_24C, this->unk_248, &this->unk_250, sp7C,
- &sp58, this->unk_3C4);
- func_8013B878(globalCtx, this->unk_234, this->unk_250, &sp58);
- this->actor.world.pos.y = sp58.y;
+ timePathTargetPos = gZeroVec3f;
+ SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &timePathTargetPos, this->timePathTimeSpeed);
+ SubS_TimePathing_ComputeInitialY(globalCtx, this->timePath, this->timePathWaypoint, &timePathTargetPos);
+ this->actor.world.pos.y = timePathTargetPos.y;
this->unk_3A4 |= 8;
} else {
- sp58 = this->unk_238;
+ timePathTargetPos = this->timePathTargetPos;
}
- this->actor.world.pos.x = sp58.x;
- this->actor.world.pos.z = sp58.z;
+ this->actor.world.pos.x = timePathTargetPos.x;
+ this->actor.world.pos.z = timePathTargetPos.z;
if (SubS_InCsMode(globalCtx)) {
- sp54 = this->unk_254;
- sp50 = this->unk_250;
- sp58 = this->actor.world.pos;
+ sp54 = this->timePathElapsedTime;
+ sp50 = this->timePathWaypoint;
+ timePathTargetPos = this->actor.world.pos;
}
- this->unk_238 = gZeroVec3f;
+ this->timePathTargetPos = gZeroVec3f;
- if (func_8013B6B0(this->unk_234, &this->unk_244, &this->unk_254, this->unk_24C, this->unk_248, &this->unk_250, sp7C,
- &this->unk_238, this->unk_3C4)) {
+ if (SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &this->timePathTargetPos, this->timePathTimeSpeed)) {
this->unk_3A4 |= 0x10;
} else {
sp70 = this->actor.world.pos;
- sp64 = this->unk_238;
+ sp64 = this->timePathTargetPos;
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp70, &sp64);
}
if (SubS_InCsMode(globalCtx)) {
- this->unk_254 = sp54;
- this->unk_250 = sp50;
- this->unk_238 = sp58;
+ this->timePathElapsedTime = sp54;
+ this->timePathWaypoint = sp50;
+ this->timePathTargetPos = timePathTargetPos;
} else if (Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PIRATE_WALK);
}
@@ -1576,7 +1579,7 @@ void func_80950C24(EnGm* this, GlobalContext* globalCtx) {
void func_80950CDC(EnGm* this, GlobalContext* globalCtx) {
ScheduleResult sp20;
- this->unk_3C4 = REG(15) + ((void)0, gSaveContext.save.daySpeed);
+ this->timePathTimeSpeed = REG(15) + ((void)0, gSaveContext.save.daySpeed);
if (!Schedule_RunScript(globalCtx, D_80951820, &sp20) ||
((this->unk_258 != sp20.result) && !func_80950280(this, globalCtx, &sp20))) {
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
index 63b6b8f57..1dd161757 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
@@ -18,13 +18,13 @@ typedef struct EnGm {
/* 0x018C */ EnGmUnkFunc2 unk_18C;
/* 0x0190 */ ColliderCylinder colliderCylinder;
/* 0x01DC */ ColliderSphere colliderSphere;
- /* 0x0234 */ Path* unk_234;
- /* 0x0238 */ Vec3f unk_238;
- /* 0x0244 */ f32 unk_244;
- /* 0x0248 */ s32 unk_248;
- /* 0x024C */ s32 unk_24C;
- /* 0x0250 */ s32 unk_250;
- /* 0x0254 */ s32 unk_254;
+ /* 0x0234 */ Path* timePath;
+ /* 0x0238 */ Vec3f timePathTargetPos;
+ /* 0x0244 */ f32 timePathProgress;
+ /* 0x0248 */ s32 timePathTotalTime;
+ /* 0x024C */ s32 timePathWaypointTime;
+ /* 0x0250 */ s32 timePathWaypoint;
+ /* 0x0254 */ s32 timePathElapsedTime;
/* 0x0258 */ u8 unk_258;
/* 0x0259 */ u8 unk_259;
/* 0x025C */ s32 unk_25C;
@@ -54,7 +54,7 @@ typedef struct EnGm {
/* 0x03BE */ s16 unk_3BE;
/* 0x03C0 */ s16 unk_3C0;
/* 0x03C2 */ s16 unk_3C2;
- /* 0x03C4 */ s16 unk_3C4;
+ /* 0x03C4 */ s16 timePathTimeSpeed;
/* 0x03C6 */ s16 unk_3C6;
/* 0x03C8 */ s16 unk_3C8;
/* 0x03CA */ s16 unk_3CA;
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c
index 27c307777..659473e30 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.c
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.c
@@ -187,16 +187,16 @@ static DamageTable sDamageTable = {
};
static AnimationInfoS sAnimations[] = {
- { &object_oF1d_map_Anim_011D98, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
- { &object_oF1d_map_Anim_011D98, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
- { &object_oF1d_map_Anim_012DE0, 2.0f, 0, -1, ANIMMODE_ONCE, 0 },
- { &object_oF1d_map_Anim_012DE0, 2.0f, 0, -1, ANIMMODE_ONCE, -4 },
- { &object_oF1d_map_Anim_012DE0, -2.0f, 0, -1, ANIMMODE_ONCE, 0 },
- { &object_oF1d_map_Anim_003E28, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
- { &object_oF1d_map_Anim_003E28, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
- { &object_oF1d_map_Anim_0039D8, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
- { &object_oF1d_map_Anim_003650, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
- { &object_oF1d_map_Anim_0135E8, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
+ { &gGoronLyingDownIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
+ { &gGoronLyingDownIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
+ { &gGoronUnrollAnim, 2.0f, 0, -1, ANIMMODE_ONCE, 0 },
+ { &gGoronUnrollAnim, 2.0f, 0, -1, ANIMMODE_ONCE, -4 },
+ { &gGoronUnrollAnim, -2.0f, 0, -1, ANIMMODE_ONCE, 0 },
+ { &gGoronShiverAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
+ { &gGoronShiverAnim, 1.0f, 0, -1, ANIMMODE_LOOP, -4 },
+ { &gGoronDropKegAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
+ { &gGoronCoverEarsAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
+ { &gGoronShiveringSurprisedAnim, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
{ &object_taisou_Anim_004DD4, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &object_taisou_Anim_0016C8, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
@@ -249,7 +249,7 @@ void func_80A11144(EnGoStruct* ptr, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
if (!flag) {
- gSPDisplayList(POLY_XLU_DISP++, object_oF1d_map_DL_0031A0);
+ gSPDisplayList(POLY_XLU_DISP++, gGoronSteamMaterialDL);
flag = true;
}
@@ -269,7 +269,7 @@ void func_80A11144(EnGoStruct* ptr, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, object_oF1d_map_DL_003258);
+ gSPDisplayList(POLY_XLU_DISP++, gGoronSteamModelDL);
Matrix_Pop();
if (globalCtx->state.gfxCtx) {}
@@ -325,7 +325,7 @@ void func_80A115B4(EnGoStruct* ptr, GlobalContext* globalCtx) {
if ((ptr->unk_00 >= 4) && (ptr->unk_00 < 7)) {
if (!flag) {
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
- gSPDisplayList(POLY_XLU_DISP++, object_oF1d_map_DL_014CF0);
+ gSPDisplayList(POLY_XLU_DISP++, gGoronDustMaterialDL);
flag = true;
}
Matrix_Push();
@@ -344,7 +344,7 @@ void func_80A115B4(EnGoStruct* ptr, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(D_80A16644[(s32)(temp * 7.0f)]));
- gSPDisplayList(POLY_XLU_DISP++, object_oF1d_map_DL_014D00);
+ gSPDisplayList(POLY_XLU_DISP++, gGoronDustModelDL);
Matrix_Pop();
}
@@ -516,9 +516,12 @@ void func_80A1203C(EnGo* this) {
}
void func_80A1213C(EnGo* this, GlobalContext* globalCtx) {
- func_80A11EC0(this->unk_3F8, globalCtx, object_oF1d_map_DL_0003D0, object_oF1d_map_DL_000458, 1);
- func_80A11EC0(this->unk_3F8, globalCtx, object_oF1d_map_DL_0008C0, object_oF1d_map_DL_000948, 2);
- func_80A11EC0(this->unk_3F8, globalCtx, object_oF1d_map_DL_000D50, object_oF1d_map_DL_000DD8, 3);
+ func_80A11EC0(this->unk_3F8, globalCtx, gGoronLargeSnowballFragmentMaterialDL, gGoronLargeSnowballFragmentModelDL,
+ 1);
+ func_80A11EC0(this->unk_3F8, globalCtx, gGoronMediumSnowballFragmentMaterialDL, gGoronMediumSnowballFragmentModelDL,
+ 2);
+ func_80A11EC0(this->unk_3F8, globalCtx, gGoronSmallSnowballFragmentMaterialDL, gGoronSmallSnowballFragmentModelDL,
+ 3);
func_80A11144(this->unk_3F8, globalCtx);
func_80A115B4(this->unk_3F8, globalCtx);
}
@@ -1459,8 +1462,8 @@ void func_80A14798(EnGo* this, GlobalContext* globalCtx) {
if ((this->unk_288 < 0) || SubS_IsObjectLoaded(this->unk_288, globalCtx) || (this->unk_289 < 0) ||
SubS_IsObjectLoaded(this->unk_289, globalCtx)) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_oF1d_map_Skel_011AC8, NULL, this->jointTable,
- this->morphTable, 18);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, NULL, this->jointTable, this->morphTable,
+ GORON_LIMB_MAX);
this->unk_3DC = -1;
func_80A12C48(this, globalCtx, 2);
@@ -1966,7 +1969,7 @@ void func_80A15B80(EnGo* this, GlobalContext* globalCtx) {
Matrix_RotateXS(this->actor.shape.rot.x, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, (this->unk_390 & 0x100) ? object_oF1d_map_DL_001560 : object_oF1d_map_DL_0091A8);
+ gSPDisplayList(POLY_OPA_DISP++, (this->unk_390 & 0x100) ? gGoronSnowballDL : gGoronRolledUpDL);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -2059,8 +2062,7 @@ void EnGo_TransfromLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* this
void func_80A15FEC(Actor* thisx, GlobalContext* globalCtx) {
static TexturePtr D_80A1670C[] = {
- object_oF1d_map_Tex_010438, object_oF1d_map_Tex_010C38, object_oF1d_map_Tex_011038,
- object_oF1d_map_Tex_010C38, object_oF1d_map_Tex_010838,
+ gGoronEyeOpenTex, gGoronEyeHalfTex, gGoronEyeClosedTex, gGoronEyeHalfTex, gGoronEyeClosed2Tex,
};
EnGo* this = THIS;
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
index f17a75f6a..e4b822546 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
@@ -599,7 +599,7 @@ void func_8093FC6C(EnGoroiwa* this, GlobalContext* globalCtx) {
temp = 0x10000 / sp80;
for (i = 0, phi_s0 = 0; i < sp80; i++, phi_s0 += temp) {
- temp_s3 = (u32)Rand_Next() >> 0x10;
+ temp_s3 = Rand_Next() >> 0x10;
temp_f20 = Math_SinS(temp_s3);
temp_f22 = Math_CosS(temp_s3);
@@ -701,7 +701,7 @@ void func_80940090(EnGoroiwa* this, GlobalContext* globalCtx) {
phi_s1 = D_80942E0C[sp120][0];
phi_s3 = 1;
phi_f22 = 0.8f;
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
phi_s0 = 0x21;
} else {
phi_s0 = 0x41;
@@ -779,7 +779,7 @@ void func_80940588(GlobalContext* globalCtx, Vec3f* arg1, Gfx* arg2[], Color_RGB
phi_s7 = arg2[0];
phi_fp = -0x190;
spC8 = 1;
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
phi_s0 = 0x21;
} else {
phi_s0 = 0x41;
@@ -856,7 +856,7 @@ void func_80940A1C(GlobalContext* globalCtx, Vec3f* arg1, Gfx** arg2, Color_RGBA
if ((i & 3) == 1) {
phi_s1 = arg2[1];
phi_s2 = -0x154;
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
phi_s0 = 0x21;
} else {
phi_s0 = 0x41;
@@ -864,7 +864,7 @@ void func_80940A1C(GlobalContext* globalCtx, Vec3f* arg1, Gfx** arg2, Color_RGBA
} else {
phi_s1 = arg2[0];
phi_s2 = -0x190;
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
phi_s0 = 0x21;
} else {
phi_s0 = 0x41;
diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
index d8551103d..8feabc0c7 100644
--- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
+++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
@@ -94,36 +94,36 @@ void func_80B21BE0(BossHakugin* parent, Vec3f* arg1, s32 arg2) {
s32 i;
for (i = 0; i < ARRAY_COUNT(parent->unk_9F8); i++) {
- BossHakuginParticle* gohtParticle = &parent->unk_9F8[i];
- if (gohtParticle->unk_18 < 0) {
+ BossHakuginEffect* gohtEffect = &parent->unk_9F8[i];
+ if (gohtEffect->unk_18 < 0) {
s16 sp2E;
s16 sp2C;
f32 sp28;
- Math_Vec3f_Copy(&gohtParticle->unk_0, arg1);
+ Math_Vec3f_Copy(&gohtEffect->unk_0, arg1);
sp2C = Rand_S16Offset(0x1000, 0x3000);
- sp2E = (u32)Rand_Next() >> 0x10;
+ sp2E = Rand_Next() >> 0x10;
sp28 = Rand_ZeroFloat(5.0f) + 10.0f;
- gohtParticle->unk_C.x = (sp28 * Math_CosS(sp2C)) * Math_SinS(sp2E);
- gohtParticle->unk_C.y = (Math_SinS(sp2C) * sp28);
- gohtParticle->unk_C.z = (sp28 * Math_CosS(sp2C)) * Math_CosS(sp2E);
+ gohtEffect->unk_C.x = (sp28 * Math_CosS(sp2C)) * Math_SinS(sp2E);
+ gohtEffect->unk_C.y = (Math_SinS(sp2C) * sp28);
+ gohtEffect->unk_C.z = (sp28 * Math_CosS(sp2C)) * Math_CosS(sp2E);
if ((arg2 == 1) || (arg2 == 3)) {
- gohtParticle->unk_24 = ((Rand_ZeroFloat(5.0f) + 25.0f) * 0.0012f);
- gohtParticle->unk_0.x = ((Rand_ZeroFloat(2.0f) + 9.0f) * gohtParticle->unk_C.x) + arg1->x;
- gohtParticle->unk_0.y = ((Rand_ZeroFloat(2.0f) + 3.0f) * gohtParticle->unk_C.y) + arg1->y;
- gohtParticle->unk_0.z = ((Rand_ZeroFloat(2.0f) + 9.0f) * gohtParticle->unk_C.z) + arg1->z;
- gohtParticle->unk_1A = 1;
+ gohtEffect->unk_24 = ((Rand_ZeroFloat(5.0f) + 25.0f) * 0.0012f);
+ gohtEffect->unk_0.x = ((Rand_ZeroFloat(2.0f) + 9.0f) * gohtEffect->unk_C.x) + arg1->x;
+ gohtEffect->unk_0.y = ((Rand_ZeroFloat(2.0f) + 3.0f) * gohtEffect->unk_C.y) + arg1->y;
+ gohtEffect->unk_0.z = ((Rand_ZeroFloat(2.0f) + 9.0f) * gohtEffect->unk_C.z) + arg1->z;
+ gohtEffect->unk_1A = 1;
} else {
- gohtParticle->unk_24 = ((Rand_ZeroFloat(5.0f) + 18.0f) * 0.0001f);
- gohtParticle->unk_0.x = ((Rand_ZeroFloat(2.0f) + 3.0f) * gohtParticle->unk_C.x) + arg1->x;
- gohtParticle->unk_0.y = ((Rand_ZeroFloat(3.0f) + 1.0f) * gohtParticle->unk_C.y) + arg1->y;
- gohtParticle->unk_0.z = ((Rand_ZeroFloat(2.0f) + 3.0f) * gohtParticle->unk_C.z) + arg1->z;
- gohtParticle->unk_1A = 0;
+ gohtEffect->unk_24 = ((Rand_ZeroFloat(5.0f) + 18.0f) * 0.0001f);
+ gohtEffect->unk_0.x = ((Rand_ZeroFloat(2.0f) + 3.0f) * gohtEffect->unk_C.x) + arg1->x;
+ gohtEffect->unk_0.y = ((Rand_ZeroFloat(3.0f) + 1.0f) * gohtEffect->unk_C.y) + arg1->y;
+ gohtEffect->unk_0.z = ((Rand_ZeroFloat(2.0f) + 3.0f) * gohtEffect->unk_C.z) + arg1->z;
+ gohtEffect->unk_1A = 0;
}
- gohtParticle->unk_1C.x = Rand_Next() >> 0x10;
- gohtParticle->unk_1C.y = Rand_Next() >> 0x10;
- gohtParticle->unk_1C.z = Rand_Next() >> 0x10;
- gohtParticle->unk_18 = 0x28;
+ gohtEffect->unk_1C.x = (s32)Rand_Next() >> 0x10;
+ gohtEffect->unk_1C.y = (s32)Rand_Next() >> 0x10;
+ gohtEffect->unk_1C.z = (s32)Rand_Next() >> 0x10;
+ gohtEffect->unk_18 = 0x28;
return;
}
}
@@ -189,10 +189,10 @@ void func_80B220A8(EnHakurock* this) {
this->actor.speedXZ = Rand_ZeroFloat(3.5f) + 2.5f;
this->actor.velocity.y = Rand_ZeroFloat(4.5f) + 18.0f;
Actor_SetScale(&this->actor, (Rand_ZeroFloat(5.0f) + 15.0f) * 0.001f);
- this->actor.world.rot.y = (Rand_Next() >> 0x12) + this->actor.parent->shape.rot.y + 0x8000;
- this->actor.shape.rot.x = Rand_Next() >> 0x10;
- this->actor.shape.rot.y = Rand_Next() >> 0x10;
- this->actor.shape.rot.z = Rand_Next() >> 0x10;
+ this->actor.world.rot.y = ((s32)Rand_Next() >> 0x12) + this->actor.parent->shape.rot.y + 0x8000;
+ this->actor.shape.rot.x = (s32)Rand_Next() >> 0x10;
+ this->actor.shape.rot.y = (s32)Rand_Next() >> 0x10;
+ this->actor.shape.rot.z = (s32)Rand_Next() >> 0x10;
this->collider.dim.radius = (this->actor.scale.x * 2500.0f);
this->collider.dim.yShift = -this->collider.dim.radius;
this->collider.dim.height = this->collider.dim.radius * 2;
@@ -222,8 +222,8 @@ void func_80B222AC(EnHakurock* this, GlobalContext* globalCtx) {
s16 angle;
this->actor.draw = EnHakurock_Draw;
- angle = (Rand_Next() >> 0x13) + player->actor.shape.rot.y;
- this->actor.shape.rot.y = Rand_Next() >> 0x10;
+ angle = ((s32)Rand_Next() >> 0x13) + player->actor.shape.rot.y;
+ this->actor.shape.rot.y = (s32)Rand_Next() >> 0x10;
this->actor.world.pos.x = (Math_SinS(angle) * 600.0f) + player->actor.world.pos.x;
this->actor.world.pos.y = player->actor.world.pos.y + 700.0f;
this->actor.world.pos.z = (Math_CosS(angle) * 600.0f) + player->actor.world.pos.z;
diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c
index 10c8df4e7..1d7914d5a 100644
--- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c
+++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c
@@ -5,6 +5,7 @@
*/
#include "z_en_hata.h"
+#include "objects/object_hata/object_hata.h"
#define FLAGS 0x00000000
@@ -12,10 +13,9 @@
void EnHata_Init(Actor* thisx, GlobalContext* globalCtx);
void EnHata_Destroy(Actor* thisx, GlobalContext* globalCtx);
-void EnHata_Update(Actor* thisx, GlobalContext* globalCtx);
+void EnHata_Update(Actor* thisx, GlobalContext* globalCtx2);
void EnHata_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
const ActorInit En_Hata_InitVars = {
ACTOR_EN_HATA,
ACTORCAT_PROP,
@@ -28,16 +28,74 @@ const ActorInit En_Hata_InitVars = {
(ActorFunc)EnHata_Draw,
};
-#endif
+void EnHata_Init(Actor* thisx, GlobalContext* globalCtx) {
+ EnHata* this = THIS;
+ s32 rand;
+ f32 endFrame;
-extern UNK_TYPE D_06002FD0;
+ SkelAnime_Init(globalCtx, &this->skelAnime, &object_hata_Skel_002FD0, NULL, this->jointTable, this->morphTable,
+ OBJECT_HATA_LIMB_MAX);
+ endFrame = Animation_GetLastFrame(&object_hata_Anim_000444);
+ Animation_Change(&this->skelAnime, &object_hata_Anim_000444, 1.0f, 0.0f, endFrame, ANIMMODE_LOOP, 0.0f);
+ rand = Rand_ZeroFloat(endFrame);
+ this->skelAnime.curFrame = rand;
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_hata_Colheader_0000C0);
+ Actor_SetScale(&this->dyna.actor, 0.013f);
+ this->dyna.actor.uncullZoneScale = 500.0f;
+ this->dyna.actor.uncullZoneDownward = 500.0f;
+ this->dyna.actor.uncullZoneForward = 2200.0f;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hata/EnHata_Init.s")
+void EnHata_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ EnHata* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hata/EnHata_Destroy.s")
+ DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hata/EnHata_Update.s")
+void EnHata_Update(Actor* thisx, GlobalContext* globalCtx2) {
+ GlobalContext* globalCtx = globalCtx2;
+ EnHata* this = THIS;
+ Vec3f sp34;
+ f32 phi_fv0;
+ s32 pad;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hata/func_8089EC68.s")
+ phi_fv0 = CLAMP(globalCtx->envCtx.windSpeed / 120.0f, 0.0f, 1.0f);
+ this->skelAnime.playSpeed = 2.75f * phi_fv0;
+ this->skelAnime.playSpeed += 1.0f + Rand_ZeroFloat(1.25f);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hata/EnHata_Draw.s")
+ sp34.x = globalCtx->envCtx.windDir.x;
+ sp34.y = globalCtx->envCtx.windDir.y + ((1.0f - phi_fv0) * 240.0f);
+ sp34.y = CLAMP(sp34.y, -118.0f, 118.0f);
+ sp34.z = globalCtx->envCtx.windDir.z;
+
+ phi_fv0 = CLAMP(phi_fv0, 0.1f, 0.4f);
+ Math_ApproachF(&this->unk_2A4.x, sp34.x, phi_fv0, 1000.0f);
+ Math_ApproachF(&this->unk_2A4.y, sp34.y, phi_fv0, 1000.0f);
+ Math_ApproachF(&this->unk_2A4.z, sp34.z, phi_fv0, 1000.0f);
+
+ sp34 = this->unk_2A4;
+ this->unk_29C = Math_Vec3f_Pitch(&gZeroVec3f, &sp34);
+ this->unk_29C = -this->unk_29C;
+ this->unk_2A0 = Math_Vec3f_Yaw(&gZeroVec3f, &sp34);
+ this->unk_2A0 += -0x4000;
+ SkelAnime_Update(&this->skelAnime);
+}
+
+s32 EnHata_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+ Actor* thisx) {
+ EnHata* this = THIS;
+
+ if ((limbIndex == OBJECT_HATA_LIMB_04) || (limbIndex == OBJECT_HATA_LIMB_0D)) {
+ rot->y += this->unk_29C;
+ rot->z += this->unk_2A0;
+ }
+ return false;
+}
+
+void EnHata_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ EnHata* this = THIS;
+
+ func_8012C5B0(globalCtx->state.gfxCtx);
+ SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnHata_OverrideLimbDraw, NULL,
+ &this->dyna.actor);
+}
diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.h b/src/overlays/actors/ovl_En_Hata/z_en_hata.h
index f80403933..fc96f302a 100644
--- a/src/overlays/actors/ovl_En_Hata/z_en_hata.h
+++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.h
@@ -2,13 +2,20 @@
#define Z_EN_HATA_H
#include "global.h"
+#include "objects/object_hata/object_hata.h"
struct EnHata;
typedef struct EnHata {
- /* 0x000 */ Actor actor;
- /* 0x144 */ char unk_144[0x16C];
-} EnHata; // size = 0x2B0
+ /* 0x000 */ DynaPolyActor dyna;
+ /* 0x15C */ SkelAnime skelAnime;
+ /* 0x1A0 */ Vec3s jointTable[OBJECT_HATA_LIMB_MAX];
+ /* 0x21E */ Vec3s morphTable[OBJECT_HATA_LIMB_MAX];
+ /* 0x29C */ s16 unk_29C;
+ /* 0x29E */ UNK_TYPE1 pad_29E[2];
+ /* 0x2A0 */ s16 unk_2A0;
+ /* 0x2A4 */ Vec3f unk_2A4;
+} EnHata; /* size = 0x2B0 */
extern const ActorInit En_Hata_InitVars;
diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c
index a16e0d94a..813800efb 100644
--- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c
+++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c
@@ -315,7 +315,7 @@ s32 func_80BD0898(EnHgo* this, GlobalContext* globalCtx) {
}
void func_80BD0B8C(EnHgo* this, GlobalContext* globalCtx) {
- func_800E9250(globalCtx, &this->actor, &this->unk_300, &this->unk_306, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_300, &this->unk_306, this->actor.focus.pos);
if (this->unk_30E > 2) {
this->unk_30E--;
} else if (this->unk_30E == 2) {
@@ -337,7 +337,7 @@ void EnHgo_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
SkelAnime_Update(&this->skelAnime);
if (func_80BD0898(this, globalCtx)) {
- func_800E8F08(&this->unk_300, &this->unk_306);
+ Actor_TrackNone(&this->unk_300, &this->unk_306);
} else if (this->actionFunc != func_80BD0410) {
if (this->actionFunc != func_80BD0434) {
Collider_UpdateCylinder(&this->actor, &this->collider);
diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c
index 76c02fc95..985344f1d 100644
--- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c
+++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c
@@ -218,7 +218,7 @@ void EnHoll_VisibleIdle(EnHoll* this, GlobalContext* globalCtx) {
void EnHoll_TransparentIdle(EnHoll* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
- s32 useViewEye = D_801D0D50 || globalCtx->csCtx.state != 0;
+ s32 useViewEye = gDbgCamEnabled || globalCtx->csCtx.state != 0;
Vec3f transformedPlayerPos;
f32 enHollTop;
f32 playerDistFromCentralPlane;
diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
index da62a57e0..26295c6eb 100644
--- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
+++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
@@ -5,6 +5,7 @@
*/
#include "z_en_horse_link_child.h"
+#include "objects/object_horse_link_child/object_horse_link_child.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_2000000)
@@ -15,7 +16,16 @@ void EnHorseLinkChild_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnHorseLinkChild_Update(Actor* thisx, GlobalContext* globalCtx);
void EnHorseLinkChild_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
+void func_808DEA0C(EnHorseLinkChild* this, GlobalContext* globalCtx);
+void func_808DEB14(EnHorseLinkChild* this, GlobalContext* globalCtx);
+void func_808DECA0(EnHorseLinkChild* this);
+void func_808DED40(EnHorseLinkChild* this, GlobalContext* globalCtx);
+void func_808DEFE8(EnHorseLinkChild* this);
+void func_808DF194(EnHorseLinkChild* this, GlobalContext* globalCtx);
+void func_808DF620(EnHorseLinkChild* this, GlobalContext* globalCtx);
+void func_808DF788(EnHorseLinkChild* this);
+void func_808DF838(EnHorseLinkChild* this, GlobalContext* globalCtx);
+
const ActorInit En_Horse_Link_Child_InitVars = {
ACTOR_EN_HORSE_LINK_CHILD,
ACTORCAT_BG,
@@ -28,77 +38,560 @@ const ActorInit En_Horse_Link_Child_InitVars = {
(ActorFunc)EnHorseLinkChild_Draw,
};
-// static ColliderJntSphElementInit sJntSphElementsInit[1] = {
-static ColliderJntSphElementInit D_808DFED4[1] = {
+AnimationHeader* D_808DFEC0[] = { &object_horse_link_child_Anim_006D44, &object_horse_link_child_Anim_007468 };
+
+AnimationHeader* D_808DFEC8[] = { &object_horse_link_child_Anim_007D50, &object_horse_link_child_Anim_0043AC,
+ &object_horse_link_child_Anim_002F98 };
+
+static ColliderJntSphElementInit sJntSphElementsInit[] = {
{
- { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_NONE, OCELEM_ON, },
+ {
+ ELEMTYPE_UNK0,
+ { 0x00000000, 0x00, 0x00 },
+ { 0x00000000, 0x00, 0x00 },
+ TOUCH_NONE | TOUCH_SFX_NORMAL,
+ BUMP_NONE,
+ OCELEM_ON,
+ },
{ 13, { { 0, 0, 0 }, 10 }, 100 },
},
};
-// static ColliderJntSphInit sJntSphInit = {
-static ColliderJntSphInit D_808DFEF8 = {
- { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1 | OC2_UNK1, COLSHAPE_JNTSPH, },
- 1, D_808DFED4, // sJntSphElementsInit,
+static ColliderJntSphInit sJntSphInit = {
+ {
+ COLTYPE_NONE,
+ AT_NONE,
+ AC_ON | AC_TYPE_PLAYER,
+ OC1_ON | OC1_TYPE_ALL,
+ OC2_TYPE_1 | OC2_UNK1,
+ COLSHAPE_JNTSPH,
+ },
+ ARRAY_COUNT(sJntSphElementsInit),
+ sJntSphElementsInit,
};
-// sColChkInfoInit
-static CollisionCheckInfoInit D_808DFF08 = { 10, 35, 100, MASS_HEAVY };
+static CollisionCheckInfoInit sColChkInfoInit = { 10, 35, 100, MASS_HEAVY };
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_808DFF2C[] = {
+s32 D_808DFF10[] = { 1, 19 };
+
+f32 D_808DFF18[] = { 1.0f, 1.0f, 1.5f, 1.5f, 1.5f };
+
+static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP),
};
-#endif
+EnHorseLinkChildUnkFunc D_808DFF30[] = {
+ func_808DEA0C, func_808DED40, func_808DEB14, func_808DF194, func_808DF838, func_808DF620,
+};
-extern ColliderJntSphElementInit D_808DFED4[1];
-extern ColliderJntSphInit D_808DFEF8;
-extern CollisionCheckInfoInit D_808DFF08;
-extern InitChainEntry D_808DFF2C[];
+TexturePtr D_808DFF48[] = { object_horse_link_child_Tex_001D28, object_horse_link_child_Tex_001928,
+ object_horse_link_child_Tex_001B28 };
-extern UNK_TYPE D_06002F98;
+s8 D_808DFF54[] = { 0, 1, 2, 1 };
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DE5C0.s")
+void func_808DE5C0(EnHorseLinkChild* this) {
+ if ((D_808DFF10[this->unk_1E8] < this->skin.skelAnime.curFrame) &&
+ ((this->unk_1E8 != 0) || !(D_808DFF10[1] < this->skin.skelAnime.curFrame))) {
+ Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_KID_HORSE_WALK);
+ this->unk_1E8++;
+ if (this->unk_1E8 >= 2) {
+ this->unk_1E8 = 0;
+ }
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DE660.s")
+void func_808DE660(EnHorseLinkChild* this) {
+ if (this->unk_148 == 2) {
+ func_808DE5C0(this);
+ } else if (this->skin.skelAnime.curFrame == 0.0f) {
+ if ((this->unk_148 == 3) || (this->unk_148 == 4)) {
+ Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_KID_HORSE_RUN);
+ } else if (this->unk_148 == 1) {
+ if (Rand_ZeroOne() > 0.5f) {
+ Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_KID_HORSE_GROAN);
+ } else {
+ Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_KID_HORSE_NEIGH);
+ }
+ }
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DE728.s")
+f32 func_808DE728(EnHorseLinkChild* this) {
+ f32 phi_fv1;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s")
+ if (this->unk_148 == 2) {
+ phi_fv1 = D_808DFF18[this->unk_148] * this->actor.speedXZ * (1.0f / 2.0f);
+ } else if (this->unk_148 == 3) {
+ phi_fv1 = D_808DFF18[this->unk_148] * this->actor.speedXZ * (1.0f / 3.0f);
+ } else if (this->unk_148 == 4) {
+ phi_fv1 = D_808DFF18[this->unk_148] * this->actor.speedXZ * (1.0f / 5.0f);
+ } else {
+ phi_fv1 = D_808DFF18[this->unk_148];
+ }
+ return phi_fv1;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/EnHorseLinkChild_Destroy.s")
+void EnHorseLinkChild_Init(Actor* thisx, GlobalContext* globalCtx) {
+ EnHorseLinkChild* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DE9A8.s")
+ Actor_ProcessInitChain(&this->actor, sInitChain);
+ Actor_SetScale(&this->actor, 0.00648f);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DEA0C.s")
+ this->actor.gravity = -3.5f;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DEA54.s")
+ ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawHorse, 20.0f);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DEB14.s")
+ this->unk_144 = 1;
+ this->actor.speedXZ = 0.0f;
+ this->actor.focus.pos = this->actor.world.pos;
+ this->actor.focus.pos.y += 70.0f;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DECA0.s")
+ Skin_Init(&globalCtx->state, &this->skin, &object_horse_link_child_Skel_00A480,
+ &object_horse_link_child_Anim_002F98);
+ this->unk_148 = 0;
+ Animation_PlayOnce(&this->skin.skelAnime, D_808DFEC0[0]);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DED40.s")
+ Collider_InitCylinder(globalCtx, &this->colldierCylinder);
+ Collider_InitJntSph(globalCtx, &this->colliderJntSph);
+ Collider_SetJntSph(globalCtx, &this->colliderJntSph, &this->actor, &sJntSphInit, this->colliderJntSphElements);
+ CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DEFE8.s")
+ this->unk_1E8 = 0;
+ this->unk_1E4 = 0;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DF088.s")
+ if (gSaveContext.sceneSetupIndex >= 4) {
+ func_808DEFE8(this);
+ } else {
+ func_808DEFE8(this);
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DF194.s")
+ this->actor.home.rot.z = this->actor.world.rot.z = this->actor.shape.rot.z = 0;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DF560.s")
+void EnHorseLinkChild_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ EnHorseLinkChild* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DF620.s")
+ Skin_Free(&globalCtx->state, &this->skin);
+ Collider_DestroyCylinder(globalCtx, &this->colldierCylinder);
+ Collider_DestroyJntSph(globalCtx, &this->colliderJntSph);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DF788.s")
+void func_808DE9A8(EnHorseLinkChild* this) {
+ this->unk_144 = 0;
+ this->unk_148++;
+ if (this->unk_148 >= ARRAY_COUNT(D_808DFF18)) {
+ this->unk_148 = 0;
+ }
+ Animation_PlayOnce(&this->skin.skelAnime, D_808DFEC0[this->unk_148]);
+ this->skin.skelAnime.playSpeed = func_808DE728(this);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DF838.s")
+void func_808DEA0C(EnHorseLinkChild* this, GlobalContext* globalCtx) {
+ this->actor.speedXZ = 0.0f;
+ if (SkelAnime_Update(&this->skin.skelAnime)) {
+ func_808DE9A8(this);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/EnHorseLinkChild_Update.s")
+void func_808DEA54(EnHorseLinkChild* this, s32 arg1) {
+ this->unk_144 = 2;
+ this->actor.speedXZ = 0.0f;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DFC3C.s")
+ if ((arg1 != 0) && (arg1 != 1)) {
+ arg1 = 0;
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/func_808DFDC8.s")
+ if (arg1 != this->unk_148) {
+ this->unk_148 = arg1;
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, -5.0f);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Horse_Link_Child/EnHorseLinkChild_Draw.s")
+void func_808DEB14(EnHorseLinkChild* this, GlobalContext* globalCtx) {
+ f32 sp44 = Actor_XZDistanceBetweenActors(&this->actor, &GET_PLAYER(globalCtx)->actor);
+ s32 phi_v0;
+
+ if (SkelAnime_Update(&this->skin.skelAnime)) {
+ if ((sp44 < 1000.0f) && (sp44 > 70.0f)) {
+ func_808DECA0(this);
+ return;
+ }
+
+ if (this->unk_148 == 1) {
+ phi_v0 = 0;
+ } else {
+ phi_v0 = 1;
+ }
+
+ if (phi_v0 != this->unk_148) {
+ this->unk_148 = phi_v0;
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, -5.0f);
+ } else {
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, 0.0f);
+ }
+ }
+}
+
+void func_808DECA0(EnHorseLinkChild* this) {
+ this->unk_144 = 1;
+ this->unk_148 = 0;
+ this->actor.speedXZ = 0.0f;
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, -5.0f);
+}
+
+void func_808DED40(EnHorseLinkChild* this, GlobalContext* globalCtx) {
+ f32 temp_fv0;
+ s16 temp_a0;
+ s32 phi_v0;
+
+ if ((this->unk_148 == 4) || (this->unk_148 == 3) || (this->unk_148 == 2)) {
+ temp_a0 = Actor_YawBetweenActors(&this->actor, &GET_PLAYER(globalCtx)->actor) - this->actor.world.rot.y;
+ if (temp_a0 > 0x12C) {
+ this->actor.world.rot.y += 0x12C;
+ } else if (temp_a0 < -0x12C) {
+ this->actor.world.rot.y -= 0x12C;
+ } else {
+ this->actor.world.rot.y += temp_a0;
+ }
+ this->actor.shape.rot.y = this->actor.world.rot.y;
+ }
+
+ if (SkelAnime_Update(&this->skin.skelAnime)) {
+ temp_fv0 = Actor_XZDistanceBetweenActors(&this->actor, &GET_PLAYER(globalCtx)->actor);
+ if (temp_fv0 > 1000.0f) {
+ func_808DEA54(this, 0);
+ return;
+ }
+
+ if ((temp_fv0 < 1000.0f) && (temp_fv0 >= 300.0f)) {
+ phi_v0 = 4;
+ this->actor.speedXZ = 6.0f;
+ } else if ((temp_fv0 < 300.0f) && (temp_fv0 >= 150.0f)) {
+ phi_v0 = 3;
+ this->actor.speedXZ = 4.0f;
+ } else if ((temp_fv0 < 150.0f) && (temp_fv0 >= 70.0f)) {
+ phi_v0 = 2;
+ this->unk_1E8 = 0;
+ this->actor.speedXZ = 2.0f;
+ } else {
+ func_808DEA54(this, 1);
+ return;
+ }
+
+ if (phi_v0 != this->unk_148) {
+ this->unk_148 = phi_v0;
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, -5.0f);
+ } else {
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, 0.0f);
+ }
+ }
+}
+
+void func_808DEFE8(EnHorseLinkChild* this) {
+ this->unk_144 = 3;
+ this->unk_148 = 0;
+ this->actor.speedXZ = 0.0f;
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, -5.0f);
+}
+
+void func_808DF088(EnHorseLinkChild* this, GlobalContext* globalCtx) {
+ if ((this->unk_148 == 4) || (this->unk_148 == 3) || (this->unk_148 == 2)) {
+ Player* player = GET_PLAYER(globalCtx);
+ s16 sp32;
+ s32 phi_v0;
+ s32 pad;
+
+ if (Math3D_Distance(&player->actor.world.pos, &this->actor.home.pos) < 250.0f) {
+ sp32 = player->actor.shape.rot.y;
+ if (Actor_YawBetweenActors(&this->actor, &player->actor) > 0) {
+ phi_v0 = 1;
+ } else {
+ phi_v0 = -1;
+ }
+ sp32 += (phi_v0 << 0xE);
+ } else {
+ sp32 = Math_Vec3f_Yaw(&this->actor.world.pos, &this->actor.home.pos) - this->actor.world.rot.y;
+ }
+
+ if (sp32 > 0x12C) {
+ this->actor.world.rot.y += 0x12C;
+ } else if (sp32 < -0x12C) {
+ this->actor.world.rot.y += -0x12C;
+ } else {
+ this->actor.world.rot.y += sp32;
+ }
+
+ this->actor.shape.rot.y = this->actor.world.rot.y;
+ }
+}
+
+void func_808DF194(EnHorseLinkChild* this, GlobalContext* globalCtx) {
+ Player* player;
+ f32 sp50;
+ s32 sp4C;
+ s32 sp48;
+
+ func_808DF088(this, globalCtx);
+
+ player = GET_PLAYER(globalCtx);
+ sp50 = Actor_XZDistanceBetweenActors(&this->actor, &player->actor);
+ sp48 = this->unk_148;
+ sp4C = SkelAnime_Update(&this->skin.skelAnime);
+
+ if ((sp4C != 0) || (this->unk_148 == 1) || (this->unk_148 == 0)) {
+ if ((gSaveContext.save.weekEventReg[1] & 0x20)) {
+ f32 sp44 = Math3D_Distance(&this->actor.world.pos, &this->actor.home.pos);
+ s32 pad;
+
+ if (Math3D_Distance(&player->actor.world.pos, &this->actor.home.pos) > 250.0f) {
+ if (sp44 >= 300.0f) {
+ sp48 = 4;
+ this->actor.speedXZ = 6.0f;
+ } else if ((sp44 < 300.0f) && (sp44 >= 150.0f)) {
+ sp48 = 3;
+ this->actor.speedXZ = 4.0f;
+ } else if ((sp44 < 150.0f) && (sp44 >= 70.0f)) {
+ sp48 = 2;
+ this->unk_1E8 = 0;
+ this->actor.speedXZ = 2.0f;
+ } else {
+ this->actor.speedXZ = 0.0f;
+ if (this->unk_148 == 0) {
+ sp48 = (sp4C == 1) ? 1 : 0;
+ } else {
+ sp48 = (sp4C == 1) ? 0 : 1;
+ }
+ }
+ } else if (sp50 < 200.0f) {
+ sp48 = 4;
+ this->actor.speedXZ = 6.0f;
+ } else if (sp50 < 300.0f) {
+ sp48 = 3;
+ this->actor.speedXZ = 4.0f;
+ } else if (sp50 < 400.0f) {
+ sp48 = 2;
+ this->unk_1E8 = 0;
+ this->actor.speedXZ = 2.0f;
+ } else {
+ this->actor.speedXZ = 0.0f;
+ if (this->unk_148 == 0) {
+ sp48 = (sp4C == 1) ? 1 : 0;
+ } else {
+ sp48 = (sp4C == 1) ? 0 : 1;
+ }
+ }
+ } else {
+ this->actor.speedXZ = 0.0f;
+ if (this->unk_148 == 0) {
+ sp48 = (sp4C == 1) ? 1 : 0;
+ } else {
+ sp48 = (sp4C == 1) ? 0 : 1;
+ }
+ }
+ }
+
+ if ((sp48 != this->unk_148) || (sp4C == 1)) {
+ this->unk_148 = sp48;
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, -5.0f);
+ } else {
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this),
+ this->skin.skelAnime.curFrame, Animation_GetLastFrame(D_808DFEC0[this->unk_148]),
+ ANIMMODE_ONCE, 0.0f);
+ }
+}
+
+void func_808DF560(EnHorseLinkChild* this) {
+ this->unk_144 = 5;
+
+ if (Rand_ZeroOne() > 0.5f) {
+ this->unk_148 = 0;
+ } else {
+ this->unk_148 = 1;
+ }
+
+ D_801BDAA4 = 0;
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, 0.0f);
+}
+
+void func_808DF620(EnHorseLinkChild* this, GlobalContext* globalCtx) {
+ s16 sp36;
+
+ if (D_801BDAA4 != 0) {
+ D_801BDAA4 = 0;
+ Audio_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_KID_HORSE_NEIGH);
+ func_808DF788(this);
+ return;
+ }
+
+ this->actor.speedXZ = 0.0f;
+ sp36 = Actor_YawBetweenActors(&this->actor, &GET_PLAYER(globalCtx)->actor) - this->actor.world.rot.y;
+
+ if ((Math_CosS(sp36) < 0.7071f) && (this->unk_148 == 2)) {
+ func_800F415C(&this->actor, &GET_PLAYER(globalCtx)->actor.world.pos, 0x12C);
+ }
+
+ if (SkelAnime_Update(&this->skin.skelAnime)) {
+ if (Math_CosS(sp36) < 0.0f) {
+ this->unk_148 = 2;
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], D_808DFF18[this->unk_148], 0.0f,
+ Animation_GetLastFrame(D_808DFEC8[0]), ANIMMODE_ONCE, -5.0f);
+ } else {
+ func_808DF560(this);
+ }
+ }
+}
+
+void func_808DF788(EnHorseLinkChild* this) {
+ this->unk_1DC = 0;
+ this->unk_144 = 4;
+ this->unk_148 = 2;
+ this->unk_1E0 = 0;
+ this->actor.speedXZ = 2.0f;
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, -5.0f);
+}
+
+void func_808DF838(EnHorseLinkChild* this, GlobalContext* globalCtx) {
+ Player* player = GET_PLAYER(globalCtx);
+ f32 phi_fv0;
+ s32 phi_v0;
+
+ this->unk_1DC++;
+ if (this->unk_1DC > 300) {
+ this->unk_1E0 = 1;
+ }
+
+ if ((this->unk_148 == 4) || (this->unk_148 == 3) || (this->unk_148 == 2)) {
+ if (this->unk_1E0 == 0) {
+ func_800F415C(&this->actor, &player->actor.world.pos, 0x12C);
+ } else {
+ func_800F415C(&this->actor, &this->actor.home.pos, 0x12C);
+ }
+ }
+
+ if (SkelAnime_Update(&this->skin.skelAnime)) {
+ if (this->unk_1E0 == 0) {
+ phi_fv0 = Actor_XZDistanceBetweenActors(&this->actor, &GET_PLAYER(globalCtx)->actor);
+ } else {
+ phi_fv0 = Math3D_Distance(&this->actor.world.pos, &this->actor.home.pos);
+ }
+
+ if (this->unk_1E0 == 0) {
+ if (phi_fv0 >= 300.0f) {
+ phi_v0 = 4;
+ this->actor.speedXZ = 6.0f;
+ } else if (phi_fv0 >= 150.0f) {
+ phi_v0 = 3;
+ this->actor.speedXZ = 4.0f;
+ } else {
+ phi_v0 = 2;
+ this->unk_1E8 = 0;
+ this->actor.speedXZ = 2.0f;
+ }
+ } else if (phi_fv0 >= 300.0f) {
+ phi_v0 = 4;
+ this->actor.speedXZ = 6.0f;
+ } else if (phi_fv0 >= 150.0f) {
+ phi_v0 = 3;
+ this->actor.speedXZ = 4.0f;
+ } else if (phi_fv0 >= 70.0f) {
+ phi_v0 = 2;
+ this->unk_1E8 = 0;
+ this->actor.speedXZ = 2.0f;
+ } else {
+ func_808DF560(this);
+ return;
+ }
+
+ if (phi_v0 != this->unk_148) {
+ this->unk_148 = phi_v0;
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, -5.0f);
+ } else {
+ Animation_Change(&this->skin.skelAnime, D_808DFEC0[this->unk_148], func_808DE728(this), 0.0f,
+ Animation_GetLastFrame(D_808DFEC0[this->unk_148]), ANIMMODE_ONCE, 0.0f);
+ }
+ }
+}
+
+void EnHorseLinkChild_Update(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ EnHorseLinkChild* this = THIS;
+
+ D_808DFF30[this->unk_144](this, globalCtx);
+ Actor_MoveWithGravity(&this->actor);
+ Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 55.0f, 100.0f, 0x1D);
+
+ this->actor.focus.pos = this->actor.world.pos;
+ this->actor.focus.pos.y += 70.0f;
+
+ if ((Rand_ZeroOne() < 0.025f) && (this->unk_1E4 == 0)) {
+ this->unk_1E4++;
+ } else if (this->unk_1E4 > 0) {
+ this->unk_1E4++;
+ if (this->unk_1E4 >= 4) {
+ this->unk_1E4 = 0;
+ }
+ }
+
+ Collider_UpdateCylinder(&this->actor, &this->colldierCylinder);
+ CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colldierCylinder.base);
+
+ func_808DE660(this);
+}
+
+void EnHorseLinkChild_PostSkinDraw(Actor* thisx, GlobalContext* globalCtx, Skin* skin) {
+ Vec3f sp4C;
+ Vec3f sp40;
+ EnHorseLinkChild* this = THIS;
+ s32 i;
+
+ for (i = 0; i < this->colliderJntSph.count; i++) {
+ sp4C.x = this->colliderJntSph.elements[i].dim.modelSphere.center.x;
+ sp4C.y = this->colliderJntSph.elements[i].dim.modelSphere.center.y;
+ sp4C.z = this->colliderJntSph.elements[i].dim.modelSphere.center.z;
+
+ Skin_GetLimbPos(skin, this->colliderJntSph.elements[i].dim.limb, &sp4C, &sp40);
+
+ this->colliderJntSph.elements[i].dim.worldSphere.center.x = sp40.x;
+ this->colliderJntSph.elements[i].dim.worldSphere.center.y = sp40.y;
+ this->colliderJntSph.elements[i].dim.worldSphere.center.z = sp40.z;
+ this->colliderJntSph.elements[i].dim.worldSphere.radius =
+ this->colliderJntSph.elements[i].dim.modelSphere.radius * this->colliderJntSph.elements[i].dim.scale;
+ }
+
+ CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->colliderJntSph.base);
+}
+
+s32 EnHorseLinkChild_OverrideSkinDraw(Actor* thisx, GlobalContext* globalCtx, s32 limbIndex, Skin* skin) {
+ EnHorseLinkChild* this = THIS;
+
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+
+ if (limbIndex == OBJECT_HORSE_LINK_CHILD_LIMB_0D) {
+ u8 index = D_808DFF54[this->unk_1E4];
+
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_808DFF48[index]));
+ }
+
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+
+ return true;
+}
+
+void EnHorseLinkChild_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ EnHorseLinkChild* this = THIS;
+
+ func_8012C28C(globalCtx->state.gfxCtx);
+ func_80138258(&this->actor, globalCtx, &this->skin, EnHorseLinkChild_PostSkinDraw,
+ EnHorseLinkChild_OverrideSkinDraw, true);
+}
diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
index ecc816c52..0cdbdda9a 100644
--- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
+++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h
@@ -6,9 +6,21 @@
struct EnHorseLinkChild;
+typedef void (*EnHorseLinkChildUnkFunc)(struct EnHorseLinkChild*, GlobalContext*);
+
typedef struct EnHorseLinkChild {
/* 0x000 */ Actor actor;
- /* 0x144 */ char unk_144[0x158];
+ /* 0x144 */ s32 unk_144;
+ /* 0x148 */ s32 unk_148;
+ /* 0x14C */ Skin skin;
+ /* 0x1DC */ s32 unk_1DC;
+ /* 0x1DC */ s32 unk_1E0;
+ /* 0x1E4 */ u8 unk_1E4;
+ /* 0x1E8 */ s32 unk_1E8;
+ /* 0x1EC */ ColliderCylinder colldierCylinder;
+ /* 0x238 */ ColliderJntSph colliderJntSph;
+ /* 0x258 */ ColliderJntSphElement colliderJntSphElements[1];
+ /* 0x298 */ UNK_TYPE1 unk298[4];
} EnHorseLinkChild; // size = 0x29C
extern const ActorInit En_Horse_Link_Child_InitVars;
diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c
index 8e143016c..cb0e50257 100644
--- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c
+++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c
@@ -297,7 +297,7 @@ void EnHs_Update(Actor* thisx, GlobalContext* globalCtx) {
Math_SmoothStepToS(&this->unusedRot.x, 0, 6, 0x1838, 0x64);
Math_SmoothStepToS(&this->unusedRot.y, 0, 6, 0x1838, 0x64);
} else if (this->stateFlags & 1) {
- func_800E9250(globalCtx, &this->actor, &this->headRot, &this->unusedRot, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->headRot, &this->unusedRot, this->actor.focus.pos);
} else {
Math_SmoothStepToS(&this->headRot.x, 0x3200, 6, 0x1838, 0x64);
Math_SmoothStepToS(&this->headRot.y, 0, 6, 0x1838, 0x64);
diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c
index e687b770d..f15f15d59 100644
--- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c
+++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c
@@ -506,17 +506,17 @@ s32 func_80BF1C44(EnIg* this, GlobalContext* globalCtx, ScheduleResult* arg2, s3
s32 sp24 = false;
sp2C = func_80BF1150(this, globalCtx, arg3, arg4);
- this->unk_274 = NULL;
+ this->timePath = NULL;
if (D_80BF3318[arg2->result] >= 0) {
- this->unk_274 = SubS_GetAdditionalPath(globalCtx, sp4F, D_80BF3318[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp4F, D_80BF3318[arg2->result]);
}
if ((sp2C != NULL) && (sp2C->update != NULL)) {
- if (this->unk_274 != NULL) {
- sp48 = Lib_SegmentedToVirtual(this->unk_274->points);
- Math_Vec3s_ToVec3f(&sp3C, &sp48[this->unk_274->count - 2]);
- Math_Vec3s_ToVec3f(&sp30, &sp48[this->unk_274->count - 1]);
+ if (this->timePath != NULL) {
+ sp48 = Lib_SegmentedToVirtual(this->timePath->points);
+ Math_Vec3s_ToVec3f(&sp3C, &sp48[this->timePath->count - 2]);
+ Math_Vec3s_ToVec3f(&sp30, &sp48[this->timePath->count - 1]);
this->actor.shape.shadowDraw = NULL;
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp3C, &sp30);
Math_Vec3f_Copy(&this->actor.world.pos, &sp30);
@@ -549,16 +549,16 @@ s32 func_80BF1DF4(EnIg* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
s32 pad;
s32 ret = false;
- this->unk_274 = NULL;
+ this->timePath = NULL;
door = func_80BF1200(globalCtx, arg2->result);
if (D_80BF3318[arg2->result] >= 0) {
- this->unk_274 = SubS_GetAdditionalPath(globalCtx, sp55, D_80BF3318[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp55, D_80BF3318[arg2->result]);
}
if ((door != NULL) && (door->dyna.actor.update != NULL)) {
- if (this->unk_274 != NULL) {
- sp4C = Lib_SegmentedToVirtual(this->unk_274->points);
+ if (this->timePath != NULL) {
+ sp4C = Lib_SegmentedToVirtual(this->timePath->points);
Math_Vec3s_ToVec3f(&sp40, &sp4C[0]);
Math_Vec3s_ToVec3f(&sp34, &sp4C[1]);
Math_Vec3f_Copy(&this->unk_2B0, &sp40);
@@ -588,39 +588,39 @@ s32 func_80BF1FA8(EnIg* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
u16 sp2E = SCHEDULE_TIME_NOW;
u16 phi_v1;
u8 sp2B = ENIG_GET_FF(&this->actor);
- s32 temp_t8;
+ s32 pad;
s32 ret = false;
- this->unk_274 = NULL;
+ this->timePath = NULL;
if (D_80BF3318[arg2->result] >= 0) {
- this->unk_274 = SubS_GetAdditionalPath(globalCtx, sp2B, D_80BF3318[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp2B, D_80BF3318[arg2->result]);
}
- if ((this->unk_274 != NULL) && (this->unk_274->count < 3)) {
- this->unk_274 = NULL;
+ if ((this->timePath != NULL) && (this->timePath->count < 3)) {
+ this->timePath = NULL;
}
- if (this->unk_274 != NULL) {
- temp_t8 = this->scheduleResult;
- if ((temp_t8 < 10) && (temp_t8 != 0) && (this->unk_3EC >= 0)) {
+ if (this->timePath != NULL) {
+ if ((this->scheduleResult < 10) && (this->scheduleResult != 0) && (this->timePathTimeSpeed >= 0)) {
phi_v1 = sp2E;
} else {
phi_v1 = arg2->time0;
}
if (arg2->time1 < phi_v1) {
- this->unk_288 = (phi_v1 - arg2->time1) + 0xFFFF;
+ this->timePathTotalTime = (phi_v1 - arg2->time1) + 0xFFFF;
} else {
- this->unk_288 = arg2->time1 - phi_v1;
+ this->timePathTotalTime = arg2->time1 - phi_v1;
}
- this->unk_294 = sp2E - phi_v1;
+ this->timePathElapsedTime = sp2E - phi_v1;
- phi_v1 = (this->unk_274->count - 2) & 0xFFFF;
+ phi_v1 = this->timePath->count - (SUBS_TIME_PATHING_ORDER - 1);
- this->unk_28C = this->unk_288 / phi_v1;
- this->unk_290 = (this->unk_294 / this->unk_28C) + 2;
+ this->timePathWaypointTime = this->timePathTotalTime / phi_v1;
+ this->timePathWaypoint =
+ (this->timePathElapsedTime / this->timePathWaypointTime) + (SUBS_TIME_PATHING_ORDER - 1);
this->unk_3D0 &= ~0x8;
this->unk_3D0 &= ~0x10;
@@ -641,16 +641,16 @@ s32 func_80BF219C(EnIg* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
s32 pad;
s32 ret = false;
- this->unk_274 = NULL;
+ this->timePath = NULL;
if (D_80BF3318[arg2->result] >= 0) {
- this->unk_274 = SubS_GetAdditionalPath(globalCtx, sp4F, D_80BF3318[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp4F, D_80BF3318[arg2->result]);
}
- if ((this->unk_274 != 0) && (this->unk_274->count >= 2)) {
- sp30 = Lib_SegmentedToVirtual(this->unk_274->points);
- Math_Vec3s_ToVec3f(&sp40, &sp30[this->unk_274->count - 1]);
- Math_Vec3s_ToVec3f(&sp34, &sp30[this->unk_274->count - 2]);
+ if ((this->timePath != 0) && (this->timePath->count >= 2)) {
+ sp30 = Lib_SegmentedToVirtual(this->timePath->points);
+ Math_Vec3s_ToVec3f(&sp40, &sp30[this->timePath->count - 1]);
+ Math_Vec3s_ToVec3f(&sp34, &sp30[this->timePath->count - 2]);
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp34, &sp40);
Math_Vec3s_Copy(&this->actor.shape.rot, &this->actor.world.rot);
Math_Vec3f_Copy(&this->actor.world.pos, &sp40);
@@ -733,7 +733,7 @@ s32 func_80BF2470(EnIg* this, GlobalContext* globalCtx) {
f32 temp;
s32 pad;
- if (!SubS_InCsMode(globalCtx) && (this->unk_3EC != 0)) {
+ if (!SubS_InCsMode(globalCtx) && (this->timePathTimeSpeed != 0)) {
if ((door != NULL) && (door->dyna.actor.update != NULL)) {
if (((f32)this->unk_3E2 / this->unk_3E0) <= 0.9f) {
door->unk_1A7 = this->unk_2A4;
@@ -747,7 +747,7 @@ s32 func_80BF2470(EnIg* this, GlobalContext* globalCtx) {
sp38.y = 0.0f;
sp38.z = this->unk_3E2 * temp;
Lib_Vec3f_TranslateAndRotateY(&this->unk_2B0, this->actor.world.rot.y, &sp38, &this->actor.world.pos);
- this->unk_3E2 += this->unk_3EC;
+ this->unk_3E2 += this->timePathTimeSpeed;
if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PIRATE_WALK);
}
@@ -756,50 +756,52 @@ s32 func_80BF2470(EnIg* this, GlobalContext* globalCtx) {
}
s32 func_80BF25E8(EnIg* this, GlobalContext* globalCtx) {
- f32 sp7C[265];
+ f32 knots[265];
Vec3f sp70;
Vec3f sp64;
- Vec3f sp58;
+ Vec3f timePathTargetPos;
s32 sp54 = 0;
s32 sp50 = 0;
s32 pad;
- func_8013AF00(sp7C, 3, this->unk_274->count + 3);
+ SubS_TimePathing_FillKnots(knots, SUBS_TIME_PATHING_ORDER, this->timePath->count + SUBS_TIME_PATHING_ORDER);
if (!(this->unk_3D0 & 8)) {
- sp58 = gZeroVec3f;
- func_8013B6B0(this->unk_274, &this->unk_284, &this->unk_294, this->unk_28C, this->unk_288, &this->unk_290, sp7C,
- &sp58, this->unk_3EC);
- func_8013B878(globalCtx, this->unk_274, this->unk_290, &sp58);
- this->actor.world.pos.y = sp58.y;
+ timePathTargetPos = gZeroVec3f;
+ SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &timePathTargetPos, this->timePathTimeSpeed);
+ SubS_TimePathing_ComputeInitialY(globalCtx, this->timePath, this->timePathWaypoint, &timePathTargetPos);
+ this->actor.world.pos.y = timePathTargetPos.y;
this->unk_3D0 |= 8;
} else {
- sp58 = this->unk_278;
+ timePathTargetPos = this->timePathTargetPos;
}
- this->actor.world.pos.x = sp58.x;
- this->actor.world.pos.z = sp58.z;
+ this->actor.world.pos.x = timePathTargetPos.x;
+ this->actor.world.pos.z = timePathTargetPos.z;
if (SubS_InCsMode(globalCtx)) {
- sp54 = this->unk_294;
- sp50 = this->unk_290;
- sp58 = this->actor.world.pos;
+ sp54 = this->timePathElapsedTime;
+ sp50 = this->timePathWaypoint;
+ timePathTargetPos = this->actor.world.pos;
}
- this->unk_278 = gZeroVec3f;
+ this->timePathTargetPos = gZeroVec3f;
- if (func_8013B6B0(this->unk_274, &this->unk_284, &this->unk_294, this->unk_28C, this->unk_288, &this->unk_290, sp7C,
- &this->unk_278, this->unk_3EC)) {
+ if (SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &this->timePathTargetPos, this->timePathTimeSpeed)) {
this->unk_3D0 |= 0x10;
} else {
sp70 = this->actor.world.pos;
- sp64 = this->unk_278;
+ sp64 = this->timePathTargetPos;
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp70, &sp64);
}
if (SubS_InCsMode(globalCtx)) {
- this->unk_294 = sp54;
- this->unk_290 = sp50;
- this->unk_278 = sp58;
+ this->timePathElapsedTime = sp54;
+ this->timePathWaypoint = sp50;
+ this->timePathTargetPos = timePathTargetPos;
} else if (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_PIRATE_WALK);
}
@@ -873,7 +875,7 @@ void func_80BF2A50(EnIg* this, GlobalContext* globalCtx) {
void func_80BF2AF8(EnIg* this, GlobalContext* globalCtx) {
ScheduleResult sp20;
- this->unk_3EC = REG(15) + ((void)0, gSaveContext.save.daySpeed);
+ this->timePathTimeSpeed = REG(15) + ((void)0, gSaveContext.save.daySpeed);
if (!Schedule_RunScript(globalCtx, D_80BF3260, &sp20) ||
((this->scheduleResult != sp20.result) && !func_80BF2368(this, globalCtx, &sp20))) {
diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.h b/src/overlays/actors/ovl_En_Ig/z_en_ig.h
index 21abb08ac..9acf34ae9 100644
--- a/src/overlays/actors/ovl_En_Ig/z_en_ig.h
+++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.h
@@ -19,13 +19,13 @@ typedef struct EnIg {
/* 0x0190 */ MtxF unk_190;
/* 0x01D0 */ ColliderCylinder collider1;
/* 0x021C */ ColliderSphere collider2;
- /* 0x0274 */ Path* unk_274;
- /* 0x0278 */ Vec3f unk_278;
- /* 0x0284 */ f32 unk_284;
- /* 0x0288 */ s32 unk_288;
- /* 0x028C */ s32 unk_28C;
- /* 0x0290 */ s32 unk_290;
- /* 0x0294 */ s32 unk_294;
+ /* 0x0274 */ Path* timePath;
+ /* 0x0278 */ Vec3f timePathTargetPos;
+ /* 0x0284 */ f32 timePathProgress;
+ /* 0x0288 */ s32 timePathTotalTime;
+ /* 0x028C */ s32 timePathWaypointTime;
+ /* 0x0290 */ s32 timePathWaypoint;
+ /* 0x0294 */ s32 timePathElapsedTime;
/* 0x0298 */ u8 scheduleResult;
/* 0x029C */ s32* unk_29C;
/* 0x02A0 */ s32 unk_2A0;
@@ -50,7 +50,7 @@ typedef struct EnIg {
/* 0x03E6 */ s16 unk_3E6;
/* 0x03E8 */ s16 unk_3E8;
/* 0x03EA */ s16 unk_3EA;
- /* 0x03EC */ s16 unk_3EC;
+ /* 0x03EC */ s16 timePathTimeSpeed;
/* 0x03EE */ s16 unk_3EE;
/* 0x03F0 */ s16 unk_3F0;
/* 0x03F2 */ s16 unk_3F2;
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c
index 98228adc6..230b6be5f 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.c
+++ b/src/overlays/actors/ovl_En_In/z_en_in.c
@@ -139,7 +139,7 @@ static AnimationInfoS sAnimations[] = {
{ &object_in_Anim_019EB4, 1.0f, 0, -1, ANIMMODE_ONCE, -4 },
};
-static TurnOptionsSet sTurnOptions = {
+static TrackOptionsSet sTrackOptions = {
{ 0xFA0, 4, 1, 3 },
{ 0x1770, 4, 1, 6 },
{ 0xFA0, 4, 1, 3 },
@@ -240,11 +240,11 @@ void func_808F3414(EnIn* this, GlobalContext* globalCtx) {
point.x = player->actor.world.pos.x;
point.y = player->bodyPartsPos[7].y + 3.0f;
point.z = player->actor.world.pos.z;
- SubS_TurnToPoint(&point, &this->actor.focus.pos, &this->actor.shape.rot, &this->turnTarget, &this->headRot,
- &this->torsoRot, &sTurnOptions);
+ SubS_TrackPoint(&point, &this->actor.focus.pos, &this->actor.shape.rot, &this->trackTarget, &this->headRot,
+ &this->torsoRot, &sTrackOptions);
} else {
- Math_SmoothStepToS(&this->turnTarget.x, 0, 4, 0x3E8, 1);
- Math_SmoothStepToS(&this->turnTarget.y, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->trackTarget.x, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->trackTarget.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->headRot.x, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->headRot.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->torsoRot.x, 0, 4, 0x3E8, 1);
@@ -585,15 +585,15 @@ s32 func_808F4150(GlobalContext* globalCtx, EnIn* this, s32 arg2, MessageContext
} else if (this->unk4AC & 8) {
func_808F4108(this, globalCtx, 0x3475);
} else {
- func_800E8EA0(globalCtx, &this->actor, 0x3475);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3475);
}
} else {
play_sound(NA_SE_SY_ERROR);
- func_800E8EA0(globalCtx, &this->actor, 0x3473);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3473);
}
} else {
func_8019F230();
- func_800E8EA0(globalCtx, &this->actor, 0x3472);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3472);
}
return 0;
}
@@ -608,13 +608,13 @@ s32 func_808F4270(GlobalContext* globalCtx, EnIn* this, s32 arg2, MessageContext
Rupees_ChangeBy(-fee);
if (!(gSaveContext.save.weekEventReg[57] & 1)) {
if (arg4 != 0) {
- func_800E8EA0(globalCtx, &this->actor, 0x3474);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3474);
} else {
func_808F4108(this, globalCtx, 0x3474);
}
} else {
if (arg4 != 0) {
- func_800E8EA0(globalCtx, &this->actor, 0x3475);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3475);
} else {
func_808F4108(this, globalCtx, 0x3475);
}
@@ -622,14 +622,14 @@ s32 func_808F4270(GlobalContext* globalCtx, EnIn* this, s32 arg2, MessageContext
} else {
play_sound(NA_SE_SY_ERROR);
if (arg4 != 0) {
- func_800E8EA0(globalCtx, &this->actor, 0x3473);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3473);
} else {
func_808F4108(this, globalCtx, 0x3473);
}
}
} else {
func_8019F230();
- func_800E8EA0(globalCtx, &this->actor, 0x3472);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3472);
}
return 0;
}
@@ -649,7 +649,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
switch (textId) {
case 0x34AF:
- func_800E8EA0(globalCtx, &this->actor, 0x34B0);
+ Actor_ContinueText(globalCtx, &this->actor, 0x34B0);
ret = false;
break;
case 0x34A9:
@@ -670,11 +670,11 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
ret = false;
break;
case 0x34AD:
- func_800E8EA0(globalCtx, &this->actor, 0x34AE);
+ Actor_ContinueText(globalCtx, &this->actor, 0x34AE);
ret = false;
break;
case 0x34B1:
- func_800E8EA0(globalCtx, &this->actor, 0x34B2);
+ Actor_ContinueText(globalCtx, &this->actor, 0x34B2);
ret = false;
break;
default:
@@ -686,11 +686,11 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
switch (textId) {
case 0x3458:
gSaveContext.save.weekEventReg[15] |= 8;
- func_800E8EA0(globalCtx, &this->actor, 0x3459);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3459);
ret = false;
break;
case 0x3459:
- func_800E8EA0(globalCtx, &this->actor, 0x345A);
+ Actor_ContinueText(globalCtx, &this->actor, 0x345A);
ret = false;
break;
case 0x345A:
@@ -702,15 +702,15 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
ret = true;
break;
case 0x345C:
- func_800E8EA0(globalCtx, &this->actor, 0x345D);
+ Actor_ContinueText(globalCtx, &this->actor, 0x345D);
ret = false;
break;
case 0x345D:
- func_800E8EA0(globalCtx, &this->actor, 0x345E);
+ Actor_ContinueText(globalCtx, &this->actor, 0x345E);
ret = false;
break;
case 0x345E:
- func_800E8EA0(globalCtx, &this->actor, 0x345F);
+ Actor_ContinueText(globalCtx, &this->actor, 0x345F);
ret = false;
break;
case 0x345F:
@@ -718,11 +718,11 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
ret = true;
break;
case 0x3460:
- func_800E8EA0(globalCtx, &this->actor, 0x3461);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3461);
ret = false;
break;
case 0x3461:
- func_800E8EA0(globalCtx, &this->actor, 0x3462);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3462);
ret = false;
break;
case 0x3462:
@@ -735,15 +735,15 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
switch (textId) {
case 0x3463:
gSaveContext.save.weekEventReg[15] |= 0x10;
- func_800E8EA0(globalCtx, &this->actor, 0x3464);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3464);
ret = false;
break;
case 0x3464:
- func_800E8EA0(globalCtx, &this->actor, 0x3465);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3465);
ret = false;
break;
case 0x3465:
- func_800E8EA0(globalCtx, &this->actor, 0x3466);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3466);
ret = false;
break;
case 0x3466:
@@ -756,17 +756,17 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
Rupees_ChangeBy(-globalCtx->msgCtx.unk1206C);
ret = true;
} else {
- func_800E8EA0(globalCtx, &this->actor, 0x3469);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3469);
ret = false;
}
} else {
play_sound(NA_SE_SY_ERROR);
- func_800E8EA0(globalCtx, &this->actor, 0x3468);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3468);
ret = false;
}
} else {
func_8019F230();
- func_800E8EA0(globalCtx, &this->actor, 0x3467);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3467);
ret = false;
}
break;
@@ -777,11 +777,11 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
ret = true;
break;
case 0x346B:
- func_800E8EA0(globalCtx, &this->actor, 0x346C);
+ Actor_ContinueText(globalCtx, &this->actor, 0x346C);
ret = false;
break;
case 0x346C:
- func_800E8EA0(globalCtx, &this->actor, 0x3466);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3466);
ret = false;
break;
case 0x346A:
@@ -797,11 +797,11 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
ret = false;
break;
case 0x3470:
- func_800E8EA0(globalCtx, &this->actor, 0x3471);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3471);
ret = false;
break;
case 0x3483:
- func_800E8EA0(globalCtx, &this->actor, 0x3471);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3471);
ret = false;
break;
case 0x3471:
@@ -872,7 +872,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
ret = false;
break;
case 0x3476:
- func_800E8EA0(globalCtx, &this->actor, 0x3477);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3477);
func_808F30B0(&this->skelAnime, 1);
func_808F30B0(&this->unk4A4->skelAnime, 7);
ret = false;
@@ -886,7 +886,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
func_808F30B0(&this->skelAnime, 1);
func_808F30B0(&this->unk4A4->skelAnime, 7);
if (INV_CONTENT(ITEM_MASK_GARO) == ITEM_MASK_GARO) {
- func_800E8EA0(globalCtx, &this->actor, 0x347E);
+ Actor_ContinueText(globalCtx, &this->actor, 0x347E);
ret = false;
} else {
gSaveContext.save.weekEventReg[56] |= 8;
@@ -901,12 +901,12 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
Actor_PickUp(&this->actor, globalCtx, GI_MILK, 500.0f, 100.0f);
ret = true;
} else {
- func_800E8EA0(globalCtx, &this->actor, 0x347F);
+ Actor_ContinueText(globalCtx, &this->actor, 0x347F);
ret = false;
}
break;
case 0x347F:
- func_800E8EA0(globalCtx, &this->actor, 0x3480);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3480);
ret = false;
break;
case 0x3480:
@@ -944,12 +944,12 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
case 4:
switch (textId) {
case 0x3486:
- func_800E8EA0(globalCtx, &this->actor, 0x3487);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3487);
gSaveContext.save.weekEventReg[16] |= 1;
ret = false;
break;
case 0x3487:
- func_800E8EA0(globalCtx, &this->actor, 0x3488);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3488);
ret = false;
break;
case 0x3488:
@@ -963,11 +963,11 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
func_80151BB4(globalCtx, 0x11);
break;
case 0x348B:
- func_800E8EA0(globalCtx, &this->actor, 0x348C);
+ Actor_ContinueText(globalCtx, &this->actor, 0x348C);
ret = false;
break;
case 0x348C:
- func_800E8EA0(globalCtx, &this->actor, 0x348D);
+ Actor_ContinueText(globalCtx, &this->actor, 0x348D);
ret = false;
break;
case 0x348D:
@@ -985,17 +985,17 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
break;
case 0x348E:
case 0x34B3:
- func_800E8EA0(globalCtx, &this->actor, 0x348F);
+ Actor_ContinueText(globalCtx, &this->actor, 0x348F);
gSaveContext.save.weekEventReg[16] |= 2;
ret = false;
break;
case 0x3493:
- func_800E8EA0(globalCtx, &this->actor, 0x3494);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3494);
ret = false;
break;
case 0x348F:
case 0x3494:
- func_800E8EA0(globalCtx, &this->actor, 0x3490);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3490);
ret = false;
break;
case 0x3490:
@@ -1008,17 +1008,17 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
Rupees_ChangeBy(-globalCtx->msgCtx.unk1206C);
ret = true;
} else {
- func_800E8EA0(globalCtx, &this->actor, 0x3469);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3469);
ret = false;
}
} else {
play_sound(NA_SE_SY_ERROR);
- func_800E8EA0(globalCtx, &this->actor, 0x3468);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3468);
ret = false;
}
} else {
func_8019F230();
- func_800E8EA0(globalCtx, &this->actor, 0x3491);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3491);
ret = false;
}
break;
@@ -1062,7 +1062,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
func_80151BB4(globalCtx, 0x11);
break;
case 0x3474:
- func_800E8EA0(globalCtx, &this->actor, 0x3475);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3475);
ret = false;
break;
case 0x3475:
@@ -1077,7 +1077,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
func_808F30B0(&this->skelAnime, 1);
func_808F30B0(&this->unk4A4->skelAnime, 7);
if (INV_CONTENT(ITEM_MASK_GARO) == ITEM_MASK_GARO) {
- func_800E8EA0(globalCtx, &this->actor, 0x34A1);
+ Actor_ContinueText(globalCtx, &this->actor, 0x34A1);
ret = false;
} else {
gSaveContext.save.weekEventReg[56] |= 8;
@@ -1105,12 +1105,12 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
Actor_PickUp(&this->actor, globalCtx, GI_MILK, 500.0f, 100.0f);
ret = true;
} else {
- func_800E8EA0(globalCtx, &this->actor, 0x34A2);
+ Actor_ContinueText(globalCtx, &this->actor, 0x34A2);
ret = false;
}
break;
case 0x34A2:
- func_800E8EA0(globalCtx, &this->actor, 0x34A3);
+ Actor_ContinueText(globalCtx, &this->actor, 0x34A3);
ret = false;
break;
case 0x34A3:
@@ -1119,13 +1119,13 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
ret = true;
break;
case 0x3499:
- func_800E8EA0(globalCtx, &this->actor, 0x349A);
+ Actor_ContinueText(globalCtx, &this->actor, 0x349A);
func_808F30B0(&this->skelAnime, 1);
func_808F30B0(&this->unk4A4->skelAnime, 7);
ret = false;
break;
case 0x349A:
- func_800E8EA0(globalCtx, &this->actor, 0x349B);
+ Actor_ContinueText(globalCtx, &this->actor, 0x349B);
ret = false;
break;
case 0x349B:
@@ -1134,7 +1134,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
ret = false;
} else {
func_8019F230();
- func_800E8EA0(globalCtx, &this->actor, 0x349C);
+ Actor_ContinueText(globalCtx, &this->actor, 0x349C);
ret = false;
}
break;
@@ -1154,7 +1154,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
break;
case 0x3498:
case 0x34A6:
- func_800E8EA0(globalCtx, &this->actor, 0x3471);
+ Actor_ContinueText(globalCtx, &this->actor, 0x3471);
ret = false;
break;
case 0x3471:
diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h
index ae339ecaa..e0667e0c2 100644
--- a/src/overlays/actors/ovl_En_In/z_en_in.h
+++ b/src/overlays/actors/ovl_En_In/z_en_in.h
@@ -36,7 +36,7 @@ typedef struct EnIn {
/* 0x261 */ u8 unk261;
/* 0x262 */ Vec3s jointTable[20];
/* 0x2DA */ Vec3s morphTable[20];
- /* 0x352 */ Vec3s turnTarget;
+ /* 0x352 */ Vec3s trackTarget;
/* 0x358 */ Vec3s headRot;
/* 0x35E */ Vec3s torsoRot;
/* 0x364 */ char unk364[0x12];
diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
index c6369258a..a6d15d855 100644
--- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
+++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
@@ -2656,7 +2656,7 @@ void func_80B48AD4(EnInvadepoh* this, GlobalContext* globalCtx) {
if (this->actionTimer > 0) {
temp_v1_3 = this->actionTimer & 0x1F;
if ((temp_v1_3 == 0) && (Rand_ZeroOne() < 0.3f)) {
- temp_v1_3 = Rand_Next() % 4;
+ temp_v1_3 = (s32)Rand_Next() % 4;
if (temp_v1_3 != this->rand) {
this->rand = temp_v1_3;
if (this->rand == 0) {
diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
index 9b60a41dd..6f29acf4a 100644
--- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
@@ -203,8 +203,8 @@ void func_8095D804(Actor* thisx, GlobalContext* globalCtx) {
spC4.y += (Rand_ZeroOne() * 7.0f) + 6.0f;
spC4.z += (Rand_ZeroOne() - 0.5f) * 11.0f;
- EffectSsKakera_Spawn(globalCtx, &spB8, &spC4, &spB8, -420, (Rand_Next() > 0) ? 65 : 33, 30, 5, 0, D_8095F74C[i],
- 3, 10, 40, -1, temp, phi_s4);
+ EffectSsKakera_Spawn(globalCtx, &spB8, &spC4, &spB8, -420, ((s32)Rand_Next() > 0) ? 65 : 33, 30, 5, 0,
+ D_8095F74C[i], 3, 10, 40, -1, temp, phi_s4);
}
}
@@ -389,7 +389,7 @@ void EnIshi_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if ((this->actor.shape.rot.y == 0) && !(this->unk_197 & 2)) {
- this->actor.shape.rot.y = this->actor.world.rot.y = (u32)Rand_Next() >> 0x10;
+ this->actor.shape.rot.y = this->actor.world.rot.y = Rand_Next() >> 0x10;
}
Actor_SetScale(&this->actor, D_8095F6B8[sp34]);
diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.c b/src/overlays/actors/ovl_En_Jg/z_en_jg.c
index 8f2408495..5c7d0d4fe 100644
--- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c
+++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c
@@ -992,7 +992,8 @@ void EnJg_Update(Actor* thisx, GlobalContext* globalCtx) {
EnJg_SpawnBreath(this, globalCtx);
}
- func_800E9250(globalCtx, &this->actor, &this->unusedRotation1, &this->unusedRotation2, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unusedRotation1, &this->unusedRotation2,
+ this->actor.focus.pos);
}
this->actionFunc(this, globalCtx);
}
diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c
index 5480762af..d158042b0 100644
--- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c
+++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c
@@ -313,7 +313,7 @@ void func_80C14230(EnJgameTsn* this, GlobalContext* globalCtx) {
s32 rand;
if ((this->unk_2FC > 100) || func_80C14BCC(this, globalCtx)) {
- rand = (u32)Rand_Next() % 3;
+ rand = Rand_Next() % 3;
this->unk_2FC = 0;
if (rand < this->unk_218) {
@@ -586,7 +586,7 @@ void func_80C14D14(EnJgameTsn* this, GlobalContext* globalCtx) {
}
void func_80C14D58(EnJgameTsn* this, GlobalContext* globalCtx) {
- func_800E9250(globalCtx, &this->actor, &this->unk_2EC, &this->unk_2F2, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_2EC, &this->unk_2F2, this->actor.focus.pos);
if (DECR(this->unk_2FA) == 0) {
this->unk_2FA = Rand_S16Offset(60, 60);
diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c
index d2a1f9902..ab3e8531f 100644
--- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c
+++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c
@@ -230,7 +230,7 @@ void func_80AD7254(EnKame* this, GlobalContext* globalCtx) {
Math_ScaledStepToS(&this->actor.shape.rot.y, this->unk_2A4, 0x100);
this->actor.world.rot.y = this->actor.shape.rot.y;
} else if (Actor_XZDistanceToPoint(&this->actor, &this->actor.home.pos) > 40.0f) {
- this->unk_2A4 = Actor_YawToPoint(&this->actor, &this->actor.home.pos) + (Rand_Next() >> 0x14);
+ this->unk_2A4 = Actor_YawToPoint(&this->actor, &this->actor.home.pos) + ((s32)Rand_Next() >> 0x14);
}
this->unk_29E--;
diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
index 3fba931ee..5437fa5a4 100644
--- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
+++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c
@@ -600,8 +600,8 @@ void func_80B274BC(EnKendoJs* this, GlobalContext* globalCtx) {
}
play_sound(NA_SE_SY_FOUND);
- func_80B279F0(this, globalCtx, ((Rand_Next() & 0xFF) % 3) + 1);
- func_80B279F0(this, globalCtx, ((Rand_Next() & 0xFF) % 3) + 4);
+ func_80B279F0(this, globalCtx, (((s32)Rand_Next() & 0xFF) % 3) + 1);
+ func_80B279F0(this, globalCtx, (((s32)Rand_Next() & 0xFF) % 3) + 4);
this->unk_290 = 0;
this->unk_284++;
} else if (this->unk_290 == 120) {
@@ -741,7 +741,7 @@ void EnKendoJs_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
SkelAnime_Update(&this->skelAnime);
- func_800E9250(globalCtx, &this->actor, &this->unk_278, &this->unk_27E, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_278, &this->unk_27E, this->actor.focus.pos);
func_80B279AC(this, globalCtx);
func_80B27880(this, globalCtx);
}
diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
index f99db2397..9301df8ad 100644
--- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
+++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
@@ -1090,7 +1090,7 @@ void EnKgy_Update(Actor* thisx, GlobalContext* globalCtx) {
sp30.z = 0;
sp30.y = 0;
sp30.x = 0;
- func_800E9250(globalCtx, &this->actor, &this->unk_2CC, &sp30, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_2CC, &sp30, this->actor.focus.pos);
} else {
Math_SmoothStepToS(&this->unk_2CC.x, 0, 6, 6200, 100);
Math_SmoothStepToS(&this->unk_2CC.y, 0, 6, 6200, 100);
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
index 1767f3c86..fb20fcd67 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
@@ -381,7 +381,7 @@ void EnKusa_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if (this->actor.shape.rot.y == 0) {
- this->actor.shape.rot.y = ((u32)Rand_Next() >> 0x10);
+ this->actor.shape.rot.y = (Rand_Next() >> 0x10);
this->actor.home.rot.y = this->actor.shape.rot.y;
this->actor.world.rot.y = this->actor.shape.rot.y;
}
@@ -401,11 +401,11 @@ void EnKusa_Init(Actor* thisx, GlobalContext* globalCtx) {
EnKusa_SetupWaitObject(this);
if (D_809366B4) {
- D_80936CD8 = ((u32)Rand_Next() >> 0x10);
- D_80936CDA = ((u32)Rand_Next() >> 0x10);
- D_80936CDC = ((u32)Rand_Next() >> 0x10);
- D_80936CDE = ((u32)Rand_Next() >> 0x10);
- D_80936CE0 = ((u32)Rand_Next() >> 0x10);
+ D_80936CD8 = Rand_Next() >> 0x10;
+ D_80936CDA = Rand_Next() >> 0x10;
+ D_80936CDC = Rand_Next() >> 0x10;
+ D_80936CDE = Rand_Next() >> 0x10;
+ D_80936CE0 = Rand_Next() >> 0x10;
D_809366B4 = false;
EnKusa_Sway();
kusaGameplayFrames = globalCtx->gameplayFrames;
diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
index 6ba532cef..8852319df 100644
--- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
+++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
@@ -102,7 +102,7 @@ void func_80A5B160(EnKusa2* this, GlobalContext* globalCtx) {
ptr = this->unk_194;
actor = (EnKusa2*)Actor_SpawnAsChildAndCutscene(
&globalCtx->actorCtx, globalCtx, ACTOR_EN_KUSA2, this->actor.world.pos.x, this->actor.world.pos.y,
- this->actor.world.pos.z, 0, (u32)Rand_Next() >> 0x10, 0, 1, this->actor.cutscene, this->actor.unk20, NULL);
+ this->actor.world.pos.z, 0, Rand_Next() >> 0x10, 0, 1, this->actor.cutscene, this->actor.unk20, NULL);
*ptr = actor;
if (*ptr != NULL) {
@@ -117,8 +117,8 @@ void func_80A5B160(EnKusa2* this, GlobalContext* globalCtx) {
ptr = &this->unk_194[i];
actor = (EnKusa2*)Actor_SpawnAsChildAndCutscene(
&globalCtx->actorCtx, globalCtx, ACTOR_EN_KUSA2, (Math_SinS(temp_s1) * 80.0f) + this->actor.world.pos.x,
- this->actor.world.pos.y, (Math_CosS(temp_s1) * 80.0f) + this->actor.world.pos.z, 0,
- (u32)Rand_Next() >> 0x10, 0, 1, this->actor.cutscene, this->actor.unk20, NULL);
+ this->actor.world.pos.y, (Math_CosS(temp_s1) * 80.0f) + this->actor.world.pos.z, 0, Rand_Next() >> 0x10,
+ 0, 1, this->actor.cutscene, this->actor.unk20, NULL);
*ptr = actor;
if (*ptr != NULL) {
(*ptr)->actor.room = this->actor.room;
@@ -741,7 +741,7 @@ void func_80A5CD0C(EnKusa2* this) {
s32 pad;
for (i = 0; i < 2; i++) {
- temp_s0 = (u32)Rand_Next() & 0xFFFF;
+ temp_s0 = Rand_Next() & 0xFFFF;
temp_f20 = Rand_ZeroOne() * 30.0f;
spA8.x = Math_SinS(temp_s0) * temp_f20;
@@ -756,13 +756,13 @@ void func_80A5CD0C(EnKusa2* this) {
spA8.y += this->actor.world.pos.y;
spA8.z += this->actor.world.pos.z;
- sp94.x = (u32)Rand_Next() & 0xFFFF;
- sp94.y = (u32)Rand_Next() & 0xFFFF;
- sp94.z = (u32)Rand_Next() & 0xFFFF;
+ sp94.x = Rand_Next() & 0xFFFF;
+ sp94.y = Rand_Next() & 0xFFFF;
+ sp94.z = Rand_Next() & 0xFFFF;
- sp8C.x = ((u32)Rand_Next() % 0x4000) - 0x1FFF;
- sp8C.y = ((u32)Rand_Next() % 0x2000) - 0xFFF;
- sp8C.z = ((u32)Rand_Next() % 0x4000) - 0x1FFF;
+ sp8C.x = (Rand_Next() % 0x4000) - 0x1FFF;
+ sp8C.y = (Rand_Next() % 0x2000) - 0xFFF;
+ sp8C.z = (Rand_Next() % 0x4000) - 0x1FFF;
func_80A5C2FC(&D_80A5F1C0, (Rand_ZeroOne() * 0.4f) + 0.02f, &spA8, &sp9C, &sp94, &sp8C);
}
@@ -779,7 +779,7 @@ void func_80A5CF44(EnKusa2* this) {
s32 phi_s2;
for (i = 0, phi_s2 = 0; i < 8; i++, phi_s2 += 0x2000) {
- temp_s0 = ((u32)Rand_Next() % 0x2000) + phi_s2;
+ temp_s0 = (Rand_Next() % 0x2000) + phi_s2;
temp_f20 = Rand_ZeroOne() * 30.0f;
spA8.x = Math_SinS(temp_s0) * temp_f20;
@@ -798,9 +798,9 @@ void func_80A5CF44(EnKusa2* this) {
sp94.y = Rand_Next() & 0xFFFF;
sp94.z = Rand_Next() & 0xFFFF;
- sp8C.x = ((u32)Rand_Next() % 0x4000) - 0x1FFF;
- sp8C.y = ((u32)Rand_Next() % 0x2000) - 0xFFF;
- sp8C.z = ((u32)Rand_Next() % 0x4000) - 0x1FFF;
+ sp8C.x = (Rand_Next() % 0x4000) - 0x1FFF;
+ sp8C.y = (Rand_Next() % 0x2000) - 0xFFF;
+ sp8C.z = (Rand_Next() % 0x4000) - 0x1FFF;
func_80A5C2FC(&D_80A5F1C0, (Rand_ZeroOne() * 0.45f) + 0.04f, &spA8, &sp9C, &sp94, &sp8C);
}
@@ -819,7 +819,7 @@ void func_80A5D178(EnKusa2* this) {
s32 pad;
for (i = 0; i < 8; i++) {
- temp_s0 = (u32)Rand_Next();
+ temp_s0 = Rand_Next();
temp_f22 = Math_SinS(temp_s0);
temp_f20 = Math_CosS(temp_s0);
temp_f24 = (Rand_ZeroOne() * 40.0f) + 10.0f;
@@ -836,12 +836,12 @@ void func_80A5D178(EnKusa2* this) {
spB0.y += this->actor.world.pos.y;
spB0.z += this->actor.world.pos.z;
- sp9C.x = (u32)Rand_Next() & 0xFFFF;
- sp9C.y = (u32)Rand_Next() & 0xFFFF;
- sp9C.z = (u32)Rand_Next() & 0xFFFF;
+ sp9C.x = Rand_Next() & 0xFFFF;
+ sp9C.y = Rand_Next() & 0xFFFF;
+ sp9C.z = Rand_Next() & 0xFFFF;
sp94.x = Rand_S16Offset(-12000, 24000);
- sp94.y = ((u32)Rand_Next() % 0x4000) - 0x1FFF;
+ sp94.y = (Rand_Next() % 0x4000) - 0x1FFF;
sp94.z = Rand_S16Offset(-12000, 24000);
func_80A5C2FC(&D_80A5F1C0, (Rand_ZeroOne() * 0.38f) + 0.02f, &spB0, &spA4, &sp9C, &sp94);
}
@@ -868,11 +868,11 @@ void EnKusa2_Init(Actor* thisx, GlobalContext* globalCtx) {
D_80A5EAEC = 0;
D_80A60900 = globalCtx->gameplayFrames;
func_80A5CAD4(&D_80A5F1C0);
- D_80A60B08 = (u32)Rand_Next() >> 0x10;
- D_80A60B0A = (u32)Rand_Next() >> 0x10;
- D_80A60B0C = (u32)Rand_Next() >> 0x10;
- D_80A60B0E = (u32)Rand_Next() >> 0x10;
- D_80A60B10 = (u32)Rand_Next() >> 0x10;
+ D_80A60B08 = Rand_Next() >> 0x10;
+ D_80A60B0A = Rand_Next() >> 0x10;
+ D_80A60B0C = Rand_Next() >> 0x10;
+ D_80A60B0E = Rand_Next() >> 0x10;
+ D_80A60B10 = Rand_Next() >> 0x10;
func_80A5B508();
}
func_80A5D5E0(this);
@@ -1048,14 +1048,14 @@ void func_80A5D9C8(EnKusa2* this, GlobalContext* globalCtx) {
sp30.y = this->actor.world.pos.y + 20.0f;
sp30.z = this->actor.world.pos.z;
- if ((u32)Rand_Next() < 0xFFFFFFF) {
+ if (Rand_Next() < 0xFFFFFFF) {
func_80A5CD0C(this);
}
this->unk_1D0--;
if (this->unk_1D0 <= 0) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KUSAMUSHI_VIBE);
- this->unk_1D0 = ((u32)Rand_Next() >> 0x1D) + 14;
+ this->unk_1D0 = (Rand_Next() >> 0x1D) + 14;
}
this->actor.floorHeight =
@@ -1152,7 +1152,7 @@ void func_80A5DEB4(EnKusa2* this, GlobalContext* globalCtx) {
func_80A5BF38(this, 4);
func_80A5BF84(this, globalCtx);
- if ((u32)Rand_Next() < 0xFFFFFFF) {
+ if (Rand_Next() < 0xFFFFFFF) {
func_80A5CD0C(this);
}
diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c
index 621b4fc27..fb899217d 100644
--- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c
+++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c
@@ -235,9 +235,9 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) {
if (gSaveContext.fileNum != 0xFEDC) {
if (this->state == MAG_STATE_INITIAL) {
- if (CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_START) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_B)) {
+ if (CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_START) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_B)) {
if (!EnvFlags_Get(globalCtx, 4)) {
play_sound(NA_SE_SY_PIECE_OF_HEART);
@@ -378,9 +378,9 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) {
EnMag_UpdateDisplayEffectColors(&this->actor);
if (sInputDelayTimer == 0) {
- if (CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_START) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_B)) {
+ if (CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_START) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_B)) {
if (globalCtx->transitionTrigger != 0x14) {
Audio_SetCutsceneFlag(false);
D_801BB12C++;
@@ -427,9 +427,9 @@ void EnMag_Update(Actor* thisx, GlobalContext* globalCtx) {
// Appear fully immediately if called during fade-in states.
if ((this->state > MAG_STATE_INITIAL) && (this->state < MAG_STATE_CALLED)) {
- if (CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_START) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_B)) {
+ if (CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_START) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_B)) {
play_sound(NA_SE_SY_PIECE_OF_HEART);
this->state = MAG_STATE_CALLED;
}
diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c
index 4efc18714..2ffb3d0ba 100644
--- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c
+++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c
@@ -185,18 +185,18 @@ void EnMinislime_AddIceShardEffect(EnMinislime* this) {
for (; i < i_end; i++) {
iceShardEffect = &bigslime->iceShardEffect[i];
vecSph.pitch = Rand_S16Offset(0x1000, 0x3000);
- iceShardEffect->vel.x = Math_CosS(vecSph.pitch) * Math_SinS(vecSph.yaw);
- iceShardEffect->vel.y = Math_SinS(vecSph.pitch);
- iceShardEffect->vel.z = Math_CosS(vecSph.pitch) * Math_CosS(vecSph.yaw);
- iceShardEffect->pos.x = this->actor.world.pos.x + (400.0f * this->actor.scale.x) * iceShardEffect->vel.x;
+ iceShardEffect->velocity.x = Math_CosS(vecSph.pitch) * Math_SinS(vecSph.yaw);
+ iceShardEffect->velocity.y = Math_SinS(vecSph.pitch);
+ iceShardEffect->velocity.z = Math_CosS(vecSph.pitch) * Math_CosS(vecSph.yaw);
+ iceShardEffect->pos.x = this->actor.world.pos.x + (400.0f * this->actor.scale.x) * iceShardEffect->velocity.x;
iceShardEffect->pos.y =
- this->actor.world.pos.y + (((iceShardEffect->vel.y * 2.0f) - 1.0f) * 400.0f * this->actor.scale.y);
- iceShardEffect->pos.z = this->actor.world.pos.z + (400.0f * this->actor.scale.z) * iceShardEffect->vel.z;
- iceShardEffect->rotation.x = Rand_Next() >> 0x10;
- iceShardEffect->rotation.y = Rand_Next() >> 0x10;
- iceShardEffect->rotation.z = Rand_Next() >> 0x10;
- iceShardEffect->isActive = true;
- Math_Vec3f_ScaleAndStore(&iceShardEffect->vel, Rand_ZeroFloat(3.0f) + 7.0f, &iceShardEffect->vel);
+ this->actor.world.pos.y + (((iceShardEffect->velocity.y * 2.0f) - 1.0f) * 400.0f * this->actor.scale.y);
+ iceShardEffect->pos.z = this->actor.world.pos.z + (400.0f * this->actor.scale.z) * iceShardEffect->velocity.z;
+ iceShardEffect->rot.x = (s32)Rand_Next() >> 0x10;
+ iceShardEffect->rot.y = (s32)Rand_Next() >> 0x10;
+ iceShardEffect->rot.z = (s32)Rand_Next() >> 0x10;
+ iceShardEffect->isEnabled = true;
+ Math_Vec3f_ScaleAndStore(&iceShardEffect->velocity, Rand_ZeroFloat(3.0f) + 7.0f, &iceShardEffect->velocity);
iceShardEffect->scale = (Rand_ZeroFloat(6.0f) + 2.0f) * 0.001f;
vecSph.yaw += 0x1999;
}
@@ -276,8 +276,8 @@ void EnMinislime_SetupBreakFromBigslime(EnMinislime* this) {
this->actor.gravity = -1.0f;
this->frozenScale = 0.1f;
this->actor.world.rot.x = Rand_S16Offset(0x800, 0x800);
- this->actor.shape.rot.x = (s16)(Rand_Next() >> 0x10);
- this->actor.shape.rot.z = (s16)(Rand_Next() >> 0x10);
+ this->actor.shape.rot.x = (s32)Rand_Next() >> 0x10;
+ this->actor.shape.rot.z = (s32)Rand_Next() >> 0x10;
this->actor.scale.x = 0.15f;
this->actor.scale.y = 0.075f;
this->actor.scale.z = 0.15f;
@@ -437,7 +437,7 @@ void EnMinislime_Idle(EnMinislime* this, GlobalContext* globalCtx) {
if (Actor_XZDistanceToPoint(&this->actor, &this->actor.home.pos) < 200.0f) {
this->actor.world.rot.y = Actor_YawToPoint(&this->actor, &this->actor.home.pos);
} else {
- this->actor.world.rot.y += (s16)(Rand_Next() >> 19);
+ this->actor.world.rot.y += (s16)((s32)Rand_Next() >> 0x13);
}
}
this->idleTimer = 20;
diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c
index b0e468ab2..0071673b4 100644
--- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c
+++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c
@@ -451,7 +451,7 @@ void EnMk_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
if ((this->unk_27A & 1) && !Cutscene_CheckActorAction(globalCtx, 0x7F)) {
- func_800E9250(globalCtx, &this->actor, &this->unk_270, &sp38, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_270, &sp38, this->actor.focus.pos);
} else {
Math_SmoothStepToS(&this->unk_270.x, 0, 6, 0x1838, 0x64);
Math_SmoothStepToS(&this->unk_270.y, 0, 6, 0x1838, 0x64);
diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
index 2103dcdae..eec4dfde8 100644
--- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
+++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
@@ -517,7 +517,7 @@ void EnMm3_Update(Actor* thisx, GlobalContext* globalCtx) {
SkelAnime_Update(&this->skelAnime);
if (this->unk_2B0 & 1) {
- func_800E9250(globalCtx, &this->actor, &this->unk_2A0, &this->unk_2A6, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_2A0, &this->unk_2A6, this->actor.focus.pos);
}
Collider_UpdateCylinder(&this->actor, &this->collider);
diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c
index 4afae5793..e08969c6b 100644
--- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c
+++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c
@@ -618,7 +618,7 @@ void func_80A69ADC(Actor* thisx) {
if (Rand_ZeroOne() < this->unk_358) {
this->unk_366 = (sp44 >= 0.0f) ? 2000 : -2000;
} else {
- this->unk_366 = (Rand_Next() > 0) ? 2000 : -2000;
+ this->unk_366 = ((s32)Rand_Next() > 0) ? 2000 : -2000;
}
this->unk_366 += (s16)(((Rand_ZeroOne() * (1.0f - this->unk_358)) - 0.5f) * 0x400);
} else {
@@ -634,7 +634,7 @@ void func_80A69CE0(Actor* thisx) {
this->unk_360 = Rand_ZeroOne() * 1500.0f;
this->unk_364 = 0;
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
this->unk_366 = 2000;
} else {
this->unk_366 = -2000;
@@ -770,7 +770,7 @@ void EnMushi2_Init(Actor* thisx, GlobalContext* globalCtx) {
if (sp3C != 0) {
func_80A69F5C(&this->actor, globalCtx);
- this->actor.world.rot.y = (u32)Rand_Next() >> 0x10;
+ this->actor.world.rot.y = Rand_Next() >> 0x10;
func_80A6AE14(this);
} else {
func_80A6A300(this);
@@ -1034,7 +1034,7 @@ void func_80A6AE7C(EnMushi2* this, GlobalContext* globalCtx) {
temp_f2 = this->actor.scale.x - (1.0f / 20000.0f);
Actor_SetScale(&this->actor, CLAMP_MIN(temp_f2, 0.001f));
if ((this->actor.flags & ACTOR_FLAG_40) && (this->actor.depthInWater > 5.0f) &&
- (this->actor.depthInWater < 30.0f) && ((Rand_Next() & 0x1FF) < this->unk_368)) {
+ (this->actor.depthInWater < 30.0f) && ((s32)(Rand_Next() & 0x1FF) < this->unk_368)) {
EffectSsBubble_Spawn(globalCtx, &this->actor.world.pos, -5.0f, 5.0f, 5.0f,
((Rand_ZeroOne() * 4.0f) + 2.0f) * this->actor.scale.x);
}
diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c
index 90cd6785f..a214bd72f 100644
--- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c
+++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c
@@ -846,7 +846,7 @@ void EnOsn_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actor.flags &= ~ACTOR_FLAG_1;
}
}
- func_800E9250(globalCtx, &this->actor, &this->unk_1D8, &this->unk_1DE, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_1D8, &this->unk_1DE, this->actor.focus.pos);
}
s32 EnOsn_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx,
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index 169dbbc6e..379e1b7dc 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -199,11 +199,11 @@ s32 EnOssan_TestItemSelected(GlobalContext* globalCtx) {
MessageContext* msgCtx = &globalCtx->msgCtx;
if (msgCtx->unk12020 == 0x10 || msgCtx->unk12020 == 0x11) {
- return CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A);
+ return CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A);
}
- return CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_B) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_CUP);
+ return CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_B) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_CUP);
}
void EnOssan_CheckValidSpawn(EnOssan* this) {
@@ -453,8 +453,8 @@ void EnOssan_BeginInteraction(EnOssan* this, GlobalContext* globalCtx) {
}
void EnOssan_UpdateJoystickInputState(GlobalContext* globalCtx, EnOssan* this) {
- s8 stickX = CONTROLLER1(globalCtx)->rel.stick_x;
- s8 stickY = CONTROLLER1(globalCtx)->rel.stick_y;
+ s8 stickX = CONTROLLER1(&globalCtx->state)->rel.stick_x;
+ s8 stickY = CONTROLLER1(&globalCtx->state)->rel.stick_y;
this->moveHorizontal = this->moveVertical = false;
@@ -574,7 +574,7 @@ void EnOssan_Hello(EnOssan* this, GlobalContext* globalCtx) {
} else if (this->flags & END_INTERACTION) {
this->flags &= ~END_INTERACTION;
EnOssan_EndInteraction(globalCtx, this);
- } else if (!EnOssan_TestEndInteraction(this, globalCtx, CONTROLLER1(globalCtx))) {
+ } else if (!EnOssan_TestEndInteraction(this, globalCtx, CONTROLLER1(&globalCtx->state))) {
EnOssan_StartShopping(globalCtx, this);
} else {
return;
@@ -631,7 +631,7 @@ void EnOssan_FaceShopkeeper(EnOssan* this, GlobalContext* globalCtx) {
} else {
if (talkState == 4) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnOssan_TestEndInteraction(this, globalCtx, CONTROLLER1(globalCtx)) &&
+ if (!EnOssan_TestEndInteraction(this, globalCtx, CONTROLLER1(&globalCtx->state)) &&
(!Message_ShouldAdvance(globalCtx) || !EnOssan_FacingShopkeeperDialogResult(this, globalCtx))) {
if (this->stickAccumX < 0) {
cursorIdx = EnOssan_SetCursorIndexFromNeutral(this, 4);
@@ -854,7 +854,7 @@ void EnOssan_BrowseLeftShelf(EnOssan* this, GlobalContext* globalCtx) {
EnOssan_UpdateCursorPos(globalCtx, this);
if (talkState == 5) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnOssan_HasPlayerSelectedItem(globalCtx, this, CONTROLLER1(globalCtx))) {
+ if (!EnOssan_HasPlayerSelectedItem(globalCtx, this, CONTROLLER1(&globalCtx->state))) {
if (this->moveHorizontal) {
if (this->stickAccumX > 0) {
cursorIdx = EnOssan_CursorRight(this, this->cursorIdx, 4);
@@ -912,7 +912,7 @@ void EnOssan_BrowseRightShelf(EnOssan* this, GlobalContext* globalCtx) {
EnOssan_UpdateCursorPos(globalCtx, this);
if (talkState == 5) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnOssan_HasPlayerSelectedItem(globalCtx, this, CONTROLLER1(globalCtx))) {
+ if (!EnOssan_HasPlayerSelectedItem(globalCtx, this, CONTROLLER1(&globalCtx->state))) {
if (this->moveHorizontal != 0) {
if (this->stickAccumX < 0) {
cursorIdx = EnOssan_CursorRight(this, this->cursorIdx, 0);
@@ -1053,7 +1053,8 @@ void EnOssan_SelectItem(EnOssan* this, GlobalContext* globalCtx) {
if (EnOssan_TakeItemOffShelf(this) && talkState == 4) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnOssan_TestCancelOption(this, globalCtx, CONTROLLER1(globalCtx)) && Message_ShouldAdvance(globalCtx)) {
+ if (!EnOssan_TestCancelOption(this, globalCtx, CONTROLLER1(&globalCtx->state)) &&
+ Message_ShouldAdvance(globalCtx)) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
EnOssan_HandleCanBuyItem(globalCtx, this);
@@ -1124,7 +1125,7 @@ void EnOssan_ContinueShopping(EnOssan* this, GlobalContext* globalCtx) {
EnOssan_ResetItemPosition(this);
item = this->items[this->cursorIdx];
item->restockFunc(globalCtx, item);
- if (!EnOssan_TestEndInteraction(this, globalCtx, CONTROLLER1(globalCtx))) {
+ if (!EnOssan_TestEndInteraction(this, globalCtx, CONTROLLER1(&globalCtx->state))) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
func_8019F208();
@@ -1553,7 +1554,7 @@ void EnOssan_Update(Actor* thisx, GlobalContext* globalCtx) {
EnOssan_UpdateItemSelectedProperty(this);
EnOssan_UpdateStickDirectionPromptAnim(this);
EnOssan_UpdateCursorAnim(this);
- func_800E9250(globalCtx, &this->actor, &this->headRot, &this->unk2CC, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->headRot, &this->unk2CC, this->actor.focus.pos);
this->actionFunc(this, globalCtx);
Actor_SetFocus(&this->actor, 90.0f);
SkelAnime_Update(&this->skelAnime);
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
index 58c638d8e..00ed6814a 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
+++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h
@@ -6,7 +6,8 @@
#include "objects/object_ani/object_ani.h"
#include "objects/object_fsn/object_fsn.h"
-#define ENOSSAN_LIMB_MAX MAX(FSN_LIMB_MAX + 1, ANI_LIMB_MAX)
+// Note: adding 1 to FSN_LIMB_MAX due to bug in object_fsn, see bug in object_fsn.xml
+#define ENOSSAN_LIMB_MAX MAX((s32)FSN_LIMB_MAX + 1, (s32)ANI_LIMB_MAX)
struct EnOssan;
diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
index c0db6f3ec..fb59a00c3 100644
--- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
+++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
@@ -511,9 +511,9 @@ void func_80BD94E0(EnPamera* this, GlobalContext* globalCtx) {
if ((this->actionFunc != func_80BD8B70) && (this->actionFunc != func_80BD8964) &&
(this->actionFunc != func_80BD909C) && (this->actionFunc != func_80BD8D1C) &&
((this->actionFunc != func_80BD8DB0) || (this->actor.speedXZ == 3.0f))) {
- func_800E9250(globalCtx, &this->actor, &this->limb9Rot, &this->limb8Rot, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->limb9Rot, &this->limb8Rot, this->actor.focus.pos);
} else {
- func_800E8F08(&this->limb9Rot, &this->limb8Rot);
+ Actor_TrackNone(&this->limb9Rot, &this->limb8Rot);
}
}
@@ -856,7 +856,7 @@ void func_80BDA344(Actor* thisx, GlobalContext* globalCtx) {
if (!(gSaveContext.save.weekEventReg[61] & 4)) {
gSaveContext.save.weekEventReg[61] |= 4;
}
- func_800E8F08(&this->limb9Rot, &this->limb8Rot);
+ Actor_TrackNone(&this->limb9Rot, &this->limb8Rot);
} else {
func_80BD94E0(this, globalCtx);
if (this->actionFunc == func_80BD994C) {
diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
index 708bae3ef..4f65a541c 100644
--- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
+++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
@@ -249,7 +249,7 @@ void func_80897258(GlobalContext* globalCtx, EnPeehat* this, Vec3f* arg2, f32 ar
static Vec3f D_80899558 = { 0.0f, 8.0f, 0.0f };
static Vec3f D_80899564 = { 0.0f, -1.5f, 0.0f };
Vec3f sp44;
- s16 sp42 = Rand_Next() >> 0x10;
+ s16 sp42 = (s32)Rand_Next() >> 0x10;
s32 temp_v1;
sp44.y = this->actor.floorHeight;
diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c
index bc41461d9..43fb03da4 100644
--- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c
+++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c
@@ -1207,17 +1207,17 @@ s32 func_80AF8ED4(EnPm* this, GlobalContext* globalCtx, ScheduleResult* arg2, u8
s32 pad;
s32 ret = false;
- this->unk_234 = NULL;
+ this->timePath = NULL;
sp2C = func_80AF7CB0(this, globalCtx, actorCat, actorId);
if (D_80AFB430[arg2->result] >= 0) {
- this->unk_234 = SubS_GetAdditionalPath(globalCtx, sp4F, D_80AFB430[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp4F, D_80AFB430[arg2->result]);
}
if ((sp2C != NULL) && (sp2C->update != NULL)) {
- if (this->unk_234 != NULL) {
- sp48 = Lib_SegmentedToVirtual(this->unk_234->points);
- Math_Vec3s_ToVec3f(&sp3C, &sp48[this->unk_234->count - 2]);
- Math_Vec3s_ToVec3f(&sp30, &sp48[this->unk_234->count - 1]);
+ if (this->timePath != NULL) {
+ sp48 = Lib_SegmentedToVirtual(this->timePath->points);
+ Math_Vec3s_ToVec3f(&sp3C, &sp48[this->timePath->count - 2]);
+ Math_Vec3s_ToVec3f(&sp30, &sp48[this->timePath->count - 1]);
this->actor.shape.shadowDraw = NULL;
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp3C, &sp30);
Math_Vec3f_Copy(&this->actor.world.pos, &sp30);
@@ -1238,15 +1238,15 @@ s32 func_80AF9008(EnPm* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
s16 temp;
s32 ret = false;
- this->unk_234 = NULL;
+ this->timePath = NULL;
door = func_80AF7D60(globalCtx, arg2->result);
if (D_80AFB430[arg2->result] >= 0) {
- this->unk_234 = SubS_GetAdditionalPath(globalCtx, sp55, D_80AFB430[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp55, D_80AFB430[arg2->result]);
}
if ((door != NULL) && (door->dyna.actor.update != NULL)) {
- if (this->unk_234 != 0) {
- sp4C = Lib_SegmentedToVirtual(this->unk_234->points);
+ if (this->timePath != 0) {
+ sp4C = Lib_SegmentedToVirtual(this->timePath->points);
Math_Vec3s_ToVec3f(&sp40, &sp4C[0]);
Math_Vec3s_ToVec3f(&sp34, &sp4C[1]);
Math_Vec3f_Copy(&this->unk_26C, &sp40);
@@ -1283,33 +1283,34 @@ s32 func_80AF91E8(EnPm* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
s32 pad;
s32 ret = false;
- this->unk_234 = NULL;
+ this->timePath = NULL;
if (D_80AFB430[arg2->result] >= 0) {
- this->unk_234 = SubS_GetAdditionalPath(globalCtx, sp2B, D_80AFB430[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp2B, D_80AFB430[arg2->result]);
}
- if ((this->unk_234 != NULL) && (this->unk_234->count < 3)) {
- this->unk_234 = NULL;
+ if ((this->timePath != NULL) && (this->timePath->count < 3)) {
+ this->timePath = NULL;
}
- if (this->unk_234 != 0) {
- if ((this->unk_258 < 38) && (this->unk_258 != 0) && (this->unk_374 >= 0)) {
+ if (this->timePath != 0) {
+ if ((this->unk_258 < 38) && (this->unk_258 != 0) && (this->timePathTimeSpeed >= 0)) {
phi_v1 = sp2E;
} else {
phi_v1 = arg2->time0;
}
if (arg2->time1 < phi_v1) {
- this->unk_248 = (phi_v1 - arg2->time1) + 0xFFFF;
+ this->timePathTotalTime = (phi_v1 - arg2->time1) + 0xFFFF;
} else {
- this->unk_248 = arg2->time1 - phi_v1;
+ this->timePathTotalTime = arg2->time1 - phi_v1;
}
- this->unk_254 = sp2E - phi_v1;
- phi_v1 = this->unk_234->count - 2;
- this->unk_24C = this->unk_248 / phi_v1;
- this->unk_250 = (this->unk_254 / this->unk_24C) + 2;
+ this->timePathElapsedTime = sp2E - phi_v1;
+ phi_v1 = this->timePath->count - (SUBS_TIME_PATHING_ORDER - 1);
+ this->timePathWaypointTime = this->timePathTotalTime / phi_v1;
+ this->timePathWaypoint =
+ (this->timePathElapsedTime / this->timePathWaypointTime) + (SUBS_TIME_PATHING_ORDER - 1);
this->unk_356 &= ~8;
this->unk_356 &= ~0x10;
if (this->unk_258 == 27) {
@@ -1364,13 +1365,13 @@ s32 func_80AF94AC(EnPm* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
s32 pad;
s32 ret = false;
- this->unk_234 = NULL;
+ this->timePath = NULL;
if (D_80AFB430[arg2->result] >= 0) {
- this->unk_234 = SubS_GetAdditionalPath(globalCtx, sp4F, D_80AFB430[arg2->result]);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp4F, D_80AFB430[arg2->result]);
}
- if ((this->unk_234 != 0) && (this->unk_234->count >= 2)) {
- sp30 = Lib_SegmentedToVirtual(this->unk_234->points);
+ if ((this->timePath != 0) && (this->timePath->count >= 2)) {
+ sp30 = Lib_SegmentedToVirtual(this->timePath->points);
Math_Vec3s_ToVec3f(&sp40, &sp30[0]);
Math_Vec3s_ToVec3f(&sp34, &sp30[1]);
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp40, &sp34);
@@ -1416,16 +1417,16 @@ s32 func_80AF95E8(EnPm* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
return ret;
}
- this->unk_234 = NULL;
+ this->timePath = NULL;
phi_a3 = D_80AFB430[arg2->result];
if (phi_a3 >= 0) {
- this->unk_234 = SubS_GetAdditionalPath(globalCtx, sp4F, phi_a3);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp4F, phi_a3);
}
- if ((this->unk_234 != 0) && (this->unk_234->count >= 2)) {
- sp30 = Lib_SegmentedToVirtual(this->unk_234->points);
- Math_Vec3s_ToVec3f(&sp40, &sp30[this->unk_234->count - 1]);
- Math_Vec3s_ToVec3f(&sp34, &sp30[this->unk_234->count - 2]);
+ if ((this->timePath != 0) && (this->timePath->count >= 2)) {
+ sp30 = Lib_SegmentedToVirtual(this->timePath->points);
+ Math_Vec3s_ToVec3f(&sp40, &sp30[this->timePath->count - 1]);
+ Math_Vec3s_ToVec3f(&sp34, &sp30[this->timePath->count - 2]);
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp34, &sp40);
Math_Vec3s_Copy(&this->actor.shape.rot, &this->actor.world.rot);
Math_Vec3f_Copy(&this->actor.world.pos, &sp40);
@@ -1703,7 +1704,7 @@ s32 func_80AF9D04(EnPm* this, GlobalContext* globalCtx) {
Vec3f* sp28;
f32 temp;
- if (!SubS_InCsMode(globalCtx) && (this->unk_374 != 0)) {
+ if (!SubS_InCsMode(globalCtx) && (this->timePathTimeSpeed != 0)) {
if ((door != NULL) && (door->dyna.actor.update != NULL)) {
if (((f32)this->unk_36E / this->unk_36C) <= 0.9f) {
door->unk_1A7 = this->unk_260;
@@ -1717,7 +1718,7 @@ s32 func_80AF9D04(EnPm* this, GlobalContext* globalCtx) {
sp38.y = 0.0f;
sp38.z = this->unk_36E * temp;
Lib_Vec3f_TranslateAndRotateY(&this->unk_26C, this->actor.world.rot.y, &sp38, &this->actor.world.pos);
- this->unk_36E += this->unk_374;
+ this->unk_36E += this->timePathTimeSpeed;
if (Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 8.0f)) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_POSTMAN_WALK);
}
@@ -1726,52 +1727,54 @@ s32 func_80AF9D04(EnPm* this, GlobalContext* globalCtx) {
}
s32 func_80AF9E7C(EnPm* this, GlobalContext* globalCtx) {
- f32 sp7C[265];
+ f32 knots[265];
Vec3f sp70;
Vec3f sp64;
- Vec3f sp58;
+ Vec3f timePathTargetPos;
s32 sp54;
s32 sp50;
sp50 = 0;
sp54 = 0;
- func_8013AF00(sp7C, 3, this->unk_234->count + 3);
+ SubS_TimePathing_FillKnots(knots, SUBS_TIME_PATHING_ORDER, this->timePath->count + SUBS_TIME_PATHING_ORDER);
if (!(this->unk_356 & 8)) {
- sp58 = gZeroVec3f;
- func_8013B6B0(this->unk_234, &this->unk_244, &this->unk_254, this->unk_24C, this->unk_248, &this->unk_250, sp7C,
- &sp58, this->unk_374);
- func_8013B878(globalCtx, this->unk_234, this->unk_250, &sp58);
- this->actor.world.pos.y = sp58.y;
+ timePathTargetPos = gZeroVec3f;
+ SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &timePathTargetPos, this->timePathTimeSpeed);
+ SubS_TimePathing_ComputeInitialY(globalCtx, this->timePath, this->timePathWaypoint, &timePathTargetPos);
+ this->actor.world.pos.y = timePathTargetPos.y;
this->unk_356 |= 8;
} else {
- sp58 = this->unk_238;
+ timePathTargetPos = this->timePathTargetPos;
}
- this->actor.world.pos.x = sp58.x;
- this->actor.world.pos.z = sp58.z;
+ this->actor.world.pos.x = timePathTargetPos.x;
+ this->actor.world.pos.z = timePathTargetPos.z;
if (SubS_InCsMode(globalCtx)) {
- sp54 = this->unk_254;
- sp50 = this->unk_250;
- sp58 = this->actor.world.pos;
+ sp54 = this->timePathElapsedTime;
+ sp50 = this->timePathWaypoint;
+ timePathTargetPos = this->actor.world.pos;
}
- this->unk_238 = gZeroVec3f;
+ this->timePathTargetPos = gZeroVec3f;
- if (func_8013B6B0(this->unk_234, &this->unk_244, &this->unk_254, this->unk_24C, this->unk_248, &this->unk_250, sp7C,
- &this->unk_238, this->unk_374)) {
+ if (SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &this->timePathTargetPos, this->timePathTimeSpeed)) {
this->unk_356 |= 0x10;
} else {
sp70 = this->actor.world.pos;
- sp64 = this->unk_238;
+ sp64 = this->timePathTargetPos;
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp70, &sp64);
}
if (SubS_InCsMode(globalCtx)) {
- this->unk_254 = sp54;
- this->unk_250 = sp50;
- this->unk_238 = sp58;
+ this->timePathElapsedTime = sp54;
+ this->timePathWaypoint = sp50;
+ this->timePathTargetPos = timePathTargetPos;
} else if ((this->unk_258 != 91) &&
(Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 8.0f))) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_POSTMAN_WALK);
@@ -1989,7 +1992,7 @@ void func_80AFA4D0(EnPm* this, GlobalContext* globalCtx) {
u16 sp3C = 0;
ScheduleResult sp2C;
- this->unk_374 = REG(15) + ((void)0, gSaveContext.save.daySpeed);
+ this->timePathTimeSpeed = REG(15) + ((void)0, gSaveContext.save.daySpeed);
if (this->unk_38C != 0) {
time = gSaveContext.save.time - D_801F4E78;
sp3C = gSaveContext.save.time;
diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.h b/src/overlays/actors/ovl_En_Pm/z_en_pm.h
index 6d545373b..7a8c2be77 100644
--- a/src/overlays/actors/ovl_En_Pm/z_en_pm.h
+++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.h
@@ -16,13 +16,13 @@ typedef struct EnPm {
/* 0x018C */ EnPmFunc2 unk_18C;
/* 0x0190 */ ColliderCylinder colliderCylinder;
/* 0x01DC */ ColliderSphere colliderSphere;
- /* 0x0234 */ Path* unk_234;
- /* 0x0238 */ Vec3f unk_238;
- /* 0x0244 */ f32 unk_244;
- /* 0x0248 */ s32 unk_248;
- /* 0x024C */ s32 unk_24C;
- /* 0x0250 */ s32 unk_250;
- /* 0x0254 */ s32 unk_254;
+ /* 0x0234 */ Path* timePath;
+ /* 0x0238 */ Vec3f timePathTargetPos;
+ /* 0x0244 */ f32 timePathProgress;
+ /* 0x0248 */ s32 timePathTotalTime;
+ /* 0x024C */ s32 timePathWaypointTime;
+ /* 0x0250 */ s32 timePathWaypoint;
+ /* 0x0254 */ s32 timePathElapsedTime;
/* 0x0258 */ u8 unk_258;
/* 0x025C */ UNK_TYPE* unk_25C;
/* 0x0260 */ s8 unk_260;
@@ -44,7 +44,7 @@ typedef struct EnPm {
/* 0x036E */ s16 unk_36E;
/* 0x0370 */ s16 unk_370;
/* 0x0372 */ s16 unk_372;
- /* 0x0374 */ s16 unk_374;
+ /* 0x0374 */ s16 timePathTimeSpeed;
/* 0x0376 */ s16 unk_376;
/* 0x0378 */ s16 unk_378;
/* 0x037C */ EnPmFunc unk_37C;
diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c
index fb3b1070e..225feec70 100644
--- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c
+++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c
@@ -30,9 +30,9 @@ void EnRaf_SetupDissolve(EnRaf* this);
void EnRaf_Dissolve(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_SetupDormant(EnRaf* this);
void EnRaf_Dormant(EnRaf* this, GlobalContext* globalCtx);
-void EnRaf_InitializeParticle(EnRaf* this, Vec3f* position, Vec3f* velocity, Vec3f* acceleration, f32 scale, s16 timer);
-void EnRaf_UpdateParticles(EnRaf* this, GlobalContext* globalCtx);
-void EnRaf_DrawParticles(EnRaf* this, GlobalContext* globalCtx);
+void EnRaf_InitializeEffect(EnRaf* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale, s16 timer);
+void EnRaf_UpdateEffects(EnRaf* this, GlobalContext* globalCtx);
+void EnRaf_DrawEffects(EnRaf* this, GlobalContext* globalCtx);
typedef enum {
/* 0 */ EN_RAF_ANIMATION_IDLE,
@@ -494,11 +494,11 @@ void EnRaf_Throw(EnRaf* this, GlobalContext* globalCtx) {
}
/**
- * Creates an explosion effect/sound and spawns particles.
+ * Creates an explosion effect/sound and spawns effects.
*/
void EnRaf_Explode(EnRaf* this, GlobalContext* globalCtx) {
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
- Vec3f acceleration = { 0.0f, 0.0f, 0.0f };
+ Vec3f accel = { 0.0f, 0.0f, 0.0f };
Vec3f explosionPos;
s32 i;
s32 pad;
@@ -516,14 +516,14 @@ void EnRaf_Explode(EnRaf* this, GlobalContext* globalCtx) {
this->petalScaleType = EN_RAF_PETAL_SCALE_TYPE_DEAD;
for (i = 0; i < BREG(57) + 30; i++) {
- acceleration.x = (Rand_ZeroOne() - 0.5f) * 0.5f;
- acceleration.y = -0.3f;
- acceleration.z = (Rand_ZeroOne() - 0.5f) * 0.5f;
+ accel.x = (Rand_ZeroOne() - 0.5f) * 0.5f;
+ accel.y = -0.3f;
+ accel.z = (Rand_ZeroOne() - 0.5f) * 0.5f;
velocity.x = Rand_ZeroOne() - 0.5f;
velocity.y = Rand_ZeroOne() * 10.0f;
velocity.z = Rand_ZeroOne() - 0.5f;
- EnRaf_InitializeParticle(this, &this->dyna.actor.world.pos, &velocity, &acceleration,
- (Rand_ZeroFloat(1.0f) / 500.0f) + 0.002f, 90);
+ EnRaf_InitializeEffect(this, &this->dyna.actor.world.pos, &velocity, &accel,
+ (Rand_ZeroFloat(1.0f) / 500.0f) + 0.002f, 90);
}
for (i = CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_LOWER_SEGMENT; i <= CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT; i++) {
@@ -742,7 +742,7 @@ void EnRaf_Update(Actor* thisx, GlobalContext* globalCtx) {
Math_ApproachZeroF(&this->heightDiffFromPlayer, 0.3f, 2.0f);
if (this->action == EN_RAF_ACTION_EXPLODE) {
- EnRaf_UpdateParticles(this, globalCtx);
+ EnRaf_UpdateEffects(this, globalCtx);
}
for (i = 0; i < ARRAY_COUNT(this->limbScale); i++) {
@@ -875,84 +875,83 @@ void EnRaf_Draw(Actor* thisx, GlobalContext* globalCtx) {
this->skelAnime.dListCount, NULL, NULL, EnRaf_TransformLimbDraw, &this->dyna.actor);
if (this->action == EN_RAF_ACTION_EXPLODE) {
- EnRaf_DrawParticles(this, globalCtx);
+ EnRaf_DrawEffects(this, globalCtx);
}
}
-void EnRaf_InitializeParticle(EnRaf* this, Vec3f* position, Vec3f* velocity, Vec3f* acceleration, f32 scale,
- s16 timer) {
+void EnRaf_InitializeEffect(EnRaf* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale, s16 timer) {
s16 i;
- EnRafParticle* particle = this->particles;
+ EnRafEffect* effect = this->effects;
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
- if (!particle->isVisible) {
- particle->isVisible = true;
- particle->position = *position;
- particle->velocity = *velocity;
- particle->acceleration = *acceleration;
- particle->scale = scale;
- particle->timer = timer;
- particle->rotation.x = randPlusMinusPoint5Scaled(30000.0f);
- particle->rotation.y = randPlusMinusPoint5Scaled(30000.0f);
- particle->rotation.z = randPlusMinusPoint5Scaled(30000.0f);
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
+ if (!effect->isEnabled) {
+ effect->isEnabled = true;
+ effect->pos = *pos;
+ effect->velocity = *velocity;
+ effect->accel = *accel;
+ effect->scale = scale;
+ effect->timer = timer;
+ effect->rotation.x = randPlusMinusPoint5Scaled(30000.0f);
+ effect->rotation.y = randPlusMinusPoint5Scaled(30000.0f);
+ effect->rotation.z = randPlusMinusPoint5Scaled(30000.0f);
return;
}
}
}
-void EnRaf_UpdateParticles(EnRaf* this, GlobalContext* globalCtx) {
+void EnRaf_UpdateEffects(EnRaf* this, GlobalContext* globalCtx) {
s32 i;
- EnRafParticle* particle = this->particles;
+ EnRafEffect* effect = this->effects;
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
- if (particle->isVisible) {
- particle->position.x += particle->velocity.x;
- particle->position.y += particle->velocity.y;
- particle->position.z += particle->velocity.z;
- particle->rotation.x += 0xBB8;
- particle->rotation.y += 0xBB8;
- particle->rotation.z += 0xBB8;
- particle->velocity.x += particle->acceleration.x;
- particle->velocity.y += particle->acceleration.y;
- particle->velocity.z += particle->acceleration.z;
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
+ if (effect->isEnabled) {
+ effect->pos.x += effect->velocity.x;
+ effect->pos.y += effect->velocity.y;
+ effect->pos.z += effect->velocity.z;
+ effect->rotation.x += 0xBB8;
+ effect->rotation.y += 0xBB8;
+ effect->rotation.z += 0xBB8;
+ effect->velocity.x += effect->accel.x;
+ effect->velocity.y += effect->accel.y;
+ effect->velocity.z += effect->accel.z;
if (this->mainType != EN_RAF_TYPE_NO_WATER_INTERACTIONS) {
- if (particle->position.y < (this->dyna.actor.world.pos.y - 10.0f)) {
- EffectSsGSplash_Spawn(globalCtx, &particle->position, NULL, NULL, 0, particle->scale * 200000.0f);
- SoundSource_PlaySfxAtFixedWorldPos(globalCtx, &particle->position, 50, NA_SE_EV_BOMB_DROP_WATER);
- particle->isVisible = false;
+ if (effect->pos.y < (this->dyna.actor.world.pos.y - 10.0f)) {
+ EffectSsGSplash_Spawn(globalCtx, &effect->pos, NULL, NULL, 0, effect->scale * 200000.0f);
+ SoundSource_PlaySfxAtFixedWorldPos(globalCtx, &effect->pos, 50, NA_SE_EV_BOMB_DROP_WATER);
+ effect->isEnabled = false;
}
- } else if (particle->position.y < (this->dyna.actor.world.pos.y - 10.0f)) {
- Math_ApproachZeroF(&particle->scale, 0.2f, 0.001f);
- if (particle->scale <= 0.0001f) {
- particle->timer = 0;
+ } else if (effect->pos.y < (this->dyna.actor.world.pos.y - 10.0f)) {
+ Math_ApproachZeroF(&effect->scale, 0.2f, 0.001f);
+ if (effect->scale <= 0.0001f) {
+ effect->timer = 0;
}
}
- if (particle->timer != 0) {
- particle->timer--;
+ if (effect->timer != 0) {
+ effect->timer--;
} else {
- particle->isVisible = false;
+ effect->isEnabled = false;
}
}
}
}
-void EnRaf_DrawParticles(EnRaf* this, GlobalContext* globalCtx) {
+void EnRaf_DrawEffects(EnRaf* this, GlobalContext* globalCtx) {
s16 i;
- EnRafParticle* particle = this->particles;
+ EnRafEffect* effect = this->effects;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
- for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
- if (particle->isVisible) {
- Matrix_Translate(particle->position.x, particle->position.y, particle->position.z, MTXMODE_NEW);
- Matrix_Scale(particle->scale, particle->scale, particle->scale, MTXMODE_APPLY);
- Matrix_RotateXS(particle->rotation.x, MTXMODE_APPLY);
- Matrix_RotateYS(particle->rotation.y, MTXMODE_APPLY);
- Matrix_RotateZS(particle->rotation.z, MTXMODE_APPLY);
+ for (i = 0; i < ARRAY_COUNT(this->effects); i++, effect++) {
+ if (effect->isEnabled) {
+ Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
+ Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
+ Matrix_RotateXS(effect->rotation.x, MTXMODE_APPLY);
+ Matrix_RotateYS(effect->rotation.y, MTXMODE_APPLY);
+ Matrix_RotateZS(effect->rotation.z, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gCarnivorousLilyPadParticleDL);
diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.h b/src/overlays/actors/ovl_En_Raf/z_en_raf.h
index f63924402..2fc92fb2b 100644
--- a/src/overlays/actors/ovl_En_Raf/z_en_raf.h
+++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.h
@@ -11,7 +11,7 @@
typedef enum {
/* 0 */ EN_RAF_TYPE_NORMAL,
/* 1 */ EN_RAF_TYPE_DORMANT, // Spawns without trap, so it can't eat bombs/player
- /* 2 */ EN_RAF_TYPE_NO_WATER_INTERACTIONS // Won't produce ripples, and particles won't produce splashes
+ /* 2 */ EN_RAF_TYPE_NO_WATER_INTERACTIONS // Won't produce ripples, and effects won't produce splashes
} EnRafType;
struct EnRaf;
@@ -19,14 +19,16 @@ struct EnRaf;
typedef void (*EnRafActionFunc)(struct EnRaf*, GlobalContext*);
typedef struct {
- /* 0x00 */ u8 isVisible;
- /* 0x04 */ Vec3f position;
+ /* 0x00 */ u8 isEnabled;
+ /* 0x04 */ Vec3f pos;
/* 0x10 */ Vec3f velocity;
- /* 0x1C */ Vec3f acceleration;
+ /* 0x1C */ Vec3f accel;
/* 0x28 */ Vec3s rotation;
/* 0x30 */ f32 scale;
/* 0x34 */ s16 timer;
-} EnRafParticle; // size = 0x38
+} EnRafEffect; // size = 0x38
+
+#define EN_RAF_EFFECT_COUNT 31
typedef struct EnRaf {
/* 0x000 */ DynaPolyActor dyna;
@@ -59,7 +61,7 @@ typedef struct EnRaf {
/* 0x3CC */ s16 petalClearPixelSecondPassIndex;
/* 0x3CE */ s16 teethClearPixelSecondPassIndex;
/* 0x3D0 */ ColliderCylinder collider;
- /* 0x41C */ EnRafParticle particles[31];
+ /* 0x41C */ EnRafEffect effects[EN_RAF_EFFECT_COUNT];
} EnRaf; // size = 0xAE4
extern const ActorInit En_Raf_InitVars;
diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c
index 13ab86f52..94f697601 100644
--- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c
+++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c
@@ -178,7 +178,7 @@ void EnRecepgirl_Update(Actor* thisx, GlobalContext* globalCtx) {
Vec3s sp30;
this->actionFunc(this, globalCtx);
- func_800E9250(globalCtx, &this->actor, &this->headRot, &sp30, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->headRot, &sp30, this->actor.focus.pos);
EnRecepgirl_UpdateEyes(this);
}
diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c
index c5f2954f9..43042ccd0 100644
--- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c
+++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c
@@ -119,8 +119,8 @@ s32 D_80BF57E4[][4] = {
};
AnimationInfoS D_80BF5914[] = {
- { &object_oF1d_map_Anim_012DE0, 2.0f, 0, -1, ANIMMODE_ONCE, 0 },
- { &object_oF1d_map_Anim_012DE0, -2.0f, 0, -1, ANIMMODE_ONCE, 0 },
+ { &gGoronUnrollAnim, 2.0f, 0, -1, ANIMMODE_ONCE, 0 },
+ { &gGoronUnrollAnim, -2.0f, 0, -1, ANIMMODE_ONCE, 0 },
};
TexturePtr D_80BF5934[] = {
@@ -153,8 +153,7 @@ EffectTireMarkInit D_80BF59F0 = {
};
TexturePtr D_80BF59F8[] = {
- object_oF1d_map_Tex_010438, object_oF1d_map_Tex_010C38, object_oF1d_map_Tex_011038,
- object_oF1d_map_Tex_010C38, object_oF1d_map_Tex_010838,
+ gGoronEyeOpenTex, gGoronEyeHalfTex, gGoronEyeClosedTex, gGoronEyeHalfTex, gGoronEyeClosed2Tex,
};
void func_80BF3920(EnRgStruct* ptr, GlobalContext* globalCtx) {
@@ -170,8 +169,8 @@ void func_80BF3920(EnRgStruct* ptr, GlobalContext* globalCtx) {
for (i = 0; i < 32; i++, ptr++) {
if ((ptr->unk_00 >= 4) && (ptr->unk_00 < 7)) {
if (!phi_fp) {
- POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, sizeof(Gfx) * 0);
- gSPDisplayList(POLY_XLU_DISP++, object_oF1d_map_DL_014CF0);
+ POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
+ gSPDisplayList(POLY_XLU_DISP++, gGoronDustMaterialDL);
phi_fp = true;
}
@@ -193,7 +192,7 @@ void func_80BF3920(EnRgStruct* ptr, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
idx = temp_f20 * 7.0f;
gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(D_80BF5934[idx]));
- gSPDisplayList(POLY_XLU_DISP++, object_oF1d_map_DL_014D00);
+ gSPDisplayList(POLY_XLU_DISP++, gGoronDustModelDL);
Matrix_Pop();
}
@@ -728,8 +727,8 @@ void EnRg_Init(Actor* thisx, GlobalContext* globalCtx) {
if (gSaveContext.save.entranceIndex == 0xD010) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_oF1d_map_Skel_011AC8, NULL, this->jointTable,
- this->morphTable, 18);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, NULL, this->jointTable, this->morphTable,
+ GORON_LIMB_MAX);
this->unk_334 = -1;
func_80BF409C(this, 0);
@@ -814,7 +813,7 @@ void func_80BF547C(EnRg* this, GlobalContext* globalCtx) {
Matrix_RotateXS(this->actor.shape.rot.x, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_OPA_DISP++, object_oF1d_map_DL_0091A8);
+ gSPDisplayList(POLY_OPA_DISP++, gGoronRolledUpDL);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c
index 3a29b5081..3681deadd 100644
--- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c
+++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c
@@ -30,7 +30,7 @@ const ActorInit En_Rsn_InitVars = {
(ActorFunc)EnRsn_Draw,
};
-static AnimationInfo sAnimations[] = { { &object_rs_Anim_00788C, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f } };
+static AnimationInfo sAnimations[] = { { &gBombShopkeeperSwayAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f } };
void func_80C25D40(EnRsn* this) {
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 0);
@@ -44,7 +44,7 @@ void EnRsn_Init(Actor* thisx, GlobalContext* globalCtx) {
EnRsn* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rs_Skel_009220, &object_rs_Anim_009120, NULL, NULL, 0);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gBombShopkeeperSkel, &gBombShopkeeperWalkAnim, NULL, NULL, 0);
this->actor.flags &= ~ACTOR_FLAG_1;
func_80C25D40(this);
}
@@ -61,26 +61,24 @@ void EnRsn_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
Actor_MoveWithGravity(&this->actor);
SkelAnime_Update(&this->skelAnime);
- func_800E9250(globalCtx, &this->actor, &this->unk1D8, &this->unk1DE, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk1D8, &this->unk1DE, this->actor.focus.pos);
}
s32 EnRsn_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* thisx) {
EnRsn* this = THIS;
- if (limbIndex == 14) {
+ if (limbIndex == BOMB_SHOPKEEPER_LIMB_RIGHT_HAND) {
Matrix_RotateXS(this->unk1D8.y, MTXMODE_APPLY);
}
return false;
}
-static Vec3f D_80C26028 = { 0.0f, 0.0f, 0.0f };
-
void EnRsn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
EnRsn* this = THIS;
- Vec3f sp18 = D_80C26028;
+ Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
- if (limbIndex == 14) {
- Matrix_MultVec3f(&sp18, &this->actor.focus.pos);
+ if (limbIndex == BOMB_SHOPKEEPER_LIMB_RIGHT_HAND) {
+ Matrix_MultVec3f(&zeroVec, &this->actor.focus.pos);
}
}
@@ -89,7 +87,7 @@ void EnRsn_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C5B0(globalCtx->state.gfxCtx);
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_rs_Tex_005458));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gBombShopkeeperEyeTex));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnRsn_OverrideLimbDraw, EnRsn_PostLimbDraw, &this->actor);
CLOSE_DISPS(globalCtx->state.gfxCtx);
diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h
index b9a607a1c..926bc6d32 100644
--- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h
+++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.h
@@ -9,7 +9,7 @@ typedef void (*EnRsnActionFunc)(struct EnRsn*, GlobalContext*);
typedef struct EnRsn {
/* 0x000 */ Actor actor;
- /* 0x144 */ char unk144[0x4C];
+ /* 0x144 */ UNK_TYPE1 unk144[0x4C];
/* 0x190 */ SkelAnime skelAnime;
/* 0x1D4 */ EnRsnActionFunc actionFunc;
/* 0x1D8 */ Vec3s unk1D8;
diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c
index 357d41ba7..5f0140c17 100644
--- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c
+++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c
@@ -5,6 +5,7 @@
*/
#include "z_en_sc_ruppe.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)
@@ -15,10 +16,13 @@ void EnScRuppe_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnScRuppe_Update(Actor* thisx, GlobalContext* globalCtx);
void EnScRuppe_Draw(Actor* thisx, GlobalContext* globalCtx);
-void func_80BD6A8C(EnScRuppe* this, GlobalContext* globalCtx);
void func_80BD6B18(EnScRuppe* this, GlobalContext* globalCtx);
-#if 0
+typedef struct {
+ /* 0x0 */ TexturePtr tex;
+ /* 0x4 */ s16 amount;
+} RuppeInfo;
+
const ActorInit En_Sc_Ruppe_InitVars = {
ACTOR_EN_SC_RUPPE,
ACTORCAT_NPC,
@@ -31,29 +35,157 @@ const ActorInit En_Sc_Ruppe_InitVars = {
(ActorFunc)EnScRuppe_Draw,
};
-// static ColliderCylinderInit sCylinderInit = {
-static ColliderCylinderInit D_80BD6E40 = {
- { COLTYPE_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_NO_PUSH | OC1_TYPE_PLAYER, OC2_TYPE_2, COLSHAPE_CYLINDER, },
- { ELEMTYPE_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_NONE, OCELEM_ON, },
+RuppeInfo sRupeeInfo[] = {
+ { gameplay_keep_Tex_061FC0, 1 }, // Green rupee
+ { gameplay_keep_Tex_061FE0, 5 }, // Blue rupee
+ { gameplay_keep_Tex_062000, 20 }, // Red rupee
+ { gameplay_keep_Tex_062040, 200 }, // Orange rupee
+ { gameplay_keep_Tex_062020, 50 }, // Purple rupee
+ { gameplay_keep_Tex_062060, 10 }, // (unused)
+};
+
+static ColliderCylinderInit sCylinderInit = {
+ {
+ COLTYPE_NONE,
+ AT_NONE,
+ AC_NONE,
+ OC1_ON | OC1_NO_PUSH | OC1_TYPE_PLAYER,
+ OC2_TYPE_2,
+ COLSHAPE_CYLINDER,
+ },
+ {
+ ELEMTYPE_UNK4,
+ { 0x00000000, 0x00, 0x00 },
+ { 0x00000000, 0x00, 0x00 },
+ TOUCH_NONE | TOUCH_SFX_NORMAL,
+ BUMP_NONE,
+ OCELEM_ON,
+ },
{ 10, 30, 0, { 0, 0, 0 } },
};
-#endif
+void EnScRuppe_UpdateCollision(EnScRuppe* this, GlobalContext* globalCtx) {
+ Collider_UpdateCylinder(&this->actor, &this->collider);
+ CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+ Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 32.0f, 30.0f, 0.0f, 4);
+}
-extern ColliderCylinderInit D_80BD6E40;
+s32 func_80BD697C(s16 ruppeIndex) {
+ switch (ruppeIndex) {
+ case RUPEE_GREEN:
+ if (gSaveContext.save.weekEventReg[53] & 4) {
+ gSaveContext.save.weekEventReg[53] &= (u8)~4;
+ return true;
+ }
+ break;
+ case RUPEE_BLUE:
+ if (gSaveContext.save.weekEventReg[53] & 0x80) {
+ gSaveContext.save.weekEventReg[53] &= (u8)~0x80;
+ return true;
+ }
+ break;
+ case RUPEE_RED:
+ if (gSaveContext.save.weekEventReg[54] & 1) {
+ gSaveContext.save.weekEventReg[54] &= (u8)~1;
+ return true;
+ }
+ break;
+ case RUPEE_ORANGE:
+ if (gSaveContext.save.weekEventReg[54] & 2) {
+ gSaveContext.save.weekEventReg[54] &= (u8)~2;
+ return true;
+ }
+ break;
+ case RUPEE_PURPLE:
+ if (gSaveContext.save.weekEventReg[54] & 4) {
+ gSaveContext.save.weekEventReg[54] &= (u8)~4;
+ return true;
+ }
+ break;
+ case RUPEE_UNUSED:
+ if ((gSaveContext.save.weekEventReg[54] & 8)) {
+ gSaveContext.save.weekEventReg[54] &= (u8)~8;
+ return true;
+ }
+ break;
+ }
+ return false;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/func_80BD6910.s")
+void func_80BD6A8C(EnScRuppe* this, GlobalContext* globalCtx) {
+ if (this->collider.base.ocFlags1 & OC1_HIT) {
+ this->ruppeDisplayTime = 0;
+ this->actor.gravity = 0.0f;
+ Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_GET_RUPY);
+ Rupees_ChangeBy(sRupeeInfo[this->ruppeIndex].amount);
+ this->actionFunc = func_80BD6B18;
+ }
+ this->actor.shape.rot.y += 0x1F4;
+ Actor_MoveWithGravity(&this->actor);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/func_80BD697C.s")
+void func_80BD6B18(EnScRuppe* this, GlobalContext* globalCtx) {
+ Player* player = GET_PLAYER(globalCtx);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/func_80BD6A8C.s")
+ if (this->ruppeDisplayTime > 30) {
+ if (func_80BD697C(this->ruppeIndex)) {
+ Actor_MarkForDeath(&this->actor);
+ }
+ } else {
+ f32 scale;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/func_80BD6B18.s")
+ this->ruppeDisplayTime++;
+ this->actor.world.pos = player->actor.world.pos;
+ this->actor.world.pos.y += 40.0f;
+ scale = (30.0f - this->ruppeDisplayTime) * 0.001f;
+ Actor_SetScale(&this->actor, scale);
+ }
+ this->actor.shape.rot.y += 0x3E8;
+ Actor_MoveWithGravity(&this->actor);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/EnScRuppe_Init.s")
+void EnScRuppe_Init(Actor* thisx, GlobalContext* globalCtx) {
+ EnScRuppe* this = THIS;
+ ColliderCylinder* collider = &this->collider;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/EnScRuppe_Destroy.s")
+ Collider_InitCylinder(globalCtx, collider);
+ Collider_InitAndSetCylinder(globalCtx, collider, &this->actor, &sCylinderInit);
+ Actor_SetScale(&this->actor, 0.03f);
+ ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 10.0f);
+ this->ruppeIndex = SCRUPPE_GET_TYPE(thisx);
+ if ((this->ruppeIndex < RUPEE_GREEN) || (this->ruppeIndex >= RUPEE_UNUSED)) {
+ this->ruppeIndex = RUPEE_GREEN;
+ }
+ this->actor.speedXZ = 0.0f;
+ this->actionFunc = func_80BD6A8C;
+ this->actor.gravity = -0.5f;
+ this->actor.shape.yOffset = 700.0f;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/EnScRuppe_Update.s")
+void EnScRuppe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ EnScRuppe* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/EnScRuppe_Draw.s")
+ Collider_DestroyCylinder(globalCtx, &this->collider);
+}
+
+void EnScRuppe_Update(Actor* thisx, GlobalContext* globalCtx) {
+ EnScRuppe* this = THIS;
+
+ this->actionFunc(this, globalCtx);
+ EnScRuppe_UpdateCollision(this, globalCtx);
+}
+
+void EnScRuppe_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ s32* pad;
+ EnScRuppe* this = THIS;
+
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+
+ func_8012C28C(globalCtx->state.gfxCtx);
+ func_800B8050(&this->actor, globalCtx, 0);
+ gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(sRupeeInfo[this->ruppeIndex].tex));
+ gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0622C0);
+
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h
index ad9aa6915..13140be43 100644
--- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h
+++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.h
@@ -3,17 +3,29 @@
#include "global.h"
+#define SCRUPPE_GET_TYPE(thisx) ((thisx)->params & 0x1F)
+
struct EnScRuppe;
typedef void (*EnScRuppeActionFunc)(struct EnScRuppe*, GlobalContext*);
typedef struct EnScRuppe {
/* 0x0000 */ Actor actor;
- /* 0x0144 */ char unk_144[0x4C];
+ /* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ EnScRuppeActionFunc actionFunc;
- /* 0x0194 */ char unk_194[0x4];
+ /* 0x194 */ s16 ruppeDisplayTime;
+ /* 0x196 */ s16 ruppeIndex;
} EnScRuppe; // size = 0x198
+typedef enum {
+ /* 0 */ RUPEE_GREEN,
+ /* 1 */ RUPEE_BLUE,
+ /* 2 */ RUPEE_RED,
+ /* 3 */ RUPEE_ORANGE,
+ /* 4 */ RUPEE_PURPLE,
+ /* 5 */ RUPEE_UNUSED,
+} RupeeType;
+
extern const ActorInit En_Sc_Ruppe_InitVars;
#endif // Z_EN_SC_RUPPE_H
diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c
index 6d3a118f4..c98c279ce 100644
--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c
@@ -478,7 +478,7 @@ void func_8099556C(EnSkb* this, GlobalContext* globalCtx) {
}
if (Animation_OnFrame(&this->skelAnime, 22.5f)) {
- this->unk_3D4 = (u32)Rand_Next() % 0x7D0;
+ this->unk_3D4 = Rand_Next() % 0x7D0;
}
this->actor.shape.rot.x = Math_SinS(this->unk_3D4 * sp26) * 20000.0f;
diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c
index ef0ad1b57..2b579bf8d 100644
--- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c
+++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c
@@ -319,7 +319,7 @@ void EnSnowman_SpawnBigSnowballFragmentEffects(EnSnowman* this, GlobalContext* g
for (i = 0; i < 15; i++) {
altitude = Rand_S16Offset(0x1800, 0x2800);
- azimuth = ((u32)Rand_Next() >> 0x10);
+ azimuth = Rand_Next() >> 0x10;
speed = Rand_ZeroFloat(3.0f) + 8.0f;
velocity.x = (speed * Math_CosS(altitude)) * Math_SinS(azimuth);
velocity.y = speed * Math_SinS(altitude);
@@ -406,9 +406,9 @@ void EnSnowman_MoveSnowPile(EnSnowman* this, GlobalContext* globalCtx) {
} else if (this->actor.bgCheckFlags & 8) {
this->snowPileTargetRotY = this->actor.wallYaw;
} else if (Actor_XZDistanceToPoint(&this->actor, &this->actor.home.pos) > 200.0f) {
- this->snowPileTargetRotY = Actor_YawToPoint(&this->actor, &this->actor.home.pos) + (Rand_Next() >> 0x14);
+ this->snowPileTargetRotY = Actor_YawToPoint(&this->actor, &this->actor.home.pos) + ((s32)Rand_Next() >> 0x14);
} else if (Rand_ZeroOne() < 0.02f) {
- this->snowPileTargetRotY += (s16)((((u32)Rand_Next() >> 0x13) + 0x1000) * ((Rand_ZeroOne() < 0.5f) ? -1 : 1));
+ this->snowPileTargetRotY += (s16)(((Rand_Next() >> 0x13) + 0x1000) * ((Rand_ZeroOne() < 0.5f) ? -1 : 1));
}
}
@@ -746,7 +746,7 @@ void EnSnowman_Dead(EnSnowman* this, GlobalContext* globalCtx) {
for (i = 0; i < 15; i++) {
altitude = Rand_S16Offset(0x1000, 0x3000);
- azimuth = ((u32)Rand_Next() >> 0x10);
+ azimuth = (Rand_Next() >> 0x10);
speed = Rand_ZeroFloat(2.0f) + 4.0f;
velocity.x = (speed * Math_CosS(altitude)) * Math_SinS(azimuth);
velocity.y = speed * Math_SinS(altitude);
diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
index 61a5d4546..532026a1a 100644
--- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
+++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
@@ -5,11 +5,8 @@
*/
#include "z_en_sob1.h"
-#include "objects/object_rs/object_rs.h"
-#include "objects/object_zo/object_zo.h"
#include "objects/object_mastergolon/object_mastergolon.h"
#include "objects/object_masterzoora/object_masterzoora.h"
-#include "objects/object_oF1d_map/object_oF1d_map.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8 | ACTOR_FLAG_10)
@@ -53,12 +50,18 @@ void EnSob1_Blink(EnSob1* this);
s32 EnSob1_TakeItemOffShelf(EnSob1* this);
s32 EnSob1_ReturnItemToShelf(EnSob1* this);
-s16 EnSob1_GetDistSqAndOrient(Path* path, s32 pointIdx, Vec3f* pos, f32* distSq);
+s16 EnSob1_GetDistSqAndOrient(Path* path, s32 pointIndex, Vec3f* pos, f32* distSq);
+
+typedef enum {
+ /* 0 */ BOMB_SHOPKEEPER_ANIM_WALK,
+ /* 1 */ BOMB_SHOPKEEPER_ANIM_SIT_AT_COUNTER_START,
+ /* 2 */ BOMB_SHOPKEEPER_ANIM_SIT_AT_COUNTER_LOOP
+} BombShopkeeperAnimation;
static AnimationInfoS sAnimationsBombShopkeeper[] = {
- { &object_rs_Anim_009120, 2.0f, 0, -1, ANIMMODE_LOOP, 20 },
- { &object_rs_Anim_008268, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
- { &object_rs_Anim_0087BC, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
+ { &gBombShopkeeperWalkAnim, 2.0f, 0, -1, ANIMMODE_LOOP, 20 },
+ { &gBombShopkeeperSitAtCounterStartAnim, 1.0f, 0, -1, ANIMMODE_ONCE, 0 },
+ { &gBombShopkeeperSitAtCounterLoopAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
};
const ActorInit En_Sob1_InitVars = {
@@ -153,10 +156,10 @@ static Vec3f sPosOffset[] = {
{ 0.0f, -4.0f, 0.0f },
};
-void EnSob1_ChangeAnim(SkelAnime* skelAnime, AnimationInfoS* animations, s32 idx) {
+void EnSob1_ChangeAnim(SkelAnime* skelAnime, AnimationInfoS* animations, s32 index) {
f32 frameCount;
- animations += idx;
+ animations += index;
if (animations->frameCount < 0) {
frameCount = Animation_GetLastFrame(animations->animation);
} else {
@@ -174,11 +177,11 @@ s32 EnSob1_TestItemSelected(GlobalContext* globalCtx) {
MessageContext* msgCtx = &globalCtx->msgCtx;
if (msgCtx->unk12020 == 0x10 || msgCtx->unk12020 == 0x11) {
- return CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A);
+ return CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A);
}
- return CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_B) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_CUP);
+ return CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_B) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_CUP);
}
u16 EnSob1_GetTalkOption(EnSob1* this, GlobalContext* globalCtx) {
@@ -355,20 +358,20 @@ void EnSob1_SpawnShopItems(EnSob1* this, GlobalContext* globalCtx, ShopItem* sho
s32 EnSob1_GetObjIndices(EnSob1* this, GlobalContext* globalCtx, s16* objIds) {
if (objIds[1] != OBJECT_ID_MAX) {
- this->objIndices[1] = Object_GetIndex(&globalCtx->objectCtx, objIds[1]);
- if (this->objIndices[1] < 0) {
+ this->unusedObjIndex = Object_GetIndex(&globalCtx->objectCtx, objIds[1]);
+ if (this->unusedObjIndex < 0) {
return false;
}
} else {
- this->objIndices[1] = -1;
+ this->unusedObjIndex = -1;
}
if (objIds[2] != OBJECT_ID_MAX) {
- this->objIndices[2] = Object_GetIndex(&globalCtx->objectCtx, objIds[2]);
- if (this->objIndices[2] < 0) {
+ this->shopkeeperAnimObjIndex = Object_GetIndex(&globalCtx->objectCtx, objIds[2]);
+ if (this->shopkeeperAnimObjIndex < 0) {
return false;
}
} else {
- this->objIndices[2] = -1;
+ this->shopkeeperAnimObjIndex = -1;
}
return true;
}
@@ -398,8 +401,8 @@ void EnSob1_Init(Actor* thisx, GlobalContext* globalCtx) {
}
objIds = sObjectIds[this->shopType];
- this->objIndices[0] = Object_GetIndex(&globalCtx->objectCtx, objIds[0]);
- if (this->objIndices[0] < 0) {
+ this->mainObjIndex = Object_GetIndex(&globalCtx->objectCtx, objIds[0]);
+ if (this->mainObjIndex < 0) {
Actor_MarkForDeath(&this->actor);
return;
}
@@ -423,7 +426,7 @@ void EnSob1_UpdateCursorPos(GlobalContext* globalCtx, EnSob1* this) {
f32 xOffset = 0.0f;
f32 yOffset = 17.0f;
- Actor_GetScreenPos(globalCtx, &this->items[this->cursorIdx]->actor, &x, &y);
+ Actor_GetScreenPos(globalCtx, &this->items[this->cursorIndex]->actor, &x, &y);
this->cursorPos.x = x + xOffset;
this->cursorPos.y = y + yOffset;
this->cursorPos.z = 1.2f;
@@ -464,7 +467,7 @@ s32 EnSob1_TestEndInteraction(EnSob1* this, GlobalContext* globalCtx, Input* inp
s32 EnSob1_TestCancelOption(EnSob1* this, GlobalContext* globalCtx, Input* input) {
if (CHECK_BTN_ALL(input->press.button, BTN_B)) {
this->actionFunc = this->tmpActionFunc;
- func_80151938(globalCtx, this->items[this->cursorIdx]->actor.textId);
+ func_80151938(globalCtx, this->items[this->cursorIndex]->actor.textId);
return true;
}
return false;
@@ -552,8 +555,8 @@ void EnSob1_Idle(EnSob1* this, GlobalContext* globalCtx) {
}
void EnSob1_UpdateJoystickInputState(GlobalContext* globalCtx, EnSob1* this) {
- s8 stickX = CONTROLLER1(globalCtx)->rel.stick_x;
- s8 stickY = CONTROLLER1(globalCtx)->rel.stick_y;
+ s8 stickX = CONTROLLER1(&globalCtx->state)->rel.stick_x;
+ s8 stickY = CONTROLLER1(&globalCtx->state)->rel.stick_y;
if (this->stickAccumX == 0) {
if (stickX > 30 || stickX < -30) {
@@ -608,7 +611,7 @@ void EnSob1_Hello(EnSob1* this, GlobalContext* globalCtx) {
}
}
if ((talkState == 5) && Message_ShouldAdvance(globalCtx) &&
- !EnSob1_TestEndInteraction(this, globalCtx, CONTROLLER1(globalCtx))) {
+ !EnSob1_TestEndInteraction(this, globalCtx, CONTROLLER1(&globalCtx->state))) {
if (this->welcomeTextId == 0x68A) { // Welcome text when wearing Kafei's mask
EnSob1_EndInteraction(globalCtx, this);
} else {
@@ -638,7 +641,7 @@ s32 EnSob1_FacingShopkeeperDialogResult(EnSob1* this, GlobalContext* globalCtx)
void EnSob1_FaceShopkeeper(EnSob1* this, GlobalContext* globalCtx) {
s32 pad[2];
u8 talkState = Message_GetState(&globalCtx->msgCtx);
- u8 cursorIdx;
+ u8 cursorIndex;
if (this->cutsceneState == ENSOB1_CUTSCENESTATE_WAITING) {
if (ActorCutscene_GetCanPlayNext(this->cutscene)) {
@@ -658,12 +661,12 @@ void EnSob1_FaceShopkeeper(EnSob1* this, GlobalContext* globalCtx) {
} else {
if (talkState == 4) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnSob1_TestEndInteraction(this, globalCtx, CONTROLLER1(globalCtx))) {
+ if (!EnSob1_TestEndInteraction(this, globalCtx, CONTROLLER1(&globalCtx->state))) {
if (!Message_ShouldAdvance(globalCtx) || !EnSob1_FacingShopkeeperDialogResult(this, globalCtx)) {
if (this->stickAccumX > 0) {
- cursorIdx = EnSob1_SetCursorIndexFromNeutral(this, 2);
- if (cursorIdx != CURSOR_INVALID) {
- this->cursorIdx = cursorIdx;
+ cursorIndex = EnSob1_SetCursorIndexFromNeutral(this, 2);
+ if (cursorIndex != CURSOR_INVALID) {
+ this->cursorIndex = cursorIndex;
EnSob1_SetupAction(this, EnSob1_LookToShelf);
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
this->stickRightPrompt.isEnabled = false;
@@ -709,17 +712,17 @@ void EnSob1_EndWalk(EnSob1* this, GlobalContext* globalCtx) {
s32 pad;
f32 distSq;
s16 curFrame = this->skelAnime.curFrame / this->skelAnime.playSpeed;
- s16 animLastFrame = Animation_GetLastFrame(&object_rs_Anim_009120) / (s16)this->skelAnime.playSpeed;
+ s16 animLastFrame = Animation_GetLastFrame(&gBombShopkeeperWalkAnim) / (s16)this->skelAnime.playSpeed;
Math_SmoothStepToS(&this->actor.world.rot.y,
- EnSob1_GetDistSqAndOrient(this->path, this->pathPointsIdx - 1, &this->actor.world.pos, &distSq),
- 4, 1000, 1);
+ EnSob1_GetDistSqAndOrient(this->path, this->waypoint - 1, &this->actor.world.pos, &distSq), 4,
+ 1000, 1);
this->actor.shape.rot.y = this->actor.world.rot.y;
Math_ApproachF(&this->actor.speedXZ, 0.5f, 0.2f, 1.0f);
if (distSq < 12.0f) {
this->actor.speedXZ = 0.0f;
if (animLastFrame == curFrame) {
- EnSob1_ChangeAnim(&this->skelAnime, sAnimationsBombShopkeeper, 1);
+ EnSob1_ChangeAnim(&this->skelAnime, sAnimationsBombShopkeeper, BOMB_SHOPKEEPER_ANIM_SIT_AT_COUNTER_START);
EnSob1_SetupAction(this, EnSob1_SetupIdle);
}
}
@@ -729,8 +732,8 @@ void EnSob1_EndWalk(EnSob1* this, GlobalContext* globalCtx) {
void EnSob1_SetupIdle(EnSob1* this, GlobalContext* globalCtx) {
s16 curFrame = this->skelAnime.curFrame;
- if (Animation_GetLastFrame(&object_rs_Anim_008268) == curFrame) {
- EnSob1_ChangeAnim(&this->skelAnime, sAnimationsBombShopkeeper, 2);
+ if (Animation_GetLastFrame(&gBombShopkeeperSitAtCounterStartAnim) == curFrame) {
+ EnSob1_ChangeAnim(&this->skelAnime, sAnimationsBombShopkeeper, BOMB_SHOPKEEPER_ANIM_SIT_AT_COUNTER_LOOP);
EnSob1_SetupAction(this, EnSob1_Idle);
}
EnSob1_Walking(this, globalCtx);
@@ -750,13 +753,13 @@ void EnSob1_Walk(EnSob1* this, GlobalContext* globalCtx) {
}
if (this->path != NULL) {
Math_SmoothStepToS(&this->actor.world.rot.y,
- EnSob1_GetDistSqAndOrient(this->path, this->pathPointsIdx, &this->actor.world.pos, &distSq),
- 4, 1000, 1);
+ EnSob1_GetDistSqAndOrient(this->path, this->waypoint, &this->actor.world.pos, &distSq), 4,
+ 1000, 1);
this->actor.shape.rot.y = this->actor.world.rot.y;
this->actor.speedXZ = 2.0f;
if (distSq < SQ(5.0f)) {
- this->pathPointsIdx++;
- if ((this->path->count - 1) < this->pathPointsIdx) {
+ this->waypoint++;
+ if ((this->path->count - 1) < this->waypoint) {
this->actor.speedXZ = 0.0f;
EnSob1_SetupAction(this, EnSob1_EndWalk);
}
@@ -842,7 +845,7 @@ void EnSob1_LookToShelf(EnSob1* this, GlobalContext* globalCtx) {
this->cutsceneState = ENSOB1_CUTSCENESTATE_PLAYING;
EnSob1_UpdateCursorPos(globalCtx, this);
EnSob1_SetupAction(this, EnSob1_BrowseShelf);
- func_80151938(globalCtx, this->items[this->cursorIdx]->actor.textId);
+ func_80151938(globalCtx, this->items[this->cursorIndex]->actor.textId);
} else {
ActorCutscene_SetIntentToPlay(this->cutscene);
}
@@ -850,7 +853,7 @@ void EnSob1_LookToShelf(EnSob1* this, GlobalContext* globalCtx) {
}
void EnSob1_CursorLeftRight(GlobalContext* globalCtx, EnSob1* this) {
- u8 curTemp = this->cursorIdx;
+ u8 curTemp = this->cursorIndex;
if (this->stickAccumX < 0) {
if (curTemp != 2) {
@@ -859,20 +862,20 @@ void EnSob1_CursorLeftRight(GlobalContext* globalCtx, EnSob1* this) {
EnSob1_SetupLookToShopkeeperFromShelf(globalCtx, this);
}
if (this->items[curTemp] != NULL) {
- this->cursorIdx = curTemp;
+ this->cursorIndex = curTemp;
}
} else if (this->stickAccumX > 0) {
if (curTemp != 0) {
curTemp--;
}
if (this->items[curTemp] != NULL) {
- this->cursorIdx = curTemp;
+ this->cursorIndex = curTemp;
}
}
}
s32 EnSob1_HasPlayerSelectedItem(GlobalContext* globalCtx, EnSob1* this, Input* input) {
- EnGirlA* item = this->items[this->cursorIdx];
+ EnGirlA* item = this->items[this->cursorIndex];
if (EnSob1_TestEndInteraction(this, globalCtx, input)) {
return true;
@@ -880,7 +883,7 @@ s32 EnSob1_HasPlayerSelectedItem(GlobalContext* globalCtx, EnSob1* this, Input*
if (EnSob1_TestItemSelected(globalCtx)) {
if (!item->isOutOfStock) {
this->tmpActionFunc = this->actionFunc;
- func_80151938(globalCtx, this->items[this->cursorIdx]->choiceTextId);
+ func_80151938(globalCtx, this->items[this->cursorIndex]->choiceTextId);
play_sound(NA_SE_SY_DECIDE);
this->stickLeftPrompt.isEnabled = false;
this->stickRightPrompt.isEnabled = false;
@@ -897,8 +900,8 @@ s32 EnSob1_HasPlayerSelectedItem(GlobalContext* globalCtx, EnSob1* this, Input*
void EnSob1_BrowseShelf(EnSob1* this, GlobalContext* globalCtx) {
u8 talkState = Message_GetState(&globalCtx->msgCtx);
s32 pad;
- u8 prevCursorIdx = this->cursorIdx;
- u8 cursorIdx;
+ u8 prevCursorIndex = this->cursorIndex;
+ u8 cursorIndex;
if (!EnSob1_ReturnItemToShelf(this)) {
this->delayTimer = 3;
@@ -910,11 +913,11 @@ void EnSob1_BrowseShelf(EnSob1* this, GlobalContext* globalCtx) {
EnSob1_UpdateCursorPos(globalCtx, this);
if (talkState == 5) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnSob1_HasPlayerSelectedItem(globalCtx, this, CONTROLLER1(globalCtx))) {
+ if (!EnSob1_HasPlayerSelectedItem(globalCtx, this, CONTROLLER1(&globalCtx->state))) {
EnSob1_CursorLeftRight(globalCtx, this);
- cursorIdx = this->cursorIdx;
- if (cursorIdx != prevCursorIdx) {
- func_80151938(globalCtx, this->items[cursorIdx]->actor.textId);
+ cursorIndex = this->cursorIndex;
+ if (cursorIndex != prevCursorIndex) {
+ func_80151938(globalCtx, this->items[cursorIndex]->actor.textId);
play_sound(NA_SE_SY_CURSOR);
}
}
@@ -925,7 +928,7 @@ void EnSob1_BrowseShelf(EnSob1* this, GlobalContext* globalCtx) {
void EnSob1_SetupBuyItemWithFanfare(GlobalContext* globalCtx, EnSob1* this) {
Player* player = GET_PLAYER(globalCtx);
- Actor_PickUp(&this->actor, globalCtx, this->items[this->cursorIdx]->getItemId, 300.0f, 300.0f);
+ Actor_PickUp(&this->actor, globalCtx, this->items[this->cursorIndex]->getItemId, 300.0f, 300.0f);
globalCtx->msgCtx.msgMode = 0x43;
globalCtx->msgCtx.unk12023 = 4;
player->stateFlags2 &= ~0x20000000;
@@ -945,7 +948,7 @@ void EnSob1_SetupCanBuy(GlobalContext* globalCtx, EnSob1* this, u16 textId) {
}
void EnSob1_HandleCanBuyItem(GlobalContext* globalCtx, EnSob1* this) {
- EnGirlA* item = this->items[this->cursorIdx];
+ EnGirlA* item = this->items[this->cursorIndex];
EnGirlA* item2;
switch (item->canBuyFunc(globalCtx, item)) {
@@ -955,7 +958,7 @@ void EnSob1_HandleCanBuyItem(GlobalContext* globalCtx, EnSob1* this) {
this->cutsceneState = ENSOB1_CUTSCENESTATE_STOPPED;
}
func_8019F208();
- item2 = this->items[this->cursorIdx];
+ item2 = this->items[this->cursorIndex];
item2->buyFanfareFunc(globalCtx, item2);
EnSob1_SetupBuyItemWithFanfare(globalCtx, this);
this->drawCursor = 0;
@@ -1018,7 +1021,8 @@ void EnSob1_SelectItem(EnSob1* this, GlobalContext* globalCtx) {
if (EnSob1_TakeItemOffShelf(this) && talkState == 4) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnSob1_TestCancelOption(this, globalCtx, CONTROLLER1(globalCtx)) && Message_ShouldAdvance(globalCtx)) {
+ if (!EnSob1_TestCancelOption(this, globalCtx, CONTROLLER1(&globalCtx->state)) &&
+ Message_ShouldAdvance(globalCtx)) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
EnSob1_HandleCanBuyItem(globalCtx, this);
@@ -1026,7 +1030,7 @@ void EnSob1_SelectItem(EnSob1* this, GlobalContext* globalCtx) {
case 1:
func_8019F230();
this->actionFunc = this->tmpActionFunc;
- func_80151938(globalCtx, this->items[this->cursorIdx]->actor.textId);
+ func_80151938(globalCtx, this->items[this->cursorIndex]->actor.textId);
break;
}
}
@@ -1037,7 +1041,7 @@ void EnSob1_CannotBuy(EnSob1* this, GlobalContext* globalCtx) {
if (Message_GetState(&globalCtx->msgCtx) == 5) {
if (Message_ShouldAdvance(globalCtx)) {
this->actionFunc = this->tmpActionFunc;
- func_80151938(globalCtx, this->items[this->cursorIdx]->actor.textId);
+ func_80151938(globalCtx, this->items[this->cursorIndex]->actor.textId);
}
}
}
@@ -1048,10 +1052,10 @@ void EnSob1_CanBuy(EnSob1* this, GlobalContext* globalCtx) {
if (Message_GetState(&globalCtx->msgCtx) == 5 && Message_ShouldAdvance(globalCtx)) {
this->shopItemSelectedTween = 0.0f;
EnSob1_ResetItemPosition(this);
- item = this->items[this->cursorIdx];
+ item = this->items[this->cursorIndex];
item->restockFunc(globalCtx, item);
this->actionFunc = this->tmpActionFunc;
- func_80151938(globalCtx, this->items[this->cursorIdx]->actor.textId);
+ func_80151938(globalCtx, this->items[this->cursorIndex]->actor.textId);
}
}
@@ -1060,7 +1064,7 @@ void EnSob1_BuyItemWithFanfare(EnSob1* this, GlobalContext* globalCtx) {
this->actor.parent = NULL;
EnSob1_SetupAction(this, EnSob1_SetupItemPurchased);
} else {
- Actor_PickUp(&this->actor, globalCtx, this->items[this->cursorIdx]->getItemId, 300.0f, 300.0f);
+ Actor_PickUp(&this->actor, globalCtx, this->items[this->cursorIndex]->getItemId, 300.0f, 300.0f);
}
}
@@ -1086,7 +1090,7 @@ void EnSob1_ContinueShopping(EnSob1* this, GlobalContext* globalCtx) {
if ((Message_GetState(&globalCtx->msgCtx) == 5) && Message_ShouldAdvance(globalCtx)) {
EnSob1_ResetItemPosition(this);
- item = this->items[this->cursorIdx];
+ item = this->items[this->cursorIndex];
item->restockFunc(globalCtx, item);
player->actor.shape.rot.y += 0x8000;
player->stateFlags2 |= 0x20000000;
@@ -1098,7 +1102,7 @@ void EnSob1_ContinueShopping(EnSob1* this, GlobalContext* globalCtx) {
void EnSob1_PositionSelectedItem(EnSob1* this) {
Vec3f selectedItemPosition = sSelectedItemPositions[this->shopType];
- u8 i = this->cursorIdx;
+ u8 i = this->cursorIndex;
EnGirlA* item;
ShopItem* shopItem = &sShops[this->shopType][i];
Vec3f worldPos;
@@ -1159,7 +1163,7 @@ void EnSob1_UpdateItemSelectedProperty(EnSob1* this) {
this->drawCursor == 0) {
item->isSelected = false;
} else {
- item->isSelected = this->cursorIdx == i ? true : false;
+ item->isSelected = this->cursorIndex == i ? true : false;
}
}
}
@@ -1247,14 +1251,14 @@ void EnSob1_UpdateStickDirectionPromptAnim(EnSob1* this) {
this->stickLeftPrompt.stickTexY = 95.0f;
}
-s16 EnSob1_GetDistSqAndOrient(Path* path, s32 pointIdx, Vec3f* pos, f32* distSq) {
+s16 EnSob1_GetDistSqAndOrient(Path* path, s32 pointIndex, Vec3f* pos, f32* distSq) {
Vec3s* points;
f32 diffX;
f32 diffZ;
if (path != NULL) {
points = Lib_SegmentedToVirtual(path->points);
- points = &points[pointIdx];
+ points = &points[pointIndex];
diffX = points->x - pos->x;
diffZ = points->z - pos->z;
} else {
@@ -1283,33 +1287,34 @@ void EnSob1_WaitForBlink(EnSob1* this) {
void EnSob1_Blink(EnSob1* this) {
s16 decr = this->blinkTimer - 1;
- s16 eyeTextureIdxTemp;
+ s16 eyeTextureIndexTemp;
if (decr != 0) {
this->blinkTimer = decr;
return;
}
- eyeTextureIdxTemp = this->eyeTexIndex + 1;
- if (eyeTextureIdxTemp > 2) {
+ eyeTextureIndexTemp = this->eyeTexIndex + 1;
+ if (eyeTextureIndexTemp > 2) {
this->eyeTexIndex = 0;
this->blinkTimer = (s32)(Rand_ZeroOne() * 60.0f) + 20;
this->blinkFunc = EnSob1_WaitForBlink;
} else {
- this->eyeTexIndex = eyeTextureIdxTemp;
+ this->eyeTexIndex = eyeTextureIndexTemp;
this->blinkTimer = 1;
}
}
void EnSob1_ChangeObject(EnSob1* this, GlobalContext* globalCtx) {
- gSegments[0x06] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objIndices[2]].segment);
+ gSegments[0x06] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->shopkeeperAnimObjIndex].segment);
}
s32 EnSob1_AreObjectsLoaded(EnSob1* this, GlobalContext* globalCtx) {
- if (Object_IsLoaded(&globalCtx->objectCtx, this->objIndices[0])) {
- if (this->objIndices[1] >= 0 && !Object_IsLoaded(&globalCtx->objectCtx, this->objIndices[1])) {
+ if (Object_IsLoaded(&globalCtx->objectCtx, this->mainObjIndex)) {
+ if (this->unusedObjIndex >= 0 && !Object_IsLoaded(&globalCtx->objectCtx, this->unusedObjIndex)) {
return false;
}
- if (this->objIndices[2] >= 0 && !Object_IsLoaded(&globalCtx->objectCtx, this->objIndices[2])) {
+ if (this->shopkeeperAnimObjIndex >= 0 &&
+ !Object_IsLoaded(&globalCtx->objectCtx, this->shopkeeperAnimObjIndex)) {
return false;
}
return true;
@@ -1318,27 +1323,28 @@ s32 EnSob1_AreObjectsLoaded(EnSob1* this, GlobalContext* globalCtx) {
}
void EnSob1_ZoraShopkeeper_Init(EnSob1* this, GlobalContext* globalCtx) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gZoraSkel, NULL, this->jointTable, this->morphTable, 20);
- gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objIndices[2]].segment);
- Animation_Change(&this->skelAnime, &object_masterzoora_Anim_00078C, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_masterzoora_Anim_00078C), 0, 0.0f);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gZoraSkel, NULL, this->jointTable, this->morphTable,
+ ZORA_LIMB_MAX);
+ gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->shopkeeperAnimObjIndex].segment);
+ Animation_Change(&this->skelAnime, &gZoraShopkeeperAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gZoraShopkeeperAnim),
+ ANIMMODE_LOOP, 0.0f);
this->actor.draw = EnSob1_ZoraShopkeeper_Draw;
this->changeObjectFunc = EnSob1_ChangeObject;
}
void EnSob1_GoronShopkeeper_Init(EnSob1* this, GlobalContext* globalCtx) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_oF1d_map_Skel_011AC8, NULL, this->jointTable,
- this->morphTable, 18);
- gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objIndices[2]].segment);
- Animation_Change(&this->skelAnime, &object_mastergolon_Anim_0000FC, 1.0f, 0.0f,
- Animation_GetLastFrame(&object_mastergolon_Anim_0000FC), 0, 0.0f);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gGoronSkel, NULL, this->jointTable, this->morphTable,
+ GORON_LIMB_MAX);
+ gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->shopkeeperAnimObjIndex].segment);
+ Animation_Change(&this->skelAnime, &gGoronShopkeeperAnim, 1.0f, 0.0f, Animation_GetLastFrame(&gGoronShopkeeperAnim),
+ ANIMMODE_LOOP, 0.0f);
this->actor.draw = EnSob1_GoronShopkeeper_Draw;
this->changeObjectFunc = EnSob1_ChangeObject;
}
void EnSob1_BombShopkeeper_Init(EnSob1* this, GlobalContext* globalCtx) {
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rs_Skel_009220, &object_rs_Anim_009120, this->jointTable,
- this->morphTable, 16);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gBombShopkeeperSkel, &gBombShopkeeperWalkAnim, this->jointTable,
+ this->morphTable, BOMB_SHOPKEEPER_LIMB_MAX);
this->actor.draw = EnSob1_BombShopkeeper_Draw;
this->changeObjectFunc = NULL;
this->skelAnime.playSpeed = 2.0f;
@@ -1351,7 +1357,7 @@ void EnSob1_InitShop(EnSob1* this, GlobalContext* globalCtx) {
if (EnSob1_AreObjectsLoaded(this, globalCtx)) {
this->actor.flags &= ~ACTOR_FLAG_10;
- this->actor.objBankIndex = this->objIndices[0];
+ this->actor.objBankIndex = this->mainObjIndex;
Actor_SetObjectDependency(globalCtx, &this->actor);
posOffset = &sPosOffset[this->shopType];
this->actor.world.pos.x += posOffset->x;
@@ -1370,7 +1376,7 @@ void EnSob1_InitShop(EnSob1* this, GlobalContext* globalCtx) {
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->actor.colChkInfo.cylRadius = 50;
this->wasTalkedToWhileWalking = false;
- this->pathPointsIdx = 0;
+ this->waypoint = 0;
if (this->shopType == BOMB_SHOP) {
this->path = SubS_GetPathByIndex(globalCtx, ENSOB1_GET_PATH(&this->actor), 0x1F);
@@ -1385,7 +1391,7 @@ void EnSob1_InitShop(EnSob1* this, GlobalContext* globalCtx) {
this->stickAccumY = 0;
this->stickAccumX = 0;
- this->cursorIdx = 0;
+ this->cursorIndex = 0;
this->cursorPos.z = 1.2f;
this->cursorColor.r = 0;
this->cursorColor.g = 80;
@@ -1575,7 +1581,7 @@ s32 EnSob1_ZoraShopkeeper_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbInd
Actor* thisx) {
EnSob1* this = THIS;
- if (limbIndex == 15) {
+ if (limbIndex == ZORA_LIMB_HEAD) {
rot->x += this->headRot;
}
return false;
@@ -1585,7 +1591,7 @@ s32 EnSob1_BombShopkeeper_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbInd
Actor* thisx) {
EnSob1* this = THIS;
- if (limbIndex == 15) {
+ if (limbIndex == BOMB_SHOPKEEPER_LIMB_HEAD) {
Matrix_RotateXS(this->headRot, MTXMODE_APPLY);
}
return false;
@@ -1594,8 +1600,8 @@ s32 EnSob1_BombShopkeeper_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbInd
void EnSob1_BombShopkeeper_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot,
Actor* thisx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
- if (limbIndex == 11) {
- gSPDisplayList(POLY_OPA_DISP++, object_rs_DL_000970);
+ if (limbIndex == BOMB_SHOPKEEPER_LIMB_LEFT_HAND) {
+ gSPDisplayList(POLY_OPA_DISP++, gBombShopkeeperBombDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
@@ -1634,8 +1640,7 @@ void EnSob1_ZoraShopkeeper_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
void EnSob1_GoronShopkeeper_Draw(Actor* thisx, GlobalContext* globalCtx) {
- static TexturePtr sGoronShopkeeperEyeTextures[] = { object_oF1d_map_Tex_010438, object_oF1d_map_Tex_010C38,
- object_oF1d_map_Tex_011038 };
+ static TexturePtr sGoronShopkeeperEyeTextures[] = { gGoronEyeOpenTex, gGoronEyeHalfTex, gGoronEyeClosedTex };
EnSob1* this = THIS;
s32 pad;
s32 i;
@@ -1663,7 +1668,7 @@ void EnSob1_BombShopkeeper_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
- gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_rs_Tex_005458));
+ gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gBombShopkeeperEyeTex));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnSob1_BombShopkeeper_OverrideLimbDraw, EnSob1_BombShopkeeper_PostLimbDraw, &this->actor);
for (i = 0; i < ARRAY_COUNT(this->items); i++) {
diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
index c1dfd3849..a854d4c3f 100644
--- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
+++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
@@ -3,6 +3,11 @@
#include "global.h"
#include "overlays/actors/ovl_En_GirlA/z_en_girla.h"
+#include "objects/object_rs/object_rs.h"
+#include "objects/object_zo/object_zo.h"
+#include "objects/object_oF1d_map/object_oF1d_map.h"
+
+#define ENSOB1_LIMB_MAX MAX(MAX((s32)ZORA_LIMB_MAX, (s32)BOMB_SHOPKEEPER_LIMB_MAX), (s32)GORON_LIMB_MAX)
struct EnSob1;
@@ -27,13 +32,15 @@ typedef struct EnSob1 {
/* 0x190 */ EnSob1ActionFunc changeObjectFunc;
/* 0x194 */ ColliderCylinder collider;
/* 0x1E0 */ Path* path;
- /* 0x1E4 */ s32 pathPointsIdx;
+ /* 0x1E4 */ s32 waypoint;
/* 0x1E8 */ s16 delayTimer;
- /* 0x1EA */ s8 objIndices[3];
+ /* 0x1EA */ s8 mainObjIndex;
+ /* 0x1EB */ s8 unusedObjIndex;
+ /* 0x1EC */ s8 shopkeeperAnimObjIndex;
/* 0x1EE */ s16 headRot;
/* 0x1F0 */ s16 headRotTarget;
- /* 0x1F2 */ Vec3s jointTable[20];
- /* 0x26A */ Vec3s morphTable[20];
+ /* 0x1F2 */ Vec3s jointTable[ENSOB1_LIMB_MAX];
+ /* 0x26A */ Vec3s morphTable[ENSOB1_LIMB_MAX];
/* 0x2E2 */ s16 eyeTexIndex;
/* 0x2E4 */ s16 blinkTimer;
/* 0x2E8 */ EnSob1BlinkFunc blinkFunc;
@@ -45,7 +52,7 @@ typedef struct EnSob1 {
/* 0x31C */ f32 cursorAnimTween;
/* 0x320 */ u8 cursorAnimState;
/* 0x321 */ u8 drawCursor;
- /* 0x322 */ u8 cursorIdx;
+ /* 0x322 */ u8 cursorIndex;
/* 0x324 */ StickDirectionPrompt stickLeftPrompt;
/* 0x35C */ StickDirectionPrompt stickRightPrompt;
/* 0x394 */ f32 arrowAnimTween;
diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c
index 23b1b6223..58a4f1c59 100644
--- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c
+++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c
@@ -486,7 +486,7 @@ void func_80B67B50(EnSth* this, GlobalContext* globalCtx) {
} else {
this->unk_29C &= ~1;
gSaveContext.save.weekEventReg[34] |= 8;
- Actor_PickUp(&this->actor, globalCtx, GI_MASK_CAPTAIN, 10000.0f, 50.0f);
+ Actor_PickUp(&this->actor, globalCtx, GI_MASK_TRUTH, 10000.0f, 50.0f);
}
}
@@ -635,7 +635,7 @@ void func_80B680A8(Actor* thisx, GlobalContext* globalCtx) {
if (func_80B6703C(this, globalCtx) && !(this->unk_29C & 8) && (this->unk_29A != 5)) {
sp38.x = sp38.y = sp38.z = 0;
- func_800E9250(globalCtx, &this->actor, &this->unk_294, &sp38, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_294, &sp38, this->actor.focus.pos);
} else {
Math_SmoothStepToS(&this->unk_294.x, 0, 6, 6200, 100);
Math_SmoothStepToS(&this->unk_294.y, 0, 6, 6200, 100);
diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
index d25755a3c..394ecfa1f 100644
--- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
+++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
@@ -120,7 +120,7 @@ static DamageTable sDamageTable = {
/* Powder Keg */ DMG_ENTRY(1, 0xE),
};
-static TurnOptionsSet sTurnOptions = {
+static TrackOptionsSet sTrackOptions = {
{ 0xFA0, 4, 1, 3 },
{ 0x1770, 4, 1, 6 },
{ 0xFA0, 4, 1, 3 },
@@ -530,11 +530,11 @@ void func_80BAB4F0(EnSuttari* this, GlobalContext* globalCtx) {
point.x = player->actor.world.pos.x;
point.y = player->bodyPartsPos[7].y + 3.0f;
point.z = player->actor.world.pos.z;
- SubS_TurnToPoint(&point, &this->actor.focus.pos, &this->actor.shape.rot, &this->turnTarget, &this->headRot,
- &this->torsoRot, &sTurnOptions);
+ SubS_TrackPoint(&point, &this->actor.focus.pos, &this->actor.shape.rot, &this->trackTarget, &this->headRot,
+ &this->torsoRot, &sTrackOptions);
} else {
- Math_SmoothStepToS(&this->turnTarget.x, 0, 4, 0x3E8, 1);
- Math_SmoothStepToS(&this->turnTarget.y, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->trackTarget.x, 0, 4, 0x3E8, 1);
+ Math_SmoothStepToS(&this->trackTarget.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->headRot.x, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->headRot.y, 0, 4, 0x3E8, 1);
Math_SmoothStepToS(&this->torsoRot.x, 0, 4, 0x3E8, 1);
@@ -673,68 +673,66 @@ void func_80BABB90(EnSuttari* this, s32 arg1) {
}
}
-s32 func_80BABC48(EnSuttari* this, GlobalContext* globalCtx, ScheduleResult* unkStruct) {
+s32 func_80BABC48(EnSuttari* this, GlobalContext* globalCtx, ScheduleResult* scheduleResult) {
u16 sp26 = SCHEDULE_TIME_NOW;
u16 pad1;
u8 sp23 = ENSUTTARI_GET_PATH(&this->actor);
u16 pad2;
- UNK_TYPE sp1C = D_80BAE8F8[unkStruct->result];
+ s32 sp1C = D_80BAE8F8[scheduleResult->result];
u16 phi_a0;
if (sp1C >= 0) {
- this->unk404 = SubS_GetAdditionalPath(globalCtx, sp23, sp1C);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp23, sp1C);
}
- if (this->unk404 == NULL) {
+ if (this->timePath == NULL) {
return 0;
}
- if ((this->unk428 != 0 && this->unk428 < 0xC) && (this->unk42A >= 0)) {
+ if ((this->unk428 != 0 && this->unk428 < 0xC) && (this->timePathTimeSpeed >= 0)) {
phi_a0 = sp26;
} else {
- phi_a0 = unkStruct->time0;
+ phi_a0 = scheduleResult->time0;
}
- if (unkStruct->time1 < phi_a0) {
- this->unk418 = (phi_a0 - unkStruct->time1) + 0xFFFF;
+ if (scheduleResult->time1 < phi_a0) {
+ this->timePathTotalTime = (phi_a0 - scheduleResult->time1) + 0xFFFF;
} else {
- this->unk418 = unkStruct->time1 - phi_a0;
+ this->timePathTotalTime = scheduleResult->time1 - phi_a0;
}
- this->unk424 = sp26 - phi_a0;
- phi_a0 = this->unk404->count - 2;
+ this->timePathElapsedTime = sp26 - phi_a0;
+ phi_a0 = this->timePath->count - (SUBS_TIME_PATHING_ORDER - 1);
this->unk42C = 0;
- this->unk41C = this->unk418 / phi_a0;
- this->unk420 = (this->unk424 / this->unk41C) + 2;
+ this->timePathWaypointTime = this->timePathTotalTime / phi_a0;
+ this->timePathWaypoint = (this->timePathElapsedTime / this->timePathWaypointTime) + (SUBS_TIME_PATHING_ORDER - 1);
this->unk430 = 0;
return 1;
}
-s32 func_80BABDD8(EnSuttari* this, GlobalContext* globalCtx, ScheduleResult* unkStruct) {
+s32 func_80BABDD8(EnSuttari* this, GlobalContext* globalCtx, ScheduleResult* scheduleResult) {
s32 pad;
EnDoor* sp48;
- u8 sp47;
- u16 sp44;
+ u8 sp47 = ENSUTTARI_GET_PATH(&this->actor);
+ u16 sp44 = SCHEDULE_TIME_NOW;
Vec3f sp38;
Vec3f sp2C;
Vec3s* sp28;
- UNK_TYPE sp24;
+ s32 sp24;
- sp47 = ENSUTTARI_GET_PATH(&this->actor);
- sp44 = SCHEDULE_TIME_NOW;
if (this->unk428 == 10 || this->unk428 == 11 || this->unk428 == 2) {
return 0;
}
sp48 = (EnDoor*)SubS_FindNearestActor(&this->actor, globalCtx, ACTORCAT_DOOR, ACTOR_EN_DOOR);
- sp24 = D_80BAE8F8[unkStruct->result];
+ sp24 = D_80BAE8F8[scheduleResult->result];
if ((sp48 != NULL) && (sp24 >= 0)) {
- this->unk404 = SubS_GetAdditionalPath(globalCtx, sp47, sp24);
+ this->timePath = SubS_GetAdditionalPath(globalCtx, sp47, sp24);
}
- if ((sp48 == NULL) || (this->unk404 == NULL)) {
+ if ((sp48 == NULL) || (this->timePath == NULL)) {
return 0;
}
- sp28 = Lib_SegmentedToVirtual(this->unk404->points);
+ sp28 = Lib_SegmentedToVirtual(this->timePath->points);
Math_Vec3s_ToVec3f(&sp38, &sp28[0]);
Math_Vec3s_ToVec3f(&sp2C, &sp28[1]);
- this->unk434 = sp44 - unkStruct->time0;
- this->unk436 = unkStruct->time1 - unkStruct->time0;
- if (unkStruct->result != 10 && unkStruct->result != 11) {
+ this->unk434 = sp44 - scheduleResult->time0;
+ this->unk436 = scheduleResult->time1 - scheduleResult->time0;
+ if (scheduleResult->result != 10 && scheduleResult->result != 11) {
sp48->unk_1A7 = 0x4B;
}
Math_Vec3f_Copy(&this->unk438, &sp38);
@@ -744,15 +742,15 @@ s32 func_80BABDD8(EnSuttari* this, GlobalContext* globalCtx, ScheduleResult* unk
return 1;
}
-s32 func_80BABF64(EnSuttari* this, GlobalContext* globalCtx, ScheduleResult* unkStruct) {
+s32 func_80BABF64(EnSuttari* this, GlobalContext* globalCtx, ScheduleResult* scheduleResult) {
s32 ret;
- switch (unkStruct->result) {
+ switch (scheduleResult->result) {
case 15:
case 14:
case 13:
case 12:
- ret = func_80BABC48(this, globalCtx, unkStruct);
+ ret = func_80BABC48(this, globalCtx, scheduleResult);
break;
case 11:
case 10:
@@ -760,7 +758,7 @@ s32 func_80BABF64(EnSuttari* this, GlobalContext* globalCtx, ScheduleResult* unk
case 8:
case 7:
case 6:
- ret = func_80BABDD8(this, globalCtx, unkStruct);
+ ret = func_80BABDD8(this, globalCtx, scheduleResult);
break;
case 5:
case 4:
@@ -777,45 +775,47 @@ s32 func_80BABF64(EnSuttari* this, GlobalContext* globalCtx, ScheduleResult* unk
}
s32 func_80BABFD4(EnSuttari* this, GlobalContext* globalCtx) {
- f32 sp7C[265];
+ f32 knots[265];
Vec3f sp70;
Vec3f sp64;
- Vec3f sp58;
+ Vec3f timePathTargetPos;
s32 sp54 = 0;
s32 sp50 = 0;
s32 pad;
- func_8013AF00(sp7C, 3, this->unk404->count + 3);
+ SubS_TimePathing_FillKnots(knots, SUBS_TIME_PATHING_ORDER, this->timePath->count + SUBS_TIME_PATHING_ORDER);
if (this->unk42C == 0) {
- sp58 = gZeroVec3f;
- func_8013B6B0(this->unk404, &this->unk414, &this->unk424, this->unk41C, this->unk418, &this->unk420, sp7C,
- &sp58, this->unk42A);
- func_8013B878(globalCtx, this->unk404, this->unk420, &sp58);
- this->actor.world.pos.y = sp58.y;
+ timePathTargetPos = gZeroVec3f;
+ SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &timePathTargetPos, this->timePathTimeSpeed);
+ SubS_TimePathing_ComputeInitialY(globalCtx, this->timePath, this->timePathWaypoint, &timePathTargetPos);
+ this->actor.world.pos.y = timePathTargetPos.y;
this->unk42C = 1;
} else {
- sp58 = this->unk408;
+ timePathTargetPos = this->timePathTargetPos;
}
- this->actor.world.pos.x = sp58.x;
- this->actor.world.pos.z = sp58.z;
+ this->actor.world.pos.x = timePathTargetPos.x;
+ this->actor.world.pos.z = timePathTargetPos.z;
if (SubS_InCsMode(globalCtx)) {
- sp54 = this->unk424;
- sp50 = this->unk420;
- sp58 = this->actor.world.pos;
+ sp54 = this->timePathElapsedTime;
+ sp50 = this->timePathWaypoint;
+ timePathTargetPos = this->actor.world.pos;
}
- this->unk408 = gZeroVec3f;
- if (func_8013B6B0(this->unk404, &this->unk414, &this->unk424, this->unk41C, this->unk418, &this->unk420, sp7C,
- &this->unk408, this->unk42A)) {
+ this->timePathTargetPos = gZeroVec3f;
+ if (SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &this->timePathTargetPos, this->timePathTimeSpeed)) {
this->unk430 = 1;
} else {
sp70 = this->actor.world.pos;
- sp64 = this->unk408;
+ sp64 = this->timePathTargetPos;
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp70, &sp64);
}
if (SubS_InCsMode(globalCtx)) {
- this->unk424 = sp54;
- this->unk420 = sp50;
- this->unk408 = sp58;
+ this->timePathElapsedTime = sp54;
+ this->timePathWaypoint = sp50;
+ this->timePathTargetPos = timePathTargetPos;
}
return 0;
}
@@ -837,7 +837,7 @@ s32 func_80BAC220(EnSuttari* this, GlobalContext* globalCtx) {
sp3C.z = this->unk434 * tmp;
Lib_Vec3f_TranslateAndRotateY(&this->unk438, this->actor.world.rot.y, &sp3C, &sp30);
this->actor.world.pos = sp30;
- this->unk434 += this->unk42A;
+ this->unk434 += this->timePathTimeSpeed;
return 0;
}
@@ -1100,17 +1100,17 @@ void func_80BACE4C(EnSuttari* this, GlobalContext* globalCtx) {
}
void func_80BACEE0(EnSuttari* this, GlobalContext* globalCtx) {
- ScheduleResult unkStruct;
+ ScheduleResult scheduleResult;
- this->unk42A = REG(15) + ((void)0, gSaveContext.save.daySpeed);
- if (!Schedule_RunScript(globalCtx, D_80BAE820, &unkStruct) ||
- ((this->unk428 != unkStruct.result) && !func_80BABF64(this, globalCtx, &unkStruct))) {
+ this->timePathTimeSpeed = REG(15) + ((void)0, gSaveContext.save.daySpeed);
+ if (!Schedule_RunScript(globalCtx, D_80BAE820, &scheduleResult) ||
+ ((this->unk428 != scheduleResult.result) && !func_80BABF64(this, globalCtx, &scheduleResult))) {
this->actor.flags &= ~ACTOR_FLAG_1;
- unkStruct.result = 0;
+ scheduleResult.result = 0;
} else {
this->actor.flags |= ACTOR_FLAG_1;
}
- this->unk428 = unkStruct.result;
+ this->unk428 = scheduleResult.result;
func_80BAC2FC(this, globalCtx);
func_80BAB434(this);
if (this->unk428 == 5) {
@@ -1124,17 +1124,17 @@ void func_80BACEE0(EnSuttari* this, GlobalContext* globalCtx) {
}
void func_80BAD004(EnSuttari* this, GlobalContext* globalCtx) {
- ScheduleResult unkStruct;
+ ScheduleResult scheduleResult;
- this->unk42A = REG(15) + ((void)0, gSaveContext.save.daySpeed);
- if (!Schedule_RunScript(globalCtx, D_80BAE820, &unkStruct) ||
- ((this->unk428 != unkStruct.result) && !func_80BABF64(this, globalCtx, &unkStruct))) {
+ this->timePathTimeSpeed = REG(15) + ((void)0, gSaveContext.save.daySpeed);
+ if (!Schedule_RunScript(globalCtx, D_80BAE820, &scheduleResult) ||
+ ((this->unk428 != scheduleResult.result) && !func_80BABF64(this, globalCtx, &scheduleResult))) {
this->actor.flags &= ~ACTOR_FLAG_1;
- unkStruct.result = 0;
+ scheduleResult.result = 0;
} else {
this->actor.flags |= ACTOR_FLAG_1;
}
- this->unk428 = unkStruct.result;
+ this->unk428 = scheduleResult.result;
func_80BAC2FC(this, globalCtx);
if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
Message_StartTextbox(globalCtx, 0x2A3A, &this->actor);
@@ -1245,7 +1245,7 @@ void func_80BAD380(EnSuttari* this, GlobalContext* globalCtx) {
}
void func_80BAD5F8(EnSuttari* this, GlobalContext* globalCtx) {
- ScheduleResult unkStruct;
+ ScheduleResult scheduleResult;
s16 curFrame = this->skelAnime.curFrame;
s16 frameCount = Animation_GetLastFrame(sAnimations[this->animationIndex].animation);
@@ -1253,22 +1253,22 @@ void func_80BAD5F8(EnSuttari* this, GlobalContext* globalCtx) {
this->animationIndex = 2;
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, this->animationIndex);
}
- this->unk42A = REG(15) + ((void)0, gSaveContext.save.daySpeed);
- if (!Schedule_RunScript(globalCtx, D_80BAE820, &unkStruct) ||
- ((this->unk428 != unkStruct.result) && !func_80BABF64(this, globalCtx, &unkStruct))) {
+ this->timePathTimeSpeed = REG(15) + ((void)0, gSaveContext.save.daySpeed);
+ if (!Schedule_RunScript(globalCtx, D_80BAE820, &scheduleResult) ||
+ ((this->unk428 != scheduleResult.result) && !func_80BABF64(this, globalCtx, &scheduleResult))) {
this->actor.flags &= ~ACTOR_FLAG_1;
- unkStruct.result = 0;
+ scheduleResult.result = 0;
} else {
this->actor.flags |= ACTOR_FLAG_1;
}
- this->unk428 = unkStruct.result;
+ this->unk428 = scheduleResult.result;
func_80BAC2FC(this, globalCtx);
- if ((this->unk430 == 1) && (this->unk404->unk1 == 0xFF)) {
+ if ((this->unk430 == 1) && (this->timePath->unk1 == 0xFF)) {
Actor_MarkForDeath(&this->actor);
return;
}
func_80BAB434(this);
- if ((this->flags1 & 0x20) && (this->unk430 == 0) && (unkStruct.result != 7)) {
+ if ((this->flags1 & 0x20) && (this->unk430 == 0) && (scheduleResult.result != 7)) {
if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
Message_StartTextbox(globalCtx, 0x2A02, &this->actor);
this->actionFunc = func_80BAD130;
@@ -1280,7 +1280,7 @@ void func_80BAD5F8(EnSuttari* this, GlobalContext* globalCtx) {
}
void func_80BAD7F8(EnSuttari* this, GlobalContext* globalCtx) {
- ScheduleResult unkStruct;
+ ScheduleResult scheduleResult;
s16 curFrame = this->skelAnime.curFrame;
s16 frameCount = Animation_GetLastFrame(sAnimations[this->animationIndex].animation);
@@ -1291,21 +1291,21 @@ void func_80BAD7F8(EnSuttari* this, GlobalContext* globalCtx) {
this->animationIndex = 2;
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, this->animationIndex);
}
- this->unk42A = REG(15) + ((void)0, gSaveContext.save.daySpeed);
- if (!Schedule_RunScript(globalCtx, D_80BAE820, &unkStruct) ||
- ((this->unk428 != unkStruct.result) && !func_80BABF64(this, globalCtx, &unkStruct))) {
+ this->timePathTimeSpeed = REG(15) + ((void)0, gSaveContext.save.daySpeed);
+ if (!Schedule_RunScript(globalCtx, D_80BAE820, &scheduleResult) ||
+ ((this->unk428 != scheduleResult.result) && !func_80BABF64(this, globalCtx, &scheduleResult))) {
this->actor.flags &= ~ACTOR_FLAG_1;
- unkStruct.result = 0;
+ scheduleResult.result = 0;
} else {
this->actor.flags |= ACTOR_FLAG_1;
}
- this->unk428 = unkStruct.result;
+ this->unk428 = scheduleResult.result;
func_80BAC2FC(this, globalCtx);
- if ((this->unk430 == 1) && (this->unk404->unk1 == 0xFF)) {
+ if ((this->unk430 == 1) && (this->timePath->unk1 == 0xFF)) {
Actor_MarkForDeath(&this->actor);
return;
}
- if ((this->flags1 & 0x20) && (unkStruct.result != 9)) {
+ if ((this->flags1 & 0x20) && (scheduleResult.result != 9)) {
if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
Message_StartTextbox(globalCtx, 0x2A02, &this->actor);
this->actionFunc = func_80BAD130;
diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h
index 2fbdff53b..5418f182e 100644
--- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h
+++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h
@@ -27,7 +27,7 @@ typedef struct EnSuttari {
/* 0x1FC */ UNK_TYPE1 unk_1FC[0x1A];
/* 0x216 */ Vec3s jointTable[16];
/* 0x276 */ Vec3s morphTable[16];
- /* 0x2D6 */ Vec3s turnTarget;
+ /* 0x2D6 */ Vec3s trackTarget;
/* 0x2DC */ Vec3s headRot;
/* 0x2E2 */ Vec3s torsoRot;
/* 0x2E8 */ UNK_TYPE1 unk_2E8[0x12];
@@ -39,16 +39,15 @@ typedef struct EnSuttari {
/* 0x3F4 */ s16 unk3F4;
/* 0x3F6 */ s16 unk3F6;
/* 0x3F8 */ Vec3f unk3F8;
- /* 0x404 */ Path* unk404;
- /* 0x408 */ Vec3f unk408;
- /* 0x414 */ f32 unk414;
- /* 0x418 */ s32 unk418;
- /* 0x41C */ s32 unk41C;
- /* 0x420 */ s32 unk420;
- /* 0x424 */ s32 unk424;
+ /* 0x404 */ Path* timePath;
+ /* 0x408 */ Vec3f timePathTargetPos;
+ /* 0x414 */ f32 timePathProgress;
+ /* 0x418 */ s32 timePathTotalTime;
+ /* 0x41C */ s32 timePathWaypointTime;
+ /* 0x420 */ s32 timePathWaypoint;
+ /* 0x424 */ s32 timePathElapsedTime;
/* 0x428 */ u8 unk428;
- /* 0x429 */ UNK_TYPE1 unk_429[0x1];
- /* 0x42A */ s16 unk42A;
+ /* 0x42A */ s16 timePathTimeSpeed;
/* 0x42C */ s32 unk42C;
/* 0x430 */ s32 unk430;
/* 0x434 */ s16 unk434;
diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
index 93a4ecee9..b81c89268 100644
--- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
+++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
@@ -1225,7 +1225,7 @@ void EnSyatekiMan_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetFocus(&this->actor, 70.0f);
if (this->unk_26A != 1) {
SkelAnime_Update(&this->skelAnime);
- func_800E9250(globalCtx, &this->actor, &this->unk_258, &this->unk_25E, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_258, &this->unk_25E, this->actor.focus.pos);
}
}
diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c
index 522105f03..a348c5f2f 100644
--- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c
+++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c
@@ -777,7 +777,8 @@ void EnTalkGibud_PassiveIdle(EnTalkGibud* this, GlobalContext* globalCtx) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_REDEAD_AIM);
EnTalkGibud_SetupTalk(this);
} else if (this->actor.xzDistToPlayer < 100.0f && !(this->collider.base.acFlags & AC_HIT)) {
- func_800E9250(globalCtx, &this->actor, &this->headRotation, &this->upperBodyRotation, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->headRotation, &this->upperBodyRotation,
+ this->actor.focus.pos);
func_800B8614(&this->actor, globalCtx, 100.0f);
} else {
Math_SmoothStepToS(&this->headRotation.y, 0, 1, 100, 0);
diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c
index 66ee6080e..6f52cfed7 100644
--- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c
+++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c
@@ -564,7 +564,7 @@ void EnTanron2_Update(Actor* thisx, GlobalContext* globalCtx) {
this->unk_159 = 1;
}
- input = CONTROLLER3(globalCtx);
+ input = CONTROLLER3(&globalCtx->state);
if (CHECK_BTN_ALL(input->press.button, BTN_L)) {
this->unk_158 = 1;
}
diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c
index 4f11d5ae2..64c858b67 100644
--- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c
+++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c
@@ -370,7 +370,7 @@ void func_80A42AB8(EnTest4* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
if ((globalCtx->transitionMode == 0) && !Play_InCsMode(globalCtx) && (globalCtx->numSetupActors <= 0) &&
- (globalCtx->roomCtx.unk31 == 0) && (func_8016A168() == 0)) {
+ (globalCtx->roomCtx.unk31 == 0) && !Play_IsDebugCamEnabled()) {
s16 temp_a2;
u16 temp_a0 = D_80A43364[this->unk_144];
s16 temp_a3;
diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c
index 714bc1bb4..3edfcf6b2 100644
--- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c
+++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c
@@ -407,7 +407,7 @@ void func_80A916F0(EnTest6* this, GlobalContext* globalCtx) {
}
void func_80A91760(EnTest6* this, GlobalContext* globalCtx) {
- Input* input = CONTROLLER1(globalCtx);
+ Input* input = CONTROLLER1(&globalCtx->state);
s16 temp_s0;
Player* player = GET_PLAYER(globalCtx);
Camera* sp78;
@@ -628,7 +628,7 @@ void func_80A92118(EnTest6* this, GlobalContext* globalCtx) {
}
void func_80A92188(EnTest6* this, GlobalContext* globalCtx) {
- Input* input = CONTROLLER1(globalCtx);
+ Input* input = CONTROLLER1(&globalCtx->state);
Player* player = GET_PLAYER(globalCtx);
Camera* camera;
s32 pad;
diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
index 59838c9ef..921f0e765 100644
--- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
+++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
@@ -196,7 +196,7 @@ void func_80C10984(EnThiefbird* this, s32 arg1) {
ptr->unk_0C.z = randPlusMinusPoint5Scaled(5.0f);
ptr->unk_1C = Rand_ZeroFloat(1000.0f);
ptr->unk_18 = (Rand_ZeroFloat(20.0f) + 40.0f) * 0.0001f;
- ptr->unk_1E = Rand_Next() >> 0x10;
+ ptr->unk_1E = (s32)Rand_Next() >> 0x10;
arg1--;
if (arg1 == 0) {
break;
diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c
index cd0403c71..c272ccd1b 100644
--- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c
+++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c
@@ -5,6 +5,7 @@
*/
#include "z_en_time_tag.h"
+#include "overlays/actors/ovl_En_Elf/z_en_elf.h"
#define FLAGS (ACTOR_FLAG_10)
@@ -29,7 +30,6 @@ void func_80ACA724(EnTimeTag* this, GlobalContext* globalCtx);
void func_80ACA7C4(EnTimeTag* this, GlobalContext* globalCtx);
void func_80ACA840(EnTimeTag* this, GlobalContext* globalCtx);
-#if 0
const ActorInit En_Time_Tag_InitVars = {
ACTOR_EN_TIME_TAG,
ACTORCAT_ITEMACTION,
@@ -42,40 +42,268 @@ const ActorInit En_Time_Tag_InitVars = {
(ActorFunc)NULL,
};
-#endif
+void EnTimeTag_Init(Actor* thisx, GlobalContext* globalCtx) {
+ EnTimeTag* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/EnTimeTag_Init.s")
+ this->actionFunc = func_80ACA840;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/EnTimeTag_Destroy.s")
+ switch (ENTIMETAG_GET_E000(&this->actor)) {
+ case 4:
+ if ((gSaveContext.save.weekEventReg[8] & 0x40) || (CURRENT_DAY != 3)) {
+ Actor_MarkForDeath(&this->actor);
+ return;
+ }
+ this->actor.home.rot.x = 0;
+ this->actor.home.rot.y = 0;
+ break;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80AC9FD4.s")
+ case 2:
+ this->actionFunc = func_80ACA0A8;
+ this->actor.flags |= ACTOR_FLAG_2000000;
+ break;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80AC9FE4.s")
+ case 1:
+ this->actionFunc = func_80ACA268;
+ this->actor.flags |= ACTOR_FLAG_2000000;
+ if (CHECK_QUEST_ITEM(QUEST_SONG_SOARING)) {
+ this->actor.textId = 0xC02;
+ return;
+ }
+ this->actor.textId = 0;
+ break;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA0A8.s")
+ case 3:
+ this->actionFunc = func_80ACA5F8;
+ this->actor.textId = 0;
+ this->actor.home.rot.x = 0;
+ break;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA12C.s")
+void EnTimeTag_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA184.s")
+void func_80AC9FD4(EnTimeTag* this, GlobalContext* globalCtx) {
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA208.s")
+void func_80AC9FE4(EnTimeTag* this, GlobalContext* globalCtx) {
+ if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) {
+ ActorCutscene_StartAndSetUnkLinkFields(this->actor.cutscene, &this->actor);
+ this->actionFunc = func_80AC9FD4;
+ gSaveContext.unk_3DD0[3] = 0;
+ if (CHECK_QUEST_ITEM(QUEST_REMAINS_ODOWLA) && CHECK_QUEST_ITEM(QUEST_REMAINS_GOHT) &&
+ CHECK_QUEST_ITEM(QUEST_REMAINS_GYORG) && CHECK_QUEST_ITEM(QUEST_REMAINS_TWINMOLD)) {
+ gSaveContext.save.weekEventReg[25] |= 2;
+ }
+ } else {
+ ActorCutscene_SetIntentToPlay(this->actor.cutscene);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA268.s")
+void func_80ACA0A8(EnTimeTag* this, GlobalContext* globalCtx) {
+ EnTimeTag* this2 = this;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA348.s")
+ if ((globalCtx->msgCtx.ocarinaMode == 3) && (globalCtx->msgCtx.unk1202E == 4)) {
+ if (this->actor.cutscene != -1) {
+ this->actionFunc = func_80AC9FE4;
+ ActorCutscene_SetIntentToPlay(this2->actor.cutscene);
+ gSaveContext.unk_3DD0[3] = 0;
+ }
+ globalCtx->msgCtx.ocarinaMode = 4;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA3C0.s")
+void func_80ACA12C(EnTimeTag* this, GlobalContext* globalCtx) {
+ if (ActorCutscene_GetCurrentIndex() != this->actor.cutscene) {
+ this->actionFunc = func_80ACA268;
+ this->actor.textId = 0xC02;
+ Item_Give(globalCtx, ITEM_SONG_SOARING);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA418.s")
+void func_80ACA184(EnTimeTag* this, GlobalContext* globalCtx) {
+ if (ActorCutscene_GetCurrentIndex() == 0x7C) {
+ ActorCutscene_Stop(0x7C);
+ ActorCutscene_SetIntentToPlay(this->actor.cutscene);
+ } else if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) {
+ ActorCutscene_Start(this->actor.cutscene, &this->actor);
+ this->actionFunc = func_80ACA12C;
+ } else {
+ ActorCutscene_SetIntentToPlay(this->actor.cutscene);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA5F8.s")
+void func_80ACA208(EnTimeTag* this, GlobalContext* globalCtx) {
+ if ((Message_GetState(&globalCtx->msgCtx) == 5) && Message_ShouldAdvance(globalCtx)) {
+ func_801477B4(globalCtx);
+ this->actionFunc = func_80ACA268;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA714.s")
+void func_80ACA268(EnTimeTag* this, GlobalContext* globalCtx) {
+ if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
+ if (this->actor.textId == 0) {
+ this->actionFunc = func_80ACA184;
+ } else {
+ this->actionFunc = func_80ACA208;
+ }
+ } else if ((this->actor.xzDistToPlayer < 100.0f) && Player_IsFacingActor(&this->actor, 0x3000, globalCtx) &&
+ (Flags_GetSwitch(globalCtx, ENTIMETAG_GET_SWITCHFLAG(&this->actor)) ||
+ CHECK_QUEST_ITEM(QUEST_SONG_SOARING))) {
+ this->actor.flags |= ACTOR_FLAG_1;
+ func_800B8614(&this->actor, globalCtx, 110.0f);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA724.s")
+void func_80ACA348(EnTimeTag* this, GlobalContext* globalCtx) {
+ if (this->actor.home.rot.x > 0) {
+ this->actor.home.rot.x--;
+ return;
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA7C4.s")
+ if (this->actor.home.rot.z != 0) {
+ func_80151938(globalCtx, 0x1230);
+ } else {
+ func_80151938(globalCtx, 0x122D);
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/func_80ACA840.s")
+ this->actionFunc = func_80ACA418;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Time_Tag/EnTimeTag_Update.s")
+void func_80ACA3C0(EnTimeTag* this, GlobalContext* globalCtx) {
+ if ((globalCtx->msgCtx.unk11F00->unk01 == 0) && (globalCtx->msgCtx.msgMode == 0x1B)) {
+ this->actor.home.rot.x = 5;
+ this->actionFunc = func_80ACA348;
+ globalCtx->msgCtx.unk11F10 = 0;
+ globalCtx->msgCtx.msgMode = 0;
+ }
+}
+
+void func_80ACA418(EnTimeTag* this, GlobalContext* globalCtx) {
+ switch (Message_GetState(&globalCtx->msgCtx)) {
+ case 5:
+ if (Message_ShouldAdvance(globalCtx)) {
+ switch (globalCtx->msgCtx.currentTextId) {
+ case 0x101C:
+ case 0x101D:
+ case 0x101E:
+ case 0x122D:
+ func_80151938(globalCtx, globalCtx->msgCtx.currentTextId + 1);
+ break;
+
+ case 0x101F:
+ case 0x122A:
+ case 0x1230:
+ func_801477B4(globalCtx);
+ this->actionFunc = func_80ACA5F8;
+ if (ActorCutscene_GetCurrentIndex() == this->actor.cutscene) {
+ ActorCutscene_Stop(this->actor.cutscene);
+ }
+ break;
+
+ case 0x122B:
+ func_80152434(globalCtx, 0x3F);
+ this->actionFunc = func_80ACA3C0;
+ this->actor.home.rot.z = 0;
+ break;
+
+ case 0x122E:
+ func_80152434(globalCtx, 0x40);
+ this->actionFunc = func_80ACA3C0;
+ this->actor.home.rot.z = 1;
+ break;
+ }
+ }
+ break;
+
+ case 2:
+ this->actionFunc = func_80ACA5F8;
+ break;
+ }
+
+ if (this->actor.home.rot.x != 0) {
+ if (this->actor.cutscene == -1) {
+ this->actor.home.rot.x = 0;
+ } else if (ActorCutscene_GetCurrentIndex() == 0x7C) {
+ ActorCutscene_Stop(0x7C);
+ ActorCutscene_SetIntentToPlay(this->actor.cutscene);
+ } else if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) {
+ ActorCutscene_Start(this->actor.cutscene, &this->actor);
+ this->actor.home.rot.x = 0;
+ } else {
+ ActorCutscene_SetIntentToPlay(this->actor.cutscene);
+ }
+ }
+}
+
+void func_80ACA5F8(EnTimeTag* this, GlobalContext* globalCtx) {
+ if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
+ if (gSaveContext.save.playerForm == PLAYER_FORM_ZORA) {
+ if (ENTIMETAG_GET_SWITCHFLAG(&this->actor) == 1) {
+ Message_StartTextbox(globalCtx, 0x101C, &this->actor);
+ } else {
+ Message_StartTextbox(globalCtx, 0x122B, &this->actor);
+ }
+ this->actor.home.rot.x = 1;
+ } else {
+ Message_StartTextbox(globalCtx, 0x122A, &this->actor);
+ if (0) {}
+ ((EnElf*)GET_PLAYER(globalCtx)->tatlActor)->unk_264 |= 4;
+ Actor_ChangeFocus(&this->actor, globalCtx, GET_PLAYER(globalCtx)->tatlActor);
+ this->actor.home.rot.x = 0;
+ }
+ this->actionFunc = func_80ACA418;
+ } else if ((this->actor.xzDistToPlayer < 100.0f) && Player_IsFacingActor(&this->actor, 0x3000, globalCtx)) {
+ func_800B8614(&this->actor, globalCtx, 110.0f);
+ }
+}
+
+void func_80ACA714(EnTimeTag* this, GlobalContext* globalCtx) {
+}
+
+void func_80ACA724(EnTimeTag* this, GlobalContext* globalCtx) {
+ if (Message_GetState(&globalCtx->msgCtx) == 5) {
+ globalCtx->nextEntranceIndex = globalCtx->setupExitList[ENTIMETAG_GET_1F(&this->actor)];
+ globalCtx->transitionTrigger = 0x14;
+ if (!ENTIMETAG_GET_E000(&this->actor)) {
+ Actor_PlaySfxAtPos(&this->actor, NA_SE_OC_DOOR_OPEN);
+ }
+ this->actionFunc = func_80ACA714;
+ }
+}
+
+void func_80ACA7C4(EnTimeTag* this, GlobalContext* globalCtx) {
+ if (!(gSaveContext.save.weekEventReg[63] & 1) && !(gSaveContext.save.weekEventReg[63] & 2)) {
+ func_800B7298(globalCtx, &this->actor, 7);
+ Message_StartTextbox(globalCtx, ENTIMETAG_GET_1FE0(&this->actor) + 0x1883, NULL);
+ this->actionFunc = func_80ACA724;
+ }
+}
+
+void func_80ACA840(EnTimeTag* this, GlobalContext* globalCtx) {
+ s16 temp_ft4;
+ s16 temp_hi;
+
+ if ((globalCtx->sceneNum != SCENE_YADOYA) || (INV_CONTENT(ITEM_ROOM_KEY) != ITEM_ROOM_KEY)) {
+ temp_ft4 = gSaveContext.save.time * (24.0f / 0x10000); // TIME_TO_HOURS_F
+ temp_hi = (s32)TIME_TO_MINUTES_F(gSaveContext.save.time) % 60;
+ if (gSaveContext.save.weekEventReg[63] & 1) {
+ if (gSaveContext.save.weekEventReg[63] & 2) {
+ this->actionFunc = func_80ACA7C4;
+ } else if ((temp_ft4 == this->actor.home.rot.x) && (temp_hi == this->actor.home.rot.y)) {
+ gSaveContext.save.weekEventReg[63] |= 2;
+ }
+ } else if ((temp_ft4 == this->actor.home.rot.x) && (temp_hi == this->actor.home.rot.y) &&
+ !Play_InCsMode(globalCtx)) {
+ func_800B7298(globalCtx, &this->actor, 7);
+ Message_StartTextbox(globalCtx, ENTIMETAG_GET_1FE0(&this->actor) + 0x1883, NULL);
+ this->actionFunc = func_80ACA724;
+ }
+ }
+}
+
+void EnTimeTag_Update(Actor* thisx, GlobalContext* globalCtx) {
+ EnTimeTag* this = THIS;
+
+ this->actionFunc(this, globalCtx);
+}
diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
index 7c2a6c00c..531b0aa90 100644
--- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
+++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
@@ -7,6 +7,11 @@ struct EnTimeTag;
typedef void (*EnTimeTagActionFunc)(struct EnTimeTag*, GlobalContext*);
+#define ENTIMETAG_GET_1F(thisx) ((thisx)->params & 0x1F)
+#define ENTIMETAG_GET_SWITCHFLAG(thisx) ((thisx)->params & 0x7F)
+#define ENTIMETAG_GET_1FE0(thisx) (((thisx)->params & 0x1FE0) >> 0x5)
+#define ENTIMETAG_GET_E000(thisx) (((thisx)->params & 0xE000) >> 0xD)
+
typedef struct EnTimeTag {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnTimeTagActionFunc actionFunc;
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
index 08440f578..8a05be63f 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -343,7 +343,7 @@ void func_80AECB6C(EnTk* this, GlobalContext* globalCtx) {
this->unk_2DC += (REG(15) * sp44) - temp2;
temp3 = this->unk_2DC;
- this->unk_3D0 = temp2 + temp3;
+ this->timePathTimeSpeed = temp2 + temp3;
this->unk_2DC -= temp3;
this->unk_2E0 += REG(15);
@@ -384,88 +384,89 @@ void func_80AECE0C(EnTk* this, GlobalContext* globalCtx) {
s32 func_80AECE60(EnTk* this, GlobalContext* globalCtx) {
EnDoor* door;
- f32 spA0[265];
+ f32 knots[265];
Vec3f sp94;
Vec3f sp88;
- Vec3f sp7C;
+ Vec3f timePathTargetPos;
s32 sp78;
s32 sp74;
- Actor* door2;
- Actor* door1;
- s32 pad2[1];
+ s32 pad;
- func_8013AF00(spA0, 3, this->unk_3C8->count + 3);
+ SubS_TimePathing_FillKnots(knots, SUBS_TIME_PATHING_ORDER, this->timePath->count + SUBS_TIME_PATHING_ORDER);
if (!(this->unk_3CE & 4)) {
- sp7C = gZeroVec3f;
- func_8013B6B0(this->unk_3C8, &this->unk_3E0, &this->unk_3F0, this->unk_3E8, this->unk_3E4, &this->unk_3EC, spA0,
- &sp7C, this->unk_3D0);
- func_8013B878(globalCtx, this->unk_3C8, this->unk_3EC, &sp7C);
- this->actor.world.pos.y = sp7C.y;
+ timePathTargetPos = gZeroVec3f;
+ SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &timePathTargetPos, this->timePathTimeSpeed);
+ SubS_TimePathing_ComputeInitialY(globalCtx, this->timePath, this->timePathWaypoint, &timePathTargetPos);
+ this->actor.world.pos.y = timePathTargetPos.y;
} else {
- sp7C = this->unk_3D4;
+ timePathTargetPos = this->timePathTargetPos;
}
- this->actor.world.pos.x = sp7C.x;
- this->actor.world.pos.z = sp7C.z;
+ this->actor.world.pos.x = timePathTargetPos.x;
+ this->actor.world.pos.z = timePathTargetPos.z;
if (!(this->unk_3CE & 4)) {
Math_Vec3f_Copy(&this->actor.prevPos, &this->actor.world.pos);
this->unk_3CE |= 4;
}
- if ((globalCtx->transitionMode != 0) || (this->unk_3D0 == 0)) {
- sp78 = this->unk_3F0;
- sp74 = this->unk_3EC;
- sp7C = this->actor.world.pos;
+ if ((globalCtx->transitionMode != 0) || (this->timePathTimeSpeed == 0)) {
+ sp78 = this->timePathElapsedTime;
+ sp74 = this->timePathWaypoint;
+ timePathTargetPos = this->actor.world.pos;
}
- this->unk_3D4 = gZeroVec3f;
+ this->timePathTargetPos = gZeroVec3f;
- if (func_8013B6B0(this->unk_3C8, &this->unk_3E0, &this->unk_3F0, this->unk_3E8, this->unk_3E4, &this->unk_3EC, spA0,
- &this->unk_3D4, this->unk_3D0)) {
+ if (SubS_TimePathing_Update(this->timePath, &this->timePathProgress, &this->timePathElapsedTime,
+ this->timePathWaypointTime, this->timePathTotalTime, &this->timePathWaypoint, knots,
+ &this->timePathTargetPos, this->timePathTimeSpeed)) {
this->unk_3CE |= 8;
} else {
sp94 = this->actor.world.pos;
- sp88 = this->unk_3D4;
+ sp88 = this->timePathTargetPos;
this->actor.world.rot.y = Math_Vec3f_Yaw(&sp94, &sp88);
}
- if ((globalCtx->transitionMode != 0) || (this->unk_3D0 == 0)) {
- this->unk_3F0 = sp78;
- this->unk_3EC = sp74;
- this->unk_3D4 = sp7C;
+ if ((globalCtx->transitionMode != 0) || (this->timePathTimeSpeed == 0)) {
+ this->timePathElapsedTime = sp78;
+ this->timePathWaypoint = sp74;
+ this->timePathTargetPos = timePathTargetPos;
}
door = NULL;
if (!(this->unk_2CA & 0xC00)) {
- door1 = NULL;
- label:
+ Actor* doorIter = NULL;
+
do {
- door1 = SubS_FindActor(globalCtx, door1, ACTORCAT_DOOR, ACTOR_EN_DOOR);
- if (door1 != NULL) {
- if (Actor_XZDistanceBetweenActors(&this->actor, door1) <= 120.0f) {
- if (ABS(BINANG_SUB(Actor_YawToPoint(&this->actor, &door1->world.pos), this->actor.shape.rot.y)) <=
- 0x2000) {
+ doorIter = SubS_FindActor(globalCtx, doorIter, ACTORCAT_DOOR, ACTOR_EN_DOOR);
+ if (doorIter != NULL) {
+ if (Actor_XZDistanceBetweenActors(&this->actor, doorIter) <= 120.0f) {
+ if (ABS(BINANG_SUB(Actor_YawToPoint(&this->actor, &doorIter->world.pos),
+ this->actor.shape.rot.y)) <= 0x2000) {
this->unk_2CA |= 0x400;
- door = (EnDoor*)door1;
+ door = (EnDoor*)doorIter;
break;
}
}
- door1 = door1->next;
+ doorIter = doorIter->next;
}
- } while (door1 != NULL);
+ } while (doorIter != NULL);
} else {
- door2 = NULL;
+ Actor* doorIter = NULL;
+
do {
- door2 = SubS_FindActor(globalCtx, door2, ACTORCAT_DOOR, ACTOR_EN_DOOR);
- if (door2 != NULL) {
- if (Actor_XZDistanceBetweenActors(&this->actor, door2) <= 160.0f) {
- door = (EnDoor*)door2;
+ doorIter = SubS_FindActor(globalCtx, doorIter, ACTORCAT_DOOR, ACTOR_EN_DOOR);
+ if (doorIter != NULL) {
+ if (Actor_XZDistanceBetweenActors(&this->actor, doorIter) <= 160.0f) {
+ door = (EnDoor*)doorIter;
break;
}
- door2 = door2->next;
+ doorIter = doorIter->next;
}
- } while (door2 != NULL);
+ } while (doorIter != NULL);
}
if ((door != NULL) && (this->unk_2CA & 0x400)) {
@@ -507,22 +508,22 @@ s32 func_80AED38C(EnTk* this, GlobalContext* globalCtx, ScheduleResult* arg2) {
u16 phi_a1;
s32 idx = arg2->result - 1;
- this->unk_3C8 = SubS_GetAdditionalPath(globalCtx, params, D_80AEF8E8[idx + 1]);
- if (this->unk_3C8 == 0) {
+ this->timePath = SubS_GetAdditionalPath(globalCtx, params, D_80AEF8E8[idx + 1]);
+ if (this->timePath == NULL) {
return false;
}
- if ((this->unk_3CC <= 0) && (this->unk_3CC != 0) && (this->unk_3D0 >= 0)) {
+ if ((this->unk_3CC <= 0) && (this->unk_3CC != 0) && (this->timePathTimeSpeed >= 0)) {
phi_a1 = sp1E;
} else {
phi_a1 = arg2->time0;
}
- this->unk_3E4 = arg2->time1 - phi_a1;
- this->unk_3F0 = sp1E - phi_a1;
- phi_a1 = this->unk_3C8->count - 2;
- this->unk_3E8 = this->unk_3E4 / phi_a1;
- this->unk_3EC = (this->unk_3F0 / this->unk_3E8) + 2;
+ this->timePathTotalTime = arg2->time1 - phi_a1;
+ this->timePathElapsedTime = sp1E - phi_a1;
+ phi_a1 = this->timePath->count - (SUBS_TIME_PATHING_ORDER - 1);
+ this->timePathWaypointTime = this->timePathTotalTime / phi_a1;
+ this->timePathWaypoint = (this->timePathElapsedTime / this->timePathWaypointTime) + (SUBS_TIME_PATHING_ORDER - 1);
this->unk_3CE &= ~4;
this->unk_3CE &= ~8;
return true;
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
index 119ae2b2b..ade05d6be 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
@@ -51,16 +51,16 @@ typedef struct EnTk {
/* 0x0324 */ Vec3f unk_324[6];
/* 0x036C */ s32 unk_36C;
/* 0x0370 */ UNK_TYPE1 unk370[0x58];
- /* 0x03C8 */ Path* unk_3C8;
+ /* 0x03C8 */ Path* timePath;
/* 0x03CC */ u8 unk_3CC;
/* 0x03CE */ u16 unk_3CE;
- /* 0x03D0 */ s32 unk_3D0;
- /* 0x03D4 */ Vec3f unk_3D4;
- /* 0x03E0 */ f32 unk_3E0;
- /* 0x03E4 */ s32 unk_3E4;
- /* 0x03E8 */ s32 unk_3E8;
- /* 0x03EC */ s32 unk_3EC;
- /* 0x03F0 */ s32 unk_3F0;
+ /* 0x03D0 */ s32 timePathTimeSpeed;
+ /* 0x03D4 */ Vec3f timePathTargetPos;
+ /* 0x03E0 */ f32 timePathProgress;
+ /* 0x03E4 */ s32 timePathTotalTime;
+ /* 0x03E8 */ s32 timePathWaypointTime;
+ /* 0x03EC */ s32 timePathWaypoint;
+ /* 0x03F0 */ s32 timePathElapsedTime;
} EnTk; // size = 0x3F4
extern const ActorInit En_Tk_InitVars;
diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c
index fc06cff18..7ca536b6a 100644
--- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c
+++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c
@@ -5,6 +5,7 @@
*/
#include "z_en_torch.h"
+#include "overlays/actors/ovl_En_Box/z_en_box.h"
#define FLAGS 0x00000000
@@ -17,7 +18,9 @@ const ActorInit En_Torch_InitVars = {
(ActorFunc)EnTorch_Init, (ActorFunc)NULL, (ActorFunc)NULL, (ActorFunc)NULL,
};
-static u8 sChestContents[] = { 0x02, 0x04, 0x05, 0x06, 0x36, 0x3A, 0x14, 0x14 };
+static u8 sChestContents[] = {
+ GI_RUPEE_BLUE, GI_RUPEE_RED, GI_RUPEE_PURPLE, GI_RUPEE_SILVER, GI_BOMBCHUS_1, GI_BOMBCHUS_5, GI_BOMBS_1, GI_BOMBS_1,
+};
void EnTorch_Init(Actor* thisx, GlobalContext* globalCtx) {
EnTorch* this = THIS;
@@ -25,6 +28,6 @@ void EnTorch_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOX, this->actor.world.pos.x, this->actor.world.pos.y,
this->actor.world.pos.z, 0, this->actor.shape.rot.y, 0,
- (sChestContents[(returnData >> 0x5) & 0x7] << 0x5) | 0x5000 | (returnData & 0x1F));
+ ENBOX_PARAMS(ENBOX_TYPE_SMALL, sChestContents[(returnData >> 0x5) & 0x7], returnData));
Actor_MarkForDeath(&this->actor);
}
diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c
index a2056a4ef..f189a79e9 100644
--- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c
+++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c
@@ -114,11 +114,11 @@ s32 EnTrt_TestItemSelected(GlobalContext* globalCtx) {
MessageContext* msgCtx = &globalCtx->msgCtx;
if (msgCtx->unk12020 == 0x10 || msgCtx->unk12020 == 0x11) {
- return CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A);
+ return CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A);
}
- return CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_A) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_B) ||
- CHECK_BTN_ALL(CONTROLLER1(globalCtx)->press.button, BTN_CUP);
+ return CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_A) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_B) ||
+ CHECK_BTN_ALL(CONTROLLER1(&globalCtx->state)->press.button, BTN_CUP);
}
void EnTrt_SpawnShopItems(EnTrt* this, GlobalContext* globalCtx, ShopItem* shopItem) {
@@ -257,8 +257,8 @@ void EnTrt_StartShopping(GlobalContext* globalCtx, EnTrt* this) {
}
void EnTrt_UpdateJoystickInputState(GlobalContext* globalCtx, EnTrt* this) {
- s8 stickX = CONTROLLER1(globalCtx)->rel.stick_x;
- s8 stickY = CONTROLLER1(globalCtx)->rel.stick_y;
+ s8 stickX = CONTROLLER1(&globalCtx->state)->rel.stick_x;
+ s8 stickY = CONTROLLER1(&globalCtx->state)->rel.stick_y;
if (this->stickAccumX == 0) {
if (stickX > 30 || stickX < -30) {
@@ -314,7 +314,7 @@ void EnTrt_Hello(EnTrt* this, GlobalContext* globalCtx) {
}
if (talkState == 5 && Message_ShouldAdvance(globalCtx)) {
play_sound(NA_SE_SY_MESSAGE_PASS);
- if (!EnTrt_TestEndInteraction(this, globalCtx, CONTROLLER1(globalCtx))) {
+ if (!EnTrt_TestEndInteraction(this, globalCtx, CONTROLLER1(&globalCtx->state))) {
EnTrt_StartShopping(globalCtx, this);
}
}
@@ -520,7 +520,7 @@ void EnTrt_FaceShopkeeper(EnTrt* this, GlobalContext* globalCtx) {
this->cutsceneState = ENTRT_CUTSCENESTATE_WAITING;
} else if (talkState == 4) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnTrt_TestEndInteraction(this, globalCtx, CONTROLLER1(globalCtx))) {
+ if (!EnTrt_TestEndInteraction(this, globalCtx, CONTROLLER1(&globalCtx->state))) {
if ((!Message_ShouldAdvance(globalCtx) || !EnTrt_FacingShopkeeperDialogResult(this, globalCtx)) &&
(this->stickAccumX > 0)) {
cursorIdx = EnTrt_SetCursorIndexFromNeutral(this, 2);
@@ -622,7 +622,7 @@ void EnTrt_BrowseShelf(EnTrt* this, GlobalContext* globalCtx) {
EnTrt_UpdateCursorPos(globalCtx, this);
if (talkState == 5) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnTrt_HasPlayerSelectedItem(globalCtx, this, CONTROLLER1(globalCtx))) {
+ if (!EnTrt_HasPlayerSelectedItem(globalCtx, this, CONTROLLER1(&globalCtx->state))) {
EnTrt_CursorLeftRight(globalCtx, this);
if (this->cursorIdx != prevCursorIdx) {
func_80151938(globalCtx, EnTrt_GetItemTextId(this));
@@ -707,7 +707,8 @@ void EnTrt_SelectItem(EnTrt* this, GlobalContext* globalCtx) {
if (EnTrt_TakeItemOffShelf(this)) {
if (talkState == 4) {
Interface_SetDoAction(globalCtx, DO_ACTION_DECIDE);
- if (!EnTrt_TestCancelOption(this, globalCtx, CONTROLLER1(globalCtx)) && Message_ShouldAdvance(globalCtx)) {
+ if (!EnTrt_TestCancelOption(this, globalCtx, CONTROLLER1(&globalCtx->state)) &&
+ Message_ShouldAdvance(globalCtx)) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
EnTrt_HandleCanBuyItem(globalCtx, this);
@@ -1098,7 +1099,7 @@ void EnTrt_ContinueShopping(EnTrt* this, GlobalContext* globalCtx) {
EnTrt_ResetItemPosition(this);
item = this->items[this->cursorIdx];
item->restockFunc(globalCtx, item);
- if (!EnTrt_TestEndInteraction(this, globalCtx, CONTROLLER1(globalCtx))) {
+ if (!EnTrt_TestEndInteraction(this, globalCtx, CONTROLLER1(&globalCtx->state))) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0:
func_8019F208();
diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c
index f19c1e2cd..56cff0288 100644
--- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c
+++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c
@@ -299,7 +299,7 @@ void func_80AE0460(EnTsn* this, GlobalContext* globalCtx) {
ENTSN_SET_Z(&this->unk_1D8->actor, false);
this->actionFunc = func_80AE0418;
} else {
- Actor_PickUp(&this->actor, globalCtx, GI_95, 2000.0f, 1000.0f);
+ Actor_PickUp(&this->actor, globalCtx, GI_SEAHORSE, 2000.0f, 1000.0f);
}
}
@@ -568,7 +568,7 @@ void EnTsn_Update(Actor* thisx, GlobalContext* globalCtx) {
SkelAnime_Update(&this->skelAnime);
if (this->unk_220 & 1) {
- func_800E9250(globalCtx, &this->actor, &this->unk_222, &this->unk_228, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_222, &this->unk_228, this->actor.focus.pos);
} else {
Math_SmoothStepToS(&this->unk_222.x, 0, 6, 0x1838, 0x64);
Math_SmoothStepToS(&this->unk_222.y, 0, 6, 0x1838, 0x64);
diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c
index 2c5f76f2e..31fb3a853 100644
--- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c
+++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c
@@ -5,7 +5,6 @@
*/
#include "z_en_zo.h"
-#include "objects/object_zo/object_zo.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8 | ACTOR_FLAG_10)
@@ -174,7 +173,7 @@ void EnZo_UpdateCollider(EnZo* this, GlobalContext* globalCtx) {
}
void EnZo_LookAtPlayer(EnZo* this, GlobalContext* globalCtx) {
- static TurnOptionsSet sTurnOptions = {
+ static TrackOptionsSet sTrackOptions = {
{ 0xFA0, 4, 1, 3 },
{ 0x1770, 4, 1, 6 },
{ 0xFA0, 4, 1, 3 },
@@ -188,11 +187,11 @@ void EnZo_LookAtPlayer(EnZo* this, GlobalContext* globalCtx) {
point.x = player->actor.world.pos.x;
point.y = player->bodyPartsPos[7].y + 3.0f;
point.z = player->actor.world.pos.z;
- SubS_TurnToPoint(&point, &this->actor.focus.pos, &this->actor.shape.rot, &this->turnTarget, &this->headRot,
- &this->upperBodyRot, &sTurnOptions);
+ SubS_TrackPoint(&point, &this->actor.focus.pos, &this->actor.shape.rot, &this->trackTarget, &this->headRot,
+ &this->upperBodyRot, &sTrackOptions);
} else {
- Math_SmoothStepToS(&this->turnTarget.x, 0, 4, 1000, 1);
- Math_SmoothStepToS(&this->turnTarget.y, 0, 4, 1000, 1);
+ Math_SmoothStepToS(&this->trackTarget.x, 0, 4, 1000, 1);
+ Math_SmoothStepToS(&this->trackTarget.y, 0, 4, 1000, 1);
Math_SmoothStepToS(&this->headRot.x, 0, 4, 1000, 1);
Math_SmoothStepToS(&this->headRot.y, 0, 4, 1000, 1);
@@ -257,7 +256,8 @@ void EnZo_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f);
- SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gZoraSkel, NULL, this->jointTable, this->morphTable, 20);
+ SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gZoraSkel, NULL, this->jointTable, this->morphTable,
+ ZORA_LIMB_MAX);
EnZo_SetAnimation(&this->skelAnime, 0);
Collider_InitCylinder(globalCtx, &this->collider);
@@ -291,19 +291,20 @@ s32 EnZo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
Gfx** gfx) {
EnZo* this = THIS;
- if (limbIndex == 15) {
+ if (limbIndex == ZORA_LIMB_HEAD) {
Matrix_Translate(1500.0f, 0.0f, 0.0f, MTXMODE_APPLY);
Matrix_RotateXS(this->headRot.y, MTXMODE_APPLY);
Matrix_RotateZS(-this->headRot.x, MTXMODE_APPLY);
Matrix_Translate(-1500.0f, 0.0f, 0.0f, MTXMODE_APPLY);
}
- if (limbIndex == 8) {
+ if (limbIndex == ZORA_LIMB_TORSO) {
Matrix_RotateXS(-this->upperBodyRot.y, MTXMODE_APPLY);
Matrix_RotateZS(-this->upperBodyRot.x, MTXMODE_APPLY);
}
- if ((limbIndex == 8) || (limbIndex == 9) || (limbIndex == 12)) {
+ if ((limbIndex == ZORA_LIMB_TORSO) || (limbIndex == ZORA_LIMB_LEFT_UPPER_ARM) ||
+ (limbIndex == ZORA_LIMB_RIGHT_UPPER_ARM)) {
rot->y += (s16)(Math_SinS(this->limbRotY[limbIndex]) * 200.0f);
rot->z += (s16)(Math_CosS(this->limbRotZ[limbIndex]) * 200.0f);
}
@@ -318,13 +319,13 @@ void EnZo_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
if (sBodyParts[limbIndex] >= 0) {
Matrix_MultVec3f(&zeroVec, &this->bodyPartsPos[sBodyParts[limbIndex]]);
}
- if (limbIndex == 15) {
+ if (limbIndex == ZORA_LIMB_HEAD) {
Matrix_MultVec3f(&sp30, &this->actor.focus.pos);
}
- if (limbIndex == 4) {
+ if (limbIndex == ZORA_LIMB_LEFT_FOOT) {
Matrix_MultVec3f(&zeroVec, &this->leftFootPos);
}
- if (limbIndex == 7) {
+ if (limbIndex == ZORA_LIMB_RIGHT_FOOT) {
Matrix_MultVec3f(&zeroVec, &this->rightFootPos);
}
}
diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/src/overlays/actors/ovl_En_Zo/z_en_zo.h
index b5faef776..fcc753ba5 100644
--- a/src/overlays/actors/ovl_En_Zo/z_en_zo.h
+++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.h
@@ -2,6 +2,7 @@
#define Z_EN_ZO_H
#include "global.h"
+#include "objects/object_zo/object_zo.h"
struct EnZo;
@@ -22,9 +23,9 @@ typedef struct EnZo {
/* 0x01F0 */ Vec3f rightFootPos;
/* 0x01FC */ u8 isLeftFootGrounded;
/* 0x01FD */ u8 isRightFootGrounded;
- /* 0x01FE */ Vec3s jointTable[20];
- /* 0x0276 */ Vec3s morphTable[20];
- /* 0x02EE */ Vec3s turnTarget;
+ /* 0x01FE */ Vec3s jointTable[ZORA_LIMB_MAX];
+ /* 0x0276 */ Vec3s morphTable[ZORA_LIMB_MAX];
+ /* 0x02EE */ Vec3s trackTarget;
/* 0x02F4 */ Vec3s headRot;
/* 0x02FA */ Vec3s upperBodyRot;
/* 0x0300 */ UNK_TYPE1 unk_300[0x12];
diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c
index 24b03ab5f..33e26e7e5 100644
--- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c
+++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c
@@ -726,7 +726,7 @@ void EnZob_Update(Actor* thisx, GlobalContext* globalCtx) {
}
if (this->unk_2F4 & 1) {
- func_800E9250(globalCtx, &this->actor, &this->unk_2F6, &this->unk_2FC, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_2F6, &this->unk_2FC, this->actor.focus.pos);
} else {
Math_SmoothStepToS(&this->unk_2F6.x, 0, 6, 6200, 100);
Math_SmoothStepToS(&this->unk_2F6.y, 0, 6, 6200, 100);
diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c
index f7636d8de..1bf0d7303 100644
--- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c
+++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c
@@ -87,7 +87,7 @@ void EnZot_Init(Actor* thisx, GlobalContext* globalCtx2) {
Actor_SetScale(&this->actor, 0.01f);
this->actionFunc = func_80B97100;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gZoraSkel, &gZoraIdleAnim, this->jointTable, this->morphTable, 20);
- Animation_PlayLoop(&this->skelAnime, &object_zo_Anim_00DE20);
+ Animation_PlayLoop(&this->skelAnime, &gZoraStandAnim);
this->unk_2F0 = 0;
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@@ -235,9 +235,9 @@ void EnZot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_80B96BEC(EnZot* this, s16 arg1, u8 arg2) {
static AnimationHeader* sAnimations[] = {
- &object_zo_Anim_00DE20, &gZoraWalkAnim, &object_zo_Anim_00F4E8, &object_zo_Anim_00E400,
- &object_zo_Anim_00FDF0, &object_zo_Anim_010B18, &object_zo_Anim_011424, &object_zo_Anim_00EDF0,
- &object_zo_Anim_00DF54, &object_zo_Anim_00DF54,
+ &gZoraStandAnim, &gZoraWalkAnim, &gZoraSitAnim, &gZoraRunAnim,
+ &gZoraFixSpeakerStartAnim, &gZoraFixSpeakerLoopAnim, &gZoraFixSpeakerEndAnim, &gZoraBobHandAnim,
+ &gZoraListenAnim, &gZoraListenAnim,
};
if ((arg1 >= 0) && (arg1 < 10)) {
@@ -1324,7 +1324,7 @@ void EnZot_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
if (!(this->unk_2F2 & 8)) {
if (!(this->unk_2F2 & 4) && func_80B96DF0(this, globalCtx)) {
- func_800E9250(globalCtx, &this->actor, &this->unk_2C4, &this->unk_2CA, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_2C4, &this->unk_2CA, this->actor.focus.pos);
} else {
Math_SmoothStepToS(&this->unk_2C4.x, 0, 6, 6200, 100);
Math_SmoothStepToS(&this->unk_2C4.y, 0, 6, 6200, 100);
diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c
index c3a90b9f0..617ee110f 100644
--- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c
+++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c
@@ -482,7 +482,7 @@ void EnZov_Update(Actor* thisx, GlobalContext* globalCtx) {
}
if ((this->unk_320 & 1) && func_80BD15A4(this, globalCtx)) {
- func_800E9250(globalCtx, &this->actor, &this->unk_2F0, &this->unk_2F6, this->actor.focus.pos);
+ Actor_TrackPlayer(globalCtx, &this->actor, &this->unk_2F0, &this->unk_2F6, this->actor.focus.pos);
} else {
if ((this->unk_320 & 0x10) && (this->unk_322 == 0)) {
Math_SmoothStepToS(&this->unk_2F0.x, -0x1B58, 6, 0x1838, 0x64);
diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c
index d29141499..c0751b078 100644
--- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c
+++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c
@@ -188,7 +188,7 @@ void func_80BDC830(EnZowStruct* ptr, GlobalContext* globalCtx) {
if (ptr->unk_00 == 1) {
if (!flag) {
gDPPipeSync(POLY_XLU_DISP++);
- gSPDisplayList(POLY_XLU_DISP++, object_zo_DL_00D220);
+ gSPDisplayList(POLY_XLU_DISP++, gZoraRippleMaterialDL);
gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0);
if (1) {}
flag = true;
@@ -201,7 +201,7 @@ void func_80BDC830(EnZowStruct* ptr, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, object_zo_DL_00D288);
+ gSPDisplayList(POLY_XLU_DISP++, gZoraRippleModelDL);
}
}
@@ -219,7 +219,7 @@ void func_80BDC9DC(EnZowStruct* ptr, GlobalContext* globalCtx) {
for (i = 0; i < 15; i++, ptr++) {
if (ptr->unk_00 == 3) {
if (!flag) {
- gSPDisplayList(POLY_XLU_DISP++, object_zo_DL_0029F0);
+ gSPDisplayList(POLY_XLU_DISP++, gZoraBubbleMaterialDL);
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 150, 150, 150, 0);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
@@ -233,7 +233,7 @@ void func_80BDC9DC(EnZowStruct* ptr, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, object_zo_DL_002A50);
+ gSPDisplayList(POLY_XLU_DISP++, gZoraBubbleModelDL);
}
}
@@ -251,7 +251,7 @@ void func_80BDCB84(EnZowStruct* ptr, GlobalContext* globalCtx) {
for (i = 0; i < 15; i++, ptr++) {
if (ptr->unk_00 == 2) {
if (!flag) {
- gSPDisplayList(POLY_XLU_DISP++, object_zo_DL_002BA0);
+ gSPDisplayList(POLY_XLU_DISP++, gZoraSplashMaterialDL);
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 200, 0);
if (1) {}
@@ -266,7 +266,7 @@ void func_80BDCB84(EnZowStruct* ptr, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, object_zo_DL_002C10);
+ gSPDisplayList(POLY_XLU_DISP++, gZoraSplashModelDL);
}
}
@@ -333,7 +333,7 @@ void EnZow_Destroy(Actor* thisx, GlobalContext* globalCtx) {
Collider_DestroyCylinder(globalCtx, &this->collider);
}
-AnimationHeader* sAnimations[] = { &object_zo_Anim_004168, &gZoraSurfacingAnim, &gZoraSurfacingAnim };
+static AnimationHeader* sAnimations[] = { &gZoraTreadingWaterAnim, &gZoraSurfacingAnim, &gZoraSurfacingAnim };
void func_80BDD04C(EnZow* this, s16 arg1, u8 arg2) {
if ((arg1 >= 0) && (arg1 < 3)) {
diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c
index 880d72b3f..bda85a450 100644
--- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c
+++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_boat.h"
+#include "objects/object_kaizoku_obj/object_kaizoku_obj.h"
#define FLAGS (ACTOR_FLAG_10)
@@ -15,7 +16,8 @@ void ObjBoat_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjBoat_Update(Actor* thisx, GlobalContext* globalCtx);
void ObjBoat_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
+void func_80B9B428(Actor* thisx, GlobalContext* globalCtx);
+
const ActorInit Obj_Boat_InitVars = {
ACTOR_OBJ_BOAT,
ACTORCAT_BG,
@@ -28,31 +30,162 @@ const ActorInit Obj_Boat_InitVars = {
(ActorFunc)ObjBoat_Draw,
};
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80B9B680[] = {
+static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
};
-#endif
+s16 func_80B9AF50(ObjBoat* this, Vec3f* arg0) {
+ s16 yaw;
+ Vec3s* temp = &this->unk_164[(s32)this->unk_15C];
-extern InitChainEntry D_80B9B680[];
+ Math_Vec3s_ToVec3f(arg0, &temp[this->unk_15D]);
+ yaw = Math_Vec3f_Yaw(&this->dyna.actor.world.pos, arg0);
-extern UNK_TYPE D_06007630;
-extern UNK_TYPE D_06009A88;
+ return ((this->unk_15D > 0) ? yaw : (yaw + 0x8000));
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Boat/func_80B9AF50.s")
+void ObjBoat_Init(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad[2];
+ Path* path;
+ ObjBoat* this = THIS;
+ Vec3f sp24;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Boat/ObjBoat_Init.s")
+ Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
+ DynaPolyActor_Init(&this->dyna, 3);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_kaizoku_obj_Colheader_009A88);
+ if (thisx->params < 0) {
+ this->dyna.actor.update = func_80B9B428;
+ } else {
+ path = &globalCtx->setupPathList[OBJBOAT_GET_PATH(thisx)];
+ this->unk_163 = path->count - 1;
+ this->unk_164 = Lib_SegmentedToVirtual(path->points);
+ this->unk_15D = 1;
+ this->dyna.actor.world.pos.x = this->unk_164[this->unk_15C].x;
+ this->dyna.actor.world.pos.z = this->unk_164[this->unk_15C].z;
+ this->dyna.actor.shape.rot.y = func_80B9AF50(this, &sp24);
+ this->dyna.actor.world.rot.y = this->dyna.actor.shape.rot.y;
+ this->unk_15D = -this->unk_15D;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Boat/ObjBoat_Destroy.s")
+void ObjBoat_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ ObjBoat* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Boat/func_80B9B124.s")
+ DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Boat/ObjBoat_Update.s")
+void func_80B9B124(ObjBoat* this) {
+ this->unk_160 += 1000;
+ this->dyna.actor.world.pos.y = Math_SinS(this->unk_160) + this->dyna.actor.home.pos.y;
+ this->dyna.actor.shape.rot.x = Math_SinS(this->unk_160) * 100.0f;
+ this->dyna.actor.shape.rot.z = Math_SinS(this->unk_160 * 2) * 50.0f;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Boat/func_80B9B428.s")
+void ObjBoat_Update(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ ObjBoat* this = THIS;
+ Player* player = GET_PLAYER(globalCtx);
+ s32 temp = DynaPolyActor_IsInRidingMovingState(&this->dyna);
+ f32 sp3C = 0.0f;
+ s16 sp3A = this->dyna.actor.shape.rot.y;
+ Vec3f sp2C;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Boat/ObjBoat_Draw.s")
+ if ((temp != 0) || ((DynaPolyActor_IsInRidingFallingState(&this->dyna)))) {
+ if ((this->unk_15F == 0) && (OBJBOAT_GET_4000(thisx) || ((temp != 0) && (this->unk_15C == this->unk_15E)))) {
+ this->unk_15D = -this->unk_15D;
+ if (this->unk_15D > 0) {
+ this->unk_15E = this->unk_163;
+ } else {
+ this->unk_15E = 0;
+ }
+ this->unk_15F = 60;
+ }
+ } else if (this->dyna.actor.speedXZ == 0.0f) {
+ if (this->unk_15F != 0) {
+ this->unk_15F--;
+ }
+ }
+ if (this->unk_15C != this->unk_15E) {
+ sp3A = func_80B9AF50(this, &sp2C);
+ if (Math_Vec3f_DistXZ(&this->dyna.actor.world.pos, &sp2C) < 200.0f) {
+ this->unk_15C += this->unk_15D;
+ if (this->unk_15C == this->unk_15E) {
+ if (OBJBOAT_GET_4000(thisx)) {
+ this->unk_15C = 0;
+ } else if (this->dyna.actor.speedXZ == 0.0f) {
+ this->unk_15C = 0;
+ this->unk_15D = -1;
+ }
+ }
+ } else {
+ sp3C = this->unk_15D * (OBJBOAT_GET_4000(thisx) ? 5.0f : 3.0f);
+ }
+ }
+ if (player->csMode != 0x1A) {
+ Math_ScaledStepToS(&this->dyna.actor.shape.rot.y, sp3A, (s16)(s32)(fabsf(this->dyna.actor.speedXZ) * 40.0f));
+ this->dyna.actor.world.rot.y = this->dyna.actor.shape.rot.y;
+ Math_StepToF(&this->dyna.actor.speedXZ, sp3C, 0.05f);
+ Actor_MoveWithGravity(&this->dyna.actor);
+ if (this->dyna.actor.speedXZ != 0.0f) {
+ func_800B9010(&this->dyna.actor, NA_SE_EV_PIRATE_SHIP - SFX_FLAG);
+ }
+ }
+ func_80B9B124(this);
+}
+
+void func_80B9B428(Actor* thisx, GlobalContext* globalCtx2) {
+ GlobalContext* globalCtx = globalCtx2;
+ ObjBoat* this = THIS;
+
+ if (Cutscene_CheckActorAction(globalCtx, 511)) {
+ CsCmdActorAction* actionIndex = globalCtx->csCtx.actorActions[Cutscene_GetActorActionIndex(globalCtx, 511)];
+ if (this->unk_15F != actionIndex->action) {
+ this->dyna.actor.shape.rot.x = actionIndex->urot.x;
+ if (actionIndex->action != 1) {
+ Path* path = &globalCtx->setupPathList[OBJBOAT_GET_PATH(&this->dyna.actor)];
+
+ if (actionIndex->action == 3) {
+ path = &globalCtx->setupPathList[path->unk1];
+ }
+ this->unk_163 = path->count;
+ this->unk_164 = Lib_SegmentedToVirtual(path->points);
+ Math_Vec3s_ToVec3f(&this->dyna.actor.world.pos, this->unk_164);
+ this->dyna.actor.speedXZ = actionIndex->urot.z * (45.0f / 0x2000);
+ this->unk_164++;
+ this->unk_15C = 1;
+ }
+ this->unk_15F = actionIndex->action;
+ } else {
+ if (actionIndex->action != 1) {
+ Vec3f vec;
+ f32 step;
+
+ Math_Vec3s_ToVec3f(&vec, this->unk_164);
+ step = Math_Vec3f_StepTo(&this->dyna.actor.world.pos, &vec, this->dyna.actor.speedXZ);
+ if ((this->unk_15C < this->unk_163) && (step < this->dyna.actor.speedXZ)) {
+ this->unk_164++;
+ this->unk_15C++;
+ }
+ }
+ if (actionIndex->action != 3) {
+ func_80B9B124(this);
+ if (actionIndex->action == 2) {
+ func_800B9010(&this->dyna.actor, NA_SE_EV_PIRATE_SHIP - SFX_FLAG);
+ }
+ } else {
+ this->dyna.actor.shape.rot.y += 0x7D0;
+ this->dyna.actor.shape.rot.x += 0x3E8;
+ this->dyna.actor.shape.rot.z += 0x1F4;
+ }
+ }
+ }
+}
+
+void ObjBoat_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ ObjBoat* this = THIS;
+
+ Gfx_DrawDListOpa(globalCtx, object_kaizoku_obj_DL_007630);
+}
diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h
index 988dd6a2b..110b89dde 100644
--- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h
+++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.h
@@ -3,12 +3,22 @@
#include "global.h"
+#define OBJBOAT_GET_PATH(thisx) (((thisx)->params >> 7) & 0x1F)
+#define OBJBOAT_GET_4000(thisx) ((thisx)->params & 0x4000)
+
struct ObjBoat;
typedef struct ObjBoat {
- /* 0x000 */ Actor actor;
- /* 0x144 */ char unk_144[0x24];
-} ObjBoat; // size = 0x168
+ /* 0x000 */ DynaPolyActor dyna;
+ /* 0x15C */ u8 unk_15C;
+ /* 0x15D */ s8 unk_15D;
+ /* 0x15E */ u8 unk_15E;
+ /* 0x15F */ u8 unk_15F;
+ /* 0x160 */ s16 unk_160;
+ /* 0x162 */ UNK_TYPE1 pad_162;
+ /* 0x163 */ u8 unk_163;
+ /* 0x164 */ Vec3s* unk_164;
+} ObjBoat;
extern const ActorInit Obj_Boat_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
index 55304d195..8cf2039b4 100644
--- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
+++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
@@ -193,7 +193,7 @@ void ObjBombiwa_Init(Actor* thisx, GlobalContext* globalCtx) {
if (sp34 == OBJBOMBIWA_100_0) {
if (this->actor.shape.rot.y == 0) {
- this->actor.shape.rot.y = this->actor.world.rot.y = (u32)Rand_Next() >> 0x10;
+ this->actor.shape.rot.y = this->actor.world.rot.y = Rand_Next() >> 0x10;
}
func_80939594(this, globalCtx);
}
@@ -387,7 +387,7 @@ void func_8093A080(ObjBombiwa* this) {
ptr->unk_10 = i + 3.0f;
ptr->unk_14.x = phi_s2;
- ptr->unk_14.y = (u32)Rand_Next() >> 0x10;
+ ptr->unk_14.y = Rand_Next() >> 0x10;
ptr->unk_14.z = 0;
ptr->unk_1A = 0;
}
diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c
index c90e5d8f8..832000b0c 100644
--- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c
+++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c
@@ -66,7 +66,7 @@ static InitChainEntry sInitChain[] = {
void ObjChan_InitChandelier(ObjChan* this2, GlobalContext* globalCtx);
void ObjChan_InitPot(ObjChan* this, GlobalContext* globalCtx);
-void ObjChan_CreateSmashParticles(ObjChan* this, GlobalContext* globalCtx);
+void ObjChan_CreateSmashEffects(ObjChan* this, GlobalContext* globalCtx);
void ObjChan_DrawPot(Actor* thisx, GlobalContext* globalCtx);
void ObjChan_DrawFire(ObjChan* this, GlobalContext* globalCtx);
@@ -305,7 +305,7 @@ void ObjChan_PotAction(ObjChan* this, GlobalContext* globalCtx) {
}
}
if (potBreaks) {
- ObjChan_CreateSmashParticles(this, globalCtx);
+ ObjChan_CreateSmashEffects(this, globalCtx);
((ObjChan*)this->actor.parent)->pots[this->myPotIndex] = NULL;
SoundSource_PlaySfxAtFixedWorldPos(globalCtx, &this->actor.world.pos, 20, NA_SE_EV_CHANDELIER_BROKEN);
func_80BB9A1C((ObjChan*)this->actor.parent, 40.0f);
@@ -321,7 +321,7 @@ void ObjChan_PotAction(ObjChan* this, GlobalContext* globalCtx) {
}
}
-void ObjChan_CreateSmashParticles(ObjChan* this, GlobalContext* globalCtx) {
+void ObjChan_CreateSmashEffects(ObjChan* this, GlobalContext* globalCtx) {
s16 new_var = 0;
s32 phi_s0;
Vec3f spDC;
diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c
index c6eef8626..22df1af73 100644
--- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c
+++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c
@@ -263,13 +263,13 @@ void func_80B12E7C(ObjDhouse* this, GlobalContext* globalCtx, ObjDhouseStruct1*
ptr2->unk_18 = (Rand_ZeroOne() * 0.057f) + 0.003f;
- ptr2->unk_1C.x = (u32)Rand_Next() >> 0x10;
- ptr2->unk_1C.y = (u32)Rand_Next() >> 0x10;
- ptr2->unk_1C.z = (u32)Rand_Next() >> 0x10;
+ ptr2->unk_1C.x = Rand_Next() >> 0x10;
+ ptr2->unk_1C.y = Rand_Next() >> 0x10;
+ ptr2->unk_1C.z = Rand_Next() >> 0x10;
- ptr2->unk_22 = ((u32)Rand_Next() >> 0x11) - 0x3FFF;
- ptr2->unk_24 = ((u32)Rand_Next() >> 0x13) - 0xFFF;
- ptr2->unk_26 = ((u32)Rand_Next() >> 0x12) - 0x1FFF;
+ ptr2->unk_22 = (Rand_Next() >> 0x11) - 0x3FFF;
+ ptr2->unk_24 = (Rand_Next() >> 0x13) - 0xFFF;
+ ptr2->unk_26 = (Rand_Next() >> 0x12) - 0x1FFF;
ptr2->unk_29 = 0;
ptr2->unk_28 = 40;
@@ -307,13 +307,13 @@ void func_80B13170(ObjDhouse* this, GlobalContext* globalCtx, ObjDhouseStruct1*
ptr2->unk_00.y = (ptr2->unk_00.y * 23.0f) + sp98.y + 15.0f;
ptr2->unk_00.z = (ptr2->unk_00.z * 80.0f) + sp98.z;
- ptr2->unk_1C.x = (u32)Rand_Next() >> 0x10;
- ptr2->unk_1C.y = (u32)Rand_Next() >> 0x10;
- ptr2->unk_1C.z = (u32)Rand_Next() >> 0x10;
+ ptr2->unk_1C.x = Rand_Next() >> 0x10;
+ ptr2->unk_1C.y = Rand_Next() >> 0x10;
+ ptr2->unk_1C.z = Rand_Next() >> 0x10;
- ptr2->unk_22 = ((u32)Rand_Next() >> 0x12) - 0x1FFF;
- ptr2->unk_24 = ((u32)Rand_Next() >> 0x13) - 0xFFF;
- ptr2->unk_26 = ((u32)Rand_Next() >> 0x12) - 0x1FFF;
+ ptr2->unk_22 = (Rand_Next() >> 0x12) - 0x1FFF;
+ ptr2->unk_24 = (Rand_Next() >> 0x13) - 0xFFF;
+ ptr2->unk_26 = (Rand_Next() >> 0x12) - 0x1FFF;
ptr2->unk_28 = 40;
@@ -356,13 +356,13 @@ void func_80B13474(ObjDhouse* this, GlobalContext* globalCtx, Vec3f* arg2) {
ptr2->unk_00.y = ((ptr2->unk_00.y - 0.4f) * 20.0f) + arg2->y;
ptr2->unk_00.z = (ptr2->unk_00.z * 40.0f) + arg2->z;
- ptr2->unk_1C.x = (u32)Rand_Next() >> 0x10;
- ptr2->unk_1C.y = (u32)Rand_Next() >> 0x10;
- ptr2->unk_1C.z = (u32)Rand_Next() >> 0x10;
+ ptr2->unk_1C.x = Rand_Next() >> 0x10;
+ ptr2->unk_1C.y = Rand_Next() >> 0x10;
+ ptr2->unk_1C.z = Rand_Next() >> 0x10;
- ptr2->unk_22 = ((u32)Rand_Next() >> 0x12) - 0x1FFF;
- ptr2->unk_24 = ((u32)Rand_Next() >> 0x13) - 0xFFF;
- ptr2->unk_26 = ((u32)Rand_Next() >> 0x12) - 0x1FFF;
+ ptr2->unk_22 = (Rand_Next() >> 0x12) - 0x1FFF;
+ ptr2->unk_24 = (Rand_Next() >> 0x13) - 0xFFF;
+ ptr2->unk_26 = (Rand_Next() >> 0x12) - 0x1FFF;
ptr2->unk_28 = 40;
ptr2->unk_18 = (Rand_ZeroOne() * 0.07f) + 0.003f;
diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c
index 214e60294..58baeeb25 100644
--- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c
+++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c
@@ -400,7 +400,7 @@ void ObjFlowerpot_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, sInitChain);
if (this->actor.shape.rot.y == 0) {
- this->actor.shape.rot.y = this->actor.world.rot.y = (u32)Rand_Next() >> 0x10;
+ this->actor.shape.rot.y = this->actor.world.rot.y = Rand_Next() >> 0x10;
}
Collider_InitJntSph(globalCtx, &this->collider);
@@ -416,11 +416,11 @@ void ObjFlowerpot_Init(Actor* thisx, GlobalContext* globalCtx) {
func_80A1C818(this);
if (D_80A1D404) {
- D_80A1DA38 = (u32)Rand_Next() >> 0x10;
- D_80A1DA3A = (u32)Rand_Next() >> 0x10;
- D_80A1DA3C = (u32)Rand_Next() >> 0x10;
- D_80A1DA3E = (u32)Rand_Next() >> 0x10;
- D_80A1DA40 = (u32)Rand_Next() >> 0x10;
+ D_80A1DA38 = Rand_Next() >> 0x10;
+ D_80A1DA3A = Rand_Next() >> 0x10;
+ D_80A1DA3C = Rand_Next() >> 0x10;
+ D_80A1DA3E = Rand_Next() >> 0x10;
+ D_80A1DA40 = Rand_Next() >> 0x10;
D_80A1D404 = false;
func_80A1B3D0();
D_80A1D830 = globalCtx->gameplayFrames;
diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c
index 51f2febc7..705325429 100644
--- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c
+++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c
@@ -146,11 +146,11 @@ void ObjGrass_Init(Actor* thisx, GlobalContext* globalCtx) {
}
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
- this->unk_3288 = (u32)Rand_Next() >> 0x10;
- this->unk_328A = (u32)Rand_Next() >> 0x10;
- this->unk_328C = (u32)Rand_Next() >> 0x10;
- this->unk_328E = (u32)Rand_Next() >> 0x10;
- this->unk_3290 = (u32)Rand_Next() >> 0x10;
+ this->unk_3288 = Rand_Next() >> 0x10;
+ this->unk_328A = Rand_Next() >> 0x10;
+ this->unk_328C = Rand_Next() >> 0x10;
+ this->unk_328E = Rand_Next() >> 0x10;
+ this->unk_3290 = Rand_Next() >> 0x10;
}
void ObjGrass_Destroy(Actor* thisx, GlobalContext* globalCtx) {
diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c
index d3199e8d8..c6dac659e 100644
--- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c
+++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c
@@ -389,7 +389,7 @@ void func_80B15264(ObjHakaisi* this) {
Matrix_RotateZYX(Rand_Next(), Rand_Next(), Rand_Next(), MTXMODE_NEW);
Matrix_MultVec3f(&D_80B15600, &this->unk_184);
this->dyna.actor.gravity = -1.0f;
- this->unk_19C = Rand_Next() >> 0x12;
+ this->unk_19C = (s32)Rand_Next() >> 0x12;
this->dyna.actor.velocity.x = Math_SinS(sp32) * 4.0f;
this->dyna.actor.velocity.z = Math_CosS(sp32) * 4.0f;
this->dyna.actor.velocity.y = 7.0f;
diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
index 10d8891ef..7b8377cee 100644
--- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
+++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
@@ -170,7 +170,7 @@ void ObjHamishi_Init(Actor* thisx, GlobalContext* globalCtx) {
}
if (this->actor.shape.rot.y == 0) {
- this->actor.shape.rot.y = (u32)Rand_Next() >> 0x10;
+ this->actor.shape.rot.y = Rand_Next() >> 0x10;
this->actor.world.rot.y = this->actor.shape.rot.y;
this->actor.home.rot.y = this->actor.shape.rot.y;
}
diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c
index 3fc7f84b1..c31eeb151 100644
--- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c
+++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c
@@ -463,7 +463,7 @@ void func_80A54E10(ObjHugebombiwa* this) {
ptr->unk_18 = (i * 1.04f) + 2.4f;
ptr->unk_1C.x = phi_s2;
- ptr->unk_1C.y = (u32)Rand_Next() >> 0x10;
+ ptr->unk_1C.y = Rand_Next() >> 0x10;
ptr->unk_1C.z = 0;
ptr->unk_22 = Rand_ZeroFloat(5000.0f);
ptr->unk_24 = 0;
@@ -558,7 +558,7 @@ void func_80A55310(ObjHugebombiwa* this) {
ptr->unk_18 = (i * 1.04f) + 2.4f;
ptr->unk_1C.x = phi_s2;
- ptr->unk_1C.y = (u32)Rand_Next() >> 0x10;
+ ptr->unk_1C.y = Rand_Next() >> 0x10;
ptr->unk_1C.z = 0;
ptr->unk_22 = Rand_ZeroFloat(5000.0f);
diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c
index a4db0d04e..1a6d96c73 100644
--- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c
+++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c
@@ -106,8 +106,8 @@ void func_80A2311C(Vec3f* arg0, Vec3f* arg1, s16 arg2) {
void func_80A2319C(ObjIceblock* this, f32 arg1) {
s32 i;
- s16 temp_s1 = (u32)Rand_Next() >> 0x10;
- s16 temp_s2 = (u32)Rand_Next() >> 0x10;
+ s16 temp_s1 = Rand_Next() >> 0x10;
+ s16 temp_s2 = Rand_Next() >> 0x10;
ObjIceBlockUnkStruct* ptr;
for (i = 0; i < ARRAY_COUNT(this->unk_1B4); i++) {
@@ -1364,7 +1364,7 @@ void func_80A265C0(ObjIceblock* this, GlobalContext* globalCtx) {
ptr->unk_0C = Rand_S16Offset(300, 300);
ptr->unk_0E = Rand_S16Offset(900, 600);
ptr->unk_04 = (2.0f * Rand_ZeroOne()) + 1.0f;
- ptr->unk_14 = (u32)Rand_Next() >> 0x10;
+ ptr->unk_14 = Rand_Next() >> 0x10;
func_80A24B74(this, globalCtx);
}
diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
index c0e5d8b4b..194989ad5 100644
--- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
+++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
@@ -121,7 +121,7 @@ void ObjKibako2_SpawnSkulltula(ObjKibako2* this, GlobalContext* globalCtx) {
if (ObjKibako2_ContainsSkulltula(this, globalCtx)) {
actorSpawnParam = KIBAKO2_SKULLTULA_SPAWN_PARAM(&this->dyna.actor);
- yRotation = ((u32)Rand_Next() >> 0x11) + this->dyna.actor.yawTowardsPlayer + 0xC000;
+ yRotation = (Rand_Next() >> 0x11) + this->dyna.actor.yawTowardsPlayer + 0xC000;
skulltula =
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_SW, this->dyna.actor.world.pos.x,
this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, 0, yRotation, 0, actorSpawnParam);
diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c
index 6163c753c..b17827e0a 100644
--- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c
+++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c
@@ -5,17 +5,25 @@
*/
#include "z_obj_rotlift.h"
+#include "objects/object_rotlift/object_rotlift.h"
#define FLAGS 0x00000000
#define THIS ((ObjRotlift*)thisx)
-void ObjRotlift_Init(Actor* thisx, GlobalContext* globalCtx);
+void ObjRotlift_Init(Actor* thisx, GlobalContext* globalCtx2);
void ObjRotlift_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjRotlift_Update(Actor* thisx, GlobalContext* globalCtx);
void ObjRotlift_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
+void ObjRotlift_MoveDekuFlowers(ObjRotlift* this);
+
+typedef struct ModelInfo {
+ /* 0x0 */ Gfx* dList;
+ /* 0x4 */ AnimatedMaterial* animMat;
+ /* 0x8 */ CollisionHeader* colHeader;
+} ModelInfo; // size = 0xC
+
const ActorInit Obj_Rotlift_InitVars = {
ACTOR_OBJ_ROTLIFT,
ACTORCAT_BG,
@@ -28,24 +36,107 @@ const ActorInit Obj_Rotlift_InitVars = {
(ActorFunc)ObjRotlift_Draw,
};
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80B96178[] = {
+struct ModelInfo sModelInfo[] = {
+ {
+ object_rotlift_DL_000400,
+ object_rotlift_Matanimheader_001F98,
+ &object_rotlift_Colheader_002190,
+ },
+ {
+ object_rotlift_DL_002CE0,
+ object_rotlift_Matanimheader_004A08,
+ &object_rotlift_Colheader_004DF0,
+ },
+};
+
+static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP),
};
-#endif
+void ObjRotlift_MoveDekuFlowers(ObjRotlift* this) {
+ ObjEtcetera** dekuFlower = this->dekuFlowers;
+ ObjEtcetera* curDekuFlower;
+ f32 posOffset = 300.0f;
+ s32 i;
-extern InitChainEntry D_80B96178[];
+ for (i = 0; i < ARRAY_COUNT(this->dekuFlowers); i++, dekuFlower++) {
+ curDekuFlower = *dekuFlower;
+ if (curDekuFlower->dyna.actor.update == NULL) {
+ *dekuFlower = NULL;
+ } else {
+ curDekuFlower->dyna.actor.world.pos.x =
+ this->dyna.actor.world.pos.x + posOffset * Math_SinS(this->dyna.actor.shape.rot.y);
+ curDekuFlower->dyna.actor.world.pos.y = this->dyna.actor.world.pos.y + 380.0f * this->dyna.actor.scale.y;
+ curDekuFlower->dyna.actor.world.pos.z =
+ this->dyna.actor.world.pos.z + posOffset * Math_CosS(this->dyna.actor.shape.rot.y);
+ curDekuFlower->dyna.actor.shape.rot.y = this->dyna.actor.shape.rot.y;
+ }
+ posOffset -= 600.0f;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Rotlift/func_80B95E20.s")
+void ObjRotlift_Init(Actor* thisx, GlobalContext* globalCtx2) {
+ GlobalContext* globalCtx = globalCtx2;
+ ObjRotlift* this = THIS;
+ s32 type = OBJROTLIFT_GET_TYPE(&this->dyna.actor);
+ s32 dekuFlowerType;
+ s32 i;
+ ModelInfo* modelInfo;
+ ObjEtcetera** dekuFlowers;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Rotlift/ObjRotlift_Init.s")
+ Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
+ if (type == 0) {
+ for (dekuFlowers = this->dekuFlowers, i = 0; i < ARRAY_COUNT(this->dekuFlowers); i++, dekuFlowers++) {
+ if (!OBJROTLIFT_GET_4000(thisx) || (i != 0)) {
+ dekuFlowerType = 0;
+ } else {
+ dekuFlowerType = 0x100;
+ }
+ *dekuFlowers = (ObjEtcetera*)Actor_SpawnAsChild(
+ &globalCtx->actorCtx, &this->dyna.actor, globalCtx, ACTOR_OBJ_ETCETERA, this->dyna.actor.world.pos.x,
+ this->dyna.actor.world.pos.y, this->dyna.actor.world.pos.z, this->dyna.actor.shape.rot.x,
+ this->dyna.actor.shape.rot.y, this->dyna.actor.shape.rot.z, dekuFlowerType);
+ }
+ ObjRotlift_MoveDekuFlowers(this);
+ }
+ DynaPolyActor_Init(&this->dyna, 3);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Rotlift/ObjRotlift_Destroy.s")
+ modelInfo = &sModelInfo[type];
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, modelInfo->colHeader);
+ modelInfo->animMat = Lib_SegmentedToVirtual(modelInfo->animMat);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Rotlift/ObjRotlift_Update.s")
+void ObjRotlift_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ ObjRotlift* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Rotlift/ObjRotlift_Draw.s")
+ DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+}
+
+void ObjRotlift_Update(Actor* thisx, GlobalContext* globalCtx) {
+ ObjRotlift* this = THIS;
+ s16 angShift;
+ s32 angVelocity;
+
+ if (OBJROTLIFT_GET_TYPE(&this->dyna.actor) == 0) {
+ ObjRotlift_MoveDekuFlowers(this);
+ }
+ if (thisx->params >= 0) {
+ angVelocity = -0xC8;
+ } else {
+ angVelocity = 0xC8;
+ }
+ angShift = angVelocity;
+ this->dyna.actor.shape.rot.y += angShift;
+}
+
+void ObjRotlift_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ ObjRotlift* this = THIS;
+ ModelInfo* modelInfo = &sModelInfo[OBJROTLIFT_GET_TYPE(&this->dyna.actor)];
+
+ AnimatedMat_Draw(globalCtx, modelInfo->animMat);
+ Gfx_DrawDListOpa(globalCtx, modelInfo->dList);
+}
diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h
index a58a6b621..cc627a295 100644
--- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h
+++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.h
@@ -3,11 +3,16 @@
#include "global.h"
+#include "overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h"
+
+#define OBJROTLIFT_GET_TYPE(thisx) ((thisx)->params & 1)
+#define OBJROTLIFT_GET_4000(thisx) ((thisx)->params & 0x4000)
+
struct ObjRotlift;
typedef struct ObjRotlift {
- /* 0x000 */ Actor actor;
- /* 0x144 */ char unk_144[0x20];
+ /* 0x000 */ DynaPolyActor dyna;
+ /* 0x15C */ ObjEtcetera* dekuFlowers[2];
} ObjRotlift; // size = 0x164
extern const ActorInit Obj_Rotlift_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c
index 3979479f6..b3464d744 100644
--- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c
+++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c
@@ -205,7 +205,7 @@ void func_80B030F8(ObjSnowball* this, GlobalContext* globalCtx) {
gravity = -400;
phi_s4 = 1;
phi_f22 = 0.8f;
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
phi_s0 = 0x21;
} else {
phi_s0 = 0x41;
@@ -245,7 +245,7 @@ void func_80B030F8(ObjSnowball* this, GlobalContext* globalCtx) {
temp_f26 = this->unk_20C * 60.0f;
for (i = 0, phi_s6 = 0; i < 16; i++, phi_s6 += 0x1000) {
- temp_s0 = (u32)Rand_Next() >> 0x10;
+ temp_s0 = Rand_Next() >> 0x10;
temp_f20 = Math_SinS(temp_s0);
temp_f22 = Math_CosS(temp_s0);
@@ -368,7 +368,7 @@ void func_80B03A80(GlobalContext* globalCtx, f32 arg1, Vec3f* arg2) {
temp_s1 = D_80B04FC8[0];
phi_s2 = -400;
phi_s3 = 1;
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
phi_s0 = 0x21;
} else {
phi_s0 = 0x41;
@@ -377,7 +377,7 @@ void func_80B03A80(GlobalContext* globalCtx, f32 arg1, Vec3f* arg2) {
temp_s1 = D_80B04FC8[1];
phi_s2 = -340;
phi_s3 = 1;
- if (Rand_Next() > 0) {
+ if ((s32)Rand_Next() > 0) {
phi_s0 = 0x21;
} else {
phi_s0 = 0x41;
@@ -474,7 +474,7 @@ void ObjSnowball_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.world.pos.y += 20.0f * phi_f20;
this->actor.uncullZoneScale = 150.0f * phi_f20;
this->actor.uncullZoneDownward = 300.0f * phi_f20;
- this->actor.shape.rot.y = (u32)Rand_Next() >> 0x10;
+ this->actor.shape.rot.y = Rand_Next() >> 0x10;
this->unk_20C = phi_f20;
if (sp34) {
diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c
index 5356e2e88..3737a5426 100644
--- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c
+++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c
@@ -145,7 +145,7 @@ void func_80B39108(ObjSnowball2* this, GlobalContext* globalCtx) {
for (i = 0, phi_s5 = 0; i < 11; i++, phi_s5 += (0x10000 / 11)) {
temp_s3 = (s32)(Rand_ZeroOne() * 5957.0f) + phi_s5;
- if (((u32)Rand_Next() >> 0x1E) == 0) {
+ if ((Rand_Next() >> 0x1E) == 0) {
phi_s1 = 0x20;
} else {
phi_s1 = 0x40;
@@ -234,7 +234,7 @@ void func_80B39638(GlobalContext* globalCtx, Vec3f* arg1) {
f32 temp_f2;
s32 i;
- D_80B3A938 += (s16)((u32)Rand_Next() >> 0x11);
+ D_80B3A938 += (s16)(Rand_Next() >> 0x11);
for (i = 0; i < 2; i++) {
D_80B3A938 += 0x8000;
@@ -319,7 +319,7 @@ void ObjSnowball2_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_InitJntSph(globalCtx, &this->collider);
this->actor.shape.rot.x = 0;
this->actor.shape.rot.z = 0;
- this->actor.shape.rot.y = (u32)Rand_Next() >> 0x10;
+ this->actor.shape.rot.y = Rand_Next() >> 0x10;
ActorShape_Init(&this->actor.shape, 200.0f, NULL, 12.5f);
this->actor.shape.shadowAlpha = 130;
Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sJntSphInit, this->colliderElements);
@@ -480,7 +480,7 @@ void func_80B3A13C(ObjSnowball2* this, GlobalContext* globalCtx) {
if (this->actor.bgCheckFlags & 0x40) {
Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_BOMB_DROP_WATER);
}
- } else if ((((globalCtx->gameplayFrames % 16) == 0) || (((u32)Rand_Next() >> 0x10) == 0)) &&
+ } else if ((((globalCtx->gameplayFrames % 16) == 0) || ((Rand_Next() >> 0x10) == 0)) &&
(this->actor.depthInWater < (1200.0f * this->actor.scale.y))) {
func_80B395EC(&this->actor, globalCtx);
}
@@ -567,7 +567,7 @@ void func_80B3A500(ObjSnowball2* this, GlobalContext* globalCtx) {
this->actor.velocity.y += this->actor.gravity;
this->actor.world.pos.y += this->actor.velocity.y;
- if (((globalCtx->gameplayFrames % 16) == 0) || (((u32)Rand_Next() >> 0x10) == 0)) {
+ if (((globalCtx->gameplayFrames % 16) == 0) || ((Rand_Next() >> 0x10) == 0)) {
func_80B395C4(globalCtx, &this->actor.home.pos);
}
diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c
index 0471b6bd7..f8425b40a 100644
--- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c
+++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_toge.h"
+#include "objects/object_trap/object_trap.h"
#define FLAGS (ACTOR_FLAG_10)
@@ -15,11 +16,13 @@ void ObjToge_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjToge_Update(Actor* thisx, GlobalContext* globalCtx);
void ObjToge_Draw(Actor* thisx, GlobalContext* globalCtx);
+void func_809A4744(ObjToge* this);
void func_809A477C(ObjToge* this, GlobalContext* globalCtx);
+void func_809A4804(ObjToge* this);
void func_809A481C(ObjToge* this, GlobalContext* globalCtx);
+void func_809A488C(ObjToge* this);
void func_809A48AC(ObjToge* this, GlobalContext* globalCtx);
-#if 0
const ActorInit Obj_Toge_InitVars = {
ACTOR_OBJ_TOGE,
ACTORCAT_PROP,
@@ -32,52 +35,280 @@ const ActorInit Obj_Toge_InitVars = {
(ActorFunc)ObjToge_Draw,
};
-// static ColliderCylinderInit sCylinderInit = {
-static ColliderCylinderInit D_809A4CB0 = {
- { COLTYPE_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_2, COLSHAPE_CYLINDER, },
- { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x01C37BB6, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, },
+static ColliderCylinderInit sCylinderInit = {
+ {
+ COLTYPE_METAL,
+ AT_NONE,
+ AC_ON | AC_HARD | AC_TYPE_PLAYER,
+ OC1_ON | OC1_TYPE_ALL,
+ OC2_TYPE_2,
+ COLSHAPE_CYLINDER,
+ },
+ {
+ ELEMTYPE_UNK0,
+ { 0x00000000, 0x00, 0x00 },
+ { 0x01C37BB6, 0x00, 0x00 },
+ TOUCH_NONE | TOUCH_SFX_NORMAL,
+ BUMP_ON,
+ OCELEM_ON,
+ },
{ 30, 20, 0, { 0, 0, 0 } },
};
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_809A4D14[] = {
+f32 D_809A4CDC[] = { 2.0f, 4.0f, 6.0f, 8.0f, 10.0f, 12.0f, 14.0f, 16.0f };
+
+s16 D_809A4CFC[] = { 0, 10, 20, 30, 40, 50, 60, 70 };
+
+f32 D_809A4D0C[] = { 1.0f, 2.0f };
+
+static InitChainEntry sInitChain[] = {
ICHAIN_F32_DIV1000(terminalVelocity, 0, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 150, ICHAIN_STOP),
};
-#endif
+void func_809A41C0(ObjToge* this, GlobalContext* globalCtx) {
+ Vec3f sp1C = this->actor.world.pos;
-extern ColliderCylinderInit D_809A4CB0;
-extern InitChainEntry D_809A4D14[];
+ sp1C.y += 10.0f;
+ sp1C.z += 10.0f;
+ func_800B2B44(globalCtx, &this->actor, &sp1C, 1.8f);
-extern UNK_TYPE D_06001400;
+ sp1C.x += 10.0f;
+ sp1C.z -= 20.0f;
+ func_800B2B44(globalCtx, &this->actor, &sp1C, 1.8f);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/func_809A41C0.s")
+ sp1C.x -= 20.0f;
+ func_800B2B44(globalCtx, &this->actor, &sp1C, 1.8f);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/func_809A42A0.s")
+void func_809A42A0(ObjToge* this, GlobalContext* globalCtx) {
+ Vec3f sp54;
+ s32 i;
+ s16 phi_s0;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/func_809A43A8.s")
+ sp54.y = this->actor.world.pos.y + 15.0f;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/func_809A43EC.s")
+ for (i = 0, phi_s0 = 0; i < 5; i++, phi_s0 += 0x3333) {
+ sp54.x = (Math_SinS(phi_s0) * 15.0f) + this->actor.world.pos.x;
+ sp54.z = (Math_CosS(phi_s0) * 15.0f) + this->actor.world.pos.z;
+ func_800B2B44(globalCtx, &this->actor, &sp54, (Rand_ZeroOne() * 0.6f) + 2.8f);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/ObjToge_Init.s")
+void func_809A43A8(ObjToge* this, GlobalContext* globalCtx) {
+ if (!OBJTOGE_GET_4000(&this->actor)) {
+ func_809A41C0(this, globalCtx);
+ } else {
+ func_809A42A0(this, globalCtx);
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/ObjToge_Destroy.s")
+s32 func_809A43EC(ObjToge* this, GlobalContext* globalCtx) {
+ Player* player = GET_PLAYER(globalCtx);
+ f32 temp_fv1 = player->actor.world.pos.x - this->unk_1B8;
+ f32 temp_fa0 = player->actor.world.pos.z - this->unk_1BC;
+ f32 temp = -(this->unk_1CC * temp_fa0) + (temp_fv1 * this->unk_1C8);
+ f32 temp2 = (this->unk_1CC * temp_fv1) + (temp_fa0 * this->unk_1C8);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/func_809A4744.s")
+ return fabsf(temp) <= this->unk_1C0 && fabsf(temp2) <= this->unk_1C4;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/func_809A477C.s")
+void ObjToge_Init(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ ObjToge* this = THIS;
+ Path* path;
+ Vec3s* sp40;
+ s16 sp3E;
+ s32 sp38 = OBJTOGE_GET_4000(thisx);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/func_809A4804.s")
+ Actor_ProcessInitChain(thisx, sInitChain);
+ Actor_SetScale(thisx, D_809A4D0C[sp38] * 0.1f);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/func_809A481C.s")
+ sp3E = thisx->home.rot.z;
+ thisx->home.rot.z = thisx->world.rot.z = thisx->shape.rot.z = 0;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/func_809A488C.s")
+ Collider_InitCylinder(globalCtx, &this->collider);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/func_809A48AC.s")
+ if (OBJTOGE_GET_PATH(thisx) == 0xFF) {
+ Actor_MarkForDeath(thisx);
+ return;
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/ObjToge_Update.s")
+ path = &globalCtx->setupPathList[OBJTOGE_GET_PATH(thisx)];
+ if (path->count != 2) {
+ Actor_MarkForDeath(thisx);
+ return;
+ }
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Toge/ObjToge_Draw.s")
+ sp40 = Lib_SegmentedToVirtual(path->points);
+ Math_Vec3s_ToVec3f(&this->unk_198[0], &sp40[0]);
+ Math_Vec3s_ToVec3f(&this->unk_198[1], &sp40[1]);
+ Math_Vec3f_Copy(&thisx->world.pos, &this->unk_198[0]);
+ thisx->world.rot.y = Math_Vec3f_Yaw(&this->unk_198[0], &this->unk_198[1]);
+ this->unk_194 = 0;
+ thisx->speedXZ = 0.0f;
+
+ if (sp3E > 0) {
+ s16 sp36;
+
+ this->unk_1B4 = true;
+ this->unk_1B8 = (this->unk_198[0].x + this->unk_198[1].x) * 0.5f;
+ this->unk_1BC = (this->unk_198[0].z + this->unk_198[1].z) * 0.5f;
+
+ sp36 = Math_Vec3f_Yaw(&this->unk_198[0], &this->unk_198[1]);
+ this->unk_1C8 = Math_CosS(sp36);
+ this->unk_1CC = Math_SinS(sp36);
+ this->unk_1C0 = sp3E * 7.5f;
+ this->unk_1C4 = Math3D_Distance(&this->unk_198[0], &this->unk_198[1]) * 0.5f;
+ } else {
+ this->unk_1B4 = false;
+ }
+
+ Collider_SetCylinder(globalCtx, &this->collider, thisx, &sCylinderInit);
+ Collider_UpdateCylinder(thisx, &this->collider);
+ thisx->colChkInfo.mass = MASS_IMMOVABLE;
+
+ if (sp38 == 1) {
+ this->collider.dim.radius = 60;
+ this->collider.dim.height = 40;
+ }
+
+ if (this->unk_1B4) {
+ func_809A4804(this);
+ } else {
+ func_809A4744(this);
+ }
+}
+
+void ObjToge_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
+ GlobalContext* globalCtx = globalCtx2;
+ ObjToge* this = THIS;
+
+ Collider_DestroyCylinder(globalCtx, &this->collider);
+}
+
+void func_809A4744(ObjToge* this) {
+ this->actionFunc = func_809A477C;
+ this->unk_1B0 = 0;
+ this->unk_1B2 = D_809A4CFC[OBJTOGE_GET_3800(&this->actor)];
+}
+
+void func_809A477C(ObjToge* this, GlobalContext* globalCtx) {
+ if (this->unk_1B2 > 0) {
+ this->unk_1B2--;
+ }
+
+ if (this->unk_1B0 >= 0x1770) {
+ this->unk_1B0 = 0x1770;
+ func_809A488C(this);
+ } else if ((this->unk_1B0 > 0) || (this->unk_1B2 <= 0)) {
+ this->unk_1B0 += 200;
+ }
+
+ if (!this->unk_1B4) {
+ this->actor.shape.rot.y += this->unk_1B0;
+ }
+}
+
+void func_809A4804(ObjToge* this) {
+ this->actionFunc = func_809A481C;
+ this->unk_1B0 = 0;
+}
+
+void func_809A481C(ObjToge* this, GlobalContext* globalCtx) {
+ if (this->unk_1B0 >= 0x1770) {
+ this->unk_1B0 = 0x1770;
+ func_809A488C(this);
+ } else if ((this->unk_1B0 > 0) || func_809A43EC(this, globalCtx)) {
+ this->unk_1B0 += 200;
+ }
+ this->actor.shape.rot.y += this->unk_1B0;
+}
+
+void func_809A488C(ObjToge* this) {
+ this->actor.speedXZ = 1.0f;
+ this->actionFunc = func_809A48AC;
+}
+
+void func_809A48AC(ObjToge* this, GlobalContext* globalCtx) {
+ s32 pad;
+ s32 sp30 = this->unk_194 ^ 1;
+
+ if (this->unk_1B4 && (this->unk_194 == 1)) {
+ Math_StepToF(&this->actor.speedXZ, 2.0f, 0.4f);
+ } else {
+ Math_StepToF(&this->actor.speedXZ, D_809A4CDC[OBJTOGE_GET_700(&this->actor)], 1.5f);
+ this->actor.shape.rot.y += 0x1770;
+ }
+
+ Actor_MoveWithGravity(&this->actor);
+ Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 10.0f, D_809A4D0C[OBJTOGE_GET_4000(&this->actor)] * 30.0f, 0.0f,
+ 0x81);
+
+ if (this->actor.bgCheckFlags & 8) {
+ this->actor.world.rot.y = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_198[this->unk_194]);
+ this->unk_194 = sp30;
+ if (this->unk_1B4 && (this->unk_194 == 0)) {
+ func_809A4804(this);
+ } else {
+ func_809A4744(this);
+ }
+ Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SPINE_TRAP_MOVE);
+ } else {
+ s16 yaw = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_198[sp30]) - this->actor.world.rot.y;
+
+ yaw = ABS_ALT(yaw);
+ if ((yaw > 0x4000) || (yaw == -0x8000)) {
+ this->actor.world.rot.y = Math_Vec3f_Yaw(&this->actor.world.pos, &this->unk_198[this->unk_194]);
+ this->unk_194 = sp30;
+ if (this->unk_1B4 && (this->unk_194 == 0)) {
+ func_809A4804(this);
+ } else {
+ func_809A4744(this);
+ }
+ Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_SPINE_TRAP_MOVE);
+ }
+ }
+}
+
+void ObjToge_Update(Actor* thisx, GlobalContext* globalCtx) {
+ ObjToge* this = THIS;
+ ColliderCylinder* collider = &this->collider;
+
+ if (this->collider.base.acFlags & AC_HIT) {
+ if (this->collider.info.acHitInfo->toucher.dmgFlags & 0x1000) {
+ func_809A43A8(this, globalCtx);
+ Actor_SetColorFilter(&this->actor, 0, 250, 0, 250);
+ }
+ collider->base.acFlags &= ~AC_HIT;
+ }
+
+ if (this->actor.colorFilterTimer == 0) {
+ if (this->collider.base.ocFlags2 & OC2_HIT_PLAYER) {
+ func_800B8DD4(globalCtx, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f, 4);
+ }
+
+ this->actionFunc(this, globalCtx);
+
+ Collider_UpdateCylinder(&this->actor, &this->collider);
+ if (this->actor.xzDistToPlayer < 1000.0f) {
+ CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+ }
+ }
+
+ if ((this->actor.flags & ACTOR_FLAG_40) || (this->actor.xzDistToPlayer < 300.0f)) {
+ CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &collider->base);
+ } else {
+ this->collider.base.ocFlags1 &= ~OC1_HIT;
+ this->collider.base.ocFlags2 &= ~OC2_HIT_PLAYER;
+ }
+}
+
+void ObjToge_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ ObjToge* this = THIS;
+
+ func_800B8050(&this->actor, globalCtx, 1);
+ Gfx_DrawDListOpa(globalCtx, object_trap_DL_001400);
+}
diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h
index c67e0b97f..3908b2c7e 100644
--- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h
+++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.h
@@ -7,11 +7,26 @@ struct ObjToge;
typedef void (*ObjTogeActionFunc)(struct ObjToge*, GlobalContext*);
+#define OBJTOGE_GET_PATH(thisx) ((thisx)->params & 0xFF)
+#define OBJTOGE_GET_700(thisx) (((thisx)->params >> 8) & 7)
+#define OBJTOGE_GET_3800(thisx) (((thisx)->params >> 0xB) & 7)
+#define OBJTOGE_GET_4000(thisx) (((thisx)->params >> 0xE) & 1)
+
typedef struct ObjToge {
- /* 0x0000 */ Actor actor;
- /* 0x0144 */ char unk_144[0x4C];
- /* 0x0190 */ ObjTogeActionFunc actionFunc;
- /* 0x0194 */ char unk_194[0x3C];
+ /* 0x000 */ Actor actor;
+ /* 0x144 */ ColliderCylinder collider;
+ /* 0x190 */ ObjTogeActionFunc actionFunc;
+ /* 0x194 */ s32 unk_194;
+ /* 0x198 */ Vec3f unk_198[2];
+ /* 0x1B0 */ s16 unk_1B0;
+ /* 0x1B2 */ s16 unk_1B2;
+ /* 0x1B4 */ u8 unk_1B4;
+ /* 0x1B8 */ f32 unk_1B8;
+ /* 0x1BC */ f32 unk_1BC;
+ /* 0x1C0 */ f32 unk_1C0;
+ /* 0x1C4 */ f32 unk_1C4;
+ /* 0x1C8 */ f32 unk_1C8;
+ /* 0x1CC */ f32 unk_1CC;
} ObjToge; // size = 0x1D0
extern const ActorInit Obj_Toge_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c
index 327183cfd..29ea1f8a8 100644
--- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c
+++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c
@@ -5,6 +5,7 @@
*/
#include "z_obj_tokei_turret.h"
+#include "objects/object_tokei_turret/object_tokei_turret.h"
#define FLAGS 0x00000000
@@ -15,7 +16,6 @@ void ObjTokeiTurret_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjTokeiTurret_Update(Actor* thisx, GlobalContext* globalCtx);
void ObjTokeiTurret_Draw(Actor* thisx, GlobalContext* globalCtx);
-#if 0
const ActorInit Obj_Tokei_Turret_InitVars = {
ACTOR_OBJ_TOKEI_TURRET,
ACTORCAT_BG,
@@ -28,23 +28,59 @@ const ActorInit Obj_Tokei_Turret_InitVars = {
(ActorFunc)ObjTokeiTurret_Draw,
};
-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80B91EC0[] = {
+static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE),
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
-#endif
+void ObjTokeiTurret_Init(Actor* thisx, GlobalContext* globalCtx) {
+ s32 pad;
+ ObjTokeiTurret* this = THIS;
+ s32 tier;
-extern InitChainEntry D_80B91EC0[];
+ tier = OBJ_TOKEI_TURRET_TIER_TYPE(thisx);
+ Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
+ DynaPolyActor_Init(&this->dyna, 0);
-extern UNK_TYPE D_060026A0;
-extern UNK_TYPE D_06002A88;
+ if ((tier == TURRET_TIER_BASE) || (tier == TURRET_TIER_TOP)) {
+ this->dyna.actor.uncullZoneDownward = this->dyna.actor.uncullZoneScale = 240.0f;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokei_Turret/ObjTokeiTurret_Init.s")
+ if (tier == TURRET_TIER_BASE) {
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &gClockTownTurretBaseCol);
+ } else {
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &gClockTownTurretPlatformCol);
+ }
+ } else {
+ this->dyna.actor.uncullZoneDownward = this->dyna.actor.uncullZoneScale = 1300.0;
+ }
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokei_Turret/ObjTokeiTurret_Destroy.s")
+void ObjTokeiTurret_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+ ObjTokeiTurret* this = THIS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokei_Turret/ObjTokeiTurret_Update.s")
+ DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Obj_Tokei_Turret/ObjTokeiTurret_Draw.s")
+void ObjTokeiTurret_Update(Actor* thisx, GlobalContext* globalCtx) {
+}
+
+void ObjTokeiTurret_Draw(Actor* thisx, GlobalContext* globalCtx) {
+ ObjTokeiTurret* this = THIS;
+ Gfx* gfx;
+
+ if (OBJ_TOKEI_TURRET_TIER_TYPE(thisx) == TURRET_TIER_TOP) {
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+
+ gfx = POLY_OPA_DISP;
+ gSPDisplayList(gfx++, &sSetupDL[6 * 25]);
+ gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
+ gSPDisplayList(gfx++, gClockTownTurretPlatformTopDL);
+ POLY_OPA_DISP = gfx;
+
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+ } else if (OBJ_TOKEI_TURRET_TIER_TYPE(thisx) == TURRET_TIER_BASE) {
+ Gfx_DrawDListOpa(globalCtx, gClockTownTurretPlatformBaseDL);
+ } else {
+ Gfx_DrawDListOpa(globalCtx, gClockTownFlagsDL);
+ }
+}
diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h
index 42cb6f5d7..7a2db071e 100644
--- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h
+++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.h
@@ -3,11 +3,17 @@
#include "global.h"
+#define OBJ_TOKEI_TURRET_TIER_TYPE(thisx) ((thisx)->params & 3)
+
+typedef enum {
+ /* 0 */ TURRET_TIER_BASE,
+ /* 1 */ TURRET_TIER_TOP,
+} TurretTierType;
+
struct ObjTokeiTurret;
typedef struct ObjTokeiTurret {
- /* 0x000 */ Actor actor;
- /* 0x144 */ char unk_144[0x18];
+ /* 0x000 */ DynaPolyActor dyna;
} ObjTokeiTurret; // size = 0x15C
extern const ActorInit Obj_Tokei_Turret_InitVars;
diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
index 3dfea0818..4e9bb84b2 100644
--- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
+++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
@@ -42,11 +42,11 @@ void ObjYasi_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 0);
- DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_obj_yasi_Colheader_001428);
+ DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &gPalmTreeCol);
this->dyna.actor.home.rot.y = 0;
- if (OBJYASI_IS_WIDE(thisx)) {
+ if (PALM_TREE_IS_WIDE(thisx)) {
this->dyna.actor.scale.x = 0.2f;
this->dyna.actor.scale.z = 0.2f;
}
@@ -97,5 +97,5 @@ void ObjYasi_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY);
- Gfx_DrawDListOpa(globalCtx, object_obj_yasi_DL_000360);
+ Gfx_DrawDListOpa(globalCtx, gPalmTreeDL);
}
diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h
index f4ab9ca9c..d1fdc6aed 100644
--- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h
+++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.h
@@ -11,6 +11,6 @@ typedef struct ObjYasi {
extern const ActorInit Obj_Yasi_InitVars;
-#define OBJYASI_IS_WIDE(thisx) ((thisx)->params & 1)
+#define PALM_TREE_IS_WIDE(thisx) ((thisx)->params & 1)
#endif // Z_OBJ_YASI_H
diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
index 2f976f2cc..e81799873 100644
--- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
@@ -721,7 +721,7 @@ void func_808DDE9C(Actor* thisx, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_030100);
+ gSPDisplayList(POLY_XLU_DISP++, gEffShockwaveDL);
}
}
diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
index cd0359ae3..1de32d6ce 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
@@ -1,29 +1,97 @@
/*
* File: z_eff_ss_extra.c
* Overlay: ovl_Effect_Ss_Extra
- * Description:
+ * Description: The floating points that pop-up in Swamp Bow Minigame
+ * i.e. 100 points for hitting the deku scrubs in the background
*/
#include "z_eff_ss_extra.h"
+#include "objects/object_yabusame_point/object_yabusame_point.h"
#define PARAMS ((EffectSsExtraInitParams*)initParamsx)
-s32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
+u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
void EffectSsExtra_Update(GlobalContext* globalCtx, u32 index, EffectSs* this);
void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);
-#if 0
+static s16 sScores[] = { 30, 60, 100 };
+
const EffectSsInit Effect_Ss_Extra_InitVars = {
EFFECT_SS_EXTRA,
EffectSsExtra_Init,
};
-#endif
+static TexturePtr sPointTextures[] = { gYabusamePoint30Tex, gYabusamePoint60Tex, gYabusamePoint100Tex };
-extern UNK_TYPE D_06000DC0;
+#define rObjId regs[0]
+#define rTimer regs[1]
+#define rScoreIndex regs[2]
+#define rScale regs[3]
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Extra/EffectSsExtra_Init.s")
+u32 EffectSsExtra_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
+ s32 pad;
+ EffectSsExtraInitParams* params = PARAMS;
+ s32 objIndex;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Extra/EffectSsExtra_Draw.s")
+ objIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_YABUSAME_POINT);
+ if ((objIndex >= 0) && (Object_IsLoaded(&globalCtx->objectCtx, objIndex))) {
+ void* segBackup = gSegments[6];
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Extra/EffectSsExtra_Update.s")
+ gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objIndex].segment);
+
+ this->pos = params->pos;
+ this->velocity = params->velocity;
+ this->accel = params->accel;
+ this->draw = EffectSsExtra_Draw;
+ this->update = EffectSsExtra_Update;
+ this->life = 50;
+ this->rScoreIndex = params->scoreIdx;
+ this->rScale = params->scale;
+ this->rTimer = 5;
+ this->rObjId = objIndex;
+
+ gSegments[6] = segBackup;
+ return 1;
+ }
+ return 0;
+}
+
+void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
+ s32 pad;
+ f32 scale;
+ void* storedSegment;
+
+ scale = this->rScale / 100.0f;
+ storedSegment = globalCtx->objectCtx.status[this->rObjId].segment;
+
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+
+ gSegments[6] = PHYSICAL_TO_VIRTUAL(storedSegment);
+
+ gSPSegment(POLY_XLU_DISP++, 0x06, storedSegment);
+
+ Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
+ Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
+ func_8012C2DC(globalCtx->state.gfxCtx);
+ Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
+
+ gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+
+ gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(sPointTextures[this->rScoreIndex]));
+
+ gSPDisplayList(POLY_XLU_DISP++, &gYabusamePointDL);
+
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
+
+void EffectSsExtra_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
+ if (this->rTimer != 0) {
+ this->rTimer--;
+ } else {
+ this->velocity.y = 0.0f;
+ }
+
+ if (this->rTimer == 1) {
+ globalCtx->interfaceCtx.unk_25C = sScores[this->rScoreIndex];
+ }
+}
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
index 5bd800a20..0fa12d248 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
@@ -1,27 +1,84 @@
/*
* File: z_eff_ss_ice_piece.c
* Overlay: ovl_Effect_Ss_Ice_Piece
- * Description:
+ * Description: Ice Shards
*/
#include "z_eff_ss_ice_piece.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+
+#define rLifespan regs[0]
+#define rYaw regs[1]
+#define rPitch regs[2]
+#define rRotSpeed regs[3]
+#define rScale regs[4]
#define PARAMS ((EffectSsIcePieceInitParams*)initParamsx)
-s32 EffectSsIcePiece_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
+u32 EffectSsIcePiece_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
void EffectSsIcePiece_Update(GlobalContext* globalCtx, u32 index, EffectSs* this);
void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);
-#if 0
const EffectSsInit Effect_Ss_Ice_Piece_InitVars = {
EFFECT_SS_ICE_PIECE,
EffectSsIcePiece_Init,
};
-#endif
+u32 EffectSsIcePiece_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
+ EffectSsIcePieceInitParams* initParams = PARAMS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Init.s")
+ this->pos = initParams->pos;
+ this->vec = initParams->pos;
+ this->velocity = initParams->velocity;
+ this->accel = initParams->accel;
+ this->life = initParams->life;
+ this->draw = EffectSsIcePiece_Draw;
+ this->update = EffectSsIcePiece_Update;
+ this->rLifespan = initParams->life;
+ this->rScale = initParams->scale * 100.0f;
+ this->rYaw = Math_FAtan2F(initParams->velocity.z, initParams->velocity.x);
+ this->rPitch = 0;
+ this->rRotSpeed =
+ ((fabsf(initParams->velocity.x) + fabsf(initParams->velocity.y)) * 100.0f) * (Rand_ZeroFloat(1.0f) + 0.5f);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Draw.s")
+ return 1;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Ice_Piece/EffectSsIcePiece_Update.s")
+void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
+ GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
+ s32 pad;
+ f32 scale = this->rScale * 0.01f;
+ u32 frames = globalCtx->state.frames;
+ f32 alpha;
+
+ OPEN_DISPS(gfxCtx);
+
+ if ((this->rLifespan > 0) && (this->life < (this->rLifespan >> 1))) {
+ alpha = (this->life * 2.0f) / this->rLifespan;
+ alpha *= 255.0f;
+ } else {
+ alpha = 255.0f;
+ }
+
+ Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
+ Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
+ Matrix_RotateYS(this->rYaw, MTXMODE_APPLY);
+ Matrix_RotateXS(this->rPitch, MTXMODE_APPLY);
+ gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ func_8012C2DC(globalCtx->state.gfxCtx);
+ gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, (s32)alpha & 0xFF);
+ func_800BCC68(&this->pos, globalCtx);
+ gSPSegment(POLY_XLU_DISP++, 0x08,
+ Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, frames % 256, 0x20, 0x10, 1, 0, (2 * frames) % 256, 0x40,
+ 0x20));
+ gSPDisplayList(POLY_XLU_DISP++, gEffIceFragmentDL);
+
+ CLOSE_DISPS(gfxCtx);
+}
+
+void EffectSsIcePiece_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
+ this->rPitch += this->rRotSpeed;
+ this->velocity.x *= 0.85f;
+ this->velocity.y *= 0.85f;
+ this->velocity.z *= 0.85f;
+}
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
index 71be8c0d6..4571bb790 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
@@ -1,27 +1,79 @@
/*
* File: z_eff_ss_ice_smoke.c
* Overlay: ovl_Effect_Ss_Ice_Smoke
- * Description:
+ * Description: Ice Smoke
*/
#include "z_eff_ss_ice_smoke.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+
+#define rAlpha regs[0]
+#define rScale regs[1]
+#define rScrollX regs[2]
+#define rScrollY regs[3]
#define PARAMS ((EffectSsIceSmokeInitParams*)initParamsx)
-s32 EffectSsIceSmoke_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
+u32 EffectSsIceSmoke_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
void EffectSsIceSmoke_Update(GlobalContext* globalCtx, u32 index, EffectSs* this);
void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);
-#if 0
const EffectSsInit Effect_Ss_Ice_Smoke_InitVars = {
EFFECT_SS_ICE_SMOKE,
EffectSsIceSmoke_Init,
};
-#endif
+u32 EffectSsIceSmoke_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
+ EffectSsIceSmokeInitParams* initParams = PARAMS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Init.s")
+ Math_Vec3f_Copy(&this->pos, &initParams->pos);
+ Math_Vec3f_Copy(&this->velocity, &initParams->velocity);
+ Math_Vec3f_Copy(&this->accel, &initParams->accel);
+ this->rAlpha = 0;
+ this->rScale = ABS_ALT(initParams->scale);
+ if (initParams->scale < 0) {
+ this->rScrollX = 1;
+ this->rScrollY = 2;
+ } else {
+ this->rScrollX = 3;
+ this->rScrollY = 15;
+ }
+ this->life = 50;
+ this->draw = EffectSsIceSmoke_Draw;
+ this->update = EffectSsIceSmoke_Update;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Draw.s")
+ return 1;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Ice_Smoke/EffectSsIceSmoke_Update.s")
+void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
+ s32 pad;
+ Mtx* mtx;
+ f32 scale;
+
+ OPEN_DISPS(globalCtx->state.gfxCtx);
+
+ func_8012C2DC(globalCtx->state.gfxCtx);
+ gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 195, 235, 235, this->rAlpha);
+ gSPSegment(POLY_XLU_DISP++, 0x08,
+ Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->rScrollX * this->life, this->rScrollY * this->life,
+ 0x20, 0x40, 1, 0, 0, 0x20, 0x20));
+ Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
+ Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
+ scale = this->rScale * 0.0001f;
+ Matrix_Scale(scale, scale, 1.0f, MTXMODE_APPLY);
+ mtx = Matrix_NewMtx(globalCtx->state.gfxCtx);
+ if (mtx != NULL) {
+ gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ gSPDisplayList(POLY_XLU_DISP++, gEffIceSmokeDL);
+ }
+
+ CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
+
+void EffectSsIceSmoke_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
+ if (this->life < 10) {
+ Math_StepToS(&this->rAlpha, 0, 10);
+ } else if (this->rAlpha < 100) {
+ this->rAlpha += 10;
+ }
+}
diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
index b477545c2..e93210b89 100644
--- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
@@ -5,23 +5,103 @@
*/
#include "z_eff_ss_k_fire.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+
+#define rAlpha regs[0]
+#define rScroll regs[2]
+#define rType regs[3]
+#define rYScale regs[4]
+#define rXZScale regs[5]
+#define rScaleMax regs[6]
#define PARAMS ((EffectSsKFireInitParams*)initParamsx)
-s32 EffectSsKFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
+u32 EffectSsKFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
void EffectSsKFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this);
void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);
-#if 0
const EffectSsInit Effect_Ss_K_Fire_InitVars = {
EFFECT_SS_K_FIRE,
EffectSsKFire_Init,
};
-#endif
+u32 EffectSsKFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
+ EffectSsKFireInitParams* initParams = PARAMS;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_K_Fire/EffectSsKFire_Init.s")
+ this->pos = initParams->pos;
+ this->velocity = initParams->velocity;
+ this->accel = initParams->accel;
+ this->life = 100;
+ this->rScaleMax = initParams->scaleMax;
+ this->rAlpha = 255;
+ this->rScroll = Rand_ZeroFloat(5.0f) - 25;
+ this->rType = initParams->type;
+ this->draw = EffectSsKFire_Draw;
+ this->update = EffectSsKFire_Update;
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_K_Fire/EffectSsKFire_Draw.s")
+ return 1;
+}
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_K_Fire/EffectSsKFire_Update.s")
+void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
+ s32 pad;
+ GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
+ f32 xzScale;
+ f32 yScale;
+
+ xzScale = this->rXZScale / 10000.0f;
+ yScale = this->rYScale / 10000.0f;
+
+ OPEN_DISPS(gfxCtx);
+
+ Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
+ Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY);
+ func_8012C2DC(globalCtx->state.gfxCtx);
+ gSPSegment(POLY_XLU_DISP++, 0x08,
+ Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0,
+ globalCtx->state.frames * this->rScroll, 0x20, 0x80));
+
+ if (this->rType >= 100) {
+ gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, this->rAlpha);
+ gDPSetEnvColor(POLY_XLU_DISP++, 255, 10, 0, 0);
+ } else {
+ gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, this->rAlpha);
+ gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 255, 0);
+ }
+
+ gDPPipeSync(POLY_XLU_DISP++);
+ Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
+
+ if ((index % 2) != 0) {
+ Matrix_RotateYF(M_PI, MTXMODE_APPLY);
+ }
+
+ gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+ gSPDisplayList(POLY_XLU_DISP++, gGameplayKeepDrawFlameDL);
+
+ CLOSE_DISPS(gfxCtx);
+}
+
+void EffectSsKFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
+ if (this->rXZScale < this->rScaleMax) {
+ this->rXZScale += 4;
+ this->rYScale += 4;
+
+ if (this->rXZScale > this->rScaleMax) {
+ this->rXZScale = this->rScaleMax;
+
+ if (this->rType != 3) {
+ this->rYScale = this->rScaleMax;
+ }
+ }
+ } else if (this->rAlpha > 0) {
+ this->rAlpha -= 10;
+ if (this->rAlpha <= 0) {
+ this->rAlpha = 0;
+ this->life = 0;
+ }
+ }
+
+ if (this->rType == 3) {
+ this->rYScale++;
+ }
+}
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c b/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c
index 4c27fe134..87f5638ac 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c
+++ b/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c
@@ -31,7 +31,7 @@ const TransitionInit TransitionWipe5_InitVars = {
#endif
-extern UNK_TYPE D_0F000000;
+extern u16 D_0F000000[];
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_fbdemo_wipe5/TransitionWipe5_Start.s")
diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c
index 7162d8348..49f945ca5 100644
--- a/src/overlays/gamestates/ovl_select/z_select.c
+++ b/src/overlays/gamestates/ovl_select/z_select.c
@@ -357,7 +357,7 @@ static SceneSelectEntry sScenes[] = {
void Select_UpdateMenu(SelectContext* this) {
s32 playerForm;
- Input* controller1 = CONTROLLER1(this);
+ Input* controller1 = CONTROLLER1(&this->state);
s32 stickY;
s32 pad[2];
s16 i;
diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt
index 42d7245b0..338b6d1af 100644
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@@ -114,7 +114,7 @@
0x80084CD0:("Load_AllocateAndLoad",),
0x80084DB0:("Load2_Relocate",),
0x8008501C:("Load2_LoadOverlay",),
- 0x800850C8:("Overlay_AllocateAndLoad",),
+ 0x800850C8:("Load2_AllocateAndLoad",),
0x80085130:("PadUtils_Init",),
0x80085150:("func_80085150",),
0x80085158:("PadUtils_ResetPressRel",),
@@ -137,7 +137,7 @@
0x80085468:("StackCheck_GetState",),
0x800854E0:("StackCheck_CheckAll",),
0x80085538:("StackCheck_Check",),
- 0x80085570:("GfxPrint_InitDlist",),
+ 0x80085570:("GfxPrint_Setup",),
0x800859BC:("GfxPrint_SetColor",),
0x80085A08:("GfxPrint_SetPosPx",),
0x80085A2C:("GfxPrint_SetPos",),
@@ -892,7 +892,7 @@
0x800BE504:("func_800BE504",),
0x800BE568:("func_800BE568",),
0x800BE5CC:("func_800BE5CC",),
- 0x800BE63C:("func_800BE63C",),
+ 0x800BE63C:("Actor_IsSmallChest",),
0x800BE680:("Actor_DrawDamageEffects",),
0x800BF7CC:("Actor_SpawnIceEffects",),
0x800BF9A0:("ActorOverlayTable_FaultPrint",),
@@ -1509,15 +1509,15 @@
0x800E86C0:("CollisionCheck_SpawnShieldParticlesMetal2",),
0x800E86E0:("CollisionCheck_SpawnShieldParticlesWood",),
0x800E8784:("CollisionCheck_CylSideVsLineSeg",),
- 0x800E8EA0:("func_800E8EA0",),
- 0x800E8ED0:("nop_800E8ED0",),
- 0x800E8EE0:("nop_800E8EE0",),
- 0x800E8EEC:("nop_800E8EEC",),
- 0x800E8EFC:("nop_800E8EFC",),
- 0x800E8F08:("func_800E8F08",),
- 0x800E8FA4:("func_800E8FA4",),
- 0x800E9138:("func_800E9138",),
- 0x800E9250:("func_800E9250",),
+ 0x800E8EA0:("Actor_ContinueText",),
+ 0x800E8ED0:("Flags_GetEventChkInf",),
+ 0x800E8EE0:("Flags_SetEventChkInf",),
+ 0x800E8EEC:("Flags_GetInfTable",),
+ 0x800E8EFC:("Flags_SetInfTable",),
+ 0x800E8F08:("Actor_TrackNone",),
+ 0x800E8FA4:("Actor_TrackPoint",),
+ 0x800E9138:("Actor_TrackPlayerSetFocusHeight",),
+ 0x800E9250:("Actor_TrackPlayer",),
0x800E9360:("SaveContext_Init",),
0x800E93E0:("GameInfo_Init",),
0x800E9470:("DebugDisplay_Init",),
@@ -1661,8 +1661,8 @@
0x800F21CC:("func_800F21CC",),
0x800F22C4:("func_800F22C4",),
0x800F23C4:("ActorCutscene_SetReturnCamera",),
- 0x800F23E0:("func_800F23E0",),
- 0x800F2478:("func_800F2478",),
+ 0x800F23E0:("Curve_CubicHermiteSpline",),
+ 0x800F2478:("Curve_Interpolate",),
0x800F2620:("SkelCurve_Clear",),
0x800F2650:("SkelCurve_Init",),
0x800F26C0:("SkelCurve_Destroy",),
@@ -2661,26 +2661,26 @@
0x8013AD6C:("SubS_InCsMode",),
0x8013AD9C:("SubS_UpdateLimb",),
0x8013AED4:("SubS_UpdateFlags",),
- 0x8013AF00:("func_8013AF00",),
- 0x8013B010:("func_8013B010",),
- 0x8013B0C8:("func_8013B0C8",),
- 0x8013B350:("func_8013B350",),
- 0x8013B6B0:("func_8013B6B0",),
- 0x8013B878:("func_8013B878",),
+ 0x8013AF00:("SubS_TimePathing_FillKnots",),
+ 0x8013B010:("SubS_TimePathing_ComputeProgress",),
+ 0x8013B0C8:("SubS_TimePathing_ComputeWeights",),
+ 0x8013B350:("SubS_TimePathing_ComputeTargetPosXZ",),
+ 0x8013B6B0:("SubS_TimePathing_Update",),
+ 0x8013B878:("SubS_TimePathing_ComputeInitialY",),
0x8013BB34:("SubS_GetAdditionalPath",),
0x8013BB7C:("SubS_FindNearestActor",),
0x8013BC6C:("SubS_ChangeAnimationByInfoS",),
0x8013BD40:("SubS_HasReachedPoint",),
0x8013BEDC:("SubS_GetDayDependentPath",),
- 0x8013C068:("func_8013C068",),
- 0x8013C624:("func_8013C624",),
+ 0x8013C068:("SubS_WeightPathing_ComputePoint",),
+ 0x8013C624:("SubS_WeightPathing_Move",),
0x8013C8B8:("SubS_CopyPointFromPathCheckBounds",),
0x8013C964:("func_8013C964",),
0x8013CC2C:("SubS_FillShadowTex",),
0x8013CD64:("SubS_GenShadowTex",),
0x8013CF04:("SubS_DrawShadowTex",),
- 0x8013D0E0:("SubS_ComputeTurnToPointRot",),
- 0x8013D2E0:("SubS_TurnToPoint",),
+ 0x8013D0E0:("SubS_ComputeTrackPointRot",),
+ 0x8013D2E0:("SubS_TrackPoint",),
0x8013D5E8:("SubS_AngleDiffLessEqual",),
0x8013D648:("SubS_GetPathByIndex",),
0x8013D68C:("SubS_CopyPointFromPath",),
@@ -2693,7 +2693,7 @@
0x8013D9C8:("SubS_FillLimbRotTables",),
0x8013DB90:("SubS_IsFloorAbove",),
0x8013DC40:("SubS_CopyPointFromPathList",),
- 0x8013DCCC:("SubS_GetPathCount",),
+ 0x8013DCCC:("SubS_GetPathCountFromPathList",),
0x8013DCE0:("SubS_ActorPathing_Init",),
0x8013DE04:("SubS_ActorPathing_Update",),
0x8013DF3C:("SubS_ActorPathing_ComputePointInfo",),
@@ -2709,7 +2709,7 @@
0x8013E748:("func_8013E748",),
0x8013E7C0:("SubS_ActorAndPlayerFaceEachOther",),
0x8013E8F8:("func_8013E8F8",),
- 0x8013E950:("SubS_TurnToPointStep",),
+ 0x8013E950:("SubS_TrackPointStep",),
0x8013EC10:("func_8013EC10",),
0x8013EC44:("func_8013EC44",),
0x8013ECE0:("func_8013ECE0",),
@@ -2769,12 +2769,12 @@
0x8014151C:("func_8014151C",),
0x80141678:("func_80141678",),
0x80141778:("func_80141778",),
- 0x801418B0:("func_801418B0",),
- 0x80141900:("func_80141900",),
- 0x80141924:("func_80141924",),
- 0x80141C34:("func_80141C34",),
+ 0x801418B0:("VisMono_Init",),
+ 0x80141900:("VisMono_Destroy",),
+ 0x80141924:("VisMono_DesaturateTLUT",),
+ 0x80141C34:("VisMono_DesaturateDList",),
0x80141E60:("VisMono_Draw",),
- 0x8014204C:("func_8014204C",),
+ 0x8014204C:("VisMono_DrawOld",),
0x801420C0:("func_801420C0",),
0x801420F4:("func_801420F4",),
0x80142100:("func_80142100",),
@@ -3036,7 +3036,7 @@
0x8016A01C:("FrameAdvance_IsEnabled",),
0x8016A02C:("func_8016A02C",),
0x8016A0AC:("Play_IsUnderwater",),
- 0x8016A168:("func_8016A168",),
+ 0x8016A168:("Play_IsDebugCamEnabled",),
0x8016A178:("Play_AssignPlayerActorCsIdsFromScene",),
0x8016A268:("func_8016A268",),
0x8016A2C8:("Play_Init",),
@@ -4912,7 +4912,7 @@
0x80863E48:("EnGirlA_CanBuyBombBag30BombShop",),
0x80863EC8:("EnGirlA_CanBuyBombchus",),
0x80863F94:("EnGirlA_CanBuyBombs",),
- 0x80864034:("EnGirlA_CanBuyBottle",),
+ 0x80864034:("EnGirlA_CanBuyBottleStolen",),
0x8086406C:("EnGirlA_CanBuySword",),
0x808640A4:("EnGirlA_CanBuyShieldMirror",),
0x80864108:("EnGirlA_CanBuyFairy",),
@@ -4962,31 +4962,31 @@
0x8086732C:("EnDoor_Update",),
0x80867350:("EnDoor_OverrideLimbDraw",),
0x808674B0:("EnDoor_Draw",),
- 0x80867BD0:("func_80867BD0",),
+ 0x80867BD0:("EnBox_SetupAction",),
0x80867BDC:("func_80867BDC",),
0x80867C14:("func_80867C14",),
0x80867C8C:("func_80867C8C",),
0x80867FBC:("func_80867FBC",),
0x80867FE4:("func_80867FE4",),
- 0x8086800C:("func_8086800C",),
+ 0x8086800C:("EnBox_ClipToGround",),
0x808680AC:("EnBox_Init",),
0x808685FC:("EnBox_Destroy",),
- 0x80868630:("func_80868630",),
- 0x80868734:("func_80868734",),
- 0x808687E8:("func_808687E8",),
- 0x80868944:("func_80868944",),
- 0x808689E8:("func_808689E8",),
- 0x80868A6C:("func_80868A6C",),
+ 0x80868630:("EnBox_RandomDustKinematic",),
+ 0x80868734:("EnBox_SpawnDust",),
+ 0x808687E8:("EnBox_Fall",),
+ 0x80868944:("EnBox_FallOnSwitchFlag",),
+ 0x808689E8:("EnBox_AppearSwitchFlag",),
+ 0x80868A6C:("EnBox_AppearOnRoomClear",),
0x80868AFC:("func_80868AFC",),
0x80868B74:("func_80868B74",),
- 0x80868CC8:("func_80868CC8",),
- 0x80869020:("func_80869020",),
- 0x808692E0:("func_808692E0",),
+ 0x80868CC8:("EnBox_WaitOpen",),
+ 0x80869020:("EnBox_Open",),
+ 0x808692E0:("EnBox_SpawnIceSmoke",),
0x808694A0:("EnBox_Update",),
- 0x80869600:("func_80869600",),
- 0x80869850:("func_80869850",),
- 0x80869874:("func_80869874",),
- 0x808698B4:("func_808698B4",),
+ 0x80869600:("EnBox_PostLimbDraw",),
+ 0x80869850:("EnBox_SetRenderMode1",),
+ 0x80869874:("EnBox_SetRenderMode2",),
+ 0x808698B4:("EnBox_SetRenderMode3",),
0x808698F4:("EnBox_Draw",),
0x80869D90:("EnPametfrog_Init",),
0x80869F90:("EnPametfrog_Destroy",),
@@ -5605,7 +5605,7 @@
0x8089E8E0:("EnHata_Init",),
0x8089E9DC:("EnHata_Destroy",),
0x8089EA10:("EnHata_Update",),
- 0x8089EC68:("func_8089EC68",),
+ 0x8089EC68:("EnHata_OverrideLimbDraw",),
0x8089ECBC:("EnHata_Draw",),
0x8089ED90:("EnZl1_Init",),
0x8089EDA0:("EnZl1_Destroy",),
@@ -6492,8 +6492,8 @@
0x808DF788:("func_808DF788",),
0x808DF838:("func_808DF838",),
0x808DFB14:("EnHorseLinkChild_Update",),
- 0x808DFC3C:("func_808DFC3C",),
- 0x808DFDC8:("func_808DFDC8",),
+ 0x808DFC3C:("EnHorseLinkChild_PostSkinDraw",),
+ 0x808DFDC8:("EnHorseLinkChild_OverrideSkinDraw",),
0x808DFE3C:("EnHorseLinkChild_Draw",),
0x808E01A0:("DoorAna_SetupAction",),
0x808E01AC:("DoorAna_Init",),
@@ -6508,12 +6508,12 @@
0x808E0DA8:("EnEncount1_Update",),
0x808E0E40:("DemoTreLgt_Init",),
0x808E0EBC:("DemoTreLgt_Destroy",),
- 0x808E0EE8:("func_808E0EE8",),
- 0x808E0EF4:("func_808E0EF4",),
- 0x808E0F4C:("func_808E0F4C",),
- 0x808E0FE0:("func_808E0FE0",),
+ 0x808E0EE8:("DemoTreLgt_SetupWait",),
+ 0x808E0EF4:("DemoTreLgt_Wait",),
+ 0x808E0F4C:("DemoTreLgt_SetupAnimate",),
+ 0x808E0FE0:("DemoTreLgt_Animate",),
0x808E1270:("DemoTreLgt_Update",),
- 0x808E12A4:("func_808E12A4",),
+ 0x808E12A4:("DemoTreLgt_OverrideLimbDraw",),
0x808E13FC:("DemoTreLgt_Draw",),
0x808E1560:("EnEncount2_Init",),
0x808E16B4:("EnEncount2_Destroy",),
@@ -6523,9 +6523,9 @@
0x808E18A8:("EnEncount2_Die",),
0x808E18F8:("EnEncount2_Update",),
0x808E19C4:("EnEncount2_Draw",),
- 0x808E1A24:("EnEncount2_InitParticles",),
- 0x808E1B4C:("EnEncount2_UpdateParticles",),
- 0x808E1C9C:("EnEncount2_DrawParticles",),
+ 0x808E1A24:("EnEncount2_InitEffects",),
+ 0x808E1B4C:("EnEncount2_UpdateEffects",),
+ 0x808E1C9C:("EnEncount2_DrawEffects",),
0x808E1FE0:("EnFireRock_Init",),
0x808E1FF0:("EnFireRock_Destroy",),
0x808E2000:("EnFireRock_Update",),
@@ -9769,9 +9769,9 @@
0x80A181B4:("EnRaf_Update",),
0x80A1859C:("EnRaf_TransformLimbDraw",),
0x80A18A08:("EnRaf_Draw",),
- 0x80A18A90:("EnRaf_InitializeParticle",),
- 0x80A18B8C:("EnRaf_UpdateParticles",),
- 0x80A18DA0:("EnRaf_DrawParticles",),
+ 0x80A18A90:("EnRaf_InitializeEffect",),
+ 0x80A18B8C:("EnRaf_UpdateEffects",),
+ 0x80A18DA0:("EnRaf_DrawEffects",),
0x80A19740:("ObjFunen_Init",),
0x80A19778:("ObjFunen_Draw",),
0x80A19910:("ObjRaillift_UpdatePosition",),
@@ -10244,15 +10244,15 @@
0x80A37EE0:("ObjShutter_Destroy",),
0x80A37EF0:("ObjShutter_Update",),
0x80A3803C:("ObjShutter_Draw",),
- 0x80A38190:("func_80A38190",),
+ 0x80A38190:("DmZl_ChangeAnimation",),
0x80A3822C:("DmZl_Init",),
0x80A382EC:("DmZl_Destroy",),
- 0x80A382FC:("func_80A382FC",),
- 0x80A3830C:("func_80A3830C",),
- 0x80A38468:("func_80A38468",),
+ 0x80A382FC:("DmZl_DoNothing",),
+ 0x80A3830C:("DmZl_UpdateCutscene",),
+ 0x80A38468:("DmZl_UpdateFace",),
0x80A385D4:("DmZl_Update",),
- 0x80A3862C:("func_80A3862C",),
- 0x80A38648:("func_80A38648",),
+ 0x80A3862C:("DmZl_OverrideLimbDraw",),
+ 0x80A38648:("DmZl_PostLimbDraw",),
0x80A3869C:("DmZl_Draw",),
0x80A389A0:("func_80A389A0",),
0x80A38A68:("func_80A38A68",),
@@ -10308,9 +10308,9 @@
0x80A3BC88:("EnBaguo_Update",),
0x80A3BE24:("EnBaguo_PostLimbDraw",),
0x80A3BE60:("EnBaguo_DrawBody",),
- 0x80A3BF0C:("EnBaguo_InitializeParticle",),
- 0x80A3C008:("EnBaguo_UpdateParticles",),
- 0x80A3C17C:("EnBaguo_DrawRockParticles",),
+ 0x80A3BF0C:("EnBaguo_InitializeEffect",),
+ 0x80A3C008:("EnBaguo_UpdateEffects",),
+ 0x80A3C17C:("EnBaguo_DrawEffects",),
0x80A3C4E0:("func_80A3C4E0",),
0x80A3C560:("func_80A3C560",),
0x80A3C658:("func_80A3C658",),
@@ -10908,7 +10908,7 @@
0x80A6B3F8:("EnMushi2_Update",),
0x80A6B8D0:("EnMushi2_Draw",),
0x80A6BF90:("EnFall_Moon_AdjustScaleAndPosition",),
- 0x80A6C1DC:("EnFall_RisingDebris_ResetParticles",),
+ 0x80A6C1DC:("EnFall_RisingDebris_ResetEffects",),
0x80A6C22C:("EnFall_Init",),
0x80A6C39C:("EnFall_Destroy",),
0x80A6C3AC:("EnFall_MoonsTear_GetTerminaFieldMoon",),
@@ -10925,8 +10925,8 @@
0x80A6D0DC:("EnFall_Update",),
0x80A6D100:("EnFall_FireBall_SetPerVertexAlpha",),
0x80A6D220:("EnFall_FireBall_Update",),
- 0x80A6D444:("EnFall_RisingDebris_UpdateParticles",),
- 0x80A6D504:("EnFall_RisingDebris_InitializeParticles",),
+ 0x80A6D444:("EnFall_RisingDebris_UpdateEffects",),
+ 0x80A6D504:("EnFall_RisingDebris_InitializeEffect",),
0x80A6D698:("EnFall_RisingDebris_Update",),
0x80A6D75C:("EnFall_FireRing_Update",),
0x80A6D88C:("EnFall_Moon_Draw",),
@@ -11463,44 +11463,44 @@
0x80A9FA58:("func_80A9FA58",),
0x80A9FB54:("DmOpstage_Update",),
0x80A9FBB8:("DmOpstage_Draw",),
- 0x80A9FDB0:("func_80A9FDB0",),
- 0x80A9FE3C:("func_80A9FE3C",),
- 0x80A9FED8:("func_80A9FED8",),
- 0x80AA00CC:("func_80AA00CC",),
- 0x80AA0100:("func_80AA0100",),
- 0x80AA0158:("func_80AA0158",),
- 0x80AA01C0:("func_80AA01C0",),
- 0x80AA0264:("func_80AA0264",),
- 0x80AA0420:("func_80AA0420",),
- 0x80AA05F0:("func_80AA05F0",),
- 0x80AA0634:("func_80AA0634",),
- 0x80AA066C:("func_80AA066C",),
- 0x80AA071C:("func_80AA071C",),
- 0x80AA076C:("func_80AA076C",),
- 0x80AA09DC:("func_80AA09DC",),
- 0x80AA0B08:("func_80AA0B08",),
- 0x80AA0DA8:("func_80AA0DA8",),
- 0x80AA0E1C:("func_80AA0E1C",),
- 0x80AA0E90:("func_80AA0E90",),
+ 0x80A9FDB0:("DmStk_LoadObjectForAnimation",),
+ 0x80A9FE3C:("DmStk_ChangeAnimation",),
+ 0x80A9FED8:("DmStk_PlaySfxForIntroCutsceneFirstPart",),
+ 0x80AA00CC:("DmStk_PlaySfxForTitleCutscene",),
+ 0x80AA0100:("DmStk_PlaySfxForIntroCutsceneSecondPart",),
+ 0x80AA0158:("DmStk_PlaySfxForObtainingMajorasMaskCutscene",),
+ 0x80AA01C0:("DmStk_PlaySfxForCurseCutsceneFirstPart",),
+ 0x80AA0264:("DmStk_PlaySfxForCurseCutsceneSecondPart",),
+ 0x80AA0420:("DmStk_PlaySfxForClockTowerIntroCutsceneVersion1",),
+ 0x80AA05F0:("DmStk_PlaySfxForDroppingOcarinaCutscene",),
+ 0x80AA0634:("DmStk_PlaySfxForShiveringInRainCutscene",),
+ 0x80AA066C:("DmStk_PlaySfxForPlayingWithFairiesCutscene",),
+ 0x80AA071C:("DmStk_PlaySfxForEndingCutsceneFirstPart",),
+ 0x80AA076C:("DmStk_PlaySfxForEndingCutsceneSecondPart",),
+ 0x80AA09DC:("DmStk_PlaySfxForClockTowerIntroCutsceneVersion2",),
+ 0x80AA0B08:("DmStk_PlaySfxForCutsceneAfterPlayingOathToOrder",),
+ 0x80AA0DA8:("DmStk_PlaySfxForMoonWarpCutsceneVersion1",),
+ 0x80AA0E1C:("DmStk_PlaySfxForMoonWarpCutsceneVersion2",),
+ 0x80AA0E90:("DmStk_PlaySfxForCutscenes",),
0x80AA1234:("DmStk_Init",),
0x80AA16E4:("DmStk_Destroy",),
- 0x80AA16F4:("func_80AA16F4",),
- 0x80AA1704:("func_80AA1704",),
- 0x80AA1714:("func_80AA1714",),
- 0x80AA17F8:("func_80AA17F8",),
- 0x80AA18D8:("func_80AA18D8",),
- 0x80AA192C:("func_80AA192C",),
- 0x80AA1998:("func_80AA1998",),
- 0x80AA19EC:("func_80AA19EC",),
- 0x80AA1A50:("func_80AA1A50",),
- 0x80AA1AC8:("func_80AA1AC8",),
- 0x80AA1AF8:("func_80AA1AF8",),
- 0x80AA1B9C:("func_80AA1B9C",),
- 0x80AA1C64:("func_80AA1C64",),
- 0x80AA1D1C:("func_80AA1D1C",),
- 0x80AA26CC:("func_80AA26CC",),
- 0x80AA2720:("func_80AA2720",),
- 0x80AA27EC:("func_80AA27EC",),
+ 0x80AA16F4:("DmStk_ClockTower_DoNothing",),
+ 0x80AA1704:("DmStk_DoNothing",),
+ 0x80AA1714:("DmStk_WaitForTelescope",),
+ 0x80AA17F8:("DmStk_StartTelescopeCutscene",),
+ 0x80AA18D8:("DmStk_ClockTower_StartIntroCutsceneVersion1",),
+ 0x80AA192C:("DmStk_ClockTower_WaitForIntroCutsceneVersion1ToEnd",),
+ 0x80AA1998:("DmStk_ClockTower_StartIntroCutsceneVersion2",),
+ 0x80AA19EC:("DmStk_ClockTower_WaitForIntroCutsceneVersion2ToEnd",),
+ 0x80AA1A50:("DmStk_ClockTower_StartDropOcarinaCutscene",),
+ 0x80AA1AC8:("DmStk_ClockTower_WaitForDropOcarinaCutsceneToEnd",),
+ 0x80AA1AF8:("DmStk_ClockTower_AdjustHeightAndRotation",),
+ 0x80AA1B9C:("DmStk_ClockTower_DeflectHit",),
+ 0x80AA1C64:("DmStk_ClockTower_WaitForDeflectionToEnd",),
+ 0x80AA1D1C:("DmStk_UpdateCutscenes",),
+ 0x80AA26CC:("DmStk_UpdateCollision",),
+ 0x80AA2720:("DmStk_ClockTower_IdleWithOcarina",),
+ 0x80AA27EC:("DmStk_ClockTower_Idle",),
0x80AA2884:("DmStk_Update",),
0x80AA2B14:("DmStk_OverrideLimbDraw",),
0x80AA2BC0:("DmStk_PostLimbDraw2",),
@@ -13669,8 +13669,8 @@
0x80B40100:("func_80B40100",),
0x80B40160:("func_80B40160",),
0x80B401F8:("func_80B401F8",),
- 0x80B40308:("func_80B40308",),
- 0x80B40394:("func_80B40394",),
+ 0x80B40308:("BgGoronOyu_UpdateWaterBoxInfo",),
+ 0x80B40394:("BgGoronOyu_SpawnEffects",),
0x80B4056C:("BgGoronOyu_Init",),
0x80B40628:("BgGoronOyu_Destroy",),
0x80B4065C:("BgGoronOyu_Update",),
@@ -15380,7 +15380,7 @@
0x80BB9F24:("ObjChan_ChandelierAction",),
0x80BBA2FC:("ObjChan_InitPot",),
0x80BBA314:("ObjChan_PotAction",),
- 0x80BBA488:("ObjChan_CreateSmashParticles",),
+ 0x80BBA488:("ObjChan_CreateSmashEffects",),
0x80BBA738:("ObjChan_Update",),
0x80BBA78C:("ObjChan_Draw",),
0x80BBA894:("ObjChan_DrawPot",),
@@ -16220,15 +16220,15 @@
0x80BEC080:("EffLastday_Update",),
0x80BEC0A4:("func_80BEC0A4",),
0x80BEC0DC:("EffLastday_Draw",),
- 0x80BEC240:("func_80BEC240",),
+ 0x80BEC240:("BgIkanaDharma_SpawnEffects",),
0x80BEC3F4:("BgIkanaDharma_Init",),
0x80BEC560:("BgIkanaDharma_Destroy",),
- 0x80BEC5C4:("func_80BEC5C4",),
- 0x80BEC5E0:("func_80BEC5E0",),
- 0x80BEC758:("func_80BEC758",),
- 0x80BEC790:("func_80BEC790",),
- 0x80BEC7EC:("func_80BEC7EC",),
- 0x80BEC808:("func_80BEC808",),
+ 0x80BEC5C4:("BgIkanaDharma_SetupWaitForHit",),
+ 0x80BEC5E0:("BgIkanaDharma_WaitForHit",),
+ 0x80BEC758:("BgIkanaDharma_SetupStartCutscene",),
+ 0x80BEC790:("BgIkanaDharma_StartCutscene",),
+ 0x80BEC7EC:("BgIkanaDharma_SetupWaitForCutsceneToEnd",),
+ 0x80BEC808:("BgIkanaDharma_WaitForCutsceneToEnd",),
0x80BEC8C0:("BgIkanaDharma_Update",),
0x80BECA80:("BgIkanaDharma_Draw",),
0x80BECBE0:("func_80BECBE0",),
@@ -16997,8 +16997,8 @@
0x80C1ED0C:("func_80C1ED0C",),
0x80C1ED64:("func_80C1ED64",),
0x80C1EDE4:("DmBal_Update",),
- 0x80C1EF80:("func_80C1EF80",),
- 0x80C1F060:("func_80C1F060",),
+ 0x80C1EF80:("DmBal_OverrideLimbDraw",),
+ 0x80C1F060:("DmBal_PostLimbDraw",),
0x80C1F078:("DmBal_Draw",),
0x80C1F3D0:("EnPaper_Init",),
0x80C1F45C:("EnPaper_Destroy",),
diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt
index e49a3e427..7f69e79e5 100644
--- a/tools/disasm/variables.txt
+++ b/tools/disasm/variables.txt
@@ -27,13 +27,13 @@
0x80096BC8:("sFpuExceptions","char*","[6]",0x18),
0x80096BE0:("sFaultDrawContext","FaultDrawer*","",0x4),
0x80096BE4:("sFaultDrawerDefault","FaultDrawer","",0x3c),
- 0x80096C20:("D_80096C20","UNK_TYPE4","",0x4),
- 0x80096C30:("D_80096C30","UNK_TYPE4","",0x4),
+ 0x80096C20:("gLoadLogSeverity","UNK_TYPE4","",0x4),
+ 0x80096C30:("gLoad2LogSeverity","UNK_TYPE4","",0x4),
0x80096C40:("sStackInfoListStart","StackEntry*","",0x4),
0x80096C44:("sStackInfoListEnd","StackEntry*","",0x4),
0x80096C50:("sGfxPrintFontTLUT","u16","[64]",0x80),
- 0x80096CD0:("sGfxPrintUnkTLUT","u16","[16]",0x20),
- 0x80096CF0:("sGfxPrintUnkData","u8","[8]",0x8),
+ 0x80096CD0:("sGfxPrintRainbowTLUT","u16","[16]",0x20),
+ 0x80096CF0:("sGfxPrintRainbowData","u8","[8]",0x8),
0x80096CF8:("sGfxPrintFontData","u8","[0x800]",0x800),
0x80097500:("sInitFuncs","void*","",0x4),
0x80097504:("sNew","char","[4]",0x4),
@@ -1947,8 +1947,8 @@
0x801C5CD0:("sMtxFClear","MtxF","",0x40),
0x801C5D10:("D_801C5D10","UNK_TYPE1","",0x1),
0x801C5D20:("D_801C5D20","UNK_TYPE1","",0x1),
- 0x801C5D60:("gShadowDL","UNK_TYPE1","",0x1),
- 0x801C5D80:("gShadowVtxDL","UNK_TYPE1","",0x1),
+ 0x801C5D60:("gShadowMaterialDL","UNK_TYPE1","",0x1),
+ 0x801C5D80:("gShadowModelDL","UNK_TYPE1","",0x1),
0x801C5DB0:("gOneVec3f","UNK_TYPE1","",0x1),
0x801C5DD0:("D_801C5DD0","UNK_TYPE1","",0x1),
0x801C5DE0:("D_801C5DE0","UNK_TYPE1","",0x1),
@@ -2147,7 +2147,7 @@
0x801D0CD8:("TransitionFade_InitVars","UNK_PTR","",0x4),
0x801D0D00:("D_801D0D00","UNK_TYPE1","",0x1),
0x801D0D28:("TransitionCircle_InitVars","UNK_PTR","",0x4),
- 0x801D0D50:("D_801D0D50","UNK_TYPE4","",0x4),
+ 0x801D0D50:("gDbgCamEnabled","UNK_TYPE4","",0x4),
0x801D0D54:("D_801D0D54","UNK_TYPE1","",0x1),
0x801D0D58:("D_801D0D58","UNK_TYPE2","",0x2),
0x801D0D5C:("D_801D0D5C","UNK_TYPE2","",0x2),
@@ -6802,9 +6802,8 @@
0x808CD5E8:("D_808CD5E8","f32","",0x4),
0x808CE290:("Demo_Effect_InitVars","UNK_TYPE1","",0x1),
0x808CE2B0:("D_808CE2B0","UNK_TYPE4","",0x4),
- 0x808CE2C0:("D_808CE2C0","UNK_TYPE1","",0x1),
- 0x808CE2D4:("D_808CE2D4","UNK_TYPE1","",0x1),
- 0x808CE2D5:("D_808CE2D5","UNK_TYPE1","",0x1),
+ 0x808CE2C0:("sEffectTypeObjects","s16","",0x12),
+ 0x808CE2D4:("sAlphaTypes","u8","",0x15),
0x808CE2F0:("jtbl_808CE2F0","UNK_PTR","",0x4),
0x808CE314:("D_808CE314","f32","",0x4),
0x808CE318:("D_808CE318","f32","",0x4),
@@ -7023,8 +7022,8 @@
0x808E0DF8:("D_808E0DF8","UNK_TYPE1","",0x1),
0x808E1490:("D_808E1490","UNK_TYPE1","",0x1),
0x808E14B0:("Demo_Tre_Lgt_InitVars","UNK_TYPE1","",0x1),
- 0x808E14D0:("D_808E14D0","UNK_TYPE4","",0x4),
- 0x808E14D8:("D_808E14D8","UNK_TYPE1","",0x1),
+ 0x808E14D0:("sBoxLightAnimations","UNK_TYPE4","[2]",0x8),
+ 0x808E14D8:("sActionFuncs","UNK_TYPE4","[2]",0x8),
0x808E1ED0:("En_Encount2_InitVars","UNK_TYPE1","",0x1),
0x808E1EF0:("D_808E1EF0","UNK_TYPE1","",0x1),
0x808E1F14:("D_808E1F14","UNK_TYPE1","",0x1),
@@ -15931,8 +15930,7 @@
0x80BD68A0:("D_80BD68A0","UNK_TYPE1","",0x1),
0x80BD68A4:("D_80BD68A4","UNK_TYPE1","",0x1),
0x80BD6DF0:("En_Sc_Ruppe_InitVars","UNK_TYPE1","",0x1),
- 0x80BD6E10:("D_80BD6E10","UNK_TYPE1","",0x1),
- 0x80BD6E14:("D_80BD6E14","UNK_TYPE1","",0x1),
+ 0x80BD6E10:("D_80BD6E10","UNK_TYPE1","",0x30),
0x80BD6E40:("D_80BD6E40","UNK_TYPE1","",0x1),
0x80BD6E70:("jtbl_80BD6E70","UNK_PTR","",0x4),
0x80BD6E88:("D_80BD6E88","f32","",0x4),
diff --git a/tools/namefixer.py b/tools/namefixer.py
index b8d08b65c..892b1b5af 100755
--- a/tools/namefixer.py
+++ b/tools/namefixer.py
@@ -561,6 +561,10 @@ wordReplace = {
"EffectSsKiraKira_SpawnDispersed": "EffectSsKirakira_SpawnDispersed",
"EffectSsKiraKira_SpawnFocused": "EffectSsKirakira_SpawnFocused",
+ "func_800E8F08": "Actor_TrackNone",
+ "func_800E8FA4": "Actor_TrackPoint",
+ "func_800E9250": "Actor_TrackPlayer",
+
# Struct members
"skelAnime.unk03": "skelAnime.taper",
"skelAnime.animCurrentSeg": "skelAnime.animation",
diff --git a/tools/sizes/boot_functions.csv b/tools/sizes/boot_functions.csv
index a86be3b83..bbcf6d5de 100644
--- a/tools/sizes/boot_functions.csv
+++ b/tools/sizes/boot_functions.csv
@@ -134,7 +134,7 @@ asm/non_matchings/boot/stackcheck/StackCheck_Cleanup.s,StackCheck_Cleanup,0x8008
asm/non_matchings/boot/stackcheck/StackCheck_GetState.s,StackCheck_GetState,0x80085468,0x1E
asm/non_matchings/boot/stackcheck/StackCheck_CheckAll.s,StackCheck_CheckAll,0x800854E0,0x16
asm/non_matchings/boot/stackcheck/StackCheck_Check.s,StackCheck_Check,0x80085538,0xE
-asm/non_matchings/boot/gfxprint/GfxPrint_InitDlist.s,GfxPrint_InitDlist,0x80085570,0x113
+asm/non_matchings/boot/gfxprint/GfxPrint_Setup.s,GfxPrint_Setup,0x80085570,0x113
asm/non_matchings/boot/gfxprint/GfxPrint_SetColor.s,GfxPrint_SetColor,0x800859BC,0x13
asm/non_matchings/boot/gfxprint/GfxPrint_SetPosPx.s,GfxPrint_SetPosPx,0x80085A08,0x9
asm/non_matchings/boot/gfxprint/GfxPrint_SetPos.s,GfxPrint_SetPos,0x80085A2C,0xA
diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv
index d4583fa1f..fc002a064 100644
--- a/tools/sizes/code_functions.csv
+++ b/tools/sizes/code_functions.csv
@@ -1023,15 +1023,15 @@ asm/non_matchings/code/z_collision_check/CollisionCheck_SpawnShieldParticlesMeta
asm/non_matchings/code/z_collision_check/CollisionCheck_SpawnShieldParticlesMetal2.s,CollisionCheck_SpawnShieldParticlesMetal2,0x800E86C0,0x8
asm/non_matchings/code/z_collision_check/CollisionCheck_SpawnShieldParticlesWood.s,CollisionCheck_SpawnShieldParticlesWood,0x800E86E0,0x29
asm/non_matchings/code/z_collision_check/CollisionCheck_CylSideVsLineSeg.s,CollisionCheck_CylSideVsLineSeg,0x800E8784,0x1C7
-asm/non_matchings/code/code_800E8EA0/func_800E8EA0.s,func_800E8EA0,0x800E8EA0,0xC
-asm/non_matchings/code/code_800E8EA0/nop_800E8ED0.s,nop_800E8ED0,0x800E8ED0,0x4
-asm/non_matchings/code/code_800E8EA0/nop_800E8EE0.s,nop_800E8EE0,0x800E8EE0,0x3
-asm/non_matchings/code/code_800E8EA0/nop_800E8EEC.s,nop_800E8EEC,0x800E8EEC,0x4
-asm/non_matchings/code/code_800E8EA0/nop_800E8EFC.s,nop_800E8EFC,0x800E8EFC,0x3
-asm/non_matchings/code/code_800E8EA0/func_800E8F08.s,func_800E8F08,0x800E8F08,0x27
-asm/non_matchings/code/code_800E8EA0/func_800E8FA4.s,func_800E8FA4,0x800E8FA4,0x65
-asm/non_matchings/code/code_800E8EA0/func_800E9138.s,func_800E9138,0x800E9138,0x46
-asm/non_matchings/code/code_800E8EA0/func_800E9250.s,func_800E9250,0x800E9250,0x44
+asm/non_matchings/code/code_800E8EA0/Actor_ContinueText.s,Actor_ContinueText,0x800E8EA0,0xC
+asm/non_matchings/code/code_800E8EA0/Flags_GetEventChkInf.s,Flags_GetEventChkInf,0x800E8ED0,0x4
+asm/non_matchings/code/code_800E8EA0/Flags_SetEventChkInf.s,Flags_SetEventChkInf,0x800E8EE0,0x3
+asm/non_matchings/code/code_800E8EA0/Flags_GetInfTable.s,Flags_GetInfTable,0x800E8EEC,0x4
+asm/non_matchings/code/code_800E8EA0/Flags_SetInfTable.s,Flags_SetInfTable,0x800E8EFC,0x3
+asm/non_matchings/code/code_800E8EA0/Actor_TrackNone.s,Actor_TrackNone,0x800E8F08,0x27
+asm/non_matchings/code/code_800E8EA0/Actor_TrackPoint.s,Actor_TrackPoint,0x800E8FA4,0x65
+asm/non_matchings/code/code_800E8EA0/Actor_TrackPlayerSetFocusHeight.s,Actor_TrackPlayerSetFocusHeight,0x800E9138,0x46
+asm/non_matchings/code/code_800E8EA0/Actor_TrackPlayer.s,Actor_TrackPlayer,0x800E9250,0x44
asm/non_matchings/code/z_common_data/func_800E9360.s,func_800E9360,0x800E9360,0x20
asm/non_matchings/code/z_debug/GameInfo_Init.s,GameInfo_Init,0x800E93E0,0x24
asm/non_matchings/code/z_debug_display/DebugDisplay_Init.s,DebugDisplay_Init,0x800E9470,0x6
@@ -2175,26 +2175,26 @@ asm/non_matchings/code/z_sub_s/SubS_DrawTransformFlex.s,SubS_DrawTransformFlex,0
asm/non_matchings/code/z_sub_s/SubS_InCsMode.s,SubS_InCsMode,0x8013AD6C,0xC
asm/non_matchings/code/z_sub_s/SubS_UpdateLimb.s,SubS_UpdateLimb,0x8013AD9C,0x4E
asm/non_matchings/code/z_sub_s/SubS_UpdateFlags.s,SubS_UpdateFlags,0x8013AED4,0xB
-asm/non_matchings/code/z_sub_s/func_8013AF00.s,func_8013AF00,0x8013AF00,0x44
-asm/non_matchings/code/z_sub_s/func_8013B010.s,func_8013B010,0x8013B010,0x2E
-asm/non_matchings/code/z_sub_s/func_8013B0C8.s,func_8013B0C8,0x8013B0C8,0xA2
-asm/non_matchings/code/z_sub_s/func_8013B350.s,func_8013B350,0x8013B350,0xD8
-asm/non_matchings/code/z_sub_s/func_8013B6B0.s,func_8013B6B0,0x8013B6B0,0x72
-asm/non_matchings/code/z_sub_s/func_8013B878.s,func_8013B878,0x8013B878,0xAF
+asm/non_matchings/code/z_sub_s/SubS_TimePathing_FillKnots.s,SubS_TimePathing_FillKnots,0x8013AF00,0x44
+asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeProgress.s,SubS_TimePathing_ComputeProgress,0x8013B010,0x2E
+asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeWeights.s,SubS_TimePathing_ComputeWeights,0x8013B0C8,0xA2
+asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeTargetPosXZ.s,SubS_TimePathing_ComputeTargetPosXZ,0x8013B350,0xD8
+asm/non_matchings/code/z_sub_s/SubS_TimePathing_Update.s,SubS_TimePathing_Update,0x8013B6B0,0x72
+asm/non_matchings/code/z_sub_s/SubS_TimePathing_ComputeInitialY.s,SubS_TimePathing_ComputeInitialY,0x8013B878,0xAF
asm/non_matchings/code/z_sub_s/SubS_GetAdditionalPath.s,SubS_GetAdditionalPath,0x8013BB34,0x12
asm/non_matchings/code/z_sub_s/SubS_FindNearestActor.s,SubS_FindNearestActor,0x8013BB7C,0x3C
asm/non_matchings/code/z_sub_s/SubS_ChangeAnimationByInfoS.s,SubS_ChangeAnimationByInfoS,0x8013BC6C,0x35
asm/non_matchings/code/z_sub_s/SubS_HasReachedPoint.s,SubS_HasReachedPoint,0x8013BD40,0x67
asm/non_matchings/code/z_sub_s/SubS_GetDayDependentPath.s,SubS_GetDayDependentPath,0x8013BEDC,0x63
-asm/non_matchings/code/z_sub_s/func_8013C068.s,func_8013C068,0x8013C068,0x16F
-asm/non_matchings/code/z_sub_s/func_8013C624.s,func_8013C624,0x8013C624,0xA5
+asm/non_matchings/code/z_sub_s/SubS_WeightPathing_ComputePoint.s,SubS_WeightPathing_ComputePoint,0x8013C068,0x16F
+asm/non_matchings/code/z_sub_s/SubS_WeightPathing_Move.s,SubS_WeightPathing_Move,0x8013C624,0xA5
asm/non_matchings/code/z_sub_s/SubS_CopyPointFromPathCheckBounds.s,SubS_CopyPointFromPathCheckBounds,0x8013C8B8,0x2B
asm/non_matchings/code/z_sub_s/func_8013C964.s,func_8013C964,0x8013C964,0xB2
asm/non_matchings/code/z_sub_s/SubS_FillShadowTex.s,SubS_FillShadowTex,0x8013CC2C,0x4E
asm/non_matchings/code/z_sub_s/SubS_GenShadowTex.s,SubS_GenShadowTex,0x8013CD64,0x68
asm/non_matchings/code/z_sub_s/SubS_DrawShadowTex.s,SubS_DrawShadowTex,0x8013CF04,0x77
-asm/non_matchings/code/z_sub_s/SubS_ComputeTurnToPointRot.s,SubS_ComputeTurnToPointRot,0x8013D0E0,0x80
-asm/non_matchings/code/z_sub_s/SubS_TurnToPoint.s,SubS_TurnToPoint,0x8013D2E0,0xC2
+asm/non_matchings/code/z_sub_s/SubS_ComputeTrackPointRot.s,SubS_ComputeTrackPointRot,0x8013D0E0,0x80
+asm/non_matchings/code/z_sub_s/SubS_TrackPoint.s,SubS_TrackPoint,0x8013D2E0,0xC2
asm/non_matchings/code/z_sub_s/SubS_AngleDiffLessEqual.s,SubS_AngleDiffLessEqual,0x8013D5E8,0x18
asm/non_matchings/code/z_sub_s/SubS_GetPathByIndex.s,SubS_GetPathByIndex,0x8013D648,0x11
asm/non_matchings/code/z_sub_s/SubS_CopyPointFromPath.s,SubS_CopyPointFromPath,0x8013D68C,0x25
@@ -2207,7 +2207,7 @@ asm/non_matchings/code/z_sub_s/SubS_FindActor.s,SubS_FindActor,0x8013D960,0x1A
asm/non_matchings/code/z_sub_s/SubS_FillLimbRotTables.s,SubS_FillLimbRotTables,0x8013D9C8,0x72
asm/non_matchings/code/z_sub_s/SubS_IsFloorAbove.s,SubS_IsFloorAbove,0x8013DB90,0x2C
asm/non_matchings/code/z_sub_s/SubS_CopyPointFromPathList.s,SubS_CopyPointFromPathList,0x8013DC40,0x23
-asm/non_matchings/code/z_sub_s/SubS_GetPathCount.s,SubS_GetPathCount,0x8013DCCC,0x5
+asm/non_matchings/code/z_sub_s/SubS_GetPathCountFromPathList.s,SubS_GetPathCountFromPathList,0x8013DCCC,0x5
asm/non_matchings/code/z_sub_s/SubS_ActorPathing_Init.s,SubS_ActorPathing_Init,0x8013DCE0,0x49
asm/non_matchings/code/z_sub_s/SubS_ActorPathing_Update.s,SubS_ActorPathing_Update,0x8013DE04,0x4E
asm/non_matchings/code/z_sub_s/SubS_ActorPathing_ComputePointInfo.s,SubS_ActorPathing_ComputePointInfo,0x8013DF3C,0x46
@@ -2223,7 +2223,7 @@ asm/non_matchings/code/z_sub_s/SubS_FindActorCustom.s,SubS_FindActorCustom,0x801
asm/non_matchings/code/z_sub_s/func_8013E748.s,func_8013E748,0x8013E748,0x1E
asm/non_matchings/code/z_sub_s/SubS_ActorAndPlayerFaceEachOther.s,SubS_ActorAndPlayerFaceEachOther,0x8013E7C0,0x4E
asm/non_matchings/code/z_sub_s/func_8013E8F8.s,func_8013E8F8,0x8013E8F8,0x16
-asm/non_matchings/code/z_sub_s/SubS_TurnToPointStep.s,SubS_TurnToPointStep,0x8013E950,0xB0
+asm/non_matchings/code/z_sub_s/SubS_TrackPointStep.s,SubS_TrackPointStep,0x8013E950,0xB0
asm/non_matchings/code/code_8013EC10/func_8013EC10.s,func_8013EC10,0x8013EC10,0xD
asm/non_matchings/code/code_8013EC10/func_8013EC44.s,func_8013EC44,0x8013EC44,0x27
asm/non_matchings/code/code_8013EC10/func_8013ECE0.s,func_8013ECE0,0x8013ECE0,0x2F
@@ -2283,12 +2283,12 @@ asm/non_matchings/code/code_80140E80/func_80141200.s,func_80141200,0x80141200,0x
asm/non_matchings/code/code_80140E80/func_8014151C.s,func_8014151C,0x8014151C,0x57
asm/non_matchings/code/code_80140E80/func_80141678.s,func_80141678,0x80141678,0x40
asm/non_matchings/code/code_80140E80/func_80141778.s,func_80141778,0x80141778,0x4E
-asm/non_matchings/code/z_vismono/func_801418B0.s,func_801418B0,0x801418B0,0x14
-asm/non_matchings/code/z_vismono/func_80141900.s,func_80141900,0x80141900,0x9
-asm/non_matchings/code/z_vismono/func_80141924.s,func_80141924,0x80141924,0xC4
-asm/non_matchings/code/z_vismono/func_80141C34.s,func_80141C34,0x80141C34,0x8B
+asm/non_matchings/code/z_vismono/VisMono_Init.s,VisMono_Init,0x801418B0,0x14
+asm/non_matchings/code/z_vismono/VisMono_Destroy.s,VisMono_Destroy,0x80141900,0x9
+asm/non_matchings/code/z_vismono/VisMono_DesaturateTLUT.s,VisMono_DesaturateTLUT,0x80141924,0xC4
+asm/non_matchings/code/z_vismono/VisMono_DesaturateDList.s,VisMono_DesaturateDList,0x80141C34,0x8B
asm/non_matchings/code/z_vismono/VisMono_Draw.s,VisMono_Draw,0x80141E60,0x7B
-asm/non_matchings/code/z_vismono/func_8014204C.s,func_8014204C,0x8014204C,0x1D
+asm/non_matchings/code/z_vismono/VisMono_DrawOld.s,VisMono_DrawOld,0x8014204C,0x1D
asm/non_matchings/code/code_801420C0/func_801420C0.s,func_801420C0,0x801420C0,0xD
asm/non_matchings/code/code_801420C0/func_801420F4.s,func_801420F4,0x801420F4,0x3
asm/non_matchings/code/code_801420C0/func_80142100.s,func_80142100,0x80142100,0xD0
@@ -2550,7 +2550,7 @@ asm/non_matchings/code/z_play/func_80169FFC.s,func_80169FFC,0x80169FFC,0x8
asm/non_matchings/code/z_play/FrameAdvance_IsEnabled.s,FrameAdvance_IsEnabled,0x8016A01C,0x4
asm/non_matchings/code/z_play/func_8016A02C.s,func_8016A02C,0x8016A02C,0x20
asm/non_matchings/code/z_play/Play_IsUnderwater.s,Play_IsUnderwater,0x8016A0AC,0x2F
-asm/non_matchings/code/z_play/func_8016A168.s,func_8016A168,0x8016A168,0x4
+asm/non_matchings/code/z_play/Play_IsDebugCamEnabled.s,Play_IsDebugCamEnabled,0x8016A168,0x4
asm/non_matchings/code/z_play/func_8016A178.s,func_8016A178,0x8016A178,0x3C
asm/non_matchings/code/z_play/func_8016A268.s,func_8016A268,0x8016A268,0x18
asm/non_matchings/code/z_play/Play_Init.s,Play_Init,0x8016A2C8,0x252
diff --git a/undefined_syms.txt b/undefined_syms.txt
index f24e3b627..f2f9c6af1 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -540,13 +540,6 @@ D_06011AB8 = 0x06011AB8;
D_06012A80 = 0x06012A80;
D_06013138 = 0x06013138;
-// ovl_Bg_Astr_Bombwall
-
-D_06002178 = 0x06002178;
-D_060022E0 = 0x060022E0;
-D_06002380 = 0x06002380;
-D_06002498 = 0x06002498;
-
// ovl_Bg_Botihasira
D_06000638 = 0x06000638;
@@ -619,11 +612,6 @@ D_06000C90 = 0x06000C90;
D_06000288 = 0x06000288;
-// ovl_Bg_Ikana_Dharma
-
-D_060008C8 = 0x060008C8;
-D_06000C50 = 0x06000C50;
-
// ovl_Bg_Ikana_Mirror
D_060014B0 = 0x060014B0;
@@ -633,11 +621,6 @@ D_06001AD8 = 0x06001AD8;
D_06001E18 = 0x06001E18;
D_06002358 = 0x06002358;
-// ovl_Bg_Ikninside
-
-D_0600CC78 = 0x0600CC78;
-D_0600DE48 = 0x0600DE48;
-
// ovl_Bg_Iknv_Doukutu
D_0600DB60 = 0x0600DB60;
@@ -651,11 +634,6 @@ D_06012700 = 0x06012700;
D_06012728 = 0x06012728;
D_06012788 = 0x06012788;
-// ovl_Bg_Keikoku_Saku
-
-D_06001640 = 0x06001640;
-D_06002300 = 0x06002300;
-
// ovl_Bg_Kin2_Bombwall
D_06000128 = 0x06000128;
@@ -888,18 +866,6 @@ D_0600E748 = 0x0600E748;
D_0600005C = 0x0600005C;
D_06001398 = 0x06001398;
-// ovl_Dm_Opstage
-
-D_06000970 = 0x06000970;
-D_06000978 = 0x06000978;
-D_06001C98 = 0x06001C98;
-D_06002870 = 0x06002870;
-D_06002878 = 0x06002878;
-D_06003060 = 0x06003060;
-D_06003068 = 0x06003068;
-D_06003720 = 0x06003720;
-D_06003728 = 0x06003728;
-
// ovl_Dm_Tsg
D_06002D30 = 0x06002D30;
@@ -1193,23 +1159,12 @@ D_0600A808 = 0x0600A808;
D_06000F9C = 0x06000F9C;
D_06003F00 = 0x06003F00;
-// ovl_En_Hata
-
-D_060000C0 = 0x060000C0;
-D_06000444 = 0x06000444;
-D_06002FD0 = 0x06002FD0;
-
// ovl_En_Hgo
D_0600B644 = 0x0600B644;
D_0600F248 = 0x0600F248;
D_06012A58 = 0x06012A58;
-// ovl_En_Horse_Link_Child
-
-D_06002F98 = 0x06002F98;
-D_0600A480 = 0x0600A480;
-
// ovl_En_Ik
D_06000CE8 = 0x06000CE8;
@@ -1564,11 +1519,6 @@ D_06000168 = 0x06000168;
D_060003F8 = 0x060003F8;
D_060004B0 = 0x060004B0;
-// ovl_Obj_Boat
-
-D_06007630 = 0x06007630;
-D_06009A88 = 0x06009A88;
-
// ovl_Obj_Chikuwa
D_06000D10 = 0x06000D10;
@@ -1623,18 +1573,6 @@ D_06001100 = 0x06001100;
D_06001140 = 0x06001140;
D_06001CB0 = 0x06001CB0;
-// ovl_Obj_Toge
-
-D_06001400 = 0x06001400;
-
-// ovl_Obj_Tokei_Turret
-
-D_06002508 = 0x06002508;
-D_060026A0 = 0x060026A0;
-D_06002A88 = 0x06002A88;
-D_06002D80 = 0x06002D80;
-D_06003038 = 0x06003038;
-
// ovl_Obj_Toudai
D_060023B0 = 0x060023B0;