Match ChozoStatueHintMovement

This commit is contained in:
y.demaisonregne 2023-06-18 17:31:50 +02:00
parent 5663d42c12
commit 8b3c23d547
2 changed files with 8 additions and 6 deletions

View File

@ -2,7 +2,7 @@
This is a work in progress decompilation of Metroid - Zero Mission. This is a work in progress decompilation of Metroid - Zero Mission.
2636/2721 functions decompiled (96.88%, 85 left) 2637/2721 functions decompiled (96.91%, 84 left)
0x350b3c/0x76b014 bytes of data not in blobs (44.69%, 0x41a4d8 left) 0x350b3c/0x76b014 bytes of data not in blobs (44.69%, 0x41a4d8 left)

View File

@ -198,10 +198,12 @@ u32 unk_72144(struct ChozoHintRelated* param_1)
return yPosition << 16 | xPosition; return yPosition << 16 | xPosition;
} }
/**
* @brief 72204 | 46c | Handles the movement of the target on a chozo statue hint
*
*/
void ChozoStatueHintMovement(void) void ChozoStatueHintMovement(void)
{ {
// https://decomp.me/scratch/S0x90
s32 norm; s32 norm;
s32 var_2; s32 var_2;
@ -310,9 +312,9 @@ void ChozoStatueHintMovement(void)
else else
PAUSE_SCREEN_DATA.unk_8C[0].unk_12 += 5; PAUSE_SCREEN_DATA.unk_8C[0].unk_12 += 5;
if (PAUSE_SCREEN_DATA.unk_48 % 8 == 0) if ((PAUSE_SCREEN_DATA.unk_48 & 7) == 0)
{ {
norm = (PAUSE_SCREEN_DATA.unk_48 / 8) % 4; norm = (PAUSE_SCREEN_DATA.unk_48 >> 3) & 3;
norm++; norm++;
PAUSE_SCREEN_DATA.chozoHintOam[norm] = PAUSE_SCREEN_DATA.chozoHintOam[0]; PAUSE_SCREEN_DATA.chozoHintOam[norm] = PAUSE_SCREEN_DATA.chozoHintOam[0];
@ -328,7 +330,7 @@ void ChozoStatueHintMovement(void)
else else
var_2 = 0xF; var_2 = 0xF;
PAUSE_SCREEN_DATA.chozoHintOam[norm].oamID = var_2; PAUSE_SCREEN_DATA.chozoHintOam[norm].oamID = var_2;
PAUSE_SCREEN_DATA.chozoHintOam[norm].animationDurationCounter = 4; PAUSE_SCREEN_DATA.chozoHintOam[norm].animationDurationCounter = 3;
PAUSE_SCREEN_DATA.chozoHintOam[norm].currentAnimationFrame = 5; PAUSE_SCREEN_DATA.chozoHintOam[norm].currentAnimationFrame = 5;
PAUSE_SCREEN_DATA.chozoHintOam[norm].exists = TRUE; PAUSE_SCREEN_DATA.chozoHintOam[norm].exists = TRUE;
} }