From 6739d68df74fabb94f1525f5f6ae8ff3dfe0d907 Mon Sep 17 00:00:00 2001 From: Colin Noga Date: Thu, 22 Mar 2012 21:06:44 -0500 Subject: stuff --- src/boss.cpp | 18 ++++-------------- src/bossCaptainBowser.cpp | 2 +- src/bossFlameThrower.cpp | 1 - src/bossPlayerClown.cpp | 19 ++++++++++++------- src/bossPodouble.cpp | 2 +- src/challengeStar.cpp | 4 +--- src/randtiles.cpp | 8 ++++---- 7 files changed, 23 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/boss.cpp b/src/boss.cpp index e5be583..a8a1a48 100644 --- a/src/boss.cpp +++ b/src/boss.cpp @@ -4,8 +4,6 @@ void DamagePlayer(dEn_c *actor, ActivePhysics *apThis, ActivePhysics *apOther) { - OSReport("Damage Player\n"); - actor->dEn_c::playerCollision(apThis, apOther); actor->_vf220(apOther->owner); @@ -26,7 +24,6 @@ void DamagePlayer(dEn_c *actor, ActivePhysics *apThis, ActivePhysics *apOther) { void SetupKameck(daBoss *actor, daKameckDemo *Kameck) { - OSReport("Stop BGM Music\n"); // Stop the BGM Music StopBGMMusic(); @@ -35,44 +32,38 @@ void SetupKameck(daBoss *actor, daKameckDemo *Kameck) { WLClass::instance->_4 = 4; WLClass::instance->_8 = 0; - OSReport("Enter Demo Mode\n"); MakeMarioEnterDemoMode(); // Make sure to use the correct position Vec pos = (Vec){actor->pos.x - 124.0, actor->pos.y + 104.0, 3564.0}; S16Vec rot = (S16Vec){0, 0, 0}; - OSReport("Make Kameck\n"); // Create And use Kameck actor->Kameck = (daKameckDemo*)actor->createChild(KAMECK_FOR_CASTLE_DEMO, (dStageActor_c*)actor, 0, &pos, &rot, 0); actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoWait); - OSReport("Kameck at %x\n", actor->Kameck); } void CleanupKameck(daBoss *actor, daKameckDemo *Kameck) { // Clean up the flags and Kameck - OSReport("Cleaning up ALL the Kamecks!\n"); dStage32C_c::instance->freezeMarioBossFlag = 0; WLClass::instance->_8 = 1; - OSReport("Fixing ALL the BGMs and Demo Modes!\n"); MakeMarioExitDemoMode(); StartBGMMusic(); actor->Kameck->Delete(1); - OSReport("KAMEX DELETZORS\n"); } bool GrowBoss(daBoss *actor, daKameckDemo *Kameck, float initialScale, float endScale, float yPosModifier, int timer) { - if (timer == 130) { OSReport("Timer = 130 - Kameck = %x\n", Kameck); actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoSt); } - if (timer == 400) { OSReport("Timer = 400 - Kameck = %x\n", Kameck); actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoSt2); } + if (timer == 130) { actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoSt); } + if (timer == 400) { actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoSt2); } float scaleSpeed, yPosScaling; - if (timer == 150) { PlaySound(actor, SE_BOSS_IGGY_WANWAN_TO_L); OSReport("Timer = 150\n"); } + if (timer == 150) { PlaySound(actor, SE_BOSS_IGGY_WANWAN_TO_L); } if ((timer > 150) && (timer < 230)) { scaleSpeed = (endScale -initialScale) / 80.0; @@ -86,7 +77,6 @@ bool GrowBoss(daBoss *actor, daKameckDemo *Kameck, float initialScale, float end } if (timer == 360) { - OSReport("Timer = 360 - Make Effects\n"); Vec tempPos = (Vec){actor->pos.x - 40.0, actor->pos.y + 120.0, 3564.0}; SpawnEffect("Wm_ob_greencoinkira", 0, &tempPos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0}); SpawnEffect("Wm_mr_yoshiicehit_a", 0, &tempPos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0}); @@ -97,7 +87,7 @@ bool GrowBoss(daBoss *actor, daKameckDemo *Kameck, float initialScale, float end SpawnEffect("Wm_ob_keyget01_c", 0, &tempPos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0}); } - if (timer > 420) { return true; OSReport("Timer = 420, returning true\n"); } + if (timer > 420) { return true; } return false; } diff --git a/src/bossCaptainBowser.cpp b/src/bossCaptainBowser.cpp index ba78977..bb73087 100644 --- a/src/bossCaptainBowser.cpp +++ b/src/bossCaptainBowser.cpp @@ -420,7 +420,7 @@ int daCaptainBowser::onDraw() { if (this->chrAnimation.getCurrentFrame() > 53.0) { // This is where the smackdown starts scaleIncreaser += 0.014285; - effect.spawn("Wm_ko_shout", 0, &(Vec){pos.x-186.0+(scaleIncreaser*16.0), pos.y+138.0+(scaleIncreaser*16.0), pos.z}, &(S16Vec){0,0,0}, &(Vec){scaleIncreaser, scaleIncreaser, scaleIncreaser}); + effect.spawn("Wm_ko_shout", 0, &(Vec){pos.x-186.0+(scaleIncreaser*16.0), pos.y+138.0+(scaleIncreaser*16.0), pos.z}, &(S16Vec){0,0,0x7000}, &(Vec){scaleIncreaser, scaleIncreaser, scaleIncreaser}); this->Roar.info.xDistToEdge = 70.0 * scaleIncreaser; this->Roar.info.yDistToEdge = 70.0 * scaleIncreaser; diff --git a/src/bossFlameThrower.cpp b/src/bossFlameThrower.cpp index 3a77621..871625a 100644 --- a/src/bossFlameThrower.cpp +++ b/src/bossFlameThrower.cpp @@ -28,7 +28,6 @@ daKoopaBreath *daKoopaBreath::build() { int daKoopaBreath::onCreate() { - OSReport("Made a fireball"); ActivePhysics::Info GreatBalls; GreatBalls.xDistToCenter = 0.0; diff --git a/src/bossPlayerClown.cpp b/src/bossPlayerClown.cpp index 2db1d90..eb67db3 100644 --- a/src/bossPlayerClown.cpp +++ b/src/bossPlayerClown.cpp @@ -4,11 +4,16 @@ #include #include "boss.h" +// #define cField(TYPE, OFFSET) (*(TYPE*)(((u32)clown) + (OFFSET))) +// #define cPlayerOccupying cField(dStageActor_c*, 0x738) +// #define cModel cField(m3d::mdl_c*, 0xFEC) +// #define cTimer cField(u32, 0xFEC+sizeof(m3d::mdl_c)) +// #define cAllocator cField(mHeapAllocator_c*, 0xFD0) -// #define cPlayerOccupying (*(dStageActor_c**)(((u32)(clown)) + 0x738 )) +#define cPlayerOccupying (*(dStageActor_c**)(((u32)(clown)) + 0x738 )) #define cAllocator ((mHeapAllocator_c*)(((u32)(clown)) + 0xFD0 )) #define cModel ((m3d::mdl_c*)( ((u32)(clown)) + 0xFEC )) -#define cTimer (**(u32**)((u32)(clown) + sizeof(m3d::mdl_c) + 0xFEC )) +#define cTimer (*(u32*)((u32)(clown) + sizeof(m3d::mdl_c) + 0xFEC )) extern "C" int PClownCarExecute(dEn_c *clown); extern "C" void PClownCarAfterCreate(dEn_c *clown, u32); @@ -70,7 +75,7 @@ void CCafterCreate(dEn_c *clown, u32 param) { void CConExecuteMove(dEn_c *clown) { - // u8 player = cPlayerOccupying->which_player; + u8 player = cPlayerOccupying->which_player; // OSReport("Angle = %x, %x, %x", (GetSpecificPlayerActor(player))->rot.y, (GetSpecificPlayerActor(player))->rot.x, (GetSpecificPlayerActor(player))->rot.z); // OSReport("Clown = %x, %x, %x", (clown)->rot.y, (clown)->rot.x, (clown)->rot.z); @@ -79,7 +84,7 @@ void CConExecuteMove(dEn_c *clown) { u32 buttonPushed = Remocon_GetPressed(GetRemoconMng()->controllers[0]); if (buttonPushed & 0x0100) { - // if (cTimer > 90) { + if (cTimer > 90) { if (clown->direction == 0) { // Going right tempPos = (Vec){clown->pos.x + 32.0, clown->pos.y + 32.0, 3564.0}; dStageActor_c *spawned = CreateActor(657, 0, tempPos, 0, 0); @@ -94,11 +99,11 @@ void CConExecuteMove(dEn_c *clown) { SpawnEffect("Wm_en_killervanish", 0, &tempPos, &(S16Vec){0,0,0}, &(Vec){0.1, 0.1, 0.1}); PlaySoundAsync(clown, SE_OBJ_HOUDAI_S_SHOT); - // cTimer = 0; - // } + cTimer = 0; + } } - // cTimer++; + cTimer++; // run normal move PClownCarMove(clown); diff --git a/src/bossPodouble.cpp b/src/bossPodouble.cpp index 9388d62..c6eb99b 100644 --- a/src/bossPodouble.cpp +++ b/src/bossPodouble.cpp @@ -338,7 +338,7 @@ int daPodouble::onDraw() { if (isFire) { float scaleSpeed; - if (timer == 150) { PlaySound(this, SE_BOSS_IGGY_WANWAN_TO_L); OSReport("Timer = 150\n"); } + if (timer == 150) { PlaySound(this, SE_BOSS_IGGY_WANWAN_TO_L); } if ((timer > 150) && (timer < 230)) { scaleSpeed = (3.5 - 1.0) / 80.0; diff --git a/src/challengeStar.cpp b/src/challengeStar.cpp index dda35cc..03b4089 100644 --- a/src/challengeStar.cpp +++ b/src/challengeStar.cpp @@ -51,10 +51,8 @@ void dChallengeStar::playerCollision(ActivePhysics *apThis, ActivePhysics *apOth GlobalStarsCollected--; if (GlobalStarsCollected == 0) { EventTable->events |= this->eventFlag; - OSReport("All stars spawned collected, triggered Event!\n"); } - OSReport("%d Stars Collected\n", GlobalStarsCollected); this->Delete(1); } @@ -74,7 +72,7 @@ dChallengeStar *dChallengeStar::build() { int dChallengeStar::onCreate() { char die = this->settings & 0xF; - if (GetSpecificPlayerActor(die) == 0) { this->Delete(1); } + if (GetSpecificPlayerActor(die) == 0) { this->Delete(1); return; } GlobalStarsCollected++; diff --git a/src/randtiles.cpp b/src/randtiles.cpp index 1508200..da86a92 100644 --- a/src/randtiles.cpp +++ b/src/randtiles.cpp @@ -94,13 +94,13 @@ RandomTileData *RandomTileData::instance = 0; dDvdLoader_c RandTileLoader; extern "C" bool RandTileLoadHook() { - OSReport("Trying to load..."); + // OSReport("Trying to load..."); void *buf = RandTileLoader.load("/NewerRes/RandTiles.bin"); if (buf == 0) { - OSReport("Failed.\n"); + // OSReport("Failed.\n"); return false; } else { - OSReport("Successfully loaded RandTiles.bin [%p].\n", buf); + // OSReport("Successfully loaded RandTiles.bin [%p].\n", buf); RandomTileData::instance = (RandomTileData*)buf; return true; } @@ -114,7 +114,7 @@ extern "C" void IdentifyTilesets(RTilemapClass *self) { const char *tilesetName = BGDatClass::instance->getTilesetName(self->areaID, i); self->sections[i] = RandomTileData::instance->getSection(tilesetName); - OSReport("[%d] Chose %p for %s\n", i, self->sections[i], tilesetName); + // OSReport("[%d] Chose %p for %s\n", i, self->sections[i], tilesetName); } } -- cgit v1.2.3