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_pal2.x b/kamek_pal2.x
index c18de20..8f6ff14 100644
--- a/kamek_pal2.x
+++ b/kamek_pal2.x
@@ -5,6 +5,18 @@ OUTPUT_FORMAT ("binary")
 }*/
 
 SECTIONS {
+	GetSpecificPlayerActor = 0xDEADBEEF;
+	TimeStopFlag = 0xDEADBEEF;
+	TimerBranch = 0xDEADBEEF;
+	MarioDescentRate = 0xDEADBEEF;
+	MarioJumpArc = 0xDEADBEEF;
+	MarioJumpMax = 0xDEADBEEF;
+	MiniMarioJumpArc = 0xDEADBEEF;
+	MarioSize = 0xDEADBEEF;
+	AlwaysDrawFlag = 0xDEADBEEF;
+	AlwaysDrawBranch = 0xDEADBEEF;
+
+
 	_savefpr_14 = 0xDEADBEEF;
 	_savefpr_15 = 0xDEADBEEF;
 	_savefpr_16 = 0xDEADBEEF;
@@ -173,9 +185,18 @@ SECTIONS {
 	DrawAllLayoutsAfterX__Fi = 0xDEADBEEF;
 	DrawAllLayoutsAfterXandBeforeY__Fii = 0xDEADBEEF;
 
+	findPaneByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0xDEADBEEF;
+	findTextBoxByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0xDEADBEEF;
+	findPictureByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0xDEADBEEF;
+	findWindowByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0xDEADBEEF;
 	__ct__Q23m2d13EmbedLayout_cFv = 0xDEADBEEF;
 	__dt__Q23m2d13EmbedLayout_cFv = 0xDEADBEEF;
 	loadArc__Q23m2d13EmbedLayout_cFPCcb = 0xDEADBEEF;
+	loadAnimations__Q23m2d13EmbedLayout_cFPPCci = 0xDEADBEEF;
+	loadGroups__Q23m2d13EmbedLayout_cFPPCcPii = 0xDEADBEEF;
+	enableNonLoopAnim__Q23m2d13EmbedLayout_cFib = 0xDEADBEEF;
+	enableLoopAnim__Q23m2d13EmbedLayout_cFi = 0xDEADBEEF;
+	disableAllAnimations__Q23m2d13EmbedLayout_cFv = 0xDEADBEEF;
 	free__Q23m2d13EmbedLayout_cFv = 0xDEADBEEF;
 	execAnimations__Q23m2d13EmbedLayout_cFv = 0xDEADBEEF;
 	scheduleForDrawing__Q23m2d6Base_cFv = 0xDEADBEEF;
@@ -200,14 +221,30 @@ SECTIONS {
 	Init__Q34nw4r3g3d7ResFileFv = 0xDEADBEEF;
 	Bind__Q34nw4r3g3d7ResFileFQ34nw4r3g3d7ResFile = 0xDEADBEEF;
 	GetResMdl__Q34nw4r3g3d7ResFileCFPCc = 0xDEADBEEF;
+	GetResTex__Q34nw4r3g3d7ResFileCFPCc = 0xDEADBEEF;
 	g3dMemAllocator__Q24nw4r3g3d = 0xDEADBEEF;
 	__ScnMdl__Construct__Q24nw4r3g3dFPvPUiPvUii = 0xDEADBEEF;
 	__ScnMdlSimple__Construct__Q24nw4r3g3dFPvPUiPvi = 0xDEADBEEF;
 	InsertIntoScene__Q24nw4r3g3dFPv = 0xDEADBEEF;
 
+	GetResMat__Q34nw4r3g3d6ResMdlCFPCc = 0xDEADBEEF;
+
+	DisableIndirectTexturing__3m3dFv = 0xDEADBEEF;
+	InitTexObjWithResTex__3m3dFP9_GXTexObjPv14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilter = 0xDEADBEEF;
+
+	/* This is preliminary and kinda strange, most of these just point to ScnLeaf for now */
+	setup__Q23m3d6proc_cFPvPUi = 0xDEADBEEF;
+	__ct__Q23m3d6proc_cFv = 0xDEADBEEF;
+	__dt__Q23m3d6proc_cFv = 0xDEADBEEF;
+	free__Q23m3d6proc_cFv = 0xDEADBEEF;
+	scheduleForDrawing__Q23m3d6proc_cFv = 0xDEADBEEF;
+	getViewMatrix__Q23m3d6proc_cFPA3_A4_f = 0xDEADBEEF;
+	returnUnknown__Q23m3d6proc_cFv = 0xDEADBEEF;
+	/* End preliminary section */
+
 	__ct__Q23m3d5mdl_cFv = 0xDEADBEEF;
 	__dt__Q23m3d5mdl_cFv = 0xDEADBEEF;
-	setup__Q23m3d5mdl_cFPvPvUiiPUi = 0xDEADBEEF;
+	setup__Q23m3d5mdl_cFQ34nw4r3g3d6ResMdlPvUiiPUi = 0xDEADBEEF;
 	oneSetupType__Q23m3d5mdl_cFv = 0xDEADBEEF;
 	sub_80064BF0__Q23m3d5mdl_cFv = 0xDEADBEEF;
 	setDrawMatrix__Q23m3d5mdl_cFPA4_Cf = 0xDEADBEEF;
@@ -231,6 +268,12 @@ SECTIONS {
 	allocateBuffer__10mTexture_cFPv = 0xDEADBEEF;
 	plotPixel__10mTexture_cFUsUs8_GXColor = 0xDEADBEEF;
 
+	SetFontSize__Q34nw4r2ut10CharWriterFff = 0xDEADBEEF;
+
+	__ct__Q34nw4r2ut10TextWriterFv = 0xDEADBEEF;
+	__dt__Q34nw4r2ut10TextWriterFv = 0xDEADBEEF;
+	CalcStringWidth__Q34nw4r2ut10TextWriterCFPCwi = 0xDEADBEEF;
+
 	GameHeaps = 0xDEADBEEF;
 
 	BGDatClass = 0xDEADBEEF;
@@ -300,6 +343,16 @@ SECTIONS {
 	load__12dDvdLoader_cFPCcUcPv = 0xDEADBEEF;
 	unload__12dDvdLoader_cFv = 0xDEADBEEF;
 
+	SZSDecompClass = 0xDEADBEEF;
+	LZDecompClass = 0xDEADBEEF;
+	LHDecompClass = 0xDEADBEEF;
+	LRCDecompClass = 0xDEADBEEF;
+	RLDecompClass = 0xDEADBEEF;
+	StoreCompressionClassList = 0xDEADBEEF;
+	DecompBufferPointer = 0xDEADBEEF;
+
+	TryAndFindCompressedFile = 0xDEADBEEF;
+
 	_Z22BgTexMng__LoadAnimTilePvisPcS0_c = 0xDEADBEEF; /* same for ntsc */
 	BgTexMng__LoadAnimTile__FPvisPcPcc = 0xDEADBEEF; /* same for ntsc */
 
@@ -373,6 +426,8 @@ SECTIONS {
 	AllocFromGameHeap1__FUi = 0xDEADBEEF;
 	FreeFromGameHeap1__FPv = 0xDEADBEEF;
 
+	AllocFromGameHeap1 = 0xDEADBEEF;
+
 	_Z19lyt__Layout__LayoutPv = 0xDEADBEEF;
 	_Z15lyt__Layout__dtPvi = 0xDEADBEEF;
 	_Z18lyt__Layout__BuildPvPKvS_ = 0xDEADBEEF;
@@ -403,6 +458,8 @@ SECTIONS {
 	DVDReadPrio__FP9DVDHandlePviii = 0xDEADBEEF;
 	DVDClose__FP9DVDHandle = 0xDEADBEEF;
 
+	DVDConvertPathToEntrynum = 0xDEADBEEF;
+
 	_ZN8SaveFile8GetBlockEi = 0xDEADBEEF;
 	_ZN8SaveFile10GetQSBlockEi = 0xDEADBEEF;
 
@@ -492,6 +549,7 @@ SECTIONS {
 	_Z6memsetPvij = 0xDEADBEEF;
 	sprintf__FPcPCce = 0xDEADBEEF;
 	snprintf__FPciPCce = 0xDEADBEEF;
+	memcmp__FPCvPCvUi = 0xDEADBEEF;
 	_Z6strcatPKcS0_ = 0xDEADBEEF;
 
 	_Znaj = 0xDEADBEEF;
@@ -580,12 +638,15 @@ SECTIONS {
 	GXSetTevKAlphaSel = 0xDEADBEEF;
 	GXSetTevSwapMode = 0xDEADBEEF;
 	GXSetTevSwapModeTable = 0xDEADBEEF;
+	GXSetAlphaCompare = 0xDEADBEEF;
 	GXSetTevOrder = 0xDEADBEEF;
 	GXSetNumTevStages = 0xDEADBEEF;
 	GXSetFog = 0xDEADBEEF;
+	GXSetFogRangeAdj = 0xDEADBEEF;
 	GXSetBlendMode = 0xDEADBEEF;
 	GXSetZMode = 0xDEADBEEF;
 	GXSetZCompLoc = 0xDEADBEEF;
+	GXSetDither = 0xDEADBEEF;
 	GXCallDisplayList = 0xDEADBEEF;
 	GXSetProjection = 0xDEADBEEF;
 	GXLoadPosMtxImm = 0xDEADBEEF;