summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/code_8012EC80.c6
-rw-r--r--src/code/sched.c1
-rw-r--r--src/code/z_en_item00.c4
-rw-r--r--src/code/z_game_over.c16
-rw-r--r--src/code/z_kaleido_setup.c8
-rw-r--r--src/code/z_lifemeter.c14
-rw-r--r--src/code/z_parameter.c1272
-rw-r--r--src/code/z_player_lib.c4
-rw-r--r--src/code/z_sram_NES.c71
9 files changed, 1302 insertions, 94 deletions
diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c
index e7ff5b7bf..07cb436cf 100644
--- a/src/code/code_8012EC80.c
+++ b/src/code/code_8012EC80.c
@@ -495,7 +495,7 @@ s32 Inventory_GetBtnBItem(PlayState* play) {
* Only changes shield
*/
void Inventory_ChangeEquipment(s16 value) {
- SET_EQUIP_VALUE(EQUIP_SHIELD, value);
+ SET_EQUIP_VALUE(EQUIP_TYPE_SHIELD, value);
}
/**
@@ -504,8 +504,8 @@ void Inventory_ChangeEquipment(s16 value) {
u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) {
Player* player = GET_PLAYER(play);
- if (GET_CUR_EQUIP_VALUE(EQUIP_SHIELD) != 0) {
- SET_EQUIP_VALUE(EQUIP_SHIELD, 0);
+ if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) != EQUIP_VALUE_SHIELD_NONE) {
+ SET_EQUIP_VALUE(EQUIP_TYPE_SHIELD, EQUIP_VALUE_SHIELD_NONE);
Player_SetEquipmentData(play, player);
return true;
}
diff --git a/src/code/sched.c b/src/code/sched.c
index 927a48f66..5f9cdf236 100644
--- a/src/code/sched.c
+++ b/src/code/sched.c
@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
#include "global.h"
#define RSP_DONE_MSG 667
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index 0e783e76c..10c33090c 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -224,7 +224,7 @@ void EnItem00_Init(Actor* thisx, PlayState* play) {
break;
case ITEM00_FLEXIBLE:
case ITEM00_BIG_FAIRY:
- func_80115908(play, 0x70);
+ Health_ChangeBy(play, 0x70);
break;
case ITEM00_BOMBS_A:
case ITEM00_BOMBS_B:
@@ -537,7 +537,7 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
break;
case ITEM00_FLEXIBLE:
case ITEM00_BIG_FAIRY:
- func_80115908(play, 0x70);
+ Health_ChangeBy(play, 0x70);
break;
case ITEM00_BOMBS_A:
case ITEM00_BOMBS_B:
diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c
index 18df07783..1375d1a4a 100644
--- a/src/code/z_game_over.c
+++ b/src/code/z_game_over.c
@@ -36,8 +36,8 @@ void GameOver_Update(PlayState* play) {
CUR_FORM_EQUIP(EQUIP_SLOT_B) != ITEM_SWORD_GILDED &&
CUR_FORM_EQUIP(EQUIP_SLOT_B) != ITEM_SWORD_DEITY) {
- if (gSaveContext.buttonStatus[0] != BTN_ENABLED) {
- CUR_FORM_EQUIP(EQUIP_SLOT_B) = gSaveContext.buttonStatus[0];
+ if (gSaveContext.buttonStatus[EQUIP_SLOT_B] != BTN_ENABLED) {
+ CUR_FORM_EQUIP(EQUIP_SLOT_B) = gSaveContext.buttonStatus[EQUIP_SLOT_B];
} else {
CUR_FORM_EQUIP(EQUIP_SLOT_B) = ITEM_NONE;
}
@@ -52,11 +52,11 @@ void GameOver_Update(PlayState* play) {
gSaveContext.eventInf[1] = 0;
gSaveContext.eventInf[2] = 0;
gSaveContext.eventInf[3] = 0;
- gSaveContext.buttonStatus[0] = BTN_ENABLED;
- gSaveContext.buttonStatus[1] = BTN_ENABLED;
- gSaveContext.buttonStatus[2] = BTN_ENABLED;
- gSaveContext.buttonStatus[3] = BTN_ENABLED;
- gSaveContext.buttonStatus[4] = BTN_ENABLED;
+ gSaveContext.buttonStatus[EQUIP_SLOT_B] = BTN_ENABLED;
+ gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_ENABLED;
+ gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_ENABLED;
+ gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_ENABLED;
+ gSaveContext.buttonStatus[EQUIP_SLOT_A] = BTN_ENABLED;
gSaveContext.unk_3F1E = 0;
gSaveContext.unk_3F20 = 0;
gSaveContext.unk_3F22 = 0;
@@ -73,7 +73,7 @@ void GameOver_Update(PlayState* play) {
gSaveContext.respawnFlag = -6;
}
gSaveContext.nextTransition = 2;
- gSaveContext.save.playerData.health = 48;
+ gSaveContext.save.playerData.health = 0x30;
gameOverCtx->state++;
if (INV_CONTENT(ITEM_MASK_DEKU) == ITEM_MASK_DEKU) {
gSaveContext.save.playerForm = PLAYER_FORM_HUMAN;
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index b5ec93f5a..3fc3f2e9b 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -124,10 +124,10 @@ void KaleidoSetup_Init(PlayState* play) {
pauseCtx->unk_258 = 11;
pauseCtx->unk_25A = 0;
- pauseCtx->unk_25E[PAUSE_0] = 999;
- pauseCtx->unk_25E[PAUSE_1] = XREG(94) + 3;
- pauseCtx->unk_25E[PAUSE_2] = 999;
- pauseCtx->unk_25E[PAUSE_3] = 999;
+ pauseCtx->cursorItem[PAUSE_0] = 999;
+ pauseCtx->cursorItem[PAUSE_1] = XREG(94) + 3;
+ pauseCtx->cursorItem[PAUSE_2] = 999;
+ pauseCtx->cursorItem[PAUSE_3] = 999;
pauseCtx->unk_268[PAUSE_0] = 0;
pauseCtx->unk_268[PAUSE_1] = XREG(94) + 3;
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c
index 900f46e8f..f33a949d8 100644
--- a/src/code/z_lifemeter.c
+++ b/src/code/z_lifemeter.c
@@ -415,16 +415,16 @@ void LifeMeter_UpdateSizeAndBeep(PlayState* play) {
u32 LifeMeter_IsCritical(void) {
s16 criticalThreshold;
- if (gSaveContext.save.playerData.healthCapacity <= 80) { // healthCapacity <= 5 hearts?
- criticalThreshold = 16;
+ if (gSaveContext.save.playerData.healthCapacity <= 0x50) {
+ criticalThreshold = 0x10;
- } else if (gSaveContext.save.playerData.healthCapacity <= 160) { // healthCapacity <= 10 hearts?
- criticalThreshold = 24;
+ } else if (gSaveContext.save.playerData.healthCapacity <= 0xA0) {
+ criticalThreshold = 0x18;
- } else if (gSaveContext.save.playerData.healthCapacity <= 240) { // healthCapacity <= 15 hearts?
- criticalThreshold = 32;
+ } else if (gSaveContext.save.playerData.healthCapacity <= 0xF0) {
+ criticalThreshold = 0x20;
} else {
- criticalThreshold = 44;
+ criticalThreshold = 0x2C;
}
if ((criticalThreshold >= gSaveContext.save.playerData.health) && (gSaveContext.save.playerData.health > 0)) {
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 44b1de152..a76cb36e0 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -1,4 +1,225 @@
#include "global.h"
+#include "interface/parameter_static/parameter_static.h"
+#include "interface/do_action_static/do_action_static.h"
+#include "misc/story_static/story_static.h"
+#include "overlays/gamestates/ovl_file_choose/z_file_choose.h"
+
+typedef struct {
+ /* 0x00 */ u8 scene;
+ /* 0x01 */ u8 flags1;
+ /* 0x02 */ u8 flags2;
+ /* 0x03 */ u8 flags3;
+} RestrictionFlags;
+
+Input D_801F5850[4];
+
+RestrictionFlags sRestrictionFlags[] = {
+ { SCENE_20SICHITAI2, 0x00, 0x00, 0x00 },
+ { SCENE_UNSET_1, 0x00, 0x00, 0x00 },
+ { SCENE_UNSET_2, 0x00, 0x00, 0x00 },
+ { SCENE_UNSET_3, 0x00, 0x00, 0x00 },
+ { SCENE_UNSET_4, 0x00, 0x00, 0x00 },
+ { SCENE_UNSET_5, 0x00, 0x00, 0x00 },
+ { SCENE_UNSET_6, 0x00, 0x00, 0x00 },
+ { SCENE_KAKUSIANA, 0x00, 0x00, 0x00 },
+ { SCENE_SPOT00, 0x00, 0x00, 0x00 },
+ { SCENE_UNSET_9, 0x00, 0x00, 0x00 },
+ { SCENE_WITCH_SHOP, 0x10, 0x30, 0xC1 },
+ { SCENE_LAST_BS, 0x00, 0x3F, 0x00 },
+ { SCENE_HAKASHITA, 0x00, 0x00, 0x00 },
+ { SCENE_AYASHIISHOP, 0x10, 0x30, 0xC1 },
+ { SCENE_UNSET_E, 0x00, 0x00, 0x00 },
+ { SCENE_UNSET_F, 0x00, 0x00, 0x00 },
+ { SCENE_OMOYA, 0x00, 0x33, 0x00 },
+ { SCENE_BOWLING, 0x10, 0x30, 0xC1 },
+ { SCENE_SONCHONOIE, 0x10, 0x30, 0xC1 },
+ { SCENE_IKANA, 0x00, 0x00, 0x00 },
+ { SCENE_KAIZOKU, 0x00, 0x00, 0x00 },
+ { SCENE_MILK_BAR, 0x10, 0x30, 0xC1 },
+ { SCENE_INISIE_N, 0x00, 0x00, 0x00 },
+ { SCENE_TAKARAYA, 0x10, 0x30, 0xC1 },
+ { SCENE_INISIE_R, 0x00, 0x00, 0x00 },
+ { SCENE_OKUJOU, 0x00, 0x3F, 0xF0 },
+ { SCENE_OPENINGDAN, 0x00, 0x00, 0x00 },
+ { SCENE_MITURIN, 0x00, 0x00, 0x00 },
+ { SCENE_13HUBUKINOMITI, 0x00, 0x00, 0x00 },
+ { SCENE_CASTLE, 0x00, 0x00, 0x00 },
+ { SCENE_DEKUTES, 0x10, 0x30, 0x01 },
+ { SCENE_MITURIN_BS, 0x00, 0x00, 0x00 },
+ { SCENE_SYATEKI_MIZU, 0x10, 0x30, 0xC1 },
+ { SCENE_HAKUGIN, 0x00, 0x00, 0x00 },
+ { SCENE_ROMANYMAE, 0x00, 0x00, 0x00 },
+ { SCENE_PIRATE, 0x00, 0x00, 0x00 },
+ { SCENE_SYATEKI_MORI, 0x10, 0x30, 0xC1 },
+ { SCENE_SINKAI, 0x00, 0x00, 0x00 },
+ { SCENE_YOUSEI_IZUMI, 0x00, 0x00, 0x00 },
+ { SCENE_KINSTA1, 0x00, 0x30, 0x00 },
+ { SCENE_KINDAN2, 0x00, 0x30, 0x00 },
+ { SCENE_TENMON_DAI, 0x00, 0x03, 0xC0 },
+ { SCENE_LAST_DEKU, 0x00, 0x3F, 0x00 },
+ { SCENE_22DEKUCITY, 0x00, 0x00, 0x00 },
+ { SCENE_KAJIYA, 0x00, 0x30, 0xC0 },
+ { SCENE_00KEIKOKU, 0x00, 0x00, 0x00 },
+ { SCENE_POSTHOUSE, 0x00, 0x30, 0xC1 },
+ { SCENE_LABO, 0x00, 0x30, 0xC1 },
+ { SCENE_DANPEI2TEST, 0x00, 0x30, 0x00 },
+ { SCENE_UNSET_31, 0x00, 0x00, 0x00 },
+ { SCENE_16GORON_HOUSE, 0x00, 0x00, 0x00 },
+ { SCENE_33ZORACITY, 0x00, 0x00, 0xC0 },
+ { SCENE_8ITEMSHOP, 0x00, 0x30, 0xC1 },
+ { SCENE_F01, 0x00, 0x00, 0x00 },
+ { SCENE_INISIE_BS, 0x00, 0x00, 0x00 },
+ { SCENE_30GYOSON, 0x00, 0x00, 0x00 },
+ { SCENE_31MISAKI, 0x00, 0x00, 0x00 },
+ { SCENE_TAKARAKUJI, 0x00, 0x30, 0xC1 },
+ { SCENE_UNSET_3A, 0x00, 0x00, 0x00 },
+ { SCENE_TORIDE, 0x00, 0x00, 0x00 },
+ { SCENE_FISHERMAN, 0x00, 0x30, 0xC1 },
+ { SCENE_GORONSHOP, 0x10, 0x30, 0xC1 },
+ { SCENE_DEKU_KING, 0x00, 0x30, 0xC0 },
+ { SCENE_LAST_GORON, 0x00, 0x3F, 0x00 },
+ { SCENE_24KEMONOMITI, 0x00, 0x00, 0x00 },
+ { SCENE_F01_B, 0x00, 0x30, 0x00 },
+ { SCENE_F01C, 0x00, 0x30, 0x00 },
+ { SCENE_BOTI, 0x00, 0x00, 0x00 },
+ { SCENE_HAKUGIN_BS, 0x00, 0x00, 0x00 },
+ { SCENE_20SICHITAI, 0x00, 0x00, 0x00 },
+ { SCENE_21MITURINMAE, 0x00, 0x00, 0x00 },
+ { SCENE_LAST_ZORA, 0x00, 0x3F, 0x00 },
+ { SCENE_11GORONNOSATO2, 0x00, 0x00, 0x00 },
+ { SCENE_SEA, 0x00, 0x00, 0x00 },
+ { SCENE_35TAKI, 0x00, 0x00, 0x00 },
+ { SCENE_REDEAD, 0x00, 0x00, 0x00 },
+ { SCENE_BANDROOM, 0x00, 0x30, 0xC0 },
+ { SCENE_11GORONNOSATO, 0x00, 0x00, 0x00 },
+ { SCENE_GORON_HAKA, 0x00, 0x00, 0x00 },
+ { SCENE_SECOM, 0x00, 0x3C, 0xC0 },
+ { SCENE_10YUKIYAMANOMURA, 0x00, 0x00, 0x00 },
+ { SCENE_TOUGITES, 0x00, 0x3F, 0xF0 },
+ { SCENE_DANPEI, 0x00, 0x30, 0x00 },
+ { SCENE_IKANAMAE, 0x00, 0x00, 0x00 },
+ { SCENE_DOUJOU, 0x00, 0x30, 0xC1 },
+ { SCENE_MUSICHOUSE, 0x00, 0x30, 0xC0 },
+ { SCENE_IKNINSIDE, 0x00, 0x3F, 0xC0 },
+ { SCENE_MAP_SHOP, 0x10, 0x30, 0xC1 },
+ { SCENE_F40, 0x00, 0x00, 0x00 },
+ { SCENE_F41, 0x00, 0x00, 0x00 },
+ { SCENE_10YUKIYAMANOMURA2, 0x00, 0x00, 0x00 },
+ { SCENE_14YUKIDAMANOMITI, 0x00, 0x00, 0x00 },
+ { SCENE_12HAKUGINMAE, 0x00, 0x00, 0x00 },
+ { SCENE_17SETUGEN, 0x00, 0x00, 0x00 },
+ { SCENE_17SETUGEN2, 0x00, 0x00, 0x00 },
+ { SCENE_SEA_BS, 0x00, 0x00, 0x00 },
+ { SCENE_RANDOM, 0x00, 0x00, 0x00 },
+ { SCENE_YADOYA, 0x10, 0x30, 0xC1 },
+ { SCENE_KONPEKI_ENT, 0x00, 0x00, 0x00 },
+ { SCENE_INSIDETOWER, 0x00, 0xFF, 0xC0 },
+ { SCENE_26SARUNOMORI, 0x00, 0x30, 0x00 },
+ { SCENE_LOST_WOODS, 0x00, 0x00, 0x00 },
+ { SCENE_LAST_LINK, 0x00, 0x3F, 0x00 },
+ { SCENE_SOUGEN, 0x00, 0x3F, 0x00 },
+ { SCENE_BOMYA, 0x10, 0x30, 0xC1 },
+ { SCENE_KYOJINNOMA, 0x00, 0x00, 0x00 },
+ { SCENE_KOEPONARACE, 0x00, 0x30, 0x00 },
+ { SCENE_GORONRACE, 0x00, 0x00, 0x00 },
+ { SCENE_TOWN, 0x00, 0x00, 0x00 },
+ { SCENE_ICHIBA, 0x00, 0x00, 0x00 },
+ { SCENE_BACKTOWN, 0x00, 0x00, 0x00 },
+ { SCENE_CLOCKTOWER, 0x00, 0x00, 0x00 },
+ { SCENE_ALLEY, 0x00, 0x00, 0x00 },
+};
+
+s16 D_801BF884 = 0; // pictoBox related
+s16 D_801BF888 = false; // pictoBox related
+
+s16 sHBAScoreTier = 0; // Remnant of OoT, non-functional
+
+u16 sMinigameScoreDigits[] = { 0, 0, 0, 0 };
+
+u16 sCUpInvisible = 0;
+u16 sCUpTimer = 0;
+
+s16 sMagicBarOutlinePrimRed = 255;
+s16 sMagicBarOutlinePrimGreen = 255;
+s16 sMagicBarOutlinePrimBlue = 255;
+s16 D_801BF8AC = 2; // sMagicBorderRatio
+s16 D_801BF8B0 = 1;
+
+s16 sExtraItemBases[] = {
+ ITEM_STICK, // ITEM_STICKS_5
+ ITEM_STICK, // ITEM_STICKS_10
+ ITEM_NUT, // ITEM_NUTS_5
+ ITEM_NUT, // ITEM_NUTS_10
+ ITEM_BOMB, // ITEM_BOMBS_5
+ ITEM_BOMB, // ITEM_BOMBS_10
+ ITEM_BOMB, // ITEM_BOMBS_20
+ ITEM_BOMB, // ITEM_BOMBS_30
+ ITEM_BOW, // ITEM_ARROWS_10
+ ITEM_BOW, // ITEM_ARROWS_30
+ ITEM_BOW, // ITEM_ARROWS_40
+ ITEM_BOMBCHU, // ITEM_ARROWS_50 !@bug this data is missing an ITEM_BOW, offsetting the rest by 1
+ ITEM_BOMBCHU, // ITEM_BOMBCHUS_20
+ ITEM_BOMBCHU, // ITEM_BOMBCHUS_10
+ ITEM_BOMBCHU, // ITEM_BOMBCHUS_1
+ ITEM_STICK, // ITEM_BOMBCHUS_5
+ ITEM_STICK, // ITEM_STICK_UPGRADE_20
+ ITEM_NUT, // ITEM_STICK_UPGRADE_30
+ ITEM_NUT, // ITEM_NUT_UPGRADE_30
+};
+
+s16 D_801BF8DC = 0;
+s16 D_801BF8E0 = 0;
+s16 D_801BF8E4 = 0;
+
+OSTime D_801BF8E8 = 0;
+OSTime D_801BF8F0 = 0;
+OSTime D_801BF8F8[] = {
+ 0, 0, 0, 0, 0, 0, 0,
+};
+OSTime D_801BF930[] = {
+ 0, 0, 0, 0, 0, 0, 0,
+};
+
+u8 D_801BF968 = false;
+u8 D_801BF96C = false;
+
+s16 D_801BF970 = 99;
+s16 D_801BF974 = 0;
+s16 D_801BF978 = 10;
+s16 D_801BF97C = 255;
+f32 D_801BF980 = 1.0f;
+s32 D_801BF984 = 0;
+
+Gfx D_801BF988[] = {
+ gsDPPipeSync(),
+ gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN |
+ G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH),
+ 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,
+ G_AC_NONE | G_ZS_PIXEL | G_RM_CLD_SURF | G_RM_CLD_SURF2),
+ gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE),
+ gsSPEndDisplayList(),
+};
+
+s16 D_801BF9B0 = 0;
+f32 D_801BF9B4[] = { 100.0f, 109.0f };
+s16 D_801BF9BC[] = { 0x226, 0x2A8, 0x2A8, 0x2A8 };
+s16 D_801BF9C4[] = { 0x9E, 0x9B };
+s16 D_801BF9C8[] = { 0x17, 0x16 };
+f32 D_801BF9CC[] = { -380.0f, -350.0f };
+s16 D_801BF9D4[] = { 0xA7, 0xE3 };
+s16 D_801BF9D8[] = { 0xF9, 0x10F };
+s16 D_801BF9DC[] = { 0x11, 0x12 };
+s16 D_801BF9E0[] = { 0x22, 0x12 };
+s16 D_801BF9E4[] = { 0x23F, 0x26C };
+s16 D_801BF9E8[] = { 0x26C, 0x26C };
+
+s16 sFinalHoursClockDigitsRed = 0;
+s16 sFinalHoursClockFrameEnvRed = 0;
+s16 sFinalHoursClockFrameEnvGreen = 0;
+s16 sFinalHoursClockFrameEnvBlue = 0;
+s16 sFinalHoursClockColorTimer = 15;
+s16 sFinalHoursClockColorTargetIndex = 0;
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010CB80.s")
@@ -18,8 +239,29 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010DE38.s")
+s16 D_801BFA04[] = {
+ -14, -14, -24, -8, -12, -12, -7, -8, -7, -8, -12, 0,
+};
+s16 D_801BFA1C[] = {
+ 0x1C, 0x1C, 0x30, 0x10, 0x18, 0x18, 0x10, 0x10, 0x10, 0x10, 0x18, 0,
+};
+s16 D_801BFA34[] = {
+ 14, 14, 8, 24, -82, -82, 58, 59, 58, 59, 32, 0,
+};
+s16 D_801BFA4C[] = {
+ 0x1C, 0x1C, 0x10, 0x10, 0x18, 0x18, 0xB, 0xB, 0xB, 0xB, 0x20, 0,
+};
+s16 D_801BFA64[] = {
+ -61, -45, 29, 104, -117, -42, 32, 55,
+};
+s16 D_801BFA74[] = {
+ 1, -70, -99, -70, 71, 101, 72, 1,
+};
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010E028.s")
+s32 D_801BFA84 = 0;
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010E968.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010E9F0.s")
@@ -28,6 +270,7 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010EB50.s")
+void func_8010EBA0(s16 timer, s16 timerId);
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010EBA0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010EC54.s")
@@ -52,38 +295,755 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80112AFC.s")
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80112B40.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_LoadItemIconImpl.s")
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80112BE4.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80112C0C.s")
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Item_Give.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801143CC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114978.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801149A0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114A9C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114B84.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114CA0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_HasEmptyBottle.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_HasItemInBottle.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114FD0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115130.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801152B8.s")
+s16 sAmmoRefillCounts[] = { 5, 10, 20, 30 }; // Sticks, nuts, bombs
+s16 sArrowRefillCounts[] = { 10, 30, 40, 50 };
+s16 sBombchuRefillCounts[] = { 20, 10, 1, 5 };
+s16 sRupeeRefillCounts[] = { 1, 5, 10, 20, 50, 100, 200 };
+
+u8 Item_Give(PlayState* play, u8 item) {
+ Player* player = GET_PLAYER(play);
+ u8 i;
+ u8 temp;
+ u8 slot;
+
+ slot = SLOT(item);
+ if (item >= ITEM_STICKS_5) {
+ slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]);
+ }
+
+ if (item == ITEM_SKULL_TOKEN) {
+ SET_QUEST_ITEM(item - ITEM_SKULL_TOKEN + QUEST_SKULL_TOKEN);
+ Inventory_IncrementSkullTokenCount(play->sceneNum);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_TINGLE_MAP) {
+ return ITEM_NONE;
+
+ } else if (item == ITEM_BOMBERS_NOTEBOOK) {
+ SET_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK);
+ return ITEM_NONE;
+
+ } else if ((item == ITEM_HEART_PIECE_2) || (item == ITEM_HEART_PIECE)) {
+ gSaveContext.save.inventory.questItems += (1 << QUEST_HEART_PIECE_COUNT);
+ if ((gSaveContext.save.inventory.questItems & 0xF0000000) == (4 << QUEST_HEART_PIECE_COUNT)) {
+ gSaveContext.save.inventory.questItems ^= (4 << QUEST_HEART_PIECE_COUNT);
+ gSaveContext.save.playerData.healthCapacity += 0x10;
+ gSaveContext.save.playerData.health += 0x10;
+ }
+ return ITEM_NONE;
+
+ } else if (item == ITEM_HEART_CONTAINER) {
+ gSaveContext.save.playerData.healthCapacity += 0x10;
+ gSaveContext.save.playerData.health += 0x10;
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_SONG_SONATA) && (item <= ITEM_SONG_LULLABY_INTRO)) {
+ SET_QUEST_ITEM(item - ITEM_SONG_SONATA + QUEST_SONG_SONATA);
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_GILDED)) {
+ SET_EQUIP_VALUE(EQUIP_TYPE_SWORD, item - ITEM_SWORD_KOKIRI + EQUIP_VALUE_SWORD_KOKIRI);
+ BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = item;
+ Interface_LoadItemIconImpl(play, EQUIP_SLOT_B);
+ if (item == ITEM_SWORD_RAZOR) {
+ gSaveContext.save.playerData.swordHealth = 100;
+ }
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_SHIELD_HERO) && (item <= ITEM_SHIELD_MIRROR)) {
+ if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) != (u16)(item - ITEM_SHIELD_HERO + EQUIP_VALUE_SHIELD_HERO)) {
+ SET_EQUIP_VALUE(EQUIP_TYPE_SHIELD, item - ITEM_SHIELD_HERO + EQUIP_VALUE_SHIELD_HERO);
+ Player_SetEquipmentData(play, player);
+ return ITEM_NONE;
+ }
+ return item;
+
+ } else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) {
+ SET_DUNGEON_ITEM(item - ITEM_KEY_BOSS, gSaveContext.mapIndex);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_KEY_SMALL) {
+ if (DUNGEON_KEY_COUNT(gSaveContext.mapIndex) < 0) {
+ DUNGEON_KEY_COUNT(gSaveContext.mapIndex) = 1;
+ return ITEM_NONE;
+ } else {
+ DUNGEON_KEY_COUNT(gSaveContext.mapIndex)++;
+ return ITEM_NONE;
+ }
+
+ } else if ((item == ITEM_QUIVER_30) || (item == ITEM_BOW)) {
+ if (CUR_UPG_VALUE(UPG_QUIVER) == 0) {
+ Inventory_ChangeUpgrade(UPG_QUIVER, 1);
+ INV_CONTENT(ITEM_BOW) = ITEM_BOW;
+ AMMO(ITEM_BOW) = CAPACITY(UPG_QUIVER, 1);
+ return ITEM_NONE;
+ } else {
+ AMMO(ITEM_BOW)++;
+ if (AMMO(ITEM_BOW) > (s8)CUR_CAPACITY(UPG_QUIVER)) {
+ AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
+ }
+ }
+
+ } else if (item == ITEM_QUIVER_40) {
+ Inventory_ChangeUpgrade(UPG_QUIVER, 2);
+ INV_CONTENT(ITEM_BOW) = ITEM_BOW;
+ AMMO(ITEM_BOW) = CAPACITY(UPG_QUIVER, 2);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_QUIVER_50) {
+ Inventory_ChangeUpgrade(UPG_QUIVER, 3);
+ INV_CONTENT(ITEM_BOW) = ITEM_BOW;
+ AMMO(ITEM_BOW) = CAPACITY(UPG_QUIVER, 3);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_BOMB_BAG_20) {
+ if (CUR_UPG_VALUE(UPG_BOMB_BAG) == 0) {
+ Inventory_ChangeUpgrade(UPG_BOMB_BAG, 1);
+ INV_CONTENT(ITEM_BOMB) = ITEM_BOMB;
+ AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 1);
+ return ITEM_NONE;
+
+ } else {
+ AMMO(ITEM_BOMB)++;
+ if (AMMO(ITEM_BOMB) > CUR_CAPACITY(UPG_BOMB_BAG)) {
+ AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
+ }
+ }
+
+ } else if (item == ITEM_BOMB_BAG_30) {
+ Inventory_ChangeUpgrade(UPG_BOMB_BAG, 2);
+ INV_CONTENT(ITEM_BOMB) = ITEM_BOMB;
+ AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 2);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_BOMB_BAG_40) {
+ Inventory_ChangeUpgrade(UPG_BOMB_BAG, 3);
+ INV_CONTENT(ITEM_BOMB) = ITEM_BOMB;
+ AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 3);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_WALLET_ADULT) {
+ Inventory_ChangeUpgrade(UPG_WALLET, 1);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_WALLET_GIANT) {
+ Inventory_ChangeUpgrade(UPG_WALLET, 2);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_STICK_UPGRADE_20) {
+ if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
+ INV_CONTENT(ITEM_STICK) = ITEM_STICK;
+ }
+ Inventory_ChangeUpgrade(UPG_STICKS, 2);
+ AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 2);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_STICK_UPGRADE_30) {
+ if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
+ INV_CONTENT(ITEM_STICK) = ITEM_STICK;
+ }
+ Inventory_ChangeUpgrade(UPG_STICKS, 3);
+ AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 3);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_NUT_UPGRADE_30) {
+ if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
+ INV_CONTENT(ITEM_NUT) = ITEM_NUT;
+ }
+ Inventory_ChangeUpgrade(UPG_NUTS, 2);
+ AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 2);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_NUT_UPGRADE_40) {
+ if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
+ INV_CONTENT(ITEM_NUT) = ITEM_NUT;
+ }
+ Inventory_ChangeUpgrade(UPG_NUTS, 3);
+ AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 3);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_STICK) {
+ if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
+ Inventory_ChangeUpgrade(UPG_STICKS, 1);
+ AMMO(ITEM_STICK) = 1;
+ } else {
+ AMMO(ITEM_STICK)++;
+ if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) {
+ AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
+ }
+ }
+
+ } else if ((item == ITEM_STICKS_5) || (item == ITEM_STICKS_10)) {
+ if (INV_CONTENT(ITEM_STICK) != ITEM_STICK) {
+ Inventory_ChangeUpgrade(UPG_STICKS, 1);
+ AMMO(ITEM_STICK) = sAmmoRefillCounts[item - ITEM_STICKS_5];
+ } else {
+ AMMO(ITEM_STICK) += sAmmoRefillCounts[item - ITEM_STICKS_5];
+ if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) {
+ AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
+ }
+ }
+
+ item = ITEM_STICK;
+
+ } else if (item == ITEM_NUT) {
+ if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
+ Inventory_ChangeUpgrade(UPG_NUTS, 1);
+ AMMO(ITEM_NUT) = 1;
+ } else {
+ AMMO(ITEM_NUT)++;
+ if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) {
+ AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
+ }
+ }
+
+ } else if ((item == ITEM_NUTS_5) || (item == ITEM_NUTS_10)) {
+ if (INV_CONTENT(ITEM_NUT) != ITEM_NUT) {
+ Inventory_ChangeUpgrade(UPG_NUTS, 1);
+ AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5];
+ } else {
+ AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5];
+ if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) {
+ AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
+ }
+ }
+ item = ITEM_NUT;
+
+ } else if (item == ITEM_POWDER_KEG) {
+ if (INV_CONTENT(ITEM_POWDER_KEG) != ITEM_POWDER_KEG) {
+ INV_CONTENT(ITEM_POWDER_KEG) = ITEM_POWDER_KEG;
+ }
+
+ AMMO(ITEM_POWDER_KEG) = 1;
+ return ITEM_NONE;
+
+ } else if (item == ITEM_BOMB) {
+ if ((AMMO(ITEM_BOMB) += 1) > CUR_CAPACITY(UPG_BOMB_BAG)) {
+ AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
+ }
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_BOMBS_5) && (item <= ITEM_BOMBS_30)) {
+ if (gSaveContext.save.inventory.items[SLOT_BOMB] != ITEM_BOMB) {
+ INV_CONTENT(ITEM_BOMB) = ITEM_BOMB;
+ AMMO(ITEM_BOMB) += sAmmoRefillCounts[item - ITEM_BOMBS_5];
+ return ITEM_NONE;
+ }
+
+ if ((AMMO(ITEM_BOMB) += sAmmoRefillCounts[item - ITEM_BOMBS_5]) > CUR_CAPACITY(UPG_BOMB_BAG)) {
+ AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
+ }
+ return ITEM_NONE;
+
+ } else if (item == ITEM_BOMBCHU) {
+ if (INV_CONTENT(ITEM_BOMBCHU) != ITEM_BOMBCHU) {
+ INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU;
+ AMMO(ITEM_BOMBCHU) = 10;
+ return ITEM_NONE;
+ }
+ if ((AMMO(ITEM_BOMBCHU) += 10) > CUR_CAPACITY(UPG_BOMB_BAG)) {
+ AMMO(ITEM_BOMBCHU) = CUR_CAPACITY(UPG_BOMB_BAG);
+ }
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_BOMBCHUS_20) && (item <= ITEM_BOMBCHUS_5)) {
+ if (gSaveContext.save.inventory.items[SLOT_BOMBCHU] != ITEM_BOMBCHU) {
+ INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU;
+ AMMO(ITEM_BOMBCHU) += sBombchuRefillCounts[item - ITEM_BOMBCHUS_20];
+
+ if (AMMO(ITEM_BOMBCHU) > CUR_CAPACITY(UPG_BOMB_BAG)) {
+ AMMO(ITEM_BOMBCHU) = CUR_CAPACITY(UPG_BOMB_BAG);
+ }
+ return ITEM_NONE;
+ }
+
+ if ((AMMO(ITEM_BOMBCHU) += sBombchuRefillCounts[item - ITEM_BOMBCHUS_20]) > CUR_CAPACITY(UPG_BOMB_BAG)) {
+ AMMO(ITEM_BOMBCHU) = CUR_CAPACITY(UPG_BOMB_BAG);
+ }
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_ARROWS_10) && (item <= ITEM_ARROWS_50)) {
+ AMMO(ITEM_BOW) += sArrowRefillCounts[item - ITEM_ARROWS_10];
+
+ if ((AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) || (AMMO(ITEM_BOW) < 0)) {
+ AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
+ }
+ return ITEM_BOW;
+
+ } else if (item == ITEM_OCARINA) {
+ INV_CONTENT(ITEM_OCARINA) = ITEM_OCARINA;
+ return ITEM_NONE;
+
+ } else if (item == ITEM_MAGIC_BEANS) {
+ if (INV_CONTENT(ITEM_MAGIC_BEANS) == ITEM_NONE) {
+ INV_CONTENT(item) = item;
+ AMMO(ITEM_MAGIC_BEANS) = 1;
+ } else if (AMMO(ITEM_MAGIC_BEANS) < 20) {
+ AMMO(ITEM_MAGIC_BEANS)++;
+ } else {
+ AMMO(ITEM_MAGIC_BEANS) = 20;
+ }
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_REMAINS_ODOLWA) && (item <= ITEM_REMAINS_TWINMOLD)) {
+ SET_QUEST_ITEM(item - ITEM_REMAINS_ODOLWA + QUEST_REMAINS_ODOWLA);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_HEART) {
+ Health_ChangeBy(play, 0x10);
+ return item;
+
+ } else if (item == ITEM_MAGIC_SMALL) {
+ Parameter_AddMagic(play, 0x18);
+ if (!(gSaveContext.save.weekEventReg[12] & 0x80)) {
+ gSaveContext.save.weekEventReg[12] |= 0x80;
+ return ITEM_NONE;
+ }
+ return item;
+
+ } else if (item == ITEM_MAGIC_LARGE) {
+ Parameter_AddMagic(play, 0x30);
+ if (!(gSaveContext.save.weekEventReg[12] & 0x80)) {
+ gSaveContext.save.weekEventReg[12] |= 0x80;
+ return ITEM_NONE;
+ }
+ return item;
+
+ } else if ((item >= ITEM_RUPEE_GREEN) && (item <= ITEM_RUPEE_HUGE)) {
+ Rupees_ChangeBy(sRupeeRefillCounts[item - ITEM_RUPEE_GREEN]);
+ return ITEM_NONE;
+
+ } else if (item == ITEM_LONGSHOT) {
+ slot = SLOT(item);
+
+ for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
+ if (gSaveContext.save.inventory.items[slot + i] == ITEM_NONE) {
+ gSaveContext.save.inventory.items[slot + i] = ITEM_POTION_RED;
+ return ITEM_NONE;
+ }
+ }
+ return item;
+
+ } else if ((item == ITEM_MILK_BOTTLE) || (item == ITEM_POE) || (item == ITEM_GOLD_DUST) || (item == ITEM_CHATEAU) ||
+ (item == ITEM_HYLIAN_LOACH)) {
+ slot = SLOT(item);
+
+ for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
+ if (gSaveContext.save.inventory.items[slot + i] == ITEM_NONE) {
+ gSaveContext.save.inventory.items[slot + i] = item;
+ return ITEM_NONE;
+ }
+ }
+ return item;
+
+ } else if (item == ITEM_BOTTLE) {
+ slot = SLOT(item);
+
+ for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
+ if (gSaveContext.save.inventory.items[slot + i] == ITEM_NONE) {
+ gSaveContext.save.inventory.items[slot + i] = item;
+ return ITEM_NONE;
+ }
+ }
+ return item;
+
+ } else if (((item >= ITEM_POTION_RED) && (item <= ITEM_OBABA_DRINK)) || (item == ITEM_CHATEAU_2) ||
+ (item == ITEM_MILK) || (item == ITEM_GOLD_DUST_2) || (item == ITEM_HYLIAN_LOACH_2) ||
+ (item == ITEM_SEA_HORSE_CAUGHT)) {
+ slot = SLOT(item);
+
+ if ((item != ITEM_MILK_BOTTLE) && (item != ITEM_MILK_HALF)) {
+ if (item == ITEM_CHATEAU_2) {
+ item = ITEM_CHATEAU;
+
+ } else if (item == ITEM_MILK) {
+ item = ITEM_MILK_BOTTLE;
+
+ } else if (item == ITEM_GOLD_DUST_2) {
+ item = ITEM_GOLD_DUST;
+
+ } else if (item == ITEM_HYLIAN_LOACH_2) {
+ item = ITEM_HYLIAN_LOACH;
+
+ } else if (item == ITEM_SEA_HORSE_CAUGHT) {
+ item = ITEM_SEA_HORSE;
+ }
+ slot = SLOT(item);
+
+ for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
+ if (gSaveContext.save.inventory.items[slot + i] == ITEM_BOTTLE) {
+ if (item == ITEM_HOT_SPRING_WATER) {
+ func_8010EBA0(60, i);
+ }
+
+ if ((slot + i) == C_SLOT_EQUIP(0, EQUIP_SLOT_C_LEFT)) {
+ BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_LEFT) = item;
+ Interface_LoadItemIconImpl(play, EQUIP_SLOT_C_LEFT);
+ gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_ENABLED;
+ } else if ((slot + i) == C_SLOT_EQUIP(0, EQUIP_SLOT_C_DOWN)) {
+ BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) = item;
+ Interface_LoadItemIconImpl(play, EQUIP_SLOT_C_DOWN);
+ gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_ENABLED;
+ } else if ((slot + i) == C_SLOT_EQUIP(0, EQUIP_SLOT_C_RIGHT)) {
+ BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) = item;
+ Interface_LoadItemIconImpl(play, EQUIP_SLOT_C_RIGHT);
+ gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_ENABLED;
+ }
+
+ gSaveContext.save.inventory.items[slot + i] = item;
+ return ITEM_NONE;
+ }
+ }
+ } else {
+ for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
+ if (gSaveContext.save.inventory.items[slot + i] == ITEM_NONE) {
+ gSaveContext.save.inventory.items[slot + i] = item;
+ return ITEM_NONE;
+ }
+ }
+ }
+
+ } else if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_MASK_GIANT)) {
+ temp = INV_CONTENT(item);
+ INV_CONTENT(item) = item;
+ if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_PENDANT_MEMORIES) && (temp != ITEM_NONE)) {
+ for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
+ if (temp == GET_CUR_FORM_BTN_ITEM(i)) {
+ SET_CUR_FORM_BTN_ITEM(i, item);
+ Interface_LoadItemIconImpl(play, i);
+ return ITEM_NONE;
+ }
+ }
+ }
+ return ITEM_NONE;
+ }
+
+ temp = gSaveContext.save.inventory.items[slot];
+ INV_CONTENT(item) = item;
+ return temp;
+}
+
+u8 Item_CheckObtainabilityImpl(u8 item) {
+ s16 i;
+ u8 slot;
+ u8 bottleSlot;
+
+ slot = SLOT(item);
+ if (item >= ITEM_STICKS_5) {
+ slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]);
+ }
+
+ if (item == ITEM_SKULL_TOKEN) {
+ return ITEM_NONE;
+
+ } else if (item == ITEM_TINGLE_MAP) {
+ return ITEM_NONE;
+
+ } else if (item == ITEM_BOMBERS_NOTEBOOK) {
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_GILDED)) {
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_SHIELD_HERO) && (item <= ITEM_SHIELD_MIRROR)) {
+ return ITEM_NONE;
+
+ } else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) {
+ if (!CHECK_DUNGEON_ITEM(item - ITEM_KEY_BOSS, gSaveContext.mapIndex)) {
+ return ITEM_NONE;
+ }
+ return item;
+
+ } else if (item == ITEM_KEY_SMALL) {
+ return ITEM_NONE;
+
+ } else if ((item == ITEM_OCARINA) || (item == ITEM_BOMBCHU) || (item == ITEM_HOOKSHOT) || (item == ITEM_LENS) ||
+ (item == ITEM_SWORD_GREAT_FAIRY) || (item == ITEM_PICTO_BOX)) {
+ if (INV_CONTENT(item) == ITEM_NONE) {
+ return ITEM_NONE;
+ }
+ return INV_CONTENT(item);
+
+ } else if ((item >= ITEM_BOMBS_5) && (item == ITEM_BOMBS_30)) {
+ //! @bug: Should be a range check: (item <= ITEM_BOMBS_30)
+ if (CUR_UPG_VALUE(UPG_BOMB_BAG) == 0) {
+ return ITEM_NONE;
+ }
+ return 0;
+
+ } else if ((item >= ITEM_BOMBCHUS_20) && (item <= ITEM_BOMBCHUS_5)) {
+ if (CUR_UPG_VALUE(UPG_BOMB_BAG) == 0) {
+ return ITEM_NONE;
+ }
+ return 0;
+
+ } else if ((item == ITEM_QUIVER_30) || (item == ITEM_BOW)) {
+ if (CUR_UPG_VALUE(UPG_QUIVER) == 0) {
+ return ITEM_NONE;
+ }
+ return 0;
+
+ } else if ((item == ITEM_QUIVER_40) || (item == ITEM_QUIVER_50)) {
+ return ITEM_NONE;
+
+ } else if ((item == ITEM_BOMB_BAG_20) || (item == ITEM_BOMB)) {
+ if (CUR_UPG_VALUE(UPG_BOMB_BAG) == 0) {
+ return ITEM_NONE;
+ }
+ return 0;
+
+ } else if ((item >= ITEM_STICK_UPGRADE_20) && (item <= ITEM_NUT_UPGRADE_40)) {
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_BOMB_BAG_30) && (item <= ITEM_WALLET_GIANT)) {
+ return ITEM_NONE;
+
+ } else if (item == ITEM_MAGIC_BEANS) {
+ return ITEM_NONE;
+
+ } else if (item == ITEM_POWDER_KEG) {
+ return ITEM_NONE;
+
+ } else if ((item == ITEM_HEART_PIECE_2) || (item == ITEM_HEART_PIECE)) {
+ return ITEM_NONE;
+
+ } else if (item == ITEM_HEART_CONTAINER) {
+ return ITEM_NONE;
+
+ } else if (item == ITEM_HEART) {
+ return ITEM_HEART;
+
+ } else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) {
+ if (!(gSaveContext.save.weekEventReg[12] & 0x80)) {
+ return ITEM_NONE;
+ }
+ return item;
+
+ } else if ((item >= ITEM_RUPEE_GREEN) && (item <= ITEM_RUPEE_HUGE)) {
+ return ITEM_NONE;
+
+ } else if ((item >= ITEM_REMAINS_ODOLWA) && (item <= ITEM_REMAINS_TWINMOLD)) {
+ return ITEM_NONE;
+
+ } else if (item == ITEM_LONGSHOT) {
+ return ITEM_NONE;
+
+ } else if (item == ITEM_BOTTLE) {
+ return ITEM_NONE;
+
+ } else if ((item == ITEM_MILK_BOTTLE) || (item == ITEM_POE) || (item == ITEM_GOLD_DUST) || (item == ITEM_CHATEAU) ||
+ (item == ITEM_HYLIAN_LOACH)) {
+ return ITEM_NONE;
+
+ } else if (((item >= ITEM_POTION_RED) && (item <= ITEM_OBABA_DRINK)) || (item == ITEM_CHATEAU_2) ||
+ (item == ITEM_MILK) || (item == ITEM_GOLD_DUST_2) || (item == ITEM_HYLIAN_LOACH_2) ||
+ (item == ITEM_SEA_HORSE_CAUGHT)) {
+ bottleSlot = SLOT(item);
+
+ if ((item != ITEM_MILK_BOTTLE) && (item != ITEM_MILK_HALF)) {
+ if (item == ITEM_CHATEAU_2) {
+ item = ITEM_CHATEAU;
+
+ } else if (item == ITEM_MILK) {
+ item = ITEM_MILK_BOTTLE;
+
+ } else if (item == ITEM_GOLD_DUST_2) {
+ item = ITEM_GOLD_DUST;
+
+ } else if (item == ITEM_HYLIAN_LOACH_2) {
+ item = ITEM_HYLIAN_LOACH;
+
+ } else if (item == ITEM_SEA_HORSE_CAUGHT) {
+ item = ITEM_SEA_HORSE;
+ }
+ bottleSlot = SLOT(item);
+
+ for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
+ if (gSaveContext.save.inventory.items[bottleSlot + i] == ITEM_BOTTLE) {
+ return ITEM_NONE;
+ }
+ }
+ } else {
+ for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
+ if (gSaveContext.save.inventory.items[bottleSlot + i] == ITEM_NONE) {
+ return ITEM_NONE;
+ }
+ }
+ }
+ } else if ((item >= ITEM_MOON_TEAR) && (item <= ITEM_MASK_GIANT)) {
+ return ITEM_NONE;
+ }
+
+ return gSaveContext.save.inventory.items[slot];
+}
+
+u8 Item_CheckObtainability(u8 item) {
+ return Item_CheckObtainabilityImpl(item);
+}
+
+void Inventory_DeleteItem(s16 item, s16 slot) {
+ s16 btn;
+
+ gSaveContext.save.inventory.items[slot] = ITEM_NONE;
+
+ for (btn = EQUIP_SLOT_C_LEFT; btn <= EQUIP_SLOT_C_RIGHT; btn++) {
+ if (GET_CUR_FORM_BTN_ITEM(btn) == item) {
+ SET_CUR_FORM_BTN_ITEM(btn, ITEM_NONE);
+ SET_CUR_FORM_BTN_SLOT(btn, SLOT_NONE);
+ }
+ }
+}
+
+void Inventory_UnequipItem(s16 item) {
+ s16 btn;
+
+ for (btn = EQUIP_SLOT_C_LEFT; btn <= EQUIP_SLOT_C_RIGHT; btn++) {
+ if (GET_CUR_FORM_BTN_ITEM(btn) == item) {
+ SET_CUR_FORM_BTN_ITEM(btn, ITEM_NONE);
+ SET_CUR_FORM_BTN_SLOT(btn, SLOT_NONE);
+ }
+ }
+}
+
+s32 Inventory_ReplaceItem(PlayState* play, u8 oldItem, u8 newItem) {
+ u8 i;
+
+ for (i = 0; i < 24; i++) {
+ if (gSaveContext.save.inventory.items[i] == oldItem) {
+ gSaveContext.save.inventory.items[i] = newItem;
+
+ for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
+ if (GET_CUR_FORM_BTN_ITEM(i) == oldItem) {
+ SET_CUR_FORM_BTN_ITEM(i, newItem);
+ Interface_LoadItemIconImpl(play, i);
+ break;
+ }
+ }
+ return true;
+ }
+ }
+ return false;
+}
+
+void Inventory_UpdateDeitySwordEquip(PlayState* play) {
+ InterfaceContext* interfaceCtx = &play->interfaceCtx;
+ u8 btn;
+
+ if (CUR_FORM == PLAYER_FORM_FIERCE_DEITY) {
+ interfaceCtx->unk_21C = 0;
+ interfaceCtx->bButtonDoAction = 0;
+
+ // Is simply checking if (gSaveContext.save.playerForm == PLAYER_FORM_FIERCE_DEITY)
+ if ((((gSaveContext.save.playerForm > 0) && (gSaveContext.save.playerForm < 4))
+ ? 1
+ : gSaveContext.save.playerForm >> 1) == 0) {
+ BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_SWORD_DEITY;
+ } else if (BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) == ITEM_SWORD_DEITY) {
+ if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_NONE) {
+ BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_NONE;
+ } else {
+ BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) =
+ GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) - EQUIP_VALUE_SWORD_KOKIRI + ITEM_SWORD_KOKIRI;
+ }
+ }
+ }
+
+ for (btn = EQUIP_SLOT_B; btn <= EQUIP_SLOT_B; btn++) {
+ if ((GET_CUR_FORM_BTN_ITEM(btn) != ITEM_NONE) && (GET_CUR_FORM_BTN_ITEM(btn) != ITEM_FD)) {
+ Interface_LoadItemIconImpl(play, btn);
+ }
+ }
+}
+
+s32 Inventory_HasEmptyBottle(void) {
+ s32 slot;
+
+ for (slot = SLOT_BOTTLE_1; slot <= SLOT_BOTTLE_6; slot++) {
+ if (gSaveContext.save.inventory.items[slot] == ITEM_BOTTLE) {
+ return true;
+ }
+ }
+ return false;
+}
+
+s32 Inventory_HasItemInBottle(u8 item) {
+ s32 slot;
+
+ for (slot = SLOT_BOTTLE_1; slot <= SLOT_BOTTLE_6; slot++) {
+ if (gSaveContext.save.inventory.items[slot] == item) {
+ return true;
+ }
+ }
+ return false;
+}
+
+void Inventory_UpdateBottleItem(PlayState* play, u8 item, u8 btn) {
+ gSaveContext.save.inventory.items[GET_CUR_FORM_BTN_SLOT(btn)] = item;
+ SET_CUR_FORM_BTN_ITEM(btn, item);
+
+ Interface_LoadItemIconImpl(play, btn);
+
+ play->pauseCtx.cursorItem[PAUSE_0] = item;
+ gSaveContext.buttonStatus[btn] = BTN_ENABLED;
+
+ if (item == ITEM_HOT_SPRING_WATER) {
+ func_8010EBA0(60, GET_CUR_FORM_BTN_SLOT(btn) - SLOT_BOTTLE_1);
+ }
+}
+
+s32 Inventory_ConsumeFairy(PlayState* play) {
+ u8 bottleSlot = SLOT(ITEM_FAIRY);
+ u8 btn;
+ u8 i;
+
+ for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
+ if (gSaveContext.save.inventory.items[bottleSlot + i] == ITEM_FAIRY) {
+ for (btn = EQUIP_SLOT_C_LEFT; btn <= EQUIP_SLOT_C_RIGHT; btn++) {
+ if (GET_CUR_FORM_BTN_ITEM(btn) == ITEM_FAIRY) {
+ SET_CUR_FORM_BTN_ITEM(btn, ITEM_BOTTLE);
+ Interface_LoadItemIconImpl(play, btn);
+ bottleSlot = GET_CUR_FORM_BTN_SLOT(btn);
+ i = 0;
+ break;
+ }
+ }
+ gSaveContext.save.inventory.items[bottleSlot + i] = ITEM_BOTTLE;
+ return true;
+ }
+ }
+
+ return false;
+}
+
+/**
+ * Only used to equip Spring Water when Hot Spring Water timer runs out.
+ */
+void Inventory_UpdateItem(PlayState* play, s16 slot, s16 item) {
+ s16 btn;
+
+ gSaveContext.save.inventory.items[slot] = item;
+
+ for (btn = EQUIP_SLOT_C_LEFT; btn <= EQUIP_SLOT_C_RIGHT; btn++) {
+ if (GET_CUR_FORM_BTN_SLOT(btn) == slot) {
+ SET_CUR_FORM_BTN_ITEM(btn, item);
+ Interface_LoadItemIconImpl(play, btn);
+ }
+ }
+}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801153C8.s")
+TexturePtr sDoActionTextures[] = {
+ gDoActionAttackENGTex,
+ gDoActionCheckENGTex,
+};
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115428.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011552C.s")
@@ -94,13 +1054,96 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115844.s")
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115908.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801159c0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801159EC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80115A14.s")
+/**
+ * @return false if player is out of health
+ */
+s32 Health_ChangeBy(PlayState* play, s16 healthChange) {
+ if (healthChange > 0) {
+ play_sound(NA_SE_SY_HP_RECOVER);
+ } else if (gSaveContext.save.playerData.doubleDefense && (healthChange < 0)) {
+ healthChange >>= 1;
+ }
+
+ gSaveContext.save.playerData.health += healthChange;
+
+ if (((void)0, gSaveContext.save.playerData.health) > ((void)0, gSaveContext.save.playerData.healthCapacity)) {
+ gSaveContext.save.playerData.health = gSaveContext.save.playerData.healthCapacity;
+ }
+
+ if (gSaveContext.save.playerData.health <= 0) {
+ gSaveContext.save.playerData.health = 0;
+ return false;
+ } else {
+ return true;
+ }
+}
+
+void Health_GiveHearts(s16 hearts) {
+ gSaveContext.save.playerData.healthCapacity += hearts * 0x10;
+}
+
+void Rupees_ChangeBy(s16 rupeeChange) {
+ gSaveContext.rupeeAccumulator += rupeeChange;
+}
+
+void Inventory_ChangeAmmo(s16 item, s16 ammoChange) {
+ if (item == ITEM_STICK) {
+ AMMO(ITEM_STICK) += ammoChange;
+
+ if (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS)) {
+ AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS);
+ } else if (AMMO(ITEM_STICK) < 0) {
+ AMMO(ITEM_STICK) = 0;
+ }
+
+ } else if (item == ITEM_NUT) {
+ AMMO(ITEM_NUT) += ammoChange;
+
+ if (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS)) {
+ AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS);
+ } else if (AMMO(ITEM_NUT) < 0) {
+ AMMO(ITEM_NUT) = 0;
+ }
+
+ } else if (item == ITEM_BOMBCHU) {
+ AMMO(ITEM_BOMBCHU) += ammoChange;
+
+ if (AMMO(ITEM_BOMBCHU) >= CUR_CAPACITY(UPG_BOMB_BAG)) {
+ AMMO(ITEM_BOMBCHU) = CUR_CAPACITY(UPG_BOMB_BAG);
+ } else if (AMMO(ITEM_BOMBCHU) < 0) {
+ AMMO(ITEM_BOMBCHU) = 0;
+ }
+
+ } else if (item == ITEM_BOW) {
+ AMMO(ITEM_BOW) += ammoChange;
+
+ if (AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) {
+ AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER);
+ } else if (AMMO(ITEM_BOW) < 0) {
+ AMMO(ITEM_BOW) = 0;
+ }
+
+ } else if (item == ITEM_BOMB) {
+ AMMO(ITEM_BOMB) += ammoChange;
+
+ if (AMMO(ITEM_BOMB) >= CUR_CAPACITY(UPG_BOMB_BAG)) {
+ AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG);
+ } else if (AMMO(ITEM_BOMB) < 0) {
+ AMMO(ITEM_BOMB) = 0;
+ }
+
+ } else if (item == ITEM_MAGIC_BEANS) {
+ AMMO(ITEM_MAGIC_BEANS) += ammoChange;
+
+ } else if (item == ITEM_POWDER_KEG) {
+ AMMO(ITEM_POWDER_KEG) += ammoChange;
+ if (AMMO(ITEM_POWDER_KEG) >= 1) {
+ AMMO(ITEM_POWDER_KEG) = 1;
+ } else if (AMMO(ITEM_POWDER_KEG) < 0) {
+ AMMO(ITEM_POWDER_KEG) = 0;
+ }
+ }
+}
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Parameter_AddMagic.s")
@@ -110,6 +1153,13 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80116088.s")
+s16 magicBorderColors[][3] = {
+ { 255, 255, 255 },
+ { 150, 150, 150 },
+};
+s16 magicBorderIndices[] = { 0, 1, 1, 0 };
+s16 magicBorderColorTimerIndex[] = { 2, 1, 2, 1 };
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80116114.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80116348.s")
@@ -120,10 +1170,25 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801170B8.s")
+TexturePtr cUpLabelTextures[] = {
+ gTatlCUpENGTex, gTatlCUpENGTex, gTatlCUpGERTex, gTatlCUpFRATex, gTatlCUpESPTex,
+};
+s16 startButtonLeftPos[] = {
+ // Remnant of OoT
+ 130, 136, 136, 136, 136,
+};
+s16 D_801BFAF4[] = { 0x1D, 0x1B };
+s16 D_801BFAF8[] = { 0x1B, 0x1B };
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80117100.s")
+s16 D_801BFAFC[] = { 30, 24, 24, 24 };
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80117A20.s")
+s16 D_801BFB04[] = { 0xA2, 0xE4, 0xFA, 0x110 };
+s16 D_801BFB0C[] = { 0x23, 0x23, 0x33, 0x23 };
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80117BD0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80118084.s")
@@ -132,36 +1197,179 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80118BA4.s")
+extern TexturePtr D_08095AC0; // gMagicArrowEquipEffectTex
+s16 D_801BFB14[] = { 255, 100, 255, 0 }; // magicArrowEffectsR
+s16 D_801BFB1C[] = { 0, 100, 255, 0 }; // magicArrowEffectsG
+s16 D_801BFB24[] = { 0, 255, 100, 0 }; // magicArrowEffectsB
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80119030.s")
+s16 D_801BFB2C = 255;
+s16 D_801BFB30 = 0;
+s16 D_801BFB34 = 0;
+u16 D_801BFB38[] = {
+ CLOCK_TIME(0, 0), CLOCK_TIME(1, 0), CLOCK_TIME(2, 0), CLOCK_TIME(3, 0), CLOCK_TIME(4, 0),
+ CLOCK_TIME(5, 0), CLOCK_TIME(6, 0), CLOCK_TIME(7, 0), CLOCK_TIME(8, 0), CLOCK_TIME(9, 0),
+ CLOCK_TIME(10, 0), CLOCK_TIME(11, 0), CLOCK_TIME(12, 0), CLOCK_TIME(13, 0), CLOCK_TIME(14, 0),
+ CLOCK_TIME(15, 0), CLOCK_TIME(16, 0), CLOCK_TIME(17, 0), CLOCK_TIME(18, 0), CLOCK_TIME(19, 0),
+ CLOCK_TIME(20, 0), CLOCK_TIME(21, 0), CLOCK_TIME(22, 0), CLOCK_TIME(23, 0), CLOCK_TIME(24, 0) - 1,
+};
+TexturePtr D_801BFB6C[] = {
+ gThreeDayClockHour12Tex, gThreeDayClockHour1Tex, gThreeDayClockHour2Tex, gThreeDayClockHour3Tex,
+ gThreeDayClockHour4Tex, gThreeDayClockHour5Tex, gThreeDayClockHour6Tex, gThreeDayClockHour7Tex,
+ gThreeDayClockHour8Tex, gThreeDayClockHour9Tex, gThreeDayClockHour10Tex, gThreeDayClockHour11Tex,
+ gThreeDayClockHour12Tex, gThreeDayClockHour1Tex, gThreeDayClockHour2Tex, gThreeDayClockHour3Tex,
+ gThreeDayClockHour4Tex, gThreeDayClockHour5Tex, gThreeDayClockHour6Tex, gThreeDayClockHour7Tex,
+ gThreeDayClockHour8Tex, gThreeDayClockHour9Tex, gThreeDayClockHour10Tex, gThreeDayClockHour11Tex,
+};
+s16 D_801BFBCC = 0; // color R
+s16 D_801BFBD0 = 155; // color G
+s16 D_801BFBD4 = 255;
+s16 D_801BFBD8 = 0;
+s16 D_801BFBDC = 0;
+s16 D_801BFBE0 = 0;
+s16 D_801BFBE4 = 0xF;
+u32 D_801BFBE8 = 0;
+s16 D_801BFBEC[] = { 100, 0 };
+s16 D_801BFBF0[] = { 205, 155 };
+s16 D_801BFBF4[] = { 255, 255 };
+s16 D_801BFBF8[] = { 30, 0 };
+s16 D_801BFBFC[] = { 30, 0 };
+s16 D_801BFC00[] = { 100, 0 };
+s16 D_801BFC04[] = { 255, 0 };
+s16 D_801BFC08[] = { 100, 0 };
+s16 D_801BFC0C[] = { 30, 0 };
+s16 D_801BFC10[] = { 100, 0 };
+TexturePtr D_801BFC14[] = {
+ gFinalHoursClockDigit0Tex, gFinalHoursClockDigit1Tex, gFinalHoursClockDigit2Tex, gFinalHoursClockDigit3Tex,
+ gFinalHoursClockDigit4Tex, gFinalHoursClockDigit5Tex, gFinalHoursClockDigit6Tex, gFinalHoursClockDigit7Tex,
+ gFinalHoursClockDigit8Tex, gFinalHoursClockDigit9Tex, gFinalHoursClockColonTex,
+};
+s16 D_801BFC40[] = {
+ 127, 136, 144, 151, 160, 168, 175, 184,
+};
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80119610.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011B4E0.s")
+u16 D_801BFC50[] = {
+ 0xC000, 0xE000, 0x0000, 0x2000, 0xA000, 0x8000, 0x6000, 0x4000,
+};
+s16 D_801BFC60[][3] = {
+ 255, 255, 255, 255, 165, 55,
+};
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011B5C0.s")
+s16 D_801BFC6C[] = {
+ 78, 54, 29, 5, -18, -42, -67, -85,
+};
+s16 D_801BFC7C[] = {
+ 180, 180, 180, 180, -180, -180, -180, -180,
+};
+s16 D_801BFC8C[2][3] = {
+ { 255, 255, 255 },
+ { 255, 165, 55 },
+};
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011B9E0.s")
+s16 D_801BFC98[] = {
+ 78, 54, 29, 5, -18, -42, -67, -85,
+};
+u16 D_801BFCA8[] = {
+ 0xC000, 0xE000, 0x0000, 0x2000, 0xA000, 0x8000, 0x6000, 0x4000,
+};
+s16 D_801BFCB8[2][3] = {
+ { 255, 255, 255 },
+ { 255, 165, 55 },
+};
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011BF70.s")
+TexturePtr D_801BFCC4[] = {
+ gMinigameLetterPTex, gMinigameLetterETex, gMinigameLetterRTex, gMinigameLetterFTex,
+ gMinigameLetterETex, gMinigameLetterCTex, gMinigameLetterTTex, gMinigameExclamationTex,
+};
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011C4C4.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011C808.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011C898.s")
+s16 D_801BFCE4 = 0;
+s16 D_801BFCE8[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+s16 D_801BFCF8 = 99;
+s16 D_801BFCFC[] = {
+ // timer digit width
+ 16, 25, 34, 42, 51, 60, 68, 77,
+};
+s16 D_801BFD0C[] = {
+ // digit width
+ 9, 9, 8, 9, 9, 8, 9, 9,
+};
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011CA64.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011E3B4.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011E730.s")
+// rupeeDigitsFirst
+s16 D_801BFD1C[] = { 1, 0, 0, 0 };
+// rupeeDigitsCount
+s16 D_801BFD24[] = { 2, 3, 3, 0 };
+// rupeeIconPrimColor
+Color_RGB16 D_801BFD2C[] = {
+ { 200, 255, 100 },
+ { 170, 170, 255 },
+ { 255, 105, 105 },
+};
+// rupeeIconEnvColor
+Color_RGB16 D_801BFD40[] = {
+ { 0, 80, 0 },
+ { 10, 10, 80 },
+ { 40, 10, 0 },
+};
+// minigameCountdownTexs
+TexturePtr D_801BFD54[] = {
+ gMinigameCountdown3Tex,
+ gMinigameCountdown2Tex,
+ gMinigameCountdown1Tex,
+ gMinigameCountdownGoTex,
+};
+// minigameCountdownTexHeights
+s16 D_801BFD64[] = { 24, 24, 24, 40 };
+// minigameCountdownPrimColor
+Color_RGB16 D_801BFD6C[] = {
+ { 100, 255, 100 },
+ { 255, 255, 60 },
+ { 255, 100, 0 },
+ { 120, 170, 255 },
+};
+// grandma's story pictures
+TexturePtr D_801BFD84[] = {
+ gStoryMaskFestivalTex,
+ gStoryGiantsLeavingTex,
+};
+// grandma's story TLUT
+TexturePtr D_801BFD8C[] = {
+ gStoryMaskFestivalTLUT,
+ gStoryGiantsLeavingTLUT,
+};
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011F0E0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80120F90.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80121064.s")
+u8 D_801BFD94 = 0;
+s16 D_801BFD98 = 0;
+s16 D_801BFD9C = 0;
+
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_801210E0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80121F94.s")
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index f373b0337..563560d40 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -653,7 +653,7 @@ void func_80123C58(Player* player) {
void Player_SetEquipmentData(PlayState* play, Player* player) {
if (player->csMode != 0x86) {
- player->currentShield = GET_CUR_EQUIP_VALUE(EQUIP_SHIELD);
+ player->currentShield = GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD);
if ((player->transformation != PLAYER_FORM_ZORA) || (((player->currentBoots != PLAYER_BOOTS_ZORA_LAND)) &&
(player->currentBoots != PLAYER_BOOTS_ZORA_UNDERWATER))) {
player->currentBoots = D_801BFF90[player->transformation];
@@ -667,7 +667,7 @@ void Player_SetEquipmentData(PlayState* play, Player* player) {
}
void func_80123D50(PlayState* play, Player* player, s32 itemId, s32 actionParam) {
- func_80114FD0(play, itemId, player->heldItemButton);
+ Inventory_UpdateBottleItem(play, itemId, player->heldItemButton);
if (itemId != ITEM_BOTTLE) {
player->heldItemId = itemId;
diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c
index 255f7e389..69a0a4491 100644
--- a/src/code/z_sram_NES.c
+++ b/src/code/z_sram_NES.c
@@ -230,8 +230,8 @@ void Sram_SaveEndOfCycle(PlayState* play) {
s16 sceneNum;
s32 j;
s32 i;
- u8 temp;
- u8 temp2;
+ u8 slot;
+ u8 item;
gSaveContext.save.daySpeed = 0;
gSaveContext.save.daysElapsed = 0;
@@ -276,7 +276,7 @@ void Sram_SaveEndOfCycle(PlayState* play) {
}
if (gSaveContext.save.weekEventReg[84] & 0x20) {
- func_801149A0(ITEM_MASK_FIERCE_DEITY, SLOT(ITEM_MASK_FIERCE_DEITY));
+ Inventory_DeleteItem(ITEM_MASK_FIERCE_DEITY, SLOT(ITEM_MASK_FIERCE_DEITY));
}
for (i = 0; i < ARRAY_COUNT(D_801C66D0); i++) {
@@ -306,26 +306,26 @@ void Sram_SaveEndOfCycle(PlayState* play) {
}
if (INV_CONTENT(ITEM_BOMB) == ITEM_BOMB) {
- temp2 = INV_CONTENT(ITEM_BOMB);
- if (AMMO(temp2) != 0) {
+ item = INV_CONTENT(ITEM_BOMB);
+ if (AMMO(item) != 0) {
gSaveContext.eventInf[7] |= 2;
}
}
if (INV_CONTENT(ITEM_NUT) == ITEM_NUT) {
- temp2 = INV_CONTENT(ITEM_NUT);
- if (AMMO(temp2) != 0) {
+ item = INV_CONTENT(ITEM_NUT);
+ if (AMMO(item) != 0) {
gSaveContext.eventInf[7] |= 4;
}
}
if (INV_CONTENT(ITEM_STICK) == ITEM_STICK) {
- temp2 = INV_CONTENT(ITEM_STICK);
- if (AMMO(temp2) != 0) {
+ item = INV_CONTENT(ITEM_STICK);
+ if (AMMO(item) != 0) {
gSaveContext.eventInf[7] |= 8;
}
}
if (INV_CONTENT(ITEM_BOW) == ITEM_BOW) {
- temp2 = INV_CONTENT(ITEM_BOW);
- if (AMMO(temp2) != 0) {
+ item = INV_CONTENT(ITEM_BOW);
+ if (AMMO(item) != 0) {
gSaveContext.eventInf[7] |= 0x10;
}
}
@@ -333,8 +333,8 @@ void Sram_SaveEndOfCycle(PlayState* play) {
for (i = 0; i < ARRAY_COUNT(D_801C67B0); i++) {
if (D_801C67B0[i] != ITEM_NONE) {
if ((gSaveContext.save.inventory.items[i] != ITEM_NONE) && (i != SLOT_PICTO_BOX)) {
- temp2 = gSaveContext.save.inventory.items[i];
- AMMO(temp2) = 0;
+ item = gSaveContext.save.inventory.items[i];
+ AMMO(item) = 0;
}
}
}
@@ -343,10 +343,10 @@ void Sram_SaveEndOfCycle(PlayState* play) {
// Check for all bottled items
if (gSaveContext.save.inventory.items[i] >= ITEM_POTION_RED) {
if (gSaveContext.save.inventory.items[i] <= ITEM_OBABA_DRINK) {
- for (j = 1; j < 4; j++) {
+ for (j = EQUIP_SLOT_C_LEFT; j <= EQUIP_SLOT_C_RIGHT; j++) {
if (GET_CUR_FORM_BTN_ITEM(j) == gSaveContext.save.inventory.items[i]) {
SET_CUR_FORM_BTN_ITEM(j, ITEM_BOTTLE);
- func_80112B40(play, j);
+ Interface_LoadItemIconImpl(play, j);
}
}
gSaveContext.save.inventory.items[i] = ITEM_BOTTLE;
@@ -354,26 +354,26 @@ void Sram_SaveEndOfCycle(PlayState* play) {
}
}
- REMOVE_QUEST_ITEM(QUEST_UNK_19);
+ REMOVE_QUEST_ITEM(QUEST_PICTOGRAPH);
if (gSaveContext.save.playerData.health < 0x30) {
gSaveContext.save.playerData.health = 0x30;
}
- if (GET_CUR_EQUIP_VALUE(EQUIP_SWORD) < 3) {
- SET_EQUIP_VALUE(EQUIP_SWORD, 1);
+ if (GET_CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) <= EQUIP_VALUE_SWORD_RAZOR) {
+ SET_EQUIP_VALUE(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_KOKIRI);
if (CUR_FORM == 0) {
if ((STOLEN_ITEM_1 >= ITEM_SWORD_GILDED) || (STOLEN_ITEM_2 >= ITEM_SWORD_GILDED)) {
BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_SWORD_GILDED;
- SET_EQUIP_VALUE(EQUIP_SWORD, 3);
+ SET_EQUIP_VALUE(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_GILDED);
} else {
BUTTON_ITEM_EQUIP(CUR_FORM, EQUIP_SLOT_B) = ITEM_SWORD_KOKIRI;
}
} else {
if ((STOLEN_ITEM_1 >= ITEM_SWORD_GILDED) || (STOLEN_ITEM_2 >= ITEM_SWORD_GILDED)) {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_B) = ITEM_SWORD_GILDED;
- SET_EQUIP_VALUE(EQUIP_SWORD, 3);
+ SET_EQUIP_VALUE(EQUIP_TYPE_SWORD, EQUIP_VALUE_SWORD_GILDED);
} else {
BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_B) = ITEM_SWORD_KOKIRI;
}
@@ -385,20 +385,20 @@ void Sram_SaveEndOfCycle(PlayState* play) {
}
if (STOLEN_ITEM_1 == ITEM_BOTTLE) {
- temp = SLOT(ITEM_BOTTLE);
- for (i = 0; i < 6; i++) {
- if (gSaveContext.save.inventory.items[temp + i] == ITEM_NONE) {
- gSaveContext.save.inventory.items[temp + i] = ITEM_BOTTLE;
+ slot = SLOT(ITEM_BOTTLE);
+ for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
+ if (gSaveContext.save.inventory.items[slot + i] == ITEM_NONE) {
+ gSaveContext.save.inventory.items[slot + i] = ITEM_BOTTLE;
break;
}
}
}
if (STOLEN_ITEM_2 == ITEM_BOTTLE) {
- temp = SLOT(ITEM_BOTTLE);
- for (i = 0; i < 6; i++) {
- if (gSaveContext.save.inventory.items[temp + i] == ITEM_NONE) {
- gSaveContext.save.inventory.items[temp + i] = ITEM_BOTTLE;
+ slot = SLOT(ITEM_BOTTLE);
+ for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
+ if (gSaveContext.save.inventory.items[slot + i] == ITEM_NONE) {
+ gSaveContext.save.inventory.items[slot + i] = ITEM_BOTTLE;
break;
}
}
@@ -407,15 +407,14 @@ void Sram_SaveEndOfCycle(PlayState* play) {
SET_STOLEN_ITEM_1(STOLEN_ITEM_NONE);
SET_STOLEN_ITEM_2(STOLEN_ITEM_NONE);
- // ??
- func_801149A0(ITEM_OCARINA_FAIRY, SLOT_TRADE_DEED);
- func_801149A0(ITEM_SLINGSHOT, SLOT_TRADE_KEY_MAMA);
- func_801149A0(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
+ Inventory_DeleteItem(ITEM_OCARINA_FAIRY, SLOT_TRADE_DEED);
+ Inventory_DeleteItem(ITEM_SLINGSHOT, SLOT_TRADE_KEY_MAMA);
+ Inventory_DeleteItem(ITEM_LONGSHOT, SLOT_TRADE_COUPLE);
- for (j = 1; j < 4; j++) {
+ for (j = EQUIP_SLOT_C_LEFT; j <= EQUIP_SLOT_C_RIGHT; j++) {
if (GET_CUR_FORM_BTN_ITEM(j) >= ITEM_MOON_TEAR && GET_CUR_FORM_BTN_ITEM(j) <= ITEM_PENDANT_MEMORIES) {
SET_CUR_FORM_BTN_ITEM(j, ITEM_NONE);
- func_80112B40(play, j);
+ Interface_LoadItemIconImpl(play, j);
}
}
@@ -809,8 +808,8 @@ void Sram_InitDebugSave(void) {
Lib_MemCpy(&gSaveContext.save.checksum, &sSaveDebugChecksum, sizeof(gSaveContext.save.checksum));
if (gSaveContext.save.playerForm != PLAYER_FORM_HUMAN) {
- BUTTON_ITEM_EQUIP(0, 2) = D_801C6A48[((void)0, gSaveContext.save.playerForm & 0xFF)];
- C_SLOT_EQUIP(0, 2) = D_801C6A50[((void)0, gSaveContext.save.playerForm & 0xFF)];
+ BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) = D_801C6A48[((void)0, gSaveContext.save.playerForm & 0xFF)];
+ C_SLOT_EQUIP(0, EQUIP_SLOT_C_DOWN) = D_801C6A50[((void)0, gSaveContext.save.playerForm & 0xFF)];
}
gSaveContext.save.hasTatl = true;
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-20 20:29:18 +0000