Merge branch 'level-select' of treeki:newergit/Kamek into level-select

1 files changed, 269 insertions, 9 deletions

diff --git a/kamek_ntsc2.x b/kamek_ntsc2.x
index a35703f..f803db3 100644
--- a/kamek_ntsc2.x
+++ b/kamek_ntsc2.x
@@ -6,6 +6,7 @@ OUTPUT_FORMAT ("binary")
 
 SECTIONS {
 	GetSpecificPlayerActor = 0x8005F900;
+	Actor_SearchByID = 0x80162D00;
 	TimeStopFlag = 0x80429CFA;
 	TimerBranch = 0x800E39C8;
 	MarioDescentRate = 0x8042B864;
@@ -16,6 +17,8 @@ SECTIONS {
 	AlwaysDrawFlag = 0x80064540;
 	AlwaysDrawBranch = 0x80064544;
 	GenerateRandomNumber = 0x800B2EE0;
+	OneofManySoundPlayers = 0x800CE8C0;
+	BombExplodeState = 0x80B12A88;
 
 	_savefpr_14 = 0x802DCCA8;
 	_savefpr_15 = 0x802DCCAC;
@@ -101,6 +104,9 @@ SECTIONS {
 	__construct_new_array = 0x802DC7E0;
 	__destroy_new_array = 0x802DCB10;
 
+	__register_global_object = 0x802DC780;
+	__ptmf_scall = 0x802DCBFC;
+
 
 	setup__13FunctionChainFPPFPv_bUs = 0x8015F600;
 
@@ -113,16 +119,216 @@ SECTIONS {
 
 	GetExplanationString__7dBase_cFv = 0x8006C660;
 
+	__vt__15daEnBlockMain_c = 0x80301EA8;
+	__dt__15daEnBlockMain_cFv = 0x80023340;
+	calledWhenUpMoveBegins__15daEnBlockMain_cFv = 0x80022E80;
+	calledWhenDownMoveBegins__15daEnBlockMain_cFv = 0x80022F60;
+	calledWhenUpMoveExecutes__15daEnBlockMain_cFv = 0x80022F30;
+	calledWhenUpMoveDiffExecutes__15daEnBlockMain_cFv = 0x800231A0;
+	calledWhenDownMoveExecutes__15daEnBlockMain_cFv = 0x80023010;
+	calledWhenDownMoveEndExecutes__15daEnBlockMain_cFv = 0x80023080;
+	calledWhenDownMoveDiffExecutes__15daEnBlockMain_cFv = 0x800232C0;
+	calledWhenDownMoveDiffEndExecutes__15daEnBlockMain_cFv = 0x80023330;
+	updateScale__15daEnBlockMain_cFb = 0x80022DC0;
+	upMove_Begin__15daEnBlockMain_cFv = 0x80022E60;
+	upMove_Execute__15daEnBlockMain_cFv = 0x80022EA0;
+	upMove_End__15daEnBlockMain_cFv = 0x80022E90;
+	downMove_Begin__15daEnBlockMain_cFv = 0x80022F40;
+	downMove_Execute__15daEnBlockMain_cFv = 0x80022F80;
+	downMove_End__15daEnBlockMain_cFv = 0x80022F70;
+	downMoveEnd_Begin__15daEnBlockMain_cFv = 0x80023020;
+	downMoveEnd_Execute__15daEnBlockMain_cFv = 0x80023040;
+	downMoveEnd_End__15daEnBlockMain_cFv = 0x80023030;
+	upMove_Diff_Begin__15daEnBlockMain_cFv = 0x80023090;
+	upMove_Diff_Execute__15daEnBlockMain_cFv = 0x800230D0;
+	upMove_Diff_End__15daEnBlockMain_cFv = 0x800230C0;
+	downMove_Diff_Begin__15daEnBlockMain_cFv = 0x800231B0;
+	downMove_Diff_Execute__15daEnBlockMain_cFv = 0x800231F0;
+	downMove_Diff_End__15daEnBlockMain_cFv = 0x800231E0;
+	downMove_DiffEnd_Begin__15daEnBlockMain_cFv = 0x800232D0;
+	downMove_DiffEnd_Execute__15daEnBlockMain_cFv = 0x800232F0;
+	downMove_DiffEnd_End__15daEnBlockMain_cFv = 0x800232E0;
+	blockInit__15daEnBlockMain_cFf = 0x80021690;
+	blockUpdate__15daEnBlockMain_cFv = 0x800217B0;
+	blockResult__15daEnBlockMain_cFv = 0x800212C0;
+	PhysicsCallback1__15daEnBlockMain_c = 0x80021180;
+	PhysicsCallback2__15daEnBlockMain_c = 0x80021170;
+	PhysicsCallback3__15daEnBlockMain_c = 0x800211A0;
+	OPhysicsCallback1__15daEnBlockMain_c = 0x80020BF0;
+	OPhysicsCallback2__15daEnBlockMain_c = 0x80020E70;
+	OPhysicsCallback3__15daEnBlockMain_c = 0x80021010;
+	StateID_UpMove__15daEnBlockMain_c = 0x80352A34;
+	StateID_DownMove__15daEnBlockMain_c = 0x80352A74;
+	StateID_DownMoveEnd__15daEnBlockMain_c = 0x80352AB4;
+	StateID_UpMove_Diff__15daEnBlockMain_c = 0x80352AF4;
+	StateID_DownMove_Diff__15daEnBlockMain_c = 0x80352B34;
+	StateID_DownMove_DiffEnd__15daEnBlockMain_c = 0x80352B74;
+
+	__ct__5dEn_cFv = 0x80094E80;
+	afterCreate__5dEn_cFi = 0x800951D0;
+	afterExecute__5dEn_cFi = 0x80095480;
+	kill__5dEn_cFv = 0x80097F70;
+	eatIn__5dEn_cFv = 0x80097C40;
+	disableEatIn__5dEn_cFv = 0x80097CB0;
+	_vf8C__5dEn_cFPv = 0x80097D30;
+	_vfCC__5dEn_cFP7Point2d = 0x800973F0;
+	_vfD0__5dEn_cFP7Point2d = 0x800974F0;
+	doStateChange__5dEn_cFP9StateBase = 0x800A7DF0;
+	preSpriteCollision__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x80095CE0;
+	prePlayerCollision__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x80095D30;
+	preYoshiCollision__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x80095F50;
+	stageActorCollision__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x80096060;
+	spriteCollision__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x80095C10;
+	playerCollision__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x80095C20;
+	yoshiCollision__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x80095C80;
+	collisionCat3_StarPower__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x8009F840;
+	collisionCat5_Mario__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x8009FB50;
+	_vf108__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x8009FE40;
+	collisionCatD_GroundPound__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x8009FFD0;
+	_vf110__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x8009FFC0;
+	collisionCat8_FencePunch__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x8009FCE0;
+	collisionCat7_WMWaggleWater__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x800A0150;
+	collisionCat7_WMWaggleWaterYoshi__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x800A02D0;
+	_vf120__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x8009FCD0;
+	collisionCatA_PenguinMario__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x8009FCC0;
+	collisionCat11_PipeCannon__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x8009F9D0;
+	collisionCat9_RollingObject__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x800A0700;
+	collisionCat1_Fireball_E_Explosion__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x800A08D0;
+	collisionCat2_IceBall_15_YoshiIce__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x800A0A30;
+	collisionCat13_Hammer__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x800A03C0;
+	collisionCat14_YoshiFire__5dEn_cFP13ActivePhysicsP13ActivePhysics = 0x800A0550;
+	_vf140__5dEn_cFP13dStageActor_c = 0x800A10B0;
+	_vf144__5dEn_cFi = 0x800A0C70;
+	_vf148__5dEn_cFv = 0x800A12A0;
+	_vf14C__5dEn_cFv = 0x800A1370;
+	_vf150__5dEn_cFv = 0x800206D0;
+	eatenByYoshiProbably__5dEn_cFv = 0x80096230;
+	playHpdpSound1__5dEn_cFv = 0x800A1C00;
+	playEnemyDownSound1__5dEn_cFv = 0x800A1BB0;
+	playEnemyDownComboSound__5dEn_cFPv = 0x800A1C80;
+	playHpdpSound2__5dEn_cFv = 0x800A1D90;
+	_vf168__5dEn_cFv = 0x800A1E10;
+	dieFumi_Begin__5dEn_cFv = 0x800A1470;
+	dieFumi_Execute__5dEn_cFv = 0x800A1600;
+	dieFumi_End__5dEn_cFv = 0x800A1820;
+	dieFall_Begin__5dEn_cFv = 0x800A16A0;
+	dieFall_Execute__5dEn_cFv = 0x800A1830;
+	dieFall_End__5dEn_cFv = 0x800A1820;
+	dieBigFall_Begin__5dEn_cFv = 0x800A1910;
+	dieBigFall_Execute__5dEn_cFv = 0x800A1930;
+	dieBigFall_End__5dEn_cFv = 0x800A1920;
+	dieSmoke_Begin__5dEn_cFv = 0x800A1980;
+	dieSmoke_Execute__5dEn_cFv = 0x800A1A00;
+	dieSmoke_End__5dEn_cFv = 0x800A19F0;
+	dieYoshiFumi_Begin__5dEn_cFv = 0x800A1AC0;
+	dieYoshiFumi_Execute__5dEn_cFv = 0x800A1B40;
+	dieYoshiFumi_End__5dEn_cFv = 0x800A1B30;
+	dieIceVanish_Begin__5dEn_cFv = 0x800A1A10;
+	dieIceVanish_Execute__5dEn_cFv = 0x800A1AB0;
+	dieIceVanish_End__5dEn_cFv = 0x800A1AA0;
+	dieGoal_Begin__5dEn_cFv = 0x800A1B50;
+	dieGoal_Execute__5dEn_cFv = 0x800A1B70;
+	dieGoal_End__5dEn_cFv = 0x800A1B60;
+	dieOther_Begin__5dEn_cFv = 0x800A1B80;
+	dieOther_Execute__5dEn_cFv = 0x800A1BA0;
+	dieOther_End__5dEn_cFv = 0x800A1B90;
+	eatIn_Begin__5dEn_cFv = 0x800A81C0;
+	eatIn_Execute__5dEn_cFv = 0x800A81E0;
+	eatIn_End__5dEn_cFv = 0x800A81D0;
+	eatNow_Begin__5dEn_cFv = 0x800A8260;
+	eatNow_Execute__5dEn_cFv = 0x800A8280;
+	eatNow_End__5dEn_cFv = 0x800A8270;
+	eatOut_Begin__5dEn_cFv = 0x800A8290;
+	eatOut_Execute__5dEn_cFv = 0x800A82B0;
+	eatOut_End__5dEn_cFv = 0x800A82A0;
+	hitSpin_Begin__5dEn_cFv = 0x800A8190;
+	hitSpin_Execute__5dEn_cFv = 0x800A81B0;
+	hitSpin_End__5dEn_cFv = 0x800A81A0;
+	ice_Begin__5dEn_cFv = 0x800A7E90;
+	ice_Execute__5dEn_cFv = 0x800A7F40;
+	ice_End__5dEn_cFv = 0x800A7F30;
+	spawnHitEffectAtPosition__5dEn_cF7Point2d = 0x80095520;
+	doSomethingWithHardHitAndSoftHitEffects__5dEn_cF7Point3d = 0x80095530;
+	playEnemyDownSound2__5dEn_cFv = 0x80095580;
+	add2ToYSpeed__5dEn_cFv = 0x800955D0;
+	_vf218__5dEn_cFv = 0x80095890;
+	_vf21C__5dEn_cFv = 0x80097770;
+	_vf220__5dEn_cFPv = 0x80097F20;
+	_vf224__5dEn_cFv = 0x80097F60;
+	_vf228__5dEn_cFv = 0x800206C0;
+	_vf22C__5dEn_cFv = 0x800A8060;
+	_vf230__5dEn_cFv = 0x800A8150;
+	_vf234__5dEn_cFv = 0x800A8160;
+	_vf238__5dEn_cFv = 0x800A8180;
+	_vf23C__5dEn_cFv = 0x800206B0;
+	_vf240__5dEn_cFv = 0x800206A0;
+	_vf244__5dEn_cFv = 0x80020690;
+	_vf248__5dEn_cFi = 0x800968E0;
+	_vf24C__5dEn_cFPv = 0x80096710;
+	_vf250__5dEn_cFPv = 0x80096700;
+	_vf254__5dEn_cFPv = 0x80096720;
+	_vf258__5dEn_cFPv = 0x80096760;
+	_vf25C__5dEn_cFPv = 0x80096770;
+	_vf260__5dEn_cFPv = 0x80096910;
+	_vf264__5dEn_cFP13dStageActor_c = 0x80096D60;
+	_vf268__5dEn_cFPv = 0x80096A20;
+	spawnHitEffectAtPositionAgain__5dEn_cF7Point2d = 0x80096DF0;
+	playMameStepSound__5dEn_cFv = 0x80096C40;
+	_vf274__5dEn_cFv = 0x80096E50;
+	_vf278__5dEn_cFPv = 0x80096B30;
+	_vf27C__5dEn_cFv = 0x80096E40;
+
+	_vfD8__18dActorMultiState_cFv = 0x80067590;
+	_vfDC__18dActorMultiState_cFv = 0x800675B0;
+	_vfE0__18dActorMultiState_cFv = 0x800675A0;
+
+	__ct__13dStageActor_cFv = 0x80064110;
+	__dt__13dStageActor_cFv = 0x800642B0;
+	beforeCreate__13dStageActor_cFv = 0x80064350;
+	afterCreate__13dStageActor_cFi = 0x80064380;
+	beforeDelete__13dStageActor_cFv = 0x80064390;
+	afterDelete__13dStageActor_cFi = 0x800643E0;
+	beforeExecute__13dStageActor_cFv = 0x800643F0;
+	afterExecute__13dStageActor_cFi = 0x80064490;
+	beforeDraw__13dStageActor_cFv = 0x80064540;
+	afterDraw__13dStageActor_cFi = 0x800645E0;
+	GetExplanationString__13dStageActor_cFv = 0x800645F0;
+	_vf60__13dStageActor_cFv = 0x80065080;
+	_vf68__13dStageActor_cFv = 0x8001D210;
+	_vf6C__13dStageActor_cFv = 0x8001D200;
+	_vf70__13dStageActor_cFv = 0x80065620;
+	_vf74__13dStageActor_cFv = 0x8001D1F0;
+	_vf78__13dStageActor_cFv = 0x80065820;
+	_vf7C__13dStageActor_cFv = 0x8001D1E0;
+	_vf88__13dStageActor_cFv = 0x80065860;
+	_vf90__13dStageActor_cFP13dStageActor_c = 0x80065880;
+	_vf94__13dStageActor_cFPv = 0x80065AC0;
+	removeMyActivePhysics__13dStageActor_cFv = 0x80066080;
+	addMyActivePhysics__13dStageActor_cFv = 0x80066090;
+	returnRegularScale__13dStageActor_cFv = 0x80065950;
+	_vfA4__13dStageActor_cFPv = 0x80065970;
+	_vfA8__13dStageActor_cFPv = 0x80065A00;
+	_vfAC__13dStageActor_cFPv = 0x80065A40;
+	_vfB0__13dStageActor_cFv = 0x80065660;
+	_vfB4__13dStageActor_cFv = 0x80065B40;
+	_vfB8__13dStageActor_cFv = 0x8001D1D0;
+	_vfBC__13dStageActor_cFv = 0x80065B50;
+	_vfC0__13dStageActor_cFv = 0x80065B60;
+	_vfC4__13dStageActor_cFv = 0x80065B70;
+	_vfC8__13dStageActor_cFP7Point2d = 0x80065CC0;
+	checkZoneBoundaries__13dStageActor_cFUi = 0x80064F50;
+	create__13dStageActor_cF6ActorsUiP7Point3dP6S16VecUc = 0x80064610;
+
 	__ct__8dScene_cFv = 0x800E19B0;
 	__dt__8dScene_cFv = 0x800E1A20;
 	beforeCreate__8dScene_cFv = 0x800E1AA0;
-	afterCreate__8dScene_cFv = 0x800E1AE0;
+	afterCreate__8dScene_cFi = 0x800E1AE0;
 	beforeDelete__8dScene_cFv = 0x800E1B50;
-	afterDelete__8dScene_cFv = 0x800E1B80;
+	afterDelete__8dScene_cFi = 0x800E1B80;
 	beforeExecute__8dScene_cFv = 0x800E1BE0;
-	afterExecute__8dScene_cFv = 0x800E1D20;
+	afterExecute__8dScene_cFi = 0x800E1D20;
 	beforeDraw__8dScene_cFv = 0x800E1D70;
-	afterDraw__8dScene_cFv = 0x800E1DA0;
+	afterDraw__8dScene_cFi = 0x800E1DA0;
 
 	__ct__8dActor_cFv = 0x8006C6D0;
 	__dt__8dActor_cFv = 0x8006C7F0;
@@ -130,13 +336,13 @@ SECTIONS {
 	__ct__7dBase_cFv = 0x8006C420;
 	__dt__7dBase_cFv = 0x8006C490;
 	beforeCreate__7dBase_cFv = 0x8006C540;
-	afterCreate__7dBase_cFv = 0x8006C570;
+	afterCreate__7dBase_cFi = 0x8006C570;
 	beforeDelete__7dBase_cFv = 0x8006C580;
-	afterDelete__7dBase_cFv = 0x8006C5B0;
+	afterDelete__7dBase_cFi = 0x8006C5B0;
 	beforeExecute__7dBase_cFv = 0x8006C5C0;
-	afterExecute__7dBase_cFv = 0x8006C600;
+	afterExecute__7dBase_cFi = 0x8006C600;
 	beforeDraw__7dBase_cFv = 0x8006C610;
-	afterDraw__7dBase_cFv = 0x8006C650;
+	afterDraw__7dBase_cFi = 0x8006C650;
 
 	onDraw__7fBase_cFv = 0x801621D0;
 
@@ -145,6 +351,46 @@ SECTIONS {
 	_vf58__8dActor_cFv = 0x8001D1C0;
 	_vf5C__8dActor_cFv = 0x8001D1B0;
 
+	__ct__9StateBaseFPCc = 0x8015F7C0;
+	__dt__9StateBaseFv = 0x8015F800;
+	isInvalid__9StateBaseFv = 0x8015F840;
+	isEqualNotUsedForSomeReason__9StateBaseFP9StateBase = 0x8015F850;
+	isEqual__9StateBaseFP9StateBase = 0x8015F8C0;
+	isNotEqual__9StateBaseFP9StateBase = 0x8015F8D0;
+	getName__9StateBaseFv = 0x8015F920;
+	getID__9StateBaseFv = 0x8015F930;
+
+	__ct__10dFlagMgr_c = 0x800E3AE0;
+	setup__10dFlagMgr_cFb = 0x800E3BA0;
+	applyAndClearAllTimedActions__10dFlagMgr_cFv = 0x800E3F20;
+	execute__10dFlagMgr_cFv = 0x800E4010;
+	set__10dFlagMgr_cFUcibbbUi = 0x800E41C0;
+	findLowestFlagInSet__10dFlagMgr_cFUiUl = 0x800E4470;
+	setSpecial__10dFlagMgr_cFUcffUcUiUl = 0x800E4550;
+	get8__10dFlagMgr_cFUc = 0x800E4590;
+	get108__10dFlagMgr_cFUc = 0x800E45A0;
+	get208__10dFlagMgr_cFUc = 0x800E45B0;
+	get248__10dFlagMgr_cFUc = 0x800E45C0;
+	get448__10dFlagMgr_cFUc = 0x800E45E0;
+	instance__10dFlagMgr_c = 0x8042A078;
+
+
+	__ct__7PhysicsFv = 0x8007F7A0;
+	setup__7PhysicsFP8dActor_cPQ27Physics4InfoUcUcP7Point2d = 0x8007FB10;
+	addToList__7PhysicsFv = 0x8007F900;
+	removeFromList__7PhysicsFv = 0x8007F950;
+	update__7PhysicsFv = 0x8007FDA0;
+
+	getTileRendererList__7dBgGm_cFi = 0x80078520;
+
+	add__Q212TileRenderer4ListFP12TileRenderer = 0x80014820;
+	remove__Q212TileRenderer4ListFP12TileRenderer = 0x80014860;
+
+	__ct__12TileRendererFv = 0x800145B0;
+	__dt__12TileRendererFv = 0x800145F0;
+	setPosition__12TileRendererFfff = 0x800146B0;
+	setVars__12TileRendererFf = 0x800146D0;
+
 	__ct__21dPlayerModelHandler_cFUc = 0x800D6CC0;
 	loadModel__21dPlayerModelHandler_cFUcii = 0x800D6DF0;
 	setSRT__21dPlayerModelHandler_cF7Point3d6S16Vec7Point3d = 0x800D6F40;
@@ -277,8 +523,13 @@ SECTIONS {
 	GameHeaps = 0x80377C48;
 
 	BGDatClass = 0x80429DF0;
+	instance__10BGDatClass = 0x80429DF0;
 	GetTilesetName__FPvii = 0x800813F0;
 
+	getTilesetName__10BGDatClassFii = 0x800813F0;
+
+	getPointerToTile__12TilemapClassFiiPUib = 0x80083B40;
+
 	IsWideScreen__Fv = 0x800B54B0;
 
 	Player_Active = 0x80354E50;
@@ -379,6 +630,7 @@ SECTIONS {
 	strncpy = 0x802E19F8;
 	strcmp = 0x802E1AB4;
 	sprintf = 0x802E17DC;
+	strrchr = 0x802E1C40;
 
 	wcslen = 0x802E441C;
 
@@ -692,6 +944,7 @@ SECTIONS {
 	dSys_c__RootHeapMEM2 = 0x8042A094;
 
 	BG_GM_ptr = 0x80429DD0;
+	instance__7dBgGm_c = 0x80429DD0;
 
 	BgActorDefs = 0x80429DDC;
 
@@ -735,6 +988,8 @@ SECTIONS {
 
 	continuePlumberSetPowerupTextureDebug = 0x800CA5C4;
 
+	returnFromPowerupSoundChange = 0x801412FC;
+
 	ExitFromTileGodHack = 0x807E1694;
 
 	SomeTable_802F5440 = 0x802F5140;
@@ -753,6 +1008,9 @@ SECTIONS {
 	GetRandomSeed = 0x800B2EC0;
 	RandomSeed = 0x80429F44;
 
+	MakeRandomNumber__Fi = 0x800B2EE0;
+	MakeRandomNumberForTiles__Fi = 0x801613A0;
+
 	StrangeReplayValue1 = 0x8042792E;
 	StrangeReplayValue2 = 0x80429D69;
 	StrangeReplayValue3 = 0x80429D6A;
@@ -768,13 +1026,16 @@ SECTIONS {
 	SomeWipeClass = 0x8042A440;
 	QueryGlobal5758 = 0x800B3B50;
 
+
 	.text : {
 		FILL (0)
 
 		__text_start = . ;
 		*(.init)
 		*(.text)
+		__ctor_loc = . ;
 		*(.ctors)
+		__ctor_end = . ;
 		*(.dtors)
 		*(.rodata)
 		/**(.sdata)*/
@@ -786,4 +1047,3 @@ SECTIONS {
 		__text_end  = . ;
 	}
 }
-