izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

ovl_En_GirlA OK and documented (#182)

Browse Source 
* EnGirlA Matches

* Convert func to boolean

* Cleanup

* missed a little cleanup

* Update with new MACRO

* revert z_en_item00.c macro, and add one more macro

* Documented

* Format macros.h

* Fix VTX format

* rename isBought to isOutOfStock

* PR suggestions

* Document a bug

* PR comments
This commit is contained in:
Derek Hensley
2021-06-15 08:45:19 -04:00
committed by GitHub
parent c203b9b606
commit 74e418f24f
10 changed files with 791 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -2
View File
@@ -2145,7 +2145,7 @@ void Interface_ChangeAlpha(u16 param_1);
// void func_80112C0C(void);
u32 Item_Give(GlobalContext* globalCtx, u8 param_2);
// void func_801143CC(void);
// void func_80114978(void);
UNK_TYPE func_80114978(UNK_TYPE arg0);
// void func_801149A0(void);
// void func_80114A9C(void);
// void func_80114B84(void);
@@ -2164,7 +2164,7 @@ void func_80115844(GlobalContext* globalCtx, s16 param_2);
void func_80115908(GlobalContext* globalCtx, u8 param_2);
void func_801159c0(s16 param_1);
void func_801159EC(s16 arg0);
// void func_80115A14(void);
void func_80115A14(s32 arg0, s16 arg1);
// void Parameter_AddMagic(void);
// void func_80115D5C(void);
// void func_80115DB4(void);
include/macros.h
+48 -31
View File
@@ -9,18 +9,19 @@
#define HW_REG(reg, type) *(volatile type*)((reg) | 0xa0000000)
// TODO: After uintptr_t cast change should have an AVOID_UB target that just toggles the KSEG0 bit in the address rather than add/sub 0x80000000
// TODO: After uintptr_t cast change should have an AVOID_UB target that just toggles the KSEG0 bit in the address
// rather than add/sub 0x80000000
#define PHYSICAL_TO_VIRTUAL(addr) ((uintptr_t)(addr) + 0x80000000)
#define PHYSICAL_TO_VIRTUAL2(addr) ((uintptr_t)(addr) - 0x80000000)
#define VIRTUAL_TO_PHYSICAL(addr) (uintptr_t)((u8*)(addr) - 0x80000000)
#define PHYSICAL_TO_VIRTUAL2(addr) ((uintptr_t)(addr)-0x80000000)
#define VIRTUAL_TO_PHYSICAL(addr) (uintptr_t)((u8*)(addr)-0x80000000)
#define SEGMENTED_TO_VIRTUAL(addr) (void*)(PHYSICAL_TO_VIRTUAL(gSegments[SEGMENT_NUMBER(addr)]) + SEGMENT_OFFSET(addr))
// Currently most often called ctxt in MM, TODO: Refactor names when its used
#define ACTIVE_CAM globalCtx->cameraPtrs[globalCtx->activeCamera]
#define SET_NEXT_GAMESTATE(curState, newInit, newStruct) \
(curState)->nextGameStateInit = (GameStateFunc)newInit; \
(curState)->nextGameStateSize = sizeof(newStruct);
#define SET_NEXT_GAMESTATE(curState, newInit, newStruct) \
(curState)->nextGameStateInit = (GameStateFunc)newInit; \
(curState)->nextGameStateSize = sizeof(newStruct);
#define PLAYER ((ActorPlayer*)globalCtx->actorCtx.actorList[ACTORCAT_PLAYER].first)
@@ -31,28 +32,43 @@
#define CURRENT_DAY (gSaveContext.day % 5)
#define SQ(x) ((x)*(x))
#define DECR(x) ((x) == 0 ? 0 : ((x) -= 1))
#define SLOT(item) gItemSlots[item]
#define AMMO(item) gSaveContext.inventory.ammo[SLOT(item)]
#define INV_CONTENT(item) gSaveContext.inventory.items[SLOT(item)]
#define ALL_EQUIP_VALUE_VOID(equip) \
((((void)0, gSaveContext.inventory.equipment) & gEquipMasks[equip]) >> gEquipShifts[equip])
#define CUR_EQUIP_VALUE_VOID(equip) \
((((void)0, gSaveContext.equips.equipment) & gEquipMasks[equip]) >> gEquipShifts[equip])
#define CUR_UPG_VALUE_VOID(upg) \
((((void)0, gSaveContext.inventory.upgrades) & gUpgradeMasks[upg]) >> gUpgradeShifts[upg])
#define ALL_EQUIP_VALUE(equip) ((gSaveContext.inventory.equipment & gEquipMasks[equip]) >> gEquipShifts[equip])
#define CUR_EQUIP_VALUE(equip) ((gSaveContext.equips.equipment & gEquipMasks[equip]) >> gEquipShifts[equip])
#define CUR_UPG_VALUE(upg) ((gSaveContext.inventory.upgrades & gUpgradeMasks[upg]) >> gUpgradeShifts[upg])
#define CAPACITY(upg, value) gUpgradeCapacities[upg][value]
#define CUR_CAPACITY(upg) CAPACITY(upg, CUR_UPG_VALUE(upg) - 4)
#define CHECK_BTN_ALL(state, combo) (~((state) | ~(combo)) == 0)
#define CHECK_BTN_ANY(state, combo) (((state) & (combo)) != 0)
extern GraphicsContext* __gfxCtx;
#define WORK_DISP __gfxCtx->work.p
#define POLY_OPA_DISP __gfxCtx->polyOpa.p
#define POLY_XLU_DISP __gfxCtx->polyXlu.p
#define OVERLAY_DISP __gfxCtx->overlay.p
#define WORK_DISP __gfxCtx->work.p
#define POLY_OPA_DISP __gfxCtx->polyOpa.p
#define POLY_XLU_DISP __gfxCtx->polyXlu.p
#define OVERLAY_DISP __gfxCtx->overlay.p
// __gfxCtx shouldn't be used directly.
// Use the DISP macros defined above when writing to display buffers.
#define OPEN_DISPS(gfxCtx) \
{ \
GraphicsContext* __gfxCtx = gfxCtx; \
s32 __dispPad; \
s32 __dispPad;
#define CLOSE_DISPS(gfxCtx) \
} \
#define CLOSE_DISPS(gfxCtx) \
} \
(void)0
/**
@@ -66,30 +82,31 @@ extern GraphicsContext* __gfxCtx;
* `cbnz` blue component of color vertex, or z component of normal vertex
* `a` alpha
*/
#define VTX(x,y,z,s,t,crnx,cgny,cbnz,a) { { { x, y, z }, 0, { s, t }, { crnx, cgny, cbnz, a } } }
#define VTX(x, y, z, s, t, crnx, cgny, cbnz, a) \
{ { { x, y, z }, 0, { s, t }, { crnx, cgny, cbnz, a } }, }
#define VTX_T(x,y,z,s,t,cr,cg,cb,a) { { x, y, z }, 0, { s, t }, { cr, cg, cb, a } }
#define VTX_T(x, y, z, s, t, cr, cg, cb, a) \
{ { x, y, z }, 0, { s, t }, { cr, cg, cb, a }, }
#define GRAPH_ALLOC(gfxCtx, size) \
((void *) ((gfxCtx)->polyOpa.d = (Gfx*)((u8*)(gfxCtx)->polyOpa.d - (size))))
#define GRAPH_ALLOC(gfxCtx, size) ((void*)((gfxCtx)->polyOpa.d = (Gfx*)((u8*)(gfxCtx)->polyOpa.d - (size))))
#define ALIGN8(val) (((val) + 7) & ~7)
#define ALIGN16(val) (((val) + 0xF) & ~0xF)
#define SQ(x) ((x)*(x))
#define ABS(x) ((x) >= 0 ? (x) : -(x))
#define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
#define DECR(x) ((x) == 0 ? 0 : ((x) -= 1))
#define SQ(x) ((x) * (x))
#define ABS(x) ((x) >= 0 ? (x) : -(x))
#define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
#define DECR(x) ((x) == 0 ? 0 : ((x) -= 1))
#define CLAMP(x, min, max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x))
#define CLAMP_MAX(x, max) ((x) > (max) ? (max) : (x))
#define CLAMP_MIN(x, min) ((x) < (min) ? (min) : (x))
#define CLAMP_MAX(x, max) ((x) > (max) ? (max) : (x))
#define CLAMP_MIN(x, min) ((x) < (min) ? (min) : (x))
#define SWAP(type, a, b) \
{ \
type _temp = (a); \
(a) = (b); \
(b) = _temp; \
}
#define SWAP(type, a, b) \
{ \
type _temp = (a); \
(a) = (b); \
(b) = _temp; \
}
#endif // _MACROS_H_
include/z64item.h
+99 -21
View File
@@ -7,44 +7,122 @@
// TODO fill out these enums
typedef enum {
/* 0x1 */ EQUIP_SHIELD = 0x1
} EquipmentType;
typedef enum {
/* 0x0 */ UPG_QUIVER,
/* 0x1 */ UPG_BOMB_BAG,
/* 0x4 */ UPG_WALLET = 0x4,
/* 0x6 */ UPG_STICK = 0x6,
/* 0x7 */ UPG_NUTS
} UpgradeType;
typedef enum {
/* 0x01 */ ITEM_BOW = 0x01,
/* 0x06 */ ITEM_BOMB = 0x06,
/* 0x07 */ ITEM_BOMBCHU,
/* 0x08 */ ITEM_STICK,
/* 0x09 */ ITEM_NUT,
/* 0x10 */ ITEM_SWORD_GREAT_FAIRY = 0x10,
/* 0x12 */ ITEM_BOTTLE = 0x12,
/* 0x13 */ ITEM_POTION_RED,
/* 0x14 */ ITEM_POTION_GREEN,
/* 0x15 */ ITEM_POTION_BLUE,
/* 0x16 */ ITEM_FAIRY,
/* 0x38 */ ITEM_MASK_ALL_NIGHT = 0x38,
/* 0x3B */ ITEM_MASK_GARO = 0x3B,
/* 0x4D */ ITEM_SWORD_KOKIRI = 0x4D,
/* 0x4E */ ITEM_SWORD_RAZOR,
/* 0x4F */ ITEM_SWORD_GILDED,
/* 0x51 */ ITEM_SHIELD_HERO = 0x51,
/* 0x52 */ ITEM_SHIELD_MIRROR,
/* 0x56 */ ITEM_BOMB_BAG_20 = 0x56,
/* 0x57 */ ITEM_BOMB_BAG_30,
/* 0x58 */ ITEM_BOMB_BAG_40,
/* 0x78 */ ITEM_KEY_SMALL = 0x78,
/* 0x79 */ ITEM_MAGIC_SMALL = 0x79,
/* 0x7A */ ITEM_MAGIC_LARGE = 0x7A,
/* 0x79 */ ITEM_MAGIC_SMALL,
/* 0x7A */ ITEM_MAGIC_LARGE,
/* 0x83 */ ITEM_HEART = 0x83,
/* 0x84 */ ITEM_RUPEE_GREEN = 0x84,
/* 0x85 */ ITEM_RUPEE_BLUE = 0x85,
/* 0x86 */ ITEM_RUPEE_10 = 0x86,
/* 0x87 */ ITEM_RUPEE_RED = 0x87,
/* 0x88 */ ITEM_RUPEE_PURPLE = 0x88,
/* 0x89 */ ITEM_RUPEE_100 = 0x89,
/* 0x8A */ ITEM_RUPEE_ORANGE = 0x8A,
/* 0x8F */ ITEM_BOMBS_5 = 0x8F,
/* 0x90 */ ITEM_BOMBS_10 = 0x90,
/* 0x91 */ ITEM_BOMBS_20 = 0x91,
/* 0x92 */ ITEM_BOMBS_30 = 0x92,
/* 0x93 */ ITEM_ARROWS_10 = 0x93,
/* 0x94 */ ITEM_ARROWS_30 = 0x94,
/* 0x95 */ ITEM_ARROWS_40 = 0x95,
/* 0x96 */ ITEM_ARROWS_50 = 0x96
/* 0x84 */ ITEM_RUPEE_GREEN,
/* 0x85 */ ITEM_RUPEE_BLUE,
/* 0x86 */ ITEM_RUPEE_10,
/* 0x87 */ ITEM_RUPEE_RED,
/* 0x88 */ ITEM_RUPEE_PURPLE,
/* 0x89 */ ITEM_RUPEE_100,
/* 0x8A */ ITEM_RUPEE_ORANGE,
/* 0x8D */ ITEM_NUTS_5 = 0x8D,
/* 0x8E */ ITEM_NUTS_10,
/* 0x8F */ ITEM_BOMBS_5,
/* 0x90 */ ITEM_BOMBS_10,
/* 0x91 */ ITEM_BOMBS_20,
/* 0x92 */ ITEM_BOMBS_30,
/* 0x93 */ ITEM_ARROWS_10,
/* 0x94 */ ITEM_ARROWS_30,
/* 0x95 */ ITEM_ARROWS_40,
/* 0x96 */ ITEM_ARROWS_50,
/* 0x98 */ ITEM_BOMBCHUS_10 = 0x98,
/* 0xFF */ ITEM_NONE = 0xFF
} ItemID;
typedef enum {
/* 0x00 */ GI_NONE,
/* 0x0C */ GI_HEART_PIECE = 0x0C,
/* 0x0D */ GI_HEART_CONTAINER = 0x0D,
/* 0x0D */ GI_HEART_CONTAINER,
/* 0x16 */ GI_BOMBS_10 = 0x16,
/* 0x19 */ GI_STICKS_1 = 0x19,
/* 0x1A */ GI_BOMBCHUS_10,
/* 0x1B */ GI_BOMB_BAG_20,
/* 0x1C */ GI_BOMB_BAG_30,
/* 0x1D */ GI_BOMB_BAG_40,
/* 0x1E */ GI_ARROWS_SMALL,
/* 0x1F */ GI_ARROWS_MEDIUM,
/* 0x20 */ GI_ARROWS_LARGE,
/* 0x28 */ GI_NUTS_1 = 0x28,
/* 0x2A */ GI_NUTS_10 = 0x2A,
/* 0x32 */ GI_SHIELD_HERO = 0x32,
/* 0x33 */ GI_SHIELD_MIRROR,
/* 0x3C */ GI_KEY_SMALL = 0x3C,
/* 0x3E */ GI_MAP = 0x3E,
/* 0x3F */ GI_COMPASS = 0x3F
/* 0x3F */ GI_COMPASS,
/* 0x5B */ GI_POTION_RED = 0x5B,
/* 0x5C */ GI_POTION_GREEN,
/* 0x5D */ GI_POTION_BLUE,
/* 0x5E */ GI_FAIRY,
/* 0x7E */ GI_MASK_ALL_NIGHT = 0x7E,
/* 0x9B */ GI_SWORD_GREAT_FAIRY = 0x9B,
/* 0x9C */ GI_SWORD_KOKIRI,
/* 0x9D */ GI_SWORD_RAZOR,
/* 0x9E */ GI_SWORD_GILDED,
/* 0x9F */ GI_SHIELD_HERO_2, // Code that treats this as hero's shield is unused, so take with a grain of salt
/* 0xA9 */ GI_BOTTLE = 0xA9
} GetItemID;
typedef enum {
/* 0x00 */ GID_BOTTLE,
/* 0x0A */ GID_COMPASS = 0x0A,
/* 0x1B */ GID_DUNGEON_MAP = 0x1B,
/* 0x27 */ GID_SHIELD_HERO = 0x27
/* 0x10 */ GID_MASK_ALL_NIGHT = 0x10,
/* 0x11 */ GID_NUTS,
/* 0x17 */ GID_BOMB_BAG_20 = 0x17,
/* 0x18 */ GID_BOMB_BAG_30,
/* 0x19 */ GID_BOMB_BAG_40,
/* 0x1A */ GID_STICK = 0x1A,
/* 0x1B */ GID_DUNGEON_MAP,
/* 0x1E */ GID_BOMB = 0x1E,
/* 0x23 */ GID_ARROWS_SMALL = 0x23,
/* 0x24 */ GID_ARROWS_MEDIUM,
/* 0x25 */ GID_ARROWS_LARGE,
/* 0x26 */ GID_BOMBCHU,
/* 0x27 */ GID_SHIELD_HERO,
/* 0x30 */ GID_POTION_GREEN = 0x30,
/* 0x31 */ GID_POTION_RED,
/* 0x32 */ GID_POTION_BLUE,
/* 0x33 */ GID_SHIELD_MIRROR,
/* 0x3B */ GID_FAIRY = 0x3B,
/* 0x55 */ GID_SWORD_KOKIRI = 0x55,
/* 0x66 */ GID_SWORD_RAZOR = 0x66,
/* 0x67 */ GID_SWORD_GILDED,
/* 0x68 */ GID_SWORD_GREAT_FAIRY
} GetItemDrawID;
#endif
linker_scripts/code_script.txt
+2 -2
View File
@@ -841,9 +841,9 @@ SECTIONS
ovl_En_GirlA : AT(RomLocation)
{
build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o(.text)
build/asm/overlays/ovl_En_GirlA_data.o(.data)
build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o(.data)
build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o(.rodata)
build/asm/overlays/ovl_En_GirlA_rodata.o(.rodata)
build/src/overlays/actors/ovl_En_GirlA/z_en_girla_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;
src/code/z_en_item00.c
+4 -6
View File
@@ -816,16 +816,14 @@ s16 func_800A7650(s16 dropId) {
s16 healthCapacity;
if ((((dropId == ITEM00_BOMBS_A) || (dropId == ITEM00_BOMBS_0) || (dropId == ITEM00_BOMBS_B)) &&
(gSaveContext.inventory.items[gItemSlots[6]] == 0xFF)) ||
(INV_CONTENT(ITEM_BOMB) == ITEM_NONE)) ||
(((dropId == ITEM00_ARROWS_10) || (dropId == ITEM00_ARROWS_30) || (dropId == ITEM00_ARROWS_40) ||
(dropId == ITEM00_ARROWS_50)) &&
(gSaveContext.inventory.items[gItemSlots[1]] == 0xFF)) ||
(INV_CONTENT(ITEM_BOW) == ITEM_NONE)) ||
(((dropId == ITEM00_MAGIC_LARGE) || (dropId == ITEM00_MAGIC_SMALL)) && (gSaveContext.magicLevel == 0))) {
return ITEM00_NO_DROP;
}
;
if (dropId == ITEM00_HEART) {
healthCapacity = gSaveContext.healthCapacity;
if (healthCapacity == gSaveContext.health) {
@@ -1125,11 +1123,11 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3
params = 0xD0;
dropId = ITEM00_MAGIC_LARGE;
dropQuantity = 1;
} else if (gSaveContext.inventory.ammo[gItemSlots[1]] < 6) {
} else if (AMMO(ITEM_BOW) < 6) {
params = 0xA0;
dropId = ITEM00_ARROWS_30;
dropQuantity = 1;
} else if (gSaveContext.inventory.ammo[gItemSlots[6]] < 6) {
} else if (AMMO(ITEM_BOMB) < 6) {
params = 0xB0;
dropId = ITEM00_BOMBS_A;
dropQuantity = 1;
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+2 -2
View File
@@ -424,7 +424,7 @@ void EnGinkoMan_WaitForDialogueInput(EnGinkoMan* this, GlobalContext* globalCtx)
func_800BDC5C(&this->skelAnime, animations, GINKO_FLOORSMACKING);
func_801518B0(globalCtx, 0x476, &this->actor);
this->curTextId = 0x476; // you dont have enough deposited to withdrawl
} else if (D_801C1E2C[(gSaveContext.inventory.upgrades & gUpgradeMasks[4]) >> gUpgradeShifts[4]] < (globalCtx->msgCtx.bankRupeesSelected + gSaveContext.rupees)) {
} else if (D_801C1E2C[CUR_UPG_VALUE(UPG_WALLET)] < (globalCtx->msgCtx.bankRupeesSelected + gSaveContext.rupees)) {
// check if wallet is big enough
play_sound(NA_SE_SY_ERROR);
func_801518B0(globalCtx, 0x475, &this->actor);
@@ -532,7 +532,7 @@ void EnGinkoMan_BankAward(EnGinkoMan* this, GlobalContext* globalCtx) {
EnGinkoMan_SetupBankAward2(this);
} else if (this->curTextId == 0x45B) { // "Whats this, you already saved up 200?"
if (!(gSaveContext.weekEventReg[10] & 8)) {
func_800B8A1C(&this->actor, globalCtx, ((u32)(gSaveContext.inventory.upgrades & gUpgradeMasks[4]) >> gUpgradeShifts[4]) + 8, 500.0f, 100.0f);
func_800B8A1C(&this->actor, globalCtx, CUR_UPG_VALUE(UPG_WALLET) + 8, 500.0f, 100.0f);
} else {
func_800B8A1C(&this->actor, globalCtx, 2, 500.0f, 100.0f);
}
src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+541 -45
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_GirlA/z_en_girla.h
+51 -1
View File
@@ -5,11 +5,61 @@
struct EnGirlA;
typedef void (*EnGirlAActionFunc)(struct EnGirlA*, GlobalContext*);
typedef void (*EnGirlADrawFunc)(struct Actor*, GlobalContext*, s32);
typedef s32 (*EnGirlACanBuyFunc)(GlobalContext*, struct EnGirlA*);
typedef void (*EnGirlAShopActionFunc)(GlobalContext*, struct EnGirlA*); // Buying/Restocking
typedef struct ShopItemEntry {
/* 0x00 */ s16 objectId;
/* 0x02 */ s16 getItemDrawId;
/* 0x04 */ EnGirlADrawFunc drawFunc;
/* 0x08 */ s16 params;
/* 0x0A */ u16 descriptionTextId;
/* 0x0C */ u16 choiceTextId;
/* 0x10 */ s32 getItemId;
/* 0x14 */ EnGirlACanBuyFunc canBuyFunc;
/* 0x18 */ EnGirlAShopActionFunc buyFunc;
/* 0x1C */ EnGirlAShopActionFunc buyFanfareFunc;
} ShopItemEntry; // size = 0x20
typedef struct EnGirlA {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x88];
/* 0x144 */ char unk144[0x44];
/* 0x188 */ EnGirlAActionFunc actionFunc;
/* 0x18C */ s8 objIndex;
/* 0x190 */ EnGirlAActionFunc mainActionFunc;
/* 0x194 */ s32 isInitialized;
/* 0x198 */ u16 choiceTextId;
/* 0x19C */ s32 getItemId;
/* 0x1A0 */ s16 isOutOfStock;
/* 0x1A4 */ EnGirlAShopActionFunc boughtFunc;
/* 0x1A8 */ EnGirlAShopActionFunc restockFunc;
/* 0x1AC */ s16 isSelected;
/* 0x1AE */ s16 initialRotY;
/* 0x1B0 */ s16 rotY;
/* 0x1B4 */ EnGirlACanBuyFunc canBuyFunc;
/* 0x1B8 */ EnGirlAShopActionFunc buyFunc;
/* 0x1BC */ EnGirlAShopActionFunc buyFanfareFunc;
/* 0x1C0 */ s16 unk1C0;
/* 0x1C2 */ s16 itemParams;
/* 0x1C4 */ s16 getItemDrawId;
/* 0x1C8 */ EnGirlADrawFunc drawFunc;
} EnGirlA; // size = 0x1CC
typedef enum {
/* 0 */ CANBUY_RESULT_SUCCESS_FANFARE,
/* 1 */ CANBUY_RESULT_SUCCESS,
/* 2 */ CANBUY_RESULT_NO_ROOM,
/* 3 */ CANBUY_RESULT_NEED_EMPTY_BOTTLE,
/* 4 */ CANBUY_RESULT_NEED_RUPEES,
/* 5 */ CANBUY_RESULT_CANT_GET_NOW,
/* 6 */ CANBUY_RESULT_NO_ROOM_2,
/* 7 */ CANBUY_RESULT_NO_ROOM_3,
/* 8 */ CANBUY_RESULT_ALREADY_HAVE,
/* 9 */ CANBUY_RESULT_HAVE_BETTER
} EnGirlACanBuyResult;
extern const ActorInit En_GirlA_InitVars;
#endif // Z_EN_GIRLA_H
src/overlays/actors/ovl_En_In/z_en_in.c
+2 -2
View File
@@ -894,7 +894,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
case 0x347A:
func_808F30B0(&this->skelAnime, 1);
func_808F30B0(&this->unk4A4->skelAnime, 7);
if (gSaveContext.inventory.items[gItemSlots[59]] == 59) {
if (INV_CONTENT(ITEM_MASK_GARO) == ITEM_MASK_GARO) {
func_800E8EA0(globalCtx, &this->actor, 0x347E);
ret = false;
} else {
@@ -1085,7 +1085,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
case 0x349D:
func_808F30B0(&this->skelAnime, 1);
func_808F30B0(&this->unk4A4->skelAnime, 7);
if (gSaveContext.inventory.items[gItemSlots[59]] == 59) {
if (INV_CONTENT(ITEM_MASK_GARO) == ITEM_MASK_GARO) {
func_800E8EA0(globalCtx, &this->actor, 0x34A1);
ret = false;
} else {
tables/functions.txt
+40 -40
View File
@@ -4908,49 +4908,49 @@
0x8086333C:("EnTest_Update",),
0x808634B8:("func_808634B8",),
0x808636A8:("EnTest_Draw",),
0x80863870:("func_80863870",),
0x8086387C:("func_8086387C",),
0x80863870:("EnGirlA_SetupAction",),
0x8086387C:("EnGirlA_InitObjIndex",),
0x80863920:("EnGirlA_Init",),
0x80863940:("EnGirlA_Destroy",),
0x80863950:("func_80863950",),
0x808639B0:("func_808639B0",),
0x80863A10:("func_80863A10",),
0x80863AAC:("func_80863AAC",),
0x80863B4C:("func_80863B4C",),
0x80863C08:("func_80863C08",),
0x80863C6C:("func_80863C6C",),
0x80863D28:("func_80863D28",),
0x80863D60:("func_80863D60",),
0x80863DC8:("func_80863DC8",),
0x80863E48:("func_80863E48",),
0x80863EC8:("func_80863EC8",),
0x80863F94:("func_80863F94",),
0x80864034:("func_80864034",),
0x8086406C:("func_8086406C",),
0x808640A4:("func_808640A4",),
0x80864108:("func_80864108",),
0x80864168:("func_80864168",),
0x80864210:("func_80864210",),
0x8086425C:("func_8086425C",),
0x808642D4:("func_808642D4",),
0x80864320:("func_80864320",),
0x8086436C:("func_8086436C",),
0x808643B8:("func_808643B8",),
0x8086444C:("func_8086444C",),
0x808644A4:("func_808644A4",),
0x80864558:("func_80864558",),
0x808645A4:("func_808645A4",),
0x80864658:("func_80864658",),
0x808646A4:("func_808646A4",),
0x808646E4:("func_808646E4",),
0x808646F4:("func_808646F4",),
0x8086472C:("func_8086472C",),
0x80864744:("func_80864744",),
0x80864760:("func_80864760",),
0x80864774:("func_80864774",),
0x808648F8:("func_808648F8",),
0x80863950:("EnGirlA_CanBuyPotionRed",),
0x808639B0:("EnGirlA_CanBuyPotionGreen",),
0x80863A10:("EnGirlA_CanBuyPotionBlue",),
0x80863AAC:("EnGirlA_CanBuyArrows",),
0x80863B4C:("EnGirlA_CanBuyNuts",),
0x80863C08:("EnGirlA_CanBuyShieldHero",),
0x80863C6C:("EnGirlA_CanBuyStick",),
0x80863D28:("EnGirlA_CanBuyMaskAllNight",),
0x80863D60:("EnGirlA_CanBuyBombBagCuriosityShop",),
0x80863DC8:("EnGirlA_CanBuyBombBag20BombShop",),
0x80863E48:("EnGirlA_CanBuyBombBag30BombShop",),
0x80863EC8:("EnGirlA_CanBuyBombchus",),
0x80863F94:("EnGirlA_CanBuyBombs",),
0x80864034:("EnGirlA_CanBuyBottle",),
0x8086406C:("EnGirlA_CanBuySword",),
0x808640A4:("EnGirlA_CanBuyShieldMirror",),
0x80864108:("EnGirlA_CanBuyFairy",),
0x80864168:("EnGirlA_BuyBottleItem",),
0x80864210:("EnGirlA_BuyArrows",),
0x8086425C:("EnGirlA_BuyNuts",),
0x808642D4:("EnGirlA_BuyShieldHero",),
0x80864320:("EnGirlA_BuyStick",),
0x8086436C:("EnGirlA_BuyMaskAllNight",),
0x808643B8:("EnGirlA_BuyBombBag",),
0x8086444C:("EnGirlA_BuyBombchus",),
0x808644A4:("EnGirlA_BuyBombs",),
0x80864558:("EnGirlA_BuyBottle",),
0x808645A4:("EnGirlA_BuySword",),
0x80864658:("EnGirlA_BuyShieldMirror",),
0x808646A4:("EnGirlA_BuyFanfare",),
0x808646E4:("EnGirlA_DoNothing",),
0x808646F4:("EnGirlA_InitItem",),
0x8086472C:("EnGirlA_Bought",),
0x80864744:("EnGirlA_Restock",),
0x80864760:("EnGirlA_TrySetMaskItemDescription",),
0x80864774:("EnGirlA_InitalUpdate",),
0x808648F8:("EnGirlA_Update2",),
0x808649A4:("EnGirlA_Update",),
0x808649C8:("func_808649C8",),
0x808649C8:("EnGirlA_Draw",),
0x80865370:("EnPart_Init",),
0x80865380:("EnPart_Destroy",),
0x80865390:("func_80865390",),