mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-02 15:55:59 +00:00
Code Issues Projects Releases Wiki Activity
oot/src/code/z_parameter.c

4336 lines
182 KiB
C
Raw Normal View History

First proper commit.
2020-03-17 04:31:30 +00:00
#include <ultra64.h>
Matched some controller files (#178) * osPfsIsPlug.c and osContSetCh.c OK * update * __osPfsGetStatus.c OK * removed unused asm * Updated all libultra controller files to use new structs instead of the temporary structs. Added os_pfs.h * controller updates * fixed header guard * Made suggested changes
2020-06-17 11:16:30 +00:00
#include <ultra64/controller.h>
First proper commit.
2020-03-17 04:31:30 +00:00
#include <global.h>
#include <vt.h>
Format all src C files
2020-03-22 21:19:43 +00:00
typedef struct {
First proper commit.
2020-03-17 04:31:30 +00:00
/* 0x00 */ u8 scene;
/* 0x01 */ u8 flags1;
/* 0x02 */ u8 flags2;
/* 0x03 */ u8 flags3;
} RestrictionFlags;
Format all src C files
2020-03-22 21:19:43 +00:00
RestrictionFlags sRestrictionFlags[] = {
{ SCENE_SPOT00, 0x00, 0x00, 0x10 },
{ SCENE_SPOT01, 0x00, 0x00, 0x10 },
{ SCENE_SPOT02, 0x00, 0x00, 0x10 },
{ SCENE_SPOT03, 0x00, 0x00, 0x10 },
{ SCENE_SPOT04, 0x00, 0x00, 0x10 },
{ SCENE_SPOT05, 0x00, 0x00, 0x10 },
{ SCENE_SPOT06, 0x00, 0x00, 0x10 },
{ SCENE_SPOT07, 0x00, 0x00, 0x10 },
{ SCENE_SPOT08, 0x00, 0x00, 0x10 },
{ SCENE_SPOT09, 0x00, 0x00, 0x10 },
{ SCENE_SPOT10, 0x00, 0x00, 0x10 },
{ SCENE_SPOT11, 0x00, 0x00, 0x10 },
{ SCENE_SPOT12, 0x00, 0x00, 0x10 },
{ SCENE_SPOT13, 0x00, 0x00, 0x10 },
{ SCENE_SPOT15, 0x00, 0x00, 0x10 },
{ SCENE_GANON_TOU, 0x00, 0x00, 0x10 },
{ SCENE_SPOT16, 0x00, 0x00, 0x10 },
{ SCENE_SPOT17, 0x00, 0x00, 0x10 },
{ SCENE_SPOT18, 0x00, 0x00, 0x10 },
{ SCENE_SPOT20, 0x00, 0x00, 0x10 },
{ SCENE_TOKINOMA, 0x00, 0x10, 0x15 },
{ SCENE_KENJYANOMA, 0xA2, 0xAA, 0xAA },
{ SCENE_SYATEKIJYOU, 0x11, 0x55, 0x55 },
{ SCENE_HAIRAL_NIWA, 0x11, 0x55, 0x55 },
{ SCENE_HAIRAL_NIWA_N, 0x11, 0x55, 0x55 },
{ SCENE_HAKAANA, 0x00, 0x00, 0xD0 },
{ SCENE_HAKAANA2, 0x00, 0x00, 0xD0 },
{ SCENE_HAKAANA_OUKE, 0x00, 0x00, 0xD0 },
{ SCENE_DAIYOUSEI_IZUMI, 0x00, 0x00, 0x10 },
{ SCENE_YOUSEI_IZUMI_TATE, 0x00, 0x00, 0xD0 },
{ SCENE_YOUSEI_IZUMI_YOKO, 0x00, 0x00, 0x10 },
{ SCENE_GANON_FINAL, 0x00, 0x05, 0x50 },
{ SCENE_NAKANIWA, 0x00, 0x05, 0x54 },
{ SCENE_TURIBORI, 0x11, 0x55, 0x55 },
{ SCENE_BOWLING, 0x11, 0x55, 0x55 },
{ SCENE_SOUKO, 0x00, 0x10, 0x15 },
{ SCENE_MIHARIGOYA, 0x00, 0x10, 0x14 },
{ SCENE_MAHOUYA, 0x10, 0x15, 0x55 },
{ SCENE_TAKARAYA, 0x10, 0x15, 0x55 },
{ SCENE_KINSUTA, 0x00, 0x10, 0x15 },
{ SCENE_ENTRA, 0x00, 0x10, 0x15 },
{ SCENE_ENTRA_N, 0x00, 0x10, 0x15 },
{ SCENE_ENRUI, 0x00, 0x10, 0xD5 },
{ SCENE_MARKET_DAY, 0x00, 0x10, 0x15 },
{ SCENE_MARKET_NIGHT, 0x00, 0x10, 0x15 },
{ SCENE_MARKET_RUINS, 0x00, 0x10, 0xD5 },
{ SCENE_MARKET_ALLEY, 0x00, 0x10, 0x15 },
{ SCENE_MARKET_ALLEY_N, 0x00, 0x10, 0x15 },
{ SCENE_SHRINE, 0x00, 0x10, 0x15 },
{ SCENE_SHRINE_N, 0x00, 0x10, 0x15 },
{ SCENE_SHRINE_R, 0x00, 0x10, 0xD5 },
{ SCENE_LINK_HOME, 0x10, 0x10, 0x15 },
{ SCENE_KAKARIKO, 0x10, 0x10, 0x15 },
{ SCENE_KAKARIKO3, 0x10, 0x10, 0x15 },
{ SCENE_KOKIRI_HOME, 0x10, 0x10, 0x15 },
{ SCENE_KOKIRI_HOME3, 0x10, 0x10, 0x15 },
{ SCENE_KOKIRI_HOME4, 0x10, 0x10, 0x15 },
{ SCENE_KOKIRI_HOME5, 0x10, 0x10, 0x15 },
{ SCENE_MALON_STABLE, 0x10, 0x10, 0x15 },
{ SCENE_HUT, 0x10, 0x10, 0x15 },
{ SCENE_IMPA, 0x10, 0x10, 0x15 },
{ SCENE_LABO, 0x10, 0x10, 0x15 },
{ SCENE_HYLIA_LABO, 0x00, 0x10, 0x15 },
{ SCENE_TENT, 0x10, 0x10, 0x15 },
{ SCENE_SHOP1, 0x10, 0x10, 0x15 },
{ SCENE_KOKIRI_SHOP, 0x10, 0x10, 0x15 },
{ SCENE_GOLON, 0x10, 0x10, 0x15 },
{ SCENE_ZOORA, 0x10, 0x10, 0x15 },
{ SCENE_DRAG, 0x10, 0x10, 0x15 },
{ SCENE_ALLEY_SHOP, 0x10, 0x10, 0x15 },
{ SCENE_NIGHT_SHOP, 0x10, 0x10, 0x15 },
{ SCENE_FACE_SHOP, 0x10, 0x10, 0x15 },
{ SCENE_MEN, 0x00, 0x03, 0x10 },
{ SCENE_YDAN, 0x00, 0x00, 0x00 },
{ SCENE_YDAN_BOSS, 0x00, 0x45, 0x50 },
{ SCENE_DDAN, 0x00, 0x00, 0x00 },
{ SCENE_DDAN_BOSS, 0x00, 0x45, 0x50 },
{ SCENE_BDAN, 0x00, 0x00, 0x00 },
{ SCENE_BDAN_BOSS, 0x00, 0x45, 0x50 },
{ SCENE_BMORI1, 0x00, 0x00, 0x00 },
{ SCENE_MORIBOSSROOM, 0x00, 0x45, 0x50 },
{ SCENE_HAKADANCH, 0x00, 0x00, 0x00 },
{ SCENE_HAKADAN, 0x00, 0x00, 0x00 },
{ SCENE_HAKADAN_BS, 0x00, 0x45, 0x50 },
{ SCENE_HIDAN, 0x00, 0x00, 0x00 },
{ SCENE_FIRE_BS, 0x00, 0x45, 0x50 },
{ SCENE_MIZUSIN, 0x00, 0x00, 0x00 },
{ SCENE_MIZUSIN_BS, 0x00, 0x45, 0x50 },
{ SCENE_JYASINZOU, 0x00, 0x00, 0x00 },
{ SCENE_JYASINBOSS, 0x00, 0x45, 0x50 },
{ SCENE_GANON, 0x00, 0x00, 0x00 },
{ SCENE_GANON_BOSS, 0x00, 0x45, 0x50 },
{ SCENE_ICE_DOUKUTO, 0x00, 0x00, 0xC0 },
{ SCENE_HAKASITARELAY, 0x00, 0x03, 0x14 },
{ SCENE_GANONTIKA, 0x00, 0x03, 0x10 },
{ SCENE_GANON_DEMO, 0x00, 0x45, 0x50 },
{ SCENE_GANON_SONOGO, 0x00, 0x05, 0x50 },
{ SCENE_GANONTIKA_SONOGO, 0x00, 0x05, 0x50 },
{ SCENE_GERUDOWAY, 0x00, 0x00, 0x10 },
{ SCENE_KAKUSIANA, 0x00, 0x00, 0xD0 },
{ 0xFF, 0x00, 0x00, 0x00 },
First proper commit.
2020-03-17 04:31:30 +00:00
};
s16 sHBAScoreTier = 0;
u16 sHBAScoreDigits[] = { 0, 0, 0, 0 };
u16 sCUpInvisible = 0;
u16 sCUpTimer = 0;
s16 gSpoilingItems[] = { ITEM_ODD_MUSHROOM, ITEM_FROG, ITEM_EYEDROPS };
s16 gSpoilingItemReverts[] = { ITEM_COJIRO, ITEM_PRESCRIPTION, ITEM_PRESCRIPTION };
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
s16 sMagicBorderR = 255;
s16 sMagicBorderG = 255;
s16 sMagicBorderB = 255;
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
s16 sExtraItemBases[] = {
ITEM_STICK, ITEM_STICK, ITEM_NUT, ITEM_NUT, ITEM_BOMB, ITEM_BOMB, ITEM_BOMB, ITEM_BOMB, ITEM_BOW,
ITEM_BOW, ITEM_BOW, ITEM_SEEDS, ITEM_BOMBCHU, ITEM_BOMBCHU, ITEM_STICK, ITEM_STICK, ITEM_NUT, ITEM_NUT,
First proper commit.
2020-03-17 04:31:30 +00:00
};
s16 D_80125A58 = 0;
s16 D_80125A5C = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
Gfx sSetupDL_80125A60[] = {
First proper commit.
2020-03-17 04:31:30 +00:00
gsDPPipeSync(),
Format all src C files
2020-03-22 21:19:43 +00:00
gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
G_TEXTURE_GEN_LINEAR | G_SHADING_SMOOTH | G_LOD),
gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE |
G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_1PRIMITIVE,
First proper commit.
2020-03-17 04:31:30 +00:00
G_AC_NONE | G_ZS_PIXEL | G_RM_CLD_SURF | G_RM_CLD_SURF2),
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE),
First proper commit.
2020-03-17 04:31:30 +00:00
gsSPEndDisplayList(),
};
// original name: "alpha_change"
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_ChangeAlpha(u16 alphaType) {
if (alphaType != gSaveContext.unk_13EA) {
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf("ＡＬＰＨＡーＴＹＰＥ＝%d LAST_TIME_TYPE=%d\n", alphaType, gSaveContext.unk_13EE);
gSaveContext.unk_13EA = gSaveContext.unk_13E8 = alphaType;
gSaveContext.unk_13EC = 1;
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_80082644(GlobalContext* globalCtx, s16 alpha) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[0] == BTN_DISABLED) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->bAlpha != 70) {
interfaceCtx->bAlpha = 70;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->bAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->bAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[1] == BTN_DISABLED) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->cLeftAlpha != 70) {
interfaceCtx->cLeftAlpha = 70;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->cLeftAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cLeftAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[2] == BTN_DISABLED) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->cDownAlpha != 70) {
interfaceCtx->cDownAlpha = 70;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->cDownAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cDownAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[3] == BTN_DISABLED) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->cRightAlpha != 70) {
interfaceCtx->cRightAlpha = 70;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->cRightAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cRightAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[4] == BTN_DISABLED) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->aAlpha != 70) {
interfaceCtx->aAlpha = 70;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->aAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_8008277C(GlobalContext* globalCtx, s16 maxAlpha, s16 alpha) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.unk_13E7 != 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
func_80082644(globalCtx, alpha);
return;
}
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->bAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cLeftAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cDownAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cRightAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
s16 alpha;
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
alpha = 255 - maxAlpha;
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
switch (gSaveContext.unk_13E8) {
First proper commit.
2020-03-17 04:31:30 +00:00
case 1:
case 2:
case 8:
osSyncPrintf("a_alpha=%d, c_alpha=%d → ", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha);
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.unk_13E8 == 8) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->bAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->bAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else {
if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->bAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cLeftAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cDownAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cRightAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf("a_alpha=%d, c_alpha=%d\n", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha);
break;
case 3:
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
func_8008277C(globalCtx, maxAlpha, alpha);
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->healthAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 4:
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->bAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cLeftAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cDownAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cRightAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->aAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 5:
func_8008277C(globalCtx, maxAlpha, alpha);
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->aAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->healthAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->magicAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 6:
func_8008277C(globalCtx, maxAlpha, alpha);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->aAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->healthAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->magicAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
switch (globalCtx->sceneNum) {
First proper commit.
2020-03-17 04:31:30 +00:00
case SCENE_SPOT00:
case SCENE_SPOT01:
case SCENE_SPOT02:
case SCENE_SPOT03:
case SCENE_SPOT04:
case SCENE_SPOT05:
case SCENE_SPOT06:
case SCENE_SPOT07:
case SCENE_SPOT08:
case SCENE_SPOT09:
case SCENE_SPOT10:
case SCENE_SPOT11:
case SCENE_SPOT12:
case SCENE_SPOT13:
case SCENE_SPOT15:
case SCENE_SPOT16:
case SCENE_SPOT17:
case SCENE_SPOT18:
case SCENE_SPOT20:
case SCENE_GANON_TOU:
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->minimapAlpha < 170) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
interfaceCtx->minimapAlpha = 170;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
default:
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->minimapAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
}
break;
case 7:
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
func_80082644(globalCtx, alpha);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->healthAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->magicAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 9:
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->bAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cLeftAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cDownAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cRightAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->healthAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->magicAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 10:
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cLeftAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cDownAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cRightAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->bAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->bAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 11:
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->bAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cLeftAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cDownAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cRightAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->healthAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 12:
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->aAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->bAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->bAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->minimapAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cLeftAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cDownAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->cRightAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 13:
func_8008277C(globalCtx, maxAlpha, alpha);
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->aAlpha = maxAlpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->healthAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->magicAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = alpha;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
}
Format all src C files
2020-03-22 21:19:43 +00:00
if ((globalCtx->roomCtx.curRoom.unk_03 == 1) && (interfaceCtx->minimapAlpha >= 0xFF)) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
interfaceCtx->minimapAlpha = 255;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_80083108(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
MessageContext* msgCtx = &globalCtx->msgCtx;
Player* player = PLAYER;
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
s16 i;
s16 sp28;
sp28 = 0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.cutsceneIndex < 0xFFF0) ||
((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.cutsceneIndex == 0xFFF0))) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13E7 = 0;
if ((player->stateFlags1 & 0x00800000) || (globalCtx->unk_11E5C >= 2) ||
Format all src C files
2020-03-22 21:19:43 +00:00
((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13E7 = 1;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[0] == BTN_DISABLED) {
gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
gSaveContext.buttonStatus[3] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[0] != ITEM_SLINGSHOT) &&
(gSaveContext.equips.buttonItems[0] != ITEM_BOW) &&
(gSaveContext.equips.buttonItems[0] != ITEM_BOMBCHU) &&
(gSaveContext.equips.buttonItems[0] != ITEM_NONE)) {
gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0];
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = ITEM_BOMBCHU;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = ITEM_BOW;
Format all src C files
2020-03-22 21:19:43 +00:00
if (globalCtx->unk_11E5C >= 2) {
if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = ITEM_SLINGSHOT;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
if (gSaveContext.items[SLOT_BOW] == ITEM_NONE) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] = gSaveContext.buttonStatus[3] =
Format all src C files
2020-03-22 21:19:43 +00:00
BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(6);
}
Decompiles most FBDemo and transition functions (#92) * Decompile fbdemo (transition) files * run format.sh * reformat vtx array, fill in a couple unk * match TransitionTriforce_IsDone * add VTX macro, add DW_ wrapping around triangle macros * use new VTX macro, name graphic assets * Naming updates * pr updates * naming updates * remove symbols for COLOR_BUFFER, D_08000000, and D_09000000
2020-04-30 18:41:09 +00:00
if (globalCtx->transitionMode != 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(1);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
} else if (gSaveContext.minigameState == 1) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(8);
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (globalCtx->unk_11E5C >= 2) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(8);
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38)) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(8);
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (player->stateFlags1 & 0x00800000) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(12);
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else {
if (player->stateFlags1 & 0x00800000) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(12);
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (globalCtx->sceneNum == SCENE_KENJYANOMA) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(1);
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (globalCtx->sceneNum == SCENE_TURIBORI) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13E7 = 2;
Format all src C files
2020-03-22 21:19:43 +00:00
if (globalCtx->interfaceCtx.unk_260 != 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[0] != ITEM_FISHING_POLE) {
gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0];
gSaveContext.equips.buttonItems[0] = ITEM_FISHING_POLE;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13EA = 0;
Interface_LoadItemIcon1(globalCtx, 0);
Interface_ChangeAlpha(12);
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.unk_13EA != 12) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(12);
Format all src C files
2020-03-22 21:19:43 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
} else if (gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE) {
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13EA = 0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
gSaveContext.buttonStatus[3] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(50);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[0] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13EA = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
gSaveContext.buttonStatus[3] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(50);
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (msgCtx->msgMode == 0) {
if ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[0] != BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[0] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 1; i < 4; i++) {
if (func_8008F2F8(globalCtx) == 2) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] != ITEM_HOOKSHOT) &&
(gSaveContext.equips.buttonItems[i] != ITEM_LONGSHOT)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_DISABLED;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (sp28) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13EA = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(50);
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((player->stateFlags1 & 0x00200000) || (player->stateFlags2 & 0x00040000)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[0] != BTN_DISABLED) {
gSaveContext.buttonStatus[0] = BTN_DISABLED;
gSaveContext.buttonStatus[1] = BTN_DISABLED;
gSaveContext.buttonStatus[2] = BTN_DISABLED;
gSaveContext.buttonStatus[3] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13EA = 0;
Interface_ChangeAlpha(50);
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
} else if ((gSaveContext.eventInf[0] & 0xF) == 1) {
Format all src C files
2020-03-22 21:19:43 +00:00
if (player->stateFlags1 & 0x00800000) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) &&
(gSaveContext.equips.buttonItems[0] != ITEM_BOW)) {
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.items[SLOT_BOW] == ITEM_NONE) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = ITEM_BOW;
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
do {
sp28 = 1;
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[0] == ITEM_NONE) ||
(gSaveContext.equips.buttonItems[0] == ITEM_BOW)) {
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) &&
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) &&
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS) &&
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KNIFE)) {
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0];
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} while (0); // Necessary to match
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (sp28) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
sp28 = 0;
}
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_FAIRY) &&
(gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_DISABLED;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (sp28) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13EA = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(50);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
if (interfaceCtx->restrictions.bButton == 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT) ||
(gSaveContext.equips.buttonItems[0] == ITEM_BOW) ||
(gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU) ||
(gSaveContext.equips.buttonItems[0] == ITEM_NONE)) {
if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) || (gSaveContext.infTable[29] == 0)) {
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
} else if ((gSaveContext.buttonStatus[0] & 0xFF) == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (((gSaveContext.buttonStatus[0] & 0xFF) == BTN_DISABLED) ||
((gSaveContext.buttonStatus[0] & 0xFF) == BTN_ENABLED)) {
gSaveContext.buttonStatus[0] = BTN_ENABLED;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0] & 0xFF;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (interfaceCtx->restrictions.bButton == 1) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT) ||
(gSaveContext.equips.buttonItems[0] == ITEM_BOW) ||
(gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU) ||
(gSaveContext.equips.buttonItems[0] == ITEM_NONE)) {
if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) || (gSaveContext.infTable[29] == 0)) {
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[0] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[0] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->restrictions.bottles != 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_POE)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (interfaceCtx->restrictions.bottles == 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_POE)) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->restrictions.tradeItems != 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (interfaceCtx->restrictions.tradeItems == 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK)) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->restrictions.hookshot != 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] == ITEM_HOOKSHOT) ||
(gSaveContext.equips.buttonItems[i] == ITEM_LONGSHOT)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (interfaceCtx->restrictions.hookshot == 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] == ITEM_HOOKSHOT) ||
(gSaveContext.equips.buttonItems[i] == ITEM_LONGSHOT)) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->restrictions.ocarina != 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_FAIRY) ||
(gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_TIME)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (interfaceCtx->restrictions.ocarina == 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_FAIRY) ||
(gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_TIME)) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->restrictions.farores != 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[i] == ITEM_FARORES_WIND) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf("***(i=%d)*** ", i);
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (interfaceCtx->restrictions.farores == 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[i] == ITEM_FARORES_WIND) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->restrictions.dinsNayrus != 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] == ITEM_DINS_FIRE) ||
(gSaveContext.equips.buttonItems[i] == ITEM_NAYRUS_LOVE)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_DISABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (interfaceCtx->restrictions.dinsNayrus == 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] == ITEM_DINS_FIRE) ||
(gSaveContext.equips.buttonItems[i] == ITEM_NAYRUS_LOVE)) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->restrictions.all != 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_FAIRY) &&
(gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME) &&
!((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_POE)) &&
!((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
First proper commit.
2020-03-17 04:31:30 +00:00
if ((globalCtx->sceneNum != SCENE_TAKARAYA) ||
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
(gSaveContext.equips.buttonItems[i] != ITEM_LENS)) {
if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_DISABLED;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (interfaceCtx->restrictions.all == 0) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[i] != ITEM_DINS_FIRE) &&
(gSaveContext.equips.buttonItems[i] != ITEM_HOOKSHOT) &&
(gSaveContext.equips.buttonItems[i] != ITEM_LONGSHOT) &&
(gSaveContext.equips.buttonItems[i] != ITEM_FARORES_WIND) &&
(gSaveContext.equips.buttonItems[i] != ITEM_NAYRUS_LOVE) &&
(gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_FAIRY) &&
(gSaveContext.equips.buttonItems[i] != ITEM_OCARINA_TIME) &&
!((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_POE)) &&
!((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp28 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[i] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (sp28) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13EA = 0;
Decompiles most FBDemo and transition functions (#92) * Decompile fbdemo (transition) files * run format.sh * reformat vtx array, fill in a couple unk * match TransitionTriforce_IsDone * add VTX macro, add DW_ wrapping around triangle macros * use new VTX macro, name graphic assets * Naming updates * pr updates * naming updates * remove symbols for COLOR_BUFFER, D_08000000, and D_09000000
2020-04-30 18:41:09 +00:00
if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0)) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(50);
osSyncPrintf("???????? alpha_change( 50 ); ?????\n");
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf("game_play->fade_direction || game_play->fbdemo_wipe_modem");
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_SetSceneRestrictions(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
s16 i;
u8 currentScene;
Format all src C files
2020-03-22 21:19:43 +00:00
// clang-format off
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->restrictions.hGauge = interfaceCtx->restrictions.bButton =
interfaceCtx->restrictions.aButton = interfaceCtx->restrictions.bottles =
Decompiles most FBDemo and transition functions (#92) * Decompile fbdemo (transition) files * run format.sh * reformat vtx array, fill in a couple unk * match TransitionTriforce_IsDone * add VTX macro, add DW_ wrapping around triangle macros * use new VTX macro, name graphic assets * Naming updates * pr updates * naming updates * remove symbols for COLOR_BUFFER, D_08000000, and D_09000000
2020-04-30 18:41:09 +00:00
interfaceCtx->restrictions.tradeItems = interfaceCtx->restrictions.hookshot =
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->restrictions.ocarina = interfaceCtx->restrictions.warpSongs =
interfaceCtx->restrictions.sunsSong = interfaceCtx->restrictions.farores =
interfaceCtx->restrictions.dinsNayrus = interfaceCtx->restrictions.all = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
// clang-format on
First proper commit.
2020-03-17 04:31:30 +00:00
i = 0;
// Translates to: "Data settings related to button display scene_data_ID=%d\n"
osSyncPrintf("ボタン表示関係データ設定 scene_data_ID=%d\n", globalCtx->sceneNum);
Format all src C files
2020-03-22 21:19:43 +00:00
do {
First proper commit.
2020-03-17 04:31:30 +00:00
currentScene = (u8)globalCtx->sceneNum;
Format all src C files
2020-03-22 21:19:43 +00:00
if (sRestrictionFlags[i].scene == currentScene) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->restrictions.hGauge = (sRestrictionFlags[i].flags1 & 0xC0) >> 6;
interfaceCtx->restrictions.bButton = (sRestrictionFlags[i].flags1 & 0x30) >> 4;
interfaceCtx->restrictions.aButton = (sRestrictionFlags[i].flags1 & 0x0C) >> 2;
interfaceCtx->restrictions.bottles = (sRestrictionFlags[i].flags1 & 0x03) >> 0;
interfaceCtx->restrictions.tradeItems = (sRestrictionFlags[i].flags2 & 0xC0) >> 6;
interfaceCtx->restrictions.hookshot = (sRestrictionFlags[i].flags2 & 0x30) >> 4;
interfaceCtx->restrictions.ocarina = (sRestrictionFlags[i].flags2 & 0x0C) >> 2;
interfaceCtx->restrictions.warpSongs = (sRestrictionFlags[i].flags2 & 0x03) >> 0;
interfaceCtx->restrictions.sunsSong = (sRestrictionFlags[i].flags3 & 0xC0) >> 6;
interfaceCtx->restrictions.farores = (sRestrictionFlags[i].flags3 & 0x30) >> 4;
interfaceCtx->restrictions.dinsNayrus = (sRestrictionFlags[i].flags3 & 0x0C) >> 2;
interfaceCtx->restrictions.all = (sRestrictionFlags[i].flags3 & 0x03) >> 0;
osSyncPrintf(VT_FGCOL(YELLOW));
Format all src C files
2020-03-22 21:19:43 +00:00
osSyncPrintf("parameter->button_status = %x,%x,%x\n", sRestrictionFlags[i].flags1,
sRestrictionFlags[i].flags2, sRestrictionFlags[i].flags3);
osSyncPrintf("h_gage=%d, b_button=%d, a_button=%d, c_bottle=%d\n", interfaceCtx->restrictions.hGauge,
interfaceCtx->restrictions.bButton, interfaceCtx->restrictions.aButton,
interfaceCtx->restrictions.bottles);
osSyncPrintf("c_warasibe=%d, c_hook=%d, c_ocarina=%d, c_warp=%d\n", interfaceCtx->restrictions.tradeItems,
interfaceCtx->restrictions.hookshot, interfaceCtx->restrictions.ocarina,
interfaceCtx->restrictions.warpSongs);
osSyncPrintf("c_sunmoon=%d, m_wind=%d, m_magic=%d, another=%d\n", interfaceCtx->restrictions.sunsSong,
interfaceCtx->restrictions.farores, interfaceCtx->restrictions.dinsNayrus,
interfaceCtx->restrictions.all);
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_RST);
return;
}
i++;
Format all src C files
2020-03-22 21:19:43 +00:00
} while (sRestrictionFlags[i].scene != 0xFF);
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
Gfx* Gfx_TextureIA8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop,
s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) {
Format all src C files
2020-03-22 21:19:43 +00:00
gDPLoadTextureBlock(displayListHead++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, textureWidth, textureHeight, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
G_TX_NOLOD);
gSPTextureRectangle(displayListHead++, rectLeft * 4, rectTop * 4, (rectLeft + rectWidth) * 4,
(rectTop + rectHeight) * 4, G_TX_RENDERTILE, 0, 0, dsdx, dtdy);
First proper commit.
2020-03-17 04:31:30 +00:00
return displayListHead;
}
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
Gfx* Gfx_TextureI8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop,
s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) {
Format all src C files
2020-03-22 21:19:43 +00:00
gDPLoadTextureBlock(displayListHead++, texture, G_IM_FMT_I, G_IM_SIZ_8b, textureWidth, textureHeight, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
G_TX_NOLOD);
gSPTextureRectangle(displayListHead++, rectLeft * 4, rectTop * 4, (rectLeft + rectWidth) * 4,
(rectTop + rectHeight) * 4, G_TX_RENDERTILE, 0, 0, dsdx, dtdy);
First proper commit.
2020-03-17 04:31:30 +00:00
return displayListHead;
}
#ifdef NON_MATCHING
// regalloc differences
Format all src C files
2020-03-22 21:19:43 +00:00
void Inventory_SwapAgeEquipment(void) {
First proper commit.
2020-03-17 04:31:30 +00:00
s16 i;
u16 temp;
Format all src C files
2020-03-22 21:19:43 +00:00
if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
for (i = 0; i < 4; i++) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (i != 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.childEquips.buttonItems[i] = gSaveContext.equips.buttonItems[i];
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.childEquips.buttonItems[i] = ITEM_SWORD_KOKIRI;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (i != 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.childEquips.cButtonSlots[i - 1] = gSaveContext.equips.cButtonSlots[i - 1];
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.childEquips.equipment = gSaveContext.equips.equipment;
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.adultEquips.buttonItems[0] == ITEM_NONE) {
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.items[SLOT_NUT] != ITEM_NONE) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[1] = ITEM_NUT;
gSaveContext.equips.cButtonSlots[0] = SLOT_NUT;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.cButtonSlots[0] = SLOT_NONE;
gSaveContext.equips.buttonItems[1] = ITEM_NONE;
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[2] = ITEM_BOMB;
gSaveContext.equips.cButtonSlots[1] = SLOT_BOMB;
gSaveContext.equips.cButtonSlots[2] = SLOT_OCARINA;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.equips.equipment = 0x1122;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[3] = gSaveContext.items[SLOT_OCARINA];
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
for (i = 0; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[i] = gSaveContext.adultEquips.buttonItems[i];
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (i != 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.cButtonSlots[i - 1] = gSaveContext.adultEquips.cButtonSlots[i - 1];
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_POE)) ||
((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.cButtonSlots[i - 1]);
gSaveContext.equips.buttonItems[i] = gSaveContext.items[gSaveContext.equips.cButtonSlots[i - 1]];
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.equipment = gSaveContext.adultEquips.equipment;
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
for (i = 0; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.adultEquips.buttonItems[i] = gSaveContext.equips.buttonItems[i];
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (i != 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.adultEquips.cButtonSlots[i - 1] = gSaveContext.equips.cButtonSlots[i - 1];
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.adultEquips.equipment = gSaveContext.equips.equipment;
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.childEquips.buttonItems[0] != ITEM_NONE) {
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 0; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[i] = gSaveContext.childEquips.buttonItems[i];
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (i != 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.cButtonSlots[i - 1] = gSaveContext.childEquips.cButtonSlots[i - 1];
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (((gSaveContext.equips.buttonItems[i] >= ITEM_BOTTLE) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_POE)) ||
((gSaveContext.equips.buttonItems[i] >= ITEM_WEIRD_EGG) &&
(gSaveContext.equips.buttonItems[i] <= ITEM_CLAIM_CHECK))) {
osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.cButtonSlots[i - 1]);
gSaveContext.equips.buttonItems[i] = gSaveContext.items[gSaveContext.equips.cButtonSlots[i - 1]];
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.equipment = gSaveContext.childEquips.equipment;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.equips.equipment &= 0xFFF0;
gSaveContext.equips.equipment |= 0x0001;
}
}
temp = gEquipMasks[EQUIP_SHIELD] & gSaveContext.equips.equipment;
Format all src C files
2020-03-22 21:19:43 +00:00
if (temp != 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
temp >>= gEquipShifts[EQUIP_SHIELD];
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (!(gBitFlags[temp + 3] & gSaveContext.equipment)) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.equips.equipment &= gEquipNegMasks[EQUIP_SHIELD];
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Inventory_SwapAgeEquipment.s")
#endif
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_InitHorsebackArchery(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.minigameState = 1;
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->unk_23C = interfaceCtx->unk_240 = interfaceCtx->unk_242 = 0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.minigameScore = sHBAScoreTier = 0;
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->hbaAmmo = 20;
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_800849EC(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.equipment |= gBitFlags[2] << gEquipShifts[0];
gSaveContext.equipment ^= 8 << gEquipShifts[0];
Format all src C files
2020-03-22 21:19:43 +00:00
if (gBitFlags[3] & gSaveContext.equipment) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_LoadItemIcon1(GlobalContext* globalCtx, u16 button) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK);
DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, (u32)interfaceCtx->icon_itemSegment + button * 0x1000,
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
(u32)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000),
First proper commit.
2020-03-17 04:31:30 +00:00
0x1000, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 1171);
osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_LoadItemIcon2(GlobalContext* globalCtx, u16 button) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK);
DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_180, (u32)interfaceCtx->icon_itemSegment + button * 0x1000,
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
(u32)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000),
First proper commit.
2020-03-17 04:31:30 +00:00
0x1000, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 1193);
osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_80084BF4(GlobalContext* globalCtx, u16 flag) {
if (flag) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT) ||
(gSaveContext.equips.buttonItems[0] == ITEM_BOW) || (gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU) ||
(gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE) ||
(gSaveContext.buttonStatus[0] == BTN_DISABLED)) {
if ((gSaveContext.equips.buttonItems[0] == ITEM_SLINGSHOT) ||
(gSaveContext.equips.buttonItems[0] == ITEM_BOW) ||
(gSaveContext.equips.buttonItems[0] == ITEM_BOMBCHU) ||
(gSaveContext.equips.buttonItems[0] == ITEM_FISHING_POLE)) {
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
} else if (gSaveContext.equips.buttonItems[0] == ITEM_NONE) {
if ((gSaveContext.equips.buttonItems[0] != ITEM_NONE) || (gSaveContext.infTable[29] == 0)) {
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
}
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
gSaveContext.buttonStatus[3] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_ChangeAlpha(7);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[0] = gSaveContext.buttonStatus[1] = gSaveContext.buttonStatus[2] =
gSaveContext.buttonStatus[3] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
func_80083108(globalCtx);
}
}
s16 sAmmoRefillCounts[] = { 5, 10, 20, 30, 5, 10, 30, 0, 5, 20, 1, 5, 20, 50, 200, 10 };
#ifdef NON_MATCHING
// regalloc, minor ordering and stack usage differences
Format all src C files
2020-03-22 21:19:43 +00:00
u8 Item_Give(GlobalContext* globalCtx, u8 item) {
First proper commit.
2020-03-17 04:31:30 +00:00
s16 i;
s16 slot;
s16 oldItem;
s16 bottleSlot;
s16 prevTradeItem;
s8 bombCount;
slot = SLOT(item);
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (item >= ITEM_STICKS_5) {
First proper commit.
2020-03-17 04:31:30 +00:00
slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_FGCOL(YELLOW));
osSyncPrintf("item_get_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.items[slot]);
osSyncPrintf(VT_RST);
Format all src C files
2020-03-22 21:19:43 +00:00
if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.questItems |= gBitFlags[item - ITEM_MEDALLION_FOREST + QUEST_MEDALLION_FOREST];
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "Seals = %x"
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
osSyncPrintf("封印 = %x\n", gSaveContext.questItems);
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_RST);
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (item == ITEM_MEDALLION_WATER) {
First proper commit.
2020-03-17 04:31:30 +00:00
func_8006D0AC(globalCtx);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_SONG_MINUET) && (item <= ITEM_SONG_STORMS)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.questItems |= gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET];
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "Musical scores = %x"
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
osSyncPrintf("楽譜 = %x\n", gSaveContext.questItems);
First proper commit.
2020-03-17 04:31:30 +00:00
// Translates to: "Musical scores = %x (%x) (%x)"
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
osSyncPrintf("楽譜 = %x (%x) (%x)\n", gSaveContext.questItems,
gBitFlags[item - ITEM_SONG_MINUET + QUEST_SONG_MINUET], gBitFlags[item - ITEM_SONG_MINUET]);
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_RST);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_KOKIRI_EMERALD) && (item <= ITEM_ZORA_SAPPHIRE)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.questItems |= gBitFlags[item - ITEM_KOKIRI_EMERALD + QUEST_KOKIRI_EMERALD];
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "Spiritual Stones = %x"
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
osSyncPrintf("精霊石 = %x\n", gSaveContext.questItems);
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_RST);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_STONE_OF_AGONY) || (item == ITEM_GERUDO_CARD)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.questItems |= gBitFlags[item - ITEM_STONE_OF_AGONY + QUEST_STONE_OF_AGONY];
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "Items = %x"
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
osSyncPrintf("アイテム = %x\n", gSaveContext.questItems);
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_RST);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_SKULL_TOKEN) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.questItems |= gBitFlags[item - ITEM_SKULL_TOKEN + QUEST_SKULL_TOKEN];
gSaveContext.gsTokens++;
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "N Coins = %x(%d)"
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
osSyncPrintf("Ｎコイン = %x(%d)\n", gSaveContext.questItems, gSaveContext.gsTokens);
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_RST);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BGS)) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.equipment |= gBitFlags[item - ITEM_SWORD_KOKIRI] << gEquipShifts[EQUIP_SWORD];
Format all src C files
2020-03-22 21:19:43 +00:00
if (item == ITEM_SWORD_BGS) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.bgsHitsLeft = 8;
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (ALL_EQUIP_VALUE(EQUIP_SWORD) == 0xF) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.equipment ^= 8 << gEquipShifts[EQUIP_SWORD];
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[0] == ITEM_SWORD_KNIFE) {
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 0);
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_SWORD_MASTER) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.equips.equipment &= 0xFFF0;
gSaveContext.equips.equipment |= 0x0002;
Interface_LoadItemIcon1(globalCtx, 0);
}
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_SHIELD_DEKU) && (item <= ITEM_SHIELD_MIRROR)) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.equipment |= (gBitFlags[item - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_SHIELD]);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_TUNIC_KOKIRI) && (item <= ITEM_TUNIC_ZORA)) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.equipment |= (gBitFlags[item - ITEM_TUNIC_KOKIRI] << gEquipShifts[EQUIP_TUNIC]);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_BOOTS_KOKIRI) && (item <= ITEM_BOOTS_HOVER)) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.equipment |= (gBitFlags[item - ITEM_BOOTS_KOKIRI] << gEquipShifts[EQUIP_BOOTS]);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) {
Decompile z_map_exp.c (2 non matchings left) (#104) Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 15:09:20 +00:00
gSaveContext.dungeonItems[gSaveContext.mapIndex] |= gBitFlags[item - ITEM_KEY_BOSS];
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_KEY_SMALL) {
Decompile z_map_exp.c (2 non matchings left) (#104) Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 15:09:20 +00:00
if (gSaveContext.dungeonKeys[gSaveContext.mapIndex] < 0) {
gSaveContext.dungeonKeys[gSaveContext.mapIndex] = 1;
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_map_exp.c (2 non matchings left) (#104) Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 15:09:20 +00:00
gSaveContext.dungeonKeys[gSaveContext.mapIndex]++;
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_QUIVER_30) || (item == ITEM_BOW)) {
if (CUR_UPG_VALUE(UPG_QUIVER) == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_QUIVER, 1);
INV_CONTENT(ITEM_BOW) = ITEM_BOW;
AMMO(ITEM_BOW) = CAPACITY(UPG_QUIVER, 1);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOW)++;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (AMMO(ITEM_BOW) > CUR_CAPACITY(UPG_QUIVER)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_QUIVER_40) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_QUIVER, 2);
AMMO(ITEM_BOW) = CAPACITY(UPG_QUIVER, 2);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_QUIVER_50) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_QUIVER, 3);
AMMO(ITEM_BOW) = CAPACITY(UPG_QUIVER, 3);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BULLET_BAG_40) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_BULLET_BAG, 2);
AMMO(ITEM_SLINGSHOT) = CAPACITY(UPG_BULLET_BAG, 2);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BULLET_BAG_50) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_BULLET_BAG, 3);
AMMO(ITEM_SLINGSHOT) = CAPACITY(UPG_BULLET_BAG, 3);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BOMB_BAG_20) {
if (CUR_UPG_VALUE(UPG_BOMB_BAG) == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_BOMB_BAG, 1);
INV_CONTENT(ITEM_BOMB) = ITEM_BOMB;
AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 1);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMB)++;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (AMMO(ITEM_BOMB) > CUR_CAPACITY(UPG_BOMB_BAG)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BOMB_BAG_30) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_BOMB_BAG, 2);
AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 2);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BOMB_BAG_40) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_BOMB_BAG, 3);
AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 3);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BRACELET) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_STRENGTH, 1);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_GAUNTLETS_SILVER) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_STRENGTH, 2);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_GAUNTLETS_GOLD) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_STRENGTH, 3);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_SCALE_SILVER) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_SCALE, 1);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_SCALE_GOLDEN) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_SCALE, 2);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_WALLET_ADULT) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_WALLET, 1);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_WALLET_GIANT) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_WALLET, 2);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_STICK_UPGRADE_20) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
INV_CONTENT(ITEM_STICK) = ITEM_STICK;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_STICKS, 2);
AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 2);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_STICK_UPGRADE_30) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
INV_CONTENT(ITEM_STICK) = ITEM_STICK;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_STICKS, 3);
AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 3);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_NUT_UPGRADE_30) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
INV_CONTENT(ITEM_NUT) = ITEM_NUT;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_NUTS, 2);
AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 2);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_NUT_UPGRADE_40) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
INV_CONTENT(ITEM_NUT) = ITEM_NUT;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_NUTS, 3);
AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 3);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_LONGSHOT) {
First proper commit.
2020-03-17 04:31:30 +00:00
INV_CONTENT(item) = item;
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[i] == ITEM_HOOKSHOT) {
gSaveContext.equips.buttonItems[i] = ITEM_LONGSHOT;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, i);
}
}
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_STICK) {
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_STICKS, 1);
AMMO(ITEM_STICK) = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_STICK)++;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_STICKS_5) || (item == ITEM_STICKS_10)) {
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_STICKS, 1);
AMMO(ITEM_STICK) = sAmmoRefillCounts[item - ITEM_STICKS_5];
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_STICK) += sAmmoRefillCounts[item - ITEM_STICKS_5];
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
item = ITEM_STICK;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_NUT) {
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_NUTS, 1);
AMMO(ITEM_NUT) = ITEM_NUT;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_NUT)++;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_NUTS_5) || (item == ITEM_NUTS_10)) {
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_NUTS, 1);
AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5];
// Translates to: "Deku Nuts %d(%d)=%d BS_count=%d"
Format all src C files
2020-03-22 21:19:43 +00:00
osSyncPrintf("デクの実 %d(%d)=%d BS_count=%d\n", item, ITEM_NUTS_5, item - ITEM_NUTS_5,
sAmmoRefillCounts[item - ITEM_NUTS_5]);
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5];
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
item = ITEM_NUT;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BOMB) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Translates to: "Bomb Bomb Bomb Bomb Bomb Bomb Bomb"
osSyncPrintf(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n");
bombCount = AMMO(ITEM_BOMB) + 1;
AMMO(ITEM_BOMB) = bombCount;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (bombCount > CUR_CAPACITY(UPG_BOMB_BAG)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_BOMBS_5) && (item <= ITEM_BOMBS_30)) {
First proper commit.
2020-03-17 04:31:30 +00:00
bombCount = AMMO(ITEM_BOMB) + sAmmoRefillCounts[item - ITEM_BOMBS_5];
AMMO(ITEM_BOMB) = bombCount;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (bombCount > CUR_CAPACITY(UPG_BOMB_BAG)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BOMBCHU) {
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU;
AMMO(ITEM_BOMBCHU) = 10;
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMBCHU) += 10;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (AMMO(ITEM_BOMBCHU) > 50) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMBCHU) = 50;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_BOMBCHUS_5) || (item == ITEM_BOMBCHUS_20)) {
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU;
AMMO(ITEM_BOMBCHU) += sAmmoRefillCounts[item - ITEM_BOMBCHUS_5 + 8];
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMBCHU) += sAmmoRefillCounts[item - ITEM_BOMBCHUS_5 + 8];
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (AMMO(ITEM_BOMBCHU) > 50) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMBCHU) = 50;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_ARROWS_SMALL) && (item <= ITEM_ARROWS_LARGE)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOW) += sAmmoRefillCounts[item - ITEM_ARROWS_SMALL + 4];
Run formatter with changes
2020-03-23 23:11:21 +00:00
if ((AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) || (AMMO(ITEM_BOW) < 0)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf("%d本 Item_MaxGet=%d\n", AMMO(ITEM_BOW), CUR_CAPACITY(UPG_QUIVER));
return ITEM_BOW;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_SLINGSHOT) {
First proper commit.
2020-03-17 04:31:30 +00:00
Inventory_ChangeUpgrade(UPG_BULLET_BAG, 1);
INV_CONTENT(ITEM_SLINGSHOT) = ITEM_SLINGSHOT;
AMMO(ITEM_SLINGSHOT) = 30;
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_SEEDS) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_SLINGSHOT) += 5;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (!(gSaveContext.itemGetInf[1] & 8)) {
gSaveContext.itemGetInf[1] |= 8;
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
}
return ITEM_SEEDS;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_SEEDS_30) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_SLINGSHOT) += 30;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (!(gSaveContext.itemGetInf[1] & 8)) {
gSaveContext.itemGetInf[1] |= 8;
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
}
return ITEM_SEEDS;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_OCARINA_FAIRY) {
First proper commit.
2020-03-17 04:31:30 +00:00
INV_CONTENT(ITEM_OCARINA_FAIRY) = ITEM_OCARINA_FAIRY;
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_OCARINA_TIME) {
First proper commit.
2020-03-17 04:31:30 +00:00
INV_CONTENT(ITEM_OCARINA_TIME) = ITEM_OCARINA_TIME;
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[i] == ITEM_OCARINA_FAIRY) {
gSaveContext.equips.buttonItems[i] = ITEM_OCARINA_TIME;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, i);
}
}
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BEAN) {
if (gSaveContext.items[slot] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
INV_CONTENT(item) = item;
AMMO(ITEM_BEAN) = 1;
BEANS_BOUGHT = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BEAN)++;
BEANS_BOUGHT++;
}
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_HEART_PIECE_2) || (item == ITEM_HEART_PIECE)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.questItems += (1 << QUEST_HEART_PIECE);
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_HEART_CONTAINER) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.healthCapacity += 0x10;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.health += 0x10;
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_HEART) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Translates to: "Recovery Heart"
osSyncPrintf("回復ハート回復ハート回復ハート\n");
Health_ChangeBy(globalCtx, 0x10);
return item;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_MAGIC_SMALL) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.unk_13F0 != 10) {
First proper commit.
2020-03-17 04:31:30 +00:00
func_80087680(globalCtx);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
func_80087708(globalCtx, 12, 5);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (!(gSaveContext.infTable[25] & 0x100)) {
gSaveContext.infTable[25] |= 0x100;
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
}
return item;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_MAGIC_LARGE) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.unk_13F0 != 10) {
First proper commit.
2020-03-17 04:31:30 +00:00
func_80087680(globalCtx);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
func_80087708(globalCtx, 24, 5);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (!(gSaveContext.infTable[25] & 0x100)) {
gSaveContext.infTable[25] |= 0x100;
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
}
return item;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_RUPEE_GREEN) && (item <= ITEM_INVALID_8)) {
First proper commit.
2020-03-17 04:31:30 +00:00
Rupees_ChangeBy(sAmmoRefillCounts[item - ITEM_RUPEE_GREEN + 10]);
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BOTTLE) {
for (i = 0; i < 4; i++) {
if (gSaveContext.items[SLOT(item) + i] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.items[SLOT(item) + i] = item;
return ITEM_NONE;
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (((item >= ITEM_POTION_RED) && (item <= ITEM_POE)) || (item == ITEM_MILK)) {
First proper commit.
2020-03-17 04:31:30 +00:00
bottleSlot = SLOT(item);
Format all src C files
2020-03-22 21:19:43 +00:00
if ((item != ITEM_MILK_BOTTLE) && (item != ITEM_LETTER_RUTO)) {
if (item == ITEM_MILK) {
First proper commit.
2020-03-17 04:31:30 +00:00
item = ITEM_MILK_BOTTLE;
bottleSlot = SLOT(item);
}
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 0; i < 4; i++) {
if (gSaveContext.items[bottleSlot + i] == ITEM_BOTTLE) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Translates to: "Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d Empty Bottle=%d Content=%d"
osSyncPrintf("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d 空瓶=%d 中味=%d\n",
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.cButtonSlots[0], gSaveContext.equips.cButtonSlots[1],
gSaveContext.equips.cButtonSlots[2], bottleSlot + i, item);
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((bottleSlot + i) == gSaveContext.equips.cButtonSlots[0]) {
gSaveContext.equips.buttonItems[1] = item;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon2(globalCtx, 1);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[1] = BTN_ENABLED;
} else if ((bottleSlot + i) == gSaveContext.equips.cButtonSlots[1]) {
gSaveContext.equips.buttonItems[2] = item;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon2(globalCtx, 2);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[2] = BTN_ENABLED;
} else if ((bottleSlot + i) == gSaveContext.equips.cButtonSlots[2]) {
gSaveContext.equips.buttonItems[3] = item;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, 3);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[3] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
gSaveContext.items[bottleSlot + i] = item;
return ITEM_NONE;
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
for (i = 0; i < 4; i++) {
if (gSaveContext.items[bottleSlot + i] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.items[bottleSlot + i] = item;
return ITEM_NONE;
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (item == ITEM_SAW) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.itemGetInf[1] |= 0x8000;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
prevTradeItem = INV_CONTENT(item);
INV_CONTENT(item) = item;
Format all src C files
2020-03-22 21:19:43 +00:00
if (prevTradeItem != ITEM_NONE) {
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (prevTradeItem == gSaveContext.equips.buttonItems[i]) {
Format all src C files
2020-03-22 21:19:43 +00:00
if (item != ITEM_SOLD_OUT) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[i] = item;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, i);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[i] = ITEM_NONE;
First proper commit.
2020-03-17 04:31:30 +00:00
}
return ITEM_NONE;
}
}
}
return ITEM_NONE;
}
oldItem = gSaveContext.items[slot];
osSyncPrintf("Item_Register(%d)=%d %d\n", slot, item, oldItem);
INV_CONTENT(item) = item;
return oldItem;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Item_Give.s")
#endif
Format all src C files
2020-03-22 21:19:43 +00:00
u8 Item_CheckObtainability(u8 item) {
First proper commit.
2020-03-17 04:31:30 +00:00
s16 i;
s16 slot;
s32 bottleSlot;
slot = SLOT(item);
Format all src C files
2020-03-22 21:19:43 +00:00
if (item >= ITEM_STICKS_5) {
First proper commit.
2020-03-17 04:31:30 +00:00
slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]);
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf(VT_FGCOL(GREEN));
osSyncPrintf("item_get_non_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.items[slot]);
osSyncPrintf(VT_RST);
Format all src C files
2020-03-22 21:19:43 +00:00
if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_KOKIRI_EMERALD) && (item <= ITEM_SKULL_TOKEN)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BGS)) {
if (item == ITEM_SWORD_BGS) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((gBitFlags[item - ITEM_SWORD_KOKIRI] << gEquipShifts[EQUIP_SWORD]) & gSaveContext.equipment) {
First proper commit.
2020-03-17 04:31:30 +00:00
return item;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if ((item >= ITEM_SHIELD_DEKU) && (item <= ITEM_SHIELD_MIRROR)) {
if ((gBitFlags[item - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_SHIELD]) & gSaveContext.equipment) {
First proper commit.
2020-03-17 04:31:30 +00:00
return item;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if ((item >= ITEM_TUNIC_KOKIRI) && (item <= ITEM_TUNIC_ZORA)) {
if ((gBitFlags[item - ITEM_TUNIC_KOKIRI] << gEquipShifts[EQUIP_TUNIC]) & gSaveContext.equipment) {
First proper commit.
2020-03-17 04:31:30 +00:00
return item;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if ((item >= ITEM_BOOTS_KOKIRI) && (item <= ITEM_BOOTS_HOVER)) {
if ((gBitFlags[item - ITEM_BOOTS_KOKIRI] << gEquipShifts[EQUIP_BOOTS]) & gSaveContext.equipment) {
First proper commit.
2020-03-17 04:31:30 +00:00
return item;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_KEY_SMALL) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_SLINGSHOT) && (item <= ITEM_BOMBCHU)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_BOMBCHUS_5) || (item == ITEM_BOMBCHUS_20)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_QUIVER_30) || (item == ITEM_BOW)) {
if (CUR_UPG_VALUE(UPG_QUIVER) == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if ((item == ITEM_QUIVER_40) || (item == ITEM_QUIVER_50)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_BULLET_BAG_40) || (item == ITEM_BULLET_BAG_50)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_BOMB_BAG_20) || (item == ITEM_BOMB)) {
if (CUR_UPG_VALUE(UPG_BOMB_BAG) == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if ((item >= ITEM_STICK_UPGRADE_20) && (item <= ITEM_NUT_UPGRADE_40)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_BOMB_BAG_30) && (item <= ITEM_WALLET_GIANT)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_LONGSHOT) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_SEEDS) || (item == ITEM_SEEDS_30)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (!(gSaveContext.itemGetInf[1] & 0x8)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_SEEDS;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if (item == ITEM_BEAN) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_HEART_PIECE_2) || (item == ITEM_HEART_PIECE)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_HEART_CONTAINER) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_HEART) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_HEART;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Translates to: "Magic Pot Get_Inf_Table( 25, 0x0100)=%d"
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", gSaveContext.infTable[25] & 0x100);
if (!(gSaveContext.infTable[25] & 0x100)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return item;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if ((item >= ITEM_RUPEE_GREEN) && (item <= ITEM_INVALID_8)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (item == ITEM_BOTTLE) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (((item >= ITEM_POTION_RED) && (item <= ITEM_POE)) || (item == ITEM_MILK)) {
First proper commit.
2020-03-17 04:31:30 +00:00
bottleSlot = SLOT(item);
Format all src C files
2020-03-22 21:19:43 +00:00
if ((item != ITEM_MILK_BOTTLE) && (item != ITEM_LETTER_RUTO)) {
if (item == ITEM_MILK) {
First proper commit.
2020-03-17 04:31:30 +00:00
item = ITEM_MILK_BOTTLE;
bottleSlot = SLOT(item);
}
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 0; i < 4; i++) {
if (gSaveContext.items[bottleSlot + i] == ITEM_BOTTLE) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
for (i = 0; i < 4; i++) {
if (gSaveContext.items[bottleSlot + i] == ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) {
First proper commit.
2020-03-17 04:31:30 +00:00
return ITEM_NONE;
}
return gSaveContext.items[slot];
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Inventory_DeleteItem(u16 item, u16 invSlot) {
First proper commit.
2020-03-17 04:31:30 +00:00
s16 i;
Format all src C files
2020-03-22 21:19:43 +00:00
if (item == ITEM_BEAN) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
BEANS_BOUGHT = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.items[invSlot] = ITEM_NONE;
osSyncPrintf("\nItem_Register(%d)\n", invSlot, gSaveContext.items[invSlot]);
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[i] == item) {
gSaveContext.equips.buttonItems[i] = ITEM_NONE;
gSaveContext.equips.cButtonSlots[i - 1] = SLOT_NONE;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
#ifdef NON_MATCHING
// regalloc differences
Format all src C files
2020-03-22 21:19:43 +00:00
s32 Inventory_ReplaceItem(GlobalContext* globalCtx, u16 oldItem, u16 newItem) {
First proper commit.
2020-03-17 04:31:30 +00:00
s16 i;
s16 j;
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 0; i < ARRAY_COUNT(gSaveContext.items); i++) {
if (gSaveContext.items[i] == oldItem) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.items[i] = newItem;
// Translates to: "Item Purge (%d)"
osSyncPrintf("アイテム消去(%d)", i);
Format all src C files
2020-03-22 21:19:43 +00:00
for (j = 1; j < 4; j++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[j] == oldItem) {
gSaveContext.equips.buttonItems[j] = newItem;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, j);
break;
}
}
return 1;
}
}
return 0;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Inventory_ReplaceItem.s")
#endif
Format all src C files
2020-03-22 21:19:43 +00:00
s32 Inventory_HasEmptyBottle(void) {
First proper commit.
2020-03-17 04:31:30 +00:00
u8* items = gSaveContext.items;
Format all src C files
2020-03-22 21:19:43 +00:00
if (items[SLOT_BOTTLE_1] == ITEM_BOTTLE) {
First proper commit.
2020-03-17 04:31:30 +00:00
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (items[SLOT_BOTTLE_2] == ITEM_BOTTLE) {
First proper commit.
2020-03-17 04:31:30 +00:00
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (items[SLOT_BOTTLE_3] == ITEM_BOTTLE) {
First proper commit.
2020-03-17 04:31:30 +00:00
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (items[SLOT_BOTTLE_4] == ITEM_BOTTLE) {
First proper commit.
2020-03-17 04:31:30 +00:00
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
s32 Inventory_HasSpecificBottle(u8 bottleItem) {
First proper commit.
2020-03-17 04:31:30 +00:00
u8* items = gSaveContext.items;
Format all src C files
2020-03-22 21:19:43 +00:00
if (items[SLOT_BOTTLE_1] == bottleItem) {
First proper commit.
2020-03-17 04:31:30 +00:00
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (items[SLOT_BOTTLE_2] == bottleItem) {
First proper commit.
2020-03-17 04:31:30 +00:00
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (items[SLOT_BOTTLE_3] == bottleItem) {
First proper commit.
2020-03-17 04:31:30 +00:00
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (items[SLOT_BOTTLE_4] == bottleItem) {
First proper commit.
2020-03-17 04:31:30 +00:00
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
#ifdef NON_MATCHING
// save context pointer isn't reused after Interface_LoadItemIcon1 when it should be
Format all src C files
2020-03-22 21:19:43 +00:00
void Inventory_UpdateBottleItem(GlobalContext* globalCtx, u8 item, u8 cButton) {
osSyncPrintf("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", item, cButton,
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.cButtonSlots[cButton - 1],
gSaveContext.items[gSaveContext.equips.cButtonSlots[cButton - 1]]);
First proper commit.
2020-03-17 04:31:30 +00:00
// Special case to only empty half of a Lon Lon Milk Bottle
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.items[gSaveContext.equips.cButtonSlots[cButton - 1]] == ITEM_MILK_BOTTLE) &&
Run formatter with changes
2020-03-23 23:11:21 +00:00
(item == ITEM_BOTTLE)) {
First proper commit.
2020-03-17 04:31:30 +00:00
item = ITEM_MILK_HALF;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.items[gSaveContext.equips.cButtonSlots[cButton - 1]] = item;
gSaveContext.equips.buttonItems[cButton] = item;
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (1) {} // Improves codegen but may not be necessary
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, cButton);
globalCtx->pauseCtx.unk_23E = item;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.buttonStatus[0] = BTN_ENABLED;
First proper commit.
2020-03-17 04:31:30 +00:00
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Inventory_UpdateBottleItem.s")
#endif
#ifdef NON_MATCHING
// mostly regalloc, minor ordering, and stack usage differences
Format all src C files
2020-03-22 21:19:43 +00:00
s32 Inventory_ConsumeFairy(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
s32 bottleSlot;
s16 i;
s16 j;
bottleSlot = SLOT(ITEM_FAIRY);
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 0; i < 4; i++) {
if (gSaveContext.items[bottleSlot + i] == ITEM_FAIRY) {
for (j = 1; j < 4; j++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[j] == ITEM_FAIRY) {
gSaveContext.equips.buttonItems[j] = ITEM_BOTTLE;
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, j);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
bottleSlot = gSaveContext.equips.cButtonSlots[j - 1];
First proper commit.
2020-03-17 04:31:30 +00:00
break;
}
}
// Translates to: "Fairy Usage＝%d"
osSyncPrintf("妖精使用＝%d\n", bottleSlot);
gSaveContext.items[bottleSlot] = ITEM_BOTTLE;
return 1;
}
}
return 0;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Inventory_ConsumeFairy.s")
#endif
Format all src C files
2020-03-22 21:19:43 +00:00
void func_80086D5C(s32* buf, u16 size) {
First proper commit.
2020-03-17 04:31:30 +00:00
u16 i;
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 0; i < size; i++) {
First proper commit.
2020-03-17 04:31:30 +00:00
buf[i] = 0;
}
}
u32 sDoActionTextures[] = { 0x07000000, 0x07000180 };
#ifdef NON_MATCHING
// 0x80000000 is reused in the 2 *_TO_VIRTUAL macros when it shouldn't
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 arg2) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (action >= 0x1D) {
First proper commit.
2020-03-17 04:31:30 +00:00
action = 0x0A;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.language != 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
action += 0x1D;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.language == 2) {
First proper commit.
2020-03-17 04:31:30 +00:00
action += 0x1D;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((action != 0x0A) && (action != 0x27) && (action != 0x44)) {
First proper commit.
2020-03-17 04:31:30 +00:00
osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK);
DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, (u32)interfaceCtx->do_actionSegment + (arg2 * 0x180),
Format all src C files
2020-03-22 21:19:43 +00:00
(u32)_do_action_staticSegmentRomStart + (action * 0x180), 0x180, 0,
&interfaceCtx->loadQueue, NULL, "../z_parameter.c", 2145);
First proper commit.
2020-03-17 04:31:30 +00:00
osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
gSegments[7] = PHYSICAL_TO_VIRTUAL(interfaceCtx->do_actionSegment);
func_80086D5C(SEGMENTED_TO_VIRTUAL(sDoActionTextures[arg2]), 0x180 / 4);
}
}
#else
void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 arg2);
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_LoadActionLabel.s")
#endif
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_SetDoAction(GlobalContext* globalCtx, u16 action) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
PauseContext* pauseCtx = &globalCtx->pauseCtx;
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->unk_1F0 != action) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->unk_1F0 = action;
interfaceCtx->unk_1EC = 1;
interfaceCtx->unk_1F4 = 0.0f;
Interface_LoadActionLabel(interfaceCtx, action, 1);
Format all src C files
2020-03-22 21:19:43 +00:00
if (pauseCtx->state != 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->unk_1EC = 3;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
Format all src C files
2020-03-22 21:19:43 +00:00
if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && !interfaceCtx->naviCalling &&
(globalCtx->csCtx.state == 0)) {
Add comments and macros to prevent match issues with formatting
2020-03-18 21:18:25 +00:00
// clang-format off
Decompile z_map_exp.c (2 non matchings left) (#104) Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 15:09:20 +00:00
if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8); }
Add comments and macros to prevent match issues with formatting
2020-03-18 21:18:25 +00:00
// clang-format on
Format all src C files
2020-03-22 21:19:43 +00:00
if (naviCallState == 0x1D) {
Add comments and macros to prevent match issues with formatting
2020-03-18 21:18:25 +00:00
func_800F4524(&D_801333D4, NA_SE_VO_NA_HELLO_2, 32);
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->naviCalling = 1;
sCUpInvisible = 0;
sCUpTimer = 10;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((naviCallState == 0x1F) && interfaceCtx->naviCalling) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->naviCalling = 0;
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_LoadActionLabelB(GlobalContext* globalCtx, u16 action) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.language != 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
action += 0x1D;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.language == 2) {
First proper commit.
2020-03-17 04:31:30 +00:00
action += 0x1D;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->unk_1FC = action;
osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK);
DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, (u32)interfaceCtx->do_actionSegment + 0x180,
Format all src C files
2020-03-22 21:19:43 +00:00
(u32)_do_action_staticSegmentRomStart + (action * 0x180), 0x180, 0, &interfaceCtx->loadQueue,
NULL, "../z_parameter.c", 2228);
First proper commit.
2020-03-17 04:31:30 +00:00
osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
interfaceCtx->unk_1FA = 1;
}
Format all src C files
2020-03-22 21:19:43 +00:00
s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) {
First proper commit.
2020-03-17 04:31:30 +00:00
u16 heartCount;
u16 healthLevel;
// Translates to: "＊＊＊＊＊ Fluctuation=%d (now=%d, max=%d) ＊＊＊"
Format all src C files
2020-03-22 21:19:43 +00:00
osSyncPrintf("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", healthChange, gSaveContext.health,
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.healthCapacity);
First proper commit.
2020-03-17 04:31:30 +00:00
Add comments and macros to prevent match issues with formatting
2020-03-18 21:18:25 +00:00
// clang-format off
Decompile z_map_exp.c (2 non matchings left) (#104) Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 15:09:20 +00:00
if (healthChange > 0) { Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
} else if ((gSaveContext.doubleDefense != 0) && (healthChange < 0)) {
First proper commit.
2020-03-17 04:31:30 +00:00
healthChange >>= 1;
// Translates to: "Heart decrease halved!!＝%d"
osSyncPrintf("ハート減少半分！！＝%d\n", healthChange);
}
Add comments and macros to prevent match issues with formatting
2020-03-18 21:18:25 +00:00
// clang-format on
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.health += healthChange;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.health > gSaveContext.healthCapacity) {
gSaveContext.health = gSaveContext.healthCapacity;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
heartCount = gSaveContext.health % 0x10;
healthLevel = heartCount;
Format all src C files
2020-03-22 21:19:43 +00:00
if (heartCount != 0) {
if (heartCount > 10) {
First proper commit.
2020-03-17 04:31:30 +00:00
healthLevel = 3;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (heartCount > 5) {
First proper commit.
2020-03-17 04:31:30 +00:00
healthLevel = 2;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
healthLevel = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
// Translates to: "Life=%d ＊＊＊ %d ＊＊＊＊＊＊"
osSyncPrintf(" ライフ=%d ＊＊＊ %d ＊＊＊＊＊＊\n", gSaveContext.health, healthLevel);
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.health <= 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.health = 0;
return 0;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return 1;
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Health_GiveHearts(s16 hearts) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.healthCapacity += hearts * 0x10;
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Rupees_ChangeBy(s16 rupeeChange) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.rupeeAccumulator += rupeeChange;
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Translates to: "Item = (%d) Amount = (%d + %d)"
osSyncPrintf("アイテム = (%d) 数 = (%d + %d) ", item, AMMO(item), ammoChange);
Format all src C files
2020-03-22 21:19:43 +00:00
if (item == ITEM_STICK) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_STICK) += ammoChange;
Format all src C files
2020-03-22 21:19:43 +00:00
if (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (AMMO(ITEM_STICK) < 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_STICK) = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if (item == ITEM_NUT) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_NUT) += ammoChange;
Format all src C files
2020-03-22 21:19:43 +00:00
if (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (AMMO(ITEM_NUT) < 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_NUT) = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if (item == ITEM_BOMBCHU) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMBCHU) += ammoChange;
Format all src C files
2020-03-22 21:19:43 +00:00
if (AMMO(ITEM_BOMBCHU) >= 50) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMBCHU) = 50;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (AMMO(ITEM_BOMBCHU) < 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMBCHU) = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if (item == ITEM_BOW) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOW) += ammoChange;
Format all src C files
2020-03-22 21:19:43 +00:00
if (AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (AMMO(ITEM_BOW) < 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOW) = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if ((item == ITEM_SLINGSHOT) || (item == ITEM_SEEDS)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_SLINGSHOT) += ammoChange;
Format all src C files
2020-03-22 21:19:43 +00:00
if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG);
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (AMMO(ITEM_SLINGSHOT) < 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_SLINGSHOT) = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if (item == ITEM_BOMB) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMB) += ammoChange;
Format all src C files
2020-03-22 21:19:43 +00:00
if (AMMO(ITEM_BOMB) >= CUR_CAPACITY(UPG_BOMB_BAG)) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (AMMO(ITEM_BOMB) < 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BOMB) = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if (item == ITEM_BEAN) {
First proper commit.
2020-03-17 04:31:30 +00:00
AMMO(ITEM_BEAN) += ammoChange;
}
// Translates to: "Total = (%d)"
osSyncPrintf("合計 = (%d)\n", AMMO(item));
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_80087680(GlobalContext* globalCtx) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.magicAcquired) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F2 = gSaveContext.unk_13F0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.unk_13F6 = (gSaveContext.doubleMagic * 0x30) + 0x30;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F0 = 9;
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_800876C8(GlobalContext* globalCtx) {
if ((gSaveContext.unk_13F0 != 8) && (gSaveContext.unk_13F0 != 9)) {
if (gSaveContext.unk_13F0 == 10) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F2 = gSaveContext.unk_13F0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F0 = 5;
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (!gSaveContext.magicAcquired) {
First proper commit.
2020-03-17 04:31:30 +00:00
return 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((arg2 != 5) && (gSaveContext.magic - arg1) < 0) {
if (gSaveContext.unk_13F4 != 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
return 0;
}
Format all src C files
2020-03-22 21:19:43 +00:00
switch (arg2) {
First proper commit.
2020-03-17 04:31:30 +00:00
case 0:
case 2:
Format all src C files
2020-03-22 21:19:43 +00:00
if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) {
if (gSaveContext.unk_13F0 == 7) {
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->actorCtx.unk_03 = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F8 = gSaveContext.magic - arg1;
gSaveContext.unk_13F0 = 1;
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
return 0;
}
case 1:
Format all src C files
2020-03-22 21:19:43 +00:00
if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) {
if (gSaveContext.unk_13F0 == 7) {
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->actorCtx.unk_03 = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F8 = gSaveContext.magic - arg1;
gSaveContext.unk_13F0 = 6;
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
return 0;
}
case 3:
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.unk_13F0 == 0) {
if (gSaveContext.magic != 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->interfaceCtx.unk_230 = 80;
gSaveContext.unk_13F0 = 7;
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else {
if (gSaveContext.unk_13F0 == 7) {
First proper commit.
2020-03-17 04:31:30 +00:00
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
return 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
case 4:
Format all src C files
2020-03-22 21:19:43 +00:00
if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) {
if (gSaveContext.unk_13F0 == 7) {
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->actorCtx.unk_03 = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F8 = gSaveContext.magic - arg1;
gSaveContext.unk_13F0 = 4;
return 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
return 0;
}
case 5:
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.unk_13F4 >= gSaveContext.magic) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F8 = gSaveContext.magic + arg1;
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.unk_13F8 >= gSaveContext.unk_13F4) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F8 = gSaveContext.unk_13F4;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F0 = 10;
return 1;
}
break;
}
return 0;
}
#ifdef NON_MATCHING
// this function still needs some work
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_UpdateMagicBar(GlobalContext* globalCtx) {
static s16 sMagicBorderColors[][3] = {
First proper commit.
2020-03-17 04:31:30 +00:00
{ 0xFF, 0xFF, 0xFF },
{ 0x96, 0x96, 0x96 },
{ 0xFF, 0xFF, 0x96 },
{ 0xFF, 0xFF, 0x32 },
};
static s16 sMagicBorderIndexes[] = { 0, 1, 1, 0 };
static s16 sMagicBorderRatio = 2;
static s16 sMagicBorderStep = 1;
s16* color;
s16 maxMagic;
Format all src C files
2020-03-22 21:19:43 +00:00
switch (gSaveContext.unk_13F0) {
First proper commit.
2020-03-17 04:31:30 +00:00
case 8:
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
maxMagic = gSaveContext.magicLevel * 0x30;
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.unk_13F4 != maxMagic) {
if (gSaveContext.unk_13F4 < maxMagic) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F4 += 8;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.unk_13F4 > maxMagic) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F4 = maxMagic;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F4 -= 8;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.unk_13F4 <= maxMagic) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F4 = maxMagic;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F0 = 9;
}
break;
case 9:
gSaveContext.magic += 4;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.gameMode == 0 && gSaveContext.sceneSetupIndex < 4) {
Various SFX fixes (#237) * Various SFX fixes * Fix sfx references in z_en_zl2.c
2020-07-05 03:30:21 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
// Translates to: "Storage MAGIC_NOW=%d (%d)"
osSyncPrintf("蓄電 MAGIC_NOW=%d (%d)\n", gSaveContext.magic, gSaveContext.unk_13F6);
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.magic >= gSaveContext.unk_13F6) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.magic = gSaveContext.unk_13F6;
gSaveContext.unk_13F0 = gSaveContext.unk_13F2;
gSaveContext.unk_13F2 = 0;
}
break;
case 1:
sMagicBorderRatio = 2;
gSaveContext.unk_13F0 = 2;
break;
case 2:
gSaveContext.magic -= 2;
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.magic <= 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.magic = 0;
gSaveContext.unk_13F0 = 3;
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
sMagicBorderB = 255;
sMagicBorderG = 255;
sMagicBorderR = 255;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (gSaveContext.magic == gSaveContext.unk_13F8) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F0 = 3;
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
sMagicBorderB = 255;
sMagicBorderG = 255;
sMagicBorderR = 255;
First proper commit.
2020-03-17 04:31:30 +00:00
}
case 3:
case 4:
case 6:
color = sMagicBorderColors[sMagicBorderIndexes[sMagicBorderStep]];
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sMagicBorderR >= color[0]) {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderR -= ABS(sMagicBorderR - color[0]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderR += ABS(sMagicBorderR - color[0]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sMagicBorderG >= color[1]) {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderG -= ABS(sMagicBorderG - color[1]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderG += ABS(sMagicBorderG - color[1]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sMagicBorderB >= color[2]) {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderB -= ABS(sMagicBorderB - color[2]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderB += ABS(sMagicBorderB - color[2]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderRatio--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (sMagicBorderRatio == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderR = color[0];
sMagicBorderG = color[1];
sMagicBorderB = color[2];
sMagicBorderRatio = YREG(40 + sMagicBorderStep);
sMagicBorderStep++;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sMagicBorderStep >= 4) {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderStep = 0;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
break;
case 5:
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
sMagicBorderB = 255;
sMagicBorderG = 255;
sMagicBorderR = 255;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F0 = 0;
break;
case 7:
Format all src C files
2020-03-22 21:19:43 +00:00
if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) &&
(globalCtx->msgCtx.msgMode == 0) && (globalCtx->unk_10A20 == 0) && (globalCtx->sceneLoadFlag == 0) &&
Decompiles most FBDemo and transition functions (#92) * Decompile fbdemo (transition) files * run format.sh * reformat vtx array, fill in a couple unk * match TransitionTriforce_IsDone * add VTX macro, add DW_ wrapping around triangle macros * use new VTX macro, name graphic assets * Naming updates * pr updates * naming updates * remove symbols for COLOR_BUFFER, D_08000000, and D_09000000
2020-04-30 18:41:09 +00:00
(globalCtx->transitionMode == 0) && !Gameplay_InCsMode(globalCtx)) {
Format all src C files
2020-03-22 21:19:43 +00:00
if ((gSaveContext.magic == 0) || ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) ||
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
((gSaveContext.equips.buttonItems[1] != ITEM_LENS) &&
(gSaveContext.equips.buttonItems[2] != ITEM_LENS) &&
(gSaveContext.equips.buttonItems[3] != ITEM_LENS)) ||
Format all src C files
2020-03-22 21:19:43 +00:00
(globalCtx->actorCtx.unk_03 == 0)) {
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->actorCtx.unk_03 = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &D_801333D4, 4, &D_801333E0, &D_801333E0,
&D_801333E8);
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F0 = 0;
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
sMagicBorderR = sMagicBorderG = sMagicBorderB = 255;
First proper commit.
2020-03-17 04:31:30 +00:00
break;
}
globalCtx->interfaceCtx.unk_230--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (globalCtx->interfaceCtx.unk_230 == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.magic--;
globalCtx->interfaceCtx.unk_230 = 80;
}
}
color = sMagicBorderColors[sMagicBorderIndexes[sMagicBorderStep]];
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sMagicBorderR >= color[0]) {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderR -= ABS(sMagicBorderR - color[0]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderR += ABS(sMagicBorderR - color[0]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sMagicBorderG >= color[1]) {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderG -= ABS(sMagicBorderG - color[1]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderG += ABS(sMagicBorderG - color[1]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sMagicBorderB >= color[2]) {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderB -= ABS(sMagicBorderB - color[2]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderB += ABS(sMagicBorderB - color[2]) / sMagicBorderRatio;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderRatio--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (sMagicBorderRatio == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderR = color[0];
sMagicBorderG = color[1];
sMagicBorderB = color[2];
sMagicBorderRatio = YREG(40 + sMagicBorderStep);
sMagicBorderStep++;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sMagicBorderStep >= 4) {
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicBorderStep = 0;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
break;
case 10:
gSaveContext.magic += 4;
Various SFX fixes (#237) * Various SFX fixes * Fix sfx references in z_en_zl2.c
2020-07-05 03:30:21 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.magic >= gSaveContext.unk_13F8) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.magic = gSaveContext.unk_13F8;
gSaveContext.unk_13F0 = gSaveContext.unk_13F2;
gSaveContext.unk_13F2 = 0;
}
break;
default:
gSaveContext.unk_13F0 = 0;
break;
}
}
#else
Format all src C files
2020-03-22 21:19:43 +00:00
s16 sMagicBorderColors[][3] = {
First proper commit.
2020-03-17 04:31:30 +00:00
{ 0xFF, 0xFF, 0xFF },
{ 0x96, 0x96, 0x96 },
{ 0xFF, 0xFF, 0x96 },
{ 0xFF, 0xFF, 0x32 },
};
s16 sMagicBorderIndexes[] = { 0, 1, 1, 0 };
s16 sMagicBorderRatio = 2;
s16 sMagicBorderStep = 1;
void Interface_UpdateMagicBar(GlobalContext* globalCtx);
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_UpdateMagicBar.s")
#endif
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_DrawMagicBar(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
s16 magicBarY;
GraphicsContext* gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Gfx* dispRefs[4];
First proper commit.
2020-03-17 04:31:30 +00:00
gfxCtx = globalCtx->state.gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 2650);
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.magicLevel != 0) {
if (gSaveContext.healthCapacity > 0xA0) {
First proper commit.
2020-03-17 04:31:30 +00:00
magicBarY = R_MAGIC_BAR_LARGE_Y;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
magicBarY = R_MAGIC_BAR_SMALL_Y;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
func_80094520(globalCtx->state.gfxCtx);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, sMagicBorderR, sMagicBorderG, sMagicBorderB,
interfaceCtx->magicAlpha);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetEnvColor(gfxCtx->overlay.p++, 100, 50, 50, 255);
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
gfxCtx->overlay.p =
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
Gfx_TextureIA8(gfxCtx->overlay.p, D_020038C0, 8, 16, R_MAGIC_BAR_X, magicBarY, 8, 16, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02003940, 24, 16, R_MAGIC_BAR_X + 8, magicBarY,
gSaveContext.unk_13F4, 16, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_020038C0);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 3, G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPLoadSync(gfxCtx->overlay.p++);
gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 63, 2048);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 1, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, 3, G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPSetTileSize(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 28, 60);
Format all src C files
2020-03-22 21:19:43 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, ((R_MAGIC_BAR_X + gSaveContext.unk_13F4) + 8) << 2, magicBarY << 2,
((R_MAGIC_BAR_X + gSaveContext.unk_13F4) + 16) << 2, (magicBarY + 16) << 2, G_TX_RENDERTILE,
256, 0, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE,
First proper commit.
2020-03-17 04:31:30 +00:00
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 255);
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.unk_13F0 == 4) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Yellow part of the bar being used when casting a spell
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 250, 250, 0, interfaceCtx->magicAlpha);
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
gDPLoadMultiBlock_4b(gfxCtx->overlay.p++, D_02003AC0, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
First proper commit.
2020-03-17 04:31:30 +00:00
G_TX_NOLOD, G_TX_NOLOD);
Format all src C files
2020-03-22 21:19:43 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, R_MAGIC_FILL_X << 2, (magicBarY + 3) << 2,
(R_MAGIC_FILL_X + gSaveContext.magic) << 2, (magicBarY + 10) << 2, G_TX_RENDERTILE, 0,
0, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
// Fill the rest of the bar with the normal magic color
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1),
First proper commit.
2020-03-17 04:31:30 +00:00
R_MAGIC_FILL_COLOR(2), interfaceCtx->magicAlpha);
Format all src C files
2020-03-22 21:19:43 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, R_MAGIC_FILL_X << 2, (magicBarY + 3) << 2,
(R_MAGIC_FILL_X + gSaveContext.unk_13F8) << 2, (magicBarY + 10) << 2, G_TX_RENDERTILE,
0, 0, 1024, 1024);
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
// Fill the whole bar with the normal magic color
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1),
First proper commit.
2020-03-17 04:31:30 +00:00
R_MAGIC_FILL_COLOR(2), interfaceCtx->magicAlpha);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPLoadMultiBlock_4b(gfxCtx->overlay.p++, D_02003AC0, 0, G_TX_RENDERTILE, G_IM_FMT_I, 16, 16, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK,
First proper commit.
2020-03-17 04:31:30 +00:00
G_TX_NOLOD, G_TX_NOLOD);
Format all src C files
2020-03-22 21:19:43 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, R_MAGIC_FILL_X << 2, (magicBarY + 3) << 2,
(R_MAGIC_FILL_X + gSaveContext.magic) << 2, (magicBarY + 10) << 2, G_TX_RENDERTILE, 0,
0, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 2731);
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_80088AA0(s16 arg0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerX[1] = 140;
gSaveContext.timerY[1] = 80;
First proper commit.
2020-03-17 04:31:30 +00:00
D_80125A5C = 0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2Value = arg0;
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (arg0 != 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2State = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2State = 7;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_80088AF0(GlobalContext* globalCtx) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer2State != 0) {
if (gSaveContext.eventInf[1] & 1) {
gSaveContext.timer2Value = 239;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2Value = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_80088B34(s16 arg0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerX[0] = 140;
gSaveContext.timerY[0] = 80;
First proper commit.
2020-03-17 04:31:30 +00:00
D_80125A5C = 0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1Value = arg0;
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (arg0 != 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 5;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 11;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) {
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Gfx* dispRefs[5];
First proper commit.
2020-03-17 04:31:30 +00:00
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_OpenDisps(dispRefs, gfxCtx, "../z_parameter.c", 2820);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, texture);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPLoadSync(gfxCtx->overlay.p++);
gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 191, 683);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_4b, 3, 0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPSetTileSize(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 188, 60);
gSP1Quadrangle(gfxCtx->overlay.p++, 0, 2, 3, 1, 0);
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_CloseDisps(dispRefs, gfxCtx, "../z_parameter.c", 2829);
First proper commit.
2020-03-17 04:31:30 +00:00
}
u8* sCUpLabelTextures[] = { D_02002FC0, D_02002FC0, D_02002FC0 };
s16 sStartButtonLeftPos[] = { 132, 130, 130 };
#ifdef NON_MATCHING
// regalloc and ordering differences
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_DrawItemButtons(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
Player* player = PLAYER;
f32 temp;
s16 i; // sp+0x14A
s16 cUpAlpha;
s32 pad;
GraphicsContext* gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Gfx* dispRefs[4];
First proper commit.
2020-03-17 04:31:30 +00:00
gfxCtx = globalCtx->state.gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 2900);
First proper commit.
2020-03-17 04:31:30 +00:00
// B Button Color & Texture
// Also loads the Item Button Texture reused by other buttons afterwards
gDPPipeSync(gfxCtx->overlay.p++);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_B_BTN_COLOR(0), R_B_BTN_COLOR(1), R_B_BTN_COLOR(2),
interfaceCtx->bAlpha);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 255);
Format all src C files
2020-03-22 21:19:43 +00:00
gfxCtx->overlay.p =
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
Gfx_TextureIA8(gfxCtx->overlay.p, &D_02000A00[0], 32, 32, R_ITEM_BTN_X(0), R_ITEM_BTN_Y(0), R_ITEM_BTN_WIDTH(0),
R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_DD(0) * 2, R_ITEM_BTN_DD(0) * 2);
First proper commit.
2020-03-17 04:31:30 +00:00
// C-Left Button Color & Texture
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2),
interfaceCtx->cLeftAlpha);
gSPTextureRectangle(gfxCtx->overlay.p++, R_ITEM_BTN_X(1) << 2, R_ITEM_BTN_Y(1) << 2,
(R_ITEM_BTN_X(1) + R_ITEM_BTN_WIDTH(1)) << 2, (R_ITEM_BTN_Y(1) + R_ITEM_BTN_WIDTH(1)) << 2,
G_TX_RENDERTILE, 0, 0, R_ITEM_BTN_DD(1) * 2, R_ITEM_BTN_DD(1) * 2);
First proper commit.
2020-03-17 04:31:30 +00:00
// C-Down Button Color & Texture
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2),
interfaceCtx->cDownAlpha);
gSPTextureRectangle(gfxCtx->overlay.p++, R_ITEM_BTN_X(2) << 2, R_ITEM_BTN_Y(2) << 2,
(R_ITEM_BTN_X(2) + R_ITEM_BTN_WIDTH(2)) << 2, (R_ITEM_BTN_Y(2) + R_ITEM_BTN_WIDTH(2)) << 2,
G_TX_RENDERTILE, 0, 0, R_ITEM_BTN_DD(2) * 2, R_ITEM_BTN_DD(2) * 2);
First proper commit.
2020-03-17 04:31:30 +00:00
// C-Right Button Color & Texture
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2),
interfaceCtx->cRightAlpha);
gSPTextureRectangle(gfxCtx->overlay.p++, R_ITEM_BTN_X(3) << 2, R_ITEM_BTN_Y(3) << 2,
(R_ITEM_BTN_X(3) + R_ITEM_BTN_WIDTH(3)) << 2, (R_ITEM_BTN_Y(3) + R_ITEM_BTN_WIDTH(3)) << 2,
G_TX_RENDERTILE, 0, 0, R_ITEM_BTN_DD(3) * 2, R_ITEM_BTN_DD(3) * 2);
if ((globalCtx->pauseCtx.state < 8) || (globalCtx->pauseCtx.state >= 18)) {
if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0)) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Start Button Texture, Color & Label
gDPPipeSync(gfxCtx->overlay.p++);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 120, 120, 120, interfaceCtx->startAlpha);
Fix various non matching issues and introduce #ifdef NON_EQUIVALENT instead of #if 0 (#207)
2020-06-14 03:29:59 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, sStartButtonLeftPos[gSaveContext.language] << 2, 68,
(sStartButtonLeftPos[gSaveContext.language] + 22) << 2, 156, G_TX_RENDERTILE, 0, 0,
1462, 1462);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPPipeSync(gfxCtx->overlay.p++);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->startAlpha);
gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 0);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1,
(u32)interfaceCtx->do_actionSegment + 0x300);
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPLoadSync(gfxCtx->overlay.p++);
gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 191, 683);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_4b, 3, 0, G_TX_RENDERTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
Fix various non matching issues and introduce #ifdef NON_EQUIVALENT instead of #if 0 (#207)
2020-06-14 03:29:59 +00:00
gDPSetTileSize(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 188, 60);
First proper commit.
2020-03-17 04:31:30 +00:00
temp = R_START_LABEL_DD(gSaveContext.language) / 100.0f;
Format all src C files
2020-03-22 21:19:43 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, R_START_LABEL_X(gSaveContext.language) << 2,
First proper commit.
2020-03-17 04:31:30 +00:00
R_START_LABEL_Y(gSaveContext.language) << 2,
Fix various non matching issues and introduce #ifdef NON_EQUIVALENT instead of #if 0 (#207)
2020-06-14 03:29:59 +00:00
(R_START_LABEL_X(gSaveContext.language) + (s16)(16.0f / temp)) << 2,
(R_START_LABEL_Y(gSaveContext.language) + (s16)(48.0f / temp)) << 2, G_TX_RENDERTILE, 0,
0, (s16)(1024.0f / temp), (s16)(1024.0f / temp));
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->naviCalling && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) &&
(globalCtx->csCtx.state == 0)) {
if (!sCUpInvisible) {
First proper commit.
2020-03-17 04:31:30 +00:00
// C-Up Button Texture, Color & Label (Navi Text)
gDPPipeSync(gfxCtx->overlay.p++);
Run formatter with changes
2020-03-23 23:11:21 +00:00
if ((gSaveContext.unk_13EA == 1) || (gSaveContext.unk_13EA == 2) || (gSaveContext.unk_13EA == 5)) {
First proper commit.
2020-03-17 04:31:30 +00:00
cUpAlpha = 0;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else if ((player->stateFlags2 & 0x00200000) || (func_8008F2F8(globalCtx) == 4) ||
(player->stateFlags2 & 0x00040000)) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
cUpAlpha = 70;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
cUpAlpha = interfaceCtx->healthAlpha;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), cUpAlpha);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
Format all src C files
2020-03-22 21:19:43 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, R_C_UP_BTN_X << 2, R_C_UP_BTN_Y << 2, (R_C_UP_BTN_X + 16) << 2,
(R_C_UP_BTN_Y + 16) << 2, G_TX_RENDERTILE, 0, 0, 2048, 2048);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPPipeSync(gfxCtx->overlay.p++);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, cUpAlpha);
gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 0);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
First proper commit.
2020-03-17 04:31:30 +00:00
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1,
sCUpLabelTextures[gSaveContext.language]);
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPLoadSync(gfxCtx->overlay.p++);
gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 63, 1024);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_4b, 2, 0, G_TX_RENDERTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPSetTileSize(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 124, 28);
Fix various non matching issues and introduce #ifdef NON_EQUIVALENT instead of #if 0 (#207)
2020-06-14 03:29:59 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, R_C_UP_ICON_X << 2, R_C_UP_ICON_Y << 2, (R_C_UP_ICON_X + 32) << 2,
(R_C_UP_ICON_Y + 8) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
}
sCUpTimer--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (sCUpTimer == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
sCUpTimer = 10;
sCUpInvisible ^= 1;
}
}
gDPPipeSync(gfxCtx->overlay.p++);
// Empty C Button Arrows
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 1; i < 4; i++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[i] > 0xF0) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (i == 1) {
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2),
interfaceCtx->cLeftAlpha);
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else if (i == 2) {
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2),
interfaceCtx->cDownAlpha);
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2),
interfaceCtx->cRightAlpha);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
gfxCtx->overlay.p =
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
Gfx_TextureIA8(gfxCtx->overlay.p, &D_02000A00[i + 1], 0x20, 0x20, R_ITEM_BTN_X(i), R_ITEM_BTN_Y(i),
R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_DD(i) * 2, R_ITEM_BTN_DD(i) * 2);
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3071);
First proper commit.
2020-03-17 04:31:30 +00:00
}
#else
void Interface_DrawItemButtons(GlobalContext* globalCtx);
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s")
#endif
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 button) {
First proper commit.
2020-03-17 04:31:30 +00:00
GraphicsContext* gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Gfx* dispRefs[4];
First proper commit.
2020-03-17 04:31:30 +00:00
gfxCtx = globalCtx->state.gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3079);
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
gDPLoadTextureBlock(gfxCtx->overlay.p++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPTextureRectangle(gfxCtx->overlay.p++, R_ITEM_ICON_X(button) << 2, R_ITEM_ICON_Y(button) << 2,
First proper commit.
2020-03-17 04:31:30 +00:00
(R_ITEM_ICON_X(button) + R_ITEM_ICON_WIDTH(button)) << 2,
Format all src C files
2020-03-22 21:19:43 +00:00
(R_ITEM_ICON_Y(button) + R_ITEM_ICON_WIDTH(button)) << 2, G_TX_RENDERTILE, 0, 0,
R_ITEM_ICON_DD(button) * 2, R_ITEM_ICON_DD(button) * 2);
First proper commit.
2020-03-17 04:31:30 +00:00
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3094);
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) {
First proper commit.
2020-03-17 04:31:30 +00:00
s16 item;
s16 ammo;
GraphicsContext* gfxCtx;
s16 i;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Gfx* dispRefs[3];
First proper commit.
2020-03-17 04:31:30 +00:00
gfxCtx = globalCtx->state.gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3105);
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
item = gSaveContext.equips.buttonItems[button];
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if ((item == ITEM_STICK) || (item == ITEM_NUT) || (item == ITEM_BOMB) || (item == ITEM_BOW) ||
((item >= ITEM_BOW_ARROW_FIRE) && (item <= ITEM_BOW_ARROW_LIGHT)) || (item == ITEM_SLINGSHOT) ||
(item == ITEM_BOMBCHU) || (item == ITEM_BEAN)) {
if ((item >= ITEM_BOW_ARROW_FIRE) && (item <= ITEM_BOW_ARROW_LIGHT)) {
First proper commit.
2020-03-17 04:31:30 +00:00
item = ITEM_BOW;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
ammo = AMMO(item);
gDPPipeSync(gfxCtx->overlay.p++);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((button == 0) && (gSaveContext.minigameState == 1)) {
First proper commit.
2020-03-17 04:31:30 +00:00
ammo = globalCtx->interfaceCtx.hbaAmmo;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((button == 0) && (globalCtx->unk_11E5C >= 2)) {
First proper commit.
2020-03-17 04:31:30 +00:00
ammo = globalCtx->unk_11E5C - 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((button == 0) && (globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38)) {
First proper commit.
2020-03-17 04:31:30 +00:00
ammo = globalCtx->bombchuBowlingAmmo;
Format all src C files
2020-03-22 21:19:43 +00:00
if (ammo < 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
ammo = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
}
} else if (((item == ITEM_BOW) && (AMMO(item) == CUR_CAPACITY(UPG_QUIVER))) ||
((item == ITEM_BOMB) && (AMMO(item) == CUR_CAPACITY(UPG_BOMB_BAG))) ||
((item == ITEM_SLINGSHOT) && (AMMO(item) == CUR_CAPACITY(UPG_BULLET_BAG))) ||
((item == ITEM_STICK) && (AMMO(item) == CUR_CAPACITY(UPG_STICKS))) ||
((item == ITEM_NUT) && (AMMO(item) == CUR_CAPACITY(UPG_NUTS))) ||
((item == ITEM_BOMBCHU) && (ammo == 50)) || ((item == ITEM_BEAN) && (ammo == 15))) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 120, 255, 0, alpha);
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (ammo == 0) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 100, 100, 100, alpha);
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 0; ammo >= 10; i++) {
First proper commit.
2020-03-17 04:31:30 +00:00
ammo -= 10;
Format all src C files
2020-03-22 21:19:43 +00:00
}
if (i != 0) {
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, &D_020035C0[i], 8, 8, R_ITEM_AMMO_X(button),
R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024);
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, &D_020035C0[ammo], 8, 8, R_ITEM_AMMO_X(button) + 6,
R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
}
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3158);
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_DrawActionButton(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
GraphicsContext* gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Gfx* dispRefs[4];
First proper commit.
2020-03-17 04:31:30 +00:00
gfxCtx = globalCtx->state.gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3172);
First proper commit.
2020-03-17 04:31:30 +00:00
Matrix_Translate(0.0f, 0.0f, XREG(18) / 10.0f, MTXMODE_NEW);
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
Matrix_RotateX(interfaceCtx->unk_1F4 / 10000.0f, MTXMODE_APPLY);
Format all src C files
2020-03-22 21:19:43 +00:00
if (1) {} // Necessary to match
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
gSPMatrix(gfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3177),
G_MTX_MODELVIEW | G_MTX_LOAD);
First proper commit.
2020-03-17 04:31:30 +00:00
gSPVertex(gfxCtx->overlay.p++, interfaceCtx->vtx_128, 4, 0);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPLoadTextureBlock(gfxCtx->overlay.p++, &D_02000A00[0], G_IM_FMT_IA, G_IM_SIZ_8b, 32, 32, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gSP1Quadrangle(gfxCtx->overlay.p++, 0, 2, 3, 1, 0);
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3187);
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_InitVertices(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
s16 i;
interfaceCtx->vtx_128 = Graph_Alloc(globalCtx->state.gfxCtx, 8 * sizeof(Vtx));
Format all src C files
2020-03-22 21:19:43 +00:00
// clang-format off
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->vtx_128[0].v.ob[0] =
interfaceCtx->vtx_128[2].v.ob[0] = -14;
interfaceCtx->vtx_128[1].v.ob[0] =
interfaceCtx->vtx_128[3].v.ob[0] = interfaceCtx->vtx_128[0].v.ob[0] + 28;
interfaceCtx->vtx_128[0].v.ob[1] =
interfaceCtx->vtx_128[1].v.ob[1] = 14;
interfaceCtx->vtx_128[2].v.ob[1] =
interfaceCtx->vtx_128[3].v.ob[1] = interfaceCtx->vtx_128[0].v.ob[1] - 28;
interfaceCtx->vtx_128[4].v.ob[0] =
interfaceCtx->vtx_128[6].v.ob[0] = -(XREG(21) / 2);
interfaceCtx->vtx_128[5].v.ob[0] =
interfaceCtx->vtx_128[7].v.ob[0] = interfaceCtx->vtx_128[4].v.ob[0] + XREG(21);
interfaceCtx->vtx_128[4].v.ob[1] =
interfaceCtx->vtx_128[5].v.ob[1] = XREG(28) / 2;
interfaceCtx->vtx_128[6].v.ob[1] =
interfaceCtx->vtx_128[7].v.ob[1] = interfaceCtx->vtx_128[4].v.ob[1] - XREG(28);
Format all src C files
2020-03-22 21:19:43 +00:00
for (i = 0; i < 8; i += 4) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->vtx_128[i].v.ob[2] = interfaceCtx->vtx_128[i+1].v.ob[2] =
interfaceCtx->vtx_128[i+2].v.ob[2] = interfaceCtx->vtx_128[i+3].v.ob[2] = 0;
interfaceCtx->vtx_128[i].v.flag = interfaceCtx->vtx_128[i+1].v.flag =
interfaceCtx->vtx_128[i+2].v.flag = interfaceCtx->vtx_128[i+3].v.flag = 0;
interfaceCtx->vtx_128[i].v.tc[0] = interfaceCtx->vtx_128[i].v.tc[1] =
interfaceCtx->vtx_128[i+1].v.tc[1] = interfaceCtx->vtx_128[i+2].v.tc[0] = 0;
interfaceCtx->vtx_128[i+1].v.tc[0] = interfaceCtx->vtx_128[i+2].v.tc[1] =
interfaceCtx->vtx_128[i+3].v.tc[0] = interfaceCtx->vtx_128[i+3].v.tc[1] = 1024;
interfaceCtx->vtx_128[i].v.cn[0] = interfaceCtx->vtx_128[i+1].v.cn[0] =
interfaceCtx->vtx_128[i+2].v.cn[0] = interfaceCtx->vtx_128[i+3].v.cn[0] =
interfaceCtx->vtx_128[i].v.cn[1] = interfaceCtx->vtx_128[i+1].v.cn[1] =
interfaceCtx->vtx_128[i+2].v.cn[1] = interfaceCtx->vtx_128[i+3].v.cn[1] =
interfaceCtx->vtx_128[i].v.cn[2] = interfaceCtx->vtx_128[i+1].v.cn[2] =
interfaceCtx->vtx_128[i+2].v.cn[2] = interfaceCtx->vtx_128[i+3].v.cn[2] = 0xFF;
interfaceCtx->vtx_128[i].v.cn[3] = interfaceCtx->vtx_128[i+1].v.cn[3] =
interfaceCtx->vtx_128[i+2].v.cn[3] = interfaceCtx->vtx_128[i+3].v.cn[3] = 0xFF;
}
interfaceCtx->vtx_128[5].v.tc[0] = interfaceCtx->vtx_128[7].v.tc[0] = 1536;
interfaceCtx->vtx_128[6].v.tc[1] = interfaceCtx->vtx_128[7].v.tc[1] = 512;
interfaceCtx->vtx_12C = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Vtx));
interfaceCtx->vtx_12C[0].v.ob[0] = interfaceCtx->vtx_12C[2].v.ob[0] = -8;
interfaceCtx->vtx_12C[1].v.ob[0] = interfaceCtx->vtx_12C[3].v.ob[0] = 8;
interfaceCtx->vtx_12C[0].v.ob[1] = interfaceCtx->vtx_12C[1].v.ob[1] = 8;
interfaceCtx->vtx_12C[2].v.ob[1] = interfaceCtx->vtx_12C[3].v.ob[1] = -8;
interfaceCtx->vtx_12C[0].v.ob[2] = interfaceCtx->vtx_12C[1].v.ob[2] =
interfaceCtx->vtx_12C[2].v.ob[2] = interfaceCtx->vtx_12C[3].v.ob[2] = 0;
interfaceCtx->vtx_12C[0].v.flag = interfaceCtx->vtx_12C[1].v.flag =
interfaceCtx->vtx_12C[2].v.flag = interfaceCtx->vtx_12C[3].v.flag = 0;
interfaceCtx->vtx_12C[0].v.tc[0] = interfaceCtx->vtx_12C[0].v.tc[1] =
interfaceCtx->vtx_12C[1].v.tc[1] = interfaceCtx->vtx_12C[2].v.tc[0] = 0;
interfaceCtx->vtx_12C[1].v.tc[0] = interfaceCtx->vtx_12C[2].v.tc[1] =
interfaceCtx->vtx_12C[3].v.tc[0] = interfaceCtx->vtx_12C[3].v.tc[1] = 512;
interfaceCtx->vtx_12C[0].v.cn[0] = interfaceCtx->vtx_12C[1].v.cn[0] =
interfaceCtx->vtx_12C[2].v.cn[0] = interfaceCtx->vtx_12C[3].v.cn[0] =
interfaceCtx->vtx_12C[0].v.cn[1] = interfaceCtx->vtx_12C[1].v.cn[1] =
interfaceCtx->vtx_12C[2].v.cn[1] = interfaceCtx->vtx_12C[3].v.cn[1] =
interfaceCtx->vtx_12C[0].v.cn[2] = interfaceCtx->vtx_12C[1].v.cn[2] =
interfaceCtx->vtx_12C[2].v.cn[2] = interfaceCtx->vtx_12C[3].v.cn[2] =
interfaceCtx->vtx_12C[0].v.cn[3] = interfaceCtx->vtx_12C[1].v.cn[3] =
interfaceCtx->vtx_12C[2].v.cn[3] = interfaceCtx->vtx_12C[3].v.cn[3] = 0xFF;
Format all src C files
2020-03-22 21:19:43 +00:00
// clang-format on
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
void func_8008A8B8(GlobalContext* globalCtx, s32 topY, s32 bottomY, s32 leftX, s32 rightX) {
First proper commit.
2020-03-17 04:31:30 +00:00
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
Vec3f sp40;
Vec3f sp34;
Vec3f sp28;
sp40.x = sp40.y = sp40.z = 0.0f;
sp34.x = sp34.y = 0.0f;
sp34.z = -1.0f;
sp28.x = sp28.z = 0.0f;
sp28.y = 1.0f;
func_800AA358(&interfaceCtx->view, &sp40, &sp34, &sp28);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
interfaceCtx->viewport.topY = topY;
interfaceCtx->viewport.bottomY = bottomY;
interfaceCtx->viewport.leftX = leftX;
interfaceCtx->viewport.rightX = rightX;
View_SetViewport(&interfaceCtx->view, &interfaceCtx->viewport);
First proper commit.
2020-03-17 04:31:30 +00:00
func_800AA460(&interfaceCtx->view, 60.0f, 10.0f, 60.0f);
func_800AB560(&interfaceCtx->view);
}
Format all src C files
2020-03-22 21:19:43 +00:00
void func_8008A994(InterfaceContext* interfaceCtx) {
z_select decompiled, 1 non matching left (#202) * First pass z_select * lots of progress. 2 non matchings and data stuff needed * match Select_LoadGame * z_select almost ok, 1 func left * remove comments * remove comments and add description * remove unused flg_set asm * set_next_gamestate macro * pr suggestions 1 * pr suggestions 2 * map -> scene * pr suggestions 3 Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
2020-06-14 02:59:58 +00:00
SET_FULLSCREEN_VIEWPORT(&interfaceCtx->view);
First proper commit.
2020-03-17 04:31:30 +00:00
func_800AB2C4(&interfaceCtx->view);
}
s16 sMagicArrowEffectsR[] = { 0xFF, 0x64, 0xFF };
s16 sMagicArrowEffectsG[] = { 0x00, 0x64, 0xFF };
s16 sMagicArrowEffectsB[] = { 0x00, 0xFF, 0x64 };
s16 sTimerDigitLeftPos[] = { 16, 25, 34, 42, 51 };
s16 sDigitWidth[] = { 9, 9, 8, 9, 9 };
// unused, most likely colors
Format all src C files
2020-03-22 21:19:43 +00:00
s16 D_80125B1C[][3] = {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
{ 0, 150, 0 }, { 100, 255, 0 }, { 255, 255, 255 }, { 0, 0, 0 }, { 255, 255, 255 },
First proper commit.
2020-03-17 04:31:30 +00:00
};
s16 sRupeeDigitsFirst[] = { 1, 0, 0 };
s16 sRupeeDigitsCount[] = { 2, 3, 3 };
s16 sSpoilingItemEntrances[] = { 0x01AD, 0x0153, 0x0153 };
Format all src C files
2020-03-22 21:19:43 +00:00
u16 D_80125B54 = 0xC220; // unused
u16 D_80125B58 = 0xC20C; // unused
First proper commit.
2020-03-17 04:31:30 +00:00
s16 D_80125B5C[] = { 91, 91 }; // unused
#ifdef NON_MATCHING
// mostly regalloc, minor ordering and stack usage differences
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_Draw(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
static s16 D_8015FFE0;
static s16 D_8015FFE2;
static s16 D_8015FFE4;
static s16 D_8015FFE6;
static s16 sTimerDigits[5];
MessageContext* msgCtx = &globalCtx->msgCtx;
PauseContext* pauseCtx = &globalCtx->pauseCtx;
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
Player* player = PLAYER;
s16 phi_s3_2;
s16 phi_s3;
s16 phi_s2;
s16 phi_s1;
s16 phi_s0;
s16 sp274;
GraphicsContext* gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Gfx* dispRefs[4];
First proper commit.
2020-03-17 04:31:30 +00:00
s32 pad;
gfxCtx = globalCtx->state.gfxCtx;
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3405);
First proper commit.
2020-03-17 04:31:30 +00:00
gSPSegment(gfxCtx->overlay.p++, 0x02, interfaceCtx->parameterSegment);
gSPSegment(gfxCtx->overlay.p++, 0x07, interfaceCtx->do_actionSegment);
gSPSegment(gfxCtx->overlay.p++, 0x08, interfaceCtx->icon_itemSegment);
gSPSegment(gfxCtx->overlay.p++, 0x0B, interfaceCtx->mapSegment);
Format all src C files
2020-03-22 21:19:43 +00:00
if (pauseCtx->flag == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_InitVertices(globalCtx);
func_8008A994(interfaceCtx);
Decompile z_map_exp.c (2 non matchings left) (#104) Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 15:09:20 +00:00
Health_Draw(globalCtx);
First proper commit.
2020-03-17 04:31:30 +00:00
func_80094520(globalCtx->state.gfxCtx);
// Rupee Icon
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 200, 255, 100, interfaceCtx->magicAlpha);
gDPSetEnvColor(gfxCtx->overlay.p++, 0, 80, 0, 255);
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02001F00, 16, 16, 26, 206, 16, 16, 1024, 1024);
Format all src C files
2020-03-22 21:19:43 +00:00
switch (globalCtx->sceneNum) {
First proper commit.
2020-03-17 04:31:30 +00:00
case SCENE_BMORI1:
case SCENE_HIDAN:
case SCENE_MIZUSIN:
case SCENE_JYASINZOU:
case SCENE_HAKADAN:
case SCENE_HAKADANCH:
case SCENE_ICE_DOUKUTO:
case SCENE_GANON:
case SCENE_MEN:
case SCENE_GERUDOWAY:
case SCENE_GANONTIKA:
case SCENE_GANON_SONOGO:
case SCENE_GANONTIKA_SONOGO:
case SCENE_TAKARAYA:
Decompile z_map_exp.c (2 non matchings left) (#104) Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 15:09:20 +00:00
if (gSaveContext.dungeonKeys[gSaveContext.mapIndex] >= 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Small Key Icon
gDPPipeSync(gfxCtx->overlay.p++);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 200, 230, 255, interfaceCtx->magicAlpha);
gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 20, 255);
Format all src C files
2020-03-22 21:19:43 +00:00
gfxCtx->overlay.p =
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
Gfx_TextureIA8(gfxCtx->overlay.p, D_02001E00, 16, 16, 26, 190, 16, 16, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
// Small Key Counter
gDPPipeSync(gfxCtx->overlay.p++);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0,
PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0);
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->counterDigits[2] = 0;
Decompile z_map_exp.c (2 non matchings left) (#104) Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 15:09:20 +00:00
interfaceCtx->counterDigits[3] = gSaveContext.dungeonKeys[gSaveContext.mapIndex];
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
while (interfaceCtx->counterDigits[3] >= 10) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->counterDigits[2]++;
interfaceCtx->counterDigits[3] -= 10;
}
phi_s2 = 42;
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->counterDigits[2] != 0) {
gfxCtx->overlay.p =
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[2]], 8, 16, phi_s2,
190, 8, 16, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
phi_s2 = 50;
}
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[3]], 8,
16, phi_s2, 190, 8, 16, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
}
phi_s2 = 42;
break;
default:
phi_s2 = 42;
break;
}
phi_s2 = 42;
// Rupee Counter
gDPPipeSync(gfxCtx->overlay.p++);
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.rupees == CUR_CAPACITY(UPG_WALLET)) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 120, 255, 0, interfaceCtx->magicAlpha);
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else if (gSaveContext.rupees != 0) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->magicAlpha);
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 100, 100, 100, interfaceCtx->magicAlpha);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0,
0, PRIMITIVE, 0);
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->counterDigits[0] = interfaceCtx->counterDigits[1] = 0;
interfaceCtx->counterDigits[2] = gSaveContext.rupees;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if ((interfaceCtx->counterDigits[2] >= 10000) || (interfaceCtx->counterDigits[2] < 0)) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->counterDigits[2] &= 0xDDD;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
while (interfaceCtx->counterDigits[2] >= 100) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->counterDigits[2] -= 100;
interfaceCtx->counterDigits[0]++;
}
Format all src C files
2020-03-22 21:19:43 +00:00
while (interfaceCtx->counterDigits[2] >= 10) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->counterDigits[2] -= 10;
interfaceCtx->counterDigits[1]++;
}
phi_s0 = sRupeeDigitsFirst[CUR_UPG_VALUE(UPG_WALLET)];
phi_s1 = sRupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)];
Format all src C files
2020-03-22 21:19:43 +00:00
for (phi_s3 = 0; phi_s3 < phi_s1; phi_s3++, phi_s0++, phi_s2 += 8) {
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[phi_s0]], 8,
16, phi_s2, 206, 8, 16, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
}
Interface_DrawMagicBar(globalCtx);
Decompile z_map_exp.c (2 non matchings left) (#104) Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 15:09:20 +00:00
Minimap_Draw(globalCtx);
First proper commit.
2020-03-17 04:31:30 +00:00
Run formatter with changes
2020-03-23 23:11:21 +00:00
if ((R_PAUSE_MENU_MODE != 2) && (R_PAUSE_MENU_MODE != 3)) {
First proper commit.
2020-03-17 04:31:30 +00:00
func_8002C124(&globalCtx->actorCtx.targetCtx, globalCtx); // Draw Z-Target
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
func_80094520(globalCtx->state.gfxCtx);
Interface_DrawItemButtons(globalCtx);
gDPPipeSync(gfxCtx->overlay.p++);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->unk_1FA == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
// B Button Icon & possibly Ammo Count
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[0] != ITEM_NONE) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawItemIconTexture(globalCtx, (void*)(u32)interfaceCtx->icon_itemSegment, 0);
if ((player->stateFlags1 & 0x00800000) || (globalCtx->unk_11E5C >= 2) ||
Format all src C files
2020-03-22 21:19:43 +00:00
((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) {
First proper commit.
2020-03-17 04:31:30 +00:00
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0,
PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE,
0);
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawAmmoCount(globalCtx, 0, interfaceCtx->bAlpha);
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
// B Button Do Action Label
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
First proper commit.
2020-03-17 04:31:30 +00:00
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha);
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1,
(u32)interfaceCtx->do_actionSegment + 0x180);
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPLoadSync(gfxCtx->overlay.p++);
gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 191, 683);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_4b, 3, 0x0000, G_TX_RENDERTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPSetTileSize(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 188, 60);
R_B_LABEL_DD = 1024.0f / (WREG(37 + gSaveContext.language) / 100.0f);
Format all src C files
2020-03-22 21:19:43 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, R_B_LABEL_X(gSaveContext.language) << 2,
R_B_LABEL_Y(gSaveContext.language) << 2, (R_B_LABEL_X(gSaveContext.language) + 48) << 2,
Fix various non matching issues and introduce #ifdef NON_EQUIVALENT instead of #if 0 (#207)
2020-06-14 03:29:59 +00:00
(R_B_LABEL_Y(gSaveContext.language) + 16) << 2, G_TX_RENDERTILE, 0, 0, R_B_LABEL_DD,
Format all src C files
2020-03-22 21:19:43 +00:00
R_B_LABEL_DD);
First proper commit.
2020-03-17 04:31:30 +00:00
}
gDPPipeSync(gfxCtx->overlay.p++);
// C-Left Button Icon & Ammo Count
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[1] < 0xF0) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->cLeftAlpha);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x1000), 1);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawAmmoCount(globalCtx, 1, interfaceCtx->cLeftAlpha);
}
gDPPipeSync(gfxCtx->overlay.p++);
// C-Down Button Icon & Ammo Count
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[2] < 0xF0) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->cDownAlpha);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x2000), 2);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawAmmoCount(globalCtx, 2, interfaceCtx->cDownAlpha);
}
gDPPipeSync(gfxCtx->overlay.p++);
// C-Right Button Icon & Ammo Count
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[3] < 0xF0) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->cRightAlpha);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x3000), 3);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawAmmoCount(globalCtx, 3, interfaceCtx->cRightAlpha);
}
// A Button
func_80094A14(globalCtx->state.gfxCtx);
Format all src C files
2020-03-22 21:19:43 +00:00
func_8008A8B8(globalCtx, R_A_BTN_Y, R_A_BTN_Y + 45, R_A_BTN_X, R_A_BTN_X + 45);
First proper commit.
2020-03-17 04:31:30 +00:00
gSPClearGeometryMode(gfxCtx->overlay.p++, G_CULL_BOTH);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_A_BTN_COLOR(0), R_A_BTN_COLOR(1), R_A_BTN_COLOR(2),
interfaceCtx->aAlpha);
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawActionButton(globalCtx);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
func_8008A8B8(globalCtx, R_A_ICON_Y, R_A_ICON_Y + 45, R_A_ICON_X, R_A_ICON_X + 45);
First proper commit.
2020-03-17 04:31:30 +00:00
gSPSetGeometryMode(gfxCtx->overlay.p++, G_CULL_BACK);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
First proper commit.
2020-03-17 04:31:30 +00:00
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->aAlpha);
gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 0);
First proper commit.
2020-03-17 04:31:30 +00:00
Matrix_Translate(0.0f, 0.0f, WREG(46 + gSaveContext.language) / 10.0f, MTXMODE_NEW);
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
Matrix_RotateX(interfaceCtx->unk_1F4 / 10000.0f, MTXMODE_APPLY);
Format all src C files
2020-03-22 21:19:43 +00:00
gSPMatrix(gfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3701),
G_MTX_MODELVIEW | G_MTX_LOAD);
First proper commit.
2020-03-17 04:31:30 +00:00
gSPVertex(gfxCtx->overlay.p++, &interfaceCtx->vtx_128[4], 4, 0);
Run formatter with changes
2020-03-23 23:11:21 +00:00
if ((interfaceCtx->unk_1EC < 2) || (interfaceCtx->unk_1EC == 3)) {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawActionLabel(globalCtx->state.gfxCtx, (void*)(u32)interfaceCtx->do_actionSegment);
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_DrawActionLabel(globalCtx->state.gfxCtx, (void*)((u32)interfaceCtx->do_actionSegment + 0x180));
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
gDPPipeSync(gfxCtx->overlay.p++);
func_8008A994(interfaceCtx);
Format all src C files
2020-03-22 21:19:43 +00:00
if ((pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 3)) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Inventory Equip Effects
gSPSegment(gfxCtx->overlay.p++, 0x08, pauseCtx->unk_128);
func_80094A14(globalCtx->state.gfxCtx);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
First proper commit.
2020-03-17 04:31:30 +00:00
gSPMatrix(gfxCtx->overlay.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD);
pauseCtx->vtx_168[16].v.ob[0] = pauseCtx->vtx_168[18].v.ob[0] = pauseCtx->unk_254 / 10;
Format all src C files
2020-03-22 21:19:43 +00:00
pauseCtx->vtx_168[17].v.ob[0] = pauseCtx->vtx_168[19].v.ob[0] =
pauseCtx->vtx_168[16].v.ob[0] + WREG(90) / 10;
First proper commit.
2020-03-17 04:31:30 +00:00
pauseCtx->vtx_168[16].v.ob[1] = pauseCtx->vtx_168[17].v.ob[1] = pauseCtx->unk_256 / 10;
Format all src C files
2020-03-22 21:19:43 +00:00
pauseCtx->vtx_168[18].v.ob[1] = pauseCtx->vtx_168[19].v.ob[1] =
pauseCtx->vtx_168[16].v.ob[1] - WREG(90) / 10;
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (pauseCtx->unk_24E < 0xBF) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Normal Equip (icon goes from the inventory slot to the C button when equipping it)
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, pauseCtx->unk_258);
First proper commit.
2020-03-17 04:31:30 +00:00
gSPVertex(gfxCtx->overlay.p++, &pauseCtx->vtx_168[16], 4, 0);
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1, gItemIcons[pauseCtx->unk_24E]);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 0, 0x0000, G_TX_LOADTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPLoadSync(gfxCtx->overlay.p++);
gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 1023, 128);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 8, 0x0000, G_TX_RENDERTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPSetTileSize(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 124, 124);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
// Magic Arrow Equip Effect
phi_s3_2 = pauseCtx->unk_24E - 0xBF;
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, sMagicArrowEffectsR[phi_s3_2], sMagicArrowEffectsG[phi_s3_2],
First proper commit.
2020-03-17 04:31:30 +00:00
sMagicArrowEffectsB[phi_s3_2], pauseCtx->unk_258);
Format all src C files
2020-03-22 21:19:43 +00:00
if ((pauseCtx->unk_258 > 0) && (pauseCtx->unk_258 < 0xFF)) {
First proper commit.
2020-03-17 04:31:30 +00:00
phi_s3_2 = (pauseCtx->unk_258 / 8) / 2;
Format all src C files
2020-03-22 21:19:43 +00:00
pauseCtx->vtx_168[16].v.ob[0] = pauseCtx->vtx_168[18].v.ob[0] =
pauseCtx->vtx_168[16].v.ob[0] - phi_s3_2;
pauseCtx->vtx_168[17].v.ob[0] = pauseCtx->vtx_168[19].v.ob[0] =
pauseCtx->vtx_168[16].v.ob[0] + phi_s3_2 * 2 + 32;
pauseCtx->vtx_168[16].v.ob[1] = pauseCtx->vtx_168[17].v.ob[1] =
pauseCtx->vtx_168[16].v.ob[1] + phi_s3_2;
pauseCtx->vtx_168[18].v.ob[1] = pauseCtx->vtx_168[19].v.ob[1] =
pauseCtx->vtx_168[16].v.ob[1] - phi_s3_2 * 2 - 32;
First proper commit.
2020-03-17 04:31:30 +00:00
}
gSPVertex(gfxCtx->overlay.p++, &pauseCtx->vtx_168[16], 4, 0);
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_080895C0);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPLoadSync(gfxCtx->overlay.p++);
gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 511, 512);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPSetTileSize(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 124, 124);
}
gSP1Quadrangle(gfxCtx->overlay.p++, 0, 2, 3, 1, 0);
}
func_80094520(globalCtx->state.gfxCtx);
Format all src C files
2020-03-22 21:19:43 +00:00
if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.minigameState != 1) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Carrots rendering if the action corresponds to riding a horse
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->unk_1EE == 8) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Load Carrot Icon
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1, &D_02002100);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 0, 0x0000, G_TX_LOADTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPLoadSync(gfxCtx->overlay.p++);
gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 255, 256);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 4, 0x0000, G_TX_RENDERTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMASK, G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPSetTileSize(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 60, 60);
// Draw 6 carrots
phi_s1 = ZREG(14);
Format all src C files
2020-03-22 21:19:43 +00:00
for (phi_s3 = 1; phi_s3 < 7; phi_s3++) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Carrot Color (based on availability)
Run formatter with changes
2020-03-23 23:11:21 +00:00
if ((interfaceCtx->unk_23A == 0) || (interfaceCtx->unk_23A < phi_s3)) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0, 150, 255, interfaceCtx->aAlpha);
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->aAlpha);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, phi_s1 << 2, ZREG(15) << 2, (phi_s1 + 16) << 2,
(ZREG(15) + 16) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
phi_s1 += 16;
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
// Score for the Horseback Archery
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, interfaceCtx->bAlpha);
First proper commit.
2020-03-17 04:31:30 +00:00
// Target Icon
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_02002600);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPLoadSync(gfxCtx->overlay.p++);
gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 383, 342);
gDPPipeSync(gfxCtx->overlay.p++);
Format all src C files
2020-03-22 21:19:43 +00:00
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 6, 0x0000, G_TX_RENDERTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPSetTileSize(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 92, 60);
Format all src C files
2020-03-22 21:19:43 +00:00
gSPTextureRectangle(gfxCtx->overlay.p++, (WREG(32) + 28) << 2, ZREG(15) << 2, (WREG(32) + 52) << 2,
(ZREG(15) + 16) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
// Score Counter
gDPPipeSync(gfxCtx->overlay.p++);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
First proper commit.
2020-03-17 04:31:30 +00:00
phi_s0 = 0;
phi_s1 = WREG(32) + 6 * 9;
Format all src C files
2020-03-22 21:19:43 +00:00
for (phi_s3 = 0; phi_s3 < 4; phi_s3++) {
if (sHBAScoreDigits[phi_s3] != 0 || (phi_s0 != 0) || (phi_s3 >= 3)) {
gfxCtx->overlay.p =
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[sHBAScoreDigits[phi_s3]], 8, 16, phi_s1,
ZREG(15) - 2, sDigitWidth[0], VREG(42), VREG(43) * 2, VREG(43) * 2);
First proper commit.
2020-03-17 04:31:30 +00:00
phi_s1 += 9;
phi_s0++;
}
}
gDPPipeSync(gfxCtx->overlay.p++);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.timer2State == 5) && (func_8010BDBC(&globalCtx->msgCtx) == 5)) {
First proper commit.
2020-03-17 04:31:30 +00:00
// Trade quest timer reached 0
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.cutsceneIndex = 0;
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->sceneLoadFlag = 0x14;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
globalCtx->fadeTransition = 3;
gSaveContext.timer2State = 0;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE6 = 40;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) &&
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) &&
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS) &&
(gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KNIFE)) {
if (gSaveContext.buttonStatus[0] != BTN_ENABLED) {
gSaveContext.equips.buttonItems[0] = gSaveContext.buttonStatus[0];
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.equips.buttonItems[0] = ITEM_NONE;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
// Revert any spoiling trade quest items
Format all src C files
2020-03-22 21:19:43 +00:00
for (phi_s3 = 0; phi_s3 < ARRAY_COUNT(gSpoilingItems); phi_s3++) {
En_Kz OK (#176) * start kz * remove irrelevant file * kz progress * en_kz progress * match kz switch * progress * kz OK * kz OK * sync * kz done * delete asm files * pr suggestions 1
2020-05-29 21:20:00 +00:00
if (INV_CONTENT(ITEM_TRADE_ADULT) == gSpoilingItems[phi_s3]) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.eventInf[0] &= 0x7F80;
osSyncPrintf("EVENT_INF=%x\n", gSaveContext.eventInf[0]);
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->nextEntranceIndex = sSpoilingItemEntrances[phi_s3];
INV_CONTENT(gSpoilingItemReverts[phi_s3]) = gSpoilingItemReverts[phi_s3];
Format all src C files
2020-03-22 21:19:43 +00:00
for (phi_s0 = 1; phi_s0 < 4; phi_s0++) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.equips.buttonItems[phi_s0] == gSpoilingItems[phi_s3]) {
gSaveContext.equips.buttonItems[phi_s0] = gSpoilingItemReverts[phi_s3];
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadItemIcon1(globalCtx, phi_s0);
}
}
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (globalCtx->unk_10A20 == 0) &&
(msgCtx->msgMode == 0) && !(player->stateFlags2 & 0x01000000) && (globalCtx->sceneLoadFlag == 0) &&
Decompiles most FBDemo and transition functions (#92) * Decompile fbdemo (transition) files * run format.sh * reformat vtx array, fill in a couple unk * match TransitionTriforce_IsDone * add VTX macro, add DW_ wrapping around triangle macros * use new VTX macro, name graphic assets * Naming updates * pr updates * naming updates * remove symbols for COLOR_BUFFER, D_08000000, and D_09000000
2020-04-30 18:41:09 +00:00
(globalCtx->transitionMode == 0) && !Gameplay_InCsMode(globalCtx) && (gSaveContext.minigameState != 1) &&
First proper commit.
2020-03-17 04:31:30 +00:00
(globalCtx->unk_11E5C < 2) &&
Format all src C files
2020-03-22 21:19:43 +00:00
!((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) {
First proper commit.
2020-03-17 04:31:30 +00:00
sp274 = 0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
switch (gSaveContext.timer1State) {
First proper commit.
2020-03-17 04:31:30 +00:00
case 1:
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 2;
gSaveContext.timer1Value = gSaveContext.health >> 1;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE0 = D_8015FFE2 = 20;
break;
case 2:
D_8015FFE2--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_8015FFE2 == 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 3;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE2 = 20;
}
break;
case 5:
case 11:
D_8015FFE0 = D_8015FFE2 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1State == 5) {
gSaveContext.timer1State = 6;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 12;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 6:
case 12:
D_8015FFE2--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_8015FFE2 == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE2 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1State == 6) {
gSaveContext.timer1State = 7;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 13;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
break;
case 3:
case 7:
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
phi_s3 = (gSaveContext.timerX[0] - 26) / D_8015FFE2;
gSaveContext.timerX[0] -= phi_s3;
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.healthCapacity > 0xA0) {
phi_s3 = (gSaveContext.timerY[0] - 54) / D_8015FFE2;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
phi_s3 = (gSaveContext.timerY[0] - 46) / D_8015FFE2;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerY[0] -= phi_s3;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE2--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_8015FFE2 == 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerX[0] = 26;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE2 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.healthCapacity > 0xA0) {
gSaveContext.timerY[0] = 54;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerY[0] = 46;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1State == 3) {
gSaveContext.timer1State = 4;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 8;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
case 4:
case 8:
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.timer1State == 4) || (gSaveContext.timer1State == 8)) {
if (gSaveContext.healthCapacity > 0xA0) {
gSaveContext.timerY[0] = 54;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerY[0] = 46;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.timer1State >= 3) && (msgCtx->unk_E300 == 0)) {
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE0--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_8015FFE0 == 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1Value != 0) {
gSaveContext.timer1Value--;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE0 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1Value == 0) {
gSaveContext.timer1State = 10;
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_80125A5C != 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.health = 0;
globalCtx->unk_11D58(globalCtx, -(gSaveContext.health + 2));
}
D_80125A5C = 0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
} else if (gSaveContext.timer1Value > 60) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sTimerDigits[4] == 1) {
Format all src C files
2020-03-22 21:19:43 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
} else if (gSaveContext.timer1Value >= 11) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sTimerDigits[4] & 1) {
Format all src C files
2020-03-22 21:19:43 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
break;
case 13:
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
phi_s3 = (gSaveContext.timerX[0] - 26) / D_8015FFE2;
gSaveContext.timerX[0] -= phi_s3;
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.healthCapacity > 0xA0) {
phi_s3 = (gSaveContext.timerY[0] - 54) / D_8015FFE2;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
phi_s3 = (gSaveContext.timerY[0] - 46) / D_8015FFE2;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerY[0] -= phi_s3;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE2--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_8015FFE2 == 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerX[0] = 26;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE2 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.healthCapacity > 0xA0) {
gSaveContext.timerY[0] = 54;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerY[0] = 46;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 14;
First proper commit.
2020-03-17 04:31:30 +00:00
}
case 14:
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1State == 14) {
if (gSaveContext.healthCapacity > 0xA0) {
gSaveContext.timerY[0] = 54;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerY[0] = 46;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1State >= 3) {
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE0--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_8015FFE0 == 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1Value++;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE0 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1Value == 3599) {
gSaveContext.timer1State = 15;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE2 = 40;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
break;
case 10:
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer2State != 0) {
gSaveContext.timerX[1] = 140;
gSaveContext.timerY[1] = 80;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE4 = D_8015FFE6 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer2State < 7) {
gSaveContext.timer2State = 2;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2State = 8;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 0;
First proper commit.
2020-03-17 04:31:30 +00:00
}
break;
case 15:
break;
default:
sp274 = 1;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
switch (gSaveContext.timer2State) {
First proper commit.
2020-03-17 04:31:30 +00:00
case 1:
case 7:
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerX[1] = 140;
gSaveContext.timerY[1] = 80;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE4 = D_8015FFE6 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer2State == 1) {
gSaveContext.timer2State = 2;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2State = 8;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 2:
case 8:
D_8015FFE6--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_8015FFE6 == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE6 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer2State == 2) {
gSaveContext.timer2State = 3;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2State = 9;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
break;
case 3:
case 9:
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
osSyncPrintf("event_xp[1]=%d, event_yp[1]=%d TOTAL_EVENT_TM=%d\n", gSaveContext.timerX[1],
gSaveContext.timerY[1], gSaveContext.timer2Value);
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
phi_s3 = (gSaveContext.timerX[1] - 26) / D_8015FFE2;
gSaveContext.timerX[1] -= phi_s3;
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.healthCapacity > 0xA0) {
phi_s3 = (gSaveContext.timerY[1] - 54) / D_8015FFE6;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
phi_s3 = (gSaveContext.timerY[1] - 46) / D_8015FFE6;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerY[1] -= phi_s3;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE6--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_8015FFE6 == 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerX[1] = 26;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE6 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.healthCapacity > 0xA0) {
gSaveContext.timerY[1] = 54;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerY[1] = 46;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer2State == 3) {
gSaveContext.timer2State = 4;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2State = 10;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
case 4:
case 10:
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.timer2State == 4) || (gSaveContext.timer2State == 10)) {
if (gSaveContext.healthCapacity > 0xA0) {
gSaveContext.timerY[1] = 54;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerY[1] = 46;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer2State >= 3) {
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE4--;
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_8015FFE4 == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE4 = 20;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer2State == 4) {
gSaveContext.timer2Value--;
osSyncPrintf("TOTAL_EVENT_TM=%d\n", gSaveContext.timer2Value);
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer2Value <= 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
if (!Flags_GetSwitch(globalCtx, 0x37) ||
((globalCtx->sceneNum != SCENE_GANON_DEMO) &&
(globalCtx->sceneNum != SCENE_GANON_FINAL) &&
(globalCtx->sceneNum != SCENE_GANON_SONOGO) &&
Format all src C files
2020-03-22 21:19:43 +00:00
(globalCtx->sceneNum != SCENE_GANONTIKA_SONOGO))) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2State = 5;
gSaveContext.cutsceneIndex = 0;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE6 = 40;
En_Heishi1 and Eff_Ss_Solder_Srch_Ball OK (#234) * progress * init ok and merge master * enheishi1 and srchball OK * cleanup * cleanup * cleanup * more cleanup * done * more comments * add file headers * some review comments * move vectors * more review comments * angle in decimal * add prototype * semicolon would be good * fix * make unset actor ids 0 * reword comment * no &
2020-07-09 19:12:03 +00:00
func_8010B680(globalCtx, 0x71B0, NULL);
First proper commit.
2020-03-17 04:31:30 +00:00
func_8002DF54(globalCtx, 0, 8);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2State = 6;
First proper commit.
2020-03-17 04:31:30 +00:00
D_8015FFE6 = 40;
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer2Value > 60) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sTimerDigits[4] == 1) {
Format all src C files
2020-03-22 21:19:43 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
} else if (gSaveContext.timer2Value > 10) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (sTimerDigits[4] & 1) {
Format all src C files
2020-03-22 21:19:43 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4,
&D_801333E0, &D_801333E0, &D_801333E8);
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2Value++;
if (gSaveContext.eventInf[1] & 1) {
if (gSaveContext.timer2Value == 240) {
En_Heishi1 and Eff_Ss_Solder_Srch_Ball OK (#234) * progress * init ok and merge master * enheishi1 and srchball OK * cleanup * cleanup * cleanup * more cleanup * done * more comments * add file headers * some review comments * move vectors * more review comments * angle in decimal * add prototype * semicolon would be good * fix * make unset actor ids 0 * reword comment * no &
2020-07-09 19:12:03 +00:00
func_8010B680(globalCtx, 0x6083, NULL);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2State = 0;
gSaveContext.eventInf[1] &= ~1;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.timer2Value % 60) == 0) {
Format all src C files
2020-03-22 21:19:43 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0,
&D_801333E0, &D_801333E8);
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
break;
case 6:
D_8015FFE6--;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (D_8015FFE6 == 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer2State = 0;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
Format all src C files
2020-03-22 21:19:43 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (((gSaveContext.timer1State != 0) && (gSaveContext.timer1State != 10)) ||
(gSaveContext.timer2State != 0)) {
First proper commit.
2020-03-17 04:31:30 +00:00
sTimerDigits[0] = sTimerDigits[1] = sTimerDigits[3] = 0;
sTimerDigits[2] = 10; // digit 10 is used as ':' (colon)
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1State != 0) {
sTimerDigits[4] = gSaveContext.timer1Value;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
sTimerDigits[4] = gSaveContext.timer2Value;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
while (sTimerDigits[4] >= 60) {
First proper commit.
2020-03-17 04:31:30 +00:00
sTimerDigits[1]++;
Format all src C files
2020-03-22 21:19:43 +00:00
if (sTimerDigits[1] >= 10) {
First proper commit.
2020-03-17 04:31:30 +00:00
sTimerDigits[1] -= 10;
sTimerDigits[0]++;
}
sTimerDigits[4] -= 60;
}
Format all src C files
2020-03-22 21:19:43 +00:00
while (sTimerDigits[4] >= 10) {
First proper commit.
2020-03-17 04:31:30 +00:00
sTimerDigits[4] -= 10;
sTimerDigits[3]++;
}
// Clock Icon
gDPPipeSync(gfxCtx->overlay.p++);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(gfxCtx->overlay.p++, 0, 0, 0, 0);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02002000, 16, 16, gSaveContext.timerX[sp274],
gSaveContext.timerY[sp274] + 2, 16, 16, 1024, 1024);
First proper commit.
2020-03-17 04:31:30 +00:00
// Timer Counter
gDPPipeSync(gfxCtx->overlay.p++);
Tidy up known render and combine modes
2020-04-05 19:41:49 +00:00
gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1State != 0) {
if ((gSaveContext.timer1Value < 10) && (gSaveContext.timer1State < 11)) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 50, 0, 255);
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 255, 255);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.timer2Value < 10) && (gSaveContext.timer2State < 6)) {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 50, 0, 255);
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 255, 255, 0, 255);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
for (phi_s3 = 0; phi_s3 < 5; phi_s3++) {
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[sTimerDigits[phi_s3]], 8, 16,
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timerX[sp274] + sTimerDigitLeftPos[phi_s3],
gSaveContext.timerY[sp274], sDigitWidth[phi_s3], VREG(42),
Decompile z_rcp.c (1 non matching left)
2020-03-29 16:43:45 +00:00
VREG(43) * 2, VREG(43) * 2);
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
}
}
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (pauseCtx->flag == 3) {
Decompile flg_set.c (#200) * Decompile flg_set.c * Use a for loop and rename func_8002AAB0 * move the flag set array inside the function
2020-06-09 22:14:18 +00:00
FlagSet_Update(globalCtx);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->unk_244 != 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
gDPPipeSync(gfxCtx->overlay.p++);
gSPDisplayList(gfxCtx->overlay.p++, sSetupDL_80125A60);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0, 0, 0, interfaceCtx->unk_244);
First proper commit.
2020-03-17 04:31:30 +00:00
gDPFillRectangle(gfxCtx->overlay.p++, 0, 0, gScreenWidth - 1, gScreenHeight - 1);
}
Fixes in PR #50 (3) - Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps - Rename gfxArr to dispRefs
2020-04-05 17:29:30 +00:00
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 4269);
First proper commit.
2020-03-17 04:31:30 +00:00
}
#else
s16 D_8015FFE0;
s16 D_8015FFE2;
s16 D_8015FFE4;
s16 D_8015FFE6;
s16 sTimerDigits[5];
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_Draw.s")
#endif
#ifdef NON_MATCHING
// regalloc and minor ordering differences
Format all src C files
2020-03-22 21:19:43 +00:00
void Interface_Update(GlobalContext* globalCtx) {
First proper commit.
2020-03-17 04:31:30 +00:00
static u8 D_80125B60 = 0;
static s16 D_80125B64 = 0;
MessageContext* msgCtx = &globalCtx->msgCtx;
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
Player* player = PLAYER;
Format all src C files
2020-03-22 21:19:43 +00:00
s16 alpha; // sp+0x3A
First proper commit.
2020-03-17 04:31:30 +00:00
s16 alpha1; // sp+0x38
u16 action;
Input* input = &globalCtx->state.input[2];
Decompile code_8008E6A0.c / Add CHECK_PAD macro (#156) * Decompile code_8008E6A0.c * Delete "counter" file
2020-05-22 12:33:10 +00:00
if (CHECK_PAD(input->press, L_JPAD)) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.language = 0;
osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language);
Decompile code_8008E6A0.c / Add CHECK_PAD macro (#156) * Decompile code_8008E6A0.c * Delete "counter" file
2020-05-22 12:33:10 +00:00
} else if (CHECK_PAD(input->press, U_JPAD)) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.language = 1;
osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language);
Decompile code_8008E6A0.c / Add CHECK_PAD macro (#156) * Decompile code_8008E6A0.c * Delete "counter" file
2020-05-22 12:33:10 +00:00
} else if (CHECK_PAD(input->press, R_JPAD)) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.language = 2;
osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language);
}
Format all src C files
2020-03-22 21:19:43 +00:00
if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.minigameState == 1) || (gSaveContext.sceneSetupIndex < 4) ||
((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.sceneSetupIndex == 4))) {
Format all src C files
2020-03-22 21:19:43 +00:00
if ((msgCtx->msgMode == 0) || ((msgCtx->msgMode != 0) && (globalCtx->sceneNum == SCENE_BOWLING))) {
if (globalCtx->unk_10A20 == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
func_80083108(globalCtx);
}
}
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
switch (gSaveContext.unk_13E8) {
First proper commit.
2020-03-17 04:31:30 +00:00
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
case 8:
case 9:
case 10:
case 11:
case 12:
case 13:
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
alpha = 255 - (gSaveContext.unk_13EC << 5);
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (alpha < 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
alpha = 0;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
func_80082850(globalCtx, alpha);
gSaveContext.unk_13EC++;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (alpha == 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13E8 = 0;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 50:
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
alpha = 255 - (gSaveContext.unk_13EC << 5);
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (alpha < 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
alpha = 0;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
alpha1 = 0xFF - alpha;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (alpha1 >= 0xFF) {
First proper commit.
2020-03-17 04:31:30 +00:00
alpha1 = 0xFF;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf("case 50 : alpha=%d alpha1=%d\n", alpha, alpha1);
func_80082644(globalCtx, alpha1);
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->healthAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->healthAlpha = alpha1;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->magicAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->magicAlpha = alpha1;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
switch (globalCtx->sceneNum) {
First proper commit.
2020-03-17 04:31:30 +00:00
case SCENE_SPOT00:
case SCENE_SPOT01:
case SCENE_SPOT02:
case SCENE_SPOT03:
case SCENE_SPOT04:
case SCENE_SPOT05:
case SCENE_SPOT06:
case SCENE_SPOT07:
case SCENE_SPOT08:
case SCENE_SPOT09:
case SCENE_SPOT10:
case SCENE_SPOT11:
case SCENE_SPOT12:
case SCENE_SPOT13:
case SCENE_SPOT15:
case SCENE_SPOT16:
case SCENE_SPOT17:
case SCENE_SPOT18:
case SCENE_SPOT20:
case SCENE_GANON_TOU:
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->minimapAlpha < 170) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = alpha1;
Run formatter with changes
2020-03-23 23:11:21 +00:00
} else {
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
interfaceCtx->minimapAlpha = 170;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
default:
Change Colors To Decimal (#260) * fix colliderinit typo * convert as many colors i can find to decimal * fix GPACK_RGBA5551, merge fhgFire * fix remaining colors * remove unwanted file * alpha as 1
2020-07-17 01:37:53 +00:00
if (interfaceCtx->minimapAlpha != 255) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->minimapAlpha = alpha1;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
}
gSaveContext.unk_13EC++;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (alpha1 == 0xFF) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13E8 = 0;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
break;
case 52:
gSaveContext.unk_13E8 = 1;
func_80082850(globalCtx, 0);
gSaveContext.unk_13E8 = 0;
default:
break;
}
Decompile z_map_exp.c (2 non matchings left) (#104) Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 15:09:20 +00:00
Map_Update(globalCtx);
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.healthAccumulator != 0) {
gSaveContext.healthAccumulator -= 4;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.health += 4;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if ((gSaveContext.health & 0xF) < 4) {
First proper commit.
2020-03-17 04:31:30 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
osSyncPrintf("now_life=%d max_life=%d\n", gSaveContext.health, gSaveContext.healthCapacity);
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.health >= gSaveContext.healthCapacity) {
gSaveContext.health = gSaveContext.healthCapacity;
Format all src C files
2020-03-22 21:19:43 +00:00
osSyncPrintf("S_Private.now_life=%d S_Private.max_life=%d\n", gSaveContext.health,
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.healthCapacity);
gSaveContext.healthAccumulator = 0;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Health_HandleCriticalAlarm(globalCtx);
D_80125A58 = func_8008F2F8(globalCtx);
Format all src C files
2020-03-22 21:19:43 +00:00
if (D_80125A58 == 1) {
if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == 2) {
First proper commit.
2020-03-17 04:31:30 +00:00
D_80125A58 = 0;
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) {
if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == 3) {
First proper commit.
2020-03-17 04:31:30 +00:00
D_80125A58 = 0;
}
}
Health_UpdateData(globalCtx);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.timer1State >= 3) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) &&
Format all src C files
2020-03-22 21:19:43 +00:00
(msgCtx->msgMode == 0) && !(player->stateFlags2 & 0x01000000) && (globalCtx->sceneLoadFlag == 0) &&
Decompiles most FBDemo and transition functions (#92) * Decompile fbdemo (transition) files * run format.sh * reformat vtx array, fill in a couple unk * match TransitionTriforce_IsDone * add VTX macro, add DW_ wrapping around triangle macros * use new VTX macro, name graphic assets * Naming updates * pr updates * naming updates * remove symbols for COLOR_BUFFER, D_08000000, and D_09000000
2020-04-30 18:41:09 +00:00
(globalCtx->transitionMode == 0) && !Gameplay_InCsMode(globalCtx)) {}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.rupeeAccumulator != 0) {
if (gSaveContext.rupeeAccumulator > 0) {
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.rupees < CUR_CAPACITY(UPG_WALLET)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.rupeeAccumulator--;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.rupees++;
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
// Translates to: "Rupee Amount MAX = %d"
osSyncPrintf("ルピー数ＭＡＸ = %d\n", CUR_CAPACITY(UPG_WALLET));
gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.rupeeAccumulator = 0;
First proper commit.
2020-03-17 04:31:30 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (gSaveContext.rupees != 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.rupeeAccumulator <= -50) {
gSaveContext.rupeeAccumulator += 10;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.rupees -= 10;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if (gSaveContext.rupees < 0) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.rupees = 0;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.rupeeAccumulator++;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.rupees--;
Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.rupeeAccumulator = 0;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
switch (interfaceCtx->unk_1EC) {
First proper commit.
2020-03-17 04:31:30 +00:00
case 1:
interfaceCtx->unk_1F4 = interfaceCtx->unk_1F4 + (31400.0f / WREG(5));
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->unk_1F4 >= 15700.0f) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->unk_1F4 = -15700.0f;
interfaceCtx->unk_1EC = 2;
}
break;
case 2:
interfaceCtx->unk_1F4 = interfaceCtx->unk_1F4 + (31400.0f / WREG(5));
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->unk_1F4 >= 0.0f) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->unk_1F4 = 0.0f;
interfaceCtx->unk_1EC = 0;
interfaceCtx->unk_1EE = interfaceCtx->unk_1F0;
action = interfaceCtx->unk_1EE;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if ((action == 0x1D) || (action == 0x1E)) {
First proper commit.
2020-03-17 04:31:30 +00:00
action = 0xA;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadActionLabel(interfaceCtx, action, 0);
}
break;
case 3:
interfaceCtx->unk_1F4 = interfaceCtx->unk_1F4 + (31400.0f / WREG(5));
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->unk_1F4 >= 15700.0f) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->unk_1F4 = -15700.0f;
interfaceCtx->unk_1EC = 2;
}
break;
case 4:
interfaceCtx->unk_1F4 = interfaceCtx->unk_1F4 + (31400.0f / WREG(5));
Format all src C files
2020-03-22 21:19:43 +00:00
if (interfaceCtx->unk_1F4 >= 0.0f) {
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->unk_1F4 = 0.0f;
interfaceCtx->unk_1EC = 0;
interfaceCtx->unk_1EE = interfaceCtx->unk_1F0;
action = interfaceCtx->unk_1EE;
Run formatter with changes
2020-03-23 23:11:21 +00:00
if ((action == 0x1D) || (action == 0x1E)) {
First proper commit.
2020-03-17 04:31:30 +00:00
action = 0xA;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Interface_LoadActionLabel(interfaceCtx, action, 0);
}
break;
}
WREG(7) = interfaceCtx->unk_1F4;
if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (msgCtx->msgMode == 0) &&
Decompiles most FBDemo and transition functions (#92) * Decompile fbdemo (transition) files * run format.sh * reformat vtx array, fill in a couple unk * match TransitionTriforce_IsDone * add VTX macro, add DW_ wrapping around triangle macros * use new VTX macro, name graphic assets * Naming updates * pr updates * naming updates * remove symbols for COLOR_BUFFER, D_08000000, and D_09000000
2020-04-30 18:41:09 +00:00
(globalCtx->sceneLoadFlag == 0) && (globalCtx->unk_10A20 == 0) && (globalCtx->transitionMode == 0) &&
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
((globalCtx->csCtx.state == 0) || !func_8008E988(globalCtx))) {
if ((gSaveContext.magicAcquired != 0) && (gSaveContext.magicLevel == 0)) {
gSaveContext.magicLevel = gSaveContext.doubleMagic + 1;
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_13F0 = 8;
osSyncPrintf(VT_FGCOL(YELLOW));
// Translates to: "Magic Start!!!!!!!!!"
osSyncPrintf("魔法スター─────ト！！！！！！！！！\n");
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
osSyncPrintf("MAGIC_MAX=%d\n", gSaveContext.magicLevel);
First proper commit.
2020-03-17 04:31:30 +00:00
osSyncPrintf("MAGIC_NOW=%d\n", gSaveContext.magic);
osSyncPrintf("Z_MAGIC_NOW_NOW=%d\n", gSaveContext.unk_13F6);
osSyncPrintf("Z_MAGIC_NOW_MAX=%d\n", gSaveContext.unk_13F4);
osSyncPrintf(VT_RST);
}
Interface_UpdateMagicBar(globalCtx);
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.timer1State == 0) {
Format all src C files
2020-03-22 21:19:43 +00:00
if (((D_80125A58 == 1) || (D_80125A58 == 2) || (D_80125A58 == 4)) && ((gSaveContext.health >> 1) != 0)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.timer1State = 1;
gSaveContext.timerX[0] = 140;
gSaveContext.timerY[0] = 80;
First proper commit.
2020-03-17 04:31:30 +00:00
D_80125A5C = 1;
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (((D_80125A58 == 0) || (D_80125A58 == 3)) && (gSaveContext.timer1State < 5)) {
gSaveContext.timer1State = 0;
First proper commit.
2020-03-17 04:31:30 +00:00
}
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.minigameState == 1) {
gSaveContext.minigameScore += interfaceCtx->unk_23C;
First proper commit.
2020-03-17 04:31:30 +00:00
interfaceCtx->unk_23C = 0;
Format all src C files
2020-03-22 21:19:43 +00:00
if (sHBAScoreTier == 0) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.minigameScore >= 1000) {
First proper commit.
2020-03-17 04:31:30 +00:00
sHBAScoreTier++;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if (sHBAScoreTier == 1) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (gSaveContext.minigameScore >= 1500) {
First proper commit.
2020-03-17 04:31:30 +00:00
sHBAScoreTier++;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
}
sHBAScoreDigits[1] = 0;
sHBAScoreDigits[0] = 0;
sHBAScoreDigits[2] = 0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
sHBAScoreDigits[3] = gSaveContext.minigameScore;
First proper commit.
2020-03-17 04:31:30 +00:00
Format all src C files
2020-03-22 21:19:43 +00:00
while (sHBAScoreDigits[3] >= 1000) {
First proper commit.
2020-03-17 04:31:30 +00:00
sHBAScoreDigits[0]++;
sHBAScoreDigits[3] -= 1000;
}
Format all src C files
2020-03-22 21:19:43 +00:00
while (sHBAScoreDigits[3] >= 100) {
First proper commit.
2020-03-17 04:31:30 +00:00
sHBAScoreDigits[1]++;
sHBAScoreDigits[3] -= 100;
}
Format all src C files
2020-03-22 21:19:43 +00:00
while (sHBAScoreDigits[3] >= 10) {
First proper commit.
2020-03-17 04:31:30 +00:00
sHBAScoreDigits[2]++;
sHBAScoreDigits[3] -= 10;
}
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.unk_1422 != 0) {
Run formatter with changes
2020-03-23 23:11:21 +00:00
if ((msgCtx->unk_E3F0 != 0x31) && (gSaveContext.unk_1422 == 1)) {
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->msgCtx.unk_E3EE = 4;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if (globalCtx->envCtx.unk_02 != 0) {
Format all src C files
2020-03-22 21:19:43 +00:00
if (gSaveContext.unk_1422 != 2) {
First proper commit.
2020-03-17 04:31:30 +00:00
D_80125B60 = 0;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.dayTime >= 0x4555) && (gSaveContext.dayTime <= 0xC001)) {
First proper commit.
2020-03-17 04:31:30 +00:00
D_80125B60 = 1;
Run formatter with changes
2020-03-23 23:11:21 +00:00
}
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_1422 = 2;
D_80125B64 = D_8011FB40;
D_8011FB40 = 400;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
} else if ((D_80125B60 == 0) && (gSaveContext.dayTime >= 0x4555) && (gSaveContext.dayTime <= 0xC001)) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_1422 = 0;
D_8011FB40 = D_80125B64;
globalCtx->msgCtx.unk_E3EE = 4;
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
} else if (gSaveContext.dayTime > 0xC001) {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_1422 = 0;
D_8011FB40 = D_80125B64;
globalCtx->msgCtx.unk_E3EE = 4;
}
Format all src C files
2020-03-22 21:19:43 +00:00
} else if ((globalCtx->roomCtx.curRoom.unk_03 != 1) && (interfaceCtx->restrictions.sunsSong != 3)) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
if ((gSaveContext.dayTime >= 0x4555) && (gSaveContext.dayTime < 0xC001)) {
gSaveContext.nextDayTime = 0;
globalCtx->fadeTransition = 4;
gSaveContext.nextTransition = 2;
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->unk_11DE9 = 1;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.nextDayTime = 0x8001;
globalCtx->fadeTransition = 5;
gSaveContext.nextTransition = 3;
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->unk_11DE9 = 1;
}
Format all src C files
2020-03-22 21:19:43 +00:00
if (globalCtx->sceneNum == SCENE_SPOT13) {
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
globalCtx->fadeTransition = 14;
gSaveContext.nextTransition = 14;
First proper commit.
2020-03-17 04:31:30 +00:00
}
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.respawnFlag = -2;
globalCtx->nextEntranceIndex = gSaveContext.entranceIndex;
First proper commit.
2020-03-17 04:31:30 +00:00
globalCtx->sceneLoadFlag = 0x14;
gSaveContext.unk_1422 = 0;
func_800F6964(30);
Decompile z_play.c and Match/Document some of z_view.c (#74) * Decompile z_play.c and Match/Document some of z_view.c Also fix the last non matching in z_sample.c and update some game state functions. * Suggestions from PR #74 * Fix undefined reference to Gameplay_DrawOverlay * Suggestion from PR #74 (2) * Fix a fake argument in func_800BC450
2020-04-16 21:36:12 +00:00
gSaveContext.seqIndex = 0xFF;
gSaveContext.nightSeqIndex = 0xFF;
Format all src C files
2020-03-22 21:19:43 +00:00
} else {
First proper commit.
2020-03-17 04:31:30 +00:00
gSaveContext.unk_1422 = 3;
}
}
}
#else
u8 D_80125B60 = 0;
s16 D_80125B64 = 0;
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_Update.s")
#endif
Reference in a new issue Copy permalink