summaryrefslogtreecommitdiff
path: root/src/bossBridgeBowser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/bossBridgeBowser.cpp')
-rw-r--r--src/bossBridgeBowser.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bossBridgeBowser.cpp b/src/bossBridgeBowser.cpp
index d4bda5d..0abcf21 100644
--- a/src/bossBridgeBowser.cpp
+++ b/src/bossBridgeBowser.cpp
@@ -14,7 +14,7 @@ extern "C" void *BowserDamageNormal(dEn_c *);
extern "C" void *BowserDamageKill(dEn_c *);
extern "C" void *BowserDamageEnd(dEn_c *);
-int HP = 2;
+int BridgeBowserHP = 2;
int lastBomb = 0;
extern bool HackyBombDropVariable;
@@ -31,10 +31,10 @@ void BowserDoomSpriteCollision(dEn_c *bowser, ActivePhysics *apThis, ActivePhysi
// void * bowserClass = (void*)(((u32)bowser) + 0x5F8);
// int HP = *(int*)(((u32)bowserClass) + 4);
- OSReport("HP: %d", HP);
+ OSReport("HP: %d", BridgeBowserHP);
- if (HP <= 0) {
- HP = 0;
+ if (BridgeBowserHP <= 0) {
+ BridgeBowserHP = 0;
*(int*)(((u32)bowser) + 0x540) = 0x28;
@@ -54,7 +54,7 @@ void BowserDoomSpriteCollision(dEn_c *bowser, ActivePhysics *apThis, ActivePhysi
BowserClass->doStateChange(&daBossKoopa_c::StateID_Fall);
dFlagMgr_c::instance->set(3, 0, true, false, false);
- HP = 2;
+ BridgeBowserHP = 2;
}
else {
@@ -63,7 +63,7 @@ void BowserDoomSpriteCollision(dEn_c *bowser, ActivePhysics *apThis, ActivePhysi
BowserDamageAnmClr(bowser);
BowserDamageNormal(bowser);
- HP -= 1;
+ BridgeBowserHP -= 1;
}
lastBomb = apOther->owner->id;
@@ -95,4 +95,4 @@ void BowserDoomEnd(dStageActor_c *Controller) {
void BowserStartEnd(dStageActor_c *Controller) {
dFlagMgr_c::instance->set(1, 0, true, false, false);
-} \ No newline at end of file
+}