mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-05 03:07:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl en sob1 OK and Documented (#224)

Browse Source 
* All but two match

* format

* Matched the last two functions

* Merge updates

* Bring data over as a comment

* Brought data over

* Cleanup and start documenting

* Documented

* Removed NON_MATCHING define

* Actually save the .h file

* Format and add items comment

* Add comment

* Add header to .c file

* Cleanup

* Rename EnSob1_GetGoodbyeBombShop

* Update items comment

* Final cleanup

* Rename InitialUpdate

* PR suggestions except enum for objIndices

* Add todo about objIndices index enum

* Change char to UNK_TYPE1 for padding

* Textures and convert weekEvents to hex

* PR suggestions

* Format

* Cleanup function declaration and add cutscene state enum

* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
This commit is contained in:
Derek Hensley
2021-07-28 19:26:40 -07:00
committed by GitHub
parent b292647ea2
commit 8e2f2b4cdb
8 changed files with 1877 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_In/z_en_in.h
+1 -1
View File
@@ -28,7 +28,7 @@ typedef struct EnIn {
/* 0x238 */ char unk238[0x4];
/* 0x23C */ u8 unk23C;
/* 0x23D */ u8 unk23D;
/* 0x240 */ Path *path;
/* 0x240 */ Path* path;
/* 0x244 */ s16 unk244;
/* 0x248 */ Vec3f unk248;
/* 0x254 */ Vec3f unk254;
src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
+1685 -158
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
+79 -1
View File
@@ -2,14 +2,92 @@
#define Z_EN_SOB1_H
#include <global.h>
#include "overlays/actors/ovl_En_GirlA/z_en_girla.h"
struct EnSob1;
typedef void (*EnSob1ActionFunc)(struct EnSob1*, GlobalContext*);
typedef void (*EnSob1BlinkFunc)(struct EnSob1*);
#define ENSOB1_GET_SHOPTYPE(thisx) ((thisx)->params & 0x1F)
#define ENSOB1_GET_PATH(thisx) (((thisx)->params & 0x3E0) >> 5)
typedef struct EnSob1XZRange {
/* 0x0 */ f32 xMin;
/* 0x4 */ f32 xMax;
/* 0x8 */ f32 zMin;
/* 0xC */ f32 zMax;
} EnSob1XZRange; // size = 0x10
typedef struct EnSob1 {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x28C];
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ EnSob1ActionFunc actionFunc;
/* 0x18C */ EnSob1ActionFunc tmpActionFunc; // Used to restore back to correct browsing function
/* 0x190 */ EnSob1ActionFunc changeObjectFunc;
/* 0x194 */ ColliderCylinder collider;
/* 0x1E0 */ Path* path;
/* 0x1E4 */ s32 pathPointsIdx;
/* 0x1E8 */ s16 delayTimer;
/* 0x1EA */ s8 objIndices[3];
/* 0x1EE */ s16 headRot;
/* 0x1F0 */ s16 headRotTarget;
/* 0x1F2 */ Vec3s limbDrawTable[20];
/* 0x26A */ Vec3s transitionDrawTable[20];
/* 0x2E2 */ s16 eyeTexIndex;
/* 0x2E4 */ s16 blinkTimer;
/* 0x2E8 */ EnSob1BlinkFunc blinkFunc;
/* 0x2EC */ EnGirlA* items[3]; // Items on shelf are indexed as: /* 2 1 0 */
/* 0x2F8 */ s32 stickAccumX;
/* 0x2FC */ s32 stickAccumY;
/* 0x300 */ f32 cursorX;
/* 0x304 */ f32 cursorY;
/* 0x308 */ f32 cursorZ;
/* 0x30C */ s32 cursorColorR;
/* 0x310 */ s32 cursorColorG;
/* 0x314 */ s32 cursorColorB;
/* 0x318 */ s32 cursorColorA;
/* 0x31C */ f32 cursorAnimTween;
/* 0x320 */ u8 cursorAnimState;
/* 0x321 */ u8 drawCursor;
/* 0x322 */ u8 cursorIdx;
/* 0x324 */ StickDirectionPrompt stickLeftPrompt;
/* 0x35C */ StickDirectionPrompt stickRightPrompt;
/* 0x394 */ f32 arrowAnimTween;
/* 0x398 */ f32 stickAnimTween;
/* 0x39C */ u8 arrowAnimState;
/* 0x39D */ u8 stickAnimState;
/* 0x39E */ s16 cutsceneState;
/* 0x3A0 */ s16 cutscene;
/* 0x3A2 */ s16 lookFowardCutscene;
/* 0x3A4 */ s16 lookToShelfCutscene;
/* 0x3A6 */ s16 lookToShopkeeperCutscene;
/* 0x3A8 */ UNK_TYPE1 pad3A8[0x4];
/* 0x3AC */ f32 shopItemSelectedTween;
/* 0x3B0 */ UNK_TYPE1 pad3B0[0x4];
/* 0x3B4 */ u16 welcomeTextId;
/* 0x3B6 */ u16 talkOptionTextId;
/* 0x3B8 */ u16 goodbyeTextId;
/* 0x3BA */ u8 wasTalkedToWhileWalking;
/* 0x3BC */ EnSob1XZRange posXZRange;
/* 0x3CC */ s16 shopType;
} EnSob1; // size = 0x3D0
typedef enum EnSob1ShopType {
/* 0 */ ZORA_SHOP,
/* 1 */ GORON_SHOP,
/* 2 */ BOMB_SHOP,
/* 3 */ GORON_SHOP_SPRING
} EnSob1ShopType;
typedef enum {
/* 0 */ ENSOB1_CUTSCENESTATE_STOPPED,
/* 1 */ ENSOB1_CUTSCENESTATE_WAITING,
/* 2 */ ENSOB1_CUTSCENESTATE_PLAYING
} EnSob1CutsceneState;
//! @TODO: Add enum for objIndices index based on what the object is for
extern const ActorInit En_Sob1_InitVars;
#endif // Z_EN_SOB1_H