mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
Update to latest ghidra project
This commit is contained in:
rozlette
+309
-312
File diff suppressed because it is too large
Load Diff
+373
-171
File diff suppressed because it is too large
Load Diff
+43
-35
@@ -28,8 +28,8 @@ extern u64 lastFrameDuration; // D_80096B70
|
||||
extern s32 frameCount; // D_80096B78
|
||||
extern char D_80096B80[][18]; // D_80096B80
|
||||
extern char D_80096BC8[][6]; // D_80096BC8
|
||||
extern UNK_PTR D_80096BE0; // D_80096BE0
|
||||
extern UNK_TYPE1 D_80096BE4; // D_80096BE4
|
||||
extern FaultDrawContext* faultDrawContext; // D_80096BE0
|
||||
extern FaultDrawContext faultDrawContextInit; // D_80096BE4
|
||||
extern UNK_TYPE4 D_80096C20; // D_80096C20
|
||||
extern UNK_TYPE4 D_80096C30; // D_80096C30
|
||||
extern ThreadInfo* ThreadInfoListHead; // D_80096C40
|
||||
@@ -55,7 +55,7 @@ extern OSThread* __osFaultedThread; // D_80097E24
|
||||
extern UNK_TYPE4 __osSiAccessQueueEnabled; // D_80097E30
|
||||
extern UNK_TYPE4 D_80097E40; // D_80097E40
|
||||
extern u64 osClockRate; // D_80097E50
|
||||
extern UNK_TYPE4 D_80097E58; // D_80097E58
|
||||
extern s32 osViClock; // D_80097E58
|
||||
extern UNK_TYPE4 __osShutdown; // D_80097E5C
|
||||
extern UNK_TYPE4 __OSGlobalIntMask; // D_80097E60
|
||||
extern UNK_TYPE4 __osPiDevMgr; // D_80097E70
|
||||
@@ -221,7 +221,7 @@ extern char D_80098C2C[]; // D_80098C2C
|
||||
extern UNK_TYPE1 D_80098C34; // D_80098C34
|
||||
extern char D_80098C38[]; // D_80098C38
|
||||
extern char D_80098C40[]; // D_80098C40
|
||||
extern UNK_TYPE1 D_80098C50; // D_80098C50
|
||||
extern u8 faultDrawFont[8][128]; // D_80098C50
|
||||
extern UNK_TYPE1 D_80099050; // D_80099050
|
||||
extern UNK_TYPE1 D_80099054; // D_80099054
|
||||
extern UNK_TYPE1 D_8009905C; // D_8009905C
|
||||
@@ -231,7 +231,7 @@ extern UNK_TYPE1 D_80099078; // D_80099078
|
||||
extern UNK_TYPE1 D_8009907C; // D_8009907C
|
||||
extern UNK_PTR D_80099090; // D_80099090
|
||||
extern char D_800990B0[]; // D_800990B0
|
||||
extern UNK_TYPE4 D_800990C0; // D_800990C0
|
||||
extern f32 D_800990C0; // D_800990C0
|
||||
extern UNK_TYPE4 D_800990EC; // D_800990EC
|
||||
extern UNK_TYPE4 D_800990F0; // D_800990F0
|
||||
extern UNK_TYPE4 D_800990F4; // D_800990F4
|
||||
@@ -291,13 +291,15 @@ extern u8 yaz0FileBuffer[1024]; // D_8009BA10
|
||||
extern Yaz0DecompState yaz0DecompStatus; // D_8009BE10
|
||||
extern UNK_TYPE4 D_8009BE30; // D_8009BE30
|
||||
extern UNK_TYPE4 D_8009BE34; // D_8009BE34
|
||||
extern UNK_TYPE1 D_8009BE38; // D_8009BE38
|
||||
extern s80083BC4* D_8009BE50; // D_8009BE50
|
||||
extern FaultClient romInfoFaultClient; // D_8009BE38
|
||||
extern FaultContext* faultCtxt; // D_8009BE50
|
||||
extern UNK_TYPE4 D_8009BE54; // D_8009BE54
|
||||
extern UNK_TYPE4 D_8009BE58; // D_8009BE58
|
||||
extern UNK_TYPE4 D_8009BE5C; // D_8009BE5C
|
||||
extern u32 faultCustomOptions; // D_8009BE58
|
||||
extern u32 faultCopyToLog; // D_8009BE5C
|
||||
extern u8 faultStack[1536]; // D_8009BE60
|
||||
extern ThreadInfo faultThreadInfo; // D_8009C460
|
||||
extern FaultContext faultContextStruct; // D_8009C480
|
||||
extern FaultDrawContext faultDrawContextStruct; // D_8009CCD0
|
||||
extern UNK_TYPE4 D_8009CD10; // D_8009CD10
|
||||
extern Heap startHeap; // D_8009CD20
|
||||
extern f32 randLast; // D_8009CD50
|
||||
@@ -446,11 +448,9 @@ extern BgSpecialSceneMaxMemory bgSpecialSceneMaxMemory[1]; // D_801B46D4
|
||||
extern BgSpecialSceneMeshSubdivision bgSpecialSceneMeshSubdivisions[3]; // D_801B46DC
|
||||
extern BgSpecialSceneMaxObjects bgSpecialSceneMaxObjects[1]; // D_801B4700
|
||||
extern UNK_TYPE1 D_801B4708; // D_801B4708
|
||||
extern UNK_TYPE4 D_801B986C; // D_801B986C
|
||||
extern UNK_TYPE4 D_801B9870; // D_801B9870
|
||||
extern UNK_TYPE4 D_801B9874; // D_801B9874
|
||||
extern CameraStateParams cameraStates[91]; // D_801B986C
|
||||
extern UNK_PTR D_801B9CE4; // D_801B9CE4
|
||||
extern UNK_TYPE1 D_801B9CE8; // D_801B9CE8
|
||||
extern camera_update_func cameraUpdateFuncs[71]; // D_801B9CE8
|
||||
extern UNK_TYPE2 D_801B9E04; // D_801B9E04
|
||||
extern UNK_TYPE4 D_801B9E08; // D_801B9E08
|
||||
extern UNK_TYPE4 D_801B9E0C; // D_801B9E0C
|
||||
@@ -521,11 +521,16 @@ extern Gfx D_801BC288[3]; // D_801BC288
|
||||
extern UNK_TYPE1 D_801BC2A0; // D_801BC2A0
|
||||
extern UNK_TYPE1 D_801BC400; // D_801BC400
|
||||
extern UNK_TYPE1 D_801BC410; // D_801BC410
|
||||
extern UNK_TYPE2 D_801BD8B0; // D_801BD8B0
|
||||
extern UNK_TYPE2 D_801BD8B6; // D_801BD8B6
|
||||
extern UNK_TYPE4 D_801BD8C0; // D_801BD8C0
|
||||
extern UNK_TYPE2 D_801BD8C4; // D_801BD8C4
|
||||
extern UNK_TYPE2 D_801BD8C6; // D_801BD8C6
|
||||
extern ActorCutscene actorCutscenesGlobalCutscenes[8]; // D_801BD830
|
||||
extern s16 actorCutsceneCurrent; // D_801BD8B0
|
||||
extern s16 actorCutsceneCurrentLength; // D_801BD8B2
|
||||
extern s16 actorCutsceneEnding; // D_801BD8B4
|
||||
extern s16 actorCutsceneCurrentCamera; // D_801BD8B6
|
||||
extern Actor* actorCutsceneCurrentCutsceneActor; // D_801BD8B8
|
||||
extern UNK_TYPE4 actorCutsceneStartMethod; // D_801BD8BC
|
||||
extern GlobalContext* actorCutscenesGlobalCtxt; // D_801BD8C0
|
||||
extern s16 actorCutsceneReturnCamera; // D_801BD8C4
|
||||
extern s16 D_801BD8C6; // D_801BD8C6
|
||||
extern ColCylinderInit fireObjCollisionInit; // D_801BD8D0
|
||||
extern FireObjLightParams D_801BD8FC[2]; // D_801BD8FC
|
||||
extern GameStateMetaInfo initialGameStateInfo; // D_801BD910
|
||||
@@ -535,7 +540,7 @@ extern GameStateMetaInfo mainGameStateInfo; // D_801BD9A0
|
||||
extern GameStateMetaInfo openingGameStateInfo; // D_801BD9D0
|
||||
extern GameStateMetaInfo fileChooseGameStateInfo; // D_801BDA00
|
||||
extern GameStateMetaInfo daytelopGameStateInfo; // D_801BDA30
|
||||
extern UNK_TYPE4 D_801BDA60; // D_801BDA60
|
||||
extern UNK_TYPE4 graphNumGameStates; // D_801BDA60
|
||||
extern UNK_TYPE2 D_801BDA70; // D_801BDA70
|
||||
extern UNK_TYPE2 D_801BDA74; // D_801BDA74
|
||||
extern UNK_TYPE2 D_801BDA78; // D_801BDA78
|
||||
@@ -1255,10 +1260,10 @@ extern UNK_TYPE2 D_801D14E0; // D_801D14E0
|
||||
extern UNK_TYPE2 D_801D14E4; // D_801D14E4
|
||||
extern UNK_TYPE2 D_801D14E8; // D_801D14E8
|
||||
extern UNK_TYPE4 D_801D14F0; // D_801D14F0
|
||||
extern UNK_TYPE4 D_801D1500; // D_801D1500
|
||||
extern f32 D_801D1504; // D_801D1504
|
||||
extern f32 D_801D1508; // D_801D1508
|
||||
extern f32 D_801D150C; // D_801D150C
|
||||
extern UNK_TYPE4 gFramerateDivisor; // D_801D1500
|
||||
extern f32 gFramerateDivisorF; // D_801D1504
|
||||
extern f32 gFramerateDivisorHalf; // D_801D1508
|
||||
extern f32 gFramerateDivisorThird; // D_801D150C
|
||||
extern UNK_TYPE4 D_801D1510; // D_801D1510
|
||||
extern UNK_TYPE4 D_801D1514; // D_801D1514
|
||||
extern u32 screenWidth; // D_801D1520
|
||||
@@ -2523,7 +2528,7 @@ extern ColTriParams D_801EDBB0; // D_801EDBB0
|
||||
extern UNK_TYPE1 D_801EDBD4; // D_801EDBD4
|
||||
extern UNK_TYPE1 D_801EDBD8; // D_801EDBD8
|
||||
extern UNK_TYPE1 D_801EDBDC; // D_801EDBDC
|
||||
extern UNK_TYPE1 D_801EDBF0; // D_801EDBF0
|
||||
extern s16 D_801EDBF0; // D_801EDBF0
|
||||
extern UNK_TYPE1 D_801EDBF4; // D_801EDBF4
|
||||
extern UNK_TYPE1 D_801EDBF8; // D_801EDBF8
|
||||
extern UNK_TYPE1 D_801EDC00; // D_801EDC00
|
||||
@@ -2626,11 +2631,11 @@ extern UNK_TYPE2 D_801F4DCC[8]; // D_801F4DCC
|
||||
extern UNK_TYPE1 D_801F4DDC; // D_801F4DDC
|
||||
extern UNK_TYPE1 D_801F4DE0; // D_801F4DE0
|
||||
extern UNK_TYPE2 D_801F4DE2; // D_801F4DE2
|
||||
extern UNK_TYPE1 D_801F4DF0; // D_801F4DF0
|
||||
extern UNK_TYPE1 D_801F4DF4; // D_801F4DF4
|
||||
extern UNK_TYPE1 D_801F4DF8; // D_801F4DF8
|
||||
extern ActorCutscene* actorCutscenes; // D_801F4DF0
|
||||
extern s16 actorCutsceneCount; // D_801F4DF4
|
||||
extern u8 actorCutsceneWaiting[16]; // D_801F4DF8
|
||||
extern UNK_TYPE1 D_801F4E08; // D_801F4E08
|
||||
extern UNK_TYPE1 D_801F4E10; // D_801F4E10
|
||||
extern u8 actorCutsceneNextCutscenes[16]; // D_801F4E10
|
||||
extern UNK_TYPE1 D_801F4E20; // D_801F4E20
|
||||
extern UNK_TYPE1 D_801F4E30; // D_801F4E30
|
||||
extern UNK_TYPE1 D_801F4E31; // D_801F4E31
|
||||
@@ -2689,7 +2694,7 @@ extern UNK_TYPE1 D_801F53B0; // D_801F53B0
|
||||
extern UNK_TYPE1 D_801F56B0; // D_801F56B0
|
||||
extern UNK_TYPE1 D_801F5730; // D_801F5730
|
||||
extern UNK_TYPE1 D_801F5834; // D_801F5834
|
||||
extern UNK_TYPE4 D_801F5840; // D_801F5840
|
||||
extern s32* gNMIBuffer; // D_801F5840
|
||||
extern UNK_TYPE1 D_801F5850; // D_801F5850
|
||||
extern UNK_TYPE1 D_801F58B0; // D_801F58B0
|
||||
extern UNK_TYPE1 D_801F59AC; // D_801F59AC
|
||||
@@ -2772,9 +2777,9 @@ extern UNK_TYPE1 D_801F8010; // D_801F8010
|
||||
extern UNK_TYPE1 D_801F8020; // D_801F8020
|
||||
extern UNK_TYPE1 D_801F8030; // D_801F8030
|
||||
extern UNK_TYPE1 D_801F8048; // D_801F8048
|
||||
extern UNK_TYPE1 D_801F80D0; // D_801F80D0
|
||||
extern UNK_TYPE1 D_801F80E0; // D_801F80E0
|
||||
extern UNK_TYPE1 D_801F80F0; // D_801F80F0
|
||||
extern FaultAddressConverterClient grapgFaultAddrConvClient; // D_801F80D0
|
||||
extern FaultClient graphFaultClient; // D_801F80E0
|
||||
extern Gfx* graphDlEntry; // D_801F80F0
|
||||
extern UNK_TYPE1 D_801F80F8; // D_801F80F8
|
||||
extern u64 lastRenderFrameTimestamp; // D_801F8150
|
||||
extern OSMesgQueue siEventCallbackQueue; // D_801F8160
|
||||
@@ -2807,7 +2812,7 @@ extern UNK_TYPE1 D_801FBAD0; // D_801FBAD0
|
||||
extern UNK_TYPE1 D_801FBAD4; // D_801FBAD4
|
||||
extern UNK_TYPE1 D_801FBAE0; // D_801FBAE0
|
||||
extern UNK_TYPE1 D_801FBAE8; // D_801FBAE8
|
||||
extern UNK_TYPE1 D_801FBAF0; // D_801FBAF0
|
||||
extern u64 D_801FBAF0; // D_801FBAF0
|
||||
extern u64 lastRenderFrameDuration; // D_801FBAF8
|
||||
extern UNK_TYPE1 D_801FBB00; // D_801FBB00
|
||||
extern UNK_TYPE1 D_801FBB04; // D_801FBB04
|
||||
@@ -2818,8 +2823,8 @@ extern UNK_TYPE1 D_801FBB14; // D_801FBB14
|
||||
extern UNK_TYPE1 D_801FBB20; // D_801FBB20
|
||||
extern UNK_TYPE1 D_801FBB28; // D_801FBB28
|
||||
extern UNK_TYPE1 D_801FBB30; // D_801FBB30
|
||||
extern UNK_TYPE4 D_801FBB80; // D_801FBB80
|
||||
extern UNK_TYPE1 D_801FBB88; // D_801FBB88
|
||||
extern u32* gFramebuffers[2]; // D_801FBB80
|
||||
extern OSViMode* D_801FBB88; // D_801FBB88
|
||||
extern UNK_TYPE1 D_801FBB8C; // D_801FBB8C
|
||||
extern UNK_TYPE4 D_801FBB90; // D_801FBB90
|
||||
extern UNK_TYPE1 D_801FBB94; // D_801FBB94
|
||||
@@ -9412,6 +9417,7 @@ extern UNK_TYPE4 D_80A41934; // D_80A41934
|
||||
extern OverlayBlockSizes enTest3OverlayInfo; // D_80A41940
|
||||
extern u32 enTest3OverlayRelocations[242]; // D_80A41954
|
||||
extern u32 enTest3OverlayInfoOffset; // D_80A41D1C
|
||||
extern ActorInitData enTest4InitData; // D_80A43320
|
||||
extern UNK_TYPE4 D_80A43340; // D_80A43340
|
||||
extern UNK_TYPE1 D_80A43342; // D_80A43342
|
||||
extern UNK_TYPE1 D_80A4334A; // D_80A4334A
|
||||
@@ -9421,6 +9427,8 @@ extern UNK_TYPE1 D_80A43364; // D_80A43364
|
||||
extern OverlayBlockSizes enTest4OverlayInfo; // D_80A43370
|
||||
extern u32 enTest4OverlayRelocations[81]; // D_80A43384
|
||||
extern u32 enTest4OverlayInfoOffset; // D_80A434CC
|
||||
extern s16 D_80A434D0[2]; // D_80A434D0
|
||||
extern UNK_TYPE1 D_80A434D4; // D_80A434D4
|
||||
extern UNK_TYPE1 D_80A44A00; // D_80A44A00
|
||||
extern UNK_TYPE1 D_80A44A2C; // D_80A44A2C
|
||||
extern UNK_TYPE1 D_80A44A4C; // D_80A44A4C
|
||||
|
||||
@@ -25,7 +25,7 @@ SECTIONS
|
||||
build/asm/boot_0x800862E0.o(.text)
|
||||
build/asm/boot_0x80086760.o(.text)
|
||||
build/asm/__osMalloc.o(.text)
|
||||
build/asm/boot_0x80087830.o(.text)
|
||||
build/asm/sprintf.o(.text)
|
||||
build/asm/boot_0x80087900.o(.text)
|
||||
build/asm/setcause.o(.text)
|
||||
build/src/libultra/os/sendmesg.o(.text)
|
||||
@@ -57,7 +57,7 @@ SECTIONS
|
||||
build/asm/setsr.o(.text)
|
||||
build/asm/writebackdcache.o(.text)
|
||||
build/asm/initialize.o(.text)
|
||||
build/asm/boot_0x8008AA10.o(.text)
|
||||
build/asm/vigetnextframebuf.o(.text)
|
||||
build/asm/perspective.o(.text)
|
||||
build/src/libultra/io/sprawdma.o(.text)
|
||||
build/asm/sirawdma.o(.text)
|
||||
@@ -114,17 +114,17 @@ SECTIONS
|
||||
build/asm/sptaskyielded.o(.text)
|
||||
build/asm/memcmp.o(.text)
|
||||
build/asm/gettime.o(.text)
|
||||
build/asm/boot_0x800904B0.o(.text)
|
||||
build/asm/rotate.o(.text)
|
||||
build/asm/setglobalintmask.o(.text)
|
||||
build/asm/boot_0x800906D0.o(.text)
|
||||
build/asm/boot_0x80090810.o(.text)
|
||||
build/asm/boot_0x80090900.o(.text)
|
||||
build/asm/boot_0x80090AF0.o(.text)
|
||||
build/asm/aisetfreq.o(.text)
|
||||
build/asm/boot_0x80090C40.o(.text)
|
||||
build/asm/boot_0x80090E70.o(.text)
|
||||
build/asm/boot_0x800910A0.o(.text)
|
||||
build/asm/boot_0x80091210.o(.text)
|
||||
build/asm/boot_0x80091220.o(.text)
|
||||
build/asm/getactivequeue.o(.text)
|
||||
build/asm/normalize.o(.text)
|
||||
build/asm/setcompare.o(.text)
|
||||
build/asm/getcompare.o(.text)
|
||||
build/asm/dpgetstat.o(.text)
|
||||
@@ -237,6 +237,7 @@ SECTIONS
|
||||
build/asm/code_0x800F07C0.o(.text)
|
||||
build/asm/code_0x800F1250.o(.text)
|
||||
build/asm/code_0x800F1460.o(.text)
|
||||
build/asm/code_0x800F23E0.o(.text)
|
||||
build/asm/z_fcurve_data_skelanime.o(.text)
|
||||
build/asm/z_fireobj.o(.text)
|
||||
build/asm/z_horse.o(.text)
|
||||
@@ -360,6 +361,7 @@ SECTIONS
|
||||
build/asm/code_rodata_z_draw.o(.text)
|
||||
build/src/code/z_eff_footmark.o(.rodata)
|
||||
build/asm/code_rodata_0x800F1460.o(.text)
|
||||
build/asm/code_rodata_0x800F23E0.o(.text)
|
||||
build/asm/code_rodata_z_fcurve_data_skelanime.o(.text)
|
||||
build/asm/code_rodata_z_fireobj.o(.text)
|
||||
build/asm/code_rodata_z_horse.o(.text)
|
||||
|
||||
@@ -37,7 +37,7 @@ void BgFuKaiten_Fini(ActorBgFuKaiten* this, GlobalContext* ctxt) {
|
||||
|
||||
void BgFuKaiten_UpdateRotation(ActorBgFuKaiten* this) {
|
||||
f32 f0;
|
||||
this->bg.base.postDrawParams.rotation.y += this->rotationSpeed;
|
||||
this->bg.base.drawParams.rot.y += this->rotationSpeed;
|
||||
if (this->rotationSpeed > 0)
|
||||
{
|
||||
f0 = this->rotationSpeed * .002f;
|
||||
@@ -47,9 +47,9 @@ void BgFuKaiten_UpdateRotation(ActorBgFuKaiten* this) {
|
||||
|
||||
void BgFuKaiten_UpdateHeight(ActorBgFuKaiten* this) {
|
||||
this->bounce += this->bounceSpeed;
|
||||
this->bg.base.unk24.pos.y = this->bg.base.initPosRot.pos.y + this->elevation + this->bouceHeight;
|
||||
this->bg.base.currPosRot.pos.y = this->bg.base.initPosRot.pos.y + this->elevation + this->bouceHeight;
|
||||
|
||||
this->bg.base.unk24.pos.y -= this->bouceHeight * Lib_cos(this->bounce);
|
||||
this->bg.base.currPosRot.pos.y -= this->bouceHeight * Lib_cos(this->bounce);
|
||||
}
|
||||
|
||||
void BgFuKaiten_Main(ActorBgFuKaiten* this, GlobalContext* ctxt) {
|
||||
|
||||
+10
-10
@@ -1,22 +1,22 @@
|
||||
#include <ultra64.h>
|
||||
#include <global.h>
|
||||
|
||||
void nop_80081820(void) {}
|
||||
void CIC6105_Nop80081820(void) {}
|
||||
|
||||
void nop_80081828(void) {}
|
||||
void CIC6105_Nop80081828(void) {}
|
||||
|
||||
void func_80081830(void) {
|
||||
func_8008481C(80, 200, &D_80098280, (UNK_PTR)(*(u32*)0xA4040010));
|
||||
func_8008481C(40, 184, &D_80098290, &D_800994D0);
|
||||
func_8008481C(56, 192, &D_800982A4, &D_800994DC);
|
||||
void CIC6105_PrintRomInfo(void) {
|
||||
FaultDraw_DrawText(80, 200, &D_80098280, (UNK_PTR)(*(u32*)0xA4040010));
|
||||
FaultDraw_DrawText(40, 184, &D_80098290, &D_800994D0);
|
||||
FaultDraw_DrawText(56, 192, &D_800982A4, &D_800994DC);
|
||||
}
|
||||
|
||||
void func_8008189C(void) {
|
||||
func_800819F0(&D_8009BE38, (u32)(void(*)(UNK_TYPE, UNK_TYPE))func_80081830, 0, 0);
|
||||
void CIC6105_AddRomInfoFaultPage(void) {
|
||||
Fault_AddClient(&romInfoFaultClient, (fault_client_func*)CIC6105_PrintRomInfo, 0, 0);
|
||||
}
|
||||
|
||||
void func_800818D0(void) {
|
||||
func_80081AD4(&D_8009BE38);
|
||||
void CIC6105_RemoveRomInfoFaultPage(void) {
|
||||
Fault_RemoveClient(&romInfoFaultClient);
|
||||
}
|
||||
|
||||
void func_800818F4(void) {
|
||||
|
||||
@@ -8,7 +8,7 @@ void EnAObj_Init(ActorEnAObj* this, GlobalContext* ctxt) {
|
||||
s0->base.textId = ((s0->base.variable >> 8) & 0xFF) | 0x300;
|
||||
s0->base.variable = (s0->base.variable & 0xFF) - 9;
|
||||
Lib_ApplyActorInitVars((Actor*)s0, (ActorInitVar*)&enAObjInitVar);
|
||||
Actor_SetPostDrawParams(&s0->base.postDrawParams, 0, (actor_post_draw_func*)func_800B3FC0, 12);
|
||||
Actor_SetDrawParams(&s0->base.drawParams, 0, (actor_post_draw_func*)func_800B3FC0, 12);
|
||||
Collision_InitCylinder(ctxt, &s0->collision, (Actor*)s0, &enAObjCylinderInit);
|
||||
Collision_CylinderMoveToActor((Actor*)s0, &s0->collision);
|
||||
s0->base.unkA0.unk16 = 255;
|
||||
@@ -26,7 +26,7 @@ void EnAObj_Update1(ActorEnAObj* this, GlobalContext* ctxt) {
|
||||
if (func_800B84D0((Actor*)this, ctxt) != 0) {
|
||||
this->update = (actor_func)EnAObj_Update2;
|
||||
} else {
|
||||
v0 = this->base.unk92 - this->base.postDrawParams.rotation.y;
|
||||
v0 = this->base.yawToLink - this->base.drawParams.rot.y;
|
||||
v1 = (v0 < 0)? -v0 : v0;
|
||||
if ((v1 < 10240) || ((this->base.variable == 1) && (v1 > 22528))) {
|
||||
func_800B863C((Actor*)this, ctxt);
|
||||
@@ -42,7 +42,7 @@ void EnAObj_Update2(ActorEnAObj* this, GlobalContext* ctxt) {
|
||||
|
||||
void EnAObj_Main(ActorEnAObj* this, GlobalContext* ctxt) {
|
||||
(this->update)((Actor*)this, (GlobalContext*)ctxt);
|
||||
func_800B675C((Actor*)this, 45.0f);
|
||||
Actor_SetHeight((Actor*)this, 45.0f);
|
||||
Collision_AddOT(ctxt, &ctxt->collisionContext, (ColCommon*)&this->collision);
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ void BgCheck2_UpdateActorPosition(BgCheckContext* bgCtxt, s32 index, Actor* acto
|
||||
bgCtxt->dyna.actorMeshes[index].prevParams.pos.y,
|
||||
bgCtxt->dyna.actorMeshes[index].prevParams.pos.z);
|
||||
|
||||
if (invert_matrix(&prevMatrix, &prevMatrixInv) == 2) return;
|
||||
if (Matrix_Invert(&prevMatrix, &prevMatrixInv) == 2) return;
|
||||
|
||||
Matrix_MakeTranslationRotationYXZScale(&currMatrix,
|
||||
bgCtxt->dyna.actorMeshes[index].currParams.scale.x,
|
||||
@@ -38,10 +38,10 @@ void BgCheck2_UpdateActorPosition(BgCheckContext* bgCtxt, s32 index, Actor* acto
|
||||
bgCtxt->dyna.actorMeshes[index].currParams.pos.y,
|
||||
bgCtxt->dyna.actorMeshes[index].currParams.pos.z);
|
||||
|
||||
Matrix_MultiplyByVectorXYZ(&prevMatrixInv, &actor->unk24.pos, &posWithInv);
|
||||
Matrix_MultiplyByVectorXYZ(&prevMatrixInv, &actor->currPosRot.pos, &posWithInv);
|
||||
Matrix_MultiplyByVectorXYZ(&currMatrix, &posWithInv, &newPos);
|
||||
|
||||
actor->unk24.pos = newPos;
|
||||
actor->currPosRot.pos = newPos;
|
||||
}
|
||||
|
||||
void BgCheck2_UpdateActorYRotation(BgCheckContext* bgCtxt, s32 index, Actor* actor) {
|
||||
@@ -55,8 +55,8 @@ void BgCheck2_UpdateActorYRotation(BgCheckContext* bgCtxt, s32 index, Actor* act
|
||||
((ActorPlayer*)actor)->unkAD4 += angleChange;
|
||||
}
|
||||
|
||||
actor->postDrawParams.rotation.y += angleChange;
|
||||
actor->unk24.rot.y += angleChange;
|
||||
actor->drawParams.rot.y += angleChange;
|
||||
actor->currPosRot.rot.y += angleChange;
|
||||
}
|
||||
|
||||
void BgCheck2_AttachToMesh(BgCheckContext* bgCtxt, Actor* actor, s32 index) {
|
||||
|
||||
@@ -31,8 +31,8 @@ s32 func_800E8FA4(Actor* actor, Vector3f* param_2, Vector3s* param_3, Vector3s*
|
||||
s16 targetYaw;
|
||||
s16 yawDiffFromTarget;
|
||||
|
||||
targetPitch = Lib_PitchVec3f(&actor->unk3C.pos,param_2);
|
||||
targetYaw = Lib_YawVec3f(&actor->unk3C.pos,param_2) - actor->unk24.rot.y;
|
||||
targetPitch = Lib_PitchVec3f(&actor->topPosRot.pos,param_2);
|
||||
targetYaw = Lib_YawVec3f(&actor->topPosRot.pos,param_2) - actor->currPosRot.rot.y;
|
||||
|
||||
Lib_ScaleMaxMin_s(¶m_3->x, targetPitch, 6, 2000, 1);
|
||||
param_3->x = (param_3->x < -6000)? -6000 : ((6000 < param_3->x)? 6000 : param_3->x);
|
||||
@@ -58,11 +58,11 @@ s32 func_800E9138(GlobalContext* ctxt, Actor* actor, Vector3s* param_3, Vector3s
|
||||
Vector3f local_14;
|
||||
|
||||
player = (ctxt->actorContext).actorTypeLists[2].head;
|
||||
actor->unk3C.pos = actor->unk24.pos;
|
||||
actor->unk3C.pos.y += param_5;
|
||||
actor->topPosRot.pos = actor->currPosRot.pos;
|
||||
actor->topPosRot.pos.y += param_5;
|
||||
|
||||
if (((ctxt->cutsceneContext).state == 0) && (D_801D0D50 == 0)) {
|
||||
sVar3 = actor->unk92 - actor->postDrawParams.rotation.y;
|
||||
sVar3 = actor->yawToLink - actor->drawParams.rot.y;
|
||||
// TODO is this shifting because of a missing cast?
|
||||
if (0x42ff < (sVar3 < 0? ((-sVar3 << 0x10) >> 0x10) : ((sVar3 << 0x10) >> 0x10))) {
|
||||
func_800E8F08(param_3,param_4);
|
||||
@@ -73,7 +73,7 @@ s32 func_800E9138(GlobalContext* ctxt, Actor* actor, Vector3s* param_3, Vector3s
|
||||
if (((ctxt->cutsceneContext).state != 0) || (D_801D0D50 != 0)) {
|
||||
local_14 = ctxt->view.eye;
|
||||
} else {
|
||||
local_14 = player->unk3C.pos;
|
||||
local_14 = player->topPosRot.pos;
|
||||
}
|
||||
|
||||
func_800E8FA4(actor,&local_14,param_3,param_4);
|
||||
@@ -86,10 +86,10 @@ s32 func_800E9250(GlobalContext* ctxt, Actor* actor, Vector3s* param_3, Vector3s
|
||||
Vector3f local_14;
|
||||
|
||||
player = (ctxt->actorContext).actorTypeLists[2].head;
|
||||
actor->unk3C.pos = param_5;
|
||||
actor->topPosRot.pos = param_5;
|
||||
|
||||
if (((ctxt->cutsceneContext).state == 0) && (D_801D0D50 == 0)) {
|
||||
sVar3 = actor->unk92 - actor->postDrawParams.rotation.y;
|
||||
sVar3 = actor->yawToLink - actor->drawParams.rot.y;
|
||||
// TODO is this shifting because of a missing cast?
|
||||
if (0x42ff < (sVar3 < 0? ((-sVar3 << 0x10) >> 0x10) : ((sVar3 << 0x10) >> 0x10))) {
|
||||
func_800E8F08(param_3,param_4);
|
||||
@@ -100,7 +100,7 @@ s32 func_800E9250(GlobalContext* ctxt, Actor* actor, Vector3s* param_3, Vector3s
|
||||
if (((ctxt->cutsceneContext).state != 0) || (D_801D0D50 != 0)) {
|
||||
local_14 = ctxt->view.eye;
|
||||
} else {
|
||||
local_14 = player->unk3C.pos;
|
||||
local_14 = player->topPosRot.pos;
|
||||
}
|
||||
|
||||
func_800E8FA4(actor,&local_14,param_3,param_4);
|
||||
|
||||
+20
-20
@@ -3,7 +3,7 @@
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PrintLists.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetPostDrawParams.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetDrawParams.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PostDraw.asm")
|
||||
|
||||
@@ -99,13 +99,13 @@ GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6680.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_MarkForDeath.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B672C.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_InitCurrPosition.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B675C.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetHeight.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B67A0.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetRotationFromDrawRotation.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B67C0.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_InitDrawRotation.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetScale.asm")
|
||||
|
||||
@@ -137,13 +137,13 @@ GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6C58.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_YawBetweenActors.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6D00.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_YawBetweenActorsTop.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_YawToPoint.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PitchBetweenActors.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6D7C.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PitchBetweenActorsTop.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PitchToPoint.asm")
|
||||
|
||||
@@ -155,7 +155,7 @@ GLOBAL_ASM("asm/nonmatching/z_actor//Actor_XZDistanceBetweenActors.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_XZDistanceToPoint.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6E6C.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_CalcOffsetOrientedToDrawRotation.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_YDistance.asm")
|
||||
|
||||
@@ -187,17 +187,17 @@ GLOBAL_ASM("asm/nonmatching/z_actor//func_800B72E0.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B72F8.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7320.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsLinkFacingActor.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7378.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsActorFacedByActor.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B73E0.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsActorFacingLink.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B742C.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsActorFacingActor.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B748C.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsActorFacingLinkAndWithinRange.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B750C.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_IsActorFacingActorAndWithinRange.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B75A0.asm")
|
||||
|
||||
@@ -327,9 +327,9 @@ GLOBAL_ASM("asm/nonmatching/z_actor//Actor_Init.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9334.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B948C.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_UpdateActor.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9780.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_UpdateAll.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DrawActor.asm")
|
||||
|
||||
@@ -337,7 +337,7 @@ GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9D1C.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DrawAllSetup.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_RecordDrawnActor.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_RecordUndrawnActor.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9E84.asm")
|
||||
|
||||
@@ -363,13 +363,13 @@ GLOBAL_ASM("asm/nonmatching/z_actor//Actor_RemoveFromTypeList.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_FreeOverlay.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnNoParentDefaultUnk38Unk20.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_Spawn.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_LoadOverlay.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_Spawn.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnWithParentAndCutscene.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnDefaultUnk38.asm")
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnWithParent.asm")
|
||||
|
||||
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnTransitionActors.asm")
|
||||
|
||||
|
||||
+1
-1
@@ -75,7 +75,7 @@ s32 Lib_StepTowardsCheckFramerateScaled_s(s16* start, s16 target, s16 step) {
|
||||
f32 f0;
|
||||
|
||||
if (step != 0) {
|
||||
f0 = D_801D1508;
|
||||
f0 = gFramerateDivisorHalf;
|
||||
|
||||
if ((s16)(*start - target) > 0) {
|
||||
step = -step;
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ void Room_DrawType1Mesh(GlobalContext* ctxt, Room* room, u32 flags) {
|
||||
} else if (mesh->format == 2) {
|
||||
func_8012E32C(ctxt,room,flags);
|
||||
} else {
|
||||
func_80086280(D_801DDFAC,0x3c5);
|
||||
assert_fail(D_801DDFAC,0x3c5);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -47,11 +47,11 @@ void osInitialize(void) {
|
||||
}
|
||||
|
||||
if (osTvType == 0) {
|
||||
D_80097E58 = 0x02F5B2D2;
|
||||
osViClock = 0x02F5B2D2;
|
||||
} else if (osTvType == 2) {
|
||||
D_80097E58 = 0x02E6025C;
|
||||
osViClock = 0x02E6025C;
|
||||
} else {
|
||||
D_80097E58 = 0x02E6D354;
|
||||
osViClock = 0x02E6D354;
|
||||
}
|
||||
|
||||
if((__osGetCause() & 0x1000) != 0) {
|
||||
|
||||
+309
-309
File diff suppressed because it is too large
Load Diff
+8
-6
@@ -19,7 +19,7 @@
|
||||
0x800862E0:"",
|
||||
0x80086760:"",
|
||||
0x80087160:"__osMalloc",
|
||||
0x80087830:"",
|
||||
0x80087830:"sprintf",
|
||||
0x80087900:"",
|
||||
0x80087B00:"setcause",
|
||||
0x80087B10:"sendmesg",
|
||||
@@ -51,7 +51,7 @@
|
||||
0x8008A5D0:"setsr",
|
||||
0x8008A5E0:"writebackdcache",
|
||||
0x8008A660:"initialize",
|
||||
0x8008AA10:"",
|
||||
0x8008AA10:"vigetnextframebuf",
|
||||
0x8008AA50:"perspective",
|
||||
0x8008AD70:"sirawdma",
|
||||
0x8008ACE0:"sprawdma",
|
||||
@@ -108,17 +108,17 @@
|
||||
0x800902A0:"sptaskyielded",
|
||||
0x80090300:"memcmp",
|
||||
0x80090420:"gettime",
|
||||
0x800904B0:"",
|
||||
0x800904B0:"rotate",
|
||||
0x80090680:"setglobalintmask",
|
||||
0x800906D0:"",
|
||||
0x80090810:"",
|
||||
0x80090900:"",
|
||||
0x80090AF0:"",
|
||||
0x80090AF0:"aisetfreq",
|
||||
0x80090C40:"",
|
||||
0x80090E70:"",
|
||||
0x800910A0:"",
|
||||
0x80091210:"",
|
||||
0x80091220:"",
|
||||
0x80091210:"getactivequeue",
|
||||
0x80091220:"normalize",
|
||||
0x80091280:"setcompare",
|
||||
0x80091290:"getcompare",
|
||||
0x800912A0:"dpgetstat",
|
||||
@@ -221,6 +221,7 @@
|
||||
0x800F07C0:"",
|
||||
0x800F1250:"",
|
||||
0x800F1460:"",
|
||||
0x800F23E0:"",
|
||||
0x800F2620:"z_fcurve_data_skelanime",
|
||||
0x800F2D30:"z_fireobj",
|
||||
0x800F3940:"z_horse",
|
||||
@@ -342,6 +343,7 @@
|
||||
0x801DD770:"code_rodata_z_draw",
|
||||
0x801DD780:"code_rodata_z_eff_footmark",
|
||||
0x801DD790:"code_rodata_0x800F1460",
|
||||
0x801DD7B0:"code_rodata_0x800F23E0",
|
||||
0x801DD7C0:"code_rodata_z_fcurve_data_skelanime",
|
||||
0x801DD7D0:"code_rodata_z_fireobj",
|
||||
0x801DD7E0:"code_rodata_z_horse",
|
||||
|
||||
+43
-35
@@ -15,8 +15,8 @@
|
||||
0x80096B78:("frameCount","s32",""),
|
||||
0x80096B80:("D_80096B80","char","[][18]"),
|
||||
0x80096BC8:("D_80096BC8","char","[][6]"),
|
||||
0x80096BE0:("D_80096BE0","UNK_PTR",""),
|
||||
0x80096BE4:("D_80096BE4","UNK_TYPE1",""),
|
||||
0x80096BE0:("faultDrawContext","FaultDrawContext*",""),
|
||||
0x80096BE4:("faultDrawContextInit","FaultDrawContext",""),
|
||||
0x80096C20:("D_80096C20","UNK_TYPE4",""),
|
||||
0x80096C30:("D_80096C30","UNK_TYPE4",""),
|
||||
0x80096C40:("ThreadInfoListHead","ThreadInfo*",""),
|
||||
@@ -42,7 +42,7 @@
|
||||
0x80097E30:("__osSiAccessQueueEnabled","UNK_TYPE4",""),
|
||||
0x80097E40:("D_80097E40","UNK_TYPE4",""),
|
||||
0x80097E50:("osClockRate","u64",""),
|
||||
0x80097E58:("D_80097E58","UNK_TYPE4",""),
|
||||
0x80097E58:("osViClock","s32",""),
|
||||
0x80097E5C:("__osShutdown","UNK_TYPE4",""),
|
||||
0x80097E60:("__OSGlobalIntMask","UNK_TYPE4",""),
|
||||
0x80097E70:("__osPiDevMgr","UNK_TYPE4",""),
|
||||
@@ -208,7 +208,7 @@
|
||||
0x80098C34:("D_80098C34","UNK_TYPE1",""),
|
||||
0x80098C38:("D_80098C38","char","[]"),
|
||||
0x80098C40:("D_80098C40","char","[]"),
|
||||
0x80098C50:("D_80098C50","UNK_TYPE1",""),
|
||||
0x80098C50:("faultDrawFont","u8","[8][128]"),
|
||||
0x80099050:("D_80099050","UNK_TYPE1",""),
|
||||
0x80099054:("D_80099054","UNK_TYPE1",""),
|
||||
0x8009905C:("D_8009905C","UNK_TYPE1",""),
|
||||
@@ -218,7 +218,7 @@
|
||||
0x8009907C:("D_8009907C","UNK_TYPE1",""),
|
||||
0x80099090:("D_80099090","UNK_PTR",""),
|
||||
0x800990B0:("D_800990B0","char","[]"),
|
||||
0x800990C0:("D_800990C0","UNK_TYPE4",""),
|
||||
0x800990C0:("D_800990C0","f32",""),
|
||||
0x800990EC:("D_800990EC","UNK_TYPE4",""),
|
||||
0x800990F0:("D_800990F0","UNK_TYPE4",""),
|
||||
0x800990F4:("D_800990F4","UNK_TYPE4",""),
|
||||
@@ -278,13 +278,15 @@
|
||||
0x8009BE10:("yaz0DecompStatus","Yaz0DecompState",""),
|
||||
0x8009BE30:("D_8009BE30","UNK_TYPE4",""),
|
||||
0x8009BE34:("D_8009BE34","UNK_TYPE4",""),
|
||||
0x8009BE38:("D_8009BE38","UNK_TYPE1",""),
|
||||
0x8009BE50:("D_8009BE50","s80083BC4*",""),
|
||||
0x8009BE38:("romInfoFaultClient","FaultClient",""),
|
||||
0x8009BE50:("faultCtxt","FaultContext*",""),
|
||||
0x8009BE54:("D_8009BE54","UNK_TYPE4",""),
|
||||
0x8009BE58:("D_8009BE58","UNK_TYPE4",""),
|
||||
0x8009BE5C:("D_8009BE5C","UNK_TYPE4",""),
|
||||
0x8009BE58:("faultCustomOptions","u32",""),
|
||||
0x8009BE5C:("faultCopyToLog","u32",""),
|
||||
0x8009BE60:("faultStack","u8","[1536]"),
|
||||
0x8009C460:("faultThreadInfo","ThreadInfo",""),
|
||||
0x8009C480:("faultContextStruct","FaultContext",""),
|
||||
0x8009CCD0:("faultDrawContextStruct","FaultDrawContext",""),
|
||||
0x8009CD10:("D_8009CD10","UNK_TYPE4",""),
|
||||
0x8009CD20:("startHeap","Heap",""),
|
||||
0x8009CD50:("randLast","f32",""),
|
||||
@@ -433,11 +435,9 @@
|
||||
0x801B46DC:("bgSpecialSceneMeshSubdivisions","BgSpecialSceneMeshSubdivision","[3]"),
|
||||
0x801B4700:("bgSpecialSceneMaxObjects","BgSpecialSceneMaxObjects","[1]"),
|
||||
0x801B4708:("D_801B4708","UNK_TYPE1",""),
|
||||
0x801B986C:("D_801B986C","UNK_TYPE4",""),
|
||||
0x801B9870:("D_801B9870","UNK_TYPE4",""),
|
||||
0x801B9874:("D_801B9874","UNK_TYPE4",""),
|
||||
0x801B986C:("cameraStates","CameraStateParams","[91]"),
|
||||
0x801B9CE4:("D_801B9CE4","UNK_PTR",""),
|
||||
0x801B9CE8:("D_801B9CE8","UNK_TYPE1",""),
|
||||
0x801B9CE8:("cameraUpdateFuncs","camera_update_func","[71]"),
|
||||
0x801B9E04:("D_801B9E04","UNK_TYPE2",""),
|
||||
0x801B9E08:("D_801B9E08","UNK_TYPE4",""),
|
||||
0x801B9E0C:("D_801B9E0C","UNK_TYPE4",""),
|
||||
@@ -508,11 +508,16 @@
|
||||
0x801BC2A0:("D_801BC2A0","UNK_TYPE1",""),
|
||||
0x801BC400:("D_801BC400","UNK_TYPE1",""),
|
||||
0x801BC410:("D_801BC410","UNK_TYPE1",""),
|
||||
0x801BD8B0:("D_801BD8B0","UNK_TYPE2",""),
|
||||
0x801BD8B6:("D_801BD8B6","UNK_TYPE2",""),
|
||||
0x801BD8C0:("D_801BD8C0","UNK_TYPE4",""),
|
||||
0x801BD8C4:("D_801BD8C4","UNK_TYPE2",""),
|
||||
0x801BD8C6:("D_801BD8C6","UNK_TYPE2",""),
|
||||
0x801BD830:("actorCutscenesGlobalCutscenes","ActorCutscene","[8]"),
|
||||
0x801BD8B0:("actorCutsceneCurrent","s16",""),
|
||||
0x801BD8B2:("actorCutsceneCurrentLength","s16",""),
|
||||
0x801BD8B4:("actorCutsceneEnding","s16",""),
|
||||
0x801BD8B6:("actorCutsceneCurrentCamera","s16",""),
|
||||
0x801BD8B8:("actorCutsceneCurrentCutsceneActor","Actor*",""),
|
||||
0x801BD8BC:("actorCutsceneStartMethod","UNK_TYPE4",""),
|
||||
0x801BD8C0:("actorCutscenesGlobalCtxt","GlobalContext*",""),
|
||||
0x801BD8C4:("actorCutsceneReturnCamera","s16",""),
|
||||
0x801BD8C6:("D_801BD8C6","s16",""),
|
||||
0x801BD8D0:("fireObjCollisionInit","ColCylinderInit",""),
|
||||
0x801BD8FC:("D_801BD8FC","FireObjLightParams","[2]"),
|
||||
0x801BD910:("initialGameStateInfo","GameStateMetaInfo",""),
|
||||
@@ -522,7 +527,7 @@
|
||||
0x801BD9D0:("openingGameStateInfo","GameStateMetaInfo",""),
|
||||
0x801BDA00:("fileChooseGameStateInfo","GameStateMetaInfo",""),
|
||||
0x801BDA30:("daytelopGameStateInfo","GameStateMetaInfo",""),
|
||||
0x801BDA60:("D_801BDA60","UNK_TYPE4",""),
|
||||
0x801BDA60:("graphNumGameStates","UNK_TYPE4",""),
|
||||
0x801BDA70:("D_801BDA70","UNK_TYPE2",""),
|
||||
0x801BDA74:("D_801BDA74","UNK_TYPE2",""),
|
||||
0x801BDA78:("D_801BDA78","UNK_TYPE2",""),
|
||||
@@ -1242,10 +1247,10 @@
|
||||
0x801D14E4:("D_801D14E4","UNK_TYPE2",""),
|
||||
0x801D14E8:("D_801D14E8","UNK_TYPE2",""),
|
||||
0x801D14F0:("D_801D14F0","UNK_TYPE4",""),
|
||||
0x801D1500:("D_801D1500","UNK_TYPE4",""),
|
||||
0x801D1504:("D_801D1504","f32",""),
|
||||
0x801D1508:("D_801D1508","f32",""),
|
||||
0x801D150C:("D_801D150C","f32",""),
|
||||
0x801D1500:("gFramerateDivisor","UNK_TYPE4",""),
|
||||
0x801D1504:("gFramerateDivisorF","f32",""),
|
||||
0x801D1508:("gFramerateDivisorHalf","f32",""),
|
||||
0x801D150C:("gFramerateDivisorThird","f32",""),
|
||||
0x801D1510:("D_801D1510","UNK_TYPE4",""),
|
||||
0x801D1514:("D_801D1514","UNK_TYPE4",""),
|
||||
0x801D1520:("screenWidth","u32",""),
|
||||
@@ -2510,7 +2515,7 @@
|
||||
0x801EDBD4:("D_801EDBD4","UNK_TYPE1",""),
|
||||
0x801EDBD8:("D_801EDBD8","UNK_TYPE1",""),
|
||||
0x801EDBDC:("D_801EDBDC","UNK_TYPE1",""),
|
||||
0x801EDBF0:("D_801EDBF0","UNK_TYPE1",""),
|
||||
0x801EDBF0:("D_801EDBF0","s16",""),
|
||||
0x801EDBF4:("D_801EDBF4","UNK_TYPE1",""),
|
||||
0x801EDBF8:("D_801EDBF8","UNK_TYPE1",""),
|
||||
0x801EDC00:("D_801EDC00","UNK_TYPE1",""),
|
||||
@@ -2613,11 +2618,11 @@
|
||||
0x801F4DDC:("D_801F4DDC","UNK_TYPE1",""),
|
||||
0x801F4DE0:("D_801F4DE0","UNK_TYPE1",""),
|
||||
0x801F4DE2:("D_801F4DE2","UNK_TYPE2",""),
|
||||
0x801F4DF0:("D_801F4DF0","UNK_TYPE1",""),
|
||||
0x801F4DF4:("D_801F4DF4","UNK_TYPE1",""),
|
||||
0x801F4DF8:("D_801F4DF8","UNK_TYPE1",""),
|
||||
0x801F4DF0:("actorCutscenes","ActorCutscene*",""),
|
||||
0x801F4DF4:("actorCutsceneCount","s16",""),
|
||||
0x801F4DF8:("actorCutsceneWaiting","u8","[16]"),
|
||||
0x801F4E08:("D_801F4E08","UNK_TYPE1",""),
|
||||
0x801F4E10:("D_801F4E10","UNK_TYPE1",""),
|
||||
0x801F4E10:("actorCutsceneNextCutscenes","u8","[16]"),
|
||||
0x801F4E20:("D_801F4E20","UNK_TYPE1",""),
|
||||
0x801F4E30:("D_801F4E30","UNK_TYPE1",""),
|
||||
0x801F4E31:("D_801F4E31","UNK_TYPE1",""),
|
||||
@@ -2676,7 +2681,7 @@
|
||||
0x801F56B0:("D_801F56B0","UNK_TYPE1",""),
|
||||
0x801F5730:("D_801F5730","UNK_TYPE1",""),
|
||||
0x801F5834:("D_801F5834","UNK_TYPE1",""),
|
||||
0x801F5840:("D_801F5840","UNK_TYPE4",""),
|
||||
0x801F5840:("gNMIBuffer","s32*",""),
|
||||
0x801F5850:("D_801F5850","UNK_TYPE1",""),
|
||||
0x801F58B0:("D_801F58B0","UNK_TYPE1",""),
|
||||
0x801F59AC:("D_801F59AC","UNK_TYPE1",""),
|
||||
@@ -2759,9 +2764,9 @@
|
||||
0x801F8020:("D_801F8020","UNK_TYPE1",""),
|
||||
0x801F8030:("D_801F8030","UNK_TYPE1",""),
|
||||
0x801F8048:("D_801F8048","UNK_TYPE1",""),
|
||||
0x801F80D0:("D_801F80D0","UNK_TYPE1",""),
|
||||
0x801F80E0:("D_801F80E0","UNK_TYPE1",""),
|
||||
0x801F80F0:("D_801F80F0","UNK_TYPE1",""),
|
||||
0x801F80D0:("grapgFaultAddrConvClient","FaultAddressConverterClient",""),
|
||||
0x801F80E0:("graphFaultClient","FaultClient",""),
|
||||
0x801F80F0:("graphDlEntry","Gfx*",""),
|
||||
0x801F80F8:("D_801F80F8","UNK_TYPE1",""),
|
||||
0x801F8150:("lastRenderFrameTimestamp","u64",""),
|
||||
0x801F8160:("siEventCallbackQueue","OSMesgQueue",""),
|
||||
@@ -2794,7 +2799,7 @@
|
||||
0x801FBAD4:("D_801FBAD4","UNK_TYPE1",""),
|
||||
0x801FBAE0:("D_801FBAE0","UNK_TYPE1",""),
|
||||
0x801FBAE8:("D_801FBAE8","UNK_TYPE1",""),
|
||||
0x801FBAF0:("D_801FBAF0","UNK_TYPE1",""),
|
||||
0x801FBAF0:("D_801FBAF0","u64",""),
|
||||
0x801FBAF8:("lastRenderFrameDuration","u64",""),
|
||||
0x801FBB00:("D_801FBB00","UNK_TYPE1",""),
|
||||
0x801FBB04:("D_801FBB04","UNK_TYPE1",""),
|
||||
@@ -2805,8 +2810,8 @@
|
||||
0x801FBB20:("D_801FBB20","UNK_TYPE1",""),
|
||||
0x801FBB28:("D_801FBB28","UNK_TYPE1",""),
|
||||
0x801FBB30:("D_801FBB30","UNK_TYPE1",""),
|
||||
0x801FBB80:("D_801FBB80","UNK_TYPE4",""),
|
||||
0x801FBB88:("D_801FBB88","UNK_TYPE1",""),
|
||||
0x801FBB80:("gFramebuffers","u32*","[2]"),
|
||||
0x801FBB88:("D_801FBB88","OSViMode*",""),
|
||||
0x801FBB8C:("D_801FBB8C","UNK_TYPE1",""),
|
||||
0x801FBB90:("D_801FBB90","UNK_TYPE4",""),
|
||||
0x801FBB94:("D_801FBB94","UNK_TYPE1",""),
|
||||
@@ -9399,6 +9404,7 @@
|
||||
0x80A41940:("enTest3OverlayInfo","OverlayBlockSizes",""),
|
||||
0x80A41954:("enTest3OverlayRelocations","u32","[242]"),
|
||||
0x80A41D1C:("enTest3OverlayInfoOffset","u32",""),
|
||||
0x80A43320:("enTest4InitData","ActorInitData",""),
|
||||
0x80A43340:("D_80A43340","UNK_TYPE4",""),
|
||||
0x80A43342:("D_80A43342","UNK_TYPE1",""),
|
||||
0x80A4334A:("D_80A4334A","UNK_TYPE1",""),
|
||||
@@ -9408,6 +9414,8 @@
|
||||
0x80A43370:("enTest4OverlayInfo","OverlayBlockSizes",""),
|
||||
0x80A43384:("enTest4OverlayRelocations","u32","[81]"),
|
||||
0x80A434CC:("enTest4OverlayInfoOffset","u32",""),
|
||||
0x80A434D0:("D_80A434D0","s16","[2]"),
|
||||
0x80A434D4:("D_80A434D4","UNK_TYPE1",""),
|
||||
0x80A44A00:("D_80A44A00","UNK_TYPE1",""),
|
||||
0x80A44A2C:("D_80A44A2C","UNK_TYPE1",""),
|
||||
0x80A44A4C:("D_80A44A4C","UNK_TYPE1",""),
|
||||
|
||||
@@ -34,13 +34,15 @@ yaz0FileBuffer = boot_bss_start + 0x00002510;
|
||||
yaz0DecompStatus = boot_bss_start + 0x00002910;
|
||||
D_8009BE30 = boot_bss_start + 0x00002930;
|
||||
D_8009BE34 = boot_bss_start + 0x00002934;
|
||||
D_8009BE38 = boot_bss_start + 0x00002938;
|
||||
D_8009BE50 = boot_bss_start + 0x00002950;
|
||||
romInfoFaultClient = boot_bss_start + 0x00002938;
|
||||
faultCtxt = boot_bss_start + 0x00002950;
|
||||
D_8009BE54 = boot_bss_start + 0x00002954;
|
||||
D_8009BE58 = boot_bss_start + 0x00002958;
|
||||
D_8009BE5C = boot_bss_start + 0x0000295C;
|
||||
faultCustomOptions = boot_bss_start + 0x00002958;
|
||||
faultCopyToLog = boot_bss_start + 0x0000295C;
|
||||
faultStack = boot_bss_start + 0x00002960;
|
||||
faultThreadInfo = boot_bss_start + 0x00002F60;
|
||||
faultContextStruct = boot_bss_start + 0x00002F80;
|
||||
faultDrawContextStruct = boot_bss_start + 0x000037D0;
|
||||
D_8009CD10 = boot_bss_start + 0x00003810;
|
||||
startHeap = boot_bss_start + 0x00003820;
|
||||
randLast = boot_bss_start + 0x00003850;
|
||||
@@ -249,11 +251,11 @@ D_801F4DCC = code_bss_start + 0x00010E2C;
|
||||
D_801F4DDC = code_bss_start + 0x00010E3C;
|
||||
D_801F4DE0 = code_bss_start + 0x00010E40;
|
||||
D_801F4DE2 = code_bss_start + 0x00010E42;
|
||||
D_801F4DF0 = code_bss_start + 0x00010E50;
|
||||
D_801F4DF4 = code_bss_start + 0x00010E54;
|
||||
D_801F4DF8 = code_bss_start + 0x00010E58;
|
||||
actorCutscenes = code_bss_start + 0x00010E50;
|
||||
actorCutsceneCount = code_bss_start + 0x00010E54;
|
||||
actorCutsceneWaiting = code_bss_start + 0x00010E58;
|
||||
D_801F4E08 = code_bss_start + 0x00010E68;
|
||||
D_801F4E10 = code_bss_start + 0x00010E70;
|
||||
actorCutsceneNextCutscenes = code_bss_start + 0x00010E70;
|
||||
D_801F4E20 = code_bss_start + 0x00010E80;
|
||||
D_801F4E30 = code_bss_start + 0x00010E90;
|
||||
D_801F4E31 = code_bss_start + 0x00010E91;
|
||||
@@ -312,7 +314,7 @@ D_801F53B0 = code_bss_start + 0x00011410;
|
||||
D_801F56B0 = code_bss_start + 0x00011710;
|
||||
D_801F5730 = code_bss_start + 0x00011790;
|
||||
D_801F5834 = code_bss_start + 0x00011894;
|
||||
D_801F5840 = code_bss_start + 0x000118A0;
|
||||
gNMIBuffer = code_bss_start + 0x000118A0;
|
||||
D_801F5850 = code_bss_start + 0x000118B0;
|
||||
D_801F58B0 = code_bss_start + 0x00011910;
|
||||
D_801F59AC = code_bss_start + 0x00011A0C;
|
||||
@@ -395,9 +397,9 @@ D_801F8010 = code_bss_start + 0x00014070;
|
||||
D_801F8020 = code_bss_start + 0x00014080;
|
||||
D_801F8030 = code_bss_start + 0x00014090;
|
||||
D_801F8048 = code_bss_start + 0x000140A8;
|
||||
D_801F80D0 = code_bss_start + 0x00014130;
|
||||
D_801F80E0 = code_bss_start + 0x00014140;
|
||||
D_801F80F0 = code_bss_start + 0x00014150;
|
||||
grapgFaultAddrConvClient = code_bss_start + 0x00014130;
|
||||
graphFaultClient = code_bss_start + 0x00014140;
|
||||
graphDlEntry = code_bss_start + 0x00014150;
|
||||
D_801F80F8 = code_bss_start + 0x00014158;
|
||||
lastRenderFrameTimestamp = code_bss_start + 0x000141B0;
|
||||
siEventCallbackQueue = code_bss_start + 0x000141C0;
|
||||
@@ -441,7 +443,7 @@ D_801FBB14 = code_bss_start + 0x00017B74;
|
||||
D_801FBB20 = code_bss_start + 0x00017B80;
|
||||
D_801FBB28 = code_bss_start + 0x00017B88;
|
||||
D_801FBB30 = code_bss_start + 0x00017B90;
|
||||
D_801FBB80 = code_bss_start + 0x00017BE0;
|
||||
gFramebuffers = code_bss_start + 0x00017BE0;
|
||||
D_801FBB88 = code_bss_start + 0x00017BE8;
|
||||
D_801FBB8C = code_bss_start + 0x00017BEC;
|
||||
D_801FBB90 = code_bss_start + 0x00017BF0;
|
||||
@@ -847,6 +849,8 @@ D_80A1DA3A = ovl_Obj_Flowerpot_bss_start + 0x0000020A;
|
||||
D_80A1DA3C = ovl_Obj_Flowerpot_bss_start + 0x0000020C;
|
||||
D_80A1DA3E = ovl_Obj_Flowerpot_bss_start + 0x0000020E;
|
||||
D_80A1DA40 = ovl_Obj_Flowerpot_bss_start + 0x00000210;
|
||||
D_80A434D0 = ovl_En_Test4_bss_start + 0x00000000;
|
||||
D_80A434D4 = ovl_En_Test4_bss_start + 0x00000004;
|
||||
D_80A5F1C0 = ovl_En_Kusa2_bss_start + 0x00000000;
|
||||
D_80A60900 = ovl_En_Kusa2_bss_start + 0x00001740;
|
||||
D_80A60908 = ovl_En_Kusa2_bss_start + 0x00001748;
|
||||
|
||||
Reference in New Issue
Block a user