Merge branch 'level-select' of ssh://treeki.shacknet.nu:30000/Kamek into level-select

2 files changed, 58 insertions, 0 deletions

diff --git a/kamek_pal.x b/kamek_pal.x
index 4633975..9b36840 100644
--- a/kamek_pal.x
+++ b/kamek_pal.x
@@ -1036,6 +1036,30 @@ SECTIONS {
 	getEntryField28__Q23m3d11anmTexPat_cFv = 0x801670a0;
 	vf0C__Q23m3d11anmTexPat_cFv = 0x801670c0;
 
+	AllocSizeForAnmTexSrt = 0x80167480;
+	setup__Q23m3d9anmTexSrt_cFv = 0x80167560;
+	__vt__Q23m3d9anmTexSrt_cFv = 0x803298c0;
+	__dt__Q23m3d9anmTexSrt_cFv = 0x801677e0;
+	detach__Q23m3d9anmTexSrt_cFv = 0x80167850;
+	bindEntry__Q23m3d9anmTexSrt_cFv = 0x80167940;
+	sub80167a80__Q23m3d9anmTexSrt_cFv = 0x80167a80;
+	process__Q23m3d9anmTexSrt_cFv = 0x80167b40;
+	processOneEntry__Q23m3d9anmTexSrt_cFv = 0x80167bf0;
+	getFrameForEntry__Q23m3d9anmTexSrt_cFv = 0x80167c50;
+	setFrameForEntry__Q23m3d9anmTexSrt_cFv = 0x80167c60;
+	getUpdateRateForEntry__Q23m3d9anmTexSrt_cFv = 0x80167c70;
+	setUpdateRateForEntry__Q23m3d9anmTexSrt_cFv = 0x80167c80;
+	isEntryAnimationDone__Q23m3d9anmTexSrt_cFv = 0x80167c90;
+	setEntryByte34__Q23m3d9anmTexSrt_cFv = 0x80167ca0;
+	getEntryField28__Q23m3d9anmTexSrt_cFv = 0x80167cc0;
+	getEntryField2C__Q23m3d9anmTexSrt_cFv = 0x80167ce0;
+	vf0C__Q23m3d9anmTexSrt_cFv = 0x80167d00;
+
+	__vt__Q23m3d10anmTexSrt_c__child_cFv = 0x803298d8;
+	__dt__Q23m3d10anmTexSrt_c__child_cFv = 0x80167d10;
+	vf0C__Q23m3d10anmTexSrt_c__child_cFv = 0x80167d70;
+
+
 	m3d__mdl_c__DoStuff = 0x80169ED0;
 
 	__ashldi3 = 0x802DD4DC;
diff --git a/src/bossMegaGoomba.cpp b/src/bossMegaGoomba.cpp
index e733f4d..bac2516 100644
--- a/src/bossMegaGoomba.cpp
+++ b/src/bossMegaGoomba.cpp
@@ -17,6 +17,10 @@ class daMegaGoomba_c : public dEn_c {
 	m3d::anmChr_c animationChr;
 	nw4r::g3d::ResAnmTexPat resTexPat;
 	m3d::anmTexPat_c animationPat;
+	/* SRT TESTS
+	nw4r::g3d::ResAnmTexSrt resTexSrt;
+	m3d::anmTexSrt_c animationSrt;
+	*/
 	//mAllocator_c allocator2;
 	//FIXME add this back in ?
 	//EGG::Effect effect;
@@ -242,6 +246,33 @@ void daMegaGoomba_c::setupBodyModel() {
 
 
 	allocator.unlink();
+
+	/* SRT TESTS 
+	allocator.link(-1, GameHeaps[0], 0, 0x20);
+
+	this->resFile.data = getResource("ice", "g3d/t02.brres");
+	nw4r::g3d::ResMdl mdl = this->resFile.GetResMdl("ice_B1");
+	bodyModel.setup(mdl, &allocator, 0x20, 1, 0);
+	m3d__mdl_c__SetupTexturesForMapObj_Scene0();
+	//SetupTextures_Enemy(&bodyModel, 0);
+	
+	// USED ONCE
+	// uses this->bodyModel.setDrawPriorities(0x7f, 0x80);
+	//m3d__scnLeaf_c__setDrawPriorities(0x7f, 0x80);
+
+	nw4r::g3d::ResTexSrt anmSrt = this->resFile.getResAnmTexSrt("ice_B1");
+	ret = this->animationSrt.setup(mdl, anmSrt, &this->allocator, 0, 1);
+	// USED ONCE
+	// this->animationSrt.setEntryByte34(0, 0);
+	this->animationSrt.bindEntry(&this->bodyModel, &anmSrt, 0, 0);
+
+	//SOMETIMES DOES BINDANIM
+	//this->bodyModel.bindAnim(&this->animationSrt, 1.0);
+	//this->animationSrt.setFrameForEntry(1.0, 0);
+	//this->animationSrt.setUpdateRateForEntry(1.0, 0);
+	
+	allocator.unlink();
+	*/
 }
 
 int daMegaGoomba_c::onCreate() {
@@ -328,6 +359,9 @@ int daMegaGoomba_c::onDraw() {
 	bodyModel.scheduleForDrawing();
 	bodyModel._vf1C();
 	animationPat.process();
+	/* SRT TESTS 
+	 animationSrt.process();
+	 */
 	return true;
 }