mirror of
https://github.com/pmret/papermario.git
synced 2024-09-08 02:29:49 +02:00
Pal entity (#1099)
* Start with entity segment * Match Hammer[123]Block * match /^entity_model_ShatteringHammer[1-3]Block$/ * match /_ShatteringHammer(Yellow|Red|Unused)Block$/ * Clean up undefined syms * Match push/brick/shat block * Match inert and heart blocks * Match pow super ultra * Match hit yellow block * Match 5 more entities * Match more segments * More pal entities * More pal segments * More entities * More entities * Finish entities
This commit is contained in:
Marijn van der Werf
GitHub
parent
4c7a8da864
commit
a69ae38bfe
@ -16,13 +16,19 @@ BSS s32 SaveBlockResultPrinterClosed;
|
||||
BSS MessagePrintState* SaveBlockTutorialPrinter;
|
||||
BSS MessagePrintState* SaveBlockResultPrinter;
|
||||
|
||||
#if VERSION_PAL
|
||||
extern Gfx Entity_SaveBlock_RenderBlock_es[];
|
||||
extern s32 gCurrentLanguage;
|
||||
#endif
|
||||
|
||||
void entity_SaveBlock_setupGfx(s32 index) {
|
||||
Gfx* gfxPos = gMainGfxPos;
|
||||
Gfx* dlist = Entity_SaveBlock_RenderContent;
|
||||
Entity* entity = get_entity_by_index(index);
|
||||
SaveBlockData* blockData = entity->dataBuf.saveBlock;
|
||||
s32 alpha = 128;
|
||||
Matrix4f sp18;
|
||||
Matrix4f sp58;
|
||||
Gfx* dlist;
|
||||
|
||||
guMtxL2F(sp18, ENTITY_ADDR(entity, Mtx*, &Entity_SaveBlock_Mtx));
|
||||
sp18[3][1] += 12.5f;
|
||||
@ -33,11 +39,23 @@ void entity_SaveBlock_setupGfx(s32 index) {
|
||||
gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
|
||||
gDPSetRenderMode(gfxPos++, G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2);
|
||||
gDPSetCombineMode(gfxPos++, PM_CC_01, PM_CC_02);
|
||||
gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, 128);
|
||||
gSPDisplayList(gfxPos++, Entity_SaveBlock_RenderContent);
|
||||
gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha);
|
||||
gSPDisplayList(gfxPos++, dlist);
|
||||
gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW);
|
||||
|
||||
#if VERSION_PAL
|
||||
switch (gCurrentLanguage) {
|
||||
default:
|
||||
dlist = ENTITY_ADDR(entity, Gfx*, Entity_SaveBlock_RenderBlock);
|
||||
break;
|
||||
|
||||
case LANGUAGE_ES:
|
||||
dlist = ENTITY_ADDR(entity, Gfx*, Entity_SaveBlock_RenderBlock_es);
|
||||
break;
|
||||
}
|
||||
#else
|
||||
dlist = ENTITY_ADDR(entity, Gfx*, Entity_SaveBlock_RenderBlock);
|
||||
#endif
|
||||
guMtxL2F(sp58, ENTITY_ADDR(entity, Mtx*, &Entity_SaveBlock_Mtx));
|
||||
sp58[3][1] += 12.5f;
|
||||
gDPPipeSync(gfxPos++);
|
||||
@ -46,7 +64,7 @@ void entity_SaveBlock_setupGfx(s32 index) {
|
||||
gSPMatrix(gfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
|
||||
gDPSetRenderMode(gfxPos++, G_RM_AA_XLU_SURF | Z_CMP, G_RM_AA_XLU_SURF2 | Z_CMP);
|
||||
gDPSetCombineMode(gfxPos++, PM_CC_01, PM_CC_02);
|
||||
gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, 128);
|
||||
gDPSetPrimColor(gfxPos++, 0, 0, 0, 0, 0, alpha);
|
||||
gSPDisplayList(gfxPos++, dlist);
|
||||
gSPPopMatrix(gfxPos++, G_MTX_MODELVIEW);
|
||||
|
||||
|
||||
@ -16,6 +16,7 @@ Gfx Entity_SaveBlock_LoadTextureStar[] = {
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
#if !VERSION_PAL
|
||||
#include "entity/model/SaveBlock_face.png.inc.c"
|
||||
Gfx Entity_SaveBlock_LoadTextureFace[] = {
|
||||
gsDPSetTextureLUT(G_TT_NONE),
|
||||
@ -28,8 +29,13 @@ Gfx Entity_SaveBlock_LoadTextureFace[] = {
|
||||
gsDPSetTextureFilter(G_TF_BILERP),
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
#endif
|
||||
|
||||
#include "entity/model/SaveBlock_letterS.png.inc.c"
|
||||
#if VERSION_PAL
|
||||
#include "entity/model/SaveBlock_letterG.png.inc.c"
|
||||
#endif
|
||||
|
||||
Gfx Entity_SaveBlock_LoadTextureLetterS[] = {
|
||||
gsDPSetTextureLUT(G_TT_NONE),
|
||||
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
|
||||
@ -42,6 +48,20 @@ Gfx Entity_SaveBlock_LoadTextureLetterS[] = {
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
#if VERSION_PAL
|
||||
Gfx Entity_SaveBlock_LoadTextureLetterG[] = {
|
||||
gsDPSetTextureLUT(G_TT_NONE),
|
||||
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
|
||||
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
|
||||
gsDPSetTextureDetail(G_TD_CLAMP),
|
||||
gsDPSetTextureLOD(G_TL_TILE),
|
||||
gsDPLoadTextureBlock(D_PAL_0A002170_EBA460, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
|
||||
gsDPSetTexturePersp(G_TP_PERSP),
|
||||
gsDPSetTextureFilter(G_TF_BILERP),
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
#endif
|
||||
|
||||
Mtx Entity_SaveBlock_Mtx = RDP_MATRIX(
|
||||
1.000000, 0.000000, 0.000000, 0.000000,
|
||||
0.000000, 1.000000, 0.000000, 0.000000,
|
||||
@ -76,6 +96,35 @@ Gfx Entity_SaveBlock_RenderLetterS[] = {
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
#if VERSION_PAL
|
||||
Gfx Entity_SaveBlock_RenderLetterG[] = {
|
||||
gsDPPipeSync(),
|
||||
gsDPSetCycleType(G_CYC_1CYCLE),
|
||||
gsSPDisplayList(Entity_SaveBlock_LoadTextureLetterG),
|
||||
gsSPClearGeometryMode(G_LIGHTING),
|
||||
gsSPSetGeometryMode(G_CULL_BACK | G_SHADING_SMOOTH),
|
||||
gsSPVertex(D_0A0006C0_E4B9A0, 31, 0),
|
||||
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
|
||||
gsSP2Triangles(4, 5, 0, 0, 4, 0, 3, 0),
|
||||
gsSP2Triangles(2, 6, 7, 0, 2, 7, 3, 0),
|
||||
gsSP2Triangles(8, 4, 3, 0, 8, 3, 7, 0),
|
||||
gsSP2Triangles(9, 10, 11, 0, 9, 11, 12, 0),
|
||||
gsSP2Triangles(13, 14, 9, 0, 13, 9, 12, 0),
|
||||
gsSP2Triangles(12, 11, 15, 0, 12, 15, 16, 0),
|
||||
gsSP2Triangles(17, 13, 12, 0, 17, 12, 16, 0),
|
||||
gsSP2Triangles(18, 19, 20, 0, 18, 20, 21, 0),
|
||||
gsSP2Triangles(20, 22, 23, 0, 20, 23, 21, 0),
|
||||
gsSP2Triangles(24, 25, 21, 0, 24, 21, 23, 0),
|
||||
gsSP2Triangles(25, 26, 18, 0, 25, 18, 21, 0),
|
||||
gsSP2Triangles(27, 28, 29, 0, 27, 29, 30, 0),
|
||||
gsSPVertex(&D_0A0006C0_E4B9A0[28], 8, 0),
|
||||
gsSP2Triangles(0, 3, 4, 0, 0, 4, 1, 0),
|
||||
gsSP2Triangles(4, 6, 5, 0, 4, 5, 1, 0),
|
||||
gsSP2Triangles(5, 7, 2, 0, 5, 2, 1, 0),
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
#endif
|
||||
|
||||
Gfx Entity_SaveBlock_RenderFaces[] = {
|
||||
gsDPPipeSync(),
|
||||
gsDPSetCycleType(G_CYC_1CYCLE),
|
||||
@ -141,6 +190,14 @@ Gfx Entity_SaveBlock_RenderBlock[] = {
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
#if VERSION_PAL
|
||||
Gfx Entity_SaveBlock_RenderBlock_es[] = {
|
||||
gsSPDisplayList(Entity_SaveBlock_RenderFaces),
|
||||
gsSPDisplayList(Entity_SaveBlock_RenderLetterG),
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
#endif
|
||||
|
||||
Gfx Entity_SaveBlock_RenderNone[] = {
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
1119
ver/pal/splat.yaml
1119
ver/pal/splat.yaml
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,9 @@
|
||||
D_802E9170 = 0x802EF470; // rom:0x10C4F0
|
||||
D_802E91F0 = 0x802EF4F0; // rom:0x10C570
|
||||
D_802E9270 = 0x802EF570; // rom:0x10C5F0
|
||||
D_802E92B0 = 0x802EF5B0; // rom:0x10C630
|
||||
D_802E92F0 = 0x802EF5F0; // rom:0x10C670
|
||||
D_802E94F0 = 0x802EF7F0; // rom:0x10C870
|
||||
pause_image_1439F0_png = 0x80254C00; // rom:0x149A40
|
||||
pause_image_143BF0_png = 0x80254E00; // rom:0x149C40
|
||||
pause_image_143FF0_png = 0x80255200; // rom:0x14A040
|
||||
@ -2173,3 +2179,266 @@ mgm_01_panel_bowser_img = 0x80243380; // rom:0xE82510
|
||||
mgm_01_panel_bowser_pal = 0x80243580; // rom:0xE82710
|
||||
mgm_02_panel_peach_img = 0x80248380; // rom:0xE8AB70
|
||||
mgm_02_panel_peach_pal = 0x80248580; // rom:0xE8AD70
|
||||
D_0A000000_E31530 = 0xA000000; // rom:0xE9E540
|
||||
D_0A000280_E317B0 = 0xA000280; // rom:0xE9E7C0
|
||||
D_0A000380_E318B0 = 0xA000380; // rom:0xE9E8C0
|
||||
D_0A000000_E31A30 = 0xA000000; // rom:0xE9EA40
|
||||
D_0A000280_E31CB0 = 0xA000280; // rom:0xE9ECC0
|
||||
D_0A000380_E31DB0 = 0xA000380; // rom:0xE9EDC0
|
||||
D_0A000000_E31F30 = 0xA000000; // rom:0xE9EF40
|
||||
D_0A000280_E321B0 = 0xA000280; // rom:0xE9F1C0
|
||||
D_0A000380_E322B0 = 0xA000380; // rom:0xE9F2C0
|
||||
D_0A000000_E32420 = 0xA000000; // rom:0xE9F430
|
||||
D_0A001060_E33480 = 0xA001060; // rom:0xEA0490
|
||||
D_0A001260_E33680 = 0xA001260; // rom:0xEA0690
|
||||
D_0A000000_E35670 = 0xA000000; // rom:0xEA2680
|
||||
D_0A001060_E366D0 = 0xA001060; // rom:0xEA36E0
|
||||
D_0A000000_E38890 = 0xA000000; // rom:0xEA58A0
|
||||
D_0A001050_E398E0 = 0xA001050; // rom:0xEA68F0
|
||||
D_0A001150_E399E0 = 0xA001150; // rom:0xEA69F0
|
||||
D_0A000000_E3B870 = 0xA000000; // rom:0xEA8880
|
||||
D_0A000180_E3B9F0 = 0xA000180; // rom:0xEA8A00
|
||||
D_0A000000_E3C320 = 0xA000000; // rom:0xEA9330
|
||||
D_0A000180_E3C4A0 = 0xA000180; // rom:0xEA94B0
|
||||
D_0A000000_E3CDD0 = 0xA000000; // rom:0xEA9DE0
|
||||
D_0A0003C0_E3D190 = 0xA0003C0; // rom:0xEAA1A0
|
||||
D_0A000848_E3D618 = 0xA000848; // rom:0xEAA628
|
||||
D_0A000948_E3D718 = 0xA000948; // rom:0xEAA728
|
||||
D_0A000000_E3DA60 = 0xA000000; // rom:0xEAAA70
|
||||
D_0A000120_E3DB80 = 0xA000120; // rom:0xEAAB90
|
||||
D_0A0001A0_E3DC00 = 0xA0001A0; // rom:0xEAAC10
|
||||
D_0A000000_E3DDB0 = 0xA000000; // rom:0xEAADC0
|
||||
D_0A000140_E3DEF0 = 0xA000140; // rom:0xEAAF00
|
||||
D_0A000340_E3E0F0 = 0xA000340; // rom:0xEAB100
|
||||
D_0A000000_E3E260 = 0xA000000; // rom:0xEAB270
|
||||
D_0A001AA0_E3FD00 = 0xA001AA0; // rom:0xEACD10
|
||||
D_0A000000_E42240 = 0xA000000; // rom:0xEAF250
|
||||
D_0A000100_E42340 = 0xA000100; // rom:0xEAF350
|
||||
D_0A000180_E423C0 = 0xA000180; // rom:0xEAF3D0
|
||||
D_0A000380_E425C0 = 0xA000380; // rom:0xEAF5D0
|
||||
D_0A000000_E42740 = 0xA000000; // rom:0xEAF750
|
||||
D_0A000100_E42840 = 0xA000100; // rom:0xEAF850
|
||||
D_0A000180_E428C0 = 0xA000180; // rom:0xEAF8D0
|
||||
D_0A000000_E431F0 = 0xA000000; // rom:0xEB0200
|
||||
D_0A0003C0_E435B0 = 0xA0003C0; // rom:0xEB05C0
|
||||
D_0A000000_E43B20 = 0xA000000; // rom:0xEB0B30
|
||||
D_0A000100_E43C20 = 0xA000100; // rom:0xEB0C30
|
||||
D_0A000900_E44420 = 0xA000900; // rom:0xEB1430
|
||||
D_0A000000_E44800 = 0xA000000; // rom:0xEB1810
|
||||
D_0A000480_E44C80 = 0xA000480; // rom:0xEB1C90
|
||||
D_0A000580_E44D80 = 0xA000580; // rom:0xEB1D90
|
||||
D_0A000000_E45110 = 0xA000000; // rom:0xEB2120
|
||||
D_0A000480_E45590 = 0xA000480; // rom:0xEB25A0
|
||||
D_0A000580_E45690 = 0xA000580; // rom:0xEB26A0
|
||||
D_0A000000_E459F0 = 0xA000000; // rom:0xEB2A00
|
||||
D_0A000160_E45B50 = 0xA000160; // rom:0xEB2B60
|
||||
D_0A000420_E45E10 = 0xA000420; // rom:0xEB2E20
|
||||
D_0A000C20_E46610 = 0xA000C20; // rom:0xEB3620
|
||||
D_0A000000_E470B0 = 0xA000000; // rom:0xEB40C0
|
||||
D_0A000160_E47210 = 0xA000160; // rom:0xEB4220
|
||||
D_0A000440_E474F0 = 0xA000440; // rom:0xEB4500
|
||||
D_0A000C40_E47CF0 = 0xA000C40; // rom:0xEB4D00
|
||||
D_0A000000_E48780 = 0xA000000; // rom:0xEB5790
|
||||
D_0A000160_E488E0 = 0xA000160; // rom:0xEB58F0
|
||||
D_0A000460_E48BE0 = 0xA000460; // rom:0xEB5BF0
|
||||
D_0A000C60_E493E0 = 0xA000C60; // rom:0xEB63F0
|
||||
D_0A000000_E4A6A0 = 0xA000000; // rom:0xEB76B0
|
||||
D_0A000200_E4A8A0 = 0xA000200; // rom:0xEB78B0
|
||||
D_0A000220_E4A8C0 = 0xA000220; // rom:0xEB78D0
|
||||
D_0A000240_E4A8E0 = 0xA000240; // rom:0xEB78F0
|
||||
D_0A000260_E4A900 = 0xA000260; // rom:0xEB7910
|
||||
D_0A000000_E4E7F0 = 0xA000000; // rom:0xEBB0E0
|
||||
D_0A0001E0_E4E9D0 = 0xA0001E0; // rom:0xEBB2C0
|
||||
D_0A0003C0_E4EBB0 = 0xA0003C0; // rom:0xEBB4A0
|
||||
D_0A0005A0_E4ED90 = 0xA0005A0; // rom:0xEBB680
|
||||
D_0A000780_E4EF70 = 0xA000780; // rom:0xEBB860
|
||||
D_0A000900_E4F0F0 = 0xA000900; // rom:0xEBB9E0
|
||||
D_0A000A80_E4F270 = 0xA000A80; // rom:0xEBBB60
|
||||
D_0A000C80_E4F470 = 0xA000C80; // rom:0xEBBD60
|
||||
D_0A000E80_E4F670 = 0xA000E80; // rom:0xEBBF60
|
||||
D_0A001000_E4F7F0 = 0xA001000; // rom:0xEBC0E0
|
||||
D_0A001180_E4F970 = 0xA001180; // rom:0xEBC260
|
||||
D_0A001280_E4FA70 = 0xA001280; // rom:0xEBC360
|
||||
D_0A001400_E4FBF0 = 0xA001400; // rom:0xEBC4E0
|
||||
D_0A000000_E51640 = 0xA000000; // rom:0xEBDF30
|
||||
D_0A001560_E52BA0 = 0xA001560; // rom:0xEBF490
|
||||
D_0A001D60_E533A0 = 0xA001D60; // rom:0xEBFC90
|
||||
D_0A001E28_E53468 = 0xA001E28; // rom:0xEBFD58
|
||||
D_0A002628_E53C68 = 0xA002628; // rom:0xEC0558
|
||||
D_0A000000_E55A40 = 0xA000000; // rom:0xEC2330
|
||||
D_0A0000F0_E55B30 = 0xA0000F0; // rom:0xEC2420
|
||||
D_0A000210_E55C50 = 0xA000210; // rom:0xEC2540
|
||||
D_0A000250_E55C90 = 0xA000250; // rom:0xEC2580
|
||||
D_0A000290_E55CD0 = 0xA000290; // rom:0xEC25C0
|
||||
D_0A000508_E55F48 = 0xA000508; // rom:0xEC2838
|
||||
D_0A000D08_E56748 = 0xA000D08; // rom:0xEC3038
|
||||
D_0A000DD0_E56810 = 0xA000DD0; // rom:0xEC3100
|
||||
D_0A000ED0_E56910 = 0xA000ED0; // rom:0xEC3200
|
||||
D_0A000000_E56E60 = 0xA000000; // rom:0xEC3750
|
||||
D_0A000410_E57270 = 0xA000410; // rom:0xEC3B60
|
||||
D_0A000820_E57680 = 0xA000820; // rom:0xEC3F70
|
||||
D_0A000860_E576C0 = 0xA000860; // rom:0xEC3FB0
|
||||
D_0A000BF0_E57A50 = 0xA000BF0; // rom:0xEC4340
|
||||
D_0A000FF0_E57E50 = 0xA000FF0; // rom:0xEC4740
|
||||
D_0A0014A0_E58300 = 0xA0014A0; // rom:0xEC4BF0
|
||||
D_0A0018A0_E58700 = 0xA0018A0; // rom:0xEC4FF0
|
||||
D_0A000000_E58CD0 = 0xA000000; // rom:0xEC55C0
|
||||
D_0A000060_E58D30 = 0xA000060; // rom:0xEC5620
|
||||
D_0A0002E0_E58FB0 = 0xA0002E0; // rom:0xEC58A0
|
||||
D_0A000320_E58FF0 = 0xA000320; // rom:0xEC58E0
|
||||
D_0A0003A0_E59070 = 0xA0003A0; // rom:0xEC5960
|
||||
D_0A000470_E59140 = 0xA000470; // rom:0xEC5A30
|
||||
D_0A000570_E59240 = 0xA000570; // rom:0xEC5B30
|
||||
D_0A000000_E59480 = 0xA000000; // rom:0xEC5D70
|
||||
D_0A000120_E595A0 = 0xA000120; // rom:0xEC5E90
|
||||
D_0A000580_E59A00 = 0xA000580; // rom:0xEC62F0
|
||||
D_0A000780_E59C00 = 0xA000780; // rom:0xEC64F0
|
||||
D_0A000080_E59F80 = 0xA000080; // rom:0xEC6870
|
||||
D_0A000880_E5A780 = 0xA000880; // rom:0xEC7070
|
||||
D_0A000000_E5AB50 = 0xA000000; // rom:0xEC7440
|
||||
D_0A0005C0_E5B110 = 0xA0005C0; // rom:0xEC7A00
|
||||
D_0A000620_E5B170 = 0xA000620; // rom:0xEC7A60
|
||||
D_0A000660_E5B1B0 = 0xA000660; // rom:0xEC7AA0
|
||||
D_0A000700_E5B250 = 0xA000700; // rom:0xEC7B40
|
||||
D_0A000B00_E5B650 = 0xA000B00; // rom:0xEC7F40
|
||||
D_0A000DA8_E5B8F8 = 0xA000DA8; // rom:0xEC81E8
|
||||
D_0A0015A8_E5C0F8 = 0xA0015A8; // rom:0xEC89E8
|
||||
D_0A001850_E5C3A0 = 0xA001850; // rom:0xEC8C90
|
||||
D_0A001C50_E5C7A0 = 0xA001C50; // rom:0xEC9090
|
||||
D_0A000000_E5CD80 = 0xA000000; // rom:0xEC9670
|
||||
D_0A000200_E5CF80 = 0xA000200; // rom:0xEC9870
|
||||
D_0A000240_E5CFC0 = 0xA000240; // rom:0xEC98B0
|
||||
D_0A000280_E5D000 = 0xA000280; // rom:0xEC98F0
|
||||
D_0A000540_E5D2C0 = 0xA000540; // rom:0xEC9BB0
|
||||
D_0A000D40_E5DAC0 = 0xA000D40; // rom:0xECA3B0
|
||||
D_0A000FE8_E5DD68 = 0xA000FE8; // rom:0xECA658
|
||||
D_0A0013E8_E5E168 = 0xA0013E8; // rom:0xECAA58
|
||||
D_0A000000_E5E730 = 0xA000000; // rom:0xECB020
|
||||
D_0A0005C0_E5ECF0 = 0xA0005C0; // rom:0xECB5E0
|
||||
D_0A000620_E5ED50 = 0xA000620; // rom:0xECB640
|
||||
D_0A000660_E5ED90 = 0xA000660; // rom:0xECB680
|
||||
D_0A000700_E5EE30 = 0xA000700; // rom:0xECB720
|
||||
D_0A000978_E5F0A8 = 0xA000978; // rom:0xECB998
|
||||
D_0A001178_E5F8A8 = 0xA001178; // rom:0xECC198
|
||||
D_0A001420_E5FB50 = 0xA001420; // rom:0xECC440
|
||||
D_0A001820_E5FF50 = 0xA001820; // rom:0xECC840
|
||||
D_0A000000_E60550 = 0xA000000; // rom:0xECCE40
|
||||
D_0A0005C0_E60B10 = 0xA0005C0; // rom:0xECD400
|
||||
D_0A000620_E60B70 = 0xA000620; // rom:0xECD460
|
||||
D_0A000660_E60BB0 = 0xA000660; // rom:0xECD4A0
|
||||
D_0A000700_E60C50 = 0xA000700; // rom:0xECD540
|
||||
D_0A000978_E60EC8 = 0xA000978; // rom:0xECD7B8
|
||||
D_0A001178_E616C8 = 0xA001178; // rom:0xECDFB8
|
||||
D_0A001420_E61970 = 0xA001420; // rom:0xECE260
|
||||
D_0A001820_E61D70 = 0xA001820; // rom:0xECE660
|
||||
D_0A000000_E62370 = 0xA000000; // rom:0xECEC60
|
||||
D_0A000080_E623F0 = 0xA000080; // rom:0xECECE0
|
||||
D_0A000280_E625F0 = 0xA000280; // rom:0xECEEE0
|
||||
D_0A000300_E62670 = 0xA000300; // rom:0xECEF60
|
||||
D_0A0003D8_E62748 = 0xA0003D8; // rom:0xECF038
|
||||
D_0A0004D8_E62848 = 0xA0004D8; // rom:0xECF138
|
||||
D_0A000000_E62AC0 = 0xA000000; // rom:0xECF3B0
|
||||
D_0A000390_E62E50 = 0xA000390; // rom:0xECF740
|
||||
D_0A0003D0_E62E90 = 0xA0003D0; // rom:0xECF780
|
||||
D_0A0005D0_E63090 = 0xA0005D0; // rom:0xECF980
|
||||
D_0A0006D0_E63190 = 0xA0006D0; // rom:0xECFA80
|
||||
D_0A000978_E63438 = 0xA000978; // rom:0xECFD28
|
||||
D_0A000000_E639C0 = 0xA000000; // rom:0xED02B0
|
||||
D_0A000300_E63CC0 = 0xA000300; // rom:0xED05B0
|
||||
D_0A000390_E63D50 = 0xA000390; // rom:0xED0640
|
||||
D_0A0003D0_E63D90 = 0xA0003D0; // rom:0xED0680
|
||||
D_0A0005D0_E63F90 = 0xA0005D0; // rom:0xED0880
|
||||
D_0A0006D0_E64090 = 0xA0006D0; // rom:0xED0980
|
||||
D_0A000978_E64338 = 0xA000978; // rom:0xED0C28
|
||||
D_0A000000_E648D0 = 0xA000000; // rom:0xED11C0
|
||||
D_0A000190_E64A60 = 0xA000190; // rom:0xED1350
|
||||
D_0A000210_E64AE0 = 0xA000210; // rom:0xED13D0
|
||||
D_0A000390_E64C60 = 0xA000390; // rom:0xED1550
|
||||
D_0A000410_E64CE0 = 0xA000410; // rom:0xED15D0
|
||||
D_0A000898_E65168 = 0xA000898; // rom:0xED1A58
|
||||
D_0A000998_E65268 = 0xA000998; // rom:0xED1B58
|
||||
D_0A000A70_E65340 = 0xA000A70; // rom:0xED1C30
|
||||
D_0A000B70_E65440 = 0xA000B70; // rom:0xED1D30
|
||||
D_0A000000_E657A0 = 0xA000000; // rom:0xED2090
|
||||
D_0A000280_E65A20 = 0xA000280; // rom:0xED2310
|
||||
D_0A000300_E65AA0 = 0xA000300; // rom:0xED2390
|
||||
D_0A000380_E65B20 = 0xA000380; // rom:0xED2410
|
||||
D_0A000400_E65BA0 = 0xA000400; // rom:0xED2490
|
||||
D_0A000680_E65E20 = 0xA000680; // rom:0xED2710
|
||||
D_0A0007E0_E65F80 = 0xA0007E0; // rom:0xED2870
|
||||
D_0A000860_E66000 = 0xA000860; // rom:0xED28F0
|
||||
D_0A000960_E66100 = 0xA000960; // rom:0xED29F0
|
||||
D_0A000C08_E663A8 = 0xA000C08; // rom:0xED2C98
|
||||
D_0A000D08_E664A8 = 0xA000D08; // rom:0xED2D98
|
||||
D_0A000FB0_E66750 = 0xA000FB0; // rom:0xED3040
|
||||
D_0A0013B0_E66B50 = 0xA0013B0; // rom:0xED3440
|
||||
D_0A000000_E68580 = 0xA000000; // rom:0xED4E70
|
||||
D_0A000280_E68800 = 0xA000280; // rom:0xED50F0
|
||||
D_0A000300_E68880 = 0xA000300; // rom:0xED5170
|
||||
D_0A000380_E68900 = 0xA000380; // rom:0xED51F0
|
||||
D_0A000600_E68B80 = 0xA000600; // rom:0xED5470
|
||||
D_0A000760_E68CE0 = 0xA000760; // rom:0xED55D0
|
||||
D_0A0007E0_E68D60 = 0xA0007E0; // rom:0xED5650
|
||||
D_0A0008E0_E68E60 = 0xA0008E0; // rom:0xED5750
|
||||
D_0A000B88_E69108 = 0xA000B88; // rom:0xED59F8
|
||||
D_0A000E00_E69380 = 0xA000E00; // rom:0xED5C70
|
||||
D_0A001200_E69780 = 0xA001200; // rom:0xED6070
|
||||
D_0A000000_E6B1B0 = 0xA000000; // rom:0xED7AA0
|
||||
D_0A000390_E6B540 = 0xA000390; // rom:0xED7E30
|
||||
D_0A000640_E6B7F0 = 0xA000640; // rom:0xED80E0
|
||||
D_0A000720_E6B8D0 = 0xA000720; // rom:0xED81C0
|
||||
D_0A000A10_E6BBC0 = 0xA000A10; // rom:0xED84B0
|
||||
D_0A001090_E6C240 = 0xA001090; // rom:0xED8B30
|
||||
D_0A000000_E6D390 = 0xA000000; // rom:0xED9C80
|
||||
D_0A000240_E6D5D0 = 0xA000240; // rom:0xED9EC0
|
||||
D_0A000D40_E6E0D0 = 0xA000D40; // rom:0xEDA9C0
|
||||
D_0A000000_E6E660 = 0xA000000; // rom:0xEDAF50
|
||||
D_0A005EE8_E74548 = 0xA005EE8; // rom:0xEE0E38
|
||||
D_0A000000_E74BD0 = 0xA000000; // rom:0xEE14C0
|
||||
D_0A005EE8_E7AAB8 = 0xA005EE8; // rom:0xEE73A8
|
||||
D_0A000000_E7B0E0 = 0xA000000; // rom:0xEE79D0
|
||||
D_0A005EE8_E80FC8 = 0xA005EE8; // rom:0xEED8B8
|
||||
D_0A000000_E815F0 = 0xA000000; // rom:0xEEDEE0
|
||||
D_0A006840_E87E30 = 0xA006840; // rom:0xEF4720
|
||||
D_0A000000_E884A0 = 0xA000000; // rom:0xEF4D90
|
||||
D_0A001D70_E8A210 = 0xA001D70; // rom:0xEF6B00
|
||||
D_0A000000_E8A9E0 = 0xA000000; // rom:0xEF72D0
|
||||
D_0A006840_E91220 = 0xA006840; // rom:0xEFDB10
|
||||
D_0A000000_E91890 = 0xA000000; // rom:0xEFE180
|
||||
D_0A006840_E980D0 = 0xA006840; // rom:0xF049C0
|
||||
D_0A000000_E992F0 = 0xA000000; // rom:0xF05BE0
|
||||
D_0A000800_E99AF0 = 0xA000800; // rom:0xF063E0
|
||||
D_0A0008C8_E99BB8 = 0xA0008C8; // rom:0xF064A8
|
||||
D_0A000968_E99C58 = 0xA000968; // rom:0xF06548
|
||||
D_0A0009C8_E99CB8 = 0xA0009C8; // rom:0xF065A8
|
||||
D_0A000A68_E99D58 = 0xA000A68; // rom:0xF06648
|
||||
D_0A000BB8_E99EA8 = 0xA000BB8; // rom:0xF06798
|
||||
D_0A000D28_E9A018 = 0xA000D28; // rom:0xF06908
|
||||
D_0A000DB8_E9A0A8 = 0xA000DB8; // rom:0xF06998
|
||||
D_0A000F28_E9A218 = 0xA000F28; // rom:0xF06B08
|
||||
D_0A000000_E9B500 = 0xA000000; // rom:0xF07DF0
|
||||
D_0A000040_E9B540 = 0xA000040; // rom:0xF07E30
|
||||
D_0A000290_E9B790 = 0xA000290; // rom:0xF08080
|
||||
D_0A0003B0_E9B8B0 = 0xA0003B0; // rom:0xF081A0
|
||||
D_0A0004B0_E9B9B0 = 0xA0004B0; // rom:0xF082A0
|
||||
D_0A0005B0_E9BAB0 = 0xA0005B0; // rom:0xF083A0
|
||||
D_0A000820_E9BD20 = 0xA000820; // rom:0xF08610
|
||||
D_0A000000_E9C900 = 0xA000000; // rom:0xF091F0
|
||||
D_0A000050_E9C950 = 0xA000050; // rom:0xF09240
|
||||
D_0A0000A0_E9C9A0 = 0xA0000A0; // rom:0xF09290
|
||||
D_0A000120_E9CA20 = 0xA000120; // rom:0xF09310
|
||||
D_0A000180_E9CA80 = 0xA000180; // rom:0xF09370
|
||||
D_0A0002F8_E9CBF8 = 0xA0002F8; // rom:0xF094E8
|
||||
D_0A000000_E9D650 = 0xA000000; // rom:0xF09F40
|
||||
D_0A000380_E9D9D0 = 0xA000380; // rom:0xF0A2C0
|
||||
D_0A0004A0_E9DAF0 = 0xA0004A0; // rom:0xF0A3E0
|
||||
D_0A000600_E9DC50 = 0xA000600; // rom:0xF0A540
|
||||
D_0A000720_E9DD70 = 0xA000720; // rom:0xF0A660
|
||||
D_0A000840_E9DE90 = 0xA000840; // rom:0xF0A780
|
||||
D_0A001040_E9E690 = 0xA001040; // rom:0xF0AF80
|
||||
D_0A000000_E4B2E0 = 0xA000000; // rom:0xEB82F0
|
||||
D_0A000370_E4B650 = 0xA000370; // rom:0xEB8660
|
||||
D_0A0006C0_E4B9A0 = 0xA0006C0; // rom:0xEB89B0
|
||||
D_0A000900_E4BBE0 = 0xA000900; // rom:0xEB8BF0
|
||||
D_0A0021E8_E4D4C8 = 0xA001170; // rom:0xEB9460
|
||||
D_PAL_0A002170_EBA460 = 0xA002170; // rom:0xEBA460
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
Entity_ScriptSpring_AnimLaunch = 0x1E4;
|
||||
Entity_SimpleSpring_AnimLaunch = 0x1E4;
|
||||
set_time_freeze_mode = 0x80027008;
|
||||
get_time_freeze_mode = 0x80027110;
|
||||
start_rumble = 0x80028E88;
|
||||
@ -79,6 +77,7 @@ npc_set_palswap_mode_A = 0x8003B8C0;
|
||||
npc_set_palswap_1 = 0x8003B93C;
|
||||
npc_set_palswap_2 = 0x8003B954;
|
||||
npc_set_decoration = 0x8003C8C8;
|
||||
npc_find_standing_on_entity = 0x8003D6C4;
|
||||
npc_set_imgfx_params = 0x8003DB14;
|
||||
spawn_surface_effects = 0x8003DB50;
|
||||
init_encounter_status = 0x8003E828;
|
||||
@ -283,6 +282,7 @@ player_fall_distance = 0x800DFC48;
|
||||
player_check_collision_below = 0x800DFC84;
|
||||
phys_main_collision_below = 0x800E0EB4;
|
||||
func_800E4AD8 = 0x800E1248;
|
||||
player_get_camera_facing_angle = 0x800E1BDC;
|
||||
phys_adjust_cam_on_landing = 0x800E1CA0;
|
||||
phys_get_spin_history = 0x800E20A8;
|
||||
set_action_state = 0x800E2514;
|
||||
@ -317,11 +317,14 @@ status_bar_stop_blinking_sp = 0x800E62EC;
|
||||
decrement_status_bar_disabled = 0x800E6388;
|
||||
increment_status_bar_disabled = 0x800E63AC;
|
||||
sync_status_bar = 0x800E63C4;
|
||||
is_ability_active = 0x800E65A0;
|
||||
add_coins = 0x800E6918;
|
||||
add_star_points = 0x800E6980;
|
||||
add_star_pieces = 0x800E69C8;
|
||||
increment_max_SP = 0x800E6A0C;
|
||||
set_max_SP = 0x800E6A30;
|
||||
recover_fp = 0x800E6ABC;
|
||||
recover_hp = 0x800E6B24;
|
||||
subtract_hp = 0x800E6B8C;
|
||||
subtract_fortress_keys = 0x800E6C10;
|
||||
get_fortress_key_count = 0x800E6C3C;
|
||||
@ -421,12 +424,15 @@ gPartnerStatus = 0x8010D6B0;
|
||||
gPlayerStatus = 0x8010DAC8;
|
||||
gPlayerData = 0x8010DD90;
|
||||
update_entities = 0x8010E1D0;
|
||||
set_entity_commandlist = 0x8010E6C0;
|
||||
exec_entity_commandlist = 0x8010E868;
|
||||
get_entity_by_index = 0x8010F0E8;
|
||||
get_shadow_by_index = 0x8010F104;
|
||||
entity_start_script = 0x8010F178;
|
||||
get_entity_type = 0x8010F1A4;
|
||||
delete_entity = 0x8010F1D0;
|
||||
entity_try_partner_interaction_trigger = 0x8010F4DC;
|
||||
entity_set_render_script = 0x8010F6CC;
|
||||
clear_entity_data = 0x8010F7B8;
|
||||
create_entity = 0x801103C4;
|
||||
MakeEntity = 0x80110838;
|
||||
@ -442,6 +448,7 @@ create_shadow_type = 0x80110D60;
|
||||
delete_shadow = 0x80110E28;
|
||||
entity_raycast_down = 0x801110E8;
|
||||
set_standard_shadow_scale = 0x8011135C;
|
||||
is_block_on_ground = 0x80111620;
|
||||
clear_model_data = 0x80114844;
|
||||
get_model_from_list_index = 0x80119830;
|
||||
get_model_list_index_from_tree_index = 0x80119B10;
|
||||
@ -644,6 +651,8 @@ gCurrentDoorSounds = 0x8014FF10;
|
||||
gMusicSettings = 0x801586B0;
|
||||
gWindows = 0x80158910;
|
||||
gCollisionStatus = 0x80159110;
|
||||
gCurrentHiddenPanels = 0x80159138;
|
||||
CreateEntityVarArgBuffer = 0x8015B390;
|
||||
gBackgroundImage = 0x80200000;
|
||||
UseBattleCamPreset = 0x8024E5BC;
|
||||
UseBattleCamPresetImmediately = 0x8024E604;
|
||||
@ -1052,42 +1061,6 @@ Entity_ArrowSign = 0x802BCD9C;
|
||||
Entity_BoardedFloor = 0x802BCE84;
|
||||
Entity_BombableRock = 0x802BCF00;
|
||||
Entity_BombableRock2 = 0x802BCF24;
|
||||
entity_upgrade_block_hide_content = 0x802EB990;
|
||||
Entity_SavePoint = 0x802EFD18;
|
||||
Entity_RedSwitch = 0x802EFEB0;
|
||||
Entity_BlueSwitch = 0x802EFED4;
|
||||
Entity_HugeBlueSwitch = 0x802EFEF8;
|
||||
Entity_GreenStompSwitch = 0x802EFF1C;
|
||||
Entity_InertYellowBlock = 0x802F037C;
|
||||
Entity_BrickBlock = 0x802F03C4;
|
||||
Entity_MulticoinBlock = 0x802F03E8;
|
||||
Entity_Hammer1Block = 0x802F040C;
|
||||
Entity_Hammer1Block_WideX = 0x802F0430;
|
||||
Entity_Hammer1Block_WideZ = 0x802F0454;
|
||||
Entity_Hammer1BlockTiny = 0x802F0478;
|
||||
Entity_Hammer2Block = 0x802F049C;
|
||||
Entity_Hammer2Block_WideX = 0x802F04C0;
|
||||
Entity_Hammer2Block_WideZ = 0x802F04E4;
|
||||
Entity_Hammer2BlockTiny = 0x802F0508;
|
||||
Entity_Hammer3Block = 0x802F052C;
|
||||
Entity_Hammer3Block_WideZ = 0x802F0574;
|
||||
Entity_Hammer3BlockTiny = 0x802F0598;
|
||||
Entity_PowBlock = 0x802F05E0;
|
||||
Entity_YellowBlock = 0x802F0864;
|
||||
Entity_HiddenYellowBlock = 0x802F0888;
|
||||
Entity_RedBlock = 0x802F08AC;
|
||||
Entity_HiddenRedBlock = 0x802F08D0;
|
||||
Entity_TriggerBlock = 0x802F08F4;
|
||||
Entity_HeartBlock = 0x802F0AE0;
|
||||
Entity_SuperBlock = 0x802F0C10;
|
||||
Entity_ScriptSpring = 0x802F0D30;
|
||||
Entity_SimpleSpring = 0x802F0D54;
|
||||
Entity_HiddenPanel = 0x802F0E04;
|
||||
Entity_GiantChest = 0x802F110C;
|
||||
Entity_Chest = 0x802F1130;
|
||||
Entity_WoodenCrate = 0x802F11D4;
|
||||
Entity_BlueWarpPipe = 0x802F1280;
|
||||
Entity_Signpost = 0x802F12DC;
|
||||
gMsgCharsets = 0x802F18A8;
|
||||
D_802F4560 = 0x802FA860;
|
||||
heap_generalHead = 0x802FB800;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user