falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`ovl_En_Ma_Yto`: Cremia OK and mostly documented (#209) 

* EnMaYto_Update

* init

* func_80B8E84C

* CURRENT_DAY and run format

* a few other functions

* symlink to diff.py

* identify lots of functions

* and more functions

* small

* and a bunch more

* Another bunch

* small

* another bunch of functions

* And so on

* Another bunch

* func_80B8E6E0

* func_80B8E938

* func_80B8EA38

* Fix conflicts

* Another bunch

* two functions

* func_80B9083C

* func_80B8FA14

* OK

* Import data

* params and a bit of function renaming

* Minor reorder in object_script

* Fix merge issues and warnings

* Rename a few stuff

* fix merge issues

* And more renames

* More renames

* And moreeee

* Almost everything renamed

* Clock time and reformat

* Fix merge issues and add some undeclared functions

* Reorder alphabetically

* run format

* Minor styling stuff

* review changes

* Update src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Kenix's suggestions

* engineer's suggestions

* Run formatter

* whoops

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal 2021-07-21 21:58:57 -04:00 committed by GitHub
parent 39eeb67200
commit 1a58b590f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 1627 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -924,7 +924,7 @@ void func_800BE03C(GlobalContext* globalCtx, Gfx* dl);
// void func_800BE0B8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_800BE184(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
u8 func_800BE22C(Actor* actor);
// void func_800BE258(void);
void func_800BE258(Actor* actor, UNK_PTR arg1);
// void func_800BE2B8(void);
// void func_800BE33C(void);
// void func_800BE3D0(void);

4
include/macros.h
View File

@ -21,7 +21,7 @@
#define SET_NEXT_GAMESTATE(curState, newInit, newStruct) \
(curState)->nextGameStateInit = (GameStateFunc)newInit; \
(curState)->nextGameStateSize = sizeof(newStruct);
(curState)->nextGameStateSize = sizeof(newStruct)
#define PLAYER ((Player*)globalCtx->actorCtx.actorList[ACTORCAT_PLAYER].first)
@ -72,7 +72,7 @@ extern GraphicsContext* __gfxCtx;
#define OPEN_DISPS(gfxCtx) \
{ \
GraphicsContext* __gfxCtx = gfxCtx; \
s32 __dispPad;
s32 __dispPad
#define CLOSE_DISPS(gfxCtx) \
} \

2
include/z64item.h
View File

@ -33,6 +33,7 @@ typedef enum {
/* 0x38 */ ITEM_MASK_ALL_NIGHT = 0x38,
/* 0x3A */ ITEM_MASK_KEATON = 0x3A,
/* 0x3B */ ITEM_MASK_GARO,
/* 0x3C */ ITEM_MASK_ROMANIS,
/* 0x46 */ ITEM_MASK_BREMEN = 0x46,
/* 0x4D */ ITEM_SWORD_KOKIRI = 0x4D,
/* 0x4E */ ITEM_SWORD_RAZOR,
@ -101,6 +102,7 @@ typedef enum {
/* 0x60 */ GI_MILK_BOTTLE = 0x60,
/* 0x7E */ GI_MASK_ALL_NIGHT = 0x7E,
/* 0x80 */ GI_MASK_KEATON = 0x80,
/* 0x82 */ GI_MASK_ROMANIS = 0x82,
/* 0x8C */ GI_MASK_BREMEN = 0x8C,
/* 0x9B */ GI_SWORD_GREAT_FAIRY = 0x9B,
/* 0x9C */ GI_SWORD_KOKIRI,

4
linker_scripts/code_script.txt
View File

@ -7356,9 +7356,9 @@ SECTIONS
ovl_En_Ma_Yto : AT(RomLocation)
{
build/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.o(.text)
build/asm/overlays/ovl_En_Ma_Yto_data.o(.data)
build/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.o(.data)
build/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.o(.rodata)
build/asm/overlays/ovl_En_Ma_Yto_rodata.o(.rodata)
build/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;

89
linker_scripts/object_script.txt
View File

@ -448,6 +448,43 @@ D_06016720 = 0x06016720;
/* z_en_jc_mato */
D_06000390 = 0x06000390;
/* z_en_ma_yto */
D_06007E28 = 0x06007E28;
D_06003D54 = 0x06003D54;
D_0600A174 = 0x0600A174;
D_060070EC = 0x060070EC;
D_06003D54 = 0x06003D54;
D_06015C28 = 0x06015C28;
D_06005430 = 0x06005430;
D_0600AF7C = 0x0600AF7C;
D_06014AD8 = 0x06014AD8;
D_06014ED8 = 0x06014ED8;
D_060152D8 = 0x060152D8;
D_060156D8 = 0x060156D8;
D_06001FD0 = 0x06001FD0;
D_06014AD8 = 0x06014AD8;
D_06014ED8 = 0x06014ED8;
D_060152D8 = 0x060152D8;
D_060156D8 = 0x060156D8;
D_06011AD8 = 0x06011AD8;
D_060122D8 = 0x060122D8;
D_06012AD8 = 0x06012AD8;
D_060132D8 = 0x060132D8;
D_06013AD8 = 0x06013AD8;
D_060142D8 = 0x060142D8;
D_0600A174 = 0x0600A174;
D_0600AF7C = 0x0600AF7C;
D_06000CC0 = 0x06000CC0;
D_06016720 = 0x06016720;
D_06005314 = 0x06005314;
D_060093E8 = 0x060093E8;
D_06007E28 = 0x06007E28;
D_060070EC = 0x060070EC;
D_06003D54 = 0x06003D54;
D_06001FD0 = 0x06001FD0;
D_060030B4 = 0x060030B4;
D_06004370 = 0x06004370;
/* z_en_ma_yts */
D_06009E58 = 0x06009E58;
D_06007D98 = 0x06007D98;
@ -486,6 +523,32 @@ D_06010FC8 = 0x06010FC8;
D_060117C8 = 0x060117C8;
D_06011FC8 = 0x06011FC8;
/* z_en_ma4 */
D_060003B0 = 0x060003B0;
D_06007328 = 0x06007328;
D_06002A8C = 0x06002A8C;
D_06015B7C = 0x06015B7C;
D_06013928 = 0x06013928;
D_0600FFC8 = 0x0600FFC8;
D_060107C8 = 0x060107C8;
D_06010FC8 = 0x06010FC8;
D_060117C8 = 0x060117C8;
D_06011FC8 = 0x06011FC8;
D_060127C8 = 0x060127C8;
D_06012BC8 = 0x06012BC8;
D_06012FC8 = 0x06012FC8;
D_060133C8 = 0x060133C8;
D_06009E58 = 0x06009E58;
D_06002A8C = 0x06002A8C;
D_06018948 = 0x06018948;
D_0601B76C = 0x0601B76C;
D_06007328 = 0x06007328;
D_06014088 = 0x06014088;
D_06015B7C = 0x06015B7C;
D_06007D98 = 0x06007D98;
D_0600852C = 0x0600852C;
D_06008F6C = 0x06008F6C;
/* z_en_minifrog */
D_060007BC = 0x060007BC;
D_06001534 = 0x06001534;
@ -549,32 +612,6 @@ D_04048DF0 = 0x04048DF0;
D_04057B10 = 0x04057B10;
D_04089070 = 0x04089070;
/* z_en_ma4 */
D_060003B0 = 0x060003B0;
D_06007328 = 0x06007328;
D_06002A8C = 0x06002A8C;
D_06015B7C = 0x06015B7C;
D_06013928 = 0x06013928;
D_0600FFC8 = 0x0600FFC8;
D_060107C8 = 0x060107C8;
D_06010FC8 = 0x06010FC8;
D_060117C8 = 0x060117C8;
D_06011FC8 = 0x06011FC8;
D_060127C8 = 0x060127C8;
D_06012BC8 = 0x06012BC8;
D_06012FC8 = 0x06012FC8;
D_060133C8 = 0x060133C8;
D_06009E58 = 0x06009E58;
D_06002A8C = 0x06002A8C;
D_06018948 = 0x06018948;
D_0601B76C = 0x0601B76C;
D_06007328 = 0x06007328;
D_06014088 = 0x06014088;
D_06015B7C = 0x06015B7C;
D_06007D98 = 0x06007D98;
D_0600852C = 0x0600852C;
D_06008F6C = 0x06008F6C;
/* z_en_toto */
D_06000C80 = 0x06000C80;
D_06001324 = 0x06001324;

45
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
View File

@ -36,46 +36,11 @@ const ActorInit En_Ginko_Man_InitVars = {
};
ActorAnimationEntry animations[] = {
{
object_ginko_floorsmacking_anim,
1.0f,
0.0f,
0.0f,
0,
-4.0f,
},
{
object_ginko_sitting_anim,
1.0f,
0.0f,
0.0f,
0,
-4.0f,
},
{
object_ginko_stamp_reach_anim,
1.0f,
0.0f,
0.0f,
2,
-4.0f,
},
{
object_ginko_advertising_anim,
1.0f,
0.0f,
0.0f,
0,
-4.0f,
}, // looking around for customers
{
object_ginko_amazed_anim,
1.0f,
0.0f,
0.0f,
0,
-4.0f,
},
{ object_ginko_floorsmacking_anim, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ object_ginko_sitting_anim, 1.0f, 0.0f, 0.0f, 0, -4.0f },
{ object_ginko_stamp_reach_anim, 1.0f, 0.0f, 0.0f, 2, -4.0f },
{ object_ginko_advertising_anim, 1.0f, 0.0f, 0.0f, 0, -4.0f }, // looking around for customers
{ object_ginko_amazed_anim, 1.0f, 0.0f, 0.0f, 0, -4.0f },
};
void EnGinkoMan_Init(Actor* thisx, GlobalContext* globalCtx) {

1486
src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
View File

File diff suppressed because it is too large Load Diff

59
src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.h
View File

@ -2,14 +2,71 @@
#define Z_EN_MA_YTO_H
#include <global.h>
#include "overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h"
struct EnMaYto;
typedef void (*EnMaYtoActionFunc)(struct EnMaYto*, GlobalContext*);
typedef enum {
/* 00 */ MA2_LIMB_NONE,
/* 01 */ MA2_LIMB_ROOT,
/* 02 */ MA2_LIMB_TORSO,
/* 03 */ MA2_LIMB_ARM_LEFT,
/* 04 */ MA2_LIMB_FOREARM_LEFT,
/* 05 */ MA2_LIMB_HAND_LEFT,
/* 06 */ MA2_LIMB_ARM_RIGHT,
/* 07 */ MA2_LIMB_FOREARM_RIGHT,
/* 08 */ MA2_LIMB_HAND_RIGHT,
/* 09 */ MA2_LIMB_HEAD,
/* 10 */ MA2_LIMB_HAIR,
/* 11 */ MA2_LIMB_PELVIS,
/* 12 */ MA2_LIMB_TIGHT_LEFT,
/* 13 */ MA2_LIMB_LEG_LEFT,
/* 14 */ MA2_LIMB_FOOT_LEFT,
/* 15 */ MA2_LIMB_TIGHT_RIGHT,
/* 16 */ MA2_LIMB_LEG_RIGHT,
/* 17 */ MA2_LIMB_FOOT_RIGHT,
/* 18 */ MA2_LIMB_DRESS_0,
/* 19 */ MA2_LIMB_DRESS_1,
/* 20 */ MA2_LIMB_DRESS_2,
/* 21 */ MA2_LIMB_DRESS_3,
/* 22 */ MA2_LIMB_MAX
} ObjectMa2Limbs;
typedef struct EnMaYto {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x1E0];
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ EnMaYtoActionFunc actionFunc;
/* 0x18C */ ColliderCylinder collider;
/* 0x1D8 */ struct_800BD888_arg1 unk_1D8;
/* 0x200 */ s32 unk200; // unused
/* 0x204 */ s32 type;
/* 0x208 */ Vec3s limbDrawTbl[MA2_LIMB_MAX];
/* 0x28C */ Vec3s transitionDrawTbl[MA2_LIMB_MAX];
/* 0x310 */ s16 unk310; // state?
/* 0x312 */ UNK_TYPE1 unk_312[0x2];
/* 0x314 */ s16 currentAnim; // Used only in DefaultWait
/* 0x316 */ s16 overrideEyeTexIndex; // If non-zero, then this index will be used instead of eyeTexIndex
/* 0x318 */ s16 mouthTexIndex;
/* 0x31A */ s16 eyeTexIndex;
/* 0x31C */ s16 blinkTimer;
/* 0x31E */ s16 unk31E;
/* 0x320 */ s16 unk320;
/* 0x322 */ u16 textId;
} EnMaYto; // size = 0x324
extern const ActorInit En_Ma_Yto_InitVars;
typedef enum {
/* 0 */ MA_YTO_TYPE_DEFAULT, // Strokes cow on day 1
/* 1 */ MA_YTO_TYPE_BARN,
/* 2 */ MA_YTO_TYPE_DINNER,
/* 3 */ MA_YTO_TYPE_AFTERMILKRUN, // After Milk Run minigame
/* 4 */ MA_YTO_TYPE_4 // HugCutscene? Doesn't seem to work properly in-game
} EnMaYtoType;
#define EN_MA_YTO_PARSE_TYPE(params) (((params)&0xF000) >> 12)
#define EN_MA_YTO_PARAM(enMaYtsType, arg1) (((enMaYtsType) << 12) | ((arg1) << 8))
#endif // Z_EN_MA_YTO_H

4
src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c
View File

@ -146,7 +146,7 @@ void func_80B8D12C(EnMaYts* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
s16 flag = this->unk_32C == 2 ? true : false;
if ((this->unk_32C == 0) || (this->actor.parent == NULL)) {
if (this->unk_32C == 0 || this->actor.parent == NULL) {
this->unk_1D8.unk_18 = player->actor.world.pos;
this->unk_1D8.unk_18.y -= -10.0f;
} else {
@ -218,7 +218,7 @@ s32 EnMaYts_CheckValidSpawn(EnMaYts* this, GlobalContext* globalCtx) {
// Failing the alien invasion
if (!(gSaveContext.weekEventReg[0x16] & 1)) {
return false;
} else if ((gSaveContext.time >= 0xD555) && (CURRENT_DAY == 3)) {
} else if (gSaveContext.time >= CLOCK_TIME(20, 0) && CURRENT_DAY == 3) {
return false;
}
break;

1
src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h
View File

@ -7,7 +7,6 @@ struct EnMaYts;
typedef void (*EnMaYtsActionFunc)(struct EnMaYts*, GlobalContext*);
// Limbs of OBJECT_MA1
typedef enum {
/* 00 */ MA1_LIMB_NONE,
/* 01 */ MA1_LIMB_ROOT,

2
src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
View File

@ -162,7 +162,7 @@ void EnNutsball_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnNutsball* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx)
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
SysMatrix_InsertMatrix(&globalCtx->mf_187FC, 1);
SysMatrix_InsertZRotation_s(this->actor.home.rot.z, 1);

14
src/overlays/actors/ovl_En_Toto/z_en_toto.c
View File

@ -383,7 +383,7 @@ s32 func_80BA3ED4(EnToto* this, GlobalContext* globalCtx) {
s32 func_80BA3EE8(EnToto* this, GlobalContext* globalCtx) {
if (this->text->unk1 == 2) {
func_800B7298(globalCtx, 0, 7);
func_800B7298(globalCtx, NULL, 7);
}
return 0;
}
@ -478,7 +478,7 @@ s32 func_80BA42BC(EnToto* this, GlobalContext* globalCtx) {
Vec3s* end = &D_80BA510C[3];
func_80BA3FB0(this, globalCtx);
func_800B7298(globalCtx, 0, 6);
func_800B7298(globalCtx, NULL, 6);
if (player->actor.world.pos.z > -310.0f) {
if ((player->actor.world.pos.x > -150.0f) || (player->actor.world.pos.z > -172.0f)) {
phi_s0 = 3;
@ -498,7 +498,7 @@ s32 func_80BA42BC(EnToto* this, GlobalContext* globalCtx) {
s32 func_80BA43F4(EnToto* this, GlobalContext* globalCtx) {
func_80BA3C88(this);
if (func_80122760(globalCtx, this->unk2BC, 60.0f)) {
func_800B7298(globalCtx, 0, 0x13);
func_800B7298(globalCtx, NULL, 0x13);
return func_80BA4204(this, globalCtx);
}
return 0;
@ -506,7 +506,7 @@ s32 func_80BA43F4(EnToto* this, GlobalContext* globalCtx) {
s32 func_80BA445C(EnToto* this, GlobalContext* globalCtx) {
if (func_80BA4128(this, globalCtx)) {
func_800B7298(globalCtx, 0, 6);
func_800B7298(globalCtx, NULL, 6);
return 1;
}
return 0;
@ -570,7 +570,7 @@ s32 func_80BA4530(EnToto* this, GlobalContext* globalCtx) {
}
s32 func_80BA46D8(EnToto* this, GlobalContext* globalCtx) {
func_800B7298(globalCtx, 0, 0x44);
func_800B7298(globalCtx, NULL, 0x44);
func_80152434(globalCtx, D_80BA5120[gSaveContext.playerForm == 4 ? 0 : gSaveContext.playerForm]);
return 0;
}
@ -626,7 +626,7 @@ s32 func_80BA47E0(EnToto* this, GlobalContext* globalCtx) {
}
s32 func_80BA49A4(EnToto* this, GlobalContext* globalCtx) {
func_800B7298(globalCtx, 0, 0x44);
func_800B7298(globalCtx, NULL, 0x44);
func_801A31EC(0x54, 4, this->unk2B3 ^ 0xF);
this->unk2B1 = 4;
return 0;
@ -646,7 +646,7 @@ s32 func_80BA4A00(EnToto* this, GlobalContext* globalCtx) {
if (this->spotlights != NULL) {
Actor_MarkForDeath(this->spotlights);
}
func_800B7298(globalCtx, 0, 0x45);
func_800B7298(globalCtx, NULL, 0x45);
if (this->unk2B3 == 0xF) {
if (CURRENT_DAY == 1) {
gSaveContext.weekEventReg[50] |= 1;

11
src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c
View File

@ -39,10 +39,11 @@ void ObjDinner_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjDinner_Draw(Actor* thisx, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
func_8012C28C(gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, D_060011E0);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_060011E0);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

110
tables/functions.txt
View File

@ -14768,65 +14768,65 @@
0x80B8DF9C:("EnMaYts_Draw",),
0x80B8E0BC:("EnMaYts_DrawSleeping",),
0x80B8E520:("EnMaYto_Init",),
0x80B8E6E0:("func_80B8E6E0",),
0x80B8E84C:("func_80B8E84C",),
0x80B8E938:("func_80B8E938",),
0x80B8EA38:("func_80B8EA38",),
0x80B8EABC:("func_80B8EABC",),
0x80B8E6E0:("EnMaYto_CheckValidSpawn",),
0x80B8E84C:("EnMaYto_InitAnimation",),
0x80B8E938:("EnMaYto_ChooseAction",),
0x80B8EA38:("EnMaYto_SearchRomani",),
0x80B8EABC:("EnMaYto_TryFindRomani",),
0x80B8EBB0:("EnMaYto_Destroy",),
0x80B8EBDC:("func_80B8EBDC",),
0x80B8EBF0:("func_80B8EBF0",),
0x80B8EC30:("func_80B8EC30",),
0x80B8ECAC:("func_80B8ECAC",),
0x80B8ED8C:("func_80B8ED8C",),
0x80B8EDC8:("func_80B8EDC8",),
0x80B8EEAC:("func_80B8EEAC",),
0x80B8EF4C:("func_80B8EF4C",),
0x80B8F074:("func_80B8F074",),
0x80B8F108:("func_80B8F108",),
0x80B8F254:("func_80B8F254",),
0x80B8F2D8:("func_80B8F2D8",),
0x80B8F360:("func_80B8F360",),
0x80B8F400:("func_80B8F400",),
0x80B8F744:("func_80B8F744",),
0x80B8F7F4:("func_80B8F7F4",),
0x80B8F918:("func_80B8F918",),
0x80B8F998:("func_80B8F998",),
0x80B8FA14:("func_80B8FA14",),
0x80B8FE04:("func_80B8FE04",),
0x80B8FE74:("func_80B8FE74",),
0x80B8FF80:("func_80B8FF80",),
0x80B8FF94:("func_80B8FF94",),
0x80B9000C:("func_80B9000C",),
0x80B900AC:("func_80B900AC",),
0x80B900C0:("func_80B900C0",),
0x80B90170:("func_80B90170",),
0x80B90184:("func_80B90184",),
0x80B902B8:("func_80B902B8",),
0x80B902CC:("func_80B902CC",),
0x80B90340:("func_80B90340",),
0x80B9037C:("func_80B9037C",),
0x80B904D0:("func_80B904D0",),
0x80B904E4:("func_80B904E4",),
0x80B9059C:("func_80B9059C",),
0x80B905B0:("func_80B905B0",),
0x80B9061C:("func_80B9061C",),
0x80B9083C:("func_80B9083C",),
0x80B90A78:("func_80B90A78",),
0x80B90C08:("func_80B90C08",),
0x80B8EBDC:("EnMaYto_SetupKeepLookingForRomani",),
0x80B8EBF0:("EnMaYto_KeepLookingForRomani",),
0x80B8EC30:("EnMaYto_SetupDefaultWait",),
0x80B8ECAC:("EnMaYto_DefaultWait",),
0x80B8ED8C:("EnMaYto_SetupDefaultDialogueHandler",),
0x80B8EDC8:("EnMaYto_DefaultDialogueHandler",),
0x80B8EEAC:("EnMaYto_DefaultHandlePlayerChoice",),
0x80B8EF4C:("EnMaYto_DefaultChooseNextDialogue",),
0x80B8F074:("EnMaYto_SetupDinnerWait",),
0x80B8F108:("EnMaYto_DinnerWait",),
0x80B8F254:("EnMaYto_SetupDinnerDialogueHandler",),
0x80B8F2D8:("EnMaYto_DinnerDialogueHandler",),
0x80B8F360:("EnMaYto_DinnerHandlePlayerChoice",),
0x80B8F400:("EnMaYto_DinnerChooseNextDialogue",),
0x80B8F744:("EnMaYto_SetupBarnWait",),
0x80B8F7F4:("EnMaYto_BarnWait",),
0x80B8F918:("EnMaYto_SetupBarnDialogueHandler",),
0x80B8F998:("EnMaYto_BarnDialogueHandler",),
0x80B8FA14:("EnMaYto_BarnChooseNextDialogue",),
0x80B8FE04:("EnMaYto_SetupAfterMilkRunInit",),
0x80B8FE74:("EnMaYto_AfterMilkRunInit",),
0x80B8FF80:("EnMaYto_SetupAfterMilkRunDialogueHandler",),
0x80B8FF94:("EnMaYto_AfterMilkRunDialogueHandler",),
0x80B9000C:("EnMaYto_AfterMilkRunChooseNextDialogue",),
0x80B900AC:("EnMaYto_SetupPostMilkRunGiveReward",),
0x80B900C0:("EnMaYto_PostMilkRunGiveReward",),
0x80B90170:("EnMaYto_SetupPostMilkRunExplainReward",),
0x80B90184:("EnMaYto_PostMilkRunExplainReward",),
0x80B902B8:("EnMaYto_SetupBeginWarmFuzzyFeelingCs",),
0x80B902CC:("EnMaYto_BeginWarmFuzzyFeelingCs",),
0x80B90340:("EnMaYto_SetupWarmFuzzyFeelingCs",),
0x80B9037C:("EnMaYto_WarmFuzzyFeelingCs",),
0x80B904D0:("EnMaYto_SetupPostMilkRunWaitDialogueEnd",),
0x80B904E4:("EnMaYto_PostMilkRunWaitDialogueEnd",),
0x80B9059C:("EnMaYto_SetupPostMilkRunEnd",),
0x80B905B0:("EnMaYto_PostMilkRunEnd",),
0x80B9061C:("EnMaYto_DefaultStartDialogue",),
0x80B9083C:("EnMaYto_DinnerStartDialogue",),
0x80B90A78:("EnMaYto_BarnStartDialogue",),
0x80B90C08:("EnMaYto_ChangeAnim",),
0x80B90C78:("func_80B90C78",),
0x80B90D98:("func_80B90D98",),
0x80B90DF0:("func_80B90DF0",),
0x80B90D98:("EnMaYto_UpdateCollision",),
0x80B90DF0:("EnMaYto_UpdateEyes",),
0x80B90E50:("func_80B90E50",),
0x80B90E84:("func_80B90E84",),
0x80B90EC8:("func_80B90EC8",),
0x80B90EF0:("func_80B90EF0",),
0x80B90F84:("func_80B90F84",),
0x80B91014:("func_80B91014",),
0x80B9109C:("func_80B9109C",),
0x80B90E84:("EnMaYto_SetRomaniFaceExpression",),
0x80B90EC8:("EnMaYto_SetFaceExpression",),
0x80B90EF0:("EnMaYto_InitFaceExpression",),
0x80B90F84:("EnMaYto_HasSpokeToPlayerToday",),
0x80B91014:("EnMaYto_HasSpokeToPlayer",),
0x80B9109C:("EnMaYto_SetTalkedFlag",),
0x80B9110C:("EnMaYto_Update",),
0x80B91154:("func_80B91154",),
0x80B91250:("func_80B91250",),
0x80B91154:("EnMaYto_OverrideLimbDraw",),
0x80B91250:("EnMaYto_PostLimbDraw",),
0x80B91288:("EnMaYto_Draw",),
0x80B91CC0:("ObjTokeiTurret_Init",),
0x80B91D80:("ObjTokeiTurret_Destroy",),

2
tables/variables.txt
View File

@ -16937,8 +16937,6 @@
0x80B91410:("D_80B91410","UNK_TYPE1","",0x1),
0x80B9143C:("D_80B9143C","UNK_TYPE1","",0x1),
0x80B91448:("D_80B91448","UNK_TYPE1","",0x1),
0x80B915C8:("D_80B915C8","UNK_TYPE1","",0x1),
0x80B915D8:("D_80B915D8","UNK_TYPE1","",0x1),
0x80B915F0:("D_80B915F0","UNK_TYPE2","",0x2),
0x80B91600:("jtbl_D_80B91600","UNK_PTR","",0x4),
0x80B91614:("jtbl_D_80B91614","UNK_PTR","",0x4),