From ed42b15988227e4f32858093ad430fee06c5adc5 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 30 Mar 2025 18:43:44 -0400 Subject: Debug build now takes .alf as input instead of .dol (#2360) * Fix debug build * Debug build now takes .alf as input instead of .dol I had to manually remove the following line from symbols.txt for DTK to work: ``` .data = .sbss:0x8074C97C; // type:object size:0x4 scope:local data:byte ``` After that it built OK, and DTK automatically modified all other lines in symbols.txt. * Fix pragma in header messing up debug optimization level --- src/d/d_bright_check.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/d/d_bright_check.cpp') diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index 0b74c294f5..4a717958ae 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -33,13 +33,6 @@ static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -/* 803BB5D4-803BB5EC 0186F4 0018+00 1/2 0/0 0/0 .data brightChackProc */ -typedef void (dBrightCheck_c::*procFunc)(); -static procFunc brightChackProc[] = { - &dBrightCheck_c::modeWait, - &dBrightCheck_c::modeMove, -}; - /* 80192F10-80192F98 18D850 0088+00 0/0 1/1 0/0 .text __ct__14dBrightCheck_cFP10JKRArchive */ dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) { mArchive = i_archive; @@ -126,6 +119,13 @@ void dBrightCheck_c::screenSet() { } } +/* 803BB5D4-803BB5EC 0186F4 0018+00 1/2 0/0 0/0 .data brightChackProc */ +typedef void (dBrightCheck_c::*procFunc)(); +static procFunc brightChackProc[] = { + &dBrightCheck_c::modeWait, + &dBrightCheck_c::modeMove, +}; + /* 801934D0-80193508 18DE10 0038+00 0/0 1/1 0/0 .text _move__14dBrightCheck_cFv */ void dBrightCheck_c::_move() { (this->*brightChackProc[mMode])(); -- cgit v1.2.3