Document EnToto (#1887)

* Start documenting Toto

* Document EnToto_IsFacingPlayer and Unk2B6/isPlayerCancelingSoundCheck

* Rename EnTotoText to EnTotoSpeakData to align with EnTest3 (Kafei)

* Update gitignore

* Document some HandleTalk and SetupTalk functions similar to EnTest3

* Rename D_80BA502C to sEnTotoSpeakData1

* Document TalkState setup funcs

* Update gitignore, document talk state update functions (from En_Test3)

* Toto talk loop animations

* Update gitignore for functions.txt

* Document ActionFuncs

* Clean up remaining undocumented variables

* Clean up comments

* Run format.py and clean up result, and revert makefile changes

* Add missing newline at end of z_en_toto.h

* Clean up gitignore and other local stuff

* gitignore again

* Gitignore again again

* Gitignore again again again

* Restore old graphovl.py

* Update include/z64save.h

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_En_Toto/z_en_toto.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Rename SetupAction and Action functions; fix block comments; create enum for TalkData

* move enum up so it's declared before it's used lol

* Change shouldCancelSoundCheck and ShouldPlaySoundCheckCompleteCutscene to bool

* Run format.py even though it makes the SpeakData array less readable yay

* Remove accidentally pushed files

* Enum for SpeakDataIndex

* SpeakDataIndex

* Index into SpeakData with enums

* Apply requested changes

* Apply clang-format

* Apply requested changes (rename SetPlayedFlags, add formsPlayed enum, fix a few missing enum replacements)

* Change enum to macros

* Apply more suggested changes

---------

Co-authored-by: AlexisACooper1 <alexis@lingualogica.net>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Alexis Cooper
2026-10-10 20:53:23 -06:00
committed by GitHub
parent 6e5fb93dde
commit bf6bd9d0d3
11 changed files with 536 additions and 386 deletions
+13 -13
View File
@@ -1,13 +1,13 @@
<Root>
<File Name="object_zm" Segment="6">
<Animation Name="object_zm_Anim_000C80" Offset="0xC80" /> <!-- Original name is "zM_aisatsu" -->
<Animation Name="object_zm_Anim_001324" Offset="0x1324" /> <!-- Original name is "zM_furimuki" -->
<Animation Name="object_zm_Anim_0016A4" Offset="0x16A4" /> <!-- Original name is "zM_furimuki2wait" -->
<Animation Name="object_zm_Anim_001DF0" Offset="0x1DF0" /> <!-- Original name is "zM_maru" -->
<Animation Name="object_zm_Anim_0022C8" Offset="0x22C8" /> <!-- Original name is "zM_ok2furimuki" -->
<Animation Name="object_zm_Anim_0028B8" Offset="0x28B8" /> <!-- Original name is "zM_suwaritalk01" -->
<Animation Name="object_zm_Anim_002F20" Offset="0x2F20" /> <!-- Original name is "zM_suwaritalk02" -->
<Animation Name="object_zm_Anim_003AA8" Offset="0x3AA8" /> <!-- Original name is "zM_suwariwait" -->
<Animation Name="gTotoWaveHelloAnim" Offset="0xC80" /> <!-- Original name is "zM_aisatsu" -->
<Animation Name="gTotoIdleLookAtGormanAnim" Offset="0x1324" /> <!-- Original name is "zM_furimuki" -->
<Animation Name="gTotoTurnLookAtStageAnim" Offset="0x16A4" /> <!-- Original name is "zM_furimuki2wait" -->
<Animation Name="gTotoCheerAnim" Offset="0x1DF0" /> <!-- Original name is "zM_maru" -->
<Animation Name="gTotoTurnLookAtGormanAnim" Offset="0x22C8" /> <!-- Original name is "zM_ok2furimuki" -->
<Animation Name="gTotoTalkSittingAnim" Offset="0x28B8" /> <!-- Original name is "zM_suwaritalk01" -->
<Animation Name="gTotoTapHeadWithCaneAnim" Offset="0x2F20" /> <!-- Original name is "zM_suwaritalk02" -->
<Animation Name="gTotoIdleSittingAnim" Offset="0x3AA8" /> <!-- Original name is "zM_suwariwait" -->
<DList Name="object_zm_DL_0063A0" Offset="0x63A0" />
<DList Name="object_zm_DL_0066D0" Offset="0x66D0" />
<DList Name="object_zm_DL_006898" Offset="0x6898" />
@@ -55,10 +55,10 @@
<Limb Name="object_zm_Standardlimb_00A910" Type="Standard" EnumName="OBJECT_ZM_LIMB_0F" Offset="0xA910" />
<Limb Name="object_zm_Standardlimb_00A91C" Type="Standard" EnumName="OBJECT_ZM_LIMB_10" Offset="0xA91C" />
<Limb Name="object_zm_Standardlimb_00A928" Type="Standard" EnumName="OBJECT_ZM_LIMB_11" Offset="0xA928" />
<Skeleton Name="object_zm_Skel_00A978" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZM_LIMB_NONE" LimbMax="OBJECT_ZM_LIMB_MAX" EnumName="ObjectZmLimb" Offset="0xA978" />
<Animation Name="object_zm_Anim_00B3E0" Offset="0xB3E0" /> <!-- Original name is "zM_talk" -->
<Animation Name="object_zm_Anim_00B894" Offset="0xB894" /> <!-- Original name is "zM_talk01TOtalk02" -->
<Animation Name="object_zm_Anim_00BC08" Offset="0xBC08" /> <!-- Original name is "zM_talk02TOtalk01" -->
<Animation Name="object_zm_Anim_00C880" Offset="0xC880" /> <!-- Original name is "zM_wait" -->
<Skeleton Name="gTotoSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZM_LIMB_NONE" LimbMax="OBJECT_ZM_LIMB_MAX" EnumName="ObjectZmLimb" Offset="0xA978" />
<Animation Name="gTotoTalkStandingAnim" Offset="0xB3E0" /> <!-- Original name is "zM_talk" -->
<Animation Name="gTotoMoveCaneBehindHeadAnim" Offset="0xB894" /> <!-- Original name is "zM_talk01TOtalk02" -->
<Animation Name="gTotoMoveCaneBackDownAnim" Offset="0xBC08" /> <!-- Original name is "zM_talk02TOtalk01" -->
<Animation Name="gTotoIdleStandingAnim" Offset="0xC880" /> <!-- Original name is "zM_wait" -->
</File>
</Root>
+1 -1
View File
@@ -457,7 +457,7 @@ typedef enum {
/* 0x20A */ CS_CMD_ACTOR_CUE_522,
/* 0x20B */ CS_CMD_ACTOR_CUE_523,
/* 0x20C */ CS_CMD_ACTOR_CUE_524,
/* 0x20D */ CS_CMD_ACTOR_CUE_525,
/* 0x20D */ CS_CMD_ACTOR_CUE_525, // Toto and Gorman interaction in Milk Bar
/* 0x20E */ CS_CMD_ACTOR_CUE_526,
/* 0x20F */ CS_CMD_ACTOR_CUE_527,
/* 0x210 */ CS_CMD_ACTOR_CUE_528,
+6 -6
View File
@@ -1102,7 +1102,7 @@ typedef enum {
#define WEEKEVENTREG_49_20 PACK_WEEKEVENTREG_FLAG(49, 0x20)
#define WEEKEVENTREG_49_40 PACK_WEEKEVENTREG_FLAG(49, 0x40)
#define WEEKEVENTREG_49_80 PACK_WEEKEVENTREG_FLAG(49, 0x80)
#define WEEKEVENTREG_50_01 PACK_WEEKEVENTREG_FLAG(50, 0x01)
#define WEEKEVENTREG_HELPED_GORMAN_DAY_1 PACK_WEEKEVENTREG_FLAG(50, 0x01)
#define WEEKEVENTREG_50_02 PACK_WEEKEVENTREG_FLAG(50, 0x02)
#define WEEKEVENTREG_50_04 PACK_WEEKEVENTREG_FLAG(50, 0x04)
#define WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING PACK_WEEKEVENTREG_FLAG(50, 0x08)
@@ -1120,7 +1120,7 @@ typedef enum {
// Set by Kafei
#define WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED PACK_WEEKEVENTREG_FLAG(51, 0x40)
#define WEEKEVENTREG_51_80 PACK_WEEKEVENTREG_FLAG(51, 0x80)
#define WEEKEVENTREG_HELPED_GORMAN_DAY_2 PACK_WEEKEVENTREG_FLAG(51, 0x80)
// Protected Cremia
#define WEEKEVENTREG_ESCORTED_CREMIA PACK_WEEKEVENTREG_FLAG(52, 0x01)
@@ -1167,10 +1167,10 @@ typedef enum {
#define WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE PACK_WEEKEVENTREG_FLAG(56, 0x02)
#define WEEKEVENTREG_56_04 PACK_WEEKEVENTREG_FLAG(56, 0x04)
#define WEEKEVENTREG_56_08 PACK_WEEKEVENTREG_FLAG(56, 0x08)
#define WEEKEVENTREG_56_10 PACK_WEEKEVENTREG_FLAG(56, 0x10)
#define WEEKEVENTREG_56_20 PACK_WEEKEVENTREG_FLAG(56, 0x20)
#define WEEKEVENTREG_56_40 PACK_WEEKEVENTREG_FLAG(56, 0x40)
#define WEEKEVENTREG_56_80 PACK_WEEKEVENTREG_FLAG(56, 0x80)
#define WEEKEVENTREG_PLAYED_WIND_FISH_AS_HUMAN PACK_WEEKEVENTREG_FLAG(56, 0x10)
#define WEEKEVENTREG_PLAYED_WIND_FISH_AS_DEKU PACK_WEEKEVENTREG_FLAG(56, 0x20)
#define WEEKEVENTREG_PLAYED_WIND_FISH_AS_ZORA PACK_WEEKEVENTREG_FLAG(56, 0x40)
#define WEEKEVENTREG_PLAYED_WIND_FISH_AS_GORON PACK_WEEKEVENTREG_FLAG(56, 0x80)
#define WEEKEVENTREG_57_01 PACK_WEEKEVENTREG_FLAG(57, 0x01)
#define WEEKEVENTREG_57_02 PACK_WEEKEVENTREG_FLAG(57, 0x02)
#define WEEKEVENTREG_57_04 PACK_WEEKEVENTREG_FLAG(57, 0x04)
@@ -68,7 +68,7 @@ D_80951820 {
return_none
}
} else if_day (2) {
if_week_event_reg (WEEKEVENTREG_50_01) {
if_week_event_reg (WEEKEVENTREG_HELPED_GORMAN_DAY_1) {
if_scene (SCENE_YADOYA) {
if_time_range (6, 0, 18, 0) {
return_time (6, 0, 18, 0, 7)
+7 -7
View File
@@ -210,8 +210,8 @@ static MsgScript D_80951B98[] = {
static MsgScript D_80951BE8[] = {
/* 0x0000 0x03 */ MSCRIPT_CMD_CHECK_CALLBACK(0x0),
/* 0x0003 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_50_01, 0x0039 - 0x0008),
/* 0x0008 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_51_80, 0x0039 - 0x000D),
/* 0x0003 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_HELPED_GORMAN_DAY_1, 0x0039 - 0x0008),
/* 0x0008 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_HELPED_GORMAN_DAY_2, 0x0039 - 0x000D),
/* 0x000D 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_75_02, 0x001F - 0x0012),
/* 0x0012 0x03 */ MSCRIPT_CMD_BEGIN_TEXT(0x2B13),
/* 0x0015 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_MET_GORMAN),
@@ -758,8 +758,8 @@ s32 func_8094EB1C(Actor* thisx, PlayState* play) {
switch (this->unk_3E0) {
case 0:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_50_01) || CHECK_WEEKEVENTREG(WEEKEVENTREG_51_80) ||
CHECK_WEEKEVENTREG(WEEKEVENTREG_75_02)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_HELPED_GORMAN_DAY_1) ||
CHECK_WEEKEVENTREG(WEEKEVENTREG_HELPED_GORMAN_DAY_2) || CHECK_WEEKEVENTREG(WEEKEVENTREG_75_02)) {
ret = true;
break;
}
@@ -865,8 +865,8 @@ s32 func_8094EE84(EnGm* this, PlayState* play) {
this->actor.child = this->unk_268;
this->msgScript = EnGm_GetMsgScript(this, play);
if ((this->scheduleResult == 5) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_50_01) &&
!CHECK_WEEKEVENTREG(WEEKEVENTREG_51_80) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_75_02)) {
if ((this->scheduleResult == 5) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_HELPED_GORMAN_DAY_1) &&
!CHECK_WEEKEVENTREG(WEEKEVENTREG_HELPED_GORMAN_DAY_2) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_75_02)) {
this->unk_3A4 |= 0x20;
} else if ((this->scheduleResult != 1) && (this->scheduleResult != 5) && (this->scheduleResult != 7)) {
this->unk_3A4 |= 0x20;
@@ -1481,7 +1481,7 @@ s32 func_80950490(EnGm* this, PlayState* play) {
};
s32 pad;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_50_01) || CHECK_WEEKEVENTREG(WEEKEVENTREG_51_80)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_HELPED_GORMAN_DAY_1) || CHECK_WEEKEVENTREG(WEEKEVENTREG_HELPED_GORMAN_DAY_2)) {
if (this->unk_400 == 0) {
this->unk_3C8 = 1;
this->unk_3CA = 1;
File diff suppressed because it is too large Load Diff
+25 -19
View File
@@ -8,24 +8,30 @@
struct EnToto;
typedef void (*EnTotoActionFunc)(struct EnToto*, PlayState*);
typedef s32 (*EnTotoUnkFunc)(struct EnToto*, PlayState*);
typedef s32 (*EnTotoTalkFunc)(struct EnToto*, PlayState*);
#define ENTOTO_GET_SWITCH_FLAG_1(thisx) ((thisx)->params & 0x7F)
#define ENTOTO_GET_SWITCH_FLAG_2(thisx) (((thisx)->params >> 7) & 0x7F)
#define ENTOTO_GET_SWITCH_FLAG_3(thisx) ((thisx)->home.rot.x)
#define ENTOTO_GET_ZORA_SPOKEN_FLAG(thisx) ((thisx)->params & 0x7F)
#define ENTOTO_GET_OTHER_SPOKEN_FLAG(thisx) (((thisx)->params >> 7) & 0x7F)
#define ENTOTO_GET_DEKU_SPOKEN_FLAG(thisx) ((thisx)->home.rot.x)
typedef struct EnTotoText {
/* 0x0 */ u8 unk0;
/* 0x1 */ u8 unk1;
#define WIND_FISH_PLAYED_HUMAN (1 << 0)
#define WIND_FISH_PLAYED_DEKU (1 << 1)
#define WIND_FISH_PLAYED_ZORA (1 << 2)
#define WIND_FISH_PLAYED_GORON (1 << 3)
#define WIND_FISH_PLAYED_ALL (WIND_FISH_PLAYED_HUMAN + WIND_FISH_PLAYED_DEKU + WIND_FISH_PLAYED_ZORA + WIND_FISH_PLAYED_GORON)
typedef struct EnTotoSpeakData {
/* 0x0 */ u8 talkActionIndex;
/* 0x1 */ u8 arg; // Used for various functions, including as a timer
/* 0x2 */ u16 textId;
} EnTotoText; // size = 0x4
} EnTotoSpeakData; // size = 0x4
typedef struct EnTotoUnkStruct2 {
/* 0x0 */ u16 unk0;
/* 0x2 */ u16 unk2;
/* 0x4 */ u16 unk4;
/* 0x6 */ Vec3s unk6;
} EnTotoUnkStruct2; // size = 0xC
typedef struct EnTotoSpotlight {
/* 0x0 */ u16 promptTextId;
/* 0x2 */ u16 wrongLightTextId;
/* 0x4 */ u16 rightLightTextId;
/* 0x6 */ Vec3s pos;
} EnTotoSpotlight; // size = 0xC
typedef struct EnToto {
/* 0x000 */ Actor actor;
@@ -35,14 +41,14 @@ typedef struct EnToto {
/* 0x260 */ FaceChange faceChange;
/* 0x264 */ ColliderCylinder collider;
/* 0x2B0 */ u8 actionFuncIndex;
/* 0x2B1 */ u8 unk2B1;
/* 0x2B1 */ u8 timer;
/* 0x2B2 */ s8 csId;
/* 0x2B3 */ u8 unk2B3;
/* 0x2B3 */ u8 windFishFormsPlayed;
/* 0x2B4 */ u8 animIndex;
/* 0x2B5 */ u8 cueId;
/* 0x2B6 */ u8 unk2B6;
/* 0x2B7 */ u8 unk2B7;
/* 0x2B8 */ EnTotoText* text;
/* 0x2B6 */ u8 shouldCancelSoundCheck;
/* 0x2B7 */ u8 shouldPlaySoundCheckCompleteCutscene;
/* 0x2B8 */ EnTotoSpeakData* speakData;
/* 0x2BC */ PlayerOverrideInputEntry overrideInputEntry;
/* 0x2C4 */ Actor* spotlights;
/* 0x2C8 */ s32 pad2C8;
+37 -37
View File
@@ -15066,45 +15066,45 @@ func_80BA3230 = 0x80BA6550; // type:func size:0x114
func_80BA3344 = 0x80BA6664; // type:func size:0xCC
ObjNozoki_Update = 0x80BA6730; // type:func size:0x24
ObjNozoki_Draw = 0x80BA6754; // type:func size:0x5C
func_80BA36C0 = 0x80BA69E0; // type:func size:0x3C
EnToto_SetMainAction = 0x80BA69E0; // type:func size:0x3C
EnToto_Init = 0x80BA6A1C; // type:func size:0x114
EnToto_Destroy = 0x80BA6B30; // type:func size:0x2C
func_80BA383C = 0x80BA6B5C; // type:func size:0xF4
func_80BA3930 = 0x80BA6C50; // type:func size:0x4C
func_80BA397C = 0x80BA6C9C; // type:func size:0x4C
func_80BA39C8 = 0x80BA6CE8; // type:func size:0x218
func_80BA3BFC = 0x80BA6F00; // type:func size:0x8C
func_80BA3C88 = 0x80BA6F8C; // type:func size:0x3C
func_80BA3CC4 = 0x80BA6FC8; // type:func size:0x74
func_80BA3D38 = 0x80BA703C; // type:func size:0x84
func_80BA3DBC = 0x80BA70C0; // type:func size:0x104
func_80BA3EC0 = 0x80BA71C4; // type:func size:0x14
func_80BA3ED4 = 0x80BA71D8; // type:func size:0x14
func_80BA3EE8 = 0x80BA71EC; // type:func size:0x44
func_80BA3F2C = 0x80BA7230; // type:func size:0x84
func_80BA3FB0 = 0x80BA72B4; // type:func size:0x1C
func_80BA3FCC = 0x80BA72D0; // type:func size:0x60
func_80BA402C = 0x80BA7330; // type:func size:0x50
func_80BA407C = 0x80BA7380; // type:func size:0x58
func_80BA40D4 = 0x80BA73D8; // type:func size:0x54
func_80BA4128 = 0x80BA742C; // type:func size:0x34
func_80BA415C = 0x80BA7460; // type:func size:0xA8
func_80BA4204 = 0x80BA7508; // type:func size:0xB8
func_80BA42BC = 0x80BA75C0; // type:func size:0x138
func_80BA43F4 = 0x80BA76F8; // type:func size:0x68
func_80BA445C = 0x80BA7760; // type:func size:0x44
func_80BA44A0 = 0x80BA77A4; // type:func size:0x34
func_80BA44D4 = 0x80BA77D8; // type:func size:0x5C
func_80BA4530 = 0x80BA7834; // type:func size:0x1A8
func_80BA46D8 = 0x80BA79DC; // type:func size:0x68
func_80BA4740 = 0x80BA7A44; // type:func size:0xA0
func_80BA47E0 = 0x80BA7AE4; // type:func size:0x1C4
func_80BA49A4 = 0x80BA7CA8; // type:func size:0x5C
func_80BA4A00 = 0x80BA7D04; // type:func size:0x124
func_80BA4B24 = 0x80BA7E28; // type:func size:0xE8
func_80BA4C0C = 0x80BA7F10; // type:func size:0x38
func_80BA4C44 = 0x80BA7F48; // type:func size:0x70
func_80BA4CB4 = 0x80BA7FB8; // type:func size:0x178
EnToto_UpdateAnimation = 0x80BA6B5C; // type:func size:0xF4
EnToto_SetupIdle = 0x80BA6C50; // type:func size:0x4C
EnToto_IsFacingPlayer = 0x80BA6C9C; // type:func size:0x4C
EnToto_Idle = 0x80BA6CE8; // type:func size:0x218
EnToto_SetupTalk = 0x80BA6F00; // type:func size:0x8C
EnToto_TurnTowardsPlayer = 0x80BA6F8C; // type:func size:0x3C
EnToto_Talk = 0x80BA6FC8; // type:func size:0x74
EnToto_SetupSoundCheck = 0x80BA703C; // type:func size:0x84
EnToto_SoundCheck = 0x80BA70C0; // type:func size:0x104
EnToto_SetupTalk_ReturnTrue = 0x80BA71C4; // type:func size:0x14
EnToto_SetupTalk_ReturnFalse = 0x80BA71D8; // type:func size:0x14
EnToto_HandleTalk_AfterChoice = 0x80BA71EC; // type:func size:0x44
EnToto_SetupTalk_NextMessage = 0x80BA7230; // type:func size:0x84
EnToto_SetupTalk_SetNextMessageTimer = 0x80BA72B4; // type:func size:0x1C
EnToto_HandleTalk_Wait = 0x80BA72D0; // type:func size:0x60
EnToto_SetupTalk_StartAdditionalCutscene = 0x80BA7330; // type:func size:0x50
EnToto_HandleTalk_StartCutscene = 0x80BA7380; // type:func size:0x58
EnToto_HandleTalk_Event = 0x80BA73D8; // type:func size:0x54
EnToto_HandleTalk_Closing = 0x80BA742C; // type:func size:0x34
EnToto_HandleTalk_Choice = 0x80BA7460; // type:func size:0xA8
EnToto_HandleTalk_SoundCheck_WaitAdvanceText = 0x80BA7508; // type:func size:0xB8
EnToto_SetupTalk_InitSoundCheck = 0x80BA75C0; // type:func size:0x138
EnToto_HandleTalk_SoundCheck_MovePlayerToStage = 0x80BA76F8; // type:func size:0x68
EnToto_HandleTalk_SoundCheck_WaitForPromptTextbox = 0x80BA7760; // type:func size:0x44
EnToto_SetupTalk_StopCutsceneAndResetTimer = 0x80BA77A4; // type:func size:0x34
EnToto_CheckIfPlayerInSpotlight = 0x80BA77D8; // type:func size:0x5C
EnToto_HandleTalk_SoundCheck_WaitForPlayerToEnterSpotlight = 0x80BA7834; // type:func size:0x1A8
EnToto_SetupTalk_InitWindFishOcarinaStaff = 0x80BA79DC; // type:func size:0x68
EnToto_HandleTalk_SoundCheck_UpdatePlayedFlags = 0x80BA7A44; // type:func size:0xA0
EnToto_SetupTalk_InitWindFishPlayback = 0x80BA7AE4; // type:func size:0x1C4
EnToto_SetupTalk_StartWindFishPlayback = 0x80BA7CA8; // type:func size:0x5C
EnToto_HandleTalk_SoundCheck_EndWindFishCutscene = 0x80BA7D04; // type:func size:0x124
EnToto_HandleTalk_SetupMayorsResidence = 0x80BA7E28; // type:func size:0xE8
EnToto_RunTalkStateSetupFunc = 0x80BA7F10; // type:func size:0x38
EnToto_RunTalkStateHandlerFunc = 0x80BA7F48; // type:func size:0x70
EnToto_HandleGormanCutscene = 0x80BA7FB8; // type:func size:0x178
EnToto_Update = 0x80BA8130; // type:func size:0xD0
EnToto_Draw = 0x80BA8200; // type:func size:0xD0
EnRailgibud_SpawnOtherGibdosAndSetPositionAndRotation = 0x80BA8700; // type:func size:0x220
+37 -37
View File
@@ -15074,45 +15074,45 @@ func_80BA3230 = 0x80BA3230; // type:func
func_80BA3344 = 0x80BA3344; // type:func
ObjNozoki_Update = 0x80BA3410; // type:func
ObjNozoki_Draw = 0x80BA3434; // type:func
func_80BA36C0 = 0x80BA36C0; // type:func
EnToto_SetMainAction = 0x80BA36C0; // type:func
EnToto_Init = 0x80BA36FC; // type:func
EnToto_Destroy = 0x80BA3810; // type:func
func_80BA383C = 0x80BA383C; // type:func
func_80BA3930 = 0x80BA3930; // type:func
func_80BA397C = 0x80BA397C; // type:func
func_80BA39C8 = 0x80BA39C8; // type:func
func_80BA3BFC = 0x80BA3BFC; // type:func
func_80BA3C88 = 0x80BA3C88; // type:func
func_80BA3CC4 = 0x80BA3CC4; // type:func
func_80BA3D38 = 0x80BA3D38; // type:func
func_80BA3DBC = 0x80BA3DBC; // type:func
func_80BA3EC0 = 0x80BA3EC0; // type:func
func_80BA3ED4 = 0x80BA3ED4; // type:func
func_80BA3EE8 = 0x80BA3EE8; // type:func
func_80BA3F2C = 0x80BA3F2C; // type:func
func_80BA3FB0 = 0x80BA3FB0; // type:func
func_80BA3FCC = 0x80BA3FCC; // type:func
func_80BA402C = 0x80BA402C; // type:func
func_80BA407C = 0x80BA407C; // type:func
func_80BA40D4 = 0x80BA40D4; // type:func
func_80BA4128 = 0x80BA4128; // type:func
func_80BA415C = 0x80BA415C; // type:func
func_80BA4204 = 0x80BA4204; // type:func
func_80BA42BC = 0x80BA42BC; // type:func
func_80BA43F4 = 0x80BA43F4; // type:func
func_80BA445C = 0x80BA445C; // type:func
func_80BA44A0 = 0x80BA44A0; // type:func
func_80BA44D4 = 0x80BA44D4; // type:func
func_80BA4530 = 0x80BA4530; // type:func
func_80BA46D8 = 0x80BA46D8; // type:func
func_80BA4740 = 0x80BA4740; // type:func
func_80BA47E0 = 0x80BA47E0; // type:func
func_80BA49A4 = 0x80BA49A4; // type:func
func_80BA4A00 = 0x80BA4A00; // type:func
func_80BA4B24 = 0x80BA4B24; // type:func
func_80BA4C0C = 0x80BA4C0C; // type:func
func_80BA4C44 = 0x80BA4C44; // type:func
func_80BA4CB4 = 0x80BA4CB4; // type:func
EnToto_UpdateAnimation = 0x80BA383C; // type:func
EnToto_SetupIdle = 0x80BA3930; // type:func
EnToto_IsFacingPlayer = 0x80BA397C; // type:func
EnToto_Idle = 0x80BA39C8; // type:func
EnToto_SetupTalk = 0x80BA3BFC; // type:func
EnToto_TurnTowardsPlayer = 0x80BA3C88; // type:func
EnToto_Talk = 0x80BA3CC4; // type:func
EnToto_SetupSoundCheck = 0x80BA3D38; // type:func
EnToto_SoundCheck = 0x80BA3DBC; // type:func
EnToto_SetupTalk_ReturnTrue = 0x80BA3EC0; // type:func
EnToto_SetupTalk_ReturnFalse = 0x80BA3ED4; // type:func
EnToto_HandleTalk_AfterChoice = 0x80BA3EE8; // type:func
EnToto_SetupTalk_NextMessage = 0x80BA3F2C; // type:func
EnToto_SetupTalk_SetNextMessageTimer = 0x80BA3FB0; // type:func
EnToto_HandleTalk_Wait = 0x80BA3FCC; // type:func
EnToto_SetupTalk_StartAdditionalCutscene = 0x80BA402C; // type:func
EnToto_HandleTalk_StartCutscene = 0x80BA407C; // type:func
EnToto_HandleTalk_Event = 0x80BA40D4; // type:func
EnToto_HandleTalk_Closing = 0x80BA4128; // type:func
EnToto_HandleTalk_Choice = 0x80BA415C; // type:func
EnToto_HandleTalk_SoundCheck_WaitAdvanceText = 0x80BA4204; // type:func
EnToto_SetupTalk_InitSoundCheck = 0x80BA42BC; // type:func
EnToto_HandleTalk_SoundCheck_MovePlayerToStage = 0x80BA43F4; // type:func
EnToto_HandleTalk_SoundCheck_WaitForPromptTextbox = 0x80BA445C; // type:func
EnToto_SetupTalk_StopCutsceneAndResetTimer = 0x80BA44A0; // type:func
EnToto_CheckIfPlayerInSpotlight = 0x80BA44D4; // type:func
EnToto_HandleTalk_SoundCheck_WaitForPlayerToEnterSpotlight = 0x80BA4530; // type:func
EnToto_SetupTalk_InitWindFishOcarinaStaff = 0x80BA46D8; // type:func
EnToto_HandleTalk_SoundCheck_UpdatePlayedFlags = 0x80BA4740; // type:func
EnToto_SetupTalk_InitWindFishPlayback = 0x80BA47E0; // type:func
EnToto_SetupTalk_StartWindFishPlayback = 0x80BA49A4; // type:func
EnToto_HandleTalk_SoundCheck_EndWindFishCutscene = 0x80BA4A00; // type:func
EnToto_HandleTalk_SetupMayorsResidence = 0x80BA4B24; // type:func
EnToto_RunTalkStateSetupFunc = 0x80BA4C0C; // type:func
EnToto_RunTalkStateHandlerFunc = 0x80BA4C44; // type:func
EnToto_HandleGormanCutscene = 0x80BA4CB4; // type:func
EnToto_Update = 0x80BA4E2C; // type:func
EnToto_Draw = 0x80BA4EFC; // type:func
EnRailgibud_SpawnOtherGibdosAndSetPositionAndRotation = 0x80BA5400; // type:func
+6 -6
View File
@@ -461,7 +461,7 @@ week_event_reg = {
(49 << 8) | 0x20: "WEEKEVENTREG_49_20",
(49 << 8) | 0x40: "WEEKEVENTREG_49_40",
(49 << 8) | 0x80: "WEEKEVENTREG_49_80",
(50 << 8) | 0x01: "WEEKEVENTREG_50_01",
(50 << 8) | 0x01: "WEEKEVENTREG_HELPED_GORMAN_DAY_1",
(50 << 8) | 0x02: "WEEKEVENTREG_50_02",
(50 << 8) | 0x04: "WEEKEVENTREG_50_04",
(50 << 8) | 0x08: "WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING",
@@ -476,7 +476,7 @@ week_event_reg = {
(51 << 8) | 0x10: "WEEKEVENTREG_51_10",
(51 << 8) | 0x20: "WEEKEVENTREG_ESCAPED_SAKONS_HIDEOUT",
(51 << 8) | 0x40: "WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED",
(51 << 8) | 0x80: "WEEKEVENTREG_51_80",
(51 << 8) | 0x80: "WEEKEVENTREG_HELPED_GORMAN_DAY_2",
(52 << 8) | 0x01: "WEEKEVENTREG_ESCORTED_CREMIA",
(52 << 8) | 0x02: "WEEKEVENTREG_52_02",
(52 << 8) | 0x04: "WEEKEVENTREG_52_04",
@@ -513,10 +513,10 @@ week_event_reg = {
(56 << 8) | 0x02: "WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE",
(56 << 8) | 0x04: "WEEKEVENTREG_56_04",
(56 << 8) | 0x08: "WEEKEVENTREG_56_08",
(56 << 8) | 0x10: "WEEKEVENTREG_56_10",
(56 << 8) | 0x20: "WEEKEVENTREG_56_20",
(56 << 8) | 0x40: "WEEKEVENTREG_56_40",
(56 << 8) | 0x80: "WEEKEVENTREG_56_80",
(56 << 8) | 0x10: "WEEKEVENTREG_PLAYED_WIND_FISH_AS_HUMAN",
(56 << 8) | 0x20: "WEEKEVENTREG_PLAYED_WIND_FISH_AS_DEKU",
(56 << 8) | 0x40: "WEEKEVENTREG_PLAYED_WIND_FISH_AS_ZORA",
(56 << 8) | 0x80: "WEEKEVENTREG_PLAYED_WIND_FISH_AS_GORON",
(57 << 8) | 0x01: "WEEKEVENTREG_57_01",
(57 << 8) | 0x02: "WEEKEVENTREG_57_02",
(57 << 8) | 0x04: "WEEKEVENTREG_57_04",
+6 -6
View File
@@ -404,7 +404,7 @@ weekEventReg = {
(49 << 8) | 0x20: "WEEKEVENTREG_49_20",
(49 << 8) | 0x40: "WEEKEVENTREG_49_40",
(49 << 8) | 0x80: "WEEKEVENTREG_49_80",
(50 << 8) | 0x01: "WEEKEVENTREG_50_01",
(50 << 8) | 0x01: "WEEKEVENTREG_HELPED_GORMAN_DAY_1",
(50 << 8) | 0x02: "WEEKEVENTREG_50_02",
(50 << 8) | 0x04: "WEEKEVENTREG_50_04",
(50 << 8) | 0x08: "WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING",
@@ -419,7 +419,7 @@ weekEventReg = {
(51 << 8) | 0x10: "WEEKEVENTREG_51_10",
(51 << 8) | 0x20: "WEEKEVENTREG_ESCAPED_SAKONS_HIDEOUT",
(51 << 8) | 0x40: "WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED",
(51 << 8) | 0x80: "WEEKEVENTREG_51_80",
(51 << 8) | 0x80: "WEEKEVENTREG_HELPED_GORMAN_DAY_2",
(52 << 8) | 0x01: "WEEKEVENTREG_ESCORTED_CREMIA",
(52 << 8) | 0x02: "WEEKEVENTREG_52_02",
(52 << 8) | 0x04: "WEEKEVENTREG_52_04",
@@ -456,10 +456,10 @@ weekEventReg = {
(56 << 8) | 0x02: "WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE",
(56 << 8) | 0x04: "WEEKEVENTREG_56_04",
(56 << 8) | 0x08: "WEEKEVENTREG_56_08",
(56 << 8) | 0x10: "WEEKEVENTREG_56_10",
(56 << 8) | 0x20: "WEEKEVENTREG_56_20",
(56 << 8) | 0x40: "WEEKEVENTREG_56_40",
(56 << 8) | 0x80: "WEEKEVENTREG_56_80",
(56 << 8) | 0x10: "WEEKEVENTREG_PLAYED_WIND_FISH_AS_HUMAN",
(56 << 8) | 0x20: "WEEKEVENTREG_PLAYED_WIND_FISH_AS_DEKU",
(56 << 8) | 0x40: "WEEKEVENTREG_PLAYED_WIND_FISH_AS_ZORA",
(56 << 8) | 0x80: "WEEKEVENTREG_PLAYED_WIND_FISH_AS_GORON",
(57 << 8) | 0x01: "WEEKEVENTREG_57_01",
(57 << 8) | 0x02: "WEEKEVENTREG_57_02",
(57 << 8) | 0x04: "WEEKEVENTREG_57_04",