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

cleanup

Browse Source
This commit is contained in:
engineer124
2022-11-20 19:15:48 -05:00
parent 3959a5c1d0
commit 5dc523d8af
6 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/variables.h
+3 -3
View File
@@ -639,9 +639,9 @@ extern UNK_PTR D_801BF5C0;
// extern UNK_TYPE2 sMinigameScoreDigits;
// extern UNK_TYPE2 sCUpInvisible;
// extern UNK_TYPE2 sCUpTimer;
// extern UNK_TYPE2 sMagicBarOutlinePrimRed;
// extern UNK_TYPE2 sMagicBarOutlinePrimGreen;
// extern UNK_TYPE2 sMagicBarOutlinePrimBlue;
// extern UNK_TYPE2 sMagicMeterOutlinePrimRed;
// extern UNK_TYPE2 sMagicMeterOutlinePrimGreen;
// extern UNK_TYPE2 sMagicMeterOutlinePrimBlue;
// extern UNK_TYPE2 sMagicBorderRatio;
// extern UNK_TYPE2 sMagicBorderStep;
// extern UNK_TYPE2 sEnvTimerType;
src/code/z_parameter.c
+41 -23
View File
@@ -849,6 +849,7 @@ void Interface_SetVertices(PlayState* play) {
}
s32 sPostmanTimerInputBtnAPressed = false;
void Interface_PostmanTimerCallback(s32 arg0) {
s32 btnAPressed;
@@ -894,8 +895,8 @@ void Interface_StartPostmanTimer(s16 seconds, s16 bunnyHoodState) {
} else {
gSaveContext.timerDirections[TIMER_ID_POSTMAN] = TIMER_COUNT_UP;
}
gSaveContext.timerStates[TIMER_ID_POSTMAN] = TIMER_STATE_POSTMAN_START;
gSaveContext.timerStates[TIMER_ID_POSTMAN] = TIMER_STATE_POSTMAN_START;
gSaveContext.timerStopTimes[TIMER_ID_POSTMAN] = 0;
gSaveContext.timerPausedOsTimes[TIMER_ID_POSTMAN] = 0;
}
@@ -2593,9 +2594,9 @@ u8 Item_Give(PlayState* play, u8 item) {
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);
INCREMENT_QUEST_HEART_PIECE_COUNT;
if (EQ_MAX_QUEST_HEART_PIECE_COUNT) {
RESET_HEART_PIECE_COUNT;
gSaveContext.save.playerData.healthCapacity += 0x10;
gSaveContext.save.playerData.health += 0x10;
}
@@ -3515,6 +3516,7 @@ void Magic_Reset(PlayState* play) {
/**
* Request to consume magic.
*
* @param magicToConsume the positive-valued amount to decrease magic by
* @param type how the magic is consumed.
* @return false if the request failed
@@ -3538,8 +3540,7 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
switch (type) {
case MAGIC_CONSUME_NOW:
case MAGIC_CONSUME_NOW_ALT:
// Consume magic immediately
// Ex. Deku Bubble
// Drain magic immediately e.g. Deku Bubble
if ((gSaveContext.magicState == MAGIC_STATE_IDLE) ||
(gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) {
@@ -3592,8 +3593,7 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
case MAGIC_CONSUME_WAIT_PREVIEW:
// Sets consume target but waits to consume.
// Preview consumption with a yellow bar
// Ex. Spin Attack
// Preview consumption with a yellow bar. e.g. Spin Attack
if ((gSaveContext.magicState == MAGIC_STATE_IDLE) ||
(gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) {
@@ -3608,7 +3608,7 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
}
case MAGIC_CONSUME_GORON_ZORA:
// Zora Shock, Goron Spike Roll
// Goron spiked rolling or Zora electric barrier
if (gSaveContext.save.playerData.magic != 0) {
interfaceCtx->magicConsumptionTimer = 10;
gSaveContext.magicState = MAGIC_STATE_CONSUME_GORON_ZORA_SETUP;
@@ -3618,7 +3618,7 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
}
case MAGIC_CONSUME_GIANTS_MASK:
// Wearing Giants Mask
// Wearing Giant's Mask
if (gSaveContext.magicState == MAGIC_STATE_IDLE) {
if (gSaveContext.save.playerData.magic != 0) {
interfaceCtx->magicConsumptionTimer = R_MAGIC_CONSUME_TIMER_GIANTS_MASK;
@@ -3635,7 +3635,6 @@ s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type) {
}
case MAGIC_CONSUME_DEITY_BEAM:
// Using Fierce Deity Beam
// Consumes magic immediately
if ((gSaveContext.magicState == MAGIC_STATE_IDLE) ||
(gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
@@ -3817,7 +3816,7 @@ void Magic_Update(PlayState* play) {
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) != ITEM_LENS) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) != ITEM_LENS)) ||
!play->actorCtx.lensActive) {
// Force lens off and set magic state to idle
// Deactivate Lens of Truth and set magic state to idle
play->actorCtx.lensActive = false;
play_sound(NA_SE_SY_GLASSMODE_OFF);
gSaveContext.magicState = MAGIC_STATE_IDLE;
@@ -5694,7 +5693,7 @@ void Interface_DrawTimers(PlayState* play) {
sTimerId = TIMER_ID_NONE;
// Process all active timers
// Update all timer states
for (i = 0; i < TIMER_ID_MAX; i++) {
if (gSaveContext.timerStates[i] == TIMER_STATE_OFF) {
continue;
@@ -5736,6 +5735,8 @@ void Interface_DrawTimers(PlayState* play) {
case TIMER_STATE_ALT_START:
sTimerStateTimer = 20;
if (interfaceCtx->minigameState != MINIGAME_STATE_NONE) {
// Set the timer position
gSaveContext.timerX[sTimerId] = 26;
if (interfaceCtx->magicAlpha != 255) {
@@ -5757,7 +5758,7 @@ void Interface_DrawTimers(PlayState* play) {
}
gSaveContext.timerStartOsTimes[sTimerId] = osGetTime();
gSaveContext.timerStopTimes[sTimerId] = 0;
gSaveContext.timerStopTimes[sTimerId] = SECONDS_TO_TIMER(0);
gSaveContext.timerPausedOsTimes[sTimerId] = 0;
}
} else {
@@ -5806,7 +5807,7 @@ void Interface_DrawTimers(PlayState* play) {
gSaveContext.timerStates[sTimerId] = TIMER_STATE_COUNTING;
gSaveContext.timerStartOsTimes[sTimerId] = osGetTime();
gSaveContext.timerStopTimes[sTimerId] = 0;
gSaveContext.timerStopTimes[sTimerId] = SECONDS_TO_TIMER(0);
gSaveContext.timerPausedOsTimes[sTimerId] = 0;
}
// fallthrough
@@ -5903,18 +5904,21 @@ void Interface_DrawTimers(PlayState* play) {
break;
}
// Update timer counting
if ((sTimerId != TIMER_ID_NONE) && gSaveContext.timerStates[sTimerId]) { // != TIMER_STATE_OFF
if (gSaveContext.timerDirections[sTimerId] == TIMER_COUNT_DOWN) {
sTimerDigits[0] = sTimerDigits[1] = sTimerDigits[3] = sTimerDigits[4] = sTimerDigits[6] = 0;
// used to index the counter colon
// Used to index the counter colon
sTimerDigits[2] = sTimerDigits[5] = 10;
// Get the total amount of unpaused time since the start of the timer, centiseconds (1/100th sec).
if ((gSaveContext.timerStates[sTimerId] == TIMER_STATE_COUNTING) ||
(gSaveContext.timerStates[sTimerId] == TIMER_STATE_10) ||
(gSaveContext.timerStates[sTimerId] == TIMER_STATE_ALT_COUNTING) ||
(gSaveContext.timerStates[sTimerId] == TIMER_STATE_POSTMAN_COUNTING)) {
osTime = osGetTime();
osTime =
OSTIME_TO_TIMER(osTime - ((void)0, gSaveContext.timerPausedOsTimes[sTimerId]) -
D_801BF930[sTimerId] - ((void)0, gSaveContext.timerStartOsTimes[sTimerId]));
@@ -5924,15 +5928,21 @@ void Interface_DrawTimers(PlayState* play) {
osTime = 0;
}
// Check how much unpaused time has passed
if (osTime == 0) {
// No unpaused time has passed since the start of the timer.
gSaveContext.timerCurTimes[sTimerId] = gSaveContext.timerTimeLimits[sTimerId] - osTime;
} else if (osTime <= gSaveContext.timerTimeLimits[sTimerId]) {
// Time has passed, but the time limit has not been exceeded
if (osTime >= gSaveContext.timerTimeLimits[sTimerId]) {
// The time is exactly at the time limit. No time remaining.
gSaveContext.timerCurTimes[sTimerId] = SECONDS_TO_TIMER(0);
} else {
// Update the time remaining
gSaveContext.timerCurTimes[sTimerId] = gSaveContext.timerTimeLimits[sTimerId] - osTime;
}
} else {
// Time has passed, and the time limit has been exceeded.
gSaveContext.timerCurTimes[sTimerId] = SECONDS_TO_TIMER(0);
gSaveContext.timerStates[sTimerId] = TIMER_STATE_STOP;
if (sEnvTimerActive) {
@@ -5962,9 +5972,10 @@ void Interface_DrawTimers(PlayState* play) {
} else { // TIMER_COUNT_UP
sTimerDigits[0] = sTimerDigits[1] = sTimerDigits[3] = sTimerDigits[4] = sTimerDigits[6] = 0;
// used to index the counter colon
// Used to index the counter colon
sTimerDigits[2] = sTimerDigits[5] = 10;
// Get the total amount of unpaused time since the start of the timer, centiseconds (1/100th sec).
if ((gSaveContext.timerStates[sTimerId] == TIMER_STATE_COUNTING) ||
(gSaveContext.timerStates[sTimerId] == TIMER_STATE_POSTMAN_COUNTING)) {
osTime = osGetTime();
@@ -5989,6 +6000,7 @@ void Interface_DrawTimers(PlayState* play) {
osTime = SECONDS_TO_TIMER(120);
}
// Update the time remaining with the total amount of time since the start of the timer,
gSaveContext.timerCurTimes[sTimerId] = osTime;
Interface_GetTimerDigits(osTime, sTimerDigits);
@@ -6011,6 +6023,7 @@ void Interface_DrawTimers(PlayState* play) {
}
}
// Draw timer
gDPPipeSync(OVERLAY_DISP++);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0);
@@ -6021,8 +6034,8 @@ void Interface_DrawTimers(PlayState* play) {
gDPSetCombineLERP(OVERLAY_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0,
0, PRIMITIVE, 0);
// Set the timer color
if (IS_POSTMAN_TIMER_DRAWN || (gSaveContext.timerStates[sTimerId] <= TIMER_STATE_12)) {
// Set the timer color
if (gSaveContext.timerStates[sTimerId]) { // != TIMER_STATE_OFF
if (sTimerId == TIMER_ID_2) {
if ((gSaveContext.timerCurTimes[sTimerId] == SECONDS_TO_TIMER(0)) ||
@@ -6130,18 +6143,26 @@ void Interface_UpdateBottleTimers(PlayState* play) {
for (i = BOTTLE_FIRST; i < BOTTLE_MAX; i++) {
if (gSaveContext.bottleTimerStates[i] == BOTTLE_TIMER_STATE_COUNTING) {
osTime = osGetTime();
// Get the total amount of unpaused time since the start of the timer, centiseconds (1/100th sec).
osTime = OSTIME_TO_TIMER_ALT(osTime - ((void)0, gSaveContext.bottleTimerPausedOsTimes[i]) -
((void)0, gSaveContext.bottleTimerStartOsTimes[i]));
if (osTime == 0) {
// No unpaused time has passed since the start of the timer.
gSaveContext.bottleTimerCurTimes[i] = gSaveContext.bottleTimerTimeLimits[i] - osTime;
} else if (osTime <= gSaveContext.bottleTimerTimeLimits[i]) {
// Time has passed, but the time limit has not been exceeded
if (osTime >= gSaveContext.bottleTimerTimeLimits[i]) {
gSaveContext.bottleTimerCurTimes[i] = 0;
// The time is exactly at the time limit. No time remaining.
gSaveContext.bottleTimerCurTimes[i] = SECONDS_TO_TIMER(0);
} else {
// Update the time remaining
gSaveContext.bottleTimerCurTimes[i] = gSaveContext.bottleTimerTimeLimits[i] - osTime;
}
} else {
gSaveContext.bottleTimerCurTimes[i] = 0;
// Time has passed, and the time limit has been exceeded.
gSaveContext.bottleTimerCurTimes[i] = SECONDS_TO_TIMER(0);
if (gSaveContext.save.inventory.items[i + SLOT_BOTTLE_1] == ITEM_HOT_SPRING_WATER) {
Inventory_UpdateItem(play, i + SLOT_BOTTLE_1, ITEM_SPRING_WATER);
@@ -6307,9 +6328,6 @@ TexturePtr gStoryTLUTs[] = {
gStoryGiantsLeavingTLUT,
};
// TODO: ucode.h? (see OoT)
#define SP_UCODE_DATA_SIZE 0x800
void Interface_Draw(PlayState* play) {
s32 pad;
InterfaceContext* interfaceCtx = &play->interfaceCtx;
src/overlays/actors/ovl_En_Muto/z_en_muto.c
+1 -1
View File
@@ -144,7 +144,7 @@ void EnMuto_Idle(EnMuto* this, PlayState* play) {
}
}
if (1) {} // Needed match
if (1) {} // Needed to match
if (!this->isInMayorsRoom && Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK) {
this->actor.textId = 0x2363;
src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c
+1 -1
View File
@@ -367,7 +367,7 @@ void EnRuppecrow_UpdatePosition(EnRuppecrow* this, PlayState* play) {
s32 EnRuppecrow_CheckPlayedMatchingSong(PlayState* play) {
Player* player = GET_PLAYER(play);
if (play->msgCtx.ocarinaMode == 3) {
if (play->msgCtx.ocarinaMode == 0x3) {
switch (player->transformation) {
case PLAYER_FORM_DEKU:
if (play->msgCtx.lastPlayedSong == OCARINA_SONG_SONATA) {
tools/disasm/variables.txt
+3 -3
View File
@@ -1081,9 +1081,9 @@
0x801BF890:("sMinigameScoreDigits","UNK_TYPE2","",0x2),
0x801BF898:("sCUpInvisible","UNK_TYPE2","",0x2),
0x801BF89C:("sCUpTimer","UNK_TYPE2","",0x2),
0x801BF8A0:("sMagicBarOutlinePrimRed","UNK_TYPE2","",0x2),
0x801BF8A4:("sMagicBarOutlinePrimGreen","UNK_TYPE2","",0x2),
0x801BF8A8:("sMagicBarOutlinePrimBlue","UNK_TYPE2","",0x2),
0x801BF8A0:("sMagicMeterOutlinePrimRed","UNK_TYPE2","",0x2),
0x801BF8A4:("sMagicMeterOutlinePrimGreen","UNK_TYPE2","",0x2),
0x801BF8A8:("sMagicMeterOutlinePrimBlue","UNK_TYPE2","",0x2),
0x801BF8AC:("sMagicBorderRatio","UNK_TYPE2","",0x2),
0x801BF8B0:("sMagicBorderStep","UNK_TYPE2","",0x2),
0x801BF8DC:("sEnvTimerType","UNK_TYPE2","",0x2),
tools/namefixer.py
-5
View File
@@ -548,11 +548,6 @@ wordReplace = {
"Cutscene_GetSceneSetupIndex": "Cutscene_GetSceneLayer",
"func_801343C0": "SkelAnime_DrawTransformFlexOpa",
"func_80134148": "SkelAnime_DrawTransformFlexLimbOpa",
"func_8013AB00": "SubS_DrawTransformFlex",
"func_8013A860": "SubS_DrawTransformFlexLimb",
"func_8013BC6C": "SubS_ChangeAnimationByInfoS",
"func_8013E1C8": "SubS_ChangeAnimationBySpeedInfo",
"func_8013D9C8": "SubS_FillLimbRotTables",
"func_80114E90": "Interface_HasEmptyBottle",
"func_80114F2C": "Interface_HasItemInBottle",
"func_80123C90": "Player_SetEquipmentData",