diff options
| -rw-r--r-- | spritetex.yaml | 5 | ||||
| -rw-r--r-- | src/bossSamurshai.cpp | 14 | ||||
| -rw-r--r-- | src/bossThwompaDomp.cpp | 4 | ||||
| -rwxr-xr-x | src/spritetex.S | 15 |
4 files changed, 25 insertions, 13 deletions
diff --git a/spritetex.yaml b/spritetex.yaml index 506e89d..7264fb4 100644 --- a/spritetex.yaml +++ b/spritetex.yaml @@ -728,5 +728,10 @@ hooks: src_addr_pal: 0x80855804 target_func: 'TEX_LightBlock' + - name: GLOW_LightBlock + type: branch_insn + branch_type: b + src_addr_pal: 0x807E3B40 + target_func: 'GLOW_LightBlock' diff --git a/src/bossSamurshai.cpp b/src/bossSamurshai.cpp index a5b2b30..98470b9 100644 --- a/src/bossSamurshai.cpp +++ b/src/bossSamurshai.cpp @@ -111,11 +111,7 @@ daSamurshai *daSamurshai::build() { char hitType = usedForDeterminingStatePress_or_playerCollision(this, apThis, apOther, 2); - if (topHurts == true) { - this->dEn_c::playerCollision(apThis, apOther); - this->_vf220(apOther->owner); - } - else if ((hitType == 1) || (hitType == 3)) { + if ((hitType == 1) || (hitType == 3)) { apOther->someFlagByte |= 2; if (this->isDown == 0) { this->playEnemyDownSound1(); @@ -139,11 +135,7 @@ daSamurshai *daSamurshai::build() { void daSamurshai::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { apOther->someFlagByte |= 2; - if (topHurts == true) { - this->dEn_c::playerCollision(apThis, apOther); - this->_vf220(apOther->owner); - } - else if (this->isDown == 0) { + if (this->isDown == 0) { damage += 6; if (damage > 15) { doStateChange(&StateID_Outro); } else { doStateChange(&StateID_Damage); } @@ -294,7 +286,7 @@ int daSamurshai::onCreate() { HitMeBaby.xDistToCenter = 0.0; HitMeBaby.yDistToCenter = 15.0; - HitMeBaby.xDistToEdge = 18.0; + HitMeBaby.xDistToEdge = 13.0; HitMeBaby.yDistToEdge = 15.0; HitMeBaby.category1 = 0x3; diff --git a/src/bossThwompaDomp.cpp b/src/bossThwompaDomp.cpp index 134ff5d..58254a7 100644 --- a/src/bossThwompaDomp.cpp +++ b/src/bossThwompaDomp.cpp @@ -273,7 +273,7 @@ int daEnMegaDosun_c::onDelete() { this->direction = 1; } - this->pos.x += (direction) ? 0.9 : -0.9; + this->pos.x += (direction) ? 1.2 : -1.2; if (this->notFalling == 0) { if(this->CheckIfPlayerBelow(40.0, 256.0)) { @@ -282,7 +282,7 @@ int daEnMegaDosun_c::onDelete() { } } - if (this->timer == 60) { + if (this->timer == 30) { this->notFalling = 0; } diff --git a/src/spritetex.S b/src/spritetex.S index a3d0331..50d2419 100755 --- a/src/spritetex.S +++ b/src/spritetex.S @@ -1329,6 +1329,21 @@ ChangeWindyColour: blr +.global GLOW_LightBlock +GLOW_LightBlock: + lwz r4, 4(r3) + + andi. r4, r4, 0x1 + cmpwi r4, 1 + + beqlr + + lwzu r12, 0x404(r3) + lwz r12, 0x10(r12) + mtctr r12 + bctr + + .data BomombDir: .word 0x0400FC00 |