diff options
-rwxr-xr-x | include/game.h | 10 | ||||
-rw-r--r-- | kamek_pal.x | 2 | ||||
-rw-r--r-- | src/bossMegaGoomba.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/game.h b/include/game.h index 17962e7..61e303c 100755 --- a/include/game.h +++ b/include/game.h @@ -2149,7 +2149,7 @@ public: };
u8 _125;
- u32 _128, _12C, _130, _134, _138, _13C;
+ u32 _128, _12C, directionForCarry, _134, _138, _13C;
float _140;
u32 _144;
ActivePhysics aPhysics;
@@ -2169,15 +2169,15 @@ public: u16 spriteSomeFlag;
u8 _366, _367;
u32 _368;
- u8 eatenState; // 0=normal,2=eaten
+ u8 eatenState; // 0=normal,2=eaten,4=spit out
u8 _36D;
- Vec somethingRelatedToScale;
+ Vec scaleBeforeBeingEaten;
u32 _37C, _380, _384, _388;
u8 stageActorType;
u8 which_player; // _38D
u8 disableFlagMask, currentLayerID;
u8 deleteForever;
- u8 _391, _392, _padding;
+ u8 appearsOnBackFence, _392, _padding;
dStageActor_c();
@@ -2198,7 +2198,7 @@ public: virtual u8 *_vf6C(); // returns byte 0x38D
virtual Vec2 _vf70(); // returns Vec Actor.pos + Vec Actor.field_D0
virtual int _vf74(); // params unknown. return (1) might be bool
- virtual void _vf78(); // params unknown. nullsub
+ virtual void itemPickedUp(); // params unknown. nullsub
virtual void _vf7C(); // params unknown. nullsub
virtual void eatIn(); // copies Actor.scale into StageActor.somethingRelatedToScale
virtual void disableEatIn(); // params unknown. nullsub
diff --git a/kamek_pal.x b/kamek_pal.x index 5f7a03b..18194a7 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -627,7 +627,7 @@ SECTIONS { _vf6C__13dStageActor_cFv = 0x8001D200; _vf70__13dStageActor_cFv = 0x80065620; _vf74__13dStageActor_cFv = 0x8001D1F0; - _vf78__13dStageActor_cFv = 0x80065820; + itemPickedUp__13dStageActor_cFv = 0x80065820; _vf7C__13dStageActor_cFv = 0x8001D1E0; eatIn__13dStageActor_cFv = 0x80065830; disableEatIn__13dStageActor_cFv = 0x80065850; diff --git a/src/bossMegaGoomba.cpp b/src/bossMegaGoomba.cpp index 51ee044..22a4799 100644 --- a/src/bossMegaGoomba.cpp +++ b/src/bossMegaGoomba.cpp @@ -385,7 +385,7 @@ void daMegaGoomba_c::setupCollision() { this->collMgr.init(this, &belowSensor, 0, &adjacentSensor); - char foo = this->_391; + char foo = this->appearsOnBackFence; this->pos_delta2.x = 0.0; this->pos_delta2.y = 16.0; this->pos_delta2.z = 0.0; |