diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-11-17 10:01:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-17 20:01:03 +0200 |
| commit | 540217c31b88246d5c3abd57bb3fbd97cff6d31c (patch) | |
| tree | cc08666dad6a7cd55539168a0d0e3f6bba188488 /src/m_Do/m_Do_machine.cpp | |
| parent | 4350a38fe01fa57890eade52c7c5e3789cce83ac (diff) | |
wii building OK / m_Do_graphic debug work (#2815)
* wii building OK + m_Do_graphic debug work
* d_meter_HIO debug cleanup
* wii m_Do_graphic stuff
* tag_attack_item OK, mirror_chain almost
* fix build
* mg_fshop matching
Diffstat (limited to 'src/m_Do/m_Do_machine.cpp')
| -rw-r--r-- | src/m_Do/m_Do_machine.cpp | 58 |
1 files changed, 56 insertions, 2 deletions
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 38cc4363be..a3c53ef74b 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -63,7 +63,7 @@ static int unknownHeapErrors; /* 80450C0C-80450C10 00010C 0004+00 1/1 0/0 0/0 .sbss heapErrors */ static u32 heapErrors; -#if VERSION != VERSION_GCN_PAL +#if VERSION == VERSION_GCN_USA || VERSION == VERSION_GCN_JPN /* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data g_ntscZeldaIntDf */ GXRenderModeObj g_ntscZeldaIntDf = { VI_TVMODE_NTSC_INT, @@ -119,7 +119,7 @@ GXRenderModeObj g_ntscZeldaProg = { {6, 6}}, {0, 0, 21, 22, 21, 0, 0}, }; -#else +#elif VERSION == VERSION_GCN_PAL /* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data g_ntscZeldaIntDf */ GXRenderModeObj g_ntscZeldaIntDf = { VI_TVMODE_PAL_INT, @@ -175,6 +175,60 @@ GXRenderModeObj g_ntscZeldaProg = { {6, 6}}, {8, 8, 10, 12, 10, 8, 8}, }; +#else +GXRenderModeObj g_ntscZeldaIntDf = { + VI_TVMODE_NTSC_INT, + 640, + 456, + 456, + 25, + 12, + 670, + 456, + VI_XFBMODE_DF, + 0, + 0, + {{6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}}, + {8, 8, 10, 12, 10, 8, 8}, +}; + +GXRenderModeObj g_ntscZeldaProg = { + VI_TVMODE_NTSC_PROG, + 640, + 456, + 456, + 25, + 12, + 670, + 456, + VI_XFBMODE_SF, + 0, + 0, + {{6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}, + {6, 6}}, + {0, 0, 21, 22, 21, 0, 0}, +}; #endif #ifdef DEBUG |