mirror of
https://github.com/zeldaret/tp
synced 2026-06-25 18:04:43 -04:00
d_meter_HIO Wii/debug mostly matching (#3158)
This commit is contained in:
Max Roncace
@@ -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:
|
||||
|
||||
+23
-23
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
+22
-22
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
+23
-23
@@ -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
|
||||
|
||||
+84
-40
@@ -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;
|
||||
|
||||
@@ -20,7 +20,11 @@ public:
|
||||
#endif
|
||||
};
|
||||
|
||||
class JORReflexible : public JOREventListener {
|
||||
class JORReflexible
|
||||
#if !PLATFORM_WII
|
||||
: public JOREventListener
|
||||
#endif
|
||||
{
|
||||
public:
|
||||
#if DEBUG
|
||||
JORReflexible() {}
|
||||
|
||||
@@ -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]) {
|
||||
|
||||
+6
-6
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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() {}
|
||||
|
||||
|
||||
+1571
-67
File diff suppressed because it is too large
Load Diff
+24
-6
@@ -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]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user