Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions config/RSPE01_00/splits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -919,12 +919,23 @@ Pack/RPKernel/RPSysKokeshiIcon.cpp:
.text start:0x8016D500 end:0x8016EBF4
.data start:0x80381DA0 end:0x80381DB4

Pack/RPGraphics/RPGrpModel.cpp:
.text start:0x801809E8 end:0x80181190

Pack/RPGraphics/RPGrpModelAnm.cpp:
.text start:0x80181190 end:0x80181984
.data start:0x803823B0 end:0x80382438
.sdata2 start:0x804E1A88 end:0x804E1A90

Pack/RPGraphics/RPGrpModelResManager.cpp:
.text start:0x80185AE4 end:0x80186924
.data start:0x803826F0 end:0x803827A4

Pack/RPGraphics/RPGrpCpuTexture.cpp:
.text start:0x8018F1A0 end:0x801900F0

Pack/RPGraphics/RPGrpFog.cpp:
.text start:0x801900F0 end:0x80190344

Pack/RPAudio/RPSndAudioMgr.cpp:
.text start:0x8019C7E0 end:0x8019E630
Expand All @@ -935,3 +946,24 @@ Pack/RPAudio/RPSndSpeakerMgr.cpp:
.data start:0x80383060 end:0x8038306C
.sbss start:0x804DFC68 end:0x804DFC6C
.sdata2 start:0x804E1EA8 end:0x804E1EAC

Pack/RPUtility/RPUtlDohMath.cpp:
.text start:0x8019F8D4 end:0x8019FE84
.ctors start:0x80330160 end:0x80330164
.bss start:0x804D6F08 end:0x804D6FC8
.sbss start:0x804DFC78 end:0x804DFC80
.sdata2 start:0x804E1EE0 end:0x804E1EF0

Pack/RPUtility/RPUtlMapData.cpp:
.text start:0x801A5000 end:0x801A546C

Pack/RPUtility/RPUtlShadowDrawer.cpp:
.text start:0x801A546C end:0x801A5580
.ctors start:0x8033016C end:0x80330170
.bss start:0x804D7078 end:0x804D70A8

Pack/RPSports/RPSportsCommon/RPSysPlayerSelectScene.cpp:
.text start:0x801B8778 end:0x801BB064

Pack/RPSports/RPSportsCommon/RPSportsMenuBgModel.cpp:
.text start:0x801BB064 end:0x801BB644
67 changes: 37 additions & 30 deletions config/RSPE01_01/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2894,7 +2894,7 @@ __ct__Q23EGG12LightManagerFUlUlUc = .text:0x8008FF24; // type:function size:0x23
Reset__Q23EGG12LightManagerFv = .text:0x80090160; // type:function size:0x12C scope:global
Calc__Q23EGG12LightManagerFPQ34nw4r3g3d7ScnRoot = .text:0x8009028C; // type:function size:0xB0 scope:global
CalcView__Q23EGG12LightManagerFRCQ34nw4r4math5MTX34UcPQ34nw4r3g3d7ScnRoot = .text:0x8009033C; // type:function size:0x140 scope:global
fn_8009047C = .text:0x8009047C; // type:function size:0x78
SetChanAmbColor__Q23EGG12LightManagerCFv = .text:0x8009047C; // type:function size:0x78
LoadObjIndxGX__Q23EGG12LightManagerCFv = .text:0x800904F4; // type:function size:0x74 scope:global
LoadLightSetGD__Q23EGG12LightManagerCFiPUlPUlPUlPUlP8_GXColor = .text:0x80090568; // type:function size:0x6C scope:global
DoneDraw__Q23EGG12LightManagerFv = .text:0x800905D4; // type:function size:0x2C scope:global
Expand Down Expand Up @@ -6864,7 +6864,7 @@ fn_80183534 = .text:0x80183534; // type:function size:0x50
fn_80183584 = .text:0x80183584; // type:function size:0x24
getFBHeight__11RPSysSystemCFv = .text:0x801835A8; // type:function size:0xC
getFBWidth__11RPSysSystemCFv = .text:0x801835B4; // type:function size:0xC
fn_801835C0 = .text:0x801835C0; // type:function size:0x14
getModifyRatio__11RPSysSystemCFv = .text:0x801835C0; // type:function size:0x14
fn_801835D4 = .text:0x801835D4; // type:function size:0x8
setupRenderMode__11RPSysSystemFv = .text:0x801835DC; // type:function size:0x130
setupTVMode__11RPSysSystemFv = .text:0x8018370C; // type:function size:0x6C
Expand Down Expand Up @@ -7774,8 +7774,8 @@ fn_801A96B8 = .text:0x801A96B8; // type:function size:0x40
fn_801A96F8 = .text:0x801A96F8; // type:function size:0x40
fn_801A9738 = .text:0x801A9738; // type:function size:0x40
fn_801A9778 = .text:0x801A9778; // type:function size:0x40
fn_801A97B8 = .text:0x801A97B8; // type:function size:0x14
fn_801A97CC = .text:0x801A97CC; // type:function size:0x14
On__13RPGrpDrawPathFv = .text:0x801A97B8; // type:function size:0x14
Off__13RPGrpDrawPathFv = .text:0x801A97CC; // type:function size:0x14
LoadScnLight__17RPGrpLightManagerFUsPCcfUl = .text:0x801A97E0; // type:function size:0x80
RemoveGenList__10RPGrpModelFv = .text:0x801A9860; // type:function size:0x44
ReplaceTexture__10RPGrpModelFPCcRC12RPGrpTextureb = .text:0x801A98A4; // type:function size:0x94
Expand Down Expand Up @@ -7947,7 +7947,7 @@ fn_801AF40C = .text:0x801AF40C; // type:function size:0x24
AppendDrawObject__13RPGrpRendererFP16IRPGrpDrawObject = .text:0x801AF430; // type:function size:0x24
fn_801AF454 = .text:0x801AF454; // type:function size:0x138
fn_801AF58C = .text:0x801AF58C; // type:function size:0x9C
fn_801AF628 = .text:0x801AF628; // type:function size:0x98
CreateView3D__13RPGrpRendererFUcP11RPGrpCameraP11RPGrpScreen = .text:0x801AF628; // type:function size:0x98
fn_801AF6C0 = .text:0x801AF6C0; // type:function size:0x54
CalculateInPause__13RPGrpRendererFv = .text:0x801AF714; // type:function size:0x58
PostCalculate__13RPGrpRendererFv = .text:0x801AF76C; // type:function size:0x84
Expand Down Expand Up @@ -8007,19 +8007,19 @@ GetCamera__17RPGrpViewRender3DCFv = .text:0x801B18BC; // type:function size:0x8
__ct__17RPGrpViewRender3DFUc = .text:0x801B18C4; // type:function size:0x4C
__dt__17RPGrpViewRender3DFv = .text:0x801B1910; // type:function size:0x40 scope:weak
GetType__17RPGrpViewRender3DCFv = .text:0x801B1950; // type:function size:0x8 scope:weak
fn_801B1958 = .text:0x801B1958; // type:function size:0x98
setupEnvironment__15RPGrpModelSceneCFv = .text:0x801B1958; // type:function size:0x98
fn_801B19F0 = .text:0x801B19F0; // type:function size:0x24
fn_801B1A14 = .text:0x801B1A14; // type:function size:0x80
setDrawPriority__15RPGrpModelSceneCFP10RPGrpModel = .text:0x801B1A14; // type:function size:0x80
fn_801B1A94 = .text:0x801B1A94; // type:function size:0x18
fn_801B1AAC = .text:0x801B1AAC; // type:function size:0x14
fn_801B1AC0 = .text:0x801B1AC0; // type:function size:0x14
fn_801B1AD4 = .text:0x801B1AD4; // type:function size:0x120
DrawPrepare__15RPGrpModelSceneFPC11RPGrpCameraPC11RPGrpScreen = .text:0x801B1BF4; // type:function size:0x50
fn_801B1C44 = .text:0x801B1C44; // type:function size:0x40
g_calc_background__15RPGrpModelSceneFv = .text:0x801B1C44; // type:function size:0x40
fn_801B1C84 = .text:0x801B1C84; // type:function size:0x100
fn_801B1D84 = .text:0x801B1D84; // type:function size:0x38
CalcView__15RPGrpModelSceneFv = .text:0x801B1D84; // type:function size:0x38
fn_801B1DBC = .text:0x801B1DBC; // type:function size:0xC4
fn_801B1E80 = .text:0x801B1E80; // type:function size:0x80
__dt__15RPGrpModelSceneFv = .text:0x801B1E80; // type:function size:0x80
fn_801B1F00 = .text:0x801B1F00; // type:function size:0x4E0
fn_801B23E0 = .text:0x801B23E0; // type:function size:0x4
fn_801B23E4 = .text:0x801B23E4; // type:function size:0x40
Expand Down Expand Up @@ -8800,11 +8800,11 @@ fn_801D5744 = .text:0x801D5744; // type:function size:0x5C
fn_801D57A0 = .text:0x801D57A0; // type:function size:0x34
fn_801D57D4 = .text:0x801D57D4; // type:function size:0x8
fn_801D57DC = .text:0x801D57DC; // type:function size:0x8
fn_801D57E4 = .text:0x801D57E4; // type:function size:0xA4
fn_801D5888 = .text:0x801D5888; // type:function size:0x130
fn_801D59B8 = .text:0x801D59B8; // type:function size:0x1F8
fn_801D5BB0 = .text:0x801D5BB0; // type:function size:0x1CC
fn_801D5D7C = .text:0x801D5D7C; // type:function size:0x58
calcView__19RPSportsMenuBgModelFv = .text:0x801D57E4; // type:function size:0xA4
initCamera__19RPSportsMenuBgModelFv = .text:0x801D5888; // type:function size:0x130
createData__19RPSportsMenuBgModelFPQ23EGG7Archive = .text:0x801D59B8; // type:function size:0x1F8
__ct__19RPSportsMenuBgModelFUcUcUs = .text:0x801D5BB0; // type:function size:0x1CC
__dt__19RPSportsMenuBgModelFv = .text:0x801D5D7C; // type:function size:0x58
fn_801D5DD4 = .text:0x801D5DD4; // type:function size:0x20
fn_801D5DF4 = .text:0x801D5DF4; // type:function size:0xA8
fn_801D5E9C = .text:0x801D5E9C; // type:function size:0xA8
Expand Down Expand Up @@ -17895,12 +17895,19 @@ __FilterSizeTable = .data:0x803AEAA0; // type:object size:0x100 scope:local
__SinTableFixedPoint = .data:0x803AEBA0; // type:object size:0x200 scope:local align:8
__SrcTab12khz = .data:0x803AEDA0; // type:object size:0x800 scope:local align:8
@472 = .data:0x803AF5A0; // type:object size:0x37 scope:local align:4 data:string
lbl_803AF5D8 = .data:0x803AF5D8; // type:object size:0x15 data:string
lbl_803AF5F0 = .data:0x803AF5F0; // type:object size:0x98
lbl_803AF688 = .data:0x803AF688; // type:object size:0x1B data:string
lbl_803AF6A4 = .data:0x803AF6A4; // type:object size:0x1D data:string
lbl_803AF6C4 = .data:0x803AF6C4; // type:object size:0x44
lbl_803AF708 = .data:0x803AF708; // type:object size:0x12 data:string
@844 = .data:0x803AF5D8; // type:object size:0x15 data:string
@845 = .data:0x803AF5F0; // type:object size:0x18 data:string
@873 = .data:0x803AF608; // type:object size:0x15 data:string
@874 = .data:0x803AF620; // type:object size:0x13 data:string
@875 = .data:0x803AF634; // type:object size:0xC data:string
@917 = .data:0x803AF640; // type:object size:0x18 data:string
@918 = .data:0x803AF658; // type:object size:0x18 align:8 data:string
@919 = .data:0x803AF670; // type:object size:0x15 data:string
@966 = .data:0x803AF688; // type:object size:0x1B data:string
@967 = .data:0x803AF6A4; // type:object size:0x1D data:string
@987 = .data:0x803AF6C4; // type:object size:0x22 align:4 data:string
@1043 = .data:0x803AF6E8; // type:object size:0x1D data:string
@1157 = .data:0x803AF708; // type:object size:0x12 data:string
lbl_803AF720 = .data:0x803AF720; // type:object size:0x3A data:string
lbl_803AF75C = .data:0x803AF75C; // type:object size:0x2F data:string
lbl_803AF790 = .data:0x803AF790; // type:object size:0x5D0
Expand Down Expand Up @@ -18674,8 +18681,8 @@ lbl_803BA550 = .data:0x803BA550; // type:object size:0xE data:string
lbl_803BA560 = .data:0x803BA560; // type:object size:0xD data:string
lbl_803BA570 = .data:0x803BA570; // type:object size:0xE data:string
lbl_803BA580 = .data:0x803BA580; // type:object size:0xD data:string
lbl_803BA590 = .data:0x803BA590; // type:object size:0x1F data:string
lbl_803BA5B0 = .data:0x803BA5B0; // type:object size:0xD data:string
@STRING@setModifyRatio__Q23EGG7StateGXFf@0 = .data:0x803BA590; // type:object size:0x1F data:string
@STRING@setModifyRatio__Q23EGG7StateGXFf = .data:0x803BA5B0; // type:object size:0xD data:string
lbl_803BA5C0 = .data:0x803BA5C0; // type:object size:0x2C
lbl_803BA5EC = .data:0x803BA5EC; // type:object size:0xC
lbl_803BA5F8 = .data:0x803BA5F8; // type:object size:0x10
Expand Down Expand Up @@ -18777,7 +18784,7 @@ lbl_803C1F78 = .data:0x803C1F78; // type:object size:0x28
lbl_803C1FA0 = .data:0x803C1FA0; // type:object size:0x38
lbl_803C1FD8 = .data:0x803C1FD8; // type:object size:0x28
lbl_803C2000 = .data:0x803C2000; // type:object size:0x38
lbl_803C2038 = .data:0x803C2038; // type:object size:0xC
__vt__19RPSportsMenuBgModel = .data:0x803C2038; // type:object size:0xC
lbl_803C2044 = .data:0x803C2044; // type:object size:0x22 data:string
lbl_803C2068 = .data:0x803C2068; // type:object size:0x12 data:string
lbl_803C2080 = .data:0x803C2080; // type:object size:0x20
Expand Down Expand Up @@ -19902,7 +19909,7 @@ lbl_804A4788 = .bss:0x804A4788; // type:object size:0xC align:4 data:float
lbl_804A4794 = .bss:0x804A4794; // type:object size:0xC align:4 data:float
lbl_804A47A0 = .bss:0x804A47A0; // type:object size:0xC align:4 data:float
lbl_804A47AC = .bss:0x804A47AC; // type:object size:0x54 data:4byte
sGlobalMtx__17RPUtlShadowDrawer = .bss:0x804A4800; // type:object size:0x30 data:4byte
sCameraMtx__17RPUtlShadowDrawer = .bss:0x804A4800; // type:object size:0x30 data:4byte
lbl_804A4830 = .bss:0x804A4830; // type:object size:0x18 data:4byte
lbl_804A4848 = .bss:0x804A4848; // type:object size:0x20 data:4byte
lbl_804A4868 = .bss:0x804A4868; // type:object size:0x18 align:4 data:float
Expand Down Expand Up @@ -20464,7 +20471,7 @@ lbl_804BDBF0 = .sdata:0x804BDBF0; // type:object size:0x8
sSoundHeapSize__16RPSysHomeMenuMgr = .sdata:0x804BDBF8; // type:object size:0x4 data:4byte
sSuccess__17RPSysNWC24Manager = .sdata:0x804BDC00; // type:object size:0x4 data:4byte
lbl_804BDC08 = .sdata:0x804BDC08; // type:object size:0x4 data:4byte
lbl_804BDC0C = .sdata:0x804BDC0C; // type:object size:0x4 data:4byte
sRenderPass__13RPGrpRenderer = .sdata:0x804BDC0C; // type:object size:0x4 data:4byte
lbl_804BDC10 = .sdata:0x804BDC10; // type:object size:0x8 align:4 data:float
lbl_804BDC18 = .sdata:0x804BDC18; // type:object size:0x8
lbl_804BDC20 = .sdata:0x804BDC20; // type:object size:0x8 align:4 data:float
Expand Down Expand Up @@ -21891,7 +21898,7 @@ sAddrWork__16RPSysCoreAddress = .sbss:0x804BF580; // type:object size:0x6 data:b
lbl_804BF588__18RPSysLytDynamicAnm = .sbss:0x804BF588; // type:object size:0x4 align:4 data:4byte
OUT_OF_SCREEN_POS__18RPSysCursorDrawMgr = .sbss:0x804BF590; // type:object size:0x8 align:4 data:float
spInstance__18RPSysCursorDrawMgr = .sbss:0x804BF598; // type:object size:0x4 data:4byte
lbl_804BF5A0 = .sbss:0x804BF5A0; // type:object size:0x8 data:4byte
spInstance__17RPSysSystemWinMgr = .sbss:0x804BF5A0; // type:object size:0x8 data:4byte
spInstance__16RPSysHomeMenuMgr = .sbss:0x804BF5A8; // type:object size:0x4 data:4byte
spHomeMenuArcMgr__16RPSysHomeMenuMgr = .sbss:0x804BF5AC; // type:object size:0x4 data:4byte
sIsBusy__15RPSysPairingMgr = .sbss:0x804BF5B0; // type:object size:0x1 data:byte
Expand All @@ -21913,7 +21920,7 @@ spCurrent__17RPGrpModelManager = .sbss:0x804BF5F8; // type:object size:0x8 data:
spCurrent__20RPGrpModelResManager = .sbss:0x804BF600; // type:object size:0x8 data:4byte
lbl_804BF608 = .sbss:0x804BF608; // type:object size:0x8 data:4byte
spCurrent__13RPGrpRenderer = .sbss:0x804BF610; // type:object size:0x4 data:4byte
lbl_804BF614 = .sbss:0x804BF614; // type:object size:0x1 data:byte
sRendering__13RPGrpRenderer = .sbss:0x804BF614; // type:object size:0x1 data:byte
lbl_804BF615 = .sbss:0x804BF615; // type:object size:0x1 data:byte
gap_11_804BF616_sbss = .sbss:0x804BF616; // type:object size:0x2 scope:global
spCurrentView__13RPGrpRenderer = .sbss:0x804BF618; // type:object size:0x4 data:4byte
Expand Down Expand Up @@ -23640,8 +23647,8 @@ lbl_804C1888 = .sdata2:0x804C1888; // type:object size:0x1 data:byte
lbl_804C1889 = .sdata2:0x804C1889; // type:object size:0x1 data:byte
lbl_804C188A = .sdata2:0x804C188A; // type:object size:0x1 data:byte
lbl_804C188B = .sdata2:0x804C188B; // type:object size:0x1 data:byte
lbl_804C188C = .sdata2:0x804C188C; // type:object size:0x4 align:4 data:float
lbl_804C1890 = .sdata2:0x804C1890; // type:object size:0x8 align:4 data:float
@26961 = .sdata2:0x804C188C; // type:object size:0x4 align:4 data:float
@26962 = .sdata2:0x804C1890; // type:object size:0x4 align:4 data:float
@16652 = .sdata2:0x804C1898; // type:object size:0x4 scope:local align:4 data:float
lbl_804C18A0 = .sdata2:0x804C18A0; // type:object size:0x1 data:byte
lbl_804C18A1 = .sdata2:0x804C18A1; // type:object size:0x1 data:byte
Expand Down
4 changes: 3 additions & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1276,13 +1276,15 @@ def MatchingFor(*versions):
Object(Matching, "Pack/RPGraphics/RPGrpCamera.cpp"),
Object(NonMatching, "Pack/RPGraphics/RPGrpDrawPathManager.cpp"),
Object(Matching, "Pack/RPGraphics/RPGrpLightManager.cpp"),
Object(Matching, "Pack/RPGraphics/RPGrpModel.cpp"),
Object(not MatchingFor("RSPE01_00"), "Pack/RPGraphics/RPGrpModel.cpp"),
Object(not MatchingFor("RSPE01_00"), "Pack/RPGraphics/RPGrpModelAnm.cpp"),
Object(NonMatching, "Pack/RPGraphics/RPGrpModelAnmImplement.cpp"),
Object(NonMatching, "Pack/RPGraphics/RPGrpModelImplement.cpp"),
Object(NonMatching, "Pack/RPGraphics/RPGrpModelMisc.cpp"),
Object(NonMatching, "Pack/RPGraphics/RPGrpModelManager.cpp"),
Object(NonMatching, "Pack/RPGraphics/RPGrpModelResManager.cpp"),
Object(NonMatching, "Pack/RPGraphics/RPGrpCpuTexture.cpp"),
Object(NonMatching, "Pack/RPGraphics/RPGrpFog.cpp"),
Object(NonMatching, "Pack/RPGraphics/RPGrpRenderer.cpp"),
Object(Matching, "Pack/RPGraphics/RPGrpScreen.cpp"),
Object(NonMatching, "Pack/RPGraphics/RPGrpView.cpp"),
Expand Down
2 changes: 2 additions & 0 deletions include/Pack/RPGraphics.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <Pack/RPGraphics/IRPGrpModelCallback.h>
#include <Pack/RPGraphics/RPGrpCamera.h>
#include <Pack/RPGraphics/RPGrpCaptureTexture.h>
#include <Pack/RPGraphics/RPGrpCpuTexture.h>
#include <Pack/RPGraphics/RPGrpDrawPath.h>
#include <Pack/RPGraphics/RPGrpDrawPathBloom.h>
#include <Pack/RPGraphics/RPGrpDrawPathDOF.h>
Expand All @@ -30,6 +31,7 @@
#include <Pack/RPGraphics/RPGrpModelScene.h>
#include <Pack/RPGraphics/RPGrpProjectionObject.h>
#include <Pack/RPGraphics/RPGrpRenderer.h>
#include <Pack/RPGraphics/RPGrpResTIMG.h>
#include <Pack/RPGraphics/RPGrpScreen.h>
#include <Pack/RPGraphics/RPGrpShadowTexture.h>
#include <Pack/RPGraphics/RPGrpTexture.h>
Expand Down
13 changes: 13 additions & 0 deletions include/Pack/RPGraphics/RPGrpCamera.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,19 @@ class RPGrpCamera {
void LoadScnCameraMatrix(const nw4r::g3d::ResAnmScn scn, u8 refNumber,
f32 frame = 0.0f);

/**
* @brief Getter for position
*
* @return nw4r::math::VEC3 Camera position
*/
nw4r::math::VEC3 GetPosition() {
return mPosition;
}

void SetPosition(nw4r::math::VEC3 newPos) {
mPosition = newPos;
}

/**
* @brief Sets the type of this camera
*
Expand Down
Loading
Loading