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

En_Kgy (#244)

Browse Source 
* En_Kgy

* NBS

* PR

* PR

* PR
This commit is contained in:
Maide
2021-09-02 16:27:26 +01:00
committed by GitHub
parent b3816cd26b
commit 1f4973d9b4
9 changed files with 1161 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_8012EC80.c
+6 -7
View File
@@ -177,19 +177,18 @@ u16 gScenesPerRegion[11][27] = {
s32 func_8012EC80(GlobalContext* globalCtx) {
if (gSaveContext.buttonStatus[0] == BTN_DISABLED) {
return 0xFF;
} else if (gSaveContext.unk_1015 == 0xFF) {
return 0xFF;
} else if (gSaveContext.equips.buttonItems[((gSaveContext.playerForm == 4) ? 0 : gSaveContext.playerForm)][0] ==
0xFF) {
return ITEM_NONE;
} else if (gSaveContext.unk_1015 == ITEM_NONE) {
return ITEM_NONE;
} else if (CUR_FORM_EQUIP(EQUIP_SLOT_B) == ITEM_NONE) {
if (globalCtx->interfaceCtx.unk_21C != 0) {
if (globalCtx->interfaceCtx.unk_21E != 0) {
return globalCtx->interfaceCtx.unk_21E;
}
}
return 0xFF;
return ITEM_NONE;
} else {
return gSaveContext.equips.buttonItems[((gSaveContext.playerForm == 4) ? 0 : gSaveContext.playerForm)][0];
return CUR_FORM_EQUIP(EQUIP_SLOT_B);
}
}
src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
+1 -4
View File
@@ -911,10 +911,7 @@ void EnFsn_DeterminePrice(EnFsn* this, GlobalContext* globalCtx) {
itemGiven = func_80123810(globalCtx);
if (itemGiven > 0) {
if (player->heldItemButton == 0) {
buttonItem =
gSaveContext.equips
.buttonItems[(gSaveContext.playerForm == PLAYER_FORM_HUMAN) ? 0 : gSaveContext.playerForm]
[player->heldItemButton];
buttonItem = CUR_FORM_EQUIP(player->heldItemButton);
} else {
buttonItem = gSaveContext.equips.buttonItems[0][player->heldItemButton];
}
src/overlays/actors/ovl_En_Kgy/z_en_kgy.c
+1108 -64
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Kgy/z_en_kgy.h
+26 -3
View File
@@ -7,10 +7,33 @@ struct EnKgy;
typedef void (*EnKgyActionFunc)(struct EnKgy*, GlobalContext*);
#define ENKGY_GET_1F(thisx) ((thisx)->params & 0x1F)
#define ENKGY_GET_FE00(thisx) (((thisx)->params & 0xFE00) >> 9)
typedef struct EnKgy {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x1C0];
/* 0x0304 */ EnKgyActionFunc actionFunc;
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[23];
/* 0x212 */ Vec3s morphTable[23];
/* 0x29C */ u16 unk_29C;
/* 0x2A0 */ EnKbt* zubora;
/* 0x2A4 */ ObjIcePoly* iceBlock;
/* 0x2A8 */ Vec3f unk_2A8;
/* 0x2B4 */ Vec3f unk_2B4;
/* 0x2C0 */ Vec3f unk_2C0;
/* 0x2CC */ Vec3s unk_2CC;
/* 0x2D2 */ s16 unk_2D2;
/* 0x2D4 */ s16 unk_2D4[6];
/* 0x2E0 */ s16 unk_2E0;
/* 0x2E2 */ s16 unk_2E2;
/* 0x2E4 */ s16 unk_2E4;
/* 0x2E6 */ s16 unk_2E6;
/* 0x2E8 */ s16 unk_2E8;
/* 0x2EA */ s16 unk_2EA;
/* 0x2EC */ LightInfo lightInfo;
/* 0x2FC */ LightNode* lightNode;
/* 0x300 */ s16 unk_300;
/* 0x304 */ EnKgyActionFunc actionFunc;
} EnKgy; // size = 0x308
extern const ActorInit En_Kgy_InitVars;