diff --git a/src/overlay_145210/vert.c b/src/overlay_145210/vert.c index aca7349..30ed544 100644 --- a/src/overlay_145210/vert.c +++ b/src/overlay_145210/vert.c @@ -4,7 +4,7 @@ #include "common.h" /* 14E3E0 801FD200 */ -Vtx __MAYBE_VERTICES_801FD200[] = { +Vtx VTX_801FD200[] = { { -16, 29, 0, 0, 0, 0, 0, 0, 0, 255 }, { -16, 13, 0, 0, 0, 1024, 0, 0, 0, 255 }, { -16, 1, 0, 0, 0, 1792, 0, 0, 0, 0 }, @@ -17,7 +17,7 @@ Vtx __MAYBE_VERTICES_801FD200[] = { /* 14E460 801FD280 */ Gfx DISPLAY_LIST_801FD280[] = { - { 0x01008010, /* __MAYBE_VERTICES_801FD200 */ 0x801FD200 }, + { 0x01008010, /* VTX_801FD200 */ 0x801FD200 }, gsSP1Quadrangle(0, 1, 6, 7, 0), gsSP1Quadrangle(1, 2, 5, 6, 0), gsSP1Quadrangle(2, 3, 4, 5, 0), @@ -25,7 +25,7 @@ Gfx DISPLAY_LIST_801FD280[] = { }; /* 14E488 801FD2A8 */ -Vtx __MAYBE_VERTICES_801FD2A8[] = { +Vtx VTX_801FD2A8[] = { { -16, 29, 0, 0, 1984, 0, 0, 0, 0, 255 }, { -16, 13, 0, 0, 1984, 1024, 0, 0, 0, 255 }, { -16, 1, 0, 0, 1984, 1792, 0, 0, 0, 0 }, @@ -38,8 +38,8 @@ Vtx __MAYBE_VERTICES_801FD2A8[] = { /* 14E508 801FD328 */ Gfx DISPLAY_LIST_801FD328[] = { - { 0x01008010, /* __MAYBE_VERTICES_801FD2A8 */ 0x801FD2A8 }, - // gsSPVertex(__MAYBE_VERTICES_801FD2A8 + 0, 4, 0), + { 0x01008010, /* VTX_801FD2A8 */ 0x801FD2A8 }, + // gsSPVertex(VTX_801FD2A8 + 0, 4, 0), gsSP1Quadrangle(0, 1, 6, 7, 0), gsSP1Quadrangle(1, 2, 5, 6, 0), gsSP1Quadrangle(2, 3, 4, 5, 0), diff --git a/src/overlay_165FC0/data_16FF40.c b/src/overlay_165FC0/data_16FF40.c index a63c520..4d62f8c 100644 --- a/src/overlay_165FC0/data_16FF40.c +++ b/src/overlay_165FC0/data_16FF40.c @@ -18,7 +18,7 @@ u8 D_overlay_165FC0_8021EF05_16FF45 = 0; u16 D_overlay_165FC0_8021EF06_16FF46 = 0; /* 16FF48 8021EF08 */ -Vtx __MAYBE_VERTICES_8021EF08[] = { +Vtx VTX_8021EF08[] = { { 0, 0, -6, 0, 1024, 1024, 96, 96, 84, 255 }, { -4, 4, 6, 0, 1024, 1024, 144, 144, 132, 255 }, { -4, -4, 6, 0, 1024, 1024, 32, 32, 24, 255 }, @@ -48,10 +48,11 @@ Gfx DISPLAY_LIST_8021F058[] = { gsSPDisplayList(DISPLAY_LIST_801869C8), gsDPPipeSync(), gsDPPipeSync(), - { 0xE3000A01, 00000 }, + // { 0xE3000A01, 0 }, + gsSPSetOtherMode(G_SETOTHERMODE_H, 0xa, 1, 0), gsDPPipeSync(), gsSPTexture(0, 0, 0, 0, 0), - { 0xD9000000, 00000 }, + { 0xD9000000, 0 }, { 0xD9FFFFFF, 0x00200405 }, { 0xE200001C, 0x00552078 }, { 0xFCFFFFFF, 0xFFFE793C }, diff --git a/symbol_addrs.txt b/symbol_addrs.txt index 1bd14b0..273ba9f 100644 --- a/symbol_addrs.txt +++ b/symbol_addrs.txt @@ -1,14 +1,15 @@ -__MAYBE_VERTICES_801FD200 = 0x801FD200; // rom:0x14E3E0 -__MAYBE_VERTICES_801FD2A8 = 0x801FD2A8; // rom:0x14E488 __MAYBE_VERTICES_801FD350 = 0x801FD350; // rom:0x14E530 __MAYBE_VERTICES_801FD558 = 0x801FD558; // rom:0x14E738 __MAYBE_VERTICES_801FD600 = 0x801FD600; // rom:0x14E7E0 __MAYBE_VERTICES_801FD790 = 0x801FD790; // rom:0x14E970 __MAYBE_VERTICES_801FD838 = 0x801FD838; // rom:0x14EA18 -__MAYBE_VERTICES_8021EF08 = 0x8021EF08; // rom:0x16FF48 __MAYBE_VERTICES_8021C588 = 0x8021C588; // rom:0x1B9C78 +VTX_801FD200 = 0x801FD200; // rom:0x14E3E0 +VTX_801FD2A8 = 0x801FD2A8; // rom:0x14E488 +VTX_8021EF08 = 0x8021EF08; // rom:0x16FF48 + PTR_DISPLAY_LIST = 0x800E9BA0; DISPLAY_LIST_80186310 = 0x80186310; // rom:0x5C210