mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 06:40:15 +00:00
Code Issues Projects Releases Wiki Activity

z_En_Ossan and dependencies (#824)

Browse source 
* fix colliderinit typo

* fix initchain

* reloc

* progress

* progress

* Pick off a few easy functions, reduce number of warnings

* more tough OKs

* Getting closer to all OK, fix en_girla header

* some hard OKs, 7 to go

* two funcs remaining

* func_80AC7094 OK!

* Fix warnings, begin documentation

* get most of object_ossan documented, document some of en_ossan

* improve en_girla function names

* more EnOssan documentation

* more documentation

* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements

* delete TIME ITSELF

* object_oF1d_map OK

* more names, fixed a poition typo

* Nearly all en_ossan functions named, all variables named

* format.sh

* forgot to delete data

* implement pr changes

* EnOssan OK! implement most of Roman's suggestions

* ugh

* implement figs suggestions

* implement roman's suggestion

* Can't tell my left from my other left

Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
mzxrules 2021-07-04 11:23:18 -04:00 • committed by GitHub
parent 7446e5eb80
commit 3fd05c9147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
134 changed files with 3479 additions and 7998 deletions
Download patch file Download diff file Expand all files Collapse all files

1134
src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View file

File diff suppressed because it is too large Load diff

104
src/overlays/actors/ovl_En_GirlA/z_en_girla.h
View file

@ -9,37 +9,95 @@ struct EnGirlA;
typedef void (*EnGirlAActionFunc)(struct EnGirlA*, GlobalContext*);
typedef void (*EnGirlA2Func)(GlobalContext*, struct EnGirlA*);
typedef void (*EnGirlA3Func)(Actor*, GlobalContext*, s32);
typedef s32 (*EnGirlA4Func)(GlobalContext*, struct EnGirlA*);
typedef struct EnGirlA {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ EnGirlAActionFunc actionFunc;
/* 0x0194 */ s8 unk_194;
/* 0x0195 */ s8 unk_195;
/* 0x0196 */ s16 unk_196;
/* 0x0198 */ EnGirlAActionFunc unk_198;
/* 0x019C */ s32 unk_19C;
/* 0x01A0 */ s16 unk_1A0;
/* 0x01A2 */ s16 unk_1A2;
/* 0x01A4 */ s32 unk_1A4;
/* 0x01A8 */ s16 unk_1A8;
/* 0x01AA */ s16 unk_1AA;
/* 0x01AC */ EnGirlA2Func unk_1AC;
/* 0x01B0 */ EnGirlA2Func unk_1B0;
/* 0x01B4 */ s16 unk_1B4;
/* 0x01B6 */ s16 unk_1B6;
/* 0x01B8 */ s16 unk_1B8;
/* 0x01BA */ s16 unk_1BA;
/* 0x01BC */ void* unk_1BC;
/* 0x01C0 */ void* unk_1C0;
/* 0x01C4 */ void* unk_1C4;
/* 0x01C8 */ s16 unk_1C8;
/* 0x01CA */ s16 unk_1CA;
/* 0x0194 */ s8 objBankIndex;
/* 0x0198 */ EnGirlAActionFunc actionFunc2;
/* 0x019C */ s32 isInitialized;
/* 0x01A0 */ s16 itemBuyPromptTextId;
/* 0x01A4 */ s32 getItemId;
/* 0x01A8 */ s16 isInvisible;
/* 0x01AC */ EnGirlA2Func setOutOfStockFunc;
/* 0x01B0 */ EnGirlA2Func updateStockedItemFunc;
/* 0x01B4 */ s16 isSelected;
/* 0x01B6 */ s16 yRotationInit;
/* 0x01B8 */ s16 yRotation;
/* 0x01BC */ EnGirlA4Func canBuyFunc;
/* 0x01C0 */ EnGirlA2Func itemGiveFunc;
/* 0x01C4 */ EnGirlA2Func buyEventFunc;
/* 0x01C8 */ s16 basePrice;
/* 0x01CA */ s16 itemCount;
/* 0x01CC */ s16 giDrawId;
/* 0x01CE */ s16 unk_1CE;
/* 0x01D0 */ EnGirlA3Func unk_1D0;
/* 0x01D0 */ EnGirlA3Func hiliteFunc;
} EnGirlA; // size = 0x01D4
extern const ActorInit En_GirlA_InitVars;
typedef enum {
/* 0x00 */ SI_DEKU_NUTS_5,
/* 0x01 */ SI_ARROWS_30,
/* 0x02 */ SI_ARROWS_50,
/* 0x03 */ SI_BOMBS_5_R25,
/* 0x04 */ SI_DEKU_NUTS_10,
/* 0x05 */ SI_DEKU_STICK,
/* 0x06 */ SI_BOMBS_10,
/* 0x07 */ SI_FISH,
/* 0x08 */ SI_RED_POTION_R30,
/* 0x09 */ SI_GREEN_POTION,
/* 0x0A */ SI_BLUE_POTION,
/* 0x0B */ SI_LONGSWORD,
/* 0x0C */ SI_HYLIAN_SHIELD,
/* 0x0D */ SI_DEKU_SHIELD,
/* 0x0E */ SI_GORON_TUNIC,
/* 0x0F */ SI_ZORA_TUNIC,
/* 0x10 */ SI_HEART,
/* 0x11 */ SI_MILK_BOTTLE,
/* 0x12 */ SI_WEIRD_EGG,
/* 0x13 */ SI_19,
/* 0x14 */ SI_20,
/* 0x15 */ SI_BOMBCHU_10_1,
/* 0x16 */ SI_BOMBCHU_20_1,
/* 0x17 */ SI_BOMBCHU_20_2,
/* 0x18 */ SI_BOMBCHU_10_2,
/* 0x19 */ SI_BOMBCHU_10_3,
/* 0x1A */ SI_BOMBCHU_20_3,
/* 0x1B */ SI_BOMBCHU_20_4,
/* 0x1C */ SI_BOMBCHU_10_4,
/* 0x1D */ SI_DEKU_SEEDS_30,
/* 0x1E */ SI_KEATON_MASK,
/* 0x1F */ SI_SPOOKY_MASK,
/* 0x20 */ SI_SKULL_MASK,
/* 0x21 */ SI_BUNNY_HOOD,
/* 0x22 */ SI_MASK_OF_TRUTH,
/* 0x23 */ SI_ZORA_MASK,
/* 0x24 */ SI_GORON_MASK,
/* 0x25 */ SI_GERUDO_MASK,
/* 0x26 */ SI_SOLD_OUT,
/* 0x27 */ SI_BLUE_FIRE,
/* 0x28 */ SI_BUGS,
/* 0x29 */ SI_BIG_POE,
/* 0x2A */ SI_POE,
/* 0x2B */ SI_FAIRY,
/* 0x2C */ SI_ARROWS_10,
/* 0x2D */ SI_BOMBS_20,
/* 0x2E */ SI_BOMBS_30,
/* 0x2F */ SI_BOMBS_5_R35,
/* 0x30 */ SI_RED_POTION_R40,
/* 0x31 */ SI_RED_POTION_R50,
/* 0x32 */ SI_MAX
} EnGirlAShopItem;
typedef enum {
/* 0 */ CANBUY_RESULT_SUCCESS_FANFARE,
/* 1 */ CANBUY_RESULT_SUCCESS,
/* 2 */ CANBUY_RESULT_CANT_GET_NOW,
/* 3 */ CANBUY_RESULT_NEED_BOTTLE,
/* 4 */ CANBUY_RESULT_NEED_RUPEES,
/* 5 */ CANBUY_RESULT_CANT_GET_NOW_5
} EnGirlACanBuyResult;
#endif