diff options
| -rw-r--r-- | NewerProject.yaml | 3 | ||||
| -rw-r--r-- | kamek_ntsc.x | 2 | ||||
| -rw-r--r-- | kamek_ntsc2.x | 2 | ||||
| -rw-r--r-- | kamek_pal.x | 51 | ||||
| -rw-r--r-- | kamek_pal2.x | 2 |
5 files changed, 53 insertions, 7 deletions
diff --git a/NewerProject.yaml b/NewerProject.yaml index acfa899..a8a62e3 100644 --- a/NewerProject.yaml +++ b/NewerProject.yaml @@ -18,9 +18,6 @@ modules: # - processed/replay.yaml
- processed/growup.yaml
- processed/levelspecial.yaml
-<<<<<<< HEAD - processed/eventlooper.yaml
- processed/spritespawner.yaml
-======= - processed/compression.yaml
->>>>>>> 673484e580337cd1ab14bfd43c770f004494b9a4 diff --git a/kamek_ntsc.x b/kamek_ntsc.x index f9a3800..45db184 100644 --- a/kamek_ntsc.x +++ b/kamek_ntsc.x @@ -15,7 +15,7 @@ SECTIONS { MarioSize = 0x8042B874; AlwaysDrawFlag = 0x80064540; AlwaysDrawBranch = 0x80064544; - + GenerateRandomNumber = 0x800B2EE0; _savefpr_14 = 0x802DCCA8; _savefpr_15 = 0x802DCCAC; diff --git a/kamek_ntsc2.x b/kamek_ntsc2.x index 8af9cc3..a35703f 100644 --- a/kamek_ntsc2.x +++ b/kamek_ntsc2.x @@ -15,7 +15,7 @@ SECTIONS { MarioSize = 0x8042B874; AlwaysDrawFlag = 0x80064540; AlwaysDrawBranch = 0x80064544; - + GenerateRandomNumber = 0x800B2EE0; _savefpr_14 = 0x802DCCA8; _savefpr_15 = 0x802DCCAC; diff --git a/kamek_pal.x b/kamek_pal.x index d255c9a..1cdb99a 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -185,9 +185,18 @@ SECTIONS { DrawAllLayoutsAfterX__Fi = 0x801634D0;
DrawAllLayoutsAfterXandBeforeY__Fii = 0x80163560;
+ findPaneByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0x80007300;
+ findTextBoxByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0x80007320;
+ findPictureByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0x800073D0;
+ findWindowByName__Q23m2d17EmbedLayoutBase_cCFPCc = 0x80007470;
__ct__Q23m2d13EmbedLayout_cFv = 0x800C89A0;
__dt__Q23m2d13EmbedLayout_cFv = 0x800C89F0;
loadArc__Q23m2d13EmbedLayout_cFPCcb = 0x800C8D00;
+ loadAnimations__Q23m2d13EmbedLayout_cFPPCci = 0x800C90A0;
+ loadGroups__Q23m2d13EmbedLayout_cFPPCcPii = 0x800C91E0;
+ enableNonLoopAnim__Q23m2d13EmbedLayout_cFib = 0x800C93E0;
+ enableLoopAnim__Q23m2d13EmbedLayout_cFi = 0x800C9470;
+ disableAllAnimations__Q23m2d13EmbedLayout_cFv = 0x800C95F0;
free__Q23m2d13EmbedLayout_cFv = 0x800C9A20;
execAnimations__Q23m2d13EmbedLayout_cFv = 0x800C9650;
scheduleForDrawing__Q23m2d6Base_cFv = 0x80163990;
@@ -212,14 +221,30 @@ SECTIONS { Init__Q34nw4r3g3d7ResFileFv = 0x8023A6D0;
Bind__Q34nw4r3g3d7ResFileFQ34nw4r3g3d7ResFile = 0x8023A490;
GetResMdl__Q34nw4r3g3d7ResFileCFPCc = 0x80239F70;
+ GetResTex__Q34nw4r3g3d7ResFileCFPCc = 0x8023A060;
g3dMemAllocator__Q24nw4r3g3d = 0x8042A6A8;
__ScnMdl__Construct__Q24nw4r3g3dFPvPUiPvUii = 0x8025CB60;
__ScnMdlSimple__Construct__Q24nw4r3g3dFPvPUiPvi = 0x8025A4C0;
InsertIntoScene__Q24nw4r3g3dFPv = 0x80164F90;
+ GetResMat__Q34nw4r3g3d6ResMdlCFPCc = 0x8023B8A0;
+
+ DisableIndirectTexturing__3m3dFv = 0x80165090;
+ InitTexObjWithResTex__3m3dFP9_GXTexObjPv14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilter = 0x802C7F60;
+
+ /* This is preliminary and kinda strange, most of these just point to ScnLeaf for now */
+ setup__Q23m3d6proc_cFPvPUi = 0x80165110;
+ __ct__Q23m3d6proc_cFv = 0x8016A150;
+ __dt__Q23m3d6proc_cFv = 0x8016A170;
+ free__Q23m3d6proc_cFv = 0x8016A1D0;
+ scheduleForDrawing__Q23m3d6proc_cFv = 0x8016A220;
+ getViewMatrix__Q23m3d6proc_cFPA3_A4_f = 0x8016A2D0;
+ returnUnknown__Q23m3d6proc_cFv = 0x8000F720;
+ /* End preliminary section */
+
__ct__Q23m3d5mdl_cFv = 0x80169E10;
__dt__Q23m3d5mdl_cFv = 0x80169E60;
- setup__Q23m3d5mdl_cFPvPvUiiPUi = 0x80169ED0;
+ setup__Q23m3d5mdl_cFQ34nw4r3g3d6ResMdlPvUiiPUi = 0x80169ED0;
oneSetupType__Q23m3d5mdl_cFv = 0x80064C10;
sub_80064BF0__Q23m3d5mdl_cFv = 0x80064BF0;
setDrawMatrix__Q23m3d5mdl_cFPA4_Cf = 0x8016A2B0;
@@ -243,6 +268,12 @@ SECTIONS { allocateBuffer__10mTexture_cFPv = 0x802C14D0;
plotPixel__10mTexture_cFUsUs8_GXColor = 0x802C1570;
+ SetFontSize__Q34nw4r2ut10CharWriterFff = 0x8022D430;
+
+ __ct__Q34nw4r2ut10TextWriterFv = 0x802308C0;
+ __dt__Q34nw4r2ut10TextWriterFv = 0x80230920;
+ CalcStringWidth__Q34nw4r2ut10TextWriterCFPCwi = 0x80231210;
+
GameHeaps = 0x80377F48;
BGDatClass = 0x8042A0D0;
@@ -312,6 +343,16 @@ SECTIONS { load__12dDvdLoader_cFPCcUcPv = 0x8008F1B0;
unload__12dDvdLoader_cFv = 0x8008F310;
+ SZSDecompClass = 0x80377DE4;
+ LZDecompClass = 0x80377DF0;
+ LHDecompClass = 0x80377DFC;
+ LRCDecompClass = 0x80377E08;
+ RLDecompClass = 0x80377E14;
+ StoreCompressionClassList = 0x8016B1D0;
+ DecompBufferPointer = 0x80429758;
+
+ TryAndFindCompressedFile = 0x8016BBE0;
+
_Z22BgTexMng__LoadAnimTilePvisPcS0_c = 0x80087B60; /* same for ntsc */
BgTexMng__LoadAnimTile__FPvisPcPcc = 0x80087B60; /* same for ntsc */
@@ -385,6 +426,8 @@ SECTIONS { AllocFromGameHeap1__FUi = 0x80162A00;
FreeFromGameHeap1__FPv = 0x80162A60;
+ AllocFromGameHeap1 = 0x80162A00;
+
_Z19lyt__Layout__LayoutPv = 0x802ACC80;
_Z15lyt__Layout__dtPvi = 0x802ACCC0;
_Z18lyt__Layout__BuildPvPKvS_ = 0x802ACDF0;
@@ -415,6 +458,8 @@ SECTIONS { DVDReadPrio__FP9DVDHandlePviii = 0x801CAC60;
DVDClose__FP9DVDHandle = 0x801CAB40;
+ DVDConvertPathToEntrynum = 0x801CA7C0;
+
_ZN8SaveFile8GetBlockEi = 0x800E0470;
_ZN8SaveFile10GetQSBlockEi = 0x800E04A0;
@@ -504,6 +549,7 @@ SECTIONS { _Z6memsetPvij = 0x800046B4;
sprintf__FPcPCce = 0x802E1ACC;
snprintf__FPciPCce = 0x802E19D8;
+ memcmp__FPCvPCvUi = 0x802DF388;
_Z6strcatPKcS0_ = 0x802E1D2C;
_Znaj = 0x802B9350;
@@ -592,12 +638,15 @@ SECTIONS { GXSetTevKAlphaSel = 0x801C86F0;
GXSetTevSwapMode = 0x801C8740;
GXSetTevSwapModeTable = 0x801C8780;
+ GXSetAlphaCompare = 0x801C8800;
GXSetTevOrder = 0x801C88D0;
GXSetNumTevStages = 0x801C8A30;
GXSetFog = 0x801C8A60;
+ GXSetFogRangeAdj = 0x801C8DF0;
GXSetBlendMode = 0x801C8F00;
GXSetZMode = 0x801C8FB0;
GXSetZCompLoc = 0x801C8FF0;
+ GXSetDither = 0x801C90D0;
GXCallDisplayList = 0x801C9720;
GXSetProjection = 0x801C9980;
GXLoadPosMtxImm = 0x801C9A80;
diff --git a/kamek_pal2.x b/kamek_pal2.x index 8f6ff14..16d9c48 100644 --- a/kamek_pal2.x +++ b/kamek_pal2.x @@ -15,7 +15,7 @@ SECTIONS { MarioSize = 0xDEADBEEF; AlwaysDrawFlag = 0xDEADBEEF; AlwaysDrawBranch = 0xDEADBEEF; - + GenerateRandomNumber = 0xDEADBEEF; _savefpr_14 = 0xDEADBEEF; _savefpr_15 = 0xDEADBEEF; |