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.

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

Raceconfig progress #232

Merged
merged 13 commits into from
Sep 30, 2022
2 changes: 1 addition & 1 deletion mkwutil/tools/create_ctx.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import argparse

from sources import SOURCES_DOL, SOURCES_REL
from build import CWCC_PATHS, run_windows_cmd
from configure import CWCC_PATHS, run_windows_cmd

CW_ARGS = [
# "-I-",
Expand Down
6 changes: 0 additions & 6 deletions pack/rel.lcf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,3 @@ GROUP:{
.bss ALIGN(0x20):{}
} > text
}

FORCEFILES {
{% for name in force_files -%}
{{ name }}
{% endfor -%}
}
4 changes: 2 additions & 2 deletions pack/rel_objects.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ out/LocalizedArchive.o
out/MultiDvdArchive.o
out/rel/text_8052ae5c_8052d96c.o
out/rel/rodata_8088fe28_8088ffa8.o
out/rel/data_808b31e8_808b32a0.o
out/rel/data_808b31e8_808b3260.o
out/rel/bss_809bd6ec_809bd728.o
out/RaceConfig.o
out/rel/text_80532084_8053fc4c.o
out/rel/rodata_808900e8_80890490.o
out/rel/rodata_80890148_80890490.o
out/rel/data_808b32ac_808b3960.o
out/rel/bss_809bd72c_809bd738.o
out/ResourceManager.o
Expand Down
2 changes: 1 addition & 1 deletion pack/rel_slices.csv
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ enabled,name,textStart,textEnd,ctorsStart,ctorsEnd,dtorsStart,dtorsEnd,rodataSta
1,source/game/system/Mii.cpp,0x80525f88,0x80525ff4,,,,,0x8088fd60,0x8088fd64,,,,
1,source/game/system/LocalizedArchive.cpp,0x8052a098,0x8052a538,,,,,0x8088fdc0,0x8088fe00,0x808b3188,0x808b31d8,,
1,source/game/system/MultiDvdArchive.cpp,0x8052a538,0x8052ae5c,,,,,0x8088fe00,0x8088fe28,0x808b31d8,0x808b31e8,,
1,source/game/system/RaceConfig.cpp,0x8052d96c,0x80532084,,,,,0x8088ffa8,0x808900e8,0x808b32a0,0x808b32ac,0x809bd728,0x809bd72c
1,source/game/system/RaceConfig.cpp,0x8052d96c,0x80532084,,,,,0x8088ffa8,0x80890148,0x808b3260,0x808b32ac,0x809bd728,0x809bd72c
1,source/game/system/ResourceManager.cpp,0x8053FC4C,0x80542878,,,,,0x80890490,0x80890d0c,0x808b3960,0x808b3c2c,809bd738,809bd73c
1,source/game/util/Random.cpp,0x80555464,0x8055572c,,,,,0x80891370,0x80891380,0x808b42e0,0x808b42ec,,
1,source/game/kart/KartComponent.cpp,0x80590128,0x805901d0,,,,,,,,,0x809c1900,0x809c1910
Expand Down
47 changes: 25 additions & 22 deletions pack/symbols.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ global:
0x80009b80: '__dt__Q23EGG8Vector2fFv'
0x80009bc0: 'HeapCollection_setGroupIdAll'
0x80009c24: 'unk_80009c24'
0x80009c8c: 'unk_80009c8c'
0x80009ce0: 'unk_80009ce0'
0x80009c8c: '__ct__Q26System13ParameterFileFPCcUl'
0x80009ce0: '__dt__Q26System13ParameterFileFv'
0x80009d6c: 'appendData__Q26System13ParameterFileFPcUlPQ23EGG4Heap'
0x80009ddc: 'unk_80009ddc'
0x80009ddc: 'read__Q26System13ParameterFileFPQ23EGG4Heap'
0x80009ef8: 'RamStream_destroy'
0x80009f5c: 'ModuleSlots_destroy'
0x80009ff0: 'ModuleLinker_initStaticInstance'
Expand Down Expand Up @@ -10051,13 +10051,13 @@ global:
0x8052daf0: 'computeGpRank__Q26System16RaceConfigPlayerCFv'
0x8052dbc8: '__ct__Q26System18RaceConfigScenarioFPQ26System12RawGhostFile'
0x8052dc68: '__dt__Q26System16RaceConfigPlayerFv'
0x8052dca8: 'computeWinningTeam__Q26System12RaceScenarioFv'
0x8052dca8: 'computeWinningTeam__Q26System18RaceConfigScenarioFv'
0x8052dd18: 'getTeam__Q26System16RaceConfigPlayerFv'
0x8052dd20: 'getPlayer__Q26System12RaceScenarioFUc'
0x8052dd20: 'getPlayer__Q26System12RaceScenarioCFUc'
0x8052dd30: 'getRacePlayerCount__Q26System10RaceConfigFv'
0x8052dd40: 'Racedata_init'
0x8052e42c: 'setCharacter__Q26System16RaceConfigPlayerFQ26System11CharacterId'
0x8052e434: 'getPlayer__Q26System12MenuScenarioFUc'
0x8052e434: 'getPlayer__Q26System18RaceConfigScenarioFUc'
0x8052e444: 'setVehicle__Q26System16RaceConfigPlayerFQ26System9VehicleId'
0x8052e44c: 'setPlayerType__Q26System16RaceConfigPlayerFl'
0x8052e454: 'reset__Q26System10RaceConfigFv'
Expand All @@ -10071,40 +10071,40 @@ global:
0x8052e770: 'update__Q26System18RaceConfigScenarioFv'
0x8052e870: 'updateRating__Q26System10RaceConfigFUc'
0x8052e950: 'unk_8052e950'
0x8052ed18: 'getGametype__Q26System12MenuScenarioFv'
0x8052ed18: 'getGametype__Q26System18RaceConfigScenarioFv'
0x8052ed20: 'getPlayerType__Q26System16RaceConfigPlayerFv'
0x8052ed28: 'postInitControllers__Q26System12MenuScenarioFPQ26System12RaceScenario'
0x8052ed28: 'postInitControllers__Q26System18RaceConfigScenarioFPQ26System12RaceScenario'
0x8052eef0: 'unk_8052eef0'
0x8052efd4: 'resetPlayers__Q26System18RaceConfigScenarioFv'
0x8052f064: 'unk_8052f064'
0x8052f1e0: 'copyPrevPositions__Q26System12MenuScenarioFv'
0x8052f4e8: 'initControllers__Q26System12MenuScenarioFUc'
0x8052f788: 'computePlayerCounts__Q26System12MenuScenarioFPUcPUcPUc'
0x8052f924: 'initRng__Q26System12MenuScenarioFv'
0x8052fa0c: 'unk_8052fa0c'
0x8052fb90: 'initRace__Q26System12MenuScenarioFPQ26System12RaceScenario'
0x8052fe58: 'Racedata_initStaticInstance'
0x8052ffe8: 'Racedata_destroyStaticInstance'
0x8052f1e0: 'copyPrevPositions__Q26System18RaceConfigScenarioFv'
0x8052f4e8: 'initControllers__Q26System18RaceConfigScenarioFUc'
0x8052f788: 'computePlayerCounts__Q26System18RaceConfigScenarioFPUcPUcPUc'
0x8052f924: 'initRng__Q26System18RaceConfigScenarioFv'
0x8052fa0c: 'initCompetitionSettings__Q26System18RaceConfigScenarioFv'
0x8052fb90: 'initRace__Q26System18RaceConfigScenarioFPQ26System12RaceScenario'
0x8052fe58: 'createInstance__Q26System10RaceConfigFv'
0x8052ffe8: 'destroyInstance__Q26System10RaceConfigFv'
0x80530038: 'Racedata_destroy'
0x805300f4: 'RacedataScenario_destroy'
0x8053015c: 'Racedata_construct'
0x805302c4: 'Racedata_initRace'
0x805302c4: 'initRace__Q26System10RaceConfigFv'
0x805305ac: 'RacedataScenario_copy'
0x80530864: 'Racedata_initAwards'
0x80530f0c: 'getModeFlag__Q26System12MenuScenarioFv'
0x80530f0c: 'isTeamMode__Q26System18RaceConfigScenarioFv'
0x80530f18: 'getUnkPos__Q26System16RaceConfigPlayerFv'
0x80530f20: 'getCharacter__Q26System16RaceConfigPlayerFv'
0x80530f28: 'getVehicle__Q26System16RaceConfigPlayerFv'
0x80530f30: 'setMii__Q26System16RaceConfigPlayerFRCQ26System3Mii'
0x80531068: 'getMii__Q26System16RaceConfigPlayerFv'
0x80531070: 'Racedata_initCredits'
0x80531ce4: 'update__Q26System10RaceConfigFv'
0x80531de4: 'unk_80531de4'
0x80531de4: 'appendParamFile__Q26System18RaceConfigScenarioFPQ26System10RaceConfig'
0x80531f18: 'getLocalPlayerCount__Q26System10RaceConfigFUc'
0x80531f2c: 'setGhost__Q26System10RaceConfigFPQ26System12RawGhostFile'
0x80531f70: 'getHudPlayerId__Q26System10RaceConfigFUc'
0x80531f80: 'loadNextCourse__Q26System10RaceConfigFv'
0x80531fc8: 'unk_80531fc8__Q26System10RaceConfigFUc'
0x80531fc8: 'isLiveView__Q26System10RaceConfigFUc'
0x80532030: 'isTimeAttackReplay__Q26System10RaceConfigFv'
0x80532070: 'vf18__Q26System10RaceConfigFv'
0x80532074: 'vf14__Q26System10RaceConfigFv'
Expand Down Expand Up @@ -15786,7 +15786,7 @@ global:
0x8066c528: 'unk_8066c528'
0x8066c66c: 'unk_8066c66c'
0x8066c874: 'unk_8066c874'
0x8066c8d8: 'unk_8066c8d8'
0x8066c8d8: 'getCompetitionWrapper'
0x8066ca64: 'unk_8066ca64'
0x8066cb30: 'unk_8066cb30'
0x8066cb4c: 'unk_8066cb4c'
Expand Down Expand Up @@ -22526,10 +22526,12 @@ global:
0x80890030: 'VS_POINT_DISTRIBUTION__6System'
0x808900c0: 'RANK_SCORES__6System'
0x808900d8: 'SCORES__6System'
0x808900e8: 'lbl_808900e8'
0x80890124: 'lbl_80890124'
0x80890ae8: 'arr_80890AE8'
0x80891370: 'mul__Q24Util6Random'
0x808a47ec: 'flt_808A47EC'
0x808b2c30: '__vt__Q25Field9CourseMap'
0x808b2c30: '_0x808b3268_vt__Q25Field9CourseMap'
0x808b2c78: '__vt__Q26System10DvdArchive'
0x808b2d38: '__vt__Q26System14GhostFileGroup'
0x808b2d44: '__vt__Q26System4Time'
Expand All @@ -22538,6 +22540,7 @@ global:
0x808b31b8: '__vt__Q26System12UIDvdArchive'
0x808b31c8: '__vt__Q26System17RaceSysDvdArchive'
0x808b31d8: '__vt__Q26System15MultiDvdArchive'
0x808b3260: '__vt__Q26System10RaceConfig'
0x808b3288: '__vt__Q26System18RaceConfigScenario'
0x808b3294: '__vt__Q26System16RaceConfigPlayer'
0x808b32a0: '__vt__Q26System6Rating'
Expand Down
7 changes: 4 additions & 3 deletions source/game/host_system/ParameterFile.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ class ParameterFile {
virtual ~ParameterFile();

virtual void read(EGG::Heap* heap);
virtual void emptySub1() {}
virtual void emptySub2() {}
virtual void emptySub3() {}
s32 emptySub0();
virtual void emptySub1();
virtual void emptySub2();
virtual void emptySub3();

void appendData(char* str, u32 str_size, EGG::Heap* heap);

Expand Down
4 changes: 2 additions & 2 deletions source/game/system/GhostFile.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ struct RawGhostFile {
friend class GhostFile;

public:
RawGhostFile() { reset(); }
// RawGhostFile() { reset(); }

~RawGhostFile() {}
//~RawGhostFile() {}

void reset();

Expand Down
2 changes: 2 additions & 0 deletions source/game/system/Mii.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,6 @@ class Mii {
u32 _B4;
};

inline Mii::~Mii() {}

} // namespace System
Loading