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

Conflicts:
	NewerProject.yaml
	kamek_pal.x

1 files changed, 62 insertions, 1 deletions

diff --git a/kamek_ntsc2.x b/kamek_ntsc2.x
index 2d48f72..8af9cc3 100644
--- a/kamek_ntsc2.x
+++ b/kamek_ntsc2.x
@@ -5,6 +5,18 @@ OUTPUT_FORMAT ("binary")
 }*/
 
 SECTIONS {
+	GetSpecificPlayerActor = 0x8005F900;
+	TimeStopFlag = 0x80429CFA;
+	TimerBranch = 0x800E39C8;
+	MarioDescentRate = 0x8042B864;
+	MarioJumpArc = 0x802F561C;
+	MarioJumpMax = 0x8042B848;
+	MiniMarioJumpArc = 0x802F5664;
+	MarioSize = 0x8042B874;
+	AlwaysDrawFlag = 0x80064540;
+	AlwaysDrawBranch = 0x80064544;
+
+
 	_savefpr_14 = 0x802DCCA8;
 	_savefpr_15 = 0x802DCCAC;
 	_savefpr_16 = 0x802DCCB0;
@@ -173,9 +185,18 @@ SECTIONS {
 	DrawAllLayoutsAfterX__Fi = 0x80163390;
 	DrawAllLayoutsAfterXandBeforeY__Fii = 0x80163420;
 
+	findPaneByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0x80007300;
+	findTextBoxByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0x80007320;
+	findPictureByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0x800073D0;
+	findWindowByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0x80007470;
 	__ct__Q23m2d13EmbedLayout_cFv = 0x800C8950;
 	__dt__Q23m2d13EmbedLayout_cFv = 0x800C89A0;
 	loadArc__Q23m2d13EmbedLayout_cFPCcb = 0x800C8CB0;
+	loadAnimations__Q23m2d13EmbedLayout_cFPPCci = 0x800C8FB0;
+	loadGroups__Q23m2d13EmbedLayout_cFPPCcPii = 0x800C90F0;
+	enableNonLoopAnim__Q23m2d13EmbedLayout_cFib = 0x800C92F0;
+	enableLoopAnim__Q23m2d13EmbedLayout_cFi = 0x800C9380;
+	disableAllAnimations__Q23m2d13EmbedLayout_cFv = 0x800C9500;
 	free__Q23m2d13EmbedLayout_cFv = 0x800C9930;
 	execAnimations__Q23m2d13EmbedLayout_cFv = 0x800C9560;
 	scheduleForDrawing__Q23m2d6Base_cFv = 0x80163850;
@@ -200,14 +221,30 @@ SECTIONS {
 	Init__Q34nw4r3g3d7ResFileFv = 0x8023A590;
 	Bind__Q34nw4r3g3d7ResFileFQ34nw4r3g3d7ResFile = 0x8023A350;
 	GetResMdl__Q34nw4r3g3d7ResFileCFPCc = 0x80239E30;
+	GetResTex__Q34nw4r3g3d7ResFileCFPCc = 0x80239F20;
 	g3dMemAllocator__Q24nw4r3g3d = 0x8042A3C8;
 	__ScnMdl__Construct__Q24nw4r3g3dFPvPUiPvUii = 0x8025CA20;
 	__ScnMdlSimple__Construct__Q24nw4r3g3dFPvPUiPvi = 0x8025A380;
 	InsertIntoScene__Q24nw4r3g3dFPv = 0x80164E50;
 
+	GetResMat__Q34nw4r3g3d6ResMdlCFPCc = 0x8023B760;
+
+	DisableIndirectTexturing__3m3dFv = 0x80164F50;
+	InitTexObjWithResTex__3m3dFP9_GXTexObjPv14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilter = 0x802C7C70;
+
+	/* This is preliminary and kinda strange, most of these just point to ScnLeaf for now */
+	setup__Q23m3d6proc_cFPvPUi = 0x80164FD0;
+	__ct__Q23m3d6proc_cFv = 0x8016A010;
+	__dt__Q23m3d6proc_cFv = 0x8016A030;
+	free__Q23m3d6proc_cFv = 0x8016A090;
+	scheduleForDrawing__Q23m3d6proc_cFv = 0x8016A0E0;
+	getViewMatrix__Q23m3d6proc_cFPA3_A4_f = 0x8016A190;
+	returnUnknown__Q23m3d6proc_cFv = 0x8000F720;
+	/* End preliminary section */
+
 	__ct__Q23m3d5mdl_cFv = 0x80169CD0;
 	__dt__Q23m3d5mdl_cFv = 0x80169D20;
-	setup__Q23m3d5mdl_cFPvPvUiiPUi = 0x80169D90;
+	setup__Q23m3d5mdl_cFQ34nw4r3g3d6ResMdlPvUiiPUi = 0x80169D90;
 	oneSetupType__Q23m3d5mdl_cFv = 0x80064C10;
 	sub_80064BF0__Q23m3d5mdl_cFv = 0x80064BF0;
 	setDrawMatrix__Q23m3d5mdl_cFPA4_Cf = 0x8016A170;
@@ -231,6 +268,12 @@ SECTIONS {
 	allocateBuffer__10mTexture_cFPv = 0x802C11E0;
 	plotPixel__10mTexture_cFUsUs8_GXColor = 0x802C1280;
 
+	SetFontSize__Q34nw4r2ut10CharWriterFff = 0x8022D2F0;
+
+	__ct__Q34nw4r2ut10TextWriterFv = 0x80230780;
+	__dt__Q34nw4r2ut10TextWriterFv = 0x802307E0;
+	CalcStringWidth__Q34nw4r2ut10TextWriterCFPCwi = 0x802310D0;
+
 	GameHeaps = 0x80377C48;
 
 	BGDatClass = 0x80429DF0;
@@ -300,6 +343,16 @@ SECTIONS {
 	load__12dDvdLoader_cFPCcUcPv = 0x8008F1B0;
 	unload__12dDvdLoader_cFv = 0x8008F310;
 
+	SZSDecompClass = 0x80377AE4;
+	LZDecompClass = 0x80377AF0;
+	LHDecompClass = 0x80377AFC;
+	LRCDecompClass = 0x80377B08;
+	RLDecompClass = 0x80377B14;
+	StoreCompressionClassList = 0x8016B090;
+	DecompBufferPointer = 0x80429460;
+
+	TryAndFindCompressedFile = 0x8016BAA0;
+
 	_Z22BgTexMng__LoadAnimTilePvisPcS0_c = 0x80087B60; /* same for ntsc */
 	BgTexMng__LoadAnimTile__FPvisPcPcc = 0x80087B60; /* same for ntsc */
 
@@ -373,6 +426,8 @@ SECTIONS {
 	AllocFromGameHeap1__FUi = 0x801628C0;
 	FreeFromGameHeap1__FPv = 0x80162920;
 
+	AllocFromGameHeap1 = 0x801628C0;
+
 	_Z19lyt__Layout__LayoutPv = 0x802ACB40;
 	_Z15lyt__Layout__dtPvi = 0x802ACB80;
 	_Z18lyt__Layout__BuildPvPKvS_ = 0x802ACCB0;
@@ -403,6 +458,8 @@ SECTIONS {
 	DVDReadPrio__FP9DVDHandlePviii = 0x801CAB20;
 	DVDClose__FP9DVDHandle = 0x801CAA00;
 
+	DVDConvertPathToEntrynum = 0x801CA680;
+
 	_ZN8SaveFile8GetBlockEi = 0x800E0380;
 	_ZN8SaveFile10GetQSBlockEi = 0x800E03B0;
 
@@ -492,6 +549,7 @@ SECTIONS {
 	_Z6memsetPvij = 0x800046B4;
 	sprintf__FPcPCce = 0x802E17DC;
 	snprintf__FPciPCce = 0x802E16E8;
+	memcmp__FPCvPCvUi = 0x802DF098;
 	_Z6strcatPKcS0_ = 0x802E1A3C;
 
 	_Znaj = 0x802B9210;
@@ -580,12 +638,15 @@ SECTIONS {
 	GXSetTevKAlphaSel = 0x801C85B0;
 	GXSetTevSwapMode = 0x801C8600;
 	GXSetTevSwapModeTable = 0x801C8640;
+	GXSetAlphaCompare = 0x801C86C0;
 	GXSetTevOrder = 0x801C8790;
 	GXSetNumTevStages = 0x801C88F0;
 	GXSetFog = 0x801C8920;
+	GXSetFogRangeAdj = 0x801C8CB0;
 	GXSetBlendMode = 0x801C8DC0;
 	GXSetZMode = 0x801C8E70;
 	GXSetZCompLoc = 0x801C8EB0;
+	GXSetDither = 0x801C8F90;
 	GXCallDisplayList = 0x801C95E0;
 	GXSetProjection = 0x801C9840;
 	GXLoadPosMtxImm = 0x801C9940;