diff options
| author | Ibot02 <jtp.jtp@gmx.de> | 2022-01-08 18:08:02 +0100 |
|---|---|---|
| committer | Ibot02 <jtp.jtp@gmx.de> | 2022-01-08 18:08:02 +0100 |
| commit | f21b6a477f024e9208fa2b0b16713bf923d525aa (patch) | |
| tree | 6d3049642c7746466c6523a870a83469fdfcb3e9 /src | |
| parent | 08558c96bd68ee76fb62b35cc62008ccfb87e2d8 (diff) | |
Match sub_08024E4C
Diffstat (limited to 'src')
| -rw-r--r-- | src/enemy/pesto.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index 430f8945..7d5db56e 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -790,16 +790,15 @@ u32 sub_08024E34(void) { return gUnk_080CBF20[idx]; } -NONMATCH("asm/non_matching/pesto/sub_08024E4C.inc", void sub_08024E4C(Entity* this)) { +void sub_08024E4C(Entity* this) { if (this->field_0x82.HALF.HI == 3) { - this->field_0xf++; - this->field_0xf &= 0xff; - this->field_0xf &= 0x1f; - + this->field_0xf = ++this->field_0xf & 0x1f; if (sub_0807953C()) { - this->cutsceneBeh.HALF.LO += 1 + (Random() & 1); + u32 r = Random(); + this->cutsceneBeh.HALF.LO++; + r &= 1; + this->cutsceneBeh.HALF.LO += r; } - if (gSave.stats.health == 0 || this->field_0x86.HALF.HI == 4) { this->cutsceneBeh.HALF.LO = 0x30; this->field_0x86.HALF.HI = 0; @@ -811,7 +810,6 @@ NONMATCH("asm/non_matching/pesto/sub_08024E4C.inc", void sub_08024E4C(Entity* th sub_08024A14(this, 0, 8); } else { Entity* player = &gPlayerEntity; - ResetPlayer(); gPlayerState.flags |= PL_DISABLE_ITEMS; gPlayerState.field_0xa |= 0x80; @@ -832,7 +830,6 @@ NONMATCH("asm/non_matching/pesto/sub_08024E4C.inc", void sub_08024E4C(Entity* th } } } -END_NONMATCH void sub_08024F50(Entity* this) { gPlayerState.field_0xa = 0; |