diff --git a/config/DZDE01/splits.txt b/config/DZDE01/splits.txt index f5668da27b..246234ac2d 100644 --- a/config/DZDE01/splits.txt +++ b/config/DZDE01/splits.txt @@ -1116,17 +1116,17 @@ d/d_meter_HIO.cpp: .text start:0x801DE3F0 end:0x801E1790 .ctors start:0x80396184 end:0x80396188 .rodata start:0x803B4BF0 end:0x803B4DE8 - .data start:0x803DDF10 end:0x803DE28C + .data start:0x803DDF10 end:0x803DE208 .bss start:0x8047D018 end:0x8047E5C0 - .sdata start:0x804F95B8 end:0x804F9640 + .sdata start:0x804F95B8 end:0x804F9638 .sbss start:0x804FAF38 end:0x804FAF40 .sdata2 start:0x804FE448 end:0x804FE6E0 d/d_meter_button.cpp: .text start:0x801E1790 end:0x801EBD60 .rodata start:0x803B4DE8 end:0x803B4F48 - .data start:0x803DE28C end:0x803DE368 - .sdata start:0x804F9640 end:0x804F9648 + .data start:0x803DE208 end:0x803DE368 + .sdata start:0x804F9638 end:0x804F9648 .sdata2 start:0x804FE6E0 end:0x804FE760 d/d_meter_haihai.cpp: diff --git a/config/DZDE01/symbols.txt b/config/DZDE01/symbols.txt index dc48985ffa..e87ce1993a 100644 --- a/config/DZDE01/symbols.txt +++ b/config/DZDE01/symbols.txt @@ -21504,57 +21504,57 @@ g_profile_MENUWINDOW = .data:0x803DDEC0; // type:object size:0x28 scope:global a __vt__20dDlst_MENU_CAPTURE_c = .data:0x803DDEE8; // type:object size:0x10 scope:global align:4 lbl_803DDEF8 = .data:0x803DDEF8; // type:object size:0x15 data:string __vt__18dMeter_cursorHIO_c = .data:0x803DDF10; // type:object size:0xC scope:global align:4 -lbl_803DDF1C = .data:0x803DDF1C; // type:object size:0x13 data:string +@91717 = .data:0x803DDF1C; // type:object size:0x13 data:string @91718 = .data:0x803DDF30; // type:object size:0xC scope:local align:4 __vt__16dMeter_fmapHIO_c = .data:0x803DDF3C; // type:object size:0xC scope:global align:4 -lbl_803DDF48 = .data:0x803DDF48; // type:object size:0x11 data:string +@91719 = .data:0x803DDF48; // type:object size:0x11 data:string @91720 = .data:0x803DDF5C; // type:object size:0xC scope:local align:4 __vt__19dMeter_mapIconHIO_c = .data:0x803DDF68; // type:object size:0xC scope:global align:4 -lbl_803DDF74 = .data:0x803DDF74; // type:object size:0x14 data:string +@91721 = .data:0x803DDF74; // type:object size:0x14 data:string @91722 = .data:0x803DDF88; // type:object size:0xC scope:local align:4 __vt__16dMeter_ringHIO_c = .data:0x803DDF94; // type:object size:0xC scope:global align:4 -lbl_803DDFA0 = .data:0x803DDFA0; // type:object size:0x11 data:string +@91723 = .data:0x803DDFA0; // type:object size:0x11 data:string @91724 = .data:0x803DDFB4; // type:object size:0xC scope:local align:4 __vt__16dMeter_drawHIO_c = .data:0x803DDFC0; // type:object size:0xC scope:global align:4 -lbl_803DDFCC = .data:0x803DDFCC; // type:object size:0x11 data:string +@91725 = .data:0x803DDFCC; // type:object size:0x11 data:string @91726 = .data:0x803DDFE0; // type:object size:0xC scope:local align:4 __vt__25dMeter_drawLightDropHIO_c = .data:0x803DDFEC; // type:object size:0xC scope:global align:4 -lbl_803DDFF8 = .data:0x803DDFF8; // type:object size:0x1A data:string +@91727 = .data:0x803DDFF8; // type:object size:0x1A data:string @91728 = .data:0x803DE014; // type:object size:0xC scope:local align:4 __vt__24dMeter_drawMiniGameHIO_c = .data:0x803DE020; // type:object size:0xC scope:global align:4 -lbl_803DE02C = .data:0x803DE02C; // type:object size:0x19 data:string +@91729 = .data:0x803DE02C; // type:object size:0x19 data:string @91730 = .data:0x803DE048; // type:object size:0xC scope:local align:4 __vt__25dMeter_drawEmpButtonHIO_c = .data:0x803DE054; // type:object size:0xC scope:global align:4 -lbl_803DE060 = .data:0x803DE060; // type:object size:0x1A data:string +@91731 = .data:0x803DE060; // type:object size:0x1A data:string @91732 = .data:0x803DE07C; // type:object size:0xC scope:local align:4 __vt__21dMeter_drawSkillHIO_c = .data:0x803DE088; // type:object size:0xC scope:global align:4 -lbl_803DE094 = .data:0x803DE094; // type:object size:0x16 data:string +@91733 = .data:0x803DE094; // type:object size:0x16 data:string @91734 = .data:0x803DE0AC; // type:object size:0xC scope:local align:4 __vt__27dMeter_drawCalibrationHIO_c = .data:0x803DE0B8; // type:object size:0xC scope:global align:4 -lbl_803DE0C4 = .data:0x803DE0C4; // type:object size:0x1C data:string +@91735 = .data:0x803DE0C4; // type:object size:0x1C data:string @91736 = .data:0x803DE0E0; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawInsectHIO_c = .data:0x803DE0EC; // type:object size:0xC scope:global align:4 -lbl_803DE0F8 = .data:0x803DE0F8; // type:object size:0x17 data:string +@91737 = .data:0x803DE0F8; // type:object size:0x17 data:string @91738 = .data:0x803DE110; // type:object size:0xC scope:local align:4 __vt__23dMeter_drawFishingHIO_c = .data:0x803DE11C; // type:object size:0xC scope:global align:4 -lbl_803DE128 = .data:0x803DE128; // type:object size:0x18 data:string +@91739 = .data:0x803DE128; // type:object size:0x18 data:string @91740 = .data:0x803DE140; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawLetterHIO_c = .data:0x803DE14C; // type:object size:0xC scope:global align:4 -lbl_803DE158 = .data:0x803DE158; // type:object size:0x17 data:string +@91741 = .data:0x803DE158; // type:object size:0x17 data:string @91742 = .data:0x803DE170; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawOptionHIO_c = .data:0x803DE17C; // type:object size:0xC scope:global align:4 -lbl_803DE188 = .data:0x803DE188; // type:object size:0x17 data:string +@91743 = .data:0x803DE188; // type:object size:0x17 data:string @91744 = .data:0x803DE1A0; // type:object size:0xC scope:local align:4 __vt__23dMeter_drawCollectHIO_c = .data:0x803DE1AC; // type:object size:0xC scope:global align:4 -lbl_803DE1B8 = .data:0x803DE1B8; // type:object size:0x18 data:string +@91745 = .data:0x803DE1B8; // type:object size:0x18 data:string @91746 = .data:0x803DE1D0; // type:object size:0xC scope:local align:4 __vt__16dMeter_menuHIO_c = .data:0x803DE1DC; // type:object size:0xC scope:global align:4 -lbl_803DE1E8 = .data:0x803DE1E8; // type:object size:0x11 data:string +@91747 = .data:0x803DE1E8; // type:object size:0x11 data:string @91748 = .data:0x803DE1FC; // type:object size:0xC scope:local align:4 -lbl_803DE208 = .data:0x803DE208; // type:object size:0x26 data:string -lbl_803DE22E = .data:0x803DE22E; // type:object size:0x1C data:string -lbl_803DE24A = .data:0x803DE24A; // type:object size:0x22 data:string -lbl_803DE26C = .data:0x803DE26C; // type:object size:0x1E data:string +@61965 = .data:0x803DE208; // type:object size:0x26 data:string +@61059 = .data:0x803DE22E; // type:object size:0x1C data:string +@61060 = .data:0x803DE24A; // type:object size:0x22 data:string +@61061 = .data:0x803DE26C; // type:object size:0x1E data:string @111616 = .data:0x803DE28C; // type:object size:0x58 scope:local align:4 @111732 = .data:0x803DE2E4; // type:object size:0x58 scope:local align:4 __vt__14dMeterButton_c = .data:0x803DE33C; // type:object size:0x10 scope:global align:4 @@ -25989,8 +25989,8 @@ __RTTI__22dMeter_drawLetterHIO_c = .sdata:0x804F9618; // type:object size:0x8 sc __RTTI__22dMeter_drawOptionHIO_c = .sdata:0x804F9620; // type:object size:0x8 scope:global align:4 __RTTI__23dMeter_drawCollectHIO_c = .sdata:0x804F9628; // type:object size:0x8 scope:global align:4 __RTTI__16dMeter_menuHIO_c = .sdata:0x804F9630; // type:object size:0x8 scope:global align:4 -lbl_804F9638 = .sdata:0x804F9638; // type:object size:0x1 -lbl_804F9639 = .sdata:0x804F9639; // type:object size:0x7 data:string +@60968 = .sdata:0x804F9638; // type:object size:0x1 +@61186 = .sdata:0x804F9639; // type:object size:0x7 data:string __RTTI__14dMeterButton_c = .sdata:0x804F9640; // type:object size:0x8 scope:global align:4 __RTTI__14dMeterHaihai_c = .sdata:0x804F9648; // type:object size:0x8 scope:global align:4 lbl_804F9650 = .sdata:0x804F9650; // type:object size:0x7 data:string @@ -27273,7 +27273,7 @@ l_bloObj = .sbss:0x804FAF24; // type:object size:0x4 scope:local align:4 data:4b l_anmCsr = .sbss:0x804FAF28; // type:object size:0x4 scope:local align:4 data:4byte l_bloCsr = .sbss:0x804FAF2C; // type:object size:0x4 scope:local align:4 data:4byte l_bloObj = .sbss:0x804FAF30; // type:object size:0x4 scope:local align:4 data:4byte -g_menuHIO = .sbss:0x804FAF38; // type:object size:0x8 scope:local align:4 +g_menuHIO = .sbss:0x804FAF38; // type:object size:0x8 scope:global align:4 l_baseCsr = .sbss:0x804FAF40; // type:object size:0x4 scope:local align:4 data:4byte l_bloCsr = .sbss:0x804FAF44; // type:object size:0x4 scope:local align:4 data:4byte l_bloObj = .sbss:0x804FAF48; // type:object size:0x4 scope:local align:4 data:4byte diff --git a/config/RZDE01_00/splits.txt b/config/RZDE01_00/splits.txt index 91b5253b81..d53c57b657 100644 --- a/config/RZDE01_00/splits.txt +++ b/config/RZDE01_00/splits.txt @@ -1114,17 +1114,17 @@ d/d_meter_HIO.cpp: .text start:0x801E3D2C end:0x801E7F6C .ctors start:0x803CE2BC end:0x803CE2C0 .rodata start:0x803ECC38 end:0x803ECE30 - .data start:0x80416338 end:0x804166B4 - .bss start:0x804BB5C0 end:0x804BCB68 - .sdata start:0x805392C0 end:0x80539348 + .data start:0x80416338 end:0x80416630 + .bss start:0x804BB5C0 end:0x804BCB48 + .sdata start:0x805392C0 end:0x80539340 .sbss start:0x8053AD78 end:0x8053AD80 .sdata2 start:0x8053E350 end:0x8053E5E8 d/d_meter_button.cpp: .text start:0x801E7F6C end:0x801F2544 .rodata start:0x803ECE30 end:0x803ECF90 - .data start:0x804166B4 end:0x80416790 - .sdata start:0x80539348 end:0x80539350 + .data start:0x80416630 end:0x80416790 + .sdata start:0x80539340 end:0x80539350 .sdata2 start:0x8053E5E8 end:0x8053E668 d/d_meter_haihai.cpp: @@ -1155,6 +1155,7 @@ d/d_meter2_draw.cpp: .text start:0x801F6B8C end:0x8020602C .rodata start:0x803ECF90 end:0x803ED748 .data start:0x80416A38 end:0x80417114 + .bss start:0x804BCB48 end:0x804BCB68 .sdata start:0x80539394 end:0x805393B0 .sbss start:0x8053AD80 end:0x8053ADB0 .sdata2 start:0x8053E748 end:0x8053E870 diff --git a/config/RZDE01_00/symbols.txt b/config/RZDE01_00/symbols.txt index e4bc58fd9b..5ad63ebfc2 100644 --- a/config/RZDE01_00/symbols.txt +++ b/config/RZDE01_00/symbols.txt @@ -22047,57 +22047,57 @@ g_profile_MENUWINDOW = .data:0x804162E8; // type:object size:0x28 scope:global a __vt__20dDlst_MENU_CAPTURE_c = .data:0x80416310; // type:object size:0x10 scope:global align:4 lbl_80416320 = .data:0x80416320; // type:object size:0x15 data:string __vt__18dMeter_cursorHIO_c = .data:0x80416338; // type:object size:0xC scope:global align:4 -lbl_80416344 = .data:0x80416344; // type:object size:0x13 data:string +@91717 = .data:0x80416344; // type:object size:0x13 data:string @91718 = .data:0x80416358; // type:object size:0xC scope:local align:4 __vt__16dMeter_fmapHIO_c = .data:0x80416364; // type:object size:0xC scope:global align:4 -lbl_80416370 = .data:0x80416370; // type:object size:0x11 data:string +@91719 = .data:0x80416370; // type:object size:0x11 data:string @91720 = .data:0x80416384; // type:object size:0xC scope:local align:4 __vt__19dMeter_mapIconHIO_c = .data:0x80416390; // type:object size:0xC scope:global align:4 -lbl_8041639C = .data:0x8041639C; // type:object size:0x14 data:string +@91721 = .data:0x8041639C; // type:object size:0x14 data:string @91722 = .data:0x804163B0; // type:object size:0xC scope:local align:4 __vt__16dMeter_ringHIO_c = .data:0x804163BC; // type:object size:0xC scope:global align:4 -lbl_804163C8 = .data:0x804163C8; // type:object size:0x11 data:string +@91723 = .data:0x804163C8; // type:object size:0x11 data:string @91724 = .data:0x804163DC; // type:object size:0xC scope:local align:4 __vt__16dMeter_drawHIO_c = .data:0x804163E8; // type:object size:0xC scope:global align:4 -lbl_804163F4 = .data:0x804163F4; // type:object size:0x11 data:string +@91725 = .data:0x804163F4; // type:object size:0x11 data:string @91726 = .data:0x80416408; // type:object size:0xC scope:local align:4 __vt__25dMeter_drawLightDropHIO_c = .data:0x80416414; // type:object size:0xC scope:global align:4 -lbl_80416420 = .data:0x80416420; // type:object size:0x1A data:string +@91727 = .data:0x80416420; // type:object size:0x1A data:string @91728 = .data:0x8041643C; // type:object size:0xC scope:local align:4 __vt__24dMeter_drawMiniGameHIO_c = .data:0x80416448; // type:object size:0xC scope:global align:4 -lbl_80416454 = .data:0x80416454; // type:object size:0x19 data:string +@91729 = .data:0x80416454; // type:object size:0x19 data:string @91730 = .data:0x80416470; // type:object size:0xC scope:local align:4 __vt__25dMeter_drawEmpButtonHIO_c = .data:0x8041647C; // type:object size:0xC scope:global align:4 -lbl_80416488 = .data:0x80416488; // type:object size:0x1A data:string +@91731 = .data:0x80416488; // type:object size:0x1A data:string @91732 = .data:0x804164A4; // type:object size:0xC scope:local align:4 __vt__21dMeter_drawSkillHIO_c = .data:0x804164B0; // type:object size:0xC scope:global align:4 -lbl_804164BC = .data:0x804164BC; // type:object size:0x16 data:string +@91733 = .data:0x804164BC; // type:object size:0x16 data:string @91734 = .data:0x804164D4; // type:object size:0xC scope:local align:4 __vt__27dMeter_drawCalibrationHIO_c = .data:0x804164E0; // type:object size:0xC scope:global align:4 -lbl_804164EC = .data:0x804164EC; // type:object size:0x1C data:string +@91735 = .data:0x804164EC; // type:object size:0x1C data:string @91736 = .data:0x80416508; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawInsectHIO_c = .data:0x80416514; // type:object size:0xC scope:global align:4 -lbl_80416520 = .data:0x80416520; // type:object size:0x17 data:string +@91737 = .data:0x80416520; // type:object size:0x17 data:string @91738 = .data:0x80416538; // type:object size:0xC scope:local align:4 __vt__23dMeter_drawFishingHIO_c = .data:0x80416544; // type:object size:0xC scope:global align:4 -lbl_80416550 = .data:0x80416550; // type:object size:0x18 data:string +@91739 = .data:0x80416550; // type:object size:0x18 data:string @91740 = .data:0x80416568; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawLetterHIO_c = .data:0x80416574; // type:object size:0xC scope:global align:4 -lbl_80416580 = .data:0x80416580; // type:object size:0x17 data:string +@91741 = .data:0x80416580; // type:object size:0x17 data:string @91742 = .data:0x80416598; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawOptionHIO_c = .data:0x804165A4; // type:object size:0xC scope:global align:4 -lbl_804165B0 = .data:0x804165B0; // type:object size:0x17 data:string +@91743 = .data:0x804165B0; // type:object size:0x17 data:string @91744 = .data:0x804165C8; // type:object size:0xC scope:local align:4 __vt__23dMeter_drawCollectHIO_c = .data:0x804165D4; // type:object size:0xC scope:global align:4 -lbl_804165E0 = .data:0x804165E0; // type:object size:0x18 data:string +@91745 = .data:0x804165E0; // type:object size:0x18 data:string @91746 = .data:0x804165F8; // type:object size:0xC scope:local align:4 __vt__16dMeter_menuHIO_c = .data:0x80416604; // type:object size:0xC scope:global align:4 -lbl_80416610 = .data:0x80416610; // type:object size:0x11 data:string +@91747 = .data:0x80416610; // type:object size:0x11 data:string @91748 = .data:0x80416624; // type:object size:0xC scope:local align:4 -lbl_80416630 = .data:0x80416630; // type:object size:0x26 data:string -lbl_80416656 = .data:0x80416656; // type:object size:0x1C data:string -lbl_80416672 = .data:0x80416672; // type:object size:0x22 data:string -lbl_80416694 = .data:0x80416694; // type:object size:0x1E data:string +@61965 = .data:0x80416630; // type:object size:0x26 data:string +@61059 = .data:0x80416656; // type:object size:0x1C data:string +@61060 = .data:0x80416672; // type:object size:0x22 data:string +@61061 = .data:0x80416694; // type:object size:0x1E data:string @111549 = .data:0x804166B4; // type:object size:0x58 scope:local align:4 @111665 = .data:0x8041670C; // type:object size:0x58 scope:local align:4 __vt__14dMeterButton_c = .data:0x80416764; // type:object size:0x10 scope:global align:4 @@ -27112,8 +27112,8 @@ __RTTI__22dMeter_drawLetterHIO_c = .sdata:0x80539320; // type:object size:0x8 sc __RTTI__22dMeter_drawOptionHIO_c = .sdata:0x80539328; // type:object size:0x8 scope:global align:4 __RTTI__23dMeter_drawCollectHIO_c = .sdata:0x80539330; // type:object size:0x8 scope:global align:4 __RTTI__16dMeter_menuHIO_c = .sdata:0x80539338; // type:object size:0x8 scope:global align:4 -lbl_80539340 = .sdata:0x80539340; // type:object size:0x1 -lbl_80539341 = .sdata:0x80539341; // type:object size:0x7 data:string +@60968 = .sdata:0x80539340; // type:object size:0x1 +@61186 = .sdata:0x80539341; // type:object size:0x7 data:string __RTTI__14dMeterButton_c = .sdata:0x80539348; // type:object size:0x8 scope:global align:4 __RTTI__14dMeterHaihai_c = .sdata:0x80539350; // type:object size:0x8 scope:global align:4 lbl_80539358 = .sdata:0x80539358; // type:object size:0x7 data:string diff --git a/config/RZDE01_02/splits.txt b/config/RZDE01_02/splits.txt index 04bbe0ec65..1156713d7c 100644 --- a/config/RZDE01_02/splits.txt +++ b/config/RZDE01_02/splits.txt @@ -1114,17 +1114,17 @@ d/d_meter_HIO.cpp: .text start:0x801E3450 end:0x801E76E4 .ctors start:0x803B8D00 end:0x803B8D04 .rodata start:0x803D8238 end:0x803D8430 - .data start:0x80401678 end:0x804019F4 - .bss start:0x804A2BC8 end:0x804A4190 - .sdata start:0x8051F360 end:0x8051F3E8 + .data start:0x80401678 end:0x80401970 + .bss start:0x804A2BC8 end:0x804A4170 + .sdata start:0x8051F360 end:0x8051F3E0 .sbss start:0x80520D90 end:0x80520D98 .sdata2 start:0x80524368 end:0x80524610 d/d_meter_button.cpp: .text start:0x801E76E4 end:0x801F1CB4 .rodata start:0x803D8430 end:0x803D8590 - .data start:0x804019F4 end:0x80401AD0 - .sdata start:0x8051F3E8 end:0x8051F3F0 + .data start:0x80401970 end:0x80401AD0 + .sdata start:0x8051F3E0 end:0x8051F3F0 .sdata2 start:0x80524610 end:0x80524690 d/d_meter_haihai.cpp: @@ -1155,6 +1155,7 @@ d/d_meter2_draw.cpp: .text start:0x801F62FC end:0x80205824 .rodata start:0x803D8590 end:0x803D8D48 .data start:0x80401D78 end:0x80402454 + .bss start:0x804A4170 end:0x804A4190 .sdata start:0x8051F434 end:0x8051F450 .sbss start:0x80520D98 end:0x80520DC8 .sdata2 start:0x80524770 end:0x80524898 diff --git a/config/RZDE01_02/symbols.txt b/config/RZDE01_02/symbols.txt index 9822431b82..60296e79e7 100644 --- a/config/RZDE01_02/symbols.txt +++ b/config/RZDE01_02/symbols.txt @@ -21988,57 +21988,57 @@ g_profile_MENUWINDOW = .data:0x80401628; // type:object size:0x28 scope:global a __vt__20dDlst_MENU_CAPTURE_c = .data:0x80401650; // type:object size:0x10 scope:global align:4 lbl_80401660 = .data:0x80401660; // type:object size:0x15 data:string __vt__18dMeter_cursorHIO_c = .data:0x80401678; // type:object size:0xC scope:global align:4 -lbl_80401684 = .data:0x80401684; // type:object size:0x13 data:string +@91717 = .data:0x80401684; // type:object size:0x13 data:string @91718 = .data:0x80401698; // type:object size:0xC scope:local align:4 __vt__16dMeter_fmapHIO_c = .data:0x804016A4; // type:object size:0xC scope:global align:4 -lbl_804016B0 = .data:0x804016B0; // type:object size:0x11 data:string +@91719 = .data:0x804016B0; // type:object size:0x11 data:string @91720 = .data:0x804016C4; // type:object size:0xC scope:local align:4 __vt__19dMeter_mapIconHIO_c = .data:0x804016D0; // type:object size:0xC scope:global align:4 -lbl_804016DC = .data:0x804016DC; // type:object size:0x14 data:string +@91721 = .data:0x804016DC; // type:object size:0x14 data:string @91722 = .data:0x804016F0; // type:object size:0xC scope:local align:4 __vt__16dMeter_ringHIO_c = .data:0x804016FC; // type:object size:0xC scope:global align:4 -lbl_80401708 = .data:0x80401708; // type:object size:0x11 data:string +@91723 = .data:0x80401708; // type:object size:0x11 data:string @91724 = .data:0x8040171C; // type:object size:0xC scope:local align:4 __vt__16dMeter_drawHIO_c = .data:0x80401728; // type:object size:0xC scope:global align:4 -lbl_80401734 = .data:0x80401734; // type:object size:0x11 data:string +@91725 = .data:0x80401734; // type:object size:0x11 data:string @91726 = .data:0x80401748; // type:object size:0xC scope:local align:4 __vt__25dMeter_drawLightDropHIO_c = .data:0x80401754; // type:object size:0xC scope:global align:4 -lbl_80401760 = .data:0x80401760; // type:object size:0x1A data:string +@91727 = .data:0x80401760; // type:object size:0x1A data:string @91728 = .data:0x8040177C; // type:object size:0xC scope:local align:4 __vt__24dMeter_drawMiniGameHIO_c = .data:0x80401788; // type:object size:0xC scope:global align:4 -lbl_80401794 = .data:0x80401794; // type:object size:0x19 data:string +@91729 = .data:0x80401794; // type:object size:0x19 data:string @91730 = .data:0x804017B0; // type:object size:0xC scope:local align:4 __vt__25dMeter_drawEmpButtonHIO_c = .data:0x804017BC; // type:object size:0xC scope:global align:4 -lbl_804017C8 = .data:0x804017C8; // type:object size:0x1A data:string +@91731 = .data:0x804017C8; // type:object size:0x1A data:string @91732 = .data:0x804017E4; // type:object size:0xC scope:local align:4 __vt__21dMeter_drawSkillHIO_c = .data:0x804017F0; // type:object size:0xC scope:global align:4 -lbl_804017FC = .data:0x804017FC; // type:object size:0x16 data:string +@91733 = .data:0x804017FC; // type:object size:0x16 data:string @91734 = .data:0x80401814; // type:object size:0xC scope:local align:4 __vt__27dMeter_drawCalibrationHIO_c = .data:0x80401820; // type:object size:0xC scope:global align:4 -lbl_8040182C = .data:0x8040182C; // type:object size:0x1C data:string +@91735 = .data:0x8040182C; // type:object size:0x1C data:string @91736 = .data:0x80401848; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawInsectHIO_c = .data:0x80401854; // type:object size:0xC scope:global align:4 -lbl_80401860 = .data:0x80401860; // type:object size:0x17 data:string +@91737 = .data:0x80401860; // type:object size:0x17 data:string @91738 = .data:0x80401878; // type:object size:0xC scope:local align:4 __vt__23dMeter_drawFishingHIO_c = .data:0x80401884; // type:object size:0xC scope:global align:4 -lbl_80401890 = .data:0x80401890; // type:object size:0x18 data:string +@91739 = .data:0x80401890; // type:object size:0x18 data:string @91740 = .data:0x804018A8; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawLetterHIO_c = .data:0x804018B4; // type:object size:0xC scope:global align:4 -lbl_804018C0 = .data:0x804018C0; // type:object size:0x17 data:string +@91741 = .data:0x804018C0; // type:object size:0x17 data:string @91742 = .data:0x804018D8; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawOptionHIO_c = .data:0x804018E4; // type:object size:0xC scope:global align:4 -lbl_804018F0 = .data:0x804018F0; // type:object size:0x17 data:string +@91743 = .data:0x804018F0; // type:object size:0x17 data:string @91744 = .data:0x80401908; // type:object size:0xC scope:local align:4 __vt__23dMeter_drawCollectHIO_c = .data:0x80401914; // type:object size:0xC scope:global align:4 -lbl_80401920 = .data:0x80401920; // type:object size:0x18 data:string +@91745 = .data:0x80401920; // type:object size:0x18 data:string @91746 = .data:0x80401938; // type:object size:0xC scope:local align:4 __vt__16dMeter_menuHIO_c = .data:0x80401944; // type:object size:0xC scope:global align:4 -lbl_80401950 = .data:0x80401950; // type:object size:0x11 data:string +@91747 = .data:0x80401950; // type:object size:0x11 data:string @91748 = .data:0x80401964; // type:object size:0xC scope:local align:4 -lbl_80401970 = .data:0x80401970; // type:object size:0x26 data:string -lbl_80401996 = .data:0x80401996; // type:object size:0x1C data:string -lbl_804019B2 = .data:0x804019B2; // type:object size:0x22 data:string -lbl_804019D4 = .data:0x804019D4; // type:object size:0x1E data:string +@61965 = .data:0x80401970; // type:object size:0x26 data:string +@61059 = .data:0x80401996; // type:object size:0x1C data:string +@61060 = .data:0x804019B2; // type:object size:0x22 data:string +@61061 = .data:0x804019D4; // type:object size:0x1E data:string @111616 = .data:0x804019F4; // type:object size:0x58 scope:local align:4 @111732 = .data:0x80401A4C; // type:object size:0x58 scope:local align:4 __vt__14dMeterButton_c = .data:0x80401AA4; // type:object size:0x10 scope:global align:4 @@ -26656,8 +26656,8 @@ __RTTI__22dMeter_drawLetterHIO_c = .sdata:0x8051F3C0; // type:object size:0x8 sc __RTTI__22dMeter_drawOptionHIO_c = .sdata:0x8051F3C8; // type:object size:0x8 scope:global align:4 __RTTI__23dMeter_drawCollectHIO_c = .sdata:0x8051F3D0; // type:object size:0x8 scope:global align:4 __RTTI__16dMeter_menuHIO_c = .sdata:0x8051F3D8; // type:object size:0x8 scope:global align:4 -lbl_8051F3E0 = .sdata:0x8051F3E0; // type:object size:0x1 -lbl_8051F3E1 = .sdata:0x8051F3E1; // type:object size:0x7 data:string +@60968 = .sdata:0x8051F3E0; // type:object size:0x1 +@61186 = .sdata:0x8051F3E1; // type:object size:0x7 data:string __RTTI__14dMeterButton_c = .sdata:0x8051F3E8; // type:object size:0x8 scope:global align:4 __RTTI__14dMeterHaihai_c = .sdata:0x8051F3F0; // type:object size:0x8 scope:global align:4 lbl_8051F3F8 = .sdata:0x8051F3F8; // type:object size:0x7 data:string @@ -27955,7 +27955,7 @@ l_bloObj = .sbss:0x80520D7C; // type:object size:0x4 scope:local align:4 data:4b l_anmCsr = .sbss:0x80520D80; // type:object size:0x4 scope:local align:4 data:4byte l_bloCsr = .sbss:0x80520D84; // type:object size:0x4 scope:local align:4 data:4byte l_bloObj = .sbss:0x80520D88; // type:object size:0x4 scope:local align:4 data:4byte -g_menuHIO = .sbss:0x80520D90; // type:object size:0x8 scope:local align:4 +g_menuHIO = .sbss:0x80520D90; // type:object size:0x8 scope:global align:4 l_baseCsr = .sbss:0x80520D98; // type:object size:0x4 scope:local align:4 data:4byte l_bloCsr = .sbss:0x80520D9C; // type:object size:0x4 scope:local align:4 data:4byte l_bloObj = .sbss:0x80520DA0; // type:object size:0x4 scope:local align:4 data:4byte diff --git a/config/RZDJ01/splits.txt b/config/RZDJ01/splits.txt index e5490d1c3f..d72e104765 100644 --- a/config/RZDJ01/splits.txt +++ b/config/RZDJ01/splits.txt @@ -1114,17 +1114,17 @@ d/d_meter_HIO.cpp: .text start:0x801E36C0 end:0x801E795C .ctors start:0x803BA7C0 end:0x803BA7C4 .rodata start:0x803D61B8 end:0x803D63B0 - .data start:0x803FF5C0 end:0x803FF93C + .data start:0x803FF5C0 end:0x803FF8B8 .bss start:0x804A0A48 end:0x804A1FF0 - .sdata start:0x8051D1E0 end:0x8051D268 + .sdata start:0x8051D1E0 end:0x8051D260 .sbss start:0x8051EC00 end:0x8051EC08 .sdata2 start:0x805221C8 end:0x80522478 d/d_meter_button.cpp: .text start:0x801E795C end:0x801F2074 .rodata start:0x803D63B0 end:0x803D6510 - .data start:0x803FF93C end:0x803FFA18 - .sdata start:0x8051D268 end:0x8051D270 + .data start:0x803FF8B8 end:0x803FFA18 + .sdata start:0x8051D260 end:0x8051D270 .sdata2 start:0x80522478 end:0x805224F0 d/d_meter_haihai.cpp: diff --git a/config/RZDJ01/symbols.txt b/config/RZDJ01/symbols.txt index 582b2df19f..b07f817f1b 100644 --- a/config/RZDJ01/symbols.txt +++ b/config/RZDJ01/symbols.txt @@ -21995,57 +21995,57 @@ g_profile_MENUWINDOW = .data:0x803FF570; // type:object size:0x28 scope:global a __vt__20dDlst_MENU_CAPTURE_c = .data:0x803FF598; // type:object size:0x10 scope:global align:4 lbl_803FF5A8 = .data:0x803FF5A8; // type:object size:0x15 data:string __vt__18dMeter_cursorHIO_c = .data:0x803FF5C0; // type:object size:0xC scope:global align:4 -lbl_803FF5CC = .data:0x803FF5CC; // type:object size:0x13 data:string +@91717 = .data:0x803FF5CC; // type:object size:0x13 data:string @91718 = .data:0x803FF5E0; // type:object size:0xC scope:local align:4 __vt__16dMeter_fmapHIO_c = .data:0x803FF5EC; // type:object size:0xC scope:global align:4 -lbl_803FF5F8 = .data:0x803FF5F8; // type:object size:0x11 data:string +@91719 = .data:0x803FF5F8; // type:object size:0x11 data:string @91720 = .data:0x803FF60C; // type:object size:0xC scope:local align:4 __vt__19dMeter_mapIconHIO_c = .data:0x803FF618; // type:object size:0xC scope:global align:4 -lbl_803FF624 = .data:0x803FF624; // type:object size:0x14 data:string +@91721 = .data:0x803FF624; // type:object size:0x14 data:string @91722 = .data:0x803FF638; // type:object size:0xC scope:local align:4 __vt__16dMeter_ringHIO_c = .data:0x803FF644; // type:object size:0xC scope:global align:4 -lbl_803FF650 = .data:0x803FF650; // type:object size:0x11 data:string +@91723 = .data:0x803FF650; // type:object size:0x11 data:string @91724 = .data:0x803FF664; // type:object size:0xC scope:local align:4 __vt__16dMeter_drawHIO_c = .data:0x803FF670; // type:object size:0xC scope:global align:4 -lbl_803FF67C = .data:0x803FF67C; // type:object size:0x11 data:string +@91725 = .data:0x803FF67C; // type:object size:0x11 data:string @91726 = .data:0x803FF690; // type:object size:0xC scope:local align:4 __vt__25dMeter_drawLightDropHIO_c = .data:0x803FF69C; // type:object size:0xC scope:global align:4 -lbl_803FF6A8 = .data:0x803FF6A8; // type:object size:0x1A data:string +@91727 = .data:0x803FF6A8; // type:object size:0x1A data:string @91728 = .data:0x803FF6C4; // type:object size:0xC scope:local align:4 __vt__24dMeter_drawMiniGameHIO_c = .data:0x803FF6D0; // type:object size:0xC scope:global align:4 -lbl_803FF6DC = .data:0x803FF6DC; // type:object size:0x19 data:string +@91729 = .data:0x803FF6DC; // type:object size:0x19 data:string @91730 = .data:0x803FF6F8; // type:object size:0xC scope:local align:4 __vt__25dMeter_drawEmpButtonHIO_c = .data:0x803FF704; // type:object size:0xC scope:global align:4 -lbl_803FF710 = .data:0x803FF710; // type:object size:0x1A data:string +@91731 = .data:0x803FF710; // type:object size:0x1A data:string @91732 = .data:0x803FF72C; // type:object size:0xC scope:local align:4 __vt__21dMeter_drawSkillHIO_c = .data:0x803FF738; // type:object size:0xC scope:global align:4 -lbl_803FF744 = .data:0x803FF744; // type:object size:0x16 data:string +@91733 = .data:0x803FF744; // type:object size:0x16 data:string @91734 = .data:0x803FF75C; // type:object size:0xC scope:local align:4 __vt__27dMeter_drawCalibrationHIO_c = .data:0x803FF768; // type:object size:0xC scope:global align:4 -lbl_803FF774 = .data:0x803FF774; // type:object size:0x1C data:string +@91735 = .data:0x803FF774; // type:object size:0x1C data:string @91736 = .data:0x803FF790; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawInsectHIO_c = .data:0x803FF79C; // type:object size:0xC scope:global align:4 -lbl_803FF7A8 = .data:0x803FF7A8; // type:object size:0x17 data:string +@91737 = .data:0x803FF7A8; // type:object size:0x17 data:string @91738 = .data:0x803FF7C0; // type:object size:0xC scope:local align:4 __vt__23dMeter_drawFishingHIO_c = .data:0x803FF7CC; // type:object size:0xC scope:global align:4 -lbl_803FF7D8 = .data:0x803FF7D8; // type:object size:0x18 data:string +@91739 = .data:0x803FF7D8; // type:object size:0x18 data:string @91740 = .data:0x803FF7F0; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawLetterHIO_c = .data:0x803FF7FC; // type:object size:0xC scope:global align:4 -lbl_803FF808 = .data:0x803FF808; // type:object size:0x17 data:string +@91741 = .data:0x803FF808; // type:object size:0x17 data:string @91742 = .data:0x803FF820; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawOptionHIO_c = .data:0x803FF82C; // type:object size:0xC scope:global align:4 -lbl_803FF838 = .data:0x803FF838; // type:object size:0x17 data:string +@91743 = .data:0x803FF838; // type:object size:0x17 data:string @91744 = .data:0x803FF850; // type:object size:0xC scope:local align:4 __vt__23dMeter_drawCollectHIO_c = .data:0x803FF85C; // type:object size:0xC scope:global align:4 -lbl_803FF868 = .data:0x803FF868; // type:object size:0x18 data:string +@91745 = .data:0x803FF868; // type:object size:0x18 data:string @91746 = .data:0x803FF880; // type:object size:0xC scope:local align:4 __vt__16dMeter_menuHIO_c = .data:0x803FF88C; // type:object size:0xC scope:global align:4 -lbl_803FF898 = .data:0x803FF898; // type:object size:0x11 data:string +@91747 = .data:0x803FF898; // type:object size:0x11 data:string @91748 = .data:0x803FF8AC; // type:object size:0xC scope:local align:4 -lbl_803FF8B8 = .data:0x803FF8B8; // type:object size:0x26 data:string -lbl_803FF8DE = .data:0x803FF8DE; // type:object size:0x1C data:string -lbl_803FF8FA = .data:0x803FF8FA; // type:object size:0x22 data:string -lbl_803FF91C = .data:0x803FF91C; // type:object size:0x1E data:string +@61965 = .data:0x803FF8B8; // type:object size:0x26 data:string +@61059 = .data:0x803FF8DE; // type:object size:0x1C data:string +@61060 = .data:0x803FF8FA; // type:object size:0x22 data:string +@61061 = .data:0x803FF91C; // type:object size:0x1E data:string @111730 = .data:0x803FF93C; // type:object size:0x58 scope:local align:4 @111846 = .data:0x803FF994; // type:object size:0x58 scope:local align:4 __vt__14dMeterButton_c = .data:0x803FF9EC; // type:object size:0x10 scope:global align:4 @@ -26665,8 +26665,8 @@ __RTTI__22dMeter_drawLetterHIO_c = .sdata:0x8051D240; // type:object size:0x8 sc __RTTI__22dMeter_drawOptionHIO_c = .sdata:0x8051D248; // type:object size:0x8 scope:global align:4 __RTTI__23dMeter_drawCollectHIO_c = .sdata:0x8051D250; // type:object size:0x8 scope:global align:4 __RTTI__16dMeter_menuHIO_c = .sdata:0x8051D258; // type:object size:0x8 scope:global align:4 -lbl_8051D260 = .sdata:0x8051D260; // type:object size:0x1 -lbl_8051D261 = .sdata:0x8051D261; // type:object size:0x7 data:string +@60968 = .sdata:0x8051D260; // type:object size:0x1 +@61186 = .sdata:0x8051D261; // type:object size:0x7 data:string __RTTI__14dMeterButton_c = .sdata:0x8051D268; // type:object size:0x8 scope:global align:4 __RTTI__14dMeterHaihai_c = .sdata:0x8051D270; // type:object size:0x8 scope:global align:4 lbl_8051D278 = .sdata:0x8051D278; // type:object size:0x7 data:string diff --git a/config/RZDP01/splits.txt b/config/RZDP01/splits.txt index b0eefce7fb..933a564d6e 100644 --- a/config/RZDP01/splits.txt +++ b/config/RZDP01/splits.txt @@ -1114,17 +1114,17 @@ d/d_meter_HIO.cpp: .text start:0x801E3158 end:0x801E73EC .ctors start:0x803B9180 end:0x803B9184 .rodata start:0x803D8F50 end:0x803D9148 - .data start:0x80402418 end:0x80402794 + .data start:0x80402418 end:0x80402710 .bss start:0x804A34E0 end:0x804A4A88 - .sdata start:0x8051FC60 end:0x8051FCE8 + .sdata start:0x8051FC60 end:0x8051FCE0 .sbss start:0x80521548 end:0x80521550 .sdata2 start:0x80524B20 end:0x80524DC8 d/d_meter_button.cpp: .text start:0x801E73EC end:0x801F19C4 .rodata start:0x803D9148 end:0x803D92A8 - .data start:0x80402794 end:0x80402870 - .sdata start:0x8051FCE8 end:0x8051FCF0 + .data start:0x80402710 end:0x80402870 + .sdata start:0x8051FCE0 end:0x8051FCF0 .sdata2 start:0x80524DC8 end:0x80524E48 d/d_meter_haihai.cpp: diff --git a/config/RZDP01/symbols.txt b/config/RZDP01/symbols.txt index 866b952f37..52a2e5d1d6 100644 --- a/config/RZDP01/symbols.txt +++ b/config/RZDP01/symbols.txt @@ -21989,57 +21989,57 @@ g_profile_MENUWINDOW = .data:0x804023C8; // type:object size:0x28 scope:global a __vt__20dDlst_MENU_CAPTURE_c = .data:0x804023F0; // type:object size:0x10 scope:global align:4 lbl_80402400 = .data:0x80402400; // type:object size:0x15 data:string __vt__18dMeter_cursorHIO_c = .data:0x80402418; // type:object size:0xC scope:global align:4 -lbl_80402424 = .data:0x80402424; // type:object size:0x13 data:string +@91717 = .data:0x80402424; // type:object size:0x13 data:string @91718 = .data:0x80402438; // type:object size:0xC scope:local align:4 __vt__16dMeter_fmapHIO_c = .data:0x80402444; // type:object size:0xC scope:global align:4 -lbl_80402450 = .data:0x80402450; // type:object size:0x11 data:string +@91718 = .data:0x80402450; // type:object size:0x11 data:string @91720 = .data:0x80402464; // type:object size:0xC scope:local align:4 __vt__19dMeter_mapIconHIO_c = .data:0x80402470; // type:object size:0xC scope:global align:4 -lbl_8040247C = .data:0x8040247C; // type:object size:0x14 data:string +@91721 = .data:0x8040247C; // type:object size:0x14 data:string @91722 = .data:0x80402490; // type:object size:0xC scope:local align:4 __vt__16dMeter_ringHIO_c = .data:0x8040249C; // type:object size:0xC scope:global align:4 -lbl_804024A8 = .data:0x804024A8; // type:object size:0x11 data:string +@91723 = .data:0x804024A8; // type:object size:0x11 data:string @91724 = .data:0x804024BC; // type:object size:0xC scope:local align:4 __vt__16dMeter_drawHIO_c = .data:0x804024C8; // type:object size:0xC scope:global align:4 -lbl_804024D4 = .data:0x804024D4; // type:object size:0x11 data:string +@91725 = .data:0x804024D4; // type:object size:0x11 data:string @91726 = .data:0x804024E8; // type:object size:0xC scope:local align:4 __vt__25dMeter_drawLightDropHIO_c = .data:0x804024F4; // type:object size:0xC scope:global align:4 -lbl_80402500 = .data:0x80402500; // type:object size:0x1A data:string +@91727 = .data:0x80402500; // type:object size:0x1A data:string @91728 = .data:0x8040251C; // type:object size:0xC scope:local align:4 __vt__24dMeter_drawMiniGameHIO_c = .data:0x80402528; // type:object size:0xC scope:global align:4 -lbl_80402534 = .data:0x80402534; // type:object size:0x19 data:string +@91729 = .data:0x80402534; // type:object size:0x19 data:string @91730 = .data:0x80402550; // type:object size:0xC scope:local align:4 __vt__25dMeter_drawEmpButtonHIO_c = .data:0x8040255C; // type:object size:0xC scope:global align:4 -lbl_80402568 = .data:0x80402568; // type:object size:0x1A data:string +@91731 = .data:0x80402568; // type:object size:0x1A data:string @91732 = .data:0x80402584; // type:object size:0xC scope:local align:4 __vt__21dMeter_drawSkillHIO_c = .data:0x80402590; // type:object size:0xC scope:global align:4 -lbl_8040259C = .data:0x8040259C; // type:object size:0x16 data:string +@91733 = .data:0x8040259C; // type:object size:0x16 data:string @91734 = .data:0x804025B4; // type:object size:0xC scope:local align:4 __vt__27dMeter_drawCalibrationHIO_c = .data:0x804025C0; // type:object size:0xC scope:global align:4 -lbl_804025CC = .data:0x804025CC; // type:object size:0x1C data:string +@91735 = .data:0x804025CC; // type:object size:0x1C data:string @91736 = .data:0x804025E8; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawInsectHIO_c = .data:0x804025F4; // type:object size:0xC scope:global align:4 -lbl_80402600 = .data:0x80402600; // type:object size:0x17 data:string +@91737 = .data:0x80402600; // type:object size:0x17 data:string @91738 = .data:0x80402618; // type:object size:0xC scope:local align:4 __vt__23dMeter_drawFishingHIO_c = .data:0x80402624; // type:object size:0xC scope:global align:4 -lbl_80402630 = .data:0x80402630; // type:object size:0x18 data:string +@91739 = .data:0x80402630; // type:object size:0x18 data:string @91740 = .data:0x80402648; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawLetterHIO_c = .data:0x80402654; // type:object size:0xC scope:global align:4 -lbl_80402660 = .data:0x80402660; // type:object size:0x17 data:string +@91741 = .data:0x80402660; // type:object size:0x17 data:string @91742 = .data:0x80402678; // type:object size:0xC scope:local align:4 __vt__22dMeter_drawOptionHIO_c = .data:0x80402684; // type:object size:0xC scope:global align:4 -lbl_80402690 = .data:0x80402690; // type:object size:0x17 data:string +@91743 = .data:0x80402690; // type:object size:0x17 data:string @91744 = .data:0x804026A8; // type:object size:0xC scope:local align:4 __vt__23dMeter_drawCollectHIO_c = .data:0x804026B4; // type:object size:0xC scope:global align:4 -lbl_804026C0 = .data:0x804026C0; // type:object size:0x18 data:string +@91745 = .data:0x804026C0; // type:object size:0x18 data:string @91746 = .data:0x804026D8; // type:object size:0xC scope:local align:4 __vt__16dMeter_menuHIO_c = .data:0x804026E4; // type:object size:0xC scope:global align:4 -lbl_804026F0 = .data:0x804026F0; // type:object size:0x11 data:string +@91747 = .data:0x804026F0; // type:object size:0x11 data:string @91748 = .data:0x80402704; // type:object size:0xC scope:local align:4 -lbl_80402710 = .data:0x80402710; // type:object size:0x26 data:string -lbl_80402736 = .data:0x80402736; // type:object size:0x1C data:string -lbl_80402752 = .data:0x80402752; // type:object size:0x22 data:string -lbl_80402774 = .data:0x80402774; // type:object size:0x1E data:string +@61965 = .data:0x80402710; // type:object size:0x26 data:string +@61059 = .data:0x80402736; // type:object size:0x1C data:string +@61060 = .data:0x80402752; // type:object size:0x22 data:string +@61061 = .data:0x80402774; // type:object size:0x1E data:string @111607 = .data:0x80402794; // type:object size:0x58 scope:local align:4 @111723 = .data:0x804027EC; // type:object size:0x58 scope:local align:4 __vt__14dMeterButton_c = .data:0x80402844; // type:object size:0x10 scope:global align:4 @@ -26691,8 +26691,8 @@ __RTTI__22dMeter_drawLetterHIO_c = .sdata:0x8051FCC0; // type:object size:0x8 sc __RTTI__22dMeter_drawOptionHIO_c = .sdata:0x8051FCC8; // type:object size:0x8 scope:global align:4 __RTTI__23dMeter_drawCollectHIO_c = .sdata:0x8051FCD0; // type:object size:0x8 scope:global align:4 __RTTI__16dMeter_menuHIO_c = .sdata:0x8051FCD8; // type:object size:0x8 scope:global align:4 -lbl_8051FCE0 = .sdata:0x8051FCE0; // type:object size:0x1 -lbl_8051FCE1 = .sdata:0x8051FCE1; // type:object size:0x7 data:string +@60968 = .sdata:0x8051FCE0; // type:object size:0x1 +@61186 = .sdata:0x8051FCE1; // type:object size:0x7 data:string __RTTI__14dMeterButton_c = .sdata:0x8051FCE8; // type:object size:0x8 scope:global align:4 __RTTI__14dMeterHaihai_c = .sdata:0x8051FCF0; // type:object size:0x8 scope:global align:4 lbl_8051FCF8 = .sdata:0x8051FCF8; // type:object size:0x7 data:string @@ -27877,7 +27877,7 @@ l_bloObj = .sbss:0x80521534; // type:object size:0x4 scope:local align:4 data:4b l_anmCsr = .sbss:0x80521538; // type:object size:0x4 scope:local align:4 data:4byte l_bloCsr = .sbss:0x8052153C; // type:object size:0x4 scope:local align:4 data:4byte l_bloObj = .sbss:0x80521540; // type:object size:0x4 scope:local align:4 data:4byte -g_menuHIO = .sbss:0x80521548; // type:object size:0x8 scope:local align:4 +g_menuHIO = .sbss:0x80521548; // type:object size:0x8 scope:global align:4 l_baseCsr = .sbss:0x80521550; // type:object size:0x4 scope:local align:4 data:4byte l_bloCsr = .sbss:0x80521554; // type:object size:0x4 scope:local align:4 data:4byte l_bloObj = .sbss:0x80521558; // type:object size:0x4 scope:local align:4 data:4byte diff --git a/include/d/d_meter_HIO.h b/include/d/d_meter_HIO.h index e52051095f..b18ab67d5e 100644 --- a/include/d/d_meter_HIO.h +++ b/include/d/d_meter_HIO.h @@ -8,13 +8,6 @@ #include "SSystem/SComponent/c_xyz.h" #include "global.h" -struct subJOREventCallbackListNode : public JOREventCallbackListNode { - subJOREventCallbackListNode() : JOREventCallbackListNode(0x81000000, 0x81000000, true) {} - - virtual BOOL JORAct(u32, const char*); - virtual ~subJOREventCallbackListNode() {} -}; - class JKRAramArchive; class dMeter_menuHIO_c : public JORReflexible { @@ -22,7 +15,9 @@ public: dMeter_menuHIO_c(); virtual ~dMeter_menuHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif /* 0x0 */ // vtable /* 0x4 */ u8 field_0x4[2]; @@ -36,7 +31,9 @@ public: dMeter_drawCollectHIO_c(); virtual ~dMeter_drawCollectHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif enum { /* 0x0 */ VESSEL_HEART, @@ -87,7 +84,9 @@ public: dMeter_drawOptionHIO_c(); virtual ~dMeter_drawOptionHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif enum OptionType { /* 0x0 */ ATTENTION, @@ -121,7 +120,9 @@ public: dMeter_drawLetterHIO_c(); virtual ~dMeter_drawLetterHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif enum { /* 0x0 */ WINDOW_FRAME, @@ -163,7 +164,9 @@ public: dMeter_drawFishingHIO_c(); virtual ~dMeter_drawFishingHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif enum { /* 0x0 */ HYLIAN_BASS, @@ -215,7 +218,9 @@ public: dMeter_drawInsectHIO_c(); virtual ~dMeter_drawInsectHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif enum Type { /* 0x0 */ DEFAULT, @@ -229,13 +234,21 @@ public: /* 0x0C */ f32 mSelectInsectScale; /* 0x10 */ f32 mDescWindowPosX; /* 0x14 */ f32 mDescWindowPosY; +#if VERSION != VERSION_WII_USA_R0 /* 0x18 */ f32 mGiveOptionPosX_4x3; +#endif /* 0x1C */ f32 mGiveOptionPosX; +#if VERSION != VERSION_WII_USA_R0 /* 0x20 */ f32 mGiveOptionPosY_4x3; +#endif /* 0x24 */ f32 mGiveOptionPosY; +#if VERSION != VERSION_WII_USA_R0 /* 0x28 */ f32 mConfirmOptionPosX_4x3; +#endif /* 0x2C */ f32 mConfirmOptionPosX; +#if VERSION != VERSION_WII_USA_R0 /* 0x30 */ f32 mConfirmOptionPosY_4x3; +#endif /* 0x34 */ f32 mConfirmOptionPosY; /* 0x38 */ s16 mOpenFrame; /* 0x3A */ s16 mCloseFrame; @@ -248,7 +261,9 @@ public: dMeter_drawCalibrationHIO_c(); virtual ~dMeter_drawCalibrationHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif /* 0x00 */ // vtable /* 0x04 */ u8 field_0x4[4]; @@ -265,7 +280,9 @@ public: dMeter_drawSkillHIO_c(); virtual ~dMeter_drawSkillHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif enum { /* 0x0 */ WINDOW, @@ -305,7 +322,9 @@ public: dMeter_drawEmpButtonHIO_c(); virtual ~dMeter_drawEmpButtonHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif /* 0x000 */ // vtable /* 0x004 */ u8 field_0x4[4]; @@ -455,7 +474,9 @@ public: dMeter_drawMiniGameHIO_c(); virtual ~dMeter_drawMiniGameHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif /* 0x000 */ // vtable /* 0x004 */ u8 field_0x4[4]; @@ -478,10 +499,12 @@ public: /* 0x0C8 */ f32 mIconPosX[3]; /* 0x0D4 */ f32 mIconPosY[3]; /* 0x0E0 */ f32 mIconAlpha[3]; +#if VERSION != VERSION_WII_USA_R0 /* 0x0EC */ f32 mTimerSizeX_4x3; /* 0x0F0 */ f32 mTimerSizeY_4x3; /* 0x0F4 */ f32 mTimerPosX_4x3; /* 0x0F8 */ f32 mTimerPosY_4x3; +#endif /* 0x0FC */ f32 mIconPosX_4x3; /* 0x100 */ f32 mRiverRideIconPosX_4x3; /* 0x104 */ f32 mRiderGameIconPosX_4x3; @@ -531,7 +554,9 @@ public: dMeter_drawLightDropHIO_c(); virtual ~dMeter_drawLightDropHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif /* 0x00 */ // vtable /* 0x04 */ u8 field_0x4[4]; @@ -585,7 +610,6 @@ public: } #if DEBUG - virtual void listenPropertyEvent(const JORPropertyEvent*); virtual void genMessage(JORMContext*); void updateFMsgDebug(); @@ -593,8 +617,10 @@ public: #if WIDESCREEN_SUPPORT void updateOnWide(); + #if VERSION != VERSION_WII_USA_KIOSK void updateOffWide(); #endif + #endif /* 0x000 */ // vtable /* 0x004 */ s8 field_0x4; @@ -729,17 +755,14 @@ public: /* 0x268 */ f32 mButtonYItemBasePosX[2]; /* 0x270 */ f32 mButtonYItemBasePosY[2]; /* 0x278 */ f32 mButtonYItemBaseAlpha[2]; - /* 0x280 */ f32 field_0x280; - /* 0x284 */ f32 field_0x284; - /* 0x288 */ f32 field_0x288; - /* 0x28C */ f32 field_0x28c; - /* 0x290 */ f32 field_0x290; - /* 0x294 */ f32 field_0x294; - /* 0x298 */ f32 field_0x298[2]; - /* 0x2A0 */ f32 mButtonZItemBaseScale; - /* 0x2A4 */ f32 mButtonZItemBasePosX; - /* 0x2A8 */ f32 mButtonZItemBasePosY; - /* 0x2AC */ f32 mButtonZItemBaseAlpha; + /* 0x280 */ f32 mButtonZWiiItemBaseScale[2]; + /* 0x288 */ f32 mButtonZWiiItemBasePosX[2]; + /* 0x290 */ f32 mButtonZWiiItemBasePosY[2]; + /* 0x298 */ f32 mButtonZWiiItemBaseAlpha[2]; + /* 0x2A0 */ f32 mButtonZGCNItemBaseScale; + /* 0x2A4 */ f32 mButtonZGCNItemBasePosX; + /* 0x2A8 */ f32 mButtonZGCNItemBasePosY; + /* 0x2AC */ f32 mButtonZGCNItemBaseAlpha; /* 0x2B0 */ f32 mButtonBaseAlpha; /* 0x2B4 */ f32 mButtonATextScale; /* 0x2B8 */ f32 mButtonATextPosX; @@ -768,9 +791,9 @@ public: /* 0x314 */ f32 field_0x314; /* 0x318 */ f32 field_0x318; /* 0x31C */ f32 field_0x31c; - /* 0x320 */ f32 field_0x320; - /* 0x324 */ f32 field_0x324; - /* 0x328 */ f32 field_0x328; + /* 0x320 */ f32 mButtonZTextScale; + /* 0x324 */ f32 mButtonZTextPosX; + /* 0x328 */ f32 mButtonZTextPosY; /* 0x32C */ f32 mButtonZFontScale; /* 0x330 */ f32 mButtonZFontPosX; /* 0x334 */ f32 mButtonZFontPosY; @@ -955,18 +978,28 @@ public: dMeter_ringHIO_c(); virtual ~dMeter_ringHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif #if WIDESCREEN_SUPPORT void updateOnWide(); + #if VERSION != VERSION_WII_USA_KIOSK void updateOffWide(); #endif + #endif enum { - /* 0x0 */ SET_ITEM, - /* 0x1 */ DIRECT_SELECT, - /* 0x3 */ ROTATE = 3, - /* 0x4 */ COMBO_ITEM + /* 0x0 */ GUIDE_SET_ITEM, + /* 0x1 */ GUIDE_DIRECT_SELECT, + /* 0x2 */ GUIDE_UNK_2, + /* 0x3 */ GUIDE_ROTATE, + /* 0x4 */ GUIDE_COMBO_ITEM, + /* 0x5 */ GUIDE_UNK_5, + /* 0x6 */ GUIDE_UNK_6, + /* 0x7 */ GUIDE_UNK_7, + /* 0x8 */ GUIDE_UNK_8, + /* 0x9 */ GUIDE_UNK_9, }; enum { @@ -1048,12 +1081,21 @@ public: STATIC_ASSERT(sizeof(dMeter_ringHIO_c) == 344); +struct subJOREventCallbackListNode : public JOREventCallbackListNode { + subJOREventCallbackListNode() : JOREventCallbackListNode(0x81000000, 0x81000000, true) {} + + virtual BOOL JORAct(u32, const char*); + virtual ~subJOREventCallbackListNode() {} +}; + class dMeter_mapIconHIO_c : public JORReflexible { public: dMeter_mapIconHIO_c(); virtual ~dMeter_mapIconHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif enum { /* 0x00 */ ICON_PORTAL, @@ -1315,7 +1357,9 @@ public: dMeter_cursorHIO_c(); virtual ~dMeter_cursorHIO_c() {} - void genMessage(JORMContext*); +#if DEBUG + virtual void genMessage(JORMContext*); +#endif /* 0x04 */ s8 field_0x4; /* 0x08 */ cXyz mSeraShopObjZoom; diff --git a/libs/JSystem/include/JSystem/JHostIO/JORReflexible.h b/libs/JSystem/include/JSystem/JHostIO/JORReflexible.h index 4a142dee7e..3f6387fdf4 100644 --- a/libs/JSystem/include/JSystem/JHostIO/JORReflexible.h +++ b/libs/JSystem/include/JSystem/JHostIO/JORReflexible.h @@ -20,7 +20,11 @@ public: #endif }; -class JORReflexible : public JOREventListener { +class JORReflexible +#if !PLATFORM_WII + : public JOREventListener +#endif +{ public: #if DEBUG JORReflexible() {} diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 24c4076f01..289cb36fb6 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -168,12 +168,22 @@ void dMenu_Insect_c::_draw() { mpBlackTex->setAlpha(field_0xfc); mpBlackTex->draw(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0, 0, 0); mpExpScreen->draw(0.0f, 0.0f, grafPort); + + // the magic numbers here are correlated with the framebuffer size, but + // were likely either chosen by hand or had multiple arithmetic + // operations applied which cannot easily be reverse engineered +#if VERSION == VERSION_WII_USA_R0 + mpSelect_c->translate(g_drawHIO.mInsectListScreen.mConfirmOptionPosX + 486.0f, + g_drawHIO.mInsectListScreen.mConfirmOptionPosY + 209.0f); +#else mpSelect_c->setOffsetX(g_drawHIO.mInsectListScreen.mConfirmOptionPosX_4x3); // the magic numbers here are correlated with the framebuffer size, but // were likely either chosen by hand or had multiple arithmetic // operations applied which cannot easily be reverse engineered mpSelect_c->translate(g_drawHIO.mInsectListScreen.mConfirmOptionPosX_4x3 + 486.0f, g_drawHIO.mInsectListScreen.mConfirmOptionPosY_4x3 + 209.0f); +#endif + mpSelect_c->draw(0.0f, 0.0f); mpIconScreen->draw(0.0f, 0.0f, grafPort); } @@ -741,8 +751,13 @@ void dMenu_Insect_c::setHIO(bool i_useHIO) { if (i_useHIO || g_drawHIO.mInsectListScreen.mDebugON) { mpExpSubWin[0]->paneTrans(g_drawHIO.mInsectListScreen.mDescWindowPosX, g_drawHIO.mInsectListScreen.mDescWindowPosY); +#if VERSION == VERSION_WII_USA_R0 + mpExpSubWin[1]->paneTrans(g_drawHIO.mInsectListScreen.mGiveOptionPosX, + g_drawHIO.mInsectListScreen.mGiveOptionPosY); +#else mpExpSubWin[1]->paneTrans(g_drawHIO.mInsectListScreen.mGiveOptionPosX_4x3, g_drawHIO.mInsectListScreen.mGiveOptionPosY_4x3); +#endif } if (g_drawHIO.mCollectScreen.mButtonDebugON != false || i_useHIO) { if (mpButtonAB[0]) { diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 50db238bff..6d3e0caa2b 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -1664,18 +1664,18 @@ void dMeter2_c::moveButtonZ() { draw_buttonZ = true; } - if (field_0x3e4 != g_drawHIO.mButtonZItemBaseScale) { - field_0x3e4 = g_drawHIO.mButtonZItemBaseScale; + if (field_0x3e4 != g_drawHIO.mButtonZGCNItemBaseScale) { + field_0x3e4 = g_drawHIO.mButtonZGCNItemBaseScale; draw_buttonZ = true; } - if (field_0x3e8 != g_drawHIO.mButtonZItemBasePosX) { - field_0x3e8 = g_drawHIO.mButtonZItemBasePosX; + if (field_0x3e8 != g_drawHIO.mButtonZGCNItemBasePosX) { + field_0x3e8 = g_drawHIO.mButtonZGCNItemBasePosX; draw_buttonZ = true; } - if (field_0x3ec != g_drawHIO.mButtonZItemBasePosY) { - field_0x3ec = g_drawHIO.mButtonZItemBasePosY; + if (field_0x3ec != g_drawHIO.mButtonZGCNItemBasePosY) { + field_0x3ec = g_drawHIO.mButtonZGCNItemBasePosY; draw_buttonZ = true; } diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index da751d5115..301a22c663 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -486,10 +486,10 @@ void dMeter2Draw_c::init() { mItemBBaseAlpha[i] = g_drawHIO.mItemBBaseAlpha[i]; mButtonXItemBaseAlpha[i] = g_drawHIO.mButtonXItemBaseAlpha[i]; mButtonYItemBaseAlpha[i] = g_drawHIO.mButtonYItemBaseAlpha[i]; - field_0x82c[i] = g_drawHIO.field_0x298[i]; + field_0x82c[i] = g_drawHIO.mButtonZWiiItemBaseAlpha[i]; } - mButtonZItemBaseAlpha = g_drawHIO.mButtonZItemBaseAlpha; + mButtonZItemBaseAlpha = g_drawHIO.mButtonZGCNItemBaseAlpha; mButtonBaseAlpha = g_drawHIO.mButtonBaseAlpha; mButtonATextSpacing = g_drawHIO.mButtonATextSpacing; mButtonCrossAlpha = g_drawHIO.mButtonCrossAlpha; @@ -2384,8 +2384,8 @@ void dMeter2Draw_c::drawButtonZ(u8 i_action) { mpItemR->paneTrans(g_drawHIO.mButtonZItemPosX + field_0x6ac[2], g_drawHIO.mButtonZItemPosY + field_0x6b8[2]); - mpLightXY[2]->scale(g_drawHIO.mButtonZItemBaseScale, g_drawHIO.mButtonZItemBaseScale); - mpLightXY[2]->paneTrans(g_drawHIO.mButtonZItemBasePosX, g_drawHIO.mButtonZItemBasePosY); + mpLightXY[2]->scale(g_drawHIO.mButtonZGCNItemBaseScale, g_drawHIO.mButtonZGCNItemBaseScale); + mpLightXY[2]->paneTrans(g_drawHIO.mButtonZGCNItemBasePosX, g_drawHIO.mButtonZGCNItemBasePosY); mpTextXY[2]->scale(g_drawHIO.mButtonZFontScale, g_drawHIO.mButtonZFontScale); mpTextXY[2]->paneTrans(g_drawHIO.mButtonZFontPosX, g_drawHIO.mButtonZFontPosY); @@ -2746,8 +2746,8 @@ void dMeter2Draw_c::setAlphaButtonChange(bool param_0) { set_buttonYItem = true; } - if (mButtonZItemBaseAlpha != g_drawHIO.mButtonZItemBaseAlpha || param_0) { - mButtonZItemBaseAlpha = g_drawHIO.mButtonZItemBaseAlpha; + if (mButtonZItemBaseAlpha != g_drawHIO.mButtonZGCNItemBaseAlpha || param_0) { + mButtonZItemBaseAlpha = g_drawHIO.mButtonZGCNItemBaseAlpha; set_buttonZItem = true; } diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index ed0d81d346..df1abc4521 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -1872,11 +1872,13 @@ void dMeter2Info_onWide2D() { g_drawHIO.updateOnWide(); } +#if VERSION != VERSION_WII_USA_KIOSK void dMeter2Info_offWide2D() { g_ringHIO.updateOffWide(); g_drawHIO.updateOffWide(); } #endif +#endif void dMeter2Info_set2DVibrationT() {} diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index 63da02cfc5..03ab2197e5 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -381,6 +381,9 @@ dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c() { static f32 const fishnPosY[6] = {-72.1f, 129.6f, 0.0f, 6.6f, 32.8f, 11.7f}; + UNUSED(bboxPosX); + UNUSED(bboxPosY); + mOpenFrames = 10; mCloseFrames = 10; mDebug = false; @@ -426,6 +429,7 @@ dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c() { #if DEBUG void dMeter_drawFishingHIO_c::genMessage(JORMContext* mctx) { + static u8 fish_type[6] = {3, 4, 2, 5, 1, 0}; static const char* fish_name[6] = { "********トアルナマズ********", "********ニオイマス********", @@ -434,7 +438,6 @@ void dMeter_drawFishingHIO_c::genMessage(JORMContext* mctx) { "********ハイラルドジョウ********", "********ハイラルバス********", }; - static u8 fish_type[6] = {3, 4, 2, 5, 1, 0}; mctx->genCheckBox("デバッグＯＮ", (u8*)&mDebug, 0x1); mctx->genSlider("open frame", &mOpenFrames, 1, 20); mctx->genSlider("close frame", &mCloseFrames, 1, 20); @@ -497,6 +500,13 @@ dMeter_drawInsectHIO_c::dMeter_drawInsectHIO_c() { mDescWindowPosX = 0.0f; mDescWindowPosY = 77.0f; +#if VERSION == VERSION_WII_USA_R0 + mGiveOptionPosX = 0.0f; + mGiveOptionPosY = 0.0f; + + mConfirmOptionPosX = 0.0f; + mConfirmOptionPosY = 0.0f; +#else mGiveOptionPosX_4x3 = 0.0f; mGiveOptionPosY_4x3 = 43.0f; @@ -508,6 +518,7 @@ dMeter_drawInsectHIO_c::dMeter_drawInsectHIO_c() { mConfirmOptionPosX = -34.0f; mConfirmOptionPosY = 119.0f; +#endif } #if DEBUG @@ -669,20 +680,34 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mPikariFrontInner.b = 255; mPikariFrontInner.a = 185; +#if PLATFORM_WII + mPikariFrontOuter.r = 255; + mPikariFrontOuter.g = 255; + mPikariFrontOuter.b = 255; + mPikariFrontOuter.a = 0; +#else mPikariFrontOuter.r = 0; mPikariFrontOuter.g = 155; mPikariFrontOuter.b = 0; mPikariFrontOuter.a = 0; +#endif mPikariBackInner.r = 255; mPikariBackInner.g = 255; mPikariBackInner.b = 255; mPikariBackInner.a = 87; +#if PLATFORM_WII + mPikariBackOuter.r = 255; + mPikariBackOuter.g = 255; + mPikariBackOuter.b = 255; + mPikariBackOuter.a = 0; +#else mPikariBackOuter.r = 0; mPikariBackOuter.g = 115; mPikariBackOuter.b = 0; mPikariBackOuter.a = 0; +#endif mPikariAnimSpeed = 0.772705f; mPikariFastScale = 3.0f; @@ -729,10 +754,10 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mDebugDisplayButton[0] = 0; } - #if PLATFORM_SHIELD - mDisplaySpace = 70.0f; - #else + #if PLATFORM_GCN mDisplaySpace = 35.0f; + #else + mDisplaySpace = 70.0f; #endif mEmpButtonPosX = 0.0f; @@ -764,8 +789,13 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mCButtonScale = 1.0f; mSButtonPosX = 0.0f; +#if PLATFORM_WII + mSButtonPosY = -393.0f; + mSButtonScale = 1.0f; +#else mSButtonPosY = -392.0f; mSButtonScale = 0.9f; +#endif mButtonXPosX = 0.0f; mButtonXPosY = 0.0f; @@ -831,8 +861,13 @@ dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { mViewChangePosY = 67.0f; mViewChangeScale = 1.0f; +#if PLATFORM_WII + mText1PosX = mText2PosX = 10.0f; + mText1PosY = mText2PosY = 4.0f; +#else mText1PosX = mText2PosX = 2.0f; mText1PosY = mText2PosY = 3.0f; +#endif mText1Scale = mText2Scale = 1.0f; mItemPosX = 12.0f; @@ -1158,15 +1193,24 @@ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() { field_0x20[0] = 0.0f; field_0x2c[0] = 1.0f; +#if PLATFORM_WII + mTimerSizeX[0] = 1.4f; + mTimerSizeY[0] = 1.0f; + mTimerPosX[0] = 198.0f; + mTimerPosY[0] = -30.0f; +#else mTimerSizeX[0] = 1.2f; mTimerSizeY[0] = 0.9f; mTimerPosX[0] = 207.0f; mTimerPosY[0] = -43.0f; +#endif mTimerAlpha[0] = 0.5f; +#if VERSION != VERSION_WII_USA_R0 mTimerSizeX_4x3 = 1.2f; mTimerSizeY_4x3 = 0.9f; mTimerPosX_4x3 = 207.0f; mTimerPosY_4x3 = -43.0f; +#endif mCounterSizeX[0] = 1.1f; mCounterSizeY[0] = 0.9f; @@ -1176,7 +1220,11 @@ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() { mIconSizeX[0] = 0.75f; mIconSizeY[0] = 0.75f; +#if PLATFORM_WII + mIconPosX[0] = -258.0f; +#else mIconPosX[0] = -275.0f; +#endif mIconPosX_4x3 = -275.0f; mIconPosY[0] = 76.0f; mIconAlpha[0] = 0.9f; @@ -1217,15 +1265,26 @@ dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() { mCounterSizeX[2] = 1.1f; mCounterSizeY[2] = 0.95f; +#if PLATFORM_WII + mCounterPosX[2] = 270.0f; + mCounterPosY[2] = 302.0f; +#else mCounterPosX[2] = 267.0f; mCounterPosY[2] = 288.0f; +#endif mCounterAlpha[2] = 0.7f; mIconSizeX[2] = 0.75f; mIconSizeY[2] = 0.75f; +#if PLATFORM_WII + mIconPosX[2] = -3.0f; + mRiderGameIconPosX_4x3 = -26.0f; + mIconPosY[2] = 63.0f; +#else mIconPosX[2] = -29.0f; mRiderGameIconPosX_4x3 = -26.0f; mIconPosY[2] = 50.0f; +#endif mIconAlpha[2] = 0.9f; mReadyGo = 60; @@ -1476,8 +1535,13 @@ void dMeter_drawMiniGameHIO_c::genMessage(JORMContext* mctx) { dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() { mVesselScale = 0.76f; +#if PLATFORM_WII + mVesselPosX = -20.0f; + mVesselPosY = 9.2f; +#else mVesselPosX = -18.0f; mVesselPosY = 11.0f; +#endif mVesselPosX_4x3 = -20.0f; mVesselPosY_4x3 = 6.6f; mVesselAlpha[0] = 1.0f; @@ -1645,6 +1709,10 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { #if DEBUG field_0x8_debug = 0; #endif + +#if PLATFORM_WII + updateOnWide(); +#else mLifeTopPosX = 40.0f; mLifeTopPosY = -5.6f; @@ -1767,9 +1835,9 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { field_0x318 = 0.0f; field_0x31c = 0.0f; - field_0x320 = 1.0f; - field_0x324 = 0.0f; - field_0x328 = 0.0f; + mButtonZTextScale = 1.0f; + mButtonZTextPosX = 0.0f; + mButtonZTextPosY = 0.0f; mButtonZScale = 1.0f; mButtonZAlpha = 0.9f; @@ -1856,20 +1924,20 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mButtonYItemBasePosY[1] = 0.0f; mButtonYItemBaseAlpha[1] = 0.5f; - field_0x280 = 1.5f; - field_0x288 = 0.0f; - field_0x290 = 6.0f; - field_0x298[0] = 0.5f; + mButtonZWiiItemBaseScale[0] = 1.5f; + mButtonZWiiItemBasePosX[0] = 0.0f; + mButtonZWiiItemBasePosY[0] = 6.0f; + mButtonZWiiItemBaseAlpha[0] = 0.5f; - field_0x284 = 1.0f; - field_0x28c = 0.0f; - field_0x294 = 4.0f; - field_0x298[1] = 1.0f; + mButtonZWiiItemBaseScale[1] = 1.0f; + mButtonZWiiItemBasePosX[1] = 0.0f; + mButtonZWiiItemBasePosY[1] = 4.0f; + mButtonZWiiItemBaseAlpha[1] = 1.0f; - mButtonZItemBaseScale = 1.0f; - mButtonZItemBasePosX = 0.0f; - mButtonZItemBasePosY = 0.0f; - mButtonZItemBaseAlpha = 0.5f; + mButtonZGCNItemBaseScale = 1.0f; + mButtonZGCNItemBasePosX = 0.0f; + mButtonZGCNItemBasePosY = 0.0f; + mButtonZGCNItemBaseAlpha = 0.5f; mButtonBaseAlpha = 0.55f; @@ -2253,6 +2321,8 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mFloatingMessagePosX = 0.0f; mFloatingMessagePosY = -100.0f; + // needed to match debug .sdata2 + UNUSED(-60.0f); mMessageID = 395; mFlowID = 3003; mMessageDuration = 150; @@ -2284,13 +2354,1351 @@ dMeter_drawHIO_c::dMeter_drawHIO_c() { mLanternIconMeterPosX = 0.0f; mLanternIconMeterPosY = 0.0f; mLanternIconMeterSize = 1.0f; +#endif } #if WIDESCREEN_SUPPORT -void dMeter_drawHIO_c::updateOnWide() {} +void dMeter_drawHIO_c::updateOnWide() { +#if PLATFORM_WII + mLifeTopPosX = 27.5f; + mLifeTopPosY = -5.6f; -void dMeter_drawHIO_c::updateOffWide() {} + mNoMagicPosY = -15.0f; + + mParentScale = 1.0f; + mParentAlpha = 1.0f; + + mLifeParentScale = 1.0f; + mLifeParentHeartAlpha = 1.0f; + mHeartBaseAlpha = 0.4f; + mLifeGaugePosX = -5.0f; + mLifeGaugePosY = 18.0f; + mHeartMarkScale = 1.0f; + mHeartAlpha = 0.7f; + mBigHeartScale = 1.0f; + mBigHeartAlpha = 1.0f; + + mMagicMeterScale = 0.7f; + mMagicMeterAlpha = 1.0f; + mMagicMeterFrameAlpha = 0.55f; + mMagicMeterPosX = -26.0f; + mMagicMeterPosY = 0.0f; + + mLanternMeterScale = 0.7f; + mLanternMeterAlpha = 1.0f; + mLanternMeterFrameAlpha = 0.55f; + mLanternMeterPosX = 20.0f; + mLanternMeterPosY = 20.0f; + + mOxygenMeterScale = 0.7f; + mOxygenMeterAlpha = 1.0f; + mOxygenMeterFrameAlpha = 0.55f; + mOxygenMeterPosX = 20.0f; + mOxygenMeterPosY = 20.0f; + + mMainHUDButtonsScale = 0.92f; + mMainHUDButtonsAlpha = 1.0f; + mMainHUDButtonsPosX = -2.8f; + mMainHUDButtonsPosY = 54.0f; + + mRingHUDButtonsScale = 0.98f; + mRingHUDButtonsAlpha = 1.0f; + mRingHUDButtonsPosX = -15.0f; + mRingHUDButtonsPosY = 56.0f; + + mButtonDisplayBackScale = 1.0f; + mButtonDisplayBackAlpha = 1.0f; + mButtonAScale = 0.95f; + mButtonAAlpha = 1.0f; + mButtonAPosX = -1.0f; + mButtonAPosY = 130.0f; + + mButtonATalkScale[0] = 1.1f; + mButtonATalkPosX[0] = -1.0f; + mButtonATalkPosY[0] = -106.0f; + mButtonATalkScale[1] = 1.1f; + mButtonATalkPosX[1] = 4.5f; + mButtonATalkPosY[1] = 5.5f; + mButtonATalkAScale = 1.1f; + mButtonATalkAPosX[0] = 12.0f; + mButtonATalkAPosY[0] = -161.0f; + mButtonATextTalkAScale = 1.1f; + mButtonATalkAPosX[1] = 0.5f; + mButtonATalkAPosY[1] = -9.0f; + + mButtonAVesselPosX = -1.0f; + mButtonAVesselPosY = 130.0f; + + mButtonBScale = 1.1f; + mButtonBAlpha = 1.0f; + mButtonBPosX = -20.0f; + mButtonBPosY = -14.0f; + + mButtonBTalkScale[0] = 1.0f; + mButtonBTalkPosX[0] = 20.0f; + mButtonBTalkPosY[0] = -203.0f; + mButtonBTalkScale[1] = 1.2f; + mButtonBTalkPosX[1] = -50.0f; + mButtonBTalkPosY[1] = -30.0f; + + mButtonBWolfPosX = 19.0f; + mButtonBWolfPosY = 0.0f; + + mButtonBVesselPosX = 19.0f; + mButtonBVesselPosY = 0.0f; + + mMidnaIconScale = 2.0f; + mMidnaIconAlpha = 1.0f; + mMidnaIconPosX = 0.0f; + mMidnaIconPosY = -40.0f; + + field_0x134 = 1.1f; + field_0x138 = 1.0f; + field_0x13c = 0.0f; + field_0x140 = 0.0f; + + mButtonXScale = 1.0f; + mButtonXAlpha = 0.9f; + mButtonXPosX = 0.0f; + mButtonXPosY = 0.0f; + mButtonYScale = 1.0f; + mButtonYAlpha = 0.9f; + mButtonYPosX = 0.0f; + mButtonYPosY = 0.0f; + + field_0x164 = 1.5f; + field_0x168 = 1.0f; + field_0x16c = 0.0f; + field_0x170 = 0.0f; + field_0x304 = 0.75f; + field_0x308 = 0.0f; + field_0x30c = 0.0f; + field_0x314 = 1.0f; + field_0x318 = 0.0f; + field_0x31c = 0.0f; + + mButtonZTextScale = 1.0f; + mButtonZTextPosX = 0.0f; + mButtonZTextPosY = 0.0f; + mButtonZScale = 1.0f; + mButtonZAlpha = 0.9f; + mButtonZPosX = 0.0f; + mButtonZPosY = 0.0f; + + mButtonBItemPosX[0] = 26.3f; + mButtonBItemPosY[0] = -44.8f; + mButtonBItemRotation[0] = 0.0f; + mButtonBItemScale[0] = 1.7f; + mButtonBItemPosX[1] = -4.7f; + mButtonBItemPosY[1] = 10.0f; + mButtonBItemRotation[1] = 39.0f; + mButtonBItemScale[1] = 1.1f; + mButtonBItemPosX[2] = -17.0f; + mButtonBItemPosY[2] = 40.0f; + mButtonBItemRotation[2] = 14.0f; + mButtonBItemScale[2] = 2.3f; + + mButtonXItemPosX = 19.0f; + mButtonXItemPosY = -11.0f; + mButtonXItemScale = 1.7f; + + mXItemNumPosX = -14.0f; + mXItemNumPosY = -9.0f; + mXItemNumScale = 0.8f; + + mButtonYItemPosX = -4.0f; + mButtonYItemPosY = -16.0f; + mButtonYItemScale = 1.7f; + + mYItemNumPosX = -14.0f; + mYItemNumPosY = -9.0f; + mYItemNumScale = 0.8f; + + field_0x1cc = 1.3f; + field_0x1d0 = 9.2f; + field_0x1d4 = 1.7f; + field_0x1f8 = 14.0f; + field_0x208 = -30.0f; + field_0x218 = 0.8f; + + mItemBNumPosX = 14.0f; + mItemBNumPosY = -30.0f; + mItemBNumScale = 0.8f; + + mButtonItemRotation[0] = 0.0f; + mButtonItemRotation[1] = 0.0f; + mButtonItemRotation[2] = 0.0f; + + mButtonZItemPosX = 0.0f; + mButtonZItemPosY = 0.0f; + mButtonZItemScale = 1.0f; + + for (int i = 0; i < 2; i++) { + mItemBBaseScale[i] = 1.0f; + mItemBBasePosX[i] = 22.0f; + mItemBBasePosY[i] = -49.0f; + } + mItemBBaseAlpha[0] = 1.0f; + mItemBBaseAlpha[1] = 1.0f; + + mButtonXItemBaseScale[0] = 1.5f; + mButtonXItemBasePosX[0] = 14.0f; + mButtonXItemBasePosY[0] = -12.0f; + mButtonXItemBaseAlpha[0] = 1.0f; + mButtonXItemBaseScale[1] = 1.5f; + mButtonXItemBasePosX[1] = 0.0f; + mButtonXItemBasePosY[1] = 0.0f; + mButtonXItemBaseAlpha[1] = 1.0f; + + mButtonYItemBaseScale[0] = 1.5f; + mButtonYItemBasePosX[0] = -10.0f; + mButtonYItemBasePosY[0] = -12.0f; + mButtonYItemBaseAlpha[0] = 1.0f; + mButtonYItemBaseScale[1] = 1.5f; + mButtonYItemBasePosX[1] = 0.0f; + mButtonYItemBasePosY[1] = 0.0f; + mButtonYItemBaseAlpha[1] = 1.0f; + + mButtonZWiiItemBaseScale[0] = 1.5f; + mButtonZWiiItemBasePosX[0] = 0.0f; + mButtonZWiiItemBasePosY[0] = 6.0f; + mButtonZWiiItemBaseAlpha[0] = 1.0f; + mButtonZWiiItemBaseScale[1] = 1.5f; + mButtonZWiiItemBasePosX[1] = 0.0f; + mButtonZWiiItemBasePosY[1] = 4.0f; + mButtonZWiiItemBaseAlpha[1] = 1.0f; + + mButtonZGCNItemBaseScale = 1.0f; + mButtonZGCNItemBasePosX = 0.0f; + mButtonZGCNItemBasePosY = 0.0f; + mButtonZGCNItemBaseAlpha = 0.5f; + + mButtonBaseAlpha = 0.0f; + + mButtonATextActionID = 1001; + field_0x2cc = 1001; + mButtonATextDebug = 0; +#if REGION_JPN + mButtonATextSpacing = -0.5f; +#else + mButtonATextSpacing = 1.0f; #endif + mButtonATextScale = 1.1f; + mButtonATextPosX = 0.0f; + mButtonATextPosY = -6.0f; + + mButtonATextColor.r = 255; + mButtonATextColor.g = 255; + mButtonATextColor.b = 255; + mButtonATextColor.a = 255; + + mButtonBFontScale = 0.95f; + mButtonBFontPosX = 0.0f; + mButtonBFontPosY = -1.3f; + + mButtonBFontColor.r = 255; + mButtonBFontColor.g = 255; + mButtonBFontColor.b = 255; + mButtonBFontColor.a = 255; + + field_0x2e4 = 1.0f; + field_0x2e8 = 0.0f; + field_0x2ec = 0.0f; + field_0x2f0.r = 0xFF; + field_0x2f0.g = 0xFF; + field_0x2f0.b = 0xFF; + field_0x2f0.a = 0xFF; + + mButtonXYTextScale = 1.0f; + mButtonXYTextPosX = 0.0f; + mButtonXYTextPosY = 0.0f; + mButtonXYTextColor.r = 255; + mButtonXYTextColor.g = 255; + mButtonXYTextColor.b = 255; + mButtonXYTextColor.a = 255; + + mButtonZFontScale = 1.0f; + mButtonZFontPosX = 0.0f; + mButtonZFontPosY = 0.0f; + mButtonZFontColor.r = 255; + mButtonZFontColor.g = 255; + mButtonZFontColor.b = 255; + mButtonZFontColor.a = 255; + + mRupeeKeyScale = 1.0f; + mRupeeKeyPosX = -33.0f; + mRupeeKeyPosY = 32.0f; + mRupeeKeyAlpha = 0.6f; + mRupeeScale = 0.8f; + mRupeePosX = 49.0f; + mRupeePosY = -28.0f; + mRupeeAlpha = 1.0f; + + mKeyScale = 0.7f; + mKeyPosX = 33.0f; + mKeyPosY = -30.0f; + mKeyAlpha = 1.0f; + + mRupeeFrameScale = 0.0f; + mRupeeFramePosX = 0.0f; + mRupeeFramePosY = 1.0f; + mRupeeFrameAlpha = 1.0f; + + mRupeeCountScale = 1.0f; + mRupeeCountPosX = 0.0f; + mRupeeCountPosY = 0.0f; + mRupeeCountAlpha = 1.0f; + + mKeyNumScale = 1.0f; + mKeyNumPosX = 0.0f; + mKeyNumPosY = 0.0f; + mKeyNumAlpha = 1.0f; + + mSpurDebug = 0; + mSpurIconScale = 1.0f; + mSpurIconAlpha = 1.0f; + mUsedSpurIconScale = 1.0f; + mUsedSpurIconAlpha = 1.0f; + mSpurBarScale = 0.6f; + mSpurBarPosX = 5.0f; + mSpurBarPosY = -1.3f; + + mButtonAHorsePosX = 130.0f; + mButtonAHorsePosY = 0.0f; + mButtonAHorseScale = 0.85f; + + mButtonAPikariScale = 1.5f; + mButtonBPikariScale = 0.7f; + field_0x3cc = 1.0f; + mButtonZPikariScale = 1.2f; + mButtonXYPikariScale = 1.2f; + mMidnaIconPikariScale = 1.0f; + mSpurIconPikariScale = 2.5f; + mSpurIconRevivePikariScale = 1.3f; + + field_0x3f0 = 0.0f; + field_0x3f4 = 0.0f; + field_0x3f8 = 1.0f; + + mButtonCrossScale = 0.9f; + mButtonCrossOFFPosX = -12.0f; + mButtonCrossOFFPosY = 0.0f; + mButtonCrossONPosX = -12.0f; + mButtonCrossONPosY = 0.0f; + mButtonCrossTextScale = 0.9f; + mButtonCrossAlpha = 1.0f; + mButtonCrossITEMAlpha = 1.0f; + mButtonCrossMAPAlpha = 1.0f; + mButtonCrossMoveFrame = 5; + + field_0x422 = 10; + field_0x424 = 20; + + mButtonXYItemDimAlpha = 128; + mButtonXYBaseDimAlpha = 128; + + field_0x42c = 128; + + mMaxSpurAmount = 6; + mSpurIconPikariFrontInner.r = 255; + mSpurIconPikariFrontInner.g = 255; + mSpurIconPikariFrontInner.b = 255; + mSpurIconPikariFrontInner.a = 255; + + mSpurIconPikariFrontOuter.r = 140; + mSpurIconPikariFrontOuter.g = 232; + mSpurIconPikariFrontOuter.b = 228; + mSpurIconPikariFrontOuter.a = 0; + + mSpurIconPikariBackInner.r = 255; + mSpurIconPikariBackInner.g = 255; + mSpurIconPikariBackInner.b = 190; + mSpurIconPikariBackInner.a = 255; + + mSpurIconPikariBackOuter.r = 55; + mSpurIconPikariBackOuter.g = 215; + mSpurIconPikariBackOuter.b = 90; + mSpurIconPikariBackOuter.a = 0; + + mSpurIconPikariAnimSpeed = 1.5f; + + mSpurIconRevivePikariFrontInner.r = 255; + mSpurIconRevivePikariFrontInner.g = 255; + mSpurIconRevivePikariFrontInner.b = 255; + mSpurIconRevivePikariFrontInner.a = 255; + + mSpurIconRevivePikariFrontOuter.r = 220; + mSpurIconRevivePikariFrontOuter.g = 110; + mSpurIconRevivePikariFrontOuter.b = 30; + mSpurIconRevivePikariFrontOuter.a = 0; + + mSpurIconRevivePikariBackInner.r = 255; + mSpurIconRevivePikariBackInner.g = 255; + mSpurIconRevivePikariBackInner.b = 190; + mSpurIconRevivePikariBackInner.a = 255; + + mSpurIconRevivePikariBackOuter.r = 170; + mSpurIconRevivePikariBackOuter.g = 110; + mSpurIconRevivePikariBackOuter.b = 0; + mSpurIconRevivePikariBackOuter.a = 0; + + mSpurIconRevivePikariAnimSpeed = 0.5f; + + mButtonZPikariFrontInner.r = 255; + mButtonZPikariFrontInner.g = 255; + mButtonZPikariFrontInner.b = 255; + mButtonZPikariFrontInner.a = 255; + + mButtonZPikariFrontOuter.r = 0; + mButtonZPikariFrontOuter.g = 0; + mButtonZPikariFrontOuter.b = 0; + mButtonZPikariFrontOuter.a = 0; + + mButtonZPikariBackInner.r = 255; + mButtonZPikariBackInner.g = 255; + mButtonZPikariBackInner.b = 255; + mButtonZPikariBackInner.a = 255; + + mButtonZPikariBackOuter.r = 160; + mButtonZPikariBackOuter.g = 160; + mButtonZPikariBackOuter.b = 110; + mButtonZPikariBackOuter.a = 0; + + mButtonZPikariAnimSpeed = 0.4f; + + mButtonXYPikariFrontInner.r = 255; + mButtonXYPikariFrontInner.g = 255; + mButtonXYPikariFrontInner.b = 255; + mButtonXYPikariFrontInner.a = 255; + + mButtonXYPikariFrontOuter.r = 0; + mButtonXYPikariFrontOuter.g = 0; + mButtonXYPikariFrontOuter.b = 0; + mButtonXYPikariFrontOuter.a = 0; + + mButtonXYPikariBackInner.r = 255; + mButtonXYPikariBackInner.g = 255; + mButtonXYPikariBackInner.b = 255; + mButtonXYPikariBackInner.a = 255; + + mButtonXYPikariBackOuter.r = 160; + mButtonXYPikariBackOuter.g = 160; + mButtonXYPikariBackOuter.b = 110; + mButtonXYPikariBackOuter.a = 0; + + mButtonXYPikariAnimSpeed = 0.4f; + + mButtonAPikariFrontInner.r = 255; + mButtonAPikariFrontInner.g = 255; + mButtonAPikariFrontInner.b = 255; + mButtonAPikariFrontInner.a = 160; + + mButtonAPikariFrontOuter.r = 0; + mButtonAPikariFrontOuter.g = 0; + mButtonAPikariFrontOuter.b = 0; + mButtonAPikariFrontOuter.a = 0; + + mButtonAPikariBackInner.r = 255; + mButtonAPikariBackInner.g = 255; + mButtonAPikariBackInner.b = 255; + mButtonAPikariBackInner.a = 128; + + mButtonAPikariBackOuter.r = 255; + mButtonAPikariBackOuter.g = 255; + mButtonAPikariBackOuter.b = 255; + mButtonAPikariBackOuter.a = 0; + + mButtonAPikariAnimSpeed = 0.4f; + + mButtonBPikariFrontInner.r = 255; + mButtonBPikariFrontInner.g = 180; + mButtonBPikariFrontInner.b = 180; + mButtonBPikariFrontInner.a = 160; + + mButtonBPikariFrontOuter.r = 0; + mButtonBPikariFrontOuter.g = 0; + mButtonBPikariFrontOuter.b = 0; + mButtonBPikariFrontOuter.a = 0; + + mButtonBPikariBackInner.r = 255; + mButtonBPikariBackInner.g = 255; + mButtonBPikariBackInner.b = 255; + mButtonBPikariBackInner.a = 128; + + mButtonBPikariBackOuter.r = 255; + mButtonBPikariBackOuter.g = 255; + mButtonBPikariBackOuter.b = 255; + mButtonBPikariBackOuter.a = 0; + + mButtonBPikariAnimSpeed = 0.4f; + + field_0x4a8.r = 255; + field_0x4a8.g = 180; + field_0x4a8.b = 180; + field_0x4a8.a = 160; + + field_0x4ac.r = 0; + field_0x4ac.g = 0; + field_0x4ac.b = 0; + field_0x4ac.a = 0; + + field_0x4b0.r = 255; + field_0x4b0.g = 255; + field_0x4b0.b = 255; + field_0x4b0.a = 128; + + field_0x4b4.r = 255; + field_0x4b4.g = 0; + field_0x4b4.b = 0; + field_0x4b4.a = 0; + + field_0x4b8 = 0.4f; + + field_0x4bc.r = 255; + field_0x4bc.g = 180; + field_0x4bc.b = 180; + field_0x4bc.a = 160; + + field_0x4c0.r = 0; + field_0x4c0.g = 0; + field_0x4c0.b = 0; + field_0x4c0.a = 0; + + field_0x4c4.r = 255; + field_0x4c4.g = 255; + field_0x4c4.b = 255; + field_0x4c4.a = 128; + + field_0x4c8.r = 255; + field_0x4c8.g = 255; + field_0x4c8.b = 255; + field_0x4c8.a = 0; + + field_0x4cc = 0.4f; + field_0x3d0 = 0.7f; + + field_0x4d0.r = 255; + field_0x4d0.g = 180; + field_0x4d0.b = 180; + field_0x4d0.a = 160; + + field_0x4d4.r = 0; + field_0x4d4.g = 0; + field_0x4d4.b = 0; + field_0x4d4.a = 0; + + field_0x4d8.r = 255; + field_0x4d8.g = 255; + field_0x4d8.b = 255; + field_0x4d8.a = 128; + + field_0x4dc.r = 255; + field_0x4dc.g = 255; + field_0x4dc.b = 255; + field_0x4dc.a = 0; + + field_0x4e0 = 0.4f; + field_0x3d4 = 0.7f; + + mMidnaIconPikariFrontInner.r = 200; + mMidnaIconPikariFrontInner.g = 235; + mMidnaIconPikariFrontInner.b = 255; + mMidnaIconPikariFrontInner.a = 255; + + mMidnaIconPikariFrontOuter.r = 0; + mMidnaIconPikariFrontOuter.g = 0; + mMidnaIconPikariFrontOuter.b = 0; + mMidnaIconPikariFrontOuter.a = 0; + + mMidnaIconPikariBackInner.r = 255; + mMidnaIconPikariBackInner.g = 255; + mMidnaIconPikariBackInner.b = 255; + mMidnaIconPikariBackInner.a = 255; + + mMidnaIconPikariBackOuter.r = 140; + mMidnaIconPikariBackOuter.g = 200; + mMidnaIconPikariBackOuter.b = 125; + mMidnaIconPikariBackOuter.a = 0; + + mMidnaIconPikariAnimSpeed = 0.5f; + mMidnaIconFlashRate = 50; + + mScrollArrowScaleX = 1.0f; + mScrollArrowScaleY = 1.0f; + + mScrollArrowBCKAnimSpeed = 1.0f; + mScrollArrowBPKAnimSpeed = 1.0f; + mScrollArrowBTKAnimSpeed = 1.0f; + + mScrollArrowPosX[0] = 0.0f; + mScrollArrowPosY[0] = 200.0f; + mScrollArrowPosX[1] = 200.0f; + mScrollArrowPosY[1] = 0.0f; + + mScrollArrowCenterPosX = 0.0f; + mScrollArrowCenterPosY = 0.0f; + + mScrollArrowDisplayAll = false; + + mWiiLockArrowScaleX = 0.5f; + mWiiLockArrowScaleY = 0.5f; + mWiiLockArrowBCKAnimSpeed = 1.0f; + mWiiLockArrowBPKAnimSpeed = 1.0f; + mWiiLockArrowBTKAnimSpeed = 1.0f; + mWiiLockArrowPosX[0] = 0.0f; + mWiiLockArrowPosY[0] = 150.0f; + mWiiLockArrowPosX[1] = 208.0f; + mWiiLockArrowPosY[1] = 0.0f; + mWiiLockArrowDisplayAll = false; + + field_0x54c = 1.35f; + + mItemScaleAdjustON = false; + mItemScalePercent = 100; + + mFloatingMessagePosX = 0.0f; + mFloatingMessagePosY = -100.0f; + + mMessageID = 395; + mFlowID = 3003; + mMessageDuration = 150; + mMessageDebug = false; + mFlowDebug = false; + + mTouchAreaSelectBlack[0].set(255, 145, 100, 0); + mTouchAreaSelectWhite[0].set(255, 145, 100, 255); + mTouchAreaSelectBlack[1].set(0, 0, 0, 0); + mTouchAreaSelectWhite[1].set(255, 255, 0, 255); + mTouchAreaSelectBlack[2].set(200, 200, 200, 0); + mTouchAreaSelectWhite[2].set(200, 200, 200, 255); + + mTouchAreaSelectFrameNum = 10; + + mTouchAreaSelectScale[0] = 1.1f; + mTouchAreaSelectScale[1] = 1.1f; + mTouchAreaSelectScale[2] = 0.9f; + mTouchAreaSelectScale[3] = 1.2f; + mTouchAreaUnselectScale[0] = 0.9f; + mTouchAreaUnselectScale[1] = 0.9f; + mTouchAreaUnselectScale[2] = 0.7f; + mTouchAreaUnselectScale[3] = 1.0f; + mTouchAreaSelectScale[4] = 1.0f; + + for (int i = 0; i < 5; i++) { + mTouchAreaScale[i] = 1.0f; + mTouchAreaAlpha[i] = 1.0f; + } + + mTouchAreaPosX[0] = -30.0f; + mTouchAreaPosY[0] = -9.0f; + mTouchAreaPosX[1] = -6.0f; + mTouchAreaPosY[1] = 0.0f; + mTouchAreaPosX[2] = 0.0f; + mTouchAreaPosY[2] = 0.0f; + mTouchAreaPosX[3] = 0.0f; + mTouchAreaPosY[3] = 0.0f; + +#if VERSION == VERSION_WII_USA_R0 + mDpadMAPScale = 1.2f; +#else + mDpadMAPScale = 1.0f; +#endif + mDpadMAPPosX = 0.0f; + mDpadMAPPosY = 0.0f; + + field_0x60a = false; + + mLanternIconMeterPosX = 0.0f; + mLanternIconMeterPosY = 0.0f; + mLanternIconMeterSize = 1.0f; +#else + // MWCC generates a weird function body in ShieldD which is effectively a no-op - + // this is probably a complete fakematch but it doesn't really matter + if (false) { + UNUSED(this); + UNUSED(this); + int unused1; + int unused2; + UNUSED(unused1); + UNUSED(unused2); + updateOnWide(); + } +#endif +} + +#if VERSION != VERSION_WII_USA_KIOSK +void dMeter_drawHIO_c::updateOffWide() { +#if PLATFORM_WII + mLifeTopPosX = 27.5f; + mLifeTopPosY = -5.6f; + + mNoMagicPosY = -15.0f; + + mParentScale = 1.0f; + mParentAlpha = 1.0f; + + mLifeParentScale = 1.0f; + mLifeParentHeartAlpha = 1.0f; + mHeartBaseAlpha = 0.4f; + mLifeGaugePosX = 5.0f; + mLifeGaugePosY = 18.0f; + mHeartMarkScale = 1.0f; + mHeartAlpha = 0.7f; + mBigHeartScale = 1.0f; + mBigHeartAlpha = 1.0f; + + mMagicMeterScale = 0.7f; + mMagicMeterAlpha = 1.0f; + mMagicMeterFrameAlpha = 0.55f; + mMagicMeterPosX = -26.0f; + mMagicMeterPosY = 0.0f; + + mLanternMeterScale = 0.7f; + mLanternMeterAlpha = 1.0f; + mLanternMeterFrameAlpha = 0.55f; + mLanternMeterPosX = 8.0f; + mLanternMeterPosY = 20.0f; + + mOxygenMeterScale = 0.7f; + mOxygenMeterAlpha = 1.0f; + mOxygenMeterFrameAlpha = 0.55f; + mOxygenMeterPosX = 8.0f; + mOxygenMeterPosY = 20.0f; + + mMainHUDButtonsScale = 0.92f; + mMainHUDButtonsAlpha = 1.0f; + mMainHUDButtonsPosX = -11.0f; + mMainHUDButtonsPosY = 54.0f; + + mRingHUDButtonsScale = 0.98f; + mRingHUDButtonsAlpha = 1.0f; + mRingHUDButtonsPosX = -11.0f; + mRingHUDButtonsPosY = 56.0f; + + mButtonDisplayBackScale = 1.0f; + mButtonDisplayBackAlpha = 1.0f; + mButtonAScale = 0.95f; + mButtonAAlpha = 1.0f; + mButtonAPosX = -1.0f; + mButtonAPosY = 130.0f; + + mButtonATalkScale[0] = 1.1f; + mButtonATalkPosX[0] = -1.0f; + mButtonATalkPosY[0] = -106.0f; + mButtonATalkScale[1] = 1.1f; + mButtonATalkPosX[1] = 4.5f; + mButtonATalkPosY[1] = 5.5f; + mButtonATalkAScale = 1.1f; + mButtonATalkAPosX[0] = 48.0f; + mButtonATalkAPosY[0] = -161.0f; + mButtonATextTalkAScale = 1.1f; + mButtonATalkAPosX[1] = 0.0f; + mButtonATalkAPosY[1] = -6.0f; + + mButtonAVesselPosX = -1.0f; + mButtonAVesselPosY = 130.0f; + + mButtonBScale = 1.1f; + mButtonBAlpha = 1.0f; + mButtonBPosX = -20.0f; + mButtonBPosY = -14.0f; + + mButtonBTalkScale[0] = 1.0f; + mButtonBTalkPosX[0] = 20.0f; + mButtonBTalkPosY[0] = -203.0f; + mButtonBTalkScale[1] = 1.2f; + mButtonBTalkPosX[1] = -50.0f; + mButtonBTalkPosY[1] = -30.0f; + + mButtonBWolfPosX = 19.0f; + mButtonBWolfPosY = 0.0f; + + mButtonBVesselPosX = 19.0f; + mButtonBVesselPosY = 0.0f; + + mMidnaIconScale = 2.0f; + mMidnaIconAlpha = 1.0f; + mMidnaIconPosX = 0.0f; + mMidnaIconPosY = -40.0f; + + field_0x134 = 1.1f; + field_0x138 = 1.0f; + field_0x13c = 0.0f; + field_0x140 = 0.0f; + + mButtonXScale = 1.0f; + mButtonXAlpha = 0.9f; + mButtonXPosX = 0.0f; + mButtonXPosY = 0.0f; + mButtonYScale = 1.0f; + mButtonYAlpha = 0.9f; + mButtonYPosX = 0.0f; + mButtonYPosY = 0.0f; + + field_0x164 = 1.5f; + field_0x168 = 1.0f; + field_0x16c = 0.0f; + field_0x170 = 0.0f; + field_0x304 = 0.75f; + field_0x308 = 0.0f; + field_0x30c = 0.0f; + field_0x314 = 1.0f; + field_0x318 = 0.0f; + field_0x31c = 0.0f; + + mButtonZTextScale = 1.0f; + mButtonZTextPosX = 0.0f; + mButtonZTextPosY = 0.0f; + mButtonZScale = 1.0f; + mButtonZAlpha = 0.9f; + mButtonZPosX = 0.0f; + mButtonZPosY = 0.0f; + + mButtonBItemPosX[0] = 26.3f; + mButtonBItemPosY[0] = -44.8f; + mButtonBItemRotation[0] = 0.0f; + mButtonBItemScale[0] = 1.7f; + mButtonBItemPosX[1] = -4.7f; + mButtonBItemPosY[1] = 10.0f; + mButtonBItemRotation[1] = 39.0f; + mButtonBItemScale[1] = 1.1f; + mButtonBItemPosX[2] = -17.0f; + mButtonBItemPosY[2] = 40.0f; + mButtonBItemRotation[2] = 14.0f; + mButtonBItemScale[2] = 2.3f; + + mButtonXItemPosX = 19.0f; + mButtonXItemPosY = -11.0f; + mButtonXItemScale = 1.7f; + + mXItemNumPosX = -14.0f; + mXItemNumPosY = -9.0f; + mXItemNumScale = 0.8f; + + mButtonYItemPosX = -4.0f; + mButtonYItemPosY = -16.0f; + mButtonYItemScale = 1.7f; + + mYItemNumPosX = -14.0f; + mYItemNumPosY = -9.0f; + mYItemNumScale = 0.8f; + + field_0x1cc = 1.3f; + field_0x1d0 = 9.2f; + field_0x1d4 = 1.7f; + field_0x1f8 = 14.0f; + field_0x208 = -30.0f; + field_0x218 = 0.8f; + + mItemBNumPosX = 14.0f; + mItemBNumPosY = -30.0f; + mItemBNumScale = 0.8f; + + mButtonItemRotation[0] = 0.0f; + mButtonItemRotation[1] = 0.0f; + mButtonItemRotation[2] = 0.0f; + + mButtonZItemPosX = 0.0f; + mButtonZItemPosY = 0.0f; + mButtonZItemScale = 1.0f; + + for (int i = 0; i < 2; i++) { + mItemBBaseScale[i] = 1.0f; + mItemBBasePosX[i] = 22.0f; + mItemBBasePosY[i] = -49.0f; + } + mItemBBaseAlpha[0] = 1.0f; + mItemBBaseAlpha[1] = 1.0f; + + mButtonXItemBaseScale[0] = 1.5f; + mButtonXItemBasePosX[0] = 14.0f; + mButtonXItemBasePosY[0] = -12.0f; + mButtonXItemBaseAlpha[0] = 1.0f; + mButtonXItemBaseScale[1] = 1.5f; + mButtonXItemBasePosX[1] = 0.0f; + mButtonXItemBasePosY[1] = 0.0f; + mButtonXItemBaseAlpha[1] = 1.0f; + + mButtonYItemBaseScale[0] = 1.5f; + mButtonYItemBasePosX[0] = -10.0f; + mButtonYItemBasePosY[0] = -12.0f; + mButtonYItemBaseAlpha[0] = 1.0f; + mButtonYItemBaseScale[1] = 1.5f; + mButtonYItemBasePosX[1] = 0.0f; + mButtonYItemBasePosY[1] = 0.0f; + mButtonYItemBaseAlpha[1] = 1.0f; + + mButtonZWiiItemBaseScale[0] = 1.5f; + mButtonZWiiItemBasePosX[0] = 0.0f; + mButtonZWiiItemBasePosY[0] = 6.0f; + mButtonZWiiItemBaseAlpha[0] = 1.0f; + mButtonZWiiItemBaseScale[1] = 1.5f; + mButtonZWiiItemBasePosX[1] = 0.0f; + mButtonZWiiItemBasePosY[1] = 4.0f; + mButtonZWiiItemBaseAlpha[1] = 1.0f; + + mButtonZGCNItemBaseScale = 1.0f; + mButtonZGCNItemBasePosX = 0.0f; + mButtonZGCNItemBasePosY = 0.0f; + mButtonZGCNItemBaseAlpha = 0.5f; + + mButtonBaseAlpha = 0.0f; + + mButtonATextActionID = 1001; + field_0x2cc = 1001; + mButtonATextDebug = 0; +#if REGION_JPN + mButtonATextSpacing = -0.5f; +#else + mButtonATextSpacing = 1.0f; +#endif + mButtonATextScale = 1.1f; + mButtonATextPosX = 0.0f; + mButtonATextPosY = -6.0f; + + mButtonATextColor.r = 255; + mButtonATextColor.g = 255; + mButtonATextColor.b = 255; + mButtonATextColor.a = 255; + + mButtonBFontScale = 0.95f; + mButtonBFontPosX = 0.0f; + mButtonBFontPosY = -1.3f; + + mButtonBFontColor.r = 255; + mButtonBFontColor.g = 255; + mButtonBFontColor.b = 255; + mButtonBFontColor.a = 255; + + field_0x2e4 = 1.0f; + field_0x2e8 = 0.0f; + field_0x2ec = 0.0f; + field_0x2f0.r = 0xFF; + field_0x2f0.g = 0xFF; + field_0x2f0.b = 0xFF; + field_0x2f0.a = 0xFF; + + mButtonXYTextScale = 1.0f; + mButtonXYTextPosX = 0.0f; + mButtonXYTextPosY = 0.0f; + mButtonXYTextColor.r = 255; + mButtonXYTextColor.g = 255; + mButtonXYTextColor.b = 255; + mButtonXYTextColor.a = 255; + + mButtonZFontScale = 1.0f; + mButtonZFontPosX = 0.0f; + mButtonZFontPosY = 0.0f; + mButtonZFontColor.r = 255; + mButtonZFontColor.g = 255; + mButtonZFontColor.b = 255; + mButtonZFontColor.a = 255; + + mRupeeKeyScale = 1.0f; + mRupeeKeyPosX = -60.0f; + mRupeeKeyPosY = 32.0f; + mRupeeKeyAlpha = 0.6f; + mRupeeScale = 0.8f; + mRupeePosX = 49.0f; + mRupeePosY = -28.0f; + mRupeeAlpha = 1.0f; + + mKeyScale = 0.7f; + mKeyPosX = 33.0f; + mKeyPosY = -30.0f; + mKeyAlpha = 1.0f; + + mRupeeFrameScale = 0.0f; + mRupeeFramePosX = 0.0f; + mRupeeFramePosY = 1.0f; + mRupeeFrameAlpha = 1.0f; + + mRupeeCountScale = 1.0f; + mRupeeCountPosX = 0.0f; + mRupeeCountPosY = 0.0f; + mRupeeCountAlpha = 1.0f; + + mKeyNumScale = 1.0f; + mKeyNumPosX = 0.0f; + mKeyNumPosY = 0.0f; + mKeyNumAlpha = 1.0f; + + mSpurDebug = 0; + mSpurIconScale = 1.0f; + mSpurIconAlpha = 1.0f; + mUsedSpurIconScale = 1.0f; + mUsedSpurIconAlpha = 1.0f; + mSpurBarScale = 0.95f; + mSpurBarPosX = 6.6f; + mSpurBarPosY = -1.3f; + + mButtonAHorsePosX = 5.0f; + mButtonAHorsePosY = 0.0f; + mButtonAHorseScale = 0.85f; + + mButtonAPikariScale = 1.5f; + mButtonBPikariScale = 0.7f; + field_0x3cc = 1.0f; + mButtonZPikariScale = 1.2f; + mButtonXYPikariScale = 1.2f; + mMidnaIconPikariScale = 1.0f; + mSpurIconPikariScale = 2.5f; + mSpurIconRevivePikariScale = 1.3f; + + field_0x3f0 = 0.0f; + field_0x3f4 = 0.0f; + field_0x3f8 = 1.0f; + + mButtonCrossScale = 0.9f; + mButtonCrossOFFPosX = -12.0f; + mButtonCrossOFFPosY = 0.0f; + mButtonCrossONPosX = -12.0f; + mButtonCrossONPosY = 0.0f; + mButtonCrossTextScale = 0.9f; + mButtonCrossAlpha = 1.0f; + mButtonCrossITEMAlpha = 1.0f; + mButtonCrossMAPAlpha = 1.0f; + mButtonCrossMoveFrame = 5; + + field_0x422 = 10; + field_0x424 = 20; + + mButtonXYItemDimAlpha = 128; + mButtonXYBaseDimAlpha = 128; + + field_0x42c = 128; + + mMaxSpurAmount = 6; + mSpurIconPikariFrontInner.r = 255; + mSpurIconPikariFrontInner.g = 255; + mSpurIconPikariFrontInner.b = 255; + mSpurIconPikariFrontInner.a = 255; + + mSpurIconPikariFrontOuter.r = 140; + mSpurIconPikariFrontOuter.g = 232; + mSpurIconPikariFrontOuter.b = 228; + mSpurIconPikariFrontOuter.a = 0; + + mSpurIconPikariBackInner.r = 255; + mSpurIconPikariBackInner.g = 255; + mSpurIconPikariBackInner.b = 190; + mSpurIconPikariBackInner.a = 255; + + mSpurIconPikariBackOuter.r = 55; + mSpurIconPikariBackOuter.g = 215; + mSpurIconPikariBackOuter.b = 90; + mSpurIconPikariBackOuter.a = 0; + + mSpurIconPikariAnimSpeed = 1.5f; + + mSpurIconRevivePikariFrontInner.r = 255; + mSpurIconRevivePikariFrontInner.g = 255; + mSpurIconRevivePikariFrontInner.b = 255; + mSpurIconRevivePikariFrontInner.a = 255; + + mSpurIconRevivePikariFrontOuter.r = 220; + mSpurIconRevivePikariFrontOuter.g = 110; + mSpurIconRevivePikariFrontOuter.b = 30; + mSpurIconRevivePikariFrontOuter.a = 0; + + mSpurIconRevivePikariBackInner.r = 255; + mSpurIconRevivePikariBackInner.g = 255; + mSpurIconRevivePikariBackInner.b = 190; + mSpurIconRevivePikariBackInner.a = 255; + + mSpurIconRevivePikariBackOuter.r = 170; + mSpurIconRevivePikariBackOuter.g = 110; + mSpurIconRevivePikariBackOuter.b = 0; + mSpurIconRevivePikariBackOuter.a = 0; + + mSpurIconRevivePikariAnimSpeed = 0.5f; + + mButtonZPikariFrontInner.r = 255; + mButtonZPikariFrontInner.g = 255; + mButtonZPikariFrontInner.b = 255; + mButtonZPikariFrontInner.a = 255; + + mButtonZPikariFrontOuter.r = 0; + mButtonZPikariFrontOuter.g = 0; + mButtonZPikariFrontOuter.b = 0; + mButtonZPikariFrontOuter.a = 0; + + mButtonZPikariBackInner.r = 255; + mButtonZPikariBackInner.g = 255; + mButtonZPikariBackInner.b = 255; + mButtonZPikariBackInner.a = 255; + + mButtonZPikariBackOuter.r = 160; + mButtonZPikariBackOuter.g = 160; + mButtonZPikariBackOuter.b = 110; + mButtonZPikariBackOuter.a = 0; + + mButtonZPikariAnimSpeed = 0.4f; + + mButtonXYPikariFrontInner.r = 255; + mButtonXYPikariFrontInner.g = 255; + mButtonXYPikariFrontInner.b = 255; + mButtonXYPikariFrontInner.a = 255; + + mButtonXYPikariFrontOuter.r = 0; + mButtonXYPikariFrontOuter.g = 0; + mButtonXYPikariFrontOuter.b = 0; + mButtonXYPikariFrontOuter.a = 0; + + mButtonXYPikariBackInner.r = 255; + mButtonXYPikariBackInner.g = 255; + mButtonXYPikariBackInner.b = 255; + mButtonXYPikariBackInner.a = 255; + + mButtonXYPikariBackOuter.r = 160; + mButtonXYPikariBackOuter.g = 160; + mButtonXYPikariBackOuter.b = 110; + mButtonXYPikariBackOuter.a = 0; + + mButtonXYPikariAnimSpeed = 0.4f; + + mButtonAPikariFrontInner.r = 255; + mButtonAPikariFrontInner.g = 255; + mButtonAPikariFrontInner.b = 255; + mButtonAPikariFrontInner.a = 160; + + mButtonAPikariFrontOuter.r = 0; + mButtonAPikariFrontOuter.g = 0; + mButtonAPikariFrontOuter.b = 0; + mButtonAPikariFrontOuter.a = 0; + + mButtonAPikariBackInner.r = 255; + mButtonAPikariBackInner.g = 255; + mButtonAPikariBackInner.b = 255; + mButtonAPikariBackInner.a = 128; + + mButtonAPikariBackOuter.r = 255; + mButtonAPikariBackOuter.g = 255; + mButtonAPikariBackOuter.b = 255; + mButtonAPikariBackOuter.a = 0; + + mButtonAPikariAnimSpeed = 0.4f; + + mButtonBPikariFrontInner.r = 255; + mButtonBPikariFrontInner.g = 180; + mButtonBPikariFrontInner.b = 180; + mButtonBPikariFrontInner.a = 160; + + mButtonBPikariFrontOuter.r = 0; + mButtonBPikariFrontOuter.g = 0; + mButtonBPikariFrontOuter.b = 0; + mButtonBPikariFrontOuter.a = 0; + + mButtonBPikariBackInner.r = 255; + mButtonBPikariBackInner.g = 255; + mButtonBPikariBackInner.b = 255; + mButtonBPikariBackInner.a = 128; + + mButtonBPikariBackOuter.r = 255; + mButtonBPikariBackOuter.g = 255; + mButtonBPikariBackOuter.b = 255; + mButtonBPikariBackOuter.a = 0; + + mButtonBPikariAnimSpeed = 0.4f; + + field_0x4a8.r = 255; + field_0x4a8.g = 180; + field_0x4a8.b = 180; + field_0x4a8.a = 160; + + field_0x4ac.r = 0; + field_0x4ac.g = 0; + field_0x4ac.b = 0; + field_0x4ac.a = 0; + + field_0x4b0.r = 255; + field_0x4b0.g = 255; + field_0x4b0.b = 255; + field_0x4b0.a = 128; + + field_0x4b4.r = 255; + field_0x4b4.g = 0; + field_0x4b4.b = 0; + field_0x4b4.a = 0; + + field_0x4b8 = 0.4f; + + field_0x4bc.r = 255; + field_0x4bc.g = 180; + field_0x4bc.b = 180; + field_0x4bc.a = 160; + + field_0x4c0.r = 0; + field_0x4c0.g = 0; + field_0x4c0.b = 0; + field_0x4c0.a = 0; + + field_0x4c4.r = 255; + field_0x4c4.g = 255; + field_0x4c4.b = 255; + field_0x4c4.a = 128; + + field_0x4c8.r = 255; + field_0x4c8.g = 255; + field_0x4c8.b = 255; + field_0x4c8.a = 0; + + field_0x4cc = 0.4f; + field_0x3d0 = 0.7f; + + field_0x4d0.r = 255; + field_0x4d0.g = 180; + field_0x4d0.b = 180; + field_0x4d0.a = 160; + + field_0x4d4.r = 0; + field_0x4d4.g = 0; + field_0x4d4.b = 0; + field_0x4d4.a = 0; + + field_0x4d8.r = 255; + field_0x4d8.g = 255; + field_0x4d8.b = 255; + field_0x4d8.a = 128; + + field_0x4dc.r = 255; + field_0x4dc.g = 255; + field_0x4dc.b = 255; + field_0x4dc.a = 0; + + field_0x4e0 = 0.4f; + field_0x3d4 = 0.7f; + + mMidnaIconPikariFrontInner.r = 200; + mMidnaIconPikariFrontInner.g = 235; + mMidnaIconPikariFrontInner.b = 255; + mMidnaIconPikariFrontInner.a = 255; + + mMidnaIconPikariFrontOuter.r = 0; + mMidnaIconPikariFrontOuter.g = 0; + mMidnaIconPikariFrontOuter.b = 0; + mMidnaIconPikariFrontOuter.a = 0; + + mMidnaIconPikariBackInner.r = 255; + mMidnaIconPikariBackInner.g = 255; + mMidnaIconPikariBackInner.b = 255; + mMidnaIconPikariBackInner.a = 255; + + mMidnaIconPikariBackOuter.r = 140; + mMidnaIconPikariBackOuter.g = 200; + mMidnaIconPikariBackOuter.b = 125; + mMidnaIconPikariBackOuter.a = 0; + + mMidnaIconPikariAnimSpeed = 0.5f; + mMidnaIconFlashRate = 50; + + mScrollArrowScaleX = 1.0f; + mScrollArrowScaleY = 1.0f; + + mScrollArrowBCKAnimSpeed = 1.0f; + mScrollArrowBPKAnimSpeed = 1.0f; + mScrollArrowBTKAnimSpeed = 1.0f; + + mScrollArrowPosX[0] = 0.0f; + mScrollArrowPosY[0] = 200.0f; + mScrollArrowPosX[1] = 200.0f; + mScrollArrowPosY[1] = 0.0f; + + mScrollArrowCenterPosX = 0.0f; + mScrollArrowCenterPosY = 0.0f; + + mScrollArrowDisplayAll = false; + + mWiiLockArrowScaleX = 0.5f; + mWiiLockArrowScaleY = 0.5f; + mWiiLockArrowBCKAnimSpeed = 1.0f; + mWiiLockArrowBPKAnimSpeed = 1.0f; + mWiiLockArrowBTKAnimSpeed = 1.0f; + mWiiLockArrowPosX[0] = 0.0f; + mWiiLockArrowPosY[0] = 150.0f; + mWiiLockArrowPosX[1] = 208.0f; + mWiiLockArrowPosY[1] = 0.0f; + mWiiLockArrowDisplayAll = false; + + field_0x54c = 1.35f; + + mItemScaleAdjustON = false; + mItemScalePercent = 100; + + mFloatingMessagePosX = 0.0f; + mFloatingMessagePosY = -100.0f; + + mMessageID = 395; + mFlowID = 3003; + mMessageDuration = 150; + mMessageDebug = false; + mFlowDebug = false; + + mTouchAreaSelectBlack[0].set(255, 145, 100, 0); + mTouchAreaSelectWhite[0].set(255, 145, 100, 255); + mTouchAreaSelectBlack[1].set(0, 0, 0, 0); + mTouchAreaSelectWhite[1].set(255, 255, 0, 255); + mTouchAreaSelectBlack[2].set(200, 200, 200, 0); + mTouchAreaSelectWhite[2].set(200, 200, 200, 255); + + mTouchAreaSelectFrameNum = 10; + + mTouchAreaSelectScale[0] = 0.95f; + mTouchAreaSelectScale[1] = 1.1f; + mTouchAreaSelectScale[2] = 0.8f; + mTouchAreaSelectScale[3] = 1.2f; + mTouchAreaSelectScale[4] = 1.2f; + mTouchAreaUnselectScale[0] = 0.8f; + mTouchAreaUnselectScale[1] = 0.9f; + mTouchAreaUnselectScale[2] = 0.7f; + mTouchAreaUnselectScale[3] = 1.0f; + mTouchAreaUnselectScale[4] = 1.0f; + + for (int i = 0; i < 5; i++) { + mTouchAreaScale[i] = 1.0f; + mTouchAreaAlpha[i] = 1.0f; + } + + mTouchAreaPosX[0] = -20.0f; + mTouchAreaPosY[0] = -9.0f; + mTouchAreaPosX[1] = -6.0f; + mTouchAreaPosY[1] = 0.0f; + mTouchAreaPosX[2] = 0.0f; + mTouchAreaPosY[2] = 0.0f; + mTouchAreaPosX[3] = 0.0f; + mTouchAreaPosY[3] = 0.0f; + mTouchAreaPosX[4] = 0.0f; + mTouchAreaPosY[4] = 0.0f; + +#if VERSION == VERSION_WII_USA_R0 + mDpadMAPScale = 1.2f; +#else + mDpadMAPScale = 1.0f; +#endif + mDpadMAPPosX = 0.0f; + mDpadMAPPosY = 0.0f; + + field_0x60a = false; + + mLanternIconMeterPosX = 0.0f; + mLanternIconMeterPosY = 0.0f; + mLanternIconMeterSize = 1.0f; +#else + // MWCC generates a weird function body in ShieldD which is effectively a no-op - + // this is probably a complete fakematch but it doesn't really matter + if (false) { + UNUSED(this); + UNUSED(this); + int unused1; + int unused2; + UNUSED(unused1); + UNUSED(unused2); + updateOnWide(); + } +#endif // PLATFORM_WII +} +#endif // VERSION != VERSION_WII_USA_KIOSK +#endif // WIDESCREEN_SUPPORT #if DEBUG void dMeter_drawHIO_c::genMessage(JORMContext* mctx) { @@ -2599,10 +4007,10 @@ void dMeter_drawHIO_c::genMessage(JORMContext* mctx) { mctx->genLabel("************************************", 0); mctx->genLabel("*　　　Ｚアイテムベースの調整　　　*", 0); mctx->genLabel("************************************", 0); - mctx->genSlider("拡大縮小", &mButtonZItemBaseScale, 0.0f, 3.0f); - mctx->genSlider("位置調整Ｘ", &mButtonZItemBasePosX, -300.0f, 300.0f); - mctx->genSlider("位置調整Ｙ", &mButtonZItemBasePosY, -300.0f, 300.0f); - mctx->genSlider("アルファ", &mButtonZItemBaseAlpha, 0.0f, 1.0f); + mctx->genSlider("拡大縮小", &mButtonZGCNItemBaseScale, 0.0f, 3.0f); + mctx->genSlider("位置調整Ｘ", &mButtonZGCNItemBasePosX, -300.0f, 300.0f); + mctx->genSlider("位置調整Ｙ", &mButtonZGCNItemBasePosY, -300.0f, 300.0f); + mctx->genSlider("アルファ", &mButtonZGCNItemBaseAlpha, 0.0f, 1.0f); mctx->genLabel("", 0); mctx->genLabel("************************************", 0); mctx->genLabel("* 　　　　Ｚフォントの調整　　　　 *", 0); @@ -3005,6 +4413,9 @@ void dMeter_drawHIO_c::updateFMsgDebug() { dMeter_ringHIO_c::dMeter_ringHIO_c() { #if WIDESCREEN_SUPPORT updateOnWide(); + + // needed to match DZDE01 .sdata2 + UNUSED(-60.0f); #else mRingRadiusH = 175.0f; mRingRadiusV = 160.0f; @@ -3042,25 +4453,25 @@ dMeter_ringHIO_c::dMeter_ringHIO_c() { mCenterScale = 1.0f; mOverlayAlpha = 0.35f; - mGuidePosX[SET_ITEM] = -59.0f; - mGuidePosY[SET_ITEM] = -64.0f; - mGuideScale[SET_ITEM] = 0.8f; + mGuidePosX[GUIDE_SET_ITEM] = -59.0f; + mGuidePosY[GUIDE_SET_ITEM] = -64.0f; + mGuideScale[GUIDE_SET_ITEM] = 0.8f; - mGuidePosX[DIRECT_SELECT] = 90.0f; - mGuidePosY[DIRECT_SELECT] = -124.0f; - mGuideScale[DIRECT_SELECT] = 0.8f; + mGuidePosX[GUIDE_DIRECT_SELECT] = 90.0f; + mGuidePosY[GUIDE_DIRECT_SELECT] = -124.0f; + mGuideScale[GUIDE_DIRECT_SELECT] = 0.8f; mGuidePosX[2] = 0.0f; mGuidePosY[2] = 0.0f; mGuideScale[2] = 1.0f; - mGuidePosX[ROTATE] = 118.0f; - mGuidePosY[ROTATE] = -127.0f; - mGuideScale[ROTATE] = 0.8f; + mGuidePosX[GUIDE_ROTATE] = 118.0f; + mGuidePosY[GUIDE_ROTATE] = -127.0f; + mGuideScale[GUIDE_ROTATE] = 0.8f; - mGuidePosX[COMBO_ITEM] = -1.3f; - mGuidePosY[COMBO_ITEM] = -14.0f; - mGuideScale[COMBO_ITEM] = 0.85f; + mGuidePosX[GUIDE_COMBO_ITEM] = -1.3f; + mGuidePosY[GUIDE_COMBO_ITEM] = -14.0f; + mGuideScale[GUIDE_COMBO_ITEM] = 0.85f; for (int i = 5; i < 10; i++) { mGuidePosX[i] = 0.0f; @@ -3161,6 +4572,36 @@ void dMeter_ringHIO_c::updateOnWide() { mCenterScale = 1.0f; mOverlayAlpha = 0.3f; +#if PLATFORM_WII + mGuidePosX[GUIDE_UNK_8] = 0.0f; + mGuidePosY[GUIDE_UNK_8] = -60.0f; + mGuideScale[GUIDE_UNK_8] = 0.7f; + + mGuidePosX[GUIDE_UNK_9] = 0.0f; + mGuidePosY[GUIDE_UNK_9] = -50.0f; + mGuideScale[GUIDE_UNK_9] = 1.0f; + + mGuidePosX[GUIDE_SET_ITEM] = 0.0f; + mGuidePosY[GUIDE_SET_ITEM] = 0.0f; + mGuideScale[GUIDE_SET_ITEM] = 1.0f; + + mGuidePosX[GUIDE_UNK_5] = 11.0f; + mGuidePosY[GUIDE_UNK_5] = -1.3f; + mGuideScale[GUIDE_UNK_5] = 1.4f; + + mGuidePosX[GUIDE_UNK_6] = 0.0f; + mGuidePosY[GUIDE_UNK_6] = -11.0f; + mGuideScale[GUIDE_UNK_6] = 1.0f; + + mGuidePosX[GUIDE_UNK_7] = 0.0f; + mGuidePosY[GUIDE_UNK_7] = -11.0f; + mGuideScale[GUIDE_UNK_7] = 1.0f; + + mGuidePosX[GUIDE_COMBO_ITEM] = -23.0f; + mGuidePosY[GUIDE_COMBO_ITEM] = 0.0f; + mGuideScale[GUIDE_COMBO_ITEM] = 1.0f; +#endif + mSelectPosX = 2.2f; mSelectPosY = 3.0f; mSelectScaleX = 0.8f; @@ -3219,33 +4660,54 @@ void dMeter_ringHIO_c::updateOnWide() { field_0x4c = 1.0f; field_0x154 = 255; - mGuidePosX[SET_ITEM] = -59.0f; - mGuidePosY[SET_ITEM] = -64.0f; - mGuideScale[SET_ITEM] = 0.8f; +#if PLATFORM_WII + mGuidePosX[GUIDE_DIRECT_SELECT] = 0.0f; + mGuidePosY[GUIDE_DIRECT_SELECT] = 0.0f; + mGuideScale[GUIDE_DIRECT_SELECT] = 1.0f; - mGuidePosX[DIRECT_SELECT] = 90.0f; - mGuidePosY[DIRECT_SELECT] = -124.0f; - mGuideScale[DIRECT_SELECT] = 0.8f; + mGuidePosX[GUIDE_UNK_2] = 0.0f; + mGuidePosY[GUIDE_UNK_2] = 0.0f; + mGuideScale[GUIDE_UNK_2] = 1.0f; - mGuidePosX[2] = 0.0f; - mGuidePosY[2] = 0.0f; - mGuideScale[2] = 1.0f; + mGuidePosX[GUIDE_ROTATE] = 0.0f; + mGuidePosY[GUIDE_ROTATE] = 0.0f; + mGuideScale[GUIDE_ROTATE] = 1.0f; +#else + mGuidePosX[GUIDE_SET_ITEM] = -59.0f; + mGuidePosY[GUIDE_SET_ITEM] = -64.0f; + mGuideScale[GUIDE_SET_ITEM] = 0.8f; - mGuidePosX[ROTATE] = 118.0f; - mGuidePosY[ROTATE] = -127.0f; - mGuideScale[ROTATE] = 0.8f; + mGuidePosX[GUIDE_DIRECT_SELECT] = 90.0f; + mGuidePosY[GUIDE_DIRECT_SELECT] = -124.0f; + mGuideScale[GUIDE_DIRECT_SELECT] = 0.8f; - mGuidePosX[COMBO_ITEM] = -1.3f; - mGuidePosY[COMBO_ITEM] = -14.0f; - mGuideScale[COMBO_ITEM] = 0.85f; + mGuidePosX[GUIDE_UNK_2] = 0.0f; + mGuidePosY[GUIDE_UNK_2] = 0.0f; + mGuideScale[GUIDE_UNK_2] = 1.0f; + + mGuidePosX[GUIDE_ROTATE] = 118.0f; + mGuidePosY[GUIDE_ROTATE] = -127.0f; + mGuideScale[GUIDE_ROTATE] = 0.8f; + + mGuidePosX[GUIDE_COMBO_ITEM] = -1.3f; + mGuidePosY[GUIDE_COMBO_ITEM] = -14.0f; + mGuideScale[GUIDE_COMBO_ITEM] = 0.85f; + +#if PLATFORM_WII + mGuidePosX[GUIDE_UNK_2] = 0.0f; + mGuidePosY[GUIDE_UNK_2] = 0.0f; + mGuideScale[GUIDE_UNK_2] = 1.0f; +#endif for (int i = 5; i < 10; i++) { mGuidePosX[i] = 0.0f; mGuidePosY[i] = 18.0f; mGuideScale[i] = 0.85f; } +#endif // PLATFORM_WII } +#if VERSION != VERSION_WII_USA_KIOSK void dMeter_ringHIO_c::updateOffWide() { mRingRadiusH = 170.0f; mRingRadiusV = 160.0f; @@ -3291,15 +4753,15 @@ void dMeter_ringHIO_c::updateOffWide() { mGuidePosX[8] = 0.0f; mGuidePosY[8] = -60.0f; - mGuideScale[8] = 0.7; + mGuideScale[8] = 0.7f; mGuidePosX[9] = 0.0f; mGuidePosY[9] = -50.0f; mGuideScale[9] = 1.0f; - mGuidePosX[SET_ITEM] = 0.0f; - mGuidePosY[SET_ITEM] = 0.0f; - mGuideScale[SET_ITEM] = 1.0f; + mGuidePosX[GUIDE_SET_ITEM] = 0.0f; + mGuidePosY[GUIDE_SET_ITEM] = 0.0f; + mGuideScale[GUIDE_SET_ITEM] = 1.0f; mGuidePosX[5] = 11.0f; mGuidePosY[5] = -1.3f; @@ -3313,9 +4775,9 @@ void dMeter_ringHIO_c::updateOffWide() { mGuidePosY[7] = -11.0f; mGuideScale[7] = 1.0f; - mGuidePosX[COMBO_ITEM] = -23.0f; - mGuidePosY[COMBO_ITEM] = 0.0f; - mGuideScale[COMBO_ITEM] = 1.0f; + mGuidePosX[GUIDE_COMBO_ITEM] = -23.0f; + mGuidePosY[GUIDE_COMBO_ITEM] = 0.0f; + mGuideScale[GUIDE_COMBO_ITEM] = 1.0f; mSelectPosX = 2.2f; mSelectPosY = 3.0f; @@ -3375,19 +4837,20 @@ void dMeter_ringHIO_c::updateOffWide() { field_0x4c = 1.0f; field_0x154 = 255; - mGuidePosX[DIRECT_SELECT] = 0.0f; - mGuidePosY[DIRECT_SELECT] = 0.0f; - mGuideScale[DIRECT_SELECT] = 1.0f; + mGuidePosX[GUIDE_DIRECT_SELECT] = 0.0f; + mGuidePosY[GUIDE_DIRECT_SELECT] = 0.0f; + mGuideScale[GUIDE_DIRECT_SELECT] = 1.0f; mGuidePosX[2] = 0.0f; mGuidePosY[2] = 0.0f; mGuideScale[2] = 1.0f; - mGuidePosX[ROTATE] = 0.0f; - mGuidePosY[ROTATE] = 0.0f; - mGuideScale[ROTATE] = 1.0f; + mGuidePosX[GUIDE_ROTATE] = 0.0f; + mGuidePosY[GUIDE_ROTATE] = 0.0f; + mGuideScale[GUIDE_ROTATE] = 1.0f; } -#endif +#endif // VERSION != VERSION_WII_USA_KIOSK +#endif // WIDESCREEN_SUPPORT #if DEBUG void dMeter_ringHIO_c::genMessage(JORMContext* mctx) { @@ -3484,7 +4947,7 @@ void dMeter_ringHIO_c::genMessage(JORMContext* mctx) { BOOL subJOREventCallbackListNode::JORAct(u32 param_1, const char* param_2) { UNUSED(param_1); JORFile file; - if (file.open(param_2, 1, "", NULL, NULL, NULL)) { + if (file.open(param_2, 1, "\0", NULL, NULL, NULL)) { if (!g_fmapHIO.mpArcFile) { g_fmapHIO.mpArcFile = mDoExt_getArchiveHeap()->alloc(0x46000, 0x20); JUT_ASSERT(6390, g_fmapHIO.mpArcFile != NULL); @@ -3517,6 +4980,8 @@ BOOL subJOREventCallbackListNode::JORAct(u32 param_1, const char* param_2) { #endif dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() { + // needed to match DZDE01 .sdata2 + UNUSED(1.6f); mPortalCursorScale = 0.5f; mPortalIconScale = 0.65f; mDestinationScale[0] = 0.5f; @@ -3846,6 +5311,44 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() { mSubTitlePosY = 4.5f; mSubTitleScale = 0.9f; +#if PLATFORM_WII + mAreaMovementPosX = -4.0f; + mAreaMovementPosY = 12.0f; + mAreaMovementScale = 1.0f; + + mClosingPosX = -14.0f; + mClosingPosY = 12.0f; + mClosingScale = 0.9f; + + mDoIconPosX = 0.0f; + mDoIconPosY = 0.0f; + mDoIconScale = 1.0f; + mButtonDebugON = false; + + mButtonZPosX = -18.0f; + mButtonZPosY = 54.0f; + mButtonZScale = 0.92f; + + mButtonAPosX = -18.0f; + mButtonAPosY = 130.0f; + mButtonAScale = 0.92f; + + mButtonBPosX = -18.0f; + mButtonBPosY = -1.3f; + mButtonBScale = 1.05f; + + mButtonZTextPosX = -18.0f; + mButtonZTextPosY = 57.0f; + mButtonZTextScale = 0.95f; + + mButtonATextPosX = -18.0f; + mButtonATextPosY = 128.0f; + mButtonATextScale = 0.95f; + + mButtonBTextPosX = -18.0f; + mButtonBTextPosY = -1.3f; + mButtonBTextScale = 0.95f; +#else mAreaMovementPosX = 6.0f; mAreaMovementPosY = -20.0f; mAreaMovementScale = 1.0f; @@ -3882,6 +5385,7 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() { mButtonBTextPosX = -7.0f; mButtonBTextPosY = 5.0f; mButtonBTextScale = 0.95f; +#endif mMapBlink[WORLD_VIEW].mSelectedRegion.mBlack.set(29, 24, 0, 0); mMapBlink[WORLD_VIEW].mSelectedRegion.mWhite.set(255, 255, 255, 255); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index bb526cd086..25297e049e 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -126,11 +126,14 @@ int dTimer_c::_create() { mp_tm_scrn->setHIOType(field_0x16D); +#if VERSION != VERSION_WII_USA_R0 if (mp_tm_scrn->getHIOType() != 0 && field_0x16D == 0) { f32 var_f0 = 0.0f; setCounterPos(g_drawHIO.mMiniGame.mTimerPosX_4x3 + var_f0, g_drawHIO.mMiniGame.mTimerPosY_4x3); - } else { + } else +#endif + { f32 var_f0 = 0.0f; setCounterPos(g_drawHIO.mMiniGame.mTimerPosX[field_0x16D] + var_f0, g_drawHIO.mMiniGame.mTimerPosY[field_0x16D]); @@ -514,17 +517,23 @@ void dDlst_TimerScrnDraw_c::setHIO() { } if (mpTimeParent != NULL) { +#if VERSION != VERSION_WII_USA_R0 if (field_0x3e2 != 0 && mHIOType == 0) { setTimerPos(g_drawHIO.mMiniGame.mTimerPosX_4x3, g_drawHIO.mMiniGame.mTimerPosY_4x3); - } else { + } else +#endif + { setTimerPos(g_drawHIO.mMiniGame.mTimerPosX[mHIOType], g_drawHIO.mMiniGame.mTimerPosY[mHIOType]); } +#if VERSION != VERSION_WII_USA_R0 if (field_0x3e2 != 0 && mHIOType == 0) { mpTimeParent->scale(g_drawHIO.mMiniGame.mTimerSizeX_4x3, g_drawHIO.mMiniGame.mTimerSizeY_4x3); - } else { + } else +#endif + { mpTimeParent->scale(g_drawHIO.mMiniGame.mTimerSizeX[mHIOType], g_drawHIO.mMiniGame.mTimerSizeY[mHIOType]); } @@ -1120,10 +1129,13 @@ void dDlst_TimerScrnDraw_c::anime() { f32 temp_f1 = (1.0f - temp_f31) * -50.0f; if (mpTimeParent != NULL) { +#if VERSION != VERSION_WII_USA_R0 if (field_0x3e2 != 0 && mHIOType == 0) { setTimerPos(g_drawHIO.mMiniGame.mTimerPosX_4x3 + temp_f1, g_drawHIO.mMiniGame.mTimerPosY_4x3); - } else { + } else +#endif + { setTimerPos(g_drawHIO.mMiniGame.mTimerPosX[mHIOType] + temp_f1, g_drawHIO.mMiniGame.mTimerPosY[mHIOType]); } @@ -1131,10 +1143,13 @@ void dDlst_TimerScrnDraw_c::anime() { mpTimeParent->setAlphaRate(mParentAlpha * (temp_f31 * g_drawHIO.mMiniGame.mTimerAlpha[mHIOType])); +#if VERSION != VERSION_WII_USA_R0 if (field_0x3e2 != 0 && mHIOType == 0) { mpTimeParent->scale(g_drawHIO.mMiniGame.mTimerSizeX_4x3, g_drawHIO.mMiniGame.mTimerSizeY_4x3); - } else { + } else +#endif + { mpTimeParent->scale(g_drawHIO.mMiniGame.mTimerSizeX[mHIOType], g_drawHIO.mMiniGame.mTimerSizeY[mHIOType]); } @@ -1184,10 +1199,13 @@ BOOL dDlst_TimerScrnDraw_c::closeAnime() { f32 temp_f1 = temp_f31 * -50.0f; if (mpTimeParent != NULL) { +#if VERSION != VERSION_WII_USA_R0 if (field_0x3e2 != 0 && mHIOType == 0) { setTimerPos(g_drawHIO.mMiniGame.mTimerPosX_4x3 + temp_f1, g_drawHIO.mMiniGame.mTimerPosY_4x3); - } else { + } else +#endif + { setTimerPos(g_drawHIO.mMiniGame.mTimerPosX[mHIOType] + temp_f1, g_drawHIO.mMiniGame.mTimerPosY[mHIOType]); }