diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c index 7169747575..467751b5bb 100644 --- a/src/entity/SaveBlock.c +++ b/src/entity/SaveBlock.c @@ -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); diff --git a/src/entity/model/SaveBlock.c b/src/entity/model/SaveBlock.c index 995de26d76..404878fb4b 100644 --- a/src/entity/model/SaveBlock.c +++ b/src/entity/model/SaveBlock.c @@ -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(), }; diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml index a37d5f5aeb..e030ac7f2f 100644 --- a/ver/pal/splat.yaml +++ b/ver/pal/splat.yaml @@ -63,8 +63,54 @@ segments: subsegments: - [auto, c, sprite] - [auto, c, 101b90_len_8f0] + - name: entity + type: code + start: 0x1040F0 + vram: 0x802E7070 + follows_vram: engine4 + subsegments: + - [auto, c, entity/Shadow] + - [auto, c, entity/SaveBlock] + - [auto, c, entity/Switch] + - [auto, c, entity/ShatteringBlock_common] + - [auto, c, entity/ShatteringBlock] + - [auto, c, entity/Block] + - [auto, c, entity/ItemBlock] + - [auto, c, entity/HeartBlock] + - [auto, c, entity/SuperBlock] + - [auto, c, entity/SimpleSpring] + - [auto, c, entity/HiddenPanel] + - [auto, c, entity/Chest] + - [auto, c, entity/WoodenCrate] + - [auto, c, entity/BlueWarpPipe] + - [auto, c, entity/Signpost] + - start: 0x10A9F0 + type: .data + name: entity/Shadow + subsegments: + - [0x10C4F0, i4, entity/shadow/square, 16, 16] + - [0x10C570, i4, entity/shadow/circle, 16, 16] + - [0x10C5F0, vtx, entity/vtx/shadow1] + - [0x10C630, vtx, entity/vtx/shadow2] + - [0x10C670, i4, entity/shadow/square_big, 32, 32] + - [0x10C870, i4, entity/shadow/circle_big, 32, 32] + - [0x10CA70] + - [auto, .data, entity/SaveBlock] + - [auto, .data, entity/Switch] + - [auto, .data, entity/ShatteringBlock_common] + - [auto, .data, entity/ShatteringBlock] + - [auto, .data, entity/Block] + - [auto, .data, entity/ItemBlock] + - [auto, .data, entity/HeartBlock] + - [auto, .data, entity/SuperBlock] + - [auto, .data, entity/SimpleSpring] + - [auto, .data, entity/HiddenPanel] + - [auto, .data, entity/Chest] + - [auto, .data, entity/WoodenCrate] + - [auto, .data, entity/BlueWarpPipe] + - [auto, .data, entity/Signpost] - - [0x1040F0, bin] + - [0x10E710, bin] - type: group dir: charset @@ -11525,6 +11571,1077 @@ segments: - [0xE8D120, bin] + - name: entity_model_Hammer1Block + dir: entity/model + type: code + start: 0xE9E540 + vram: 0x0A000000 + subsegments: + - [auto, c, Hammer1Block] + - start: 0xE9E540 + type: .data + name: Hammer1Block + subsegments: + - [0xE9E540, vtx, Hammer1Block] + - [0xE9E7C0, ci4, Hammer1Block_face, 16, 32] + - [0xE9E8C0, palette, Hammer1Block_face] + - [0xE9E8E0] + - name: entity_model_Hammer2Block + dir: entity/model + type: code + start: 0xE9EA40 + vram: 0x0A000000 + subsegments: + - [auto, c, Hammer2Block] + - start: 0xE9EA40 + type: .data + name: Hammer2Block + subsegments: + - [0xE9EA40, vtx, Hammer2Block] + - [0xE9ECC0, ci4, Hammer2Block_face, 16, 32] + - [0xE9EDC0, palette, Hammer2Block_face] + - [0xE9EDE0] + - name: entity_model_Hammer3Block + dir: entity/model + type: code + start: 0xE9EF40 + vram: 0x0A000000 + subsegments: + - [auto, c, Hammer3Block] + - start: 0xE9EF40 + type: .data + name: Hammer3Block + subsegments: + - [0xE9EF40, vtx, Hammer3Block] + - [0xE9F1C0, ci4, Hammer3Block_face, 16, 32] + - [0xE9F2C0, palette, Hammer3Block_face] + - [0xE9F2E0] + - name: entity_model_ShatteringHammer1Block + dir: entity/model + type: code + start: 0xE9F430 + vram: 0x0A000000 + subsegments: + - [auto, c, ShatteringHammer1Block] + - start: 0xE9F430 + type: .data + name: ShatteringHammer1Block + subsegments: + - [0xE9F430, vtx, ShatteringHammer1Block] + - [0xEA0490, ci8, ShatteringHammer1Block_texture, 16, 32] + - [0xEA0690, palette, ShatteringHammer1Block_texture] + - [0xEA0890] + - name: entity_model_ShatteringHammer2Block + dir: entity/model + type: code + start: 0xEA2680 + vram: 0x0A000000 + subsegments: + - [auto, c, ShatteringHammer2Block] + - start: 0xEA2680 + type: .data + name: ShatteringHammer2Block + subsegments: + - [0xEA2680, vtx, ShatteringHammer2Block] + - [0xEA36E0, rgba16, ShatteringHammer2Block_texture, 16, 32] + - [0xEA3AE0] + - name: entity_model_ShatteringHammer3Block + dir: entity/model + type: code + start: 0xEA58A0 + vram: 0x0A000000 + subsegments: + - [auto, c, ShatteringHammer3Block] + - start: 0xEA58A0 + type: .data + name: ShatteringHammer3Block + subsegments: + - [0xEA58A0, vtx, ShatteringHammer3Block] + - [0xEA68F0, ci4, ShatteringHammer3Block_texture, 16, 32] + - [0xEA69F0, palette, ShatteringHammer3Block_texture] + - [0xEA6A10] + - name: entity_model_YellowBlock + dir: entity/model + type: code + start: 0xEA8880 + vram: 0x0A000000 + subsegments: + - [auto, c, YellowBlock] + - start: 0xEA8880 + type: .data + name: YellowBlock + subsegments: + - [0xEA8880, vtx, YellowBlock] + - [0xEA8A00, rgba16, YellowBlock_face, 32, 32] + - [0xEA9200] + - name: entity_model_RedBlock + dir: entity/model + type: code + start: 0xEA9330 + vram: 0x0A000000 + subsegments: + - [auto, c, RedBlock] + - start: 0xEA9330 + type: .data + name: RedBlock + subsegments: + - [0xEA9330, vtx, RedBlock] + - [0xEA94B0, rgba16, RedBlock_face, 32, 32] + - [0xEA9CB0] + - name: entity_model_UnusedBlock + dir: entity/model + type: code + start: 0xEA9DE0 + vram: 0x0A000000 + subsegments: + - [auto, c, UnusedBlock] + - start: 0xEA9DE0 + type: .data + name: UnusedBlock + subsegments: + - [0xEA9DE0, vtx, UnusedBlock] + - [0xEAA1A0, rgba16, UnusedBlock_img1, 16, 32] + - [0xEAA5A0] + - [0xEAA628, ci4, UnusedBlock_img2, 16, 32] + - [0xEAA728, palette, UnusedBlock_img2] + - [0xEAA748] + - name: entity_model_PushBlock + dir: entity/model + type: code + start: 0xEAAA70 + vram: 0x0A000000 + subsegments: + - [auto, c, PushBlock] + - start: 0xEAAA70 + type: .data + name: PushBlock + subsegments: + - [0xEAAA70, vtx, PushBlock] + - [0xEAAB90, ci4, PushBlock_face, 16, 16] + - [0xEAAC10, palette, PushBlock_face] + - [0xEAAC30] + - name: entity_model_BrickBlock + dir: entity/model + type: code + start: 0xEAADC0 + vram: 0x0A000000 + subsegments: + - [auto, c, BrickBlock] + - start: 0xEAADC0 + type: .data + name: BrickBlock + subsegments: + - [0xEAADC0, vtx, BrickBlock] + - [0xEAAF00, ci4, BrickBlock_face, 32, 32] + - [0xEAB100, palette, BrickBlock_face] + - [0xEAB120] + - name: entity_model_ShatteringBrickBlock + dir: entity/model + type: code + start: 0xEAB270 + vram: 0x0A000000 + subsegments: + - [auto, c, ShatteringBrickBlock] + - start: 0xEAB270 + type: .data + name: ShatteringBrickBlock + subsegments: + - [0xEAB270, vtx, ShatteringBrickBlock] + - [0xEACD10, rgba16, ShatteringBrickBlock_texture, 32, 32] + - [0xEAD510] + - name: entity_model_InertYellowBlock + dir: entity/model + type: code + start: 0xEAF250 + vram: 0x0A000000 + subsegments: + - [auto, c, InertYellowBlock] + - start: 0xEAF250 + type: .data + name: InertYellowBlock + subsegments: + - [0xEAF250, vtx, InertYellowBlock_1] + - [0xEAF350, vtx, InertYellowBlock_2] + - [0xEAF3D0, ci4, InertYellowBlock_face, 32, 32] + - [0xEAF5D0, palette, InertYellowBlock_face] + - [0xEAF5F0] + - name: entity_model_InertRedBlock + dir: entity/model + type: code + start: 0xEAF750 + vram: 0x0A000000 + subsegments: + - [auto, c, InertRedBlock] + - start: 0xEAF750 + type: .data + name: InertRedBlock + subsegments: + - [0xEAF750, vtx, InertRedBlock_1] + - [0xEAF850, vtx, InertRedBlock_2] + - [0xEAF8D0, rgba16, InertRedBlock_face, 32, 32] + - [0xEB00D0] + - name: entity_model_HeartBlock + dir: entity/model + type: code + start: 0xEB0200 + vram: 0x0A000000 + subsegments: + - [auto, c, HeartBlock] + - start: 0xEB0200 + type: .data + name: HeartBlock + subsegments: + - [0xEB0200, vtx, HeartBlock] + - [0xEB05C0, rgba16, HeartBlock_face, 16, 32] + - [0xEB09C0] + - name: entity_model_PowBlock + dir: entity/model + type: code + start: 0xEB0B30 + vram: 0x0A000000 + subsegments: + - [auto, c, PowBlock] + - start: 0xEB0B30 + type: .data + name: PowBlock + subsegments: + - [0xEB0B30, vtx, PowBlock] + - [0xEB0C30, ci8, PowBlock_face, 64, 32] + - [0xEB1430, palette, PowBlock_face] + - [0xEB1630] + - name: entity_model_SuperBlock + dir: entity/model + type: code + start: 0xEB1810 + vram: 0x0A000000 + subsegments: + - [auto, c, SuperBlock] + - start: 0xEB1810 + type: .data + name: SuperBlock + subsegments: + - [0xEB1810, vtx, SuperBlock] + - [0xEB1C90, ci4, SuperBlock_tex, 16, 32] + - [0xEB1D90, palette, SuperBlock_tex] + - [0xEB1DB0] + - name: entity_model_UltraBlock + dir: entity/model + type: code + start: 0xEB2120 + vram: 0x0A000000 + subsegments: + - [auto, c, UltraBlock] + - start: 0xEB2120 + type: .data + name: UltraBlock + subsegments: + - [0xEB2120, vtx, UltraBlock] + - [0xEB25A0, ci4, UltraBlock_tex, 16, 32] + - [0xEB26A0, palette, UltraBlock_tex] + - [0xEB26C0] + - name: entity_model_HitYellowBlock_gfx + dir: entity/model + type: code + start: 0xEB2A00 + vram: 0x0A000000 + subsegments: + - [auto, c, HitYellowBlock_gfx] + - start: 0xEB2A00 + type: .data + name: HitYellowBlock_gfx + subsegments: + - [0xEB2A00, vtx, HitYellowBlock_1] + - [0xEB2B60, vtx, HitYellowBlock_2] + - [0xEB2CC0] + - [0xEB2E20, rgba16, HitYellowBlock_face1, 32, 32] + - [0xEB3620, rgba16, HitYellowBlock_face2, 32, 32] + - name: entity_model_HitYellowBlock_anim + dir: entity/model + type: code + start: 0xEB3E20 + vram: 0x00000000 + subsegments: + - [auto, c, HitYellowBlock_anim] + - name: entity_model_HitFloatingYellowBlock_gfx + dir: entity/model + type: code + start: 0xEB40C0 + vram: 0x0A000000 + subsegments: + - [auto, c, HitFloatingYellowBlock_gfx] + - start: 0xEB40C0 + type: .data + name: HitFloatingYellowBlock_gfx + subsegments: + - [0xEB40C0, vtx, HitFloatingYellowBlock_1] + - [0xEB4220, vtx, HitFloatingYellowBlock_2] + - [0xEB43A0] + - [0xEB4500, rgba16, HitFloatingYellowBlock_face1, 32, 32] + - [0xEB4D00, rgba16, HitFloatingYellowBlock_face2, 32, 32] + - name: entity_model_HitFloatingYellowBlock_anim + dir: entity/model + type: code + start: 0xEB5500 + vram: 0x00000000 + subsegments: + - [auto, c, HitFloatingYellowBlock_anim] + - name: entity_model_HitRedBlock_gfx + dir: entity/model + type: code + start: 0xEB5790 + vram: 0x0A000000 + subsegments: + - [auto, c, HitRedBlock_gfx] + - start: 0xEB5790 + type: .data + name: HitRedBlock_gfx + subsegments: + - [0xEB5790, vtx, HitRedBlock_1] + - [0xEB58F0, vtx, HitRedBlock_2] + - [0xEB5A50] + - [0xEB5BF0, rgba16, HitRedBlock_face1, 32, 32] + - [0xEB63F0, rgba16, HitRedBlock_face2, 32, 32] + - name: entity_model_HitRedBlock_anim + dir: entity/model + type: code + start: 0xEB6BF0 + vram: 0x00000000 + subsegments: + - [auto, c, HitRedBlock_anim] + - name: entity_model_HeartBlockContent + dir: entity/model + type: code + start: 0xEB6E50 + vram: 0x0A000000 + subsegments: + - [auto, c, HeartBlockContent] + - start: 0xEB6E50 + type: .data + name: HeartBlockContent + subsegments: + - [0xEB6E50] + - name: entity_model_SuperBlockContent + dir: entity/model + type: code + start: 0xEB76B0 + vram: 0x0A000000 + subsegments: + - [auto, c, SuperBlockContent] + - start: 0xEB76B0 + type: .data + name: SuperBlockContent + subsegments: + - [0xEB76B0, ci4, SuperBlockContent, 32, 32] + - [0xEB78B0, palette, SuperBlockContent] + - [0xEB78D0, palette, SuperBlockContent.pal2] + - [0xEB78F0, palette, SuperBlockContent.pal3] + - [0xEB7910, palette, SuperBlockContent.pal4] + - [0xEB7930] + - name: entity_model_UltraBlockContent + dir: entity/model + type: code + start: 0xEB7A90 + vram: 0x0A000000 + subsegments: + - [auto, c, UltraBlockContent] + - start: 0xEB7A90 + type: .data + name: UltraBlockContent + subsegments: + - [0xEB7A90] + - name: entity_model_SaveBlock + dir: entity/model + type: code + start: 0xEB82F0 + vram: 0x0A000000 + subsegments: + - [auto, c, SaveBlock] + - start: 0xEB82F0 + type: .data + name: SaveBlock + subsegments: + - [0xEB82F0, vtx, SaveBlock_1] + - [0xEB8660, vtx, SaveBlock_2] + - [0xEB89B0, vtx, SaveBlock_3] + - [0xEB8BF0, rgba16, SaveBlock_star, 32, 32] + - [0xEB93F0] + - [0xEB9460, rgba16, SaveBlock_letterS, 64, 32] + - [0xEBA460, ia8, SaveBlock_letterG, 64, 32] + - [0xEBAC60] + - name: entity_model_BoardedFloor + dir: entity/model + type: code + start: 0xEBB0E0 + vram: 0x0A000000 + subsegments: + - [auto, c, BoardedFloor] + - start: 0xEBB0E0 + type: .data + name: BoardedFloor + subsegments: + - [0xEBB0E0, vtx, BoardedFloor_1] + - [0xEBB2C0, vtx, BoardedFloor_2] + - [0xEBB4A0, vtx, BoardedFloor_3] + - [0xEBB680, vtx, BoardedFloor_4] + - [0xEBB860, vtx, BoardedFloor_5] + - [0xEBB9E0, vtx, BoardedFloor_6] + - [0xEBBB60, vtx, BoardedFloor_7] + - [0xEBBD60, vtx, BoardedFloor_8] + - [0xEBBF60, vtx, BoardedFloor_9] + - [0xEBC0E0, vtx, BoardedFloor_A] + - [0xEBC260, vtx, BoardedFloor_B] + - [0xEBC360, vtx, BoardedFloor_C] + - [0xEBC4E0, rgba16, BoardedFloor, 64, 32] + - [0xEBD4E0] + - name: entity_model_WoodenCrate + dir: entity/model + type: code + start: 0xEBDF30 + vram: 0x0A000000 + subsegments: + - [auto, c, WoodenCrate] + - start: 0xEBDF30 + type: .data + name: WoodenCrate + subsegments: + - [0xEBDF30, vtx, WoodenCrate] + - [0xEBF490, ci4, WoodenCrate_img1, 64, 64] + - [0xEBFC90, palette, WoodenCrate_img1] + - [0xEBFCB0] + - [0xEBFD58, ci4, WoodenCrate_img2, 64, 64] + - [0xEC0558, palette, WoodenCrate_img2] + - [0xEC0578] + - name: entity_model_StarBoxLauncher + dir: entity/model + type: code + start: 0xEC2330 + vram: 0x0A000000 + subsegments: + - [auto, c, StarBoxLauncher] + - start: 0xEC2330 + type: .data + name: StarBoxLauncher + subsegments: + - [0xEC2330, vtx, StarBoxLauncher_1] + - [0xEC2420, vtx, StarBoxLauncher_2] + - [0xEC2540, vtx, StarBoxLauncher_3] + - [0xEC2580, vtx, StarBoxLauncher_4] + - [0xEC25C0, rgba16, StarBoxLauncher_link, 16, 16] + - [0xEC27C0] + - [0xEC2838, ci4, StarBoxLauncher_face, 128, 32] + - [0xEC3038, palette, StarBoxLauncher_face] + - [0xEC3058] + - [0xEC3100, ci4, StarBoxLauncher_box, 16, 32] + - [0xEC3200, palette, StarBoxLauncher_box] + - [0xEC3220] + - name: entity_model_HiddenPanel + dir: entity/model + type: code + start: 0xEC3490 + vram: 0x0A000000 + subsegments: + - [auto, c, HiddenPanel] + - name: entity_model_Tweester + dir: entity/model + type: code + start: 0xEC3750 + vram: 0x0A000000 + subsegments: + - [auto, c, Tweester] + - start: 0xEC3750 + type: .data + name: Tweester + subsegments: + - [0xEC3750, vtx, Tweester_1] + - [0xEC3B60, vtx, Tweester_2] + - [0xEC3F70, vtx, Tweester_3] + - [0xEC3FB0, vtx, Tweester_4] + - [0xEC4340, i8, Tweester_img1, 32, 32] + - [0xEC4740, i8, Tweester_img2, 32, 32] + - [0xEC4B40] + - [0xEC4BF0, ci4, Tweester_img3, 64, 32] + - [0xEC4FF0, palette, Tweester_img3] + - [0xEC5010] + - name: entity_model_BlueWarpPipe + dir: entity/model + type: code + start: 0xEC55C0 + vram: 0x0A000000 + subsegments: + - [auto, c, BlueWarpPipe] + - start: 0xEC55C0 + type: .data + name: BlueWarpPipe + subsegments: + - [0xEC55C0, vtx, BlueWarpPipe_1] + - [0xEC5620, vtx, BlueWarpPipe_2] + - [0xEC58A0, vtx, BlueWarpPipe_3] + - [0xEC58E0, ci4, BlueWarpPipe_texBase, 16, 16] + - [0xEC5960, palette, BlueWarpPipe_texBase] + - [0xEC5980] + - [0xEC5A30, ci4, BlueWarpPipe_texPipe, 32, 16] + - [0xEC5B30, palette, BlueWarpPipe_texPipe] + - [0xEC5B50] + - name: entity_model_Signpost + dir: entity/model + type: code + start: 0xEC5D70 + vram: 0x0A000000 + subsegments: + - [auto, c, Signpost] + - start: 0xEC5D70 + type: .data + name: Signpost + subsegments: + - [0xEC5D70, vtx, Signpost_1] + - [0xEC5E90, vtx, Signpost_2] + - [0xEC62F0, ci4, Signpost, 32, 32] + - [0xEC64F0, palette, Signpost] + - [0xEC6510] + - name: entity_model_ArrowSign + dir: entity/model + type: code + start: 0xEC67F0 + vram: 0x0A000000 + subsegments: + - [auto, c, ArrowSign] + - start: 0xEC67F0 + type: .data + name: ArrowSign + subsegments: + - [0xEC67F0] + - [0xEC6870, ci8, ArrowSign, 64, 32] + - [0xEC7070, palette, ArrowSign] + - [0xEC7270] + - name: entity_model_Padlock + dir: entity/model + type: code + start: 0xEC7440 + vram: 0x0A000000 + subsegments: + - [auto, c, Padlock] + - start: 0xEC7440 + type: .data + name: Padlock + subsegments: + - [0xEC7440, vtx, Padlock_1] + - [0xEC7A00, vtx, Padlock_2] + - [0xEC7A60, vtx, Padlock_3] + - [0xEC7AA0, vtx, Padlock_4] + - [0xEC7B40, ci8, Padlock_face, 32, 32] + - [0xEC7F40, palette, Padlock_face] + - [0xEC8140] + - [0xEC81E8, ci8, Padlock_keyhole, 32, 64] + - [0xEC89E8, palette, Padlock_keyhole] + - [0xEC8BE8] + - [0xEC8C90, ci8, Padlock_body, 32, 32] + - [0xEC9090, palette, Padlock_body] + - [0xEC9290] + - name: entity_model_PadlockRedFrame + dir: entity/model + type: code + start: 0xEC9670 + vram: 0x0A000000 + subsegments: + - [auto, c, PadlockRedFrame] + - start: 0xEC9670 + type: .data + name: PadlockRedFrame + subsegments: + - [0xEC9670, vtx, PadlockRedFrame_1] + - [0xEC9870, vtx, PadlockRedFrame_2] + - [0xEC98B0, vtx, PadlockRedFrame_3] + - [0xEC98F0, vtx, PadlockRedFrame_4] + - [0xEC9BB0, ci8, PadlockRedFrame_keyhole, 32, 64] + - [0xECA3B0, palette, PadlockRedFrame_keyhole] + - [0xECA5B0] + - [0xECA658, ci8, PadlockRedFrame_face, 32, 32] + - [0xECAA58, palette, PadlockRedFrame_face] + - [0xECAC58] + - name: entity_model_PadlockRedFace + dir: entity/model + type: code + start: 0xECB020 + vram: 0x0A000000 + subsegments: + - [auto, c, PadlockRedFace] + - start: 0xECB020 + type: .data + name: PadlockRedFace + subsegments: + - [0xECB020, vtx, PadlockRedFace_1] + - [0xECB5E0, vtx, PadlockRedFace_2] + - [0xECB640, vtx, PadlockRedFace_3] + - [0xECB680, vtx, PadlockRedFace_4] + - [0xECB720, i4, PadlockRedFace_face, 32, 32] + - [0xECB920] + - [0xECB998, ci8, PadlockRedFace_keyhole, 32, 64] + - [0xECC198, palette, PadlockRedFace_keyhole] + - [0xECC398] + - [0xECC440, ci8, PadlockRedFace_body, 32, 32] + - [0xECC840, palette, PadlockRedFace_body] + - [0xECCA40] + - name: entity_model_PadlockBlueFace + dir: entity/model + type: code + start: 0xECCE40 + vram: 0x0A000000 + subsegments: + - [auto, c, PadlockBlueFace] + - start: 0xECCE40 + type: .data + name: PadlockBlueFace + subsegments: + - [0xECCE40, vtx, PadlockBlueFace_1] + - [0xECD400, vtx, PadlockBlueFace_2] + - [0xECD460, vtx, PadlockBlueFace_3] + - [0xECD4A0, vtx, PadlockBlueFace_4] + - [0xECD540, i4, PadlockBlueFace_face, 32, 32] + - [0xECD740] + - [0xECD7B8, ci8, PadlockBlueFace_keyhole, 32, 64] + - [0xECDFB8, palette, PadlockBlueFace_keyhole] + - [0xECE1B8] + - [0xECE260, ci8, PadlockBlueFace_body, 32, 32] + - [0xECE660, palette, PadlockBlueFace_body] + - [0xECE860] + - name: entity_model_GreenStompSwitch + dir: entity/model + type: code + start: 0xECEC60 + vram: 0x0A000000 + subsegments: + - [auto, c, GreenStompSwitch] + - start: 0xECEC60 + type: .data + name: GreenStompSwitch + subsegments: + - [0xECEC60, vtx, GreenStompSwitch_1] + - [0xECECE0, vtx, GreenStompSwitch_2] + - [0xECEEE0, ci4, GreenStompSwitch_tex, 16, 16] + - [0xECEF60, palette, GreenStompSwitch_tex] + - [0xECEF80] + - [0xECF038, ci4, GreenStompSwitch_exclamationMark, 16, 32] + - [0xECF138, palette, GreenStompSwitch_exclamationMark] + - [0xECF158] + - name: entity_model_RedSwitch + dir: entity/model + type: code + start: 0xECF3B0 + vram: 0x0A000000 + subsegments: + - [auto, c, RedSwitch] + - start: 0xECF3B0 + type: .data + name: RedSwitch + subsegments: + - [0xECF3B0, vtx, RedSwitch_1] + - [0xECF740, vtx, RedSwitch_2] + - [0xECF780, vtx, RedSwitch_3] + - [0xECF980, ci8, RedSwitch_tex, 16, 16] + - [0xECFA80, palette, RedSwitch_tex] + - [0xECFC80] + - [0xECFD28, ia4, RedSwitch_exclamationMark, 16, 32] + - [0xECFE28] + - name: entity_model_BlueSwitch + dir: entity/model + type: code + start: 0xED02B0 + vram: 0x0A000000 + subsegments: + - [auto, c, BlueSwitch] + - start: 0xED02B0 + type: .data + name: BlueSwitch + subsegments: + - [0xED02B0, vtx, BlueSwitch_1] + - [0xED05B0, vtx, BlueSwitch_2] + - [0xED0640, vtx, BlueSwitch_3] + - [0xED0680, vtx, BlueSwitch_4] + - [0xED0880, ci8, BlueSwitch_tex, 16, 16] + - [0xED0980, palette, BlueSwitch_tex] + - [0xED0B80] + - [0xED0C28, ia4, BlueSwitch_exclamationMark, 16, 32] + - [0xED0D28] + - name: entity_model_Chest + dir: entity/model + type: code + start: 0xED11C0 + vram: 0x0A000000 + subsegments: + - [auto, c, Chest] + - start: 0xED11C0 + type: .data + name: Chest + subsegments: + - [0xED11C0, vtx, Chest_1] + - [0xED1350, vtx, Chest_2] + - [0xED13D0, vtx, Chest_3] + - [0xED1550, vtx, Chest_4] + - [0xED15D0, rgba16, Chest_tex1, 16, 32] + - [0xED19D0] + - [0xED1A58, ci4, Chest_tex2, 16, 32] + - [0xED1B58, palette, Chest_tex2] + - [0xED1B78] + - [0xED1C30, ci4, Chest_lock, 16, 32] + - [0xED1D30, palette, Chest_lock] + - [0xED1D50] + - name: entity_model_ScriptSpring_gfx + dir: entity/model + type: code + start: 0xED2090 + vram: 0x0A000000 + subsegments: + - [auto, c, ScriptSpring_gfx] + - start: 0xED2090 + type: .data + name: ScriptSpring_gfx + subsegments: + - [0xED2090, vtx, ScriptSpring_1] + - [0xED2310, vtx, ScriptSpring_2] + - [0xED2390, vtx, ScriptSpring_3] + - [0xED2410, vtx, ScriptSpring_4] + - [0xED2490, vtx, ScriptSpring_5] + - [0xED2710, vtx, ScriptSpring_6] + - [0xED2870, vtx, ScriptSpring_7] + - [0xED28F0, ci8, ScriptSpring_tex1, 16, 16] + - [0xED29F0, palette, ScriptSpring_tex1] + - [0xED2BF0] + - [0xED2C98, ci8, ScriptSpring_tex2, 16, 16] + - [0xED2D98, palette, ScriptSpring_tex2] + - [0xED2F98] + - [0xED3040, ci8, ScriptSpring_star, 32, 32] + - [0xED3440, palette, ScriptSpring_star] + - [0xED3640] + - name: entity_model_ScriptSpring_anim + dir: entity/model + type: code + start: 0xED3A10 + vram: 0x00000000 + subsegments: + - [auto, c, ScriptSpring_anim] + - name: entity_model_SimpleSpring_gfx + dir: entity/model + type: code + start: 0xED4E70 + vram: 0x0A000000 + subsegments: + - [auto, c, SimpleSpring_gfx] + - start: 0xED4E70 + type: .data + name: SimpleSpring_gfx + subsegments: + - [0xED4E70, vtx, SimpleSpring_1] + - [0xED50F0, vtx, SimpleSpring_2] + - [0xED5170, vtx, SimpleSpring_3] + - [0xED51F0, vtx, SimpleSpring_4] + - [0xED5470, vtx, SimpleSpring_5] + - [0xED55D0, vtx, SimpleSpring_6] + - [0xED5650, ci8, SimpleSpring_tex1, 16, 16] + - [0xED5750, palette, SimpleSpring_tex1] + - [0xED5950] + - [0xED59F8, rgba16, SimpleSpring_tex2, 16, 16] + - [0xED5BF8] + - [0xED5C70, ci8, SimpleSpring_star, 32, 32] + - [0xED6070, palette, SimpleSpring_star] + - [0xED6270] + - name: entity_model_SimpleSpring_anim + dir: entity/model + type: code + start: 0xED6640 + vram: 0x00000000 + subsegments: + - [auto, c, SimpleSpring_anim] + - name: entity_model_BellbellPlant_gfx + dir: entity/model + type: code + start: 0xED7AA0 + vram: 0x0A000000 + subsegments: + - [auto, c, BellbellPlant_gfx] + - start: 0xED7AA0 + type: .data + name: BellbellPlant_gfx + subsegments: + - [0xED7AA0, vtx, BellbellPlant_1] + - [0xED7E30, vtx, BellbellPlant_2] + - [0xED80E0, vtx, BellbellPlant_3] + - [0xED81C0, vtx, BellbellPlant_4] + - [0xED84B0, vtx, BellbellPlant_5] + - [0xED8590] + - [0xED8B30, rgba16, BellbellPlant, 16, 16] + - name: entity_model_BellbellPlant_anim + dir: entity/model + type: code + start: 0xED8D30 + vram: 0x00000000 + subsegments: + - [auto, c, BellbellPlant_anim] + - name: entity_model_TrumpetPlant_gfx + dir: entity/model + type: code + start: 0xED9C80 + vram: 0x0A000000 + subsegments: + - [auto, c, TrumpetPlant_gfx] + - start: 0xED9C80 + type: .data + name: TrumpetPlant_gfx + subsegments: + - [0xED9C80, vtx, TrumpetPlant_1] + - [0xED9EC0, vtx, TrumpetPlant_2] + - [0xEDA630] + - [0xEDA9C0, rgba16, TrumpetPlant, 16, 16] + - name: entity_model_TrumpetPlant_anim + dir: entity/model + type: code + start: 0xEDABC0 + vram: 0x00000000 + subsegments: + - [auto, c, TrumpetPlant_anim] + - name: entity_model_MunchlesiaReset_gfx + dir: entity/model + type: code + start: 0xEDAF50 + vram: 0x0A000000 + subsegments: + - [auto, c, MunchlesiaReset_gfx] + - start: 0xEDAF50 + type: .data + name: MunchlesiaReset_gfx + subsegments: + - [0xEDAF50, vtx, MunchlesiaReset] + - [0xEDC840] + - [0xEE0E38, rgba16, MunchlesiaReset, 16, 16] + - name: entity_model_MunchlesiaReset_anim + dir: entity/model + type: code + start: 0xEE1040 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaReset_anim] + - name: entity_model_MunchlesiaGrab_gfx + dir: entity/model + type: code + start: 0xEE14C0 + vram: 0x0A000000 + subsegments: + - [auto, c, MunchlesiaGrab_gfx] + - start: 0xEE14C0 + type: .data + name: MunchlesiaGrab_gfx + subsegments: + - [0xEE14C0, vtx, MunchlesiaGrab] + - [0xEE2DB0] + - [0xEE73A8, rgba16, MunchlesiaGrab, 16, 16] + - name: entity_model_MunchlesiaGrab_anim + dir: entity/model + type: code + start: 0xEE75B0 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaGrab_anim] + - name: entity_model_MunchlesiaEnvelop_gfx + dir: entity/model + type: code + start: 0xEE79D0 + vram: 0x0A000000 + subsegments: + - [auto, c, MunchlesiaEnvelop_gfx] + - start: 0xEE79D0 + type: .data + name: MunchlesiaEnvelop_gfx + subsegments: + - [0xEE79D0, vtx, MunchlesiaEnvelop] + - [0xEE92C0] + - [0xEED8B8, rgba16, MunchlesiaEnvelop, 16, 16] + - name: entity_model_MunchlesiaEnvelop_anim + dir: entity/model + type: code + start: 0xEEDAC0 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaEnvelop_anim] + - name: entity_model_MunchlesiaBeginChew_gfx + dir: entity/model + type: code + start: 0xEEDEE0 + vram: 0x0A000000 + subsegments: + - [auto, c, MunchlesiaBeginChew_gfx] + - start: 0xEEDEE0 + type: .data + name: MunchlesiaBeginChew_gfx + subsegments: + - [0xEEDEE0, vtx, MunchlesiaBeginChew] + - [0xEEF7D0] + - [0xEF4720, rgba16, MunchlesiaBeginChew, 16, 16] + - name: entity_model_MunchlesiaBeginChew_anim + dir: entity/model + type: code + start: 0xEF4920 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaBeginChew_anim] + - name: entity_model_MunchlesiaChewing_gfx + dir: entity/model + type: code + start: 0xEF4D90 + vram: 0x0A000000 + subsegments: + - [auto, c, MunchlesiaChewing_gfx] + - start: 0xEF4D90 + type: .data + name: MunchlesiaChewing_gfx + subsegments: + - [0xEF4D90, vtx, MunchlesiaChewing] + - [0xEF6680] + - [0xEF6B00, rgba16, MunchlesiaChewing, 16, 16] + - name: entity_model_MunchlesiaChewing_anim + dir: entity/model + type: code + start: 0xEF6D00 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaChewing_anim] + - name: entity_model_MunchlesiaSpitOut_gfx + dir: entity/model + type: code + start: 0xEF72D0 + vram: 0x0A000000 + subsegments: + - [auto, c, MunchlesiaSpitOut_gfx] + - start: 0xEF72D0 + type: .data + name: MunchlesiaSpitOut_gfx + subsegments: + - [0xEF72D0, vtx, MunchlesiaSpitOut] + - [0xEF8BC0] + - [0xEFDB10, rgba16, MunchlesiaSpitOut, 16, 16] + - name: entity_model_MunchlesiaSpitOut_anim + dir: entity/model + type: code + start: 0xEFDD10 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaSpitOut_anim] + - name: entity_model_MunchlesiaReset1_gfx + dir: entity/model + type: code + start: 0xEFE180 + vram: 0x0A000000 + subsegments: + - [auto, c, MunchlesiaReset1_gfx] + - start: 0xEFE180 + type: .data + name: MunchlesiaReset1_gfx + subsegments: + - [0xEFE180, vtx, MunchlesiaReset1] + - [0xEFFA70] + - [0xF049C0, rgba16, MunchlesiaReset1, 16, 16] + - name: entity_model_MunchlesiaReset1_anim + dir: entity/model + type: code + start: 0xF04BC0 + vram: 0x00000000 + subsegments: + - [auto, c, MunchlesiaReset1_anim] + - name: entity_model_CymbalPlant_anim + dir: entity/model + type: code + start: 0xF05030 + vram: 0x00000000 + subsegments: + - [auto, c, CymbalPlant_anim] + - name: entity_model_CymbalPlant_gfx + dir: entity/model + type: code + start: 0xF05BE0 + vram: 0x0A000000 + subsegments: + - [auto, c, CymbalPlant_gfx] + - start: 0xF05BE0 + type: .data + name: CymbalPlant_gfx + subsegments: + - [0xF05BE0, ci4, CymbalPlant, 64, 64] + - [0xF063E0, palette, CymbalPlant] + - [0xF06400] + - [0xF064A8, vtx, CymbalPlant_1] + - [0xF06548, vtx, CymbalPlant_2] + - [0xF065A8, vtx, CymbalPlant_3] + - [0xF06648, vtx, CymbalPlant_4] + - [0xF06798, vtx, CymbalPlant_5] + - [0xF06908, vtx, CymbalPlant_6] + - [0xF06998, vtx, CymbalPlant_7] + - [0xF06B08, vtx, CymbalPlant_8] + - [0xF06C58] + - name: entity_model_PinkFlower_anim + dir: entity/model + type: code + start: 0xF07280 + vram: 0x00000000 + subsegments: + - [auto, c, PinkFlower_anim] + - name: entity_model_PinkFlower_gfx + dir: entity/model + type: code + start: 0xF07DF0 + vram: 0x0A000000 + subsegments: + - [auto, c, PinkFlower_gfx] + - start: 0xF07DF0 + type: .data + name: PinkFlower_gfx + subsegments: + - [0xF07DF0, vtx, PinkFlower_1] + - [0xF07E30, vtx, PinkFlower_2] + - [0xF08080, vtx, PinkFlower_3] + - [0xF081A0, vtx, PinkFlower_4] + - [0xF082A0, vtx, PinkFlower_5] + - [0xF083A0, ia16, PinkFlower_light, 16, 16] + - [0xF085A0] + - [0xF08610, rgba16, PinkFlower_tex, 16, 64] + - [0xF08E10] + - name: entity_model_SpinningFlower + dir: entity/model + type: code + start: 0xF091F0 + vram: 0x0A000000 + subsegments: + - [auto, c, SpinningFlower] + - start: 0xF091F0 + type: .data + name: SpinningFlower + subsegments: + - [0xF091F0, vtx, SpinningFlower_1] + - [0xF09240, vtx, SpinningFlower_2] + - [0xF09290, vtx, SpinningFlower_3] + - [0xF09310, vtx, SpinningFlower_4] + - [0xF09370, ia4, SpinningFlower_img1, 16, 32] + - [0xF09470] + - [0xF094E8, rgba16, SpinningFlower_petal, 32, 32] + - [0xF09CE8] + - name: entity_model_BombableRock + dir: entity/model + type: code + start: 0xF09F40 + vram: 0x0A000000 + subsegments: + - [auto, c, BombableRock] + - start: 0xF09F40 + type: .data + name: BombableRock + subsegments: + - [0xF09F40, vtx, BombableRock_1] + - [0xF0A2C0, vtx, BombableRock_2] + - [0xF0A3E0, vtx, BombableRock_3] + - [0xF0A540, vtx, BombableRock_4] + - [0xF0A660, vtx, BombableRock_5] + - [0xF0A780, ci4, BombableRock, 64, 64] + - [0xF0AF80, palette, BombableRock] + - [0xF0AFA0] + - [0xF0B5C0, bin] + - [0x13A0000, pm_sbn, audio] - [0x1DE2C40, bin, 1942C40] - { start: 0x1DF0000, align: 8, type: pm_sprites, name: sprites } diff --git a/ver/pal/symbol_addrs.txt b/ver/pal/symbol_addrs.txt index ebd5585038..c8a75f79cc 100644 --- a/ver/pal/symbol_addrs.txt +++ b/ver/pal/symbol_addrs.txt @@ -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 diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index 5bee68d3d3..ff055c064d 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -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;