Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Started working on Overshell related classes in band3 #367

Merged
merged 8 commits into from
Oct 6, 2024
Merged

Started working on Overshell related classes in band3 #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c762ce2
cymbalselectionprovider linked
rjkiv Oct 6, 2024
61021a9
charprovider attempt
rjkiv Oct 6, 2024
e55eb90
banduser work
rjkiv Oct 6, 2024
a1f42a7
overshellssmgr work
rjkiv Oct 6, 2024
317b1e2
overshellslotstate linked
rjkiv Oct 6, 2024
f783989
add quazal synchronize class
rjkiv Oct 6, 2024
7cbde5e
overshellpsp work
rjkiv Oct 6, 2024
b08e984
add suprovider
rjkiv Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/SZBE69/objects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
"objects": {
"band3/bandtrack/TrackConfig.cpp": "Equivalent",

"band3/meta_band/OvershellSlotState.cpp": "NonMatching",

"band3/tour/TourReward.cpp": "NonMatching"
}
},
Expand Down
2 changes: 1 addition & 1 deletion config/SZBE69/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ band3/meta_band/OvershellPanel.cpp:
.text start:0x8023FAF4 end:0x802473C0
.ctors start:0x807EFE70 end:0x807EFE74

rb3/unknown/802/unk_80252B98.cpp:
band3/meta_band/OvershellSlotState.cpp:
.text start:0x80252B98 end:0x80253774

rb3/panels/parentalcontrolpanel.cpp:
Expand Down
86 changes: 43 additions & 43 deletions config/SZBE69/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19551,7 +19551,7 @@ fn_8024349C = .text:0x8024349C; // type:function size:0x17C
fn_80243618 = .text:0x80243618; // type:function size:0x8
fn_80243620 = .text:0x80243620; // type:function size:0x4
fn_80243624 = .text:0x80243624; // type:function size:0xA8
fn_802436CC = .text:0x802436CC; // type:function size:0xC
Type__7MessageCFv = .text:0x802436CC; // type:function size:0xC
fn_802436D8 = .text:0x802436D8; // type:function size:0x8
fn_802436E0 = .text:0x802436E0; // type:function size:0x8
fn_802436E8 = .text:0x802436E8; // type:function size:0x8
Expand Down Expand Up @@ -19866,33 +19866,33 @@ fn_80252A78 = .text:0x80252A78; // type:function size:0x54
fn_80252ACC = .text:0x80252ACC; // type:function size:0x5C
fn_80252B28 = .text:0x80252B28; // type:function size:0x5C
fn_80252B84 = .text:0x80252B84; // type:function size:0x14
fn_80252B98 = .text:0x80252B98; // type:function size:0x78
fn_80252C10 = .text:0x80252C10; // type:function size:0x8
fn_80252C18 = .text:0x80252C18; // type:function size:0x58
fn_80252C70 = .text:0x80252C70; // type:function size:0x3C
fn_80252CAC = .text:0x80252CAC; // type:function size:0x60
fn_80252D0C = .text:0x80252D0C; // type:function size:0x90
fn_80252D9C = .text:0x80252D9C; // type:function size:0x74
fn_80252E10 = .text:0x80252E10; // type:function size:0x74
fn_80252E84 = .text:0x80252E84; // type:function size:0x74
fn_80252EF8 = .text:0x80252EF8; // type:function size:0x74
fn_80252F6C = .text:0x80252F6C; // type:function size:0x74
fn_80252FE0 = .text:0x80252FE0; // type:function size:0x74
fn_80253054 = .text:0x80253054; // type:function size:0x74
fn_802530C8 = .text:0x802530C8; // type:function size:0x74
fn_8025313C = .text:0x8025313C; // type:function size:0x8C
fn_802531C8 = .text:0x802531C8; // type:function size:0x74
fn_8025323C = .text:0x8025323C; // type:function size:0x74
fn_802532B0 = .text:0x802532B0; // type:function size:0x74
fn_80253324 = .text:0x80253324; // type:function size:0x74
fn_80253398 = .text:0x80253398; // type:function size:0x74
fn_8025340C = .text:0x8025340C; // type:function size:0xCC
fn_802534D8 = .text:0x802534D8; // type:function size:0x40
fn_80253518 = .text:0x80253518; // type:function size:0xC0
fn_802535D8 = .text:0x802535D8; // type:function size:0x60
__ct__18OvershellSlotStateFP9DataArrayP13OvershellSlot = .text:0x80252B98; // type:function size:0x78
GetStateID__18OvershellSlotStateCFv = .text:0x80252C10; // type:function size:0x8
GetView__18OvershellSlotStateFv = .text:0x80252C18; // type:function size:0x58
UpdateView__18OvershellSlotStateFv = .text:0x80252C70; // type:function size:0x3C
UsesRemoteStatusView__18OvershellSlotStateFv = .text:0x80252CAC; // type:function size:0x60
GetRemoteStatus__18OvershellSlotStateFv = .text:0x80252D0C; // type:function size:0x90
AllowsInputToShell__18OvershellSlotStateFv = .text:0x80252D9C; // type:function size:0x74
PreventsOverride__18OvershellSlotStateFv = .text:0x80252E10; // type:function size:0x74
RequiresOnlineSession__18OvershellSlotStateFv = .text:0x80252E84; // type:function size:0x74
RequiresRemoteUsers__18OvershellSlotStateFv = .text:0x80252EF8; // type:function size:0x74
AllowsHiding__18OvershellSlotStateFv = .text:0x80252F6C; // type:function size:0x74
RetractedPosition__18OvershellSlotStateFv = .text:0x80252FE0; // type:function size:0x74
ShowsExtendedMicArrows__18OvershellSlotStateFv = .text:0x80253054; // type:function size:0x74
InSongSettingsFlow__18OvershellSlotStateFv = .text:0x802530C8; // type:function size:0x74
IsPartUnresolved__18OvershellSlotStateFv = .text:0x8025313C; // type:function size:0x8C
InRegisterOnlineFlow__18OvershellSlotStateFv = .text:0x802531C8; // type:function size:0x74
InChooseCharFlow__18OvershellSlotStateFv = .text:0x8025323C; // type:function size:0x74
InCharEditFlow__18OvershellSlotStateFv = .text:0x802532B0; // type:function size:0x74
IsRemoveUserPrompt__18OvershellSlotStateFv = .text:0x80253324; // type:function size:0x74
IsReadyToPlay__18OvershellSlotStateFv = .text:0x80253398; // type:function size:0x74
HandleMsg__18OvershellSlotStateFRC7Message = .text:0x8025340C; // type:function size:0xCC
__ct__21OvershellSlotStateMgrFv = .text:0x802534D8; // type:function size:0x40
Init__21OvershellSlotStateMgrFP9DataArrayP13OvershellSlot = .text:0x80253518; // type:function size:0xC0
__dt__21OvershellSlotStateMgrFv = .text:0x802535D8; // type:function size:0x60
fn_80253638 = .text:0x80253638; // type:function size:0x5C
fn_80253694 = .text:0x80253694; // type:function size:0x5C
fn_802536F0 = .text:0x802536F0; // type:function size:0x84
GetSlotState__21OvershellSlotStateMgrF20OvershellSlotStateID = .text:0x802536F0; // type:function size:0x84
__ct__20ParentalControlPanelFv = .text:0x80253774; // type:function size:0x84
Enter__20ParentalControlPanelFv = .text:0x802537F8; // type:function size:0x34
Poll__20ParentalControlPanelFv = .text:0x8025382C; // type:function size:0x60
Expand Down Expand Up @@ -79106,8 +79106,8 @@ lbl_8097CD88 = .bss:0x8097CD88; // type:object size:0x78 data:4byte
lbl_8097CE00 = .bss:0x8097CE00; // type:object size:0x4 data:4byte
lbl_8097CE04 = .bss:0x8097CE04; // type:object size:0x4 data:4byte
lbl_8097CE08 = .bss:0x8097CE08; // type:object size:0xC
MsgAllowsHiding = .bss:0x8097CE18; // type:object size:0x18
MsgAllowsInputToShell = .bss:0x8097CE30; // type:object size:0x18
allows_hiding_msg = .bss:0x8097CE18; // type:object size:0x18
allows_input_to_shell_msg = .bss:0x8097CE30; // type:object size:0x18
MsgArtLoaded = .bss:0x8097CE48; // type:object size:0x18
MsgAutoScriptDone = .bss:0x8097CE60; // type:object size:0x18
MsgBlockWipeIn = .bss:0x8097CE78; // type:object size:0x18
Expand All @@ -79117,11 +79117,11 @@ cam_cut_msg = .bss:0x8097CEC0; // type:object size:0x18
MsgCancelFindOverride = .bss:0x8097CED8; // type:object size:0x18
MsgChangeFile = .bss:0x8097CEF0; // type:object size:0x18
MsgChangeProxies = .bss:0x8097CF08; // type:object size:0x18
MsgCharEditFlow = .bss:0x8097CF20; // type:object size:0x18
char_edit_flow_msg = .bss:0x8097CF20; // type:object size:0x18
MsgCheatInit = .bss:0x8097CF38; // type:object size:0x18
MsgCheckDisconnect = .bss:0x8097CF50; // type:object size:0x18
MsgCheckoutFailed = .bss:0x8097CF68; // type:object size:0x18
MsgChooseCharFlow = .bss:0x8097CF80; // type:object size:0x18
choose_char_flow_msg = .bss:0x8097CF80; // type:object size:0x18
MsgChooseColors = .bss:0x8097CF98; // type:object size:0x18
MsgChooseFinish = .bss:0x8097CFB0; // type:object size:0x18
clear_all_msg = .bss:0x8097CFC8; // type:object size:0x18
Expand Down Expand Up @@ -79259,16 +79259,16 @@ MsgOnSignedIntoGuest = .bss:0x8097DC28; // type:object size:0x18
MsgOnSignedOut = .bss:0x8097DC40; // type:object size:0x18
MsgOnViewModify = .bss:0x8097DC58; // type:object size:0x18
panel_navigated_msg = .bss:0x8097DC70; // type:object size:0x18
MsgPartUnresolved = .bss:0x8097DC88; // type:object size:0x18
part_unresolved_msg = .bss:0x8097DC88; // type:object size:0x18
MsgPhraseEnd = .bss:0x8097DCA0; // type:object size:0x18
MsgPickIntro = .bss:0x8097DCB8; // type:object size:0x18
pick_intro_shot_msg = .bss:0x8097DCD0; // type:object size:0x30
MsgPlayCorrectFret = .bss:0x8097DD00; // type:object size:0x18
poll_msg = .bss:0x8097DD18; // type:object size:0x30
MsgPostRender = .bss:0x8097DD48; // type:object size:0x18
MsgPreRender = .bss:0x8097DD60; // type:object size:0x18
MsgPreventsOverride = .bss:0x8097DD78; // type:object size:0x30
MsgReadyToPlay = .bss:0x8097DDA8; // type:object size:0x18
prevents_override_msg = .bss:0x8097DD78; // type:object size:0x30
ready_to_play_msg = .bss:0x8097DDA8; // type:object size:0x18
MsgRecommendationsReady = .bss:0x8097DDC0; // type:object size:0x18
MsgRefresh = .bss:0x8097DDD8; // type:object size:0x18
MsgRefreshAll = .bss:0x8097DDF0; // type:object size:0x18
Expand All @@ -79288,19 +79288,19 @@ MsgRefreshSonglist = .bss:0x8097DF28; // type:object size:0x18
MsgRefreshStarted = .bss:0x8097DF40; // type:object size:0x18
MsgRefreshSummary = .bss:0x8097DF58; // type:object size:0x18
MsgRefreshTop = .bss:0x8097DF70; // type:object size:0x18
MsgRegisterOnlineFlow = .bss:0x8097DF88; // type:object size:0x18
MsgRemoteStatus = .bss:0x8097DFA0; // type:object size:0x18
register_online_flow_msg = .bss:0x8097DF88; // type:object size:0x18
remote_status_msg = .bss:0x8097DFA0; // type:object size:0x18
remove_midi_parsers_msg = .bss:0x8097DFB8; // type:object size:0x18
MsgRemoveUserPrompt = .bss:0x8097DFD0; // type:object size:0x18
MsgRequiresOnlineSession = .bss:0x8097DFE8; // type:object size:0x18
MsgRequiresRemoteUsers = .bss:0x8097E000; // type:object size:0x18
remove_user_prompt_msg = .bss:0x8097DFD0; // type:object size:0x18
requires_online_session_msg = .bss:0x8097DFE8; // type:object size:0x18
requires_remote_users_msg = .bss:0x8097E000; // type:object size:0x18
reset_msg = .bss:0x8097E018; // type:object size:0x18
MsgResetCam = .bss:0x8097E030; // type:object size:0x18
MsgResetChord = .bss:0x8097E048; // type:object size:0x18
reset_particles_msg = .bss:0x8097E060; // type:object size:0x18
MsgResetScore = .bss:0x8097E078; // type:object size:0x18
MsgRestrictionToken = .bss:0x8097E090; // type:object size:0x18
MsgRetractedPosition = .bss:0x8097E0A8; // type:object size:0x18
retracted_position_msg = .bss:0x8097E0A8; // type:object size:0x18
MsgSaved = .bss:0x8097E0C0; // type:object size:0x18
MsgScore = .bss:0x8097E0D8; // type:object size:0x18
MsgSearchFinished = .bss:0x8097E0F0; // type:object size:0x18
Expand Down Expand Up @@ -79334,8 +79334,8 @@ MsgShowLowFretsLefty = .bss:0x8097E378; // type:object size:0x18
MsgShowMessage = .bss:0x8097E390; // type:object size:0x18
MsgShowPhysicalWriteIcon = .bss:0x8097E3A8; // type:object size:0x18
MsgShowSetlistSaveDialog = .bss:0x8097E3C0; // type:object size:0x18
MsgShowsExtendedMicArrows = .bss:0x8097E3D8; // type:object size:0x18
MsgSongSettingsFlow = .bss:0x8097E3F0; // type:object size:0x18
shows_extended_mic_arrows_msg = .bss:0x8097E3D8; // type:object size:0x18
song_settings_flow_msg = .bss:0x8097E3F0; // type:object size:0x18
start_msg = .bss:0x8097E408; // type:object size:0x18
start_anim_msg = .bss:0x8097E420; // type:object size:0x18
MsgStartShot = .bss:0x8097E438; // type:object size:0x18
Expand Down Expand Up @@ -79365,8 +79365,8 @@ update_gems_msg = .bss:0x8097E660; // type:object size:0x18
MsgUpdateLoadingStatus = .bss:0x8097E678; // type:object size:0x18
MsgUpdateOutfitList = .bss:0x8097E690; // type:object size:0x18
update_range_msg = .bss:0x8097E6A8; // type:object size:0x18
MsgUpdateView = .bss:0x8097E6C0; // type:object size:0x30
MsgView = .bss:0x8097E6F0; // type:object size:0x18
update_view_msg = .bss:0x8097E6C0; // type:object size:0x30
view_msg = .bss:0x8097E6F0; // type:object size:0x18
MsgVignetteOutro = .bss:0x8097E708; // type:object size:0x18
want_outro_duck_msg = .bss:0x8097E720; // type:object size:0x18
MsgWhammyEnd = .bss:0x8097E738; // type:object size:0x18
Expand Down
14 changes: 7 additions & 7 deletions config/SZBE69_B8/objects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"band3/meta_band/CampaignSongInfoPanel.cpp": "MISSING",
"band3/meta_band/CharCache.cpp": "MISSING",
"band3/meta_band/CharData.cpp": "MISSING",
"band3/meta_band/CharProvider.cpp": "MISSING",
"band3/meta_band/CharProvider.cpp": "NonMatching",
"band3/meta_band/CharSync.cpp": "MISSING",
"band3/meta_band/CharacterCreatorPanel.cpp": "MISSING",
"band3/meta_band/ChooseColorPanel.cpp": "MISSING",
Expand All @@ -173,7 +173,7 @@
"band3/meta_band/CriticalUserListener.cpp": "MISSING",
"band3/meta_band/CurrentOutfitProvider.cpp": "MISSING",
"band3/meta_band/CustomizePanel.cpp": "MISSING",
"band3/meta_band/CymbalSelectionProvider.cpp": "MISSING",
"band3/meta_band/CymbalSelectionProvider.cpp": "Matching",
"band3/meta_band/EditSetlistPanel.cpp": "MISSING",
"band3/meta_band/EventDialogPanel.cpp": "MISSING",
"band3/meta_band/EyebrowsProvider.cpp": "MISSING",
Expand Down Expand Up @@ -211,11 +211,11 @@
"band3/meta_band/NewAwardPanel.cpp": "MISSING",
"band3/meta_band/NextSongPanel.cpp": "MISSING",
"band3/meta_band/OutfitProvider.cpp": "MISSING",
"band3/meta_band/OvershellPanel.cpp": "MISSING",
"band3/meta_band/OvershellPartSelectProvider.cpp": "MISSING",
"band3/meta_band/OvershellPanel.cpp": "NonMatching",
"band3/meta_band/OvershellPartSelectProvider.cpp": "NonMatching",
"band3/meta_band/OvershellProfileProvider_Wii.cpp": "MISSING",
"band3/meta_band/OvershellSlot.cpp": "MISSING",
"band3/meta_band/OvershellSlotState.cpp": "MISSING",
"band3/meta_band/OvershellSlotState.cpp": "Matching",
"band3/meta_band/ParentalControlPanel.cpp": "MISSING",
"band3/meta_band/PassiveMessagesPanel.cpp": "MISSING",
"band3/meta_band/PassiveMessenger.cpp": "MISSING",
Expand All @@ -232,7 +232,7 @@
"band3/meta_band/SavedSetlist.cpp": "MISSING",
"band3/meta_band/SelectDifficultyPanel.cpp": "MISSING",
"band3/meta_band/SessionMgr.cpp": "MISSING",
"band3/meta_band/SessionUsersProviders.cpp": "MISSING",
"band3/meta_band/SessionUsersProviders.cpp": "NonMatching",
"band3/meta_band/SetlistMergePanel.cpp": "MISSING",
"band3/meta_band/SetlistSortByLength.cpp": "Matching",
"band3/meta_band/SetlistSortByLocation.cpp": "MISSING",
Expand Down Expand Up @@ -433,7 +433,7 @@
"network/net/SessionSearcher.cpp": "MISSING",
"network/net/SessionSearcher_RV.cpp": "MISSING",
"network/net/SyncStore.cpp": "MISSING",
"network/net/Synchronize.cpp": "MISSING",
"network/net/Synchronize.cpp": "NonMatching",
"network/net/VoiceChatMgr.cpp": "MISSING",
"network/net/WiiFriendMgr.cpp": "MISSING",
"network/net/WiiMessenger.cpp": "MISSING",
Expand Down
8 changes: 4 additions & 4 deletions src/band3/bandtrack/TrackConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ bool TrackConfig::GetDisableHopos() const { return mDisableHopos; }
bool TrackConfig::UseLeftyGems() const { return mLefty; }

bool TrackConfig::IsDrumTrack() const { return mUser->GetTrackType() == kTrackDrum; }
bool TrackConfig::IsKeyboardTrack() const { return mUser->GetTrackType() == kTrackKeyboard; }
bool TrackConfig::IsKeyboardTrack() const { return mUser->GetTrackType() == kTrackRealKeys; }

bool TrackConfig::AllowsOverlappingGems() const {
bool b = 0;
if (mUser->GetTrackType() == kTrackKeyboard || mUser->GetTrackType() == 4) b = true;
if (mUser->GetTrackType() == kTrackRealKeys || mUser->GetTrackType() == 4) b = true;
return b;
}

bool TrackConfig::AllowsPartialHits() const { return mUser->GetControllerType() == kControllerNone; }
bool TrackConfig::AllowsPartialHits() const { return mUser->GetControllerType() == kControllerKeys; }

bool TrackConfig::IsRealGuitarTrack() const {
TrackType t = mUser->GetTrackType();
bool b = 0;
if (t == kTrackProGuitar || t == kTrackProBass) b = true;
if (t == kTrackRealGuitar || t == kTrackRealBass) b = true;
return b;
}

Expand Down
Loading
Loading