Game origin rewrite.... Again!

include/GameOriginInfo.h

@@ -0,0 +1,12 @@
+/*
+    RB3Enhanced - GameOriginInfo.h
+*/
+
+typedef struct _GameOriginInfo
+{
+    char *gameOrigin;
+    int num;
+} GameOriginInfo;
+
+extern int numGameOrigins;
+extern GameOriginInfo originInfo[100];

include/GemHooks.h

@@ -7,6 +7,6 @@
 #include "rb3/Symbol.h"
 
 int WillBeNoStrumHook(int *gameGemListPtr, int *multiGemInfoPtr);
-int *GetWidgetByNameHook(int *gemManager, Symbol sym);
-int AddGameGemHook(int *gameGemList, GameGem *gem, NoStrumState gemType);
+int *GetWidgetByNameHook(int *gemManager, Symbol name);
+int AddGameGemHook(GameGemList *gameGemList, GameGem *gem, NoStrumState noStrumState);
 Symbol GetSlotColorHook(int *bandUser);

include/LocaleHooks.h

@@ -6,5 +6,5 @@
 #include "rb3/Symbol.h"
 
 char *LocalizeHook(int thisLocale, Symbol sym, int fail);
-void SetSystemLanguageHook(Symbol lang, int r4);
-int IsSupportedLanguageHook(Symbol lang, int r4);
+void SetSystemLanguageHook(Symbol lang, int cheat);
+int IsSupportedLanguageHook(Symbol lang, int cheat);

include/MiloSceneHooks.h

@@ -6,6 +6,7 @@
 #include "rb3/BinStream.h"
 #include "rb3/DirLoader.h"
 #include "rb3/Object.h"
+#include "rb3/Rnd/Transform.h"
 #include "rb3/Vector.h"
 #include "rb3/String.h"
 

include/OvershellHooks.h

@@ -28,7 +28,7 @@ typedef struct _OvershellListEntry
     char icon;
 } OvershellListEntry;
 
-void BuildInstrumentSelectionList(OvershellSlot *thisOvershellSlot, ControllerType controllerType, BandUser *bandUser);
+void OvershellPartSelectProviderReload(OvershellSlot *thisOvershellSlot, ControllerType controllerType, BandUser *bandUser);
 
 // Not overshell related but this is the only place we use them and IDK how to correctly organise code
 void PrepareSomeVectorMaybe(int *r3, int r4, int r5);

include/SetlistHooks.h

@@ -3,8 +3,14 @@
     Hooks for modifying the setlist/song selection screen.
 */
 
+#include "rb3/MusicLibrary.h"
 #include "rb3/BandLabel.h"
 #include "rb3/SortNode.h"
+#include "rb3/Rnd/RndMat.h"
+#include "rb3/Mem.h"
 
 void SetSongAndArtistNameHook(BandLabel *label, SortNode *sortNode);
 void SetSongNameFromNodeHook(BandLabel *label, SortNode *sortNode);
+RndMat *MusicLibraryMatHook(MusicLibrary *thisMusicLibrary, int unk, int unk2, int *listSlot);
+SongMetadata *SongMetadataConstructorHook(SongMetadata *thisSongMetadata, DataArray *data, DataArray *backupData, char isOnDisc);
+char SongMetadataLoadHook(SongMetadata *thisSongMetadata, BinStream *stream);

include/ports_wii.h

@@ -31,6 +31,7 @@
 #define PORT_UPDATEPRESENCEBLOCK_B 0x80188194    // branch after the failure case in a function that calls UpdatePresence
 #define PORT_MULTIPLAYER_CRASH 0x80018a78        // branch to a function that can crash in online multiplayer
 #define PORT_MULTIPLAYER_FIX 0x806ec0e8          // the function that doesn't crash
+#define PORT_ADDTRACKVECTOR_BL 0x80480a88       // bl to vector_push_back inside of SongData::AddTrack
 // #define PORT_LOADOBJS_BCTRL 0x827562e4
 // function patch addresses
 #define PORT_SETDISKERROR 0x8030ce7c             // PlatformMgr::SetDiskError
@@ -45,6 +46,7 @@
 #define PORT_EXECUTEDTA 0x802cf7e0               // RockCentralGateway::ExecuteConfig
 #define PORT_BANDLABELSETDISPLAYTEXT 0x803b1858  // BandLabel::SetDisplayText
 #define PORT_SETSONGANDARTISTNAME 0x801b68a8     // BandLabel::SetSongAndArtistName
+#define PORT_SETSONGNAMEFROMNODE 0x801b6358               // BandLabel::SetSongNameFromNode
 #define PORT_KEYSONGUITAR 0x80242ab4             // function that checks "key_keys_on_guitar"
 #define PORT_HMXFACTORYFUNCAT 0x8031b2f8         // HmxObjectFactoryFunc::_at
 #define PORT_WILLBENOSTRUM 0x80463010            // GameGemList::WillBeNoStrum
@@ -54,6 +56,7 @@
 #define PORT_GETWIDGETBYNAME 0x800d59b0          // GemManager::GetWidgetByName
 #define PORT_DATANODEEVALUATE 0x80322e9c         // DataNode::Evaluate
 #define PORT_GETSLOTCOLOR 0x800e42a4             // TrackConfig::GetSlotColor
+#define PORT_ADDSMASHERPLATETOVECTOR 0x804316d4           // AddSmasherPlateToVector
 #define PORT_USBWIIGETTYPE 0x806c1a3c            // UsbWii::GetType
 #define PORT_FILE_EXISTS 0x802fa134              // FileExists
 #define PORT_QUEUEMESSAGE 0x80253c50             // PassiveMessagesPanel::QueueMessage
@@ -67,6 +70,7 @@
 #define PORT_BUILDINSTRUMENTSELECTION 0x802478a8 // BuildInstrumentSelectionList(?) - actual name not known
 #define PORT_PREPARESOMEVECTORMAYBE 0x80247c58   // Prepares some vector, used by BuildInstrumentSelectionList
 #define PORT_SOMEVECTORPUSHBACKMAYBE 0x802484a8  // vector<class_Key<class_Vector2>,class_stlpmtx_std::StlNodeAlloc<class_Key<class_Vector2>_>_>::push_back
+#define PORT_VECTORPUSHBACK 0x800a6ef4                    // vector_push_back
 #define PORT_POSTPROC_DOPOST 0x806b52b4          // WiiPostProc::DoPost
 #define PORT_MUSICLIBRARYSELECTMAYBE 0x80230d64  // Selects an entry in the Music Library screen - actual name not known
 #define PORT_GETSYMBOLBYGAMEORIGIN 0x8027dd3c    // SongSortByRecent::GetSymbolByGameOrigin
@@ -75,6 +79,7 @@
 #define PORT_FILESTREAM_CT 0x8034c9f8            // FileStream::__ct (the one that takes a char * path instead of a File object)
 #define PORT_CHUNKSTREAM_CT 0x8034aa90           // ChunkStream::__ct
 #define PORT_GETBANDUSERFROMSLOT 0x8010021c      // BandUserMgr::GetBandUserFromSlot
+#define PORT_OVERSHELLPARTSELECTPROVIDERRELOAD 0x802478a8 // OvershellPartSelectProvider::Reload
 #define PORT_GETBANDUSERS 0x80100558             // BandUserMgr::GetBandUsers
 #define PORT_GETSONGSHORTNAME 0x80224edc         // MetaPerformer::GetSongShortname(?) - actual name not known
 #define PORT_GETMETADATA 0x80515510              // BandSongMgr::Data (function renamed from the original name to avoid any confusion with Data.h)
@@ -95,8 +100,28 @@
 #define PORT_METAMUSICPOLL 0x80678d20            // MetaMusic::Poll
 #define PORT_METAMUSICSTART 0x80678fa4           // MetaMusic::Start
 #define PORT_INITSONGMETADATA 0x805147a4         // InitSongMetadata
+#define PORT_SONGMETADATACONSTRUCTOR 0x80514880           // SongMetadata::__ct
+#define PORT_SONGMETADATALOAD 0x801d2090                  // SongMetadata::Load
 #define PORT_UPDATEPRESENCE 0x801879d4           // PresenceMgr::UpdatePresence
 #define PORT_STEPSEQUENCEJOBSETSTEP 0x80025364   // Quazal::StepSequenceJob::SetStep
+#define PORT_RNDTEXNEWOBJECT 0x80639904                   // RndTex::NewObject
+#define PORT_RNDMATNEWOBJECT 0x8063996c                   // RndMat::NewObject
+#define PORT_RNDTEXSETBITMAP 0x8063fccc                   // RndTex::SetBitmap
+#define PORT_RNDTEXSETBITMAP2 0x8063f830                  // RndTex::SetBitmap2
+#define PORT_RNDTEXSETBITMAP3 0x8063fb2c                  // RndTex::SetBitmap3
+#define PORT_FILEPATHCONSTRUCTOR 0x8000ec5c               // FilePath::__ct
+#define PORT_MUSICLIBRARY_CT 0x8022d978                   // MusicLibrary::__ct
+#define PORT_MUSICLIBRARYMAT 0x80231c5c                   // MusicLibrary::Mat
+#define PORT_NODESORTGETNODE 0x80279314                   // MusicLibrary::GetNodeByIndex
+#define PORT_GAMEGEMDB_CT 0x80460f64                      // GameGemDB::__ct
+#define PORT_ADDMULTIGEM 0x80461160                       // GameGemDB::AddMultiGem
+#define PORT_GETGAMELIST 0x8048553c                       // SongData::GetGameList
+#define PORT_SONGSORTMGRGETSORT 0x80281b20                // SongSortMgr::GetSort
+#define PORT_RNDMATSETDIFFUSETEX 0x8025ab90               // RndMat::SetDiffuseTex
+#define PORT_DYNAMICTEX_CT 0x80292a70                     // DynamicTex::__ct
+#define PORT_DYNAMICTEX_DT 0x80292bcc                     // DynamicTex::__dt
+#define PORT_MUSICLIBRARYONENTER 0x8022dd24              // MusicLibrary::OnEnter
+#define PORT_MUSICLIBRARYONUNLOAD 0x8022e87c               // MusicLibrary::OnExit
 #define PORT_BINSTREAMWRITE 0x80342f48           // BinStream::Write
 #define PORT_BINSTREAMREAD 0x80342e7c            // BinStream::Read
 #define PORT_BINSTREAMREADENDIAN 0x803430bc      // BinStream::ReadEndian

include/ports_wii_bank8.h

@@ -31,6 +31,8 @@
 // #define PORT_MICCHECK 0x8024a4e8              // NOT NEEDED? a bne that throws an error on the song select screen if the mic is not connected
 #define PORT_BIGSYMBOLFUNC_TAIL 0x804d3bac    // blr after a function that initialises a bunch of symbols
 #define PORT_UPDATEPRESENCEBLOCK_B 0x8021cbd0 // branch after the failure case in a function that calls UpdatePresence
+// FIX ME INLINED? #define PORT_ADDTRACKVECTOR_BL 0x8064e288       // bl to vector_push_back inside of SongData::AddTrack // actually SongDB::AddTrack
+#define PORT_GETGAMELIST 0x801dbfa0             // SongData::GetGameList // actually SongDB::GetGems
 #define PORT_MULTIPLAYER_CRASH 0x80023fec     // branch to a function that can crash in online multiplayer
 #define PORT_MULTIPLAYER_FIX 0x80a2f0c4       // the function that doesn't crash
 // #define PORT_LOADOBJS_BCTRL 0x827562e4
@@ -47,6 +49,7 @@
 #define PORT_EXECUTEDTA 0x803edbd0              // RockCentralGateway::ExecuteConfig
 #define PORT_BANDLABELSETDISPLAYTEXT 0x80518360 // BandLabel::SetDisplayText
 #define PORT_SETSONGANDARTISTNAME 0x80254650    // BandLabel::SetSongAndArtistName
+#define PORT_SETSONGNAMEFROMNODE 0x80253ec0     // BandLabel::SetSongNameFromNode
 #define PORT_KEYSONGUITAR 0x8031c1b0            // OvershellPanel::CanGuitarPlayKeys
 // #define PORT_HMXFACTORYFUNCAT 0x8031b2f8         // FIXME HmxObjectFactoryFunc::_at - inlined in bank8?
 #define PORT_WILLBENOSTRUM 0x8062b2d0            // GameGemList::WillBeNoStrum
@@ -56,6 +59,7 @@
 #define PORT_GETWIDGETBYNAME 0x80135f30          // GemManager::GetWidgetByName
 #define PORT_DATANODEEVALUATE 0x8045e030         // DataNode::Evaluate
 #define PORT_GETSLOTCOLOR 0x801484d0             // TrackConfig::GetSlotColor
+// FIX ME INLINED? #define PORT_ADDSMASHERPLATETOVECTOR 0x80bf0828      // AddSmasherPlateToVector
 #define PORT_USBWIIGETTYPE 0x809fd840            // UsbWii::GetType
 #define PORT_FILE_EXISTS 0x804207c0              // FileExists
 #define PORT_QUEUEMESSAGE 0x80333140             // PassiveMessagesPanel::QueueMessage
@@ -69,6 +73,7 @@
 // #define PORT_BUILDINSTRUMENTSELECTION 0x802478a8 // FIXME BuildInstrumentSelectionList(?) - actual name not known
 // #define PORT_PREPARESOMEVECTORMAYBE 0x80247c58   // FIXME Prepares some vector, used by BuildInstrumentSelectionList
 // #define PORT_SOMEVECTORPUSHBACKMAYBE 0x802484a8  // FIXME vector<class_Key<class_Vector2>,class_stlpmtx_std::StlNodeAlloc<class_Key<class_Vector2>_>_>::push_back
+// FIX ME (?) #define PORT_VECTORPUSHBACK 0x801dced0               // vector_push_back
 #define PORT_POSTPROC_DOPOST 0x809ef2d0          // WiiPostProc::DoPost
 #define PORT_MUSICLIBRARYSELECTMAYBE 0x802ff140  // UNSURE MusicLibrary::TryToSetHighlight, Selects an entry in the Music Library screen - actual name not known
 #define PORT_GETSYMBOLBYGAMEORIGIN 0x80374910    // RecentCmp::RecentTypeToOrigin
@@ -77,6 +82,7 @@
 #define PORT_FILESTREAM_CT 0x80494fd0            // FileStream::__ct (the one that takes a char * path instead of a File object)
 #define PORT_CHUNKSTREAM_CT 0x804929a0           // ChunkStream::__ct
 #define PORT_GETBANDUSERFROMSLOT 0x80168010      // BandUserMgr::GetUserFromSlot
+#define PORT_OVERSHELLPARTSELECTPROVIDERRELOAD 0x80322620 // OvershellPartSelectProvider::Reload
 #define PORT_GETBANDUSERS 0x801683e0             // BandUserMgr::GetBandUsers
 #define PORT_GETSONGSHORTNAME 0x802f5dd0         // MetaPerformer::GetSongSymbol
 #define PORT_GETMETADATA 0x80271de0              // BandSongMgr::Data (function renamed from the original name to avoid any confusion with Data.h)
@@ -97,8 +103,27 @@
 #define PORT_METAMUSICPOLL 0x80997610          // MetaMusic::Poll
 #define PORT_METAMUSICSTART 0x80997990         // MetaMusic::Start
 #define PORT_INITSONGMETADATA 0x8075a0c0       // InitSongMetadata
+#define PORT_SONGMETADATACONSTRUCTOR 0x8075a1a0       // SongMetadata::__ct
+#define PORT_SONGMETADATALOAD 0x8075a910                  // SongMetadata::Load
 #define PORT_UPDATEPRESENCE 0x8021c3d0         // PresenceMgr::UpdatePresence
 #define PORT_STEPSEQUENCEJOBSETSTEP 0x80035cf0 // Quazal::StepSequenceJob::SetStep
+#define PORT_RNDTEXNEWOBJECT 0x80931050                   // RndTex::NewObject
+#define PORT_RNDMATNEWOBJECT 0x80931010                   // RndMat::NewObject
+#define PORT_RNDTEXSETBITMAP 0x8093b810                   // RndTex::SetBitmap
+#define PORT_RNDTEXSETBITMAP2 0x8093b430                  // RndTex::SetBitmap2
+#define PORT_RNDTEXSETBITMAP3 0x8093b5b0                  // RndTex::SetBitmap3
+#define PORT_FILEPATHCONSTRUCTOR 0x80462460               // FilePath::__ct
+#define PORT_MUSICLIBRARY_CT 0x802f9e10                   // MusicLibrary::__ct
+#define PORT_MUSICLIBRARYMAT 0x80300390                   // MusicLibrary::Mat
+#define PORT_NODESORTGETNODE 0x8036f5e0                   // MusicLibrary::GetNodeByIndex //actually NodeSort::GetNode
+#define PORT_GAMEGEMDB_CT 0x80628230                      // GameGemDB::__ct
+#define PORT_ADDMULTIGEM 0x806284e0                       // GameGemDB::AddMultiGem
+#define PORT_SONGSORTMGRGETSORT 0x8037a510                // SongSortMgr::GetSort
+#define PORT_DYNAMICTEX_CT 0x80393bd0                     // DynamicTex::__ct
+#define PORT_DYNAMICTEX_DT 0x80393ef0                     // DynamicTex::__dt
+#define PORT_MUSICLIBRARYONENTER 0x802fa750              // MusicLibrary::OnEnter
+#define PORT_MUSICLIBRARYONUNLOAD 0x802fb2a0               // MusicLibrary::OnExit
+#define PORT_RNDMATSETDIFFUSETEX 0x808d36b0               // RndMat::SetDiffuseTex
 #define PORT_BINSTREAMWRITE 0x804892b0         // BinStream::Write
 #define PORT_BINSTREAMREAD 0x80489140          // BinStream::Read
 #define PORT_BINSTREAMREADENDIAN 0x804894f0    // BinStream::ReadEndian

include/ports_xbox360.h

@@ -51,6 +51,8 @@
 #define PORT_LOADOBJS_BCTRL 0x827562e4           // bctrl to Object::PreLoad insie of DirLoader::LoadObjs
 #define PORT_SONGMGR_ISDEMO_CHECK 0x82575f9c     // "bne" after IsUGC check inside SongMgr::IsDemo
 #define PORT_STAGEKIT_EXISTS 0x8228d03c          // StageKit check. nop over to allow for fog command without a physical StageKit connected.
+#define PORT_ADDTRACKVECTOR_BL 0x82777b70       // bl to vector_push_back inside of SongData::AddTrack
+#define PORT_GETGAMELIST 0x82770730             // SongData::GetGameList
 #define PORT_VERTEX_READ_1 0x82418704            // call to Vector3::operator>> to read vertex position
 #define PORT_VERTEX_READ_2 0x82418748            // call to Vector3::operator>> to read vertex normals
 #define PORT_BANDCHARDESC_MAKEOUTFITPATH 0x82335220 // BandCharDesc::MakeOutfitPath
@@ -94,6 +96,7 @@
 #define PORT_RANDOMINT 0x824f2f90                    // RandomInt(min, max)
 #define PORT_GETWIDGETBYNAME 0x82b9b880              // GemManager::GetWidgetByName
 #define PORT_GETSLOTCOLOR 0x82baa308                 // TrackConfig::GetSlotColor
+#define PORT_ADDSMASHERPLATETOVECTOR 0x82356980      // AddSmasherPlateToVector
 #define PORT_ARCHIVE_CT 0x82514408                   // Archive::_ct
 #define PORT_ARCHIVE_SETLOCATIONHARDDRIVE 0x82512b00 // Archive::SetLocationHardDrive
 #define PORT_ARCHIVE_MERGE 0x82513ee8                // Archive::Merge
@@ -110,13 +113,15 @@
 #define PORT_GAME_CT 0x8267bf30                      // Game::__ct
 #define PORT_GAME_DT 0x8267b1f0                      // Game::__dt
 #define PORT_GAMEGETACTIVEPLAYER 0x82678e88          // Game::GetActivePlayer
+#define PORT_OVERSHELLPARTSELECTPROVIDERRELOAD 0x82668c70 // OvershellPartSelectProvider::Reload
 #define PORT_GETBANDUSERS 0x82683b78                 // BandUserMgr::GetBandUsers
 #define PORT_GETBANDUSERFROMSLOT 0x82682b60          // BandUserMgr::GetBandUserFromSlot
 #define PORT_GETSONGID 0x827a87f0                    // GetSongID, function used when adding songs to BandSongMgr
 #define PORT_SONGMGRGETRANKEDSONGS 0x82577340        // BandSongMgr::GetRankedSongs(?) - not sure on the real name of the function
 #define PORT_BUILDINSTRUMENTSELECTION 0x82668c70     // BuildInstrumentSelectionList(?) - actual name not known
 #define PORT_PREPARESOMEVECTORMAYBE 0x82796d90       // Prepares some vector, used by BuildInstrumentSelectionList
 #define PORT_SOMEVECTORPUSHBACKMAYBE 0x82b6aa10      // vector<class_Key<class_Vector2>,class_stlpmtx_std::StlNodeAlloc<class_Key<class_Vector2>_>_>::push_back
+#define PORT_VECTORPUSHBACK 0x82b5f808               // vector_push_back
 #define PORT_POSTPROC_DOPOST 0x82b89a08              // NgPostProc::DoPost
 #define PORT_MUSICLIBRARYSELECTMAYBE 0x8253EB00      // Selects an entry in the Music Library screen - actual name not known
 #define PORT_GETSYMBOLBYGAMEORIGIN 0x8265bb78        // SongSortByRecent::GetSymbolByGameOrigin
@@ -142,8 +147,27 @@
 #define PORT_METAMUSICPOLL 0x82711438                // MetaMusic::Poll
 #define PORT_METAMUSICSTART 0x82711a00               // MetaMusic::Start
 #define PORT_INITSONGMETADATA 0x827aa450             // InitSongMetadata
+#define PORT_SONGMETADATACONSTRUCTOR 0x827aa6e8           // SongMetadata::__ct
+#define PORT_SONGMETADATALOAD 0x825a3f58                  // SongMetadata::Load
 #define PORT_UPDATEPRESENCE 0x82680430               // PresenceMgr::UpdatePresence
 #define PORT_STEPSEQUENCEJOBSETSTEP 0x82af92b8       // Quazal::StepSequenceJob::SetStep
+#define PORT_RNDTEXNEWOBJECT 0x82273de0                   // RndTex::NewObject
+#define PORT_RNDMATNEWOBJECT 0x8240f5d0                   // RndMat::NewObject
+#define PORT_RNDTEXSETBITMAP 0x823ff678                   // RndTex::SetBitmap
+#define PORT_RNDTEXSETBITMAP2 0x823ff240                  // RndTex::SetBitmap2
+#define PORT_RNDTEXSETBITMAP3 0x823ff510                  // RndTex::SetBitmap3
+#define PORT_FILEPATHCONSTRUCTOR 0x82270210               // FilePath::__ct
+#define PORT_MUSICLIBRARY_CT 0x825451c8                   // MusicLibrary::__ct
+#define PORT_MUSICLIBRARYMAT 0x8253b440                   // MusicLibrary::Mat
+#define PORT_NODESORTGETNODE 0x825bf708                   // MusicLibrary::GetNodeByIndex
+#define PORT_GAMEGEMDB_CT 0x827931e0                      // GameGemDB::__ct
+#define PORT_ADDMULTIGEM 0x827930d8                       // GameGemDB::AddMultiGem
+#define PORT_SONGSORTMGRGETSORT 0x82595ff8                // SongSortMgr::GetSort
+#define PORT_DYNAMICTEX_CT 0x825f2318                     // DynamicTex::__ct
+#define PORT_DYNAMICTEX_DT 0x825f2210                     // DynamicTex::__dt
+#define PORT_RNDMATSETDIFFUSETEX 0x8238b130               // RndMat::SetDiffuseTex
+#define PORT_MUSICLIBRARYONENTER 0x82542238              // MusicLibrary::OnEnter
+#define PORT_MUSICLIBRARYONUNLOAD 0x82540450               // MusicLibrary::OnExit
 #define PORT_BINSTREAMWRITE 0x827c4f58               // BinStream::Write
 #define PORT_BINSTREAMREAD 0x827c4ea8                // BinStream::Read
 #define PORT_BINSTREAMREADENDIAN 0x827c5058          // BinStream::ReadEndian

include/rb3/Archive.h

@@ -8,7 +8,7 @@ typedef struct _Archive
 } Archive;
 
 extern void ArchiveInit(void);
-extern void ArchiveConstructor(Archive *thisArchive, char *path, int unknown);
+extern void ArchiveConstructor(Archive *thisArchive, char *path, int heap_headroom);
 extern void ArchiveDestructor(Archive *thisArchive);
 extern void ArchiveMerge(Archive *thisArchive, Archive *otherArchive);
 extern void ArchiveSetLocationHardDrive(Archive *thisArchive);

include/rb3/BandLabel.h

@@ -16,6 +16,7 @@ typedef struct _BandLabel
 
 extern void SetSongAndArtistName(BandLabel *label, SortNode *unk);
 extern void SetSongNameFromNode(BandLabel *label, SortNode *unk);
-extern void BandLabelSetDisplayText(BandLabel *label, char *text, int unk);
+extern void BandLabelSetDisplayText(BandLabel *label, char *text, char clear_token);
+extern int MusicLibraryMat(void *thisMusicLibrary, int data, int unk2, int *listSlot); // returns the material for UIListMeshes in the music library
 
 #endif // _BANDLABEL_H

include/rb3/BandSongMgr.h

@@ -11,6 +11,6 @@ typedef struct _BandSongMgr
 
 extern int GetSongIDFromShortname(BandSongMgr *thisSongMgr, Symbol shortName, int fail); // fail seems to be unused on retail builds, but it would simulate a failure on debug builds
 extern SongMetadata *GetMetadata(BandSongMgr *thisSongMgr, int songId);
-extern int SongMgrGetRankedSongs(BandSongMgr *thisSongMgr, void *vector, char demosIfGameModeAllows, char includeRestricted);
+extern int SongMgrGetRankedSongs(BandSongMgr *thisSongMgr, void *songs, char demosIfGameModeAllows, char includeRestricted);
 
 #endif // _BANDSONGMGR_H