diff --git a/src/code_80281C40.c b/src/code_80281C40.c index 3c6b2c5f1..5c6ff4585 100644 --- a/src/code_80281C40.c +++ b/src/code_80281C40.c @@ -44,6 +44,9 @@ void func_80281CB4(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { } } +extern Gfx D_80284F70[]; +extern Gfx D_80284EE0[]; + void func_80281D00(void) { Camera *camera = &cameras[0]; UNUSED s32 pad[3]; @@ -71,13 +74,13 @@ void func_80281D00(void) { gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[7]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); mtxf_identity(matrix); func_802B4FF8(matrix, 0); - gSPDisplayList(gDisplayListHead++, &D_00284F70); + gSPDisplayList(gDisplayListHead++, VIRTUAL_TO_PHYSICAL2(&D_80284F70)); func_800212B4(); - gSPDisplayList(gDisplayListHead++, &D_00284EE0); + gSPDisplayList(gDisplayListHead++, VIRTUAL_TO_PHYSICAL2(&D_80284EE0)); update_actors_loop(); func_80058090(0); func_80021B0C(); - gSPDisplayList(gDisplayListHead++, &D_00284EE0); + gSPDisplayList(gDisplayListHead++, VIRTUAL_TO_PHYSICAL2(&D_80284EE0)); func_80093F10(); transition_sliding_borders(); func_80281C40(); diff --git a/src/dl_unk_80284EE0.inc.c b/src/dl_unk_80284EE0.inc.c index c868c8113..9f2e07352 100644 --- a/src/dl_unk_80284EE0.inc.c +++ b/src/dl_unk_80284EE0.inc.c @@ -37,7 +37,7 @@ extern Gfx D_070006D0[]; extern Gfx D_070004D0[]; extern Gfx D_07000840[]; -// Unknown displaylists +// Init RDP - RSP (Ceremony) Gfx D_80284EE0[] = { gsDPSetCycleType(G_CYC_1CYCLE), gsDPPipelineMode(G_PM_1PRIMITIVE), @@ -59,6 +59,7 @@ Gfx D_80284EE0[] = { gsSPEndDisplayList(), }; +// Peach's Castle (Ceremony) Gfx D_80284F70[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), diff --git a/undefined_syms.txt b/undefined_syms.txt index bc27e892f..34f3065a9 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -58,9 +58,6 @@ D_C000000C = 0xC000000C; D_000FFF00 = 0x000FFF00; -D_00284EE0 = 0x00284EE0; -D_00284F70 = 0x00284F70; - D_03004000 = 0x03004000; D_03004800 = 0x03004800; D_03005000 = 0x03005000;