diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-06-14 21:35:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 21:35:22 -0700 |
| commit | 0b375cadb0af6f2d95844cc674f84be0b148ae10 (patch) | |
| tree | 7e8a3262a549c45fe24d5a78ea66ad9407b79d4f /src/overlays/actors/ovl_En_Test3/z_en_test3.c | |
| parent | bd596f9869179f36dad57b1e17360b6532b842ca (diff) | |
Msgevent OK (#1637)
* Decompiled, some commands still unnamed
* Use full weekevent reg names
* Fix func_8094E69C
* Fix Player_GetMask
* Eventinf, mask worn, and item action argument formatting
* decimal rupees
* Times (day, hours, minutes) as decimal
* msgEventScriptPos
* Callbacks
* Name final commands
* Enum
* Arrays
* functions
* Small cleanups
* Clean up actors
* Remove event from some variable names to make them shorter
* Some more function renames
* newline
* Missed a few unks in commands
* Update functions.txt
* PlayerMask
* MSGMODE_PAUSED
* Script time macros
* EnSob1_GetWelcome default
* Whole bunch of renames
* Format
* Add CMD to commands
* Update code_functions
* structs for size
* z64scripts.h
* MsgEventCallback -> MsgScriptCallback
* format
* MsgEvent_RunScript stop
* Remove cmd handler comment
* cmd -> script in MsgEvent_RunScript
---------
Co-authored-by: Thar0 <17233964+Thar0@users.noreply.github.com>
Diffstat (limited to 'src/overlays/actors/ovl_En_Test3/z_en_test3.c')
| -rw-r--r-- | src/overlays/actors/ovl_En_Test3/z_en_test3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index af9840373..cf396f45f 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -629,7 +629,7 @@ s32 func_80A3F9A4(EnTest3* this, PlayState* play) { } s32 func_80A3F9E4(EnTest3* this, PlayState* play, struct_80A41828* arg2, ScheduleOutput* scheduleOutput) { - scheduleOutput->time0 = (u16)SCHEDULE_TIME_NOW; + scheduleOutput->time0 = (u16)SCRIPT_TIME_NOW; scheduleOutput->time1 = (u16)(scheduleOutput->time0 + 70); func_80A40098(this, play, arg2, scheduleOutput); if (this->player.actor.xzDistToPlayer < 300.0f) { @@ -657,7 +657,7 @@ s32 func_80A3FA58(EnTest3* this, PlayState* play) { if (cond || this->unk_D8A <= 0) { func_80A3F114(this, play); sp40.unk_1_0 = 5; - scheduleOutput.time0 = (u16)SCHEDULE_TIME_NOW; + scheduleOutput.time0 = (u16)SCRIPT_TIME_NOW; scheduleOutput.time1 = (u16)(scheduleOutput.time0 + (cond ? 80 : 140)); func_80A40098(this, play, &sp40, &scheduleOutput); @@ -733,7 +733,7 @@ s32 func_80A3FE20(EnTest3* this, PlayState* play) { if (D_80A41D64 == 0) { if (func_80A3E9DC(this, play)) { sp2C.unk_1_0 = 2; - scheduleOutput.time0 = (u16)SCHEDULE_TIME_NOW; + scheduleOutput.time0 = (u16)SCRIPT_TIME_NOW; scheduleOutput.time1 = (u16)(scheduleOutput.time0 + 1000); func_80A40098(this, play, &sp2C, &scheduleOutput); D_80A41D64 = 1; @@ -792,7 +792,7 @@ s32 func_80A3FFD0(EnTest3* this, PlayState* play2) { } s32 func_80A40098(EnTest3* this, PlayState* play, struct_80A41828* arg2, ScheduleOutput* scheduleOutput) { - u16 now = SCHEDULE_TIME_NOW; + u16 now = SCRIPT_TIME_NOW; u16 startTime; u16 numWaypoints; |