diff options
| author | Treeki <treeki@gmail.com> | 2012-01-30 00:39:56 +0100 | 
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-01-30 00:39:56 +0100 | 
| commit | 4d1cccfc209619919c2cae99fb5e58aa62b2bc64 (patch) | |
| tree | be8edf95312effcc9eeea33f73e324279c12630d | |
| parent | bb5d7f7e737e318d095d23939b7d288eaf5f9e63 (diff) | |
| download | kamek-4d1cccfc209619919c2cae99fb5e58aa62b2bc64.tar.gz kamek-4d1cccfc209619919c2cae99fb5e58aa62b2bc64.zip | |
a couple of header updates
Diffstat (limited to '')
| -rwxr-xr-x | include/game.h | 10 | ||||
| -rw-r--r-- | kamek_pal.x | 14 | 
2 files changed, 16 insertions, 8 deletions
| diff --git a/include/game.h b/include/game.h index e0c2eea..590fd1c 100755 --- a/include/game.h +++ b/include/game.h @@ -1654,9 +1654,9 @@ public:  	virtual void _vfBC(); // params unknown. nullsub
  	virtual void _vfC0(); // params unknown. nullsub
  	virtual void _vfC4(); // params unknown. nullsub
 -	virtual void _vfC8(Vec2 *p); // does stuff including effects and playing PLAYER_SE_OBJ/GROUP_BOOT/SE_OBJ_CMN_SPLASH
 -	virtual void _vfCC(Vec2 *p); // mostly same as vfC8, but uses PLAYER_SE_OBJ/GROUP_BOOT/SE_OBJ_CMN_SPLASH_LAVA
 -	virtual void _vfD0(Vec2 *p); // mostly same as vfC8, but uses PLAYER_SE_OBJ/GROUP_BOOT/SE_OBJ_CMN_SPLASH_POISON
 +	virtual void _vfC8(Vec2 *p, float f); // does stuff including effects and playing PLAYER_SE_OBJ/GROUP_BOOT/SE_OBJ_CMN_SPLASH
 +	virtual void _vfCC(Vec2 *p, float f); // mostly same as vfC8, but uses PLAYER_SE_OBJ/GROUP_BOOT/SE_OBJ_CMN_SPLASH_LAVA
 +	virtual void _vfD0(Vec2 *p, float f); // mostly same as vfC8, but uses PLAYER_SE_OBJ/GROUP_BOOT/SE_OBJ_CMN_SPLASH_POISON
  	// I'll add methods as I need them
  	int outOfZone(Vec3 pos, float* rect, u8 zone);
 @@ -1762,8 +1762,8 @@ public:  	void disableEatIn();
  	bool _vf8C(void *other); // AcPy/PlBase?
  	void _vfAC();
 -	void _vfCC(Vec2 *p);
 -	void _vfD0(Vec2 *p);
 +	void _vfCC(Vec2 *p, float f);
 +	void _vfD0(Vec2 *p, float f);
  	void doStateChange(dStateBase_c *state); // might return bool, dunno
 diff --git a/kamek_pal.x b/kamek_pal.x index 5410bab..9b293c1 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -245,8 +245,8 @@ SECTIONS {  	eatIn__5dEn_cFv = 0x80097C40;  	disableEatIn__5dEn_cFv = 0x80097CB0;  	_vf8C__5dEn_cFPv = 0x80097D30; -	_vfCC__5dEn_cFP7Point2d = 0x800973F0; -	_vfD0__5dEn_cFP7Point2d = 0x800974F0; +	_vfCC__5dEn_cFP7Point2df = 0x800973F0; +	_vfD0__5dEn_cFP7Point2df = 0x800974F0;  	doStateChange__5dEn_cFP12dStateBase_c = 0x800A7DF0;  	collisionCallback__5dEn_cFPQ213ActivePhysics4InfoPQ213ActivePhysics4Info = 0x80095950;  	preSpriteCollision__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x80095CE0; @@ -381,13 +381,17 @@ SECTIONS {  	afterDraw__13dStageActor_cFi = 0x800645E0;  	GetExplanationString__13dStageActor_cFv = 0x800645F0;  	_vf60__13dStageActor_cFv = 0x80065080; +	kill__13dStageActor_cFv = 0x80065650;  	_vf68__13dStageActor_cFv = 0x8001D210;  	_vf6C__13dStageActor_cFv = 0x8001D200;  	_vf70__13dStageActor_cFv = 0x80065620;  	_vf74__13dStageActor_cFv = 0x8001D1F0;  	_vf78__13dStageActor_cFv = 0x80065820;  	_vf7C__13dStageActor_cFv = 0x8001D1E0; +	eatIn__13dStageActor_cFv = 0x80065830; +	disableEatIn__13dStageActor_cFv = 0x80065850;  	_vf88__13dStageActor_cFv = 0x80065860; +	_vf8C__13dStageActor_cFPv = 0x80065870;  	_vf90__13dStageActor_cFP13dStageActor_c = 0x80065880;  	_vf94__13dStageActor_cFPv = 0x80065AC0;  	removeMyActivePhysics__13dStageActor_cFv = 0x80066080; @@ -402,7 +406,9 @@ SECTIONS {  	_vfBC__13dStageActor_cFv = 0x80065B50;  	_vfC0__13dStageActor_cFv = 0x80065B60;  	_vfC4__13dStageActor_cFv = 0x80065B70; -	_vfC8__13dStageActor_cFP7Point2d = 0x80065CC0; +	_vfC8__13dStageActor_cFP7Point2df = 0x80065CC0; +	_vfCC__13dStageActor_cFP7Point2df = 0x80065DC0; +	_vfD0__13dStageActor_cFP7Point2df = 0x80065EC0;  	outOfZone__13dStageActor_cF7Point3dPfUc = 0x80064da0;  	checkZoneBoundaries__13dStageActor_cFUi = 0x80064F50;  	create__13dStageActor_cF6ActorsUiP7Point3dP6S16VecUc = 0x80064610; @@ -569,7 +575,9 @@ SECTIONS {  	loadGroups__Q23m2d13EmbedLayout_cFPPCcPii = 0x800C91E0;  	enableNonLoopAnim__Q23m2d13EmbedLayout_cFib = 0x800C93E0;  	enableLoopAnim__Q23m2d13EmbedLayout_cFi = 0x800C9470; +	resetAnim__Q23m2d13EmbedLayout_cFib = 0x800C94C0;  	disableAllAnimations__Q23m2d13EmbedLayout_cFv = 0x800C95F0; +	isAnimOn__Q23m2d13EmbedLayout_cFi = 0x800C9700;  	free__Q23m2d13EmbedLayout_cFv = 0x800C9A20;  	execAnimations__Q23m2d13EmbedLayout_cFv = 0x800C9650;  	scheduleForDrawing__Q23m2d6Base_cFv = 0x80163990; | 
