mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-19 05:15:18 +00:00
Code Issues Projects Releases Wiki Activity

MtxClear -> IdentityMtx

Browse source
This commit is contained in:
mzxrules 2025-02-06 18:51:47 -05:00
parent 9061bcf433
commit 8fc74c0672
47 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
baseroms/gc-eu-mq-dbg/config.yml
View file

@ -50,7 +50,7 @@ incbins:
vram: 0x80157D30 vram: 0x80157D30
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x8012DB20 gIdentityMtx: 0x8012DB20
sNesMessageEntryTable: 0x8014B320 sNesMessageEntryTable: 0x8014B320
sGerMessageEntryTable: 0x8014F548 sGerMessageEntryTable: 0x8014F548
sFraMessageEntryTable: 0x80151658 sFraMessageEntryTable: 0x80151658

2
baseroms/gc-eu-mq/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801130D0 vram: 0x801130D0
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FBC00 gIdentityMtx: 0x800FBC00
sNesMessageEntryTable: 0x801077F0 sNesMessageEntryTable: 0x801077F0
sGerMessageEntryTable: 0x8010BA18 sGerMessageEntryTable: 0x8010BA18
sFraMessageEntryTable: 0x8010DB28 sFraMessageEntryTable: 0x8010DB28

2
baseroms/gc-eu/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801130F0 vram: 0x801130F0
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FBC20 gIdentityMtx: 0x800FBC20
sNesMessageEntryTable: 0x80107810 sNesMessageEntryTable: 0x80107810
sGerMessageEntryTable: 0x8010BA38 sGerMessageEntryTable: 0x8010BA38
sFraMessageEntryTable: 0x8010DB48 sFraMessageEntryTable: 0x8010DB48

2
baseroms/gc-jp-ce/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801158E0 vram: 0x801158E0
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FE2A0 gIdentityMtx: 0x800FE2A0
sJpnMessageEntryTable: 0x80109E8C sJpnMessageEntryTable: 0x80109E8C
sNesMessageEntryTable: 0x8010DFCC sNesMessageEntryTable: 0x8010DFCC
sStaffMessageEntryTable: 0x801121EC sStaffMessageEntryTable: 0x801121EC

2
baseroms/gc-jp-mq/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801158E0 vram: 0x801158E0
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FE2A0 gIdentityMtx: 0x800FE2A0
sJpnMessageEntryTable: 0x80109E8C sJpnMessageEntryTable: 0x80109E8C
sNesMessageEntryTable: 0x8010DFCC sNesMessageEntryTable: 0x8010DFCC
sStaffMessageEntryTable: 0x801121EC sStaffMessageEntryTable: 0x801121EC

2
baseroms/gc-jp/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x80115900 vram: 0x80115900
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FE2C0 gIdentityMtx: 0x800FE2C0
sJpnMessageEntryTable: 0x80109EAC sJpnMessageEntryTable: 0x80109EAC
sNesMessageEntryTable: 0x8010DFEC sNesMessageEntryTable: 0x8010DFEC
sStaffMessageEntryTable: 0x8011220C sStaffMessageEntryTable: 0x8011220C

2
baseroms/gc-us-mq/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801158C0 vram: 0x801158C0
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FE280 gIdentityMtx: 0x800FE280
sJpnMessageEntryTable: 0x80109E6C sJpnMessageEntryTable: 0x80109E6C
sNesMessageEntryTable: 0x8010DFAC sNesMessageEntryTable: 0x8010DFAC
sStaffMessageEntryTable: 0x801121CC sStaffMessageEntryTable: 0x801121CC

2
baseroms/gc-us/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x801158E0 vram: 0x801158E0
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FE2A0 gIdentityMtx: 0x800FE2A0
sJpnMessageEntryTable: 0x80109E8C sJpnMessageEntryTable: 0x80109E8C
sNesMessageEntryTable: 0x8010DFCC sNesMessageEntryTable: 0x8010DFCC
sStaffMessageEntryTable: 0x801121EC sStaffMessageEntryTable: 0x801121EC

2
baseroms/ique-cn/config.yml
View file

@ -42,7 +42,7 @@ incbins:
vram: 0x80121EE0 vram: 0x80121EE0
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x80106980 gIdentityMtx: 0x80106980
sJpnMessageEntryTable: 0x80115838 sJpnMessageEntryTable: 0x80115838
sNesMessageEntryTable: 0x80119978 sNesMessageEntryTable: 0x80119978
sStaffMessageEntryTable: 0x8011DB98 sStaffMessageEntryTable: 0x8011DB98

2
baseroms/ntsc-1.0/config.yml
View file

@ -45,7 +45,7 @@ incbins:
vram: 0x80114D70 vram: 0x80114D70
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FEDB0 gIdentityMtx: 0x800FEDB0
sJpnMessageEntryTable: 0x8010A94C sJpnMessageEntryTable: 0x8010A94C
sNesMessageEntryTable: 0x8010EA8C sNesMessageEntryTable: 0x8010EA8C
sStaffMessageEntryTable: 0x80112CAC sStaffMessageEntryTable: 0x80112CAC

2
baseroms/ntsc-1.1/config.yml
View file

@ -45,7 +45,7 @@ incbins:
vram: 0x80114F30 vram: 0x80114F30
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FEF70 gIdentityMtx: 0x800FEF70
sJpnMessageEntryTable: 0x8010AB0C sJpnMessageEntryTable: 0x8010AB0C
sNesMessageEntryTable: 0x8010EC4C sNesMessageEntryTable: 0x8010EC4C
sStaffMessageEntryTable: 0x80112E6C sStaffMessageEntryTable: 0x80112E6C

2
baseroms/ntsc-1.2/config.yml
View file

@ -45,7 +45,7 @@ incbins:
vram: 0x80115420 vram: 0x80115420
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FF3F0 gIdentityMtx: 0x800FF3F0
sJpnMessageEntryTable: 0x8010AFFC sJpnMessageEntryTable: 0x8010AFFC
sNesMessageEntryTable: 0x8010F13C sNesMessageEntryTable: 0x8010F13C
sStaffMessageEntryTable: 0x8011335C sStaffMessageEntryTable: 0x8011335C

2
baseroms/pal-1.0/config.yml
View file

@ -50,7 +50,7 @@ incbins:
vram: 0x80112B70 vram: 0x80112B70
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FCD00 gIdentityMtx: 0x800FCD00
sNesMessageEntryTable: 0x801088BC sNesMessageEntryTable: 0x801088BC
sGerMessageEntryTable: 0x8010CAE4 sGerMessageEntryTable: 0x8010CAE4
sFraMessageEntryTable: 0x8010EBF4 sFraMessageEntryTable: 0x8010EBF4

2
baseroms/pal-1.1/config.yml
View file

@ -50,7 +50,7 @@ incbins:
vram: 0x80112BB0 vram: 0x80112BB0
size: 0x60 size: 0x60
variables: variables:
gMtxClear: 0x800FCD40 gIdentityMtx: 0x800FCD40
sNesMessageEntryTable: 0x801088FC sNesMessageEntryTable: 0x801088FC
sGerMessageEntryTable: 0x8010CB24 sGerMessageEntryTable: 0x8010CB24
sFraMessageEntryTable: 0x8010EC34 sFraMessageEntryTable: 0x8010EC34

4
include/sys_matrix.h
View file

@ -11,8 +11,8 @@ typedef enum MatrixMode {
/* 1 */ MTXMODE_APPLY // applies transformation to the current matrix /* 1 */ MTXMODE_APPLY // applies transformation to the current matrix
} MatrixMode; } MatrixMode;
extern Mtx gMtxClear; extern Mtx gIdentityMtx;
extern MtxF gMtxFClear; extern MtxF gIdentityMtxF;
/* Stack operations */ /* Stack operations */

4
src/code/sys_matrix.c
View file

@ -4,14 +4,14 @@
#endif #endif
// clang-format off // clang-format off
Mtx gMtxClear = gdSPDefMtx( Mtx gIdentityMtx = gdSPDefMtx(
1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f 0.0f, 0.0f, 0.0f, 1.0f
); );
MtxF gMtxFClear = { MtxF gIdentityMtxF = {
1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f,

4
src/code/z_actor.c
View file

@ -2328,8 +2328,8 @@ void Actor_InitContext(PlayState* play, ActorContext* actorCtx, ActorEntry* play
bzero(actorCtx, sizeof(ActorContext)); bzero(actorCtx, sizeof(ActorContext));
ActorOverlayTable_Init(); ActorOverlayTable_Init();
Matrix_MtxFCopy(&play->billboardMtxF, &gMtxFClear); Matrix_MtxFCopy(&play->billboardMtxF, &gIdentityMtxF);
Matrix_MtxFCopy(&play->viewProjectionMtxF, &gMtxFClear); Matrix_MtxFCopy(&play->viewProjectionMtxF, &gIdentityMtxF);
overlayEntry = &gActorOverlayTable[0]; overlayEntry = &gActorOverlayTable[0];
for (i = 0; i < ARRAY_COUNT(gActorOverlayTable); i++) { for (i = 0; i < ARRAY_COUNT(gActorOverlayTable); i++) {

2
src/code/z_collision_check.c
View file

@ -46,7 +46,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC,
OPEN_DISPS(gfxCtx, "../z_collision_check.c", 713); OPEN_DISPS(gfxCtx, "../z_collision_check.c", 713);
gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0xFF, r, g, b, 50); gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0xFF, r, g, b, 50);
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2); gDPSetRenderMode(POLY_OPA_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2);

4
src/code/z_eff_blure.c
View file

@ -805,7 +805,7 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this,
gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(POLY_XLU_DISP++, &vtx[4 * i], 4, 0); gSPVertex(POLY_XLU_DISP++, &vtx[4 * i], 4, 0);
gSP2Triangles(POLY_XLU_DISP++, 0, 1, 3, 0, 0, 3, 2, 0); gSP2Triangles(POLY_XLU_DISP++, 0, 1, 3, 0, 0, 3, 2, 0);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
} }
} }
} }
@ -932,7 +932,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1596); OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1596);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->numElements != 0) { if (this->numElements != 0) {
if (this->flags == 0) { if (this->flags == 0) {

2
src/code/z_eff_spark.c
View file

@ -154,7 +154,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
OPEN_DISPS(gfxCtx, "../z_eff_spark.c", 293); OPEN_DISPS(gfxCtx, "../z_eff_spark.c", 293);
if (this != NULL) { if (this != NULL) {
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_38); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_38);
gDPSetCycleType(POLY_XLU_DISP++, G_CYC_2CYCLE); gDPSetCycleType(POLY_XLU_DISP++, G_CYC_2CYCLE);

2
src/code/z_map_exp.c
View file

@ -356,7 +356,7 @@ void Minimap_DrawCompassIcons(PlayState* play) {
if (play->interfaceCtx.minimapAlpha >= 0xAA) { if (play->interfaceCtx.minimapAlpha >= 0xAA) {
Gfx_SetupDL_42Overlay(play->state.gfxCtx); Gfx_SetupDL_42Overlay(play->state.gfxCtx);
gSPMatrix(OVERLAY_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(OVERLAY_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255); gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255);

2
src/code/z_parameter.c
View file

@ -3429,7 +3429,7 @@ void Interface_Draw(PlayState* play) {
gSPSegment(OVERLAY_DISP++, 0x08, pauseCtx->iconItemSegment); gSPSegment(OVERLAY_DISP++, 0x08, pauseCtx->iconItemSegment);
Gfx_SetupDL_42Overlay(play->state.gfxCtx); Gfx_SetupDL_42Overlay(play->state.gfxCtx);
gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATERGBA_PRIM, G_CC_MODULATERGBA_PRIM); gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATERGBA_PRIM, G_CC_MODULATERGBA_PRIM);
gSPMatrix(OVERLAY_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(OVERLAY_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
// PAUSE_CURSOR_QUAD_4 // PAUSE_CURSOR_QUAD_4
pauseCtx->cursorVtx[16].v.ob[0] = pauseCtx->cursorVtx[18].v.ob[0] = pauseCtx->equipAnimX / 10; pauseCtx->cursorVtx[16].v.ob[0] = pauseCtx->cursorVtx[18].v.ob[0] = pauseCtx->equipAnimX / 10;

16
src/code/z_room.c
View file

@ -49,14 +49,14 @@ void Room_DrawNormal(PlayState* play, Room* room, u32 flags) {
func_800342EC(&D_801270A0, play); func_800342EC(&D_801270A0, play);
gSPSegment(POLY_OPA_DISP++, 0x03, room->segment); gSPSegment(POLY_OPA_DISP++, 0x03, room->segment);
func_80093C80(play); func_80093C80(play);
gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
} }
if (flags & ROOM_DRAW_XLU) { if (flags & ROOM_DRAW_XLU) {
func_8003435C(&D_801270A0, play); func_8003435C(&D_801270A0, play);
gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); gSPSegment(POLY_XLU_DISP++, 0x03, room->segment);
Gfx_SetupDL_25Xlu(play->state.gfxCtx); Gfx_SetupDL_25Xlu(play->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
} }
roomShape = &room->roomShape->normal; roomShape = &room->roomShape->normal;
@ -123,7 +123,7 @@ void Room_DrawCullable(PlayState* play, Room* room, u32 flags) {
func_800342EC(&D_801270A0, play); func_800342EC(&D_801270A0, play);
gSPSegment(POLY_OPA_DISP++, 0x03, room->segment); gSPSegment(POLY_OPA_DISP++, 0x03, room->segment);
func_80093C80(play); func_80093C80(play);
gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
} }
if (1) {} if (1) {}
@ -132,7 +132,7 @@ void Room_DrawCullable(PlayState* play, Room* room, u32 flags) {
func_8003435C(&D_801270A0, play); func_8003435C(&D_801270A0, play);
gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); gSPSegment(POLY_XLU_DISP++, 0x03, room->segment);
Gfx_SetupDL_25Xlu(play->state.gfxCtx); Gfx_SetupDL_25Xlu(play->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
} }
roomShape = &room->roomShape->cullable; roomShape = &room->roomShape->cullable;
@ -391,7 +391,7 @@ void Room_DrawImageSingle(PlayState* play, Room* room, u32 flags) {
if (drawOpa) { if (drawOpa) {
Gfx_SetupDL_25Opa(play->state.gfxCtx); Gfx_SetupDL_25Opa(play->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, entry->opa); gSPDisplayList(POLY_OPA_DISP++, entry->opa);
} }
@ -422,7 +422,7 @@ void Room_DrawImageSingle(PlayState* play, Room* room, u32 flags) {
if (drawXlu) { if (drawXlu) {
gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); gSPSegment(POLY_XLU_DISP++, 0x03, room->segment);
Gfx_SetupDL_25Xlu(play->state.gfxCtx); Gfx_SetupDL_25Xlu(play->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, entry->xlu); gSPDisplayList(POLY_XLU_DISP++, entry->xlu);
} }
@ -500,7 +500,7 @@ void Room_DrawImageMulti(PlayState* play, Room* room, u32 flags) {
if (drawOpa) { if (drawOpa) {
Gfx_SetupDL_25Opa(play->state.gfxCtx); Gfx_SetupDL_25Opa(play->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, dListsEntry->opa); gSPDisplayList(POLY_OPA_DISP++, dListsEntry->opa);
} }
@ -531,7 +531,7 @@ void Room_DrawImageMulti(PlayState* play, Room* room, u32 flags) {
if (drawXlu) { if (drawXlu) {
gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); gSPSegment(POLY_XLU_DISP++, 0x03, room->segment);
Gfx_SetupDL_25Xlu(play->state.gfxCtx); Gfx_SetupDL_25Xlu(play->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, dListsEntry->xlu); gSPDisplayList(POLY_XLU_DISP++, dListsEntry->xlu);
} }

2
src/code/z_skin.c
View file

@ -207,7 +207,7 @@ void Skin_DrawImpl(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postD
skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment); skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment);
if (!(drawFlags & SKIN_DRAW_FLAG_CUSTOM_MATRIX)) { if (!(drawFlags & SKIN_DRAW_FLAG_CUSTOM_MATRIX)) {
gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &skin->mtx); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &skin->mtx);
if (mtx == NULL) { if (mtx == NULL) {

2
src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
View file

@ -244,7 +244,7 @@ void BgHidanRsekizou_Draw(Actor* thisx, PlayState* play) {
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 568); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 568);
gSPDisplayList(POLY_OPA_DISP++, gFireTempleSpinningFlamethrowerDL); gSPDisplayList(POLY_OPA_DISP++, gFireTempleSpinningFlamethrowerDL);
Matrix_MtxFCopy(&mf, &gMtxFClear); Matrix_MtxFCopy(&mf, &gIdentityMtxF);
POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_20); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_20);

2
src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
View file

@ -360,7 +360,7 @@ Gfx* func_8088DC50(PlayState* play, BgHidanSekizou* this, s16 arg2, s16 arg3, Gf
} }
temp_f20 = Math_SinS(arg2); temp_f20 = Math_SinS(arg2);
temp_f22 = Math_CosS(arg2); temp_f22 = Math_CosS(arg2);
Matrix_MtxFCopy(&sp68, &gMtxFClear); Matrix_MtxFCopy(&sp68, &gIdentityMtxF);
temp_v1 = Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) - arg2; temp_v1 = Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) - arg2;
if (ABS(temp_v1) < 0x4000) { if (ABS(temp_v1) < 0x4000) {

2
src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
View file

@ -233,7 +233,7 @@ Gfx* func_8088EB54(PlayState* play, BgHidanSima* this, Gfx* gfx) {
f32 sin; f32 sin;
s32 pad[2]; s32 pad[2];
Matrix_MtxFCopy(&mtxF, &gMtxFClear); Matrix_MtxFCopy(&mtxF, &gIdentityMtxF);
cos = Math_CosS(this->dyna.actor.world.rot.y + 0x8000); cos = Math_CosS(this->dyna.actor.world.rot.y + 0x8000);
sin = Math_SinS(this->dyna.actor.world.rot.y + 0x8000); sin = Math_SinS(this->dyna.actor.world.rot.y + 0x8000);

2
src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
View file

@ -706,7 +706,7 @@ void EnHorseNormal_Draw(Actor* thisx, PlayState* play2) {
if (mtx == NULL) { if (mtx == NULL) {
return; return;
} }
gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(POLY_OPA_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_800A63CC(&this->actor, play, &this->skin, NULL, NULL, true, 0, func_800A63CC(&this->actor, play, &this->skin, NULL, NULL, true, 0,
SKIN_DRAW_FLAG_CUSTOM_TRANSFORMS | SKIN_DRAW_FLAG_CUSTOM_MATRIX); SKIN_DRAW_FLAG_CUSTOM_TRANSFORMS | SKIN_DRAW_FLAG_CUSTOM_MATRIX);

2
src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
View file

@ -67,7 +67,7 @@ void EffectSsBomb_Draw(PlayState* play, u32 index, EffectSs* this) {
SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard); SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard);
SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfScale, &mfResult); SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfScale, &mfResult);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult);

2
src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
View file

@ -96,7 +96,7 @@ void EffectSsDust_Draw(PlayState* play, u32 index, EffectSs* this) {
SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f);
SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard); SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard);
SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfScale, &mfResult); SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfScale, &mfResult);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult);

2
src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
View file

@ -87,7 +87,7 @@ void EffectSsHitMark_Draw(PlayState* play, u32 index, EffectSs* this) {
SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f); SkinMatrix_SetScale(&mfScale, scale, scale, 1.0f);
SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard); SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard);
SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfScale, &mfResult); SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfScale, &mfResult);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult);

2
src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
View file

@ -97,7 +97,7 @@ void EffectSsKiraKira_Draw(PlayState* play, u32 index, EffectSs* this) {
SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard); SkinMatrix_MtxFMtxFMult(&mfTrans, &play->billboardMtxF, &mfTransBillboard);
SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfRotY, &mfTransBillboardRotY); SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfRotY, &mfTransBillboardRotY);
SkinMatrix_MtxFMtxFMult(&mfTransBillboardRotY, &mfScale, &mfResult); SkinMatrix_MtxFMtxFMult(&mfTransBillboardRotY, &mfScale, &mfResult);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult);

2
src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
View file

@ -100,7 +100,7 @@ void EffectSsLightning_Draw(PlayState* play, u32 index, EffectSs* this) {
SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfRotate, &mfTransBillboardRotate); SkinMatrix_MtxFMtxFMult(&mfTransBillboard, &mfRotate, &mfTransBillboardRotate);
SkinMatrix_MtxFMtxFMult(&mfTransBillboardRotate, &mfScale, &mfResult); SkinMatrix_MtxFMtxFMult(&mfTransBillboardRotate, &mfScale, &mfResult);
gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult); mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &mfResult);

2
tools/ZAPDConfigs/gc-eu-mq-dbg/SymbolMap.txt
View file

@ -1,2 +1,2 @@
8012DB20 gMtxClear 8012DB20 gIdentityMtx
80A8E610 sShadowTex 80A8E610 sShadowTex

2
tools/ZAPDConfigs/gc-eu-mq/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FBC00 gMtxClear 800FBC00 gIdentityMtx
80A72FA0 sShadowTex 80A72FA0 sShadowTex

2
tools/ZAPDConfigs/gc-eu/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FBC20 gMtxClear 800FBC20 gIdentityMtx
80A73020 sShadowTex 80A73020 sShadowTex

2
tools/ZAPDConfigs/gc-jp-ce/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FE2A0 gMtxClear 800FE2A0 gIdentityMtx
80A74120 sShadowTex 80A74120 sShadowTex

2
tools/ZAPDConfigs/gc-jp-mq/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FE2A0 gMtxClear 800FE2A0 gIdentityMtx
80A740D0 sShadowTex 80A740D0 sShadowTex

2
tools/ZAPDConfigs/gc-jp/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FE2C0 gMtxClear 800FE2C0 gIdentityMtx
80A74150 sShadowTex 80A74150 sShadowTex

2
tools/ZAPDConfigs/gc-us-mq/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FE280 gMtxClear 800FE280 gIdentityMtx
80A740B0 sShadowTex 80A740B0 sShadowTex

2
tools/ZAPDConfigs/gc-us/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FE2A0 gMtxClear 800FE2A0 gIdentityMtx
80A74130 sShadowTex 80A74130 sShadowTex

2
tools/ZAPDConfigs/ique-cn/SymbolMap.txt
View file

@ -1,2 +1,2 @@
80106980 gMtxClear 80106980 gIdentityMtx
80AE0B10 sShadowTex 80AE0B10 sShadowTex

2
tools/ZAPDConfigs/ntsc-1.0/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FEDB0 gMtxClear 800FEDB0 gIdentityMtx
80AE0AE0 sShadowTex 80AE0AE0 sShadowTex

2
tools/ZAPDConfigs/ntsc-1.1/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FEF70 gMtxClear 800FEF70 gIdentityMtx
80AE0C80 sShadowTex 80AE0C80 sShadowTex

2
tools/ZAPDConfigs/ntsc-1.2/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FF3F0 gMtxClear 800FF3F0 gIdentityMtx
80AE0FE0 sShadowTex 80AE0FE0 sShadowTex

2
tools/ZAPDConfigs/pal-1.0/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FCD00 gMtxClear 800FCD00 gIdentityMtx
80AE19F0 sShadowTex 80AE19F0 sShadowTex

2
tools/ZAPDConfigs/pal-1.1/SymbolMap.txt
View file

@ -1,2 +1,2 @@
800FCD40 gMtxClear 800FCD40 gIdentityMtx
80AE1B80 sShadowTex 80AE1B80 sShadowTex