Update to latest from ghidra project

This commit is contained in:
rozlette 2019-12-14 23:38:35 -06:00
parent d6f9c091cc
commit 9bc4990814
10 changed files with 1979 additions and 1757 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -352,7 +352,7 @@ extern UNK_TYPE1 D_801AAAB0; // D_801AAAB0
extern ActorInitData enAObjInitData; // D_801ADE60
extern ColCylinderInit enAObjCylinderInit; // D_801ADE80
extern ActorInitVar enAObjInitVar; // D_801ADEAC
extern u32 D_801ADEB0[2]; // D_801ADEB0
extern u32 enAObjDisplayLists[2]; // D_801ADEB0
extern ActorInitData enItem00InitData; // D_801ADEC0
extern ColCylinderInit enItem00CylinderInit; // D_801ADEE0
extern ActorInitVar enItem00InitVars[1]; // D_801ADF0C
@ -413,14 +413,14 @@ extern UNK_PTR D_801AE8F0; // D_801AE8F0
extern UNK_TYPE4 D_801AEC70; // D_801AEC70
extern UNK_TYPE4 D_801AEC74; // D_801AEC74
extern UNK_TYPE4 D_801AEC78; // D_801AEC78
extern UNK_TYPE1 D_801AEC80; // D_801AEC80
extern UNK_TYPE1 D_801AEC84; // D_801AEC84
extern ColorRGBA8 D_801AEC80; // D_801AEC80
extern s801AEC84 D_801AEC84[13]; // D_801AEC84
extern f32 actorMovementScale; // D_801AECEC
extern f32 D_801AECF0; // D_801AECF0
extern f32 D_801AECF4; // D_801AECF4
extern UNK_TYPE1 D_801AED48; // D_801AED48
extern UNK_TYPE4 D_801AED58; // D_801AED58
extern Color actorDefaultHitColor; // D_801AED88
extern ColorRGBA8 actorDefaultHitColor; // D_801AED88
extern UNK_TYPE1 D_801AED8C; // D_801AED8C
extern UNK_TYPE4 D_801AED98; // D_801AED98
extern UNK_TYPE4 D_801AEDA4; // D_801AEDA4
@ -438,15 +438,14 @@ extern UNK_TYPE1 D_801AEFBC; // D_801AEFBC
extern UNK_TYPE1 D_801AEFC0; // D_801AEFC0
extern ActorOverlayTableEntry actorOverlayTable[690]; // D_801AEFD0
extern UNK_TYPE4 D_801B4610; // D_801B4610
extern UNK_TYPE1 D_801B4620; // D_801B4620
extern UNK_TYPE1 D_801B46A0; // D_801B46A0
extern UNK_TYPE1 D_801B46C0; // D_801B46C0
extern UNK_TYPE2 D_801B46D0; // D_801B46D0
extern UNK_TYPE2 D_801B46D2; // D_801B46D2
extern UNK_TYPE2 D_801B46D4; // D_801B46D4
extern UNK_TYPE2 D_801B46DC; // D_801B46DC
extern UNK_TYPE2 D_801B4700; // D_801B4700
extern UNK_TYPE2 D_801B4708; // D_801B4708
extern u32 D_801B4620[32]; // D_801B4620
extern u16 D_801B46A0[16]; // D_801B46A0
extern u8 D_801B46C0[16]; // D_801B46C0
extern s16 bgSpecialSceneParamsDefault[1]; // D_801B46D0
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
@ -472,7 +471,7 @@ extern UNK_TYPE4 D_801B9F04; // D_801B9F04
extern UNK_TYPE2 D_801B9F0C; // D_801B9F0C
extern UNK_TYPE4 D_801B9F10; // D_801B9F10
extern s800E03A0 D_801B9F20[23]; // D_801B9F20
extern f32 D_801BA200[16]; // D_801BA200
extern f32 gDamageMultipliers[16]; // D_801BA200
extern ColCommon defaultColCommon; // D_801BA240
extern ColTouch defaultColTouch; // D_801BA258
extern ColBump defaultColBump; // D_801BA260
@ -482,14 +481,14 @@ extern ColCylinderParams defaultColCylinderInfo; // D_801BA2AC
extern ColTriParams defaultColTriParams; // D_801BA2B8
extern ColQuadParams defaultColQuadParams; // D_801BA2EC
extern UNK_TYPE1 D_801BA32C; // D_801BA32C
extern UNK_PTR D_801BA338; // D_801BA338
extern UNK_PTR D_801BA34C; // D_801BA34C
extern UNK_PTR D_801BA360; // D_801BA360
extern collision_add_func collisionAddATFuncs[5]; // D_801BA338
extern collision_add_func collisionAddACFuncs[5]; // D_801BA34C
extern collision_add_func collisionAddOTFuncs[5]; // D_801BA360
extern UNK_TYPE1 D_801BA38C; // D_801BA38C
extern UNK_PTR D_801BA3A8; // D_801BA3A8
extern collision_func collisionFuncTableATwithAC[25]; // D_801BA3BC
extern collision_func collisionFuncTableOTwithOT[25]; // D_801BA420
extern UNK_TYPE4 D_801BA484; // D_801BA484
extern ActorA0 D_801BA484; // D_801BA484
extern UNK_PTR D_801BA4A0; // D_801BA4A0
extern UNK_TYPE1 D_801BA4B4; // D_801BA4B4
extern UNK_TYPE1 D_801BA4C8; // D_801BA4C8
@ -527,16 +526,15 @@ 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 UNK_TYPE1 D_801BD8D0; // D_801BD8D0
extern UNK_TYPE1 D_801BD8FC; // D_801BD8FC
extern UNK_TYPE1 D_801BD904; // D_801BD904
extern ColCylinderInit fireObjCollisionInit; // D_801BD8D0
extern FireObjLightParams D_801BD8FC[2]; // D_801BD8FC
extern GameStateMetaInfo initialGameStateInfo; // D_801BD910
extern GameStateMetaInfo D_801BD940; // D_801BD940
extern GameStateMetaInfo titleGameStateInfo; // D_801BD970
extern GameStateMetaInfo mainGameStateInfo; // D_801BD9A0
extern GameStateMetaInfo openingGameStateInfo; // D_801BD9D0
extern GameStateMetaInfo fileChooseGameStateInfo; // D_801BDA00
extern GameStateMetaInfo D_801BDA30; // D_801BDA30
extern GameStateMetaInfo daytelopGameStateInfo; // D_801BDA30
extern UNK_TYPE4 D_801BDA60; // D_801BDA60
extern UNK_TYPE2 D_801BDA70; // D_801BDA70
extern UNK_TYPE2 D_801BDA74; // D_801BDA74
@ -942,8 +940,8 @@ extern Gfx D_801C1C40[6]; // D_801C1C40
extern Gfx D_801C1C70[6]; // D_801C1C70
extern Gfx D_801C1CA0[12]; // D_801C1CA0
extern Gfx D_801C1D00[1]; // D_801C1D00
extern UNK_TYPE1 D_801C1D10; // D_801C1D10
extern UNK_PTR D_801C1D1C; // D_801C1D1C
extern Vector3f D_801C1D10; // D_801C1D10
extern room_draw_func roomDrawFuncs[4]; // D_801C1D1C
extern u32 intToBitPosition[32]; // D_801C1D30
extern UNK_TYPE2 D_801C1DB0; // D_801C1DB0
extern UNK_TYPE2 D_801C1DB2; // D_801C1DB2
@ -1031,8 +1029,8 @@ extern UNK_PTR D_801C3BD8; // D_801C3BD8
extern UNK_TYPE1 D_801C3C50; // D_801C3C50
extern UNK_TYPE1 D_801C3C80; // D_801C3C80
extern UNK_TYPE1 D_801C3C88; // D_801C3C88
extern SceneTableEntry sceneTable[113]; // D_801C3CA0
extern UNK_PTR D_801C5724; // D_801C5724
extern SceneTableEntry gSceneTable[113]; // D_801C3CA0
extern SceneEntranceTableEnty gSceneEntranceTable[110]; // D_801C5720
extern UNK_PTR D_801C5C50; // D_801C5C50
extern UNK_TYPE1 D_801C5C9C; // D_801C5C9C
extern UNK_PTR D_801C5CB0; // D_801C5CB0
@ -1053,9 +1051,6 @@ extern UNK_TYPE4 D_801C5EB0; // D_801C5EB0
extern UNK_TYPE2 D_801C5EC4; // D_801C5EC4
extern UNK_TYPE4 D_801C5F44; // D_801C5F44
extern UNK_TYPE4 D_801C5FC0; // D_801C5FC0
extern UNK_TYPE4 D_801C5FC8; // D_801C5FC8
extern UNK_TYPE4 D_801C5FCC; // D_801C5FCC
extern UNK_TYPE4 D_801C5FD0; // D_801C5FD0
extern UNK_TYPE2 D_801C66D0; // D_801C66D0
extern UNK_TYPE4 D_801C6798; // D_801C6798
extern UNK_TYPE1 D_801C67B0; // D_801C67B0
@ -1071,12 +1066,12 @@ extern UNK_TYPE1 D_801C6870; // D_801C6870
extern UNK_TYPE1 D_801C6890; // D_801C6890
extern SaveContext_struct1 D_801C6898; // D_801C6898
extern SaveContext_struct2 D_801C68C0; // D_801C68C0
extern SaveContext_struct3 D_801C68E4; // D_801C68E4
extern u16 saveDefaultChecksum; // D_801C696C
extern char D_801C6970[]; // D_801C6970
extern UNK_TYPE1 D_801C6998; // D_801C6998
extern UNK_TYPE1 D_801C69BC; // D_801C69BC
extern UNK_TYPE1 D_801C6A44; // D_801C6A44
extern SaveContextInventory gSaveDefaultInventory; // D_801C68E4
extern u16 gSaveDefaultChecksum; // D_801C696C
extern SaveContext_struct1 D_801C6970; // D_801C6970
extern SaveContext_struct2 D_801C6998; // D_801C6998
extern SaveContextInventory D_801C69BC; // D_801C69BC
extern u16 D_801C6A44; // D_801C6A44
extern UNK_TYPE1 D_801C6A48; // D_801C6A48
extern UNK_TYPE1 D_801C6A50; // D_801C6A50
extern UNK_TYPE1 D_801C6A58; // D_801C6A58
@ -2501,6 +2496,7 @@ extern UNK_TYPE1 D_801ED8CC; // D_801ED8CC
extern UNK_TYPE1 D_801ED8D4; // D_801ED8D4
extern UNK_TYPE1 D_801ED8D8; // D_801ED8D8
extern UNK_TYPE1 D_801ED8DC; // D_801ED8DC
extern Mtx D_801ED8E0; // D_801ED8E0
extern UNK_TYPE1 D_801ED920; // D_801ED920
extern UNK_TYPE1 D_801ED930; // D_801ED930
extern UNK_TYPE1 D_801ED940; // D_801ED940
@ -2512,24 +2508,18 @@ extern UNK_TYPE1 D_801EDA08; // D_801EDA08
extern UNK_TYPE1 D_801EDA18; // D_801EDA18
extern UNK_TYPE1 D_801EDA24; // D_801EDA24
extern UNK_TYPE1 D_801EDA30; // D_801EDA30
extern UNK_TYPE1 D_801EDA40; // D_801EDA40
extern UNK_TYPE1 D_801EDA80; // D_801EDA80
extern UNK_TYPE1 D_801EDA8C; // D_801EDA8C
extern UNK_TYPE1 D_801EDA98; // D_801EDA98
extern UNK_TYPE1 D_801EDAA8; // D_801EDAA8
extern z_Matrix D_801EDA40; // D_801EDA40
extern ColTriParams D_801EDA80; // D_801EDA80
extern UNK_TYPE1 D_801EDAF8; // D_801EDAF8
extern UNK_TYPE1 D_801EDB48; // D_801EDB48
extern UNK_TYPE1 D_801EDB54; // D_801EDB54
extern UNK_TYPE1 D_801EDB60; // D_801EDB60
extern UNK_TYPE1 D_801EDB70; // D_801EDB70
extern ColTriParams D_801EDB48; // D_801EDB48
extern UNK_TYPE1 D_801EDB7C; // D_801EDB7C
extern UNK_TYPE1 D_801EDB88; // D_801EDB88
extern UNK_TYPE1 D_801EDB98; // D_801EDB98
extern UNK_TYPE1 D_801EDB9C; // D_801EDB9C
extern UNK_TYPE1 D_801EDBA0; // D_801EDBA0
extern UNK_TYPE1 D_801EDBA4; // D_801EDBA4
extern UNK_TYPE1 D_801EDBA8; // D_801EDBA8
extern UNK_TYPE1 D_801EDBB0; // D_801EDBB0
extern ColSphereCollisionInfo D_801EDBA8; // D_801EDBA8
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
@ -2618,122 +2608,12 @@ extern UNK_TYPE1 D_801EF5C8; // D_801EF5C8
extern ColTriParams D_801EF600; // D_801EF600
extern ColTriParams D_801EF638; // D_801EF638
extern UNK_TYPE1 D_801EF66D; // D_801EF66D
extern SaveContext saveContext; // D_801EF670
extern UNK_TYPE1 D_801F067C; // D_801F067C
extern UNK_TYPE1 D_801F067D; // D_801F067D
extern UNK_TYPE1 D_801F067E; // D_801F067E
extern UNK_TYPE1 D_801F067F; // D_801F067F
extern UNK_TYPE1 D_801F0680; // D_801F0680
extern UNK_TYPE1 D_801F0681; // D_801F0681
extern UNK_TYPE1 D_801F0682; // D_801F0682
extern UNK_TYPE1 D_801F0683; // D_801F0683
extern UNK_TYPE1 D_801F0684; // D_801F0684
extern UNK_TYPE2 D_801F0686; // D_801F0686
extern UNK_TYPE1 D_801F0688; // D_801F0688
extern UNK_TYPE1 D_801F0750; // D_801F0750
extern UNK_TYPE1 D_801F2430; // D_801F2430
extern UNK_TYPE1 D_801F2434; // D_801F2434
extern UNK_TYPE1 D_801F2E30; // D_801F2E30
extern UNK_TYPE1 D_801F2E34; // D_801F2E34
extern UNK_TYPE4 D_801F3310; // D_801F3310
extern UNK_TYPE2 D_801F3314; // D_801F3314
extern UNK_TYPE4 D_801F3318; // D_801F3318
extern UNK_TYPE4 D_801F331C; // D_801F331C
extern UNK_TYPE4 D_801F3320; // D_801F3320
extern UNK_TYPE1 D_801F3324; // D_801F3324
extern UNK_TYPE1 D_801F3330; // D_801F3330
extern UNK_TYPE1 D_801F3334; // D_801F3334
extern UNK_TYPE1 D_801F3337; // D_801F3337
extern UNK_TYPE1 D_801F3364; // D_801F3364
extern UNK_TYPE1 D_801F3394; // D_801F3394
extern UNK_TYPE1 D_801F3397; // D_801F3397
extern UNK_TYPE1 D_801F3424; // D_801F3424
extern UNK_TYPE1 D_801F342B; // D_801F342B
extern UNK_TYPE1 D_801F342C; // D_801F342C
extern UNK_TYPE1 D_801F342E; // D_801F342E
extern UNK_TYPE1 D_801F3440; // D_801F3440
extern UNK_TYPE1 D_801F3441; // D_801F3441
extern UNK_TYPE1 D_801F3442; // D_801F3442
extern UNK_TYPE1 D_801F3443; // D_801F3443
extern UNK_TYPE1 D_801F3444; // D_801F3444
extern UNK_TYPE1 D_801F3450; // D_801F3450
extern UNK_TYPE1 D_801F3454; // D_801F3454
extern UNK_TYPE1 D_801F3458; // D_801F3458
extern UNK_TYPE1 D_801F345C; // D_801F345C
extern UNK_TYPE1 D_801F3460; // D_801F3460
extern UNK_TYPE1 D_801F3464; // D_801F3464
extern UNK_TYPE1 D_801F3470; // D_801F3470
extern UNK_TYPE4 D_801F3474; // D_801F3474
extern UNK_TYPE4 D_801F3484; // D_801F3484
extern UNK_TYPE1 D_801F3488; // D_801F3488
extern UNK_TYPE1 D_801F348C; // D_801F348C
extern UNK_TYPE1 D_801F3490; // D_801F3490
extern UNK_TYPE1 D_801F3494; // D_801F3494
extern UNK_TYPE1 D_801F3498; // D_801F3498
extern UNK_TYPE1 D_801F349C; // D_801F349C
extern UNK_TYPE1 D_801F34C0; // D_801F34C0
extern UNK_TYPE1 D_801F34C4; // D_801F34C4
extern UNK_TYPE1 D_801F34C8; // D_801F34C8
extern UNK_TYPE1 D_801F34CC; // D_801F34CC
extern UNK_TYPE1 D_801F34D0; // D_801F34D0
extern UNK_TYPE1 D_801F34D4; // D_801F34D4
extern UNK_TYPE1 D_801F34F8; // D_801F34F8
extern UNK_TYPE1 D_801F34FC; // D_801F34FC
extern UNK_TYPE1 D_801F3500; // D_801F3500
extern UNK_TYPE1 D_801F3504; // D_801F3504
extern UNK_TYPE1 D_801F3508; // D_801F3508
extern UNK_TYPE1 D_801F350C; // D_801F350C
extern UNK_TYPE1 D_801F3530; // D_801F3530
extern UNK_TYPE1 D_801F3534; // D_801F3534
extern UNK_TYPE1 D_801F3538; // D_801F3538
extern UNK_TYPE1 D_801F353C; // D_801F353C
extern UNK_TYPE1 D_801F3540; // D_801F3540
extern UNK_TYPE1 D_801F3544; // D_801F3544
extern UNK_TYPE1 D_801F3586; // D_801F3586
extern UNK_TYPE1 D_801F3587; // D_801F3587
extern UNK_TYPE1 D_801F3588; // D_801F3588
extern UNK_TYPE1 D_801F3589; // D_801F3589
extern UNK_TYPE1 D_801F358A; // D_801F358A
extern UNK_TYPE1 D_801F358B; // D_801F358B
extern UNK_TYPE1 D_801F358E; // D_801F358E
extern UNK_TYPE2 D_801F3592; // D_801F3592
extern UNK_TYPE2 D_801F3596; // D_801F3596
extern UNK_TYPE2 D_801F3598; // D_801F3598
extern UNK_TYPE2 D_801F359C; // D_801F359C
extern UNK_TYPE2 D_801F359E; // D_801F359E
extern UNK_TYPE2 D_801F35A0; // D_801F35A0
extern UNK_TYPE1 D_801F35A6; // D_801F35A6
extern UNK_TYPE1 D_801F35A8; // D_801F35A8
extern UNK_TYPE2 D_801F35AA; // D_801F35AA
extern UNK_TYPE1 D_801F35AC; // D_801F35AC
extern UNK_TYPE1 D_801F35AF; // D_801F35AF
extern UNK_TYPE1 D_801F35B0; // D_801F35B0
extern UNK_TYPE1 D_801F35B2; // D_801F35B2
extern UNK_TYPE1 D_801F35B3; // D_801F35B3
extern UNK_TYPE1 D_801F35B5; // D_801F35B5
extern UNK_TYPE1 D_801F35B6; // D_801F35B6
extern UNK_TYPE1 D_801F35B8; // D_801F35B8
extern UNK_TYPE2 D_801F35BA; // D_801F35BA
extern UNK_TYPE1 D_801F35BC; // D_801F35BC
extern UNK_TYPE1 D_801F35C0; // D_801F35C0
extern UNK_TYPE1 D_801F35C1; // D_801F35C1
extern UNK_TYPE2 D_801F35C2; // D_801F35C2
extern UNK_TYPE1 D_801F35C5; // D_801F35C5
extern UNK_TYPE2 D_801F35C6; // D_801F35C6
extern UNK_TYPE1 D_801F35C8; // D_801F35C8
extern UNK_TYPE2 D_801F35CA; // D_801F35CA
extern UNK_TYPE1 D_801F35D0; // D_801F35D0
extern UNK_TYPE1 D_801F35D4; // D_801F35D4
extern UNK_TYPE1 D_801F35D8; // D_801F35D8
extern UNK_TYPE1 D_801F35DC; // D_801F35DC
extern UNK_TYPE1 D_801F35E0; // D_801F35E0
extern UNK_TYPE1 D_801F35E4; // D_801F35E4
extern UNK_TYPE1 D_801F35E8; // D_801F35E8
extern SaveContext gSaveContext; // D_801EF670
extern UNK_TYPE2 D_801F3F38; // D_801F3F38
extern UNK_TYPE1 D_801F3F3A; // D_801F3F3A
extern UNK_TYPE1 D_801F3F3B; // D_801F3F3B
extern UNK_TYPE1 D_801F3F3C; // D_801F3F3C
extern StaticContext* staticContext; // D_801F3F60
extern StaticContext* gStaticContext; // D_801F3F60
extern UNK_TYPE1 D_801F3F70; // D_801F3F70
extern UNK_TYPE1 D_801F3F80; // D_801F3F80
extern UNK_TYPE1 D_801F3F83; // D_801F3F83
@ -2801,7 +2681,6 @@ extern UNK_TYPE1 D_801F4F60; // D_801F4F60
extern UNK_TYPE1 D_801F4F66; // D_801F4F66
extern UNK_TYPE1 D_801F4F6A; // D_801F4F6A
extern LightsList lightsList; // D_801F4F70
extern UNK_TYPE1 D_801F4F78; // D_801F4F78
extern Heap mainHeap; // D_801F5100
extern UNK_TYPE1 D_801F5130; // D_801F5130
extern UNK_TYPE1 D_801F5270; // D_801F5270
@ -2826,10 +2705,11 @@ extern UNK_TYPE1 D_801F59F4; // D_801F59F4
extern UNK_TYPE1 D_801F59F8; // D_801F59F8
extern UNK_TYPE1 D_801F5A00; // D_801F5A00
extern UNK_TYPE1 D_801F5A08; // D_801F5A08
extern UNK_TYPE1 D_801F5A1E; // D_801F5A1E
extern UNK_TYPE1 D_801F5A2C; // D_801F5A2C
extern UNK_TYPE1 D_801F5A90; // D_801F5A90
extern GlobalContext* D_801F5A90; // D_801F5A90
extern UNK_TYPE1 D_801F5A96; // D_801F5A96
extern UNK_TYPE1 D_801F5A98; // D_801F5A98
extern UNK_TYPE2 D_801F5A98; // D_801F5A98
extern UNK_TYPE1 D_801F5AA0; // D_801F5AA0
extern UNK_TYPE1 D_801F5AA4; // D_801F5AA4
extern UNK_TYPE1 D_801F5AA8; // D_801F5AA8
@ -2863,7 +2743,8 @@ extern UNK_TYPE1 D_801F6B30; // D_801F6B30
extern UNK_TYPE1 D_801F6B34; // D_801F6B34
extern UNK_TYPE1 D_801F6B38; // D_801F6B38
extern UNK_TYPE1 D_801F6B3C; // D_801F6B3C
extern UNK_TYPE4 D_801F6B44; // D_801F6B44
extern ShrinkWindowContext gShrinkWindowContext; // D_801F6B40
extern ShrinkWindowContext* gShrinkWindowContextPtr; // D_801F6B44
extern UNK_TYPE4 D_801F6B50; // D_801F6B50
extern UNK_TYPE1 D_801F6B58; // D_801F6B58
extern UNK_TYPE1 D_801F6BF0; // D_801F6BF0
@ -2898,7 +2779,7 @@ extern UNK_TYPE1 D_801F80F8; // D_801F80F8
extern u64 lastRenderFrameTimestamp; // D_801F8150
extern OSMesgQueue siEventCallbackQueue; // D_801F8160
extern OSMesg siEventCallbackBuffer[1]; // D_801F8178
extern u32 rspSegmentPhysAddrs[16]; // D_801F8180
extern u32 gRspSegmentPhysAddrs[16]; // D_801F8180
extern SchedThreadStruct schedContext; // D_801F81C0
extern OSMesgQueueListNode mainIrqmgrCallbackNode; // D_801F84F8
extern OSMesgQueue mainIrqmgrCallbackQueue; // D_801F8500
@ -3299,8 +3180,8 @@ extern UNK_PTR D_80803770; // D_80803770
extern OverlayBlockSizes selectOverlayInfo; // D_808037A0
extern u32 selectOverlayRelocations[397]; // D_808037B4
extern u32 selectOverlayInfoOffset; // D_80803DEC
extern UNK_TYPE1 D_80803FC0; // D_80803FC0
extern UNK_TYPE1 D_80803FC8; // D_80803FC8
extern u32 openingEntrances[2]; // D_80803FC0
extern u32 openingCutscenes[2]; // D_80803FC8
extern OverlayBlockSizes openingOverlayBlockInfo; // D_80803FD0
extern u32 openingOverlayRelocations[10]; // D_80803FE4
extern u32 openingOverlayBlockInfoOffset; // D_8080400C
@ -3334,15 +3215,15 @@ extern UNK_TYPE2 D_808144D4; // D_808144D4
extern UNK_TYPE2 D_808144D8; // D_808144D8
extern UNK_TYPE1 D_808144DC; // D_808144DC
extern UNK_TYPE1 D_808144E8; // D_808144E8
extern UNK_TYPE1 D_80814510; // D_80814510
extern Gfx D_80814510[5]; // D_80814510
extern UNK_TYPE2 D_80814538; // D_80814538
extern UNK_TYPE2 D_80814548; // D_80814548
extern UNK_TYPE2 D_80814550; // D_80814550
extern s16 fileChooseSkyboxRotation; // D_80814550
extern UNK_TYPE1 D_80814554; // D_80814554
extern UNK_TYPE1 D_8081455C; // D_8081455C
extern UNK_TYPE2 D_80814564; // D_80814564
extern UNK_PTR D_80814568; // D_80814568
extern UNK_TYPE1 D_8081461C; // D_8081461C
extern filechoose_update_func D_80814568[45]; // D_80814568
extern s16 D_8081461C[2]; // D_8081461C
extern UNK_TYPE2 D_80814620; // D_80814620
extern UNK_TYPE1 D_80814638; // D_80814638
extern UNK_TYPE1 D_80814644; // D_80814644
@ -3362,9 +3243,9 @@ extern UNK_TYPE1 D_80814720; // D_80814720
extern UNK_TYPE1 D_80814744; // D_80814744
extern UNK_TYPE4 D_80814764; // D_80814764
extern UNK_TYPE1 D_80814774; // D_80814774
extern UNK_PTR D_8081477C; // D_8081477C
extern UNK_TYPE1 D_8081479C; // D_8081479C
extern UNK_TYPE1 D_808147A8; // D_808147A8
extern filechoose_update_func D_8081477C[8]; // D_8081477C
extern filechoose_update_func D_8081479C[3]; // D_8081479C
extern filechoose_update_func D_808147A8[3]; // D_808147A8
extern UNK_TYPE2 D_808147C0; // D_808147C0
extern UNK_TYPE2 D_808147C8; // D_808147C8
extern UNK_TYPE4 D_808147D0; // D_808147D0
@ -3378,9 +3259,9 @@ extern UNK_TYPE4 D_808147F0; // D_808147F0
extern OverlayBlockSizes filechooseOverlayInfo; // D_80814800
extern u32 filechooseOverlayRelocations[409]; // D_80814814
extern u32 filechooseOverlayInfoOffset; // D_80814E7C
extern UNK_TYPE1 D_80815FF0; // D_80815FF0
extern UNK_TYPE4 D_80816000; // D_80816000
extern UNK_TYPE4 D_80816010; // D_80816010
extern u32 D_80815FF0[4]; // D_80815FF0
extern u32 D_80816000[4]; // D_80816000
extern u32 D_80816010[4]; // D_80816010
extern OverlayBlockSizes daytelopOverlayInfo; // D_80816020
extern u32 daytelopOverlayRelocations[24]; // D_80816034
extern u32 daytelopOverlayInfoOffset; // D_8081609C
@ -8924,7 +8805,7 @@ extern OverlayBlockSizes objRailliftOverlayInfo; // D_80A1A400
extern u32 objRailliftOverlayRelocations[55]; // D_80A1A414
extern u32 objRailliftOverlayInfoOffset; // D_80A1A4FC
extern UNK_TYPE1 D_80A1B260; // D_80A1B260
extern UNK_TYPE1 D_80A1B28C; // D_80A1B28C
extern FireObjInitParams D_80A1B28C; // D_80A1B28C
extern UNK_TYPE2 D_80A1B29C; // D_80A1B29C
extern UNK_TYPE1 D_80A1B2A8; // D_80A1B2A8
extern UNK_TYPE4 D_80A1B2C0; // D_80A1B2C0
@ -13995,7 +13876,7 @@ extern OverlayBlockSizes bgIknvDoukutuOverlayInfo; // D_80BD79F0
extern u32 bgIknvDoukutuOverlayRelocations[39]; // D_80BD7A04
extern u32 bgIknvDoukutuOverlayInfoOffset; // D_80BD7AAC
extern ActorInitData bgIknvObjInitData; // D_80BD81D0
extern UNK_TYPE1 D_80BD81F0; // D_80BD81F0
extern ColCylinderInit BgIknvObjCollisionInit; // D_80BD81F0
extern OverlayBlockSizes bgIknvObjOverlayInfo; // D_80BD8220
extern u32 bgIknvObjOverlayRelocations[27]; // D_80BD8234
extern u32 bgIknvObjOverlayInfoOffset; // D_80BD82AC

View File

@ -10,7 +10,7 @@ UNK_RET EnAObj_Init(ActorEnAObj* a0, GlobalContext* a1) {
s0->base.textId = ((s0->base.variable >> 8) & 0xFF) | 0x300;
s0->base.variable = (s0->base.variable & 0xFF) - 9;
Lib_ApplyActorInitVars((Actor*)s0, (ActorInitVar*)&enAObjInitVar);
func_800B3BA4(&s0->base.unkBC, 0, (UNK_PTR)&func_800B3FC0, 12);
Actor_SetPostDrawParams(&s0->base.postDrawParams, 0, (actor_post_draw_func*)func_800B3FC0, 12);
Collision_InitCylinder(a1, &s0->collision, (Actor*)s0, &enAObjCylinderInit);
Collision_CylinderMoveToActor((Actor*)s0, &s0->collision);
s0->base.unkA0.unk16 = 255;
@ -28,7 +28,7 @@ UNK_RET EnAObj_Update1(ActorEnAObj* a0, GlobalContext* a1) {
if (func_800B84D0((Actor*)a0, a1) != 0) {
a0->update = (actor_func)EnAObj_Update2;
} else {
v0 = a0->base.unk92 - a0->base.unkBC.rotation.y;
v0 = a0->base.unk92 - a0->base.postDrawParams.rotation.y;
v1 = (v0 < 0)? -v0 : v0;
if ((v1 < 10240) || ((a0->base.variable == 1) && (v1 > 22528))) {
func_800B863C((Actor*)a0, a1);
@ -49,5 +49,5 @@ UNK_RET EnAObj_Main(ActorEnAObj* a0, GlobalContext* a1) {
}
UNK_RET EnAObj_Draw(ActorEnAObj* a0, GlobalContext* a1) {
func_800BDFC0(a1, D_801ADEB0[a0->base.variable]);
func_800BDFC0(a1, enAObjDisplayLists[a0->base.variable]);
}

View File

@ -1,263 +1,263 @@
#include <ultra64.h>
#include <global.h>
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_PrintLists.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PrintLists.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B3BA4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetPostDrawParams.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B3BC8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PostDraw.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B3FC0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B3FC0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B4024.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4024.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B4088.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4088.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B40B8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B40B8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B40E0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B40E0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B42F8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B42F8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B4A98.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4A98.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B4AEC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4AEC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B4B50.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4B50.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B4EDC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4EDC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B4F40.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4F40.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B4F78.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B4F78.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5040.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B5040.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B51A4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_TargetContextInit.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5208.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B5208.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5814.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B5814.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5BB0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetSwitchFlag.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5BF4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetSwitchFlag.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5C34.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_UnsetSwitchFlag.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5C78.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetChestFlag.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5C90.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetChestFlag.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5CAC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetAllChestFlag.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5CB8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetAllChestFlag.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5CC4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetRoomCleared.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5CDC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetRoomCleared.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5CF8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_UnsetRoomCleared.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_GetRoomCleared.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetRoomClearedTemp.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetRoomCleared.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetRoomClearedTemp.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_UnsetRoomCleared.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_UnsetRoomClearedTemp.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_GetCollectibleFlag.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_GetCollectibleFlag.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetCollectibleFlag.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetCollectibleFlag.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5DF0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_TitleCardContextInit.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5E0C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_TitleCardCreate.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_Nop800B5E50.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_Nop800B5E50.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5E68.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_TitleCardUpdate.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B5F24.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_TitleCardDraw.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6434.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6434.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B645C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B645C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6468.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6468.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6474.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6474.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B648C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B648C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B64FC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B64FC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6584.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6584.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6608.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6608.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6680.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6680.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_MarkForDeath.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//func_800B672C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B675C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B675C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B67A0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B67A0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B67C0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B67C0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetScale.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetScale.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetObjectSegment.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetObjectSegment.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_InitToDefaultValues.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_InitToDefaultValues.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_FiniActor.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_FiniActor.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetMovementScale.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetMovementScale.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_ApplyMovement.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_ApplyMovement.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetVelocityYRotationAndGravity.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityYRotationAndGravity.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetVelocityAndMoveYRotationAndGravity.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityAndMoveYRotationAndGravity.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetVelocityXYRotation.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityXYRotation.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetVelocityAndMoveXYRotation.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityAndMoveXYRotation.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetVelocityXYRotationReverse.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityXYRotationReverse.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SetVelocityAndMoveXYRotationReverse.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SetVelocityAndMoveXYRotationReverse.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6C04.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6C04.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6C58.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6C58.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_YawBetweenActors.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//func_800B6D00.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_YawToPoint.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//Actor_PitchBetweenActors.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6D7C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6D7C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_PitchToPoint.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_PitchToPoint.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_DistanceBetweenActors.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DistanceBetweenActors.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_DistanceToPoint.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DistanceToPoint.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_XZDistanceBetweenActors.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_XZDistanceBetweenActors.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_XZDistanceToPoint.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//func_800B6E6C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_YDistanceBetweenActors.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_YDistance.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6F20.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6F20.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B6FC8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B6FC8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7090.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7090.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7118.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7118.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7128.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7128.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B715C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B715C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7170.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7170.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B71DC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B71DC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7200.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7200.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B722C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B722C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B724C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B724C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7298.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7298.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B72E0.asm")
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_800B72F8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7320.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7320.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7378.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7378.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B73E0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B73E0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B742C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B742C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B748C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B748C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B750C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B750C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B75A0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B75A0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B761C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B761C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7678.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7678.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B78B8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B78B8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7E04.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7E04.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B7FE0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B7FE0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8018.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8018.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8050.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8050.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8118.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8118.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B81E0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B81E0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8214.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8214.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8248.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8248.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B82EC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B82EC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B83BC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B83BC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B83F8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B83F8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B84D0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B84D0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8500.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8500.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B85E0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B85E0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8614.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8614.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B863C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B863C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B867C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B867C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B86C8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B86C8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8708.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8708.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8718.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8718.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B874C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B874C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8804.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8804.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B882C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B882C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B886C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B886C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8898.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8898.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8934.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8934.asm")
u32 Actor_HasParent(Actor* actor, GlobalContext* ctxt) {
if (actor->parent != NULL) {
@ -267,221 +267,221 @@ u32 Actor_HasParent(Actor* actor, GlobalContext* ctxt) {
}
}
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8A1C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8A1C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8B84.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8B84.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8BB0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8BB0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8BD0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8BD0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8BFC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8BFC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8C20.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8C20.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8C50.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8C50.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8C78.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8C78.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8C9C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8C9C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8CEC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8CEC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8D10.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8D10.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8D50.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8D50.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8D98.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8D98.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8DD4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8DD4.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8E1C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8E1C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8E58.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8E58.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8EC8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8EC8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8EF4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8EF4.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8F98.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8F98.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8FC0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8FC0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B8FE8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B8FE8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9010.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9010.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9038.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9038.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9084.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9084.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9098.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9098.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B90AC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B90AC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B90F4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B90F4.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9120.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9120.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_Init.asm")
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_800B9334.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B948C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B948C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9780.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9780.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_DrawActor.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DrawActor.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9D1C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9D1C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9E3C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DrawAllSetup.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9E4C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_RecordDrawnActor.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9E84.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9E84.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800B9EF4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800B9EF4.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BA2D8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA2D8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BA2FC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA2FC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_DrawAllActors.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_DrawAll.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BA6FC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA6FC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BA798.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA798.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BA8B8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA8B8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BA9B4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BA9B4.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_InsertIntoTypeList.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_InsertIntoTypeList.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_RemoveFromTypeList.asm")
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_FreeOverlay.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SpawnNoParentDefaultUnk38Unk20.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnNoParentDefaultUnk38Unk20.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_LoadOverlay.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_Spawn.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SpawnDefaultUnk38.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnDefaultUnk38.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/Actor_SpawnTransitionActors.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//Actor_SpawnTransitionActors.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BB2D0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BB2D0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BB498.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BB498.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BB59C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BB59C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BB604.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BB604.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BB8EC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BB8EC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BBA88.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBA88.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BBAC0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBAC0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BBB74.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBB74.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BBC20.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBC20.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BBCEC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBCEC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BBDAC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBDAC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BBFB0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BBFB0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC154.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC154.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC188.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC188.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC1B4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC1B4.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC270.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC270.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC444.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC444.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC4EC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC4EC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC5B8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC5B8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC5EC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC5EC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC620.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC620.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC770.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC770.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC7D8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC7D8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC848.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC848.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BC8B8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BC8B8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BCB50.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BCB50.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BCB70.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BCB70.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BCBF4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BCBF4.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BCC68.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BCC68.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BCCDC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BCCDC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BD2B4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD2B4.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BD384.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD384.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BD6E4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD6E4.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BD888.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD888.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BD9A0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD9A0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BD9E0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BD9E0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BDAA0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDAA0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BDB6C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDB6C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BDC5C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDC5C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BDCF4.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDCF4.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BDFB0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDFB0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BDFC0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BDFC0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE03C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE03C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE0B8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE0B8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE184.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE184.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE22C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE22C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE258.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE258.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE2B8.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE2B8.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE33C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE33C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE3D0.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE3D0.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE504.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE504.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE568.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE568.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE5CC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE5CC.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE63C.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE63C.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BE680.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BE680.asm")
GLOBAL_ASM("./asm/nonmatching/z_actor/func_800BF7CC.asm")
GLOBAL_ASM("asm/nonmatching/z_actor//func_800BF7CC.asm")

View File

@ -19,7 +19,7 @@ void EffectSS_Init(GlobalContext* ctxt, s32 numEntries) {
}
}
void EffectSS_Clear(GlobalContext* ctxt) {
void EffectSS_Fini(GlobalContext* ctxt) {
u32 i;
LoadedParticleEntry* iter;
ParticleOverlayTableEntry* iter2;
@ -70,9 +70,9 @@ void EffectSS_ResetLoadedParticleEntry(LoadedParticleEntry* particle) {
particle->velocity.z = 0;
particle->velocity.y = 0;
particle->velocity.x = 0;
particle->unk34 = 0;
particle->unk30 = 0;
particle->unk2C = 0;
particle->unk2C.z = 0;
particle->unk2C.y = 0;
particle->unk2C.x = 0;
particle->position.z = 0;
particle->position.y = 0;
particle->position.x = 0;

View File

@ -581,7 +581,7 @@ void Lib_ScaleMax_s(s16* a0, s16 a1, s16 a2, s16 a3) {
*a0 += v0;
}
UNK_RET Lib_CopyColor(Color* a0, Color* a1) {
UNK_RET Lib_CopyColor(ColorRGBA8* a0, ColorRGBA8* a1) {
a0->red = a1->red;
a0->green = a1->green;
a0->blue = a1->blue;
@ -589,7 +589,7 @@ UNK_RET Lib_CopyColor(Color* a0, Color* a1) {
}
UNK_RET func_801000A4(u16 a0) {
func_8019F0C8(a0);
play_sound(a0);
}
UNK_RET func_801000CC(u16 a0) {
@ -649,16 +649,16 @@ f32 Lib_PushAwayVec3f(Vector3f* a0, Vector3f* a1, f32 a2) {
void Lib_Nop801004FC(void) {}
u32 Lib_PtrSegToPhys(u32 a0) {
return(rspSegmentPhysAddrs[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
u32 Lib_PtrSegToVirt(u32 a0) {
return(gRspSegmentPhysAddrs[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
}
u32 Lib_PtrSegToPhysNull(u32 a0) {
u32 Lib_PtrSegToVirtNull(u32 a0) {
if ((a0 >> 28) == 0) {
return a0;
}
return(rspSegmentPhysAddrs[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
return(gRspSegmentPhysAddrs[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
}
u32 Lib_PtrSegToK0(u32 a0) {

File diff suppressed because it is too large Load Diff

View File

@ -339,7 +339,7 @@
0x801ADE60:("enAObjInitData","ActorInitData",""),
0x801ADE80:("enAObjCylinderInit","ColCylinderInit",""),
0x801ADEAC:("enAObjInitVar","ActorInitVar",""),
0x801ADEB0:("D_801ADEB0","u32","[2]"),
0x801ADEB0:("enAObjDisplayLists","u32","[2]"),
0x801ADEC0:("enItem00InitData","ActorInitData",""),
0x801ADEE0:("enItem00CylinderInit","ColCylinderInit",""),
0x801ADF0C:("enItem00InitVars","ActorInitVar","[1]"),
@ -400,14 +400,14 @@
0x801AEC70:("D_801AEC70","UNK_TYPE4",""),
0x801AEC74:("D_801AEC74","UNK_TYPE4",""),
0x801AEC78:("D_801AEC78","UNK_TYPE4",""),
0x801AEC80:("D_801AEC80","UNK_TYPE1",""),
0x801AEC84:("D_801AEC84","UNK_TYPE1",""),
0x801AEC80:("D_801AEC80","ColorRGBA8",""),
0x801AEC84:("D_801AEC84","s801AEC84","[13]"),
0x801AECEC:("actorMovementScale","f32",""),
0x801AECF0:("D_801AECF0","f32",""),
0x801AECF4:("D_801AECF4","f32",""),
0x801AED48:("D_801AED48","UNK_TYPE1",""),
0x801AED58:("D_801AED58","UNK_TYPE4",""),
0x801AED88:("actorDefaultHitColor","Color",""),
0x801AED88:("actorDefaultHitColor","ColorRGBA8",""),
0x801AED8C:("D_801AED8C","UNK_TYPE1",""),
0x801AED98:("D_801AED98","UNK_TYPE4",""),
0x801AEDA4:("D_801AEDA4","UNK_TYPE4",""),
@ -425,15 +425,14 @@
0x801AEFC0:("D_801AEFC0","UNK_TYPE1",""),
0x801AEFD0:("actorOverlayTable","ActorOverlayTableEntry","[690]"),
0x801B4610:("D_801B4610","UNK_TYPE4",""),
0x801B4620:("D_801B4620","UNK_TYPE1",""),
0x801B46A0:("D_801B46A0","UNK_TYPE1",""),
0x801B46C0:("D_801B46C0","UNK_TYPE1",""),
0x801B46D0:("D_801B46D0","UNK_TYPE2",""),
0x801B46D2:("D_801B46D2","UNK_TYPE2",""),
0x801B46D4:("D_801B46D4","UNK_TYPE2",""),
0x801B46DC:("D_801B46DC","UNK_TYPE2",""),
0x801B4700:("D_801B4700","UNK_TYPE2",""),
0x801B4708:("D_801B4708","UNK_TYPE2",""),
0x801B4620:("D_801B4620","u32","[32]"),
0x801B46A0:("D_801B46A0","u16","[16]"),
0x801B46C0:("D_801B46C0","u8","[16]"),
0x801B46D0:("bgSpecialSceneParamsDefault","s16","[1]"),
0x801B46D4:("bgSpecialSceneMaxMemory","BgSpecialSceneMaxMemory","[1]"),
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",""),
@ -459,7 +458,7 @@
0x801B9F0C:("D_801B9F0C","UNK_TYPE2",""),
0x801B9F10:("D_801B9F10","UNK_TYPE4",""),
0x801B9F20:("D_801B9F20","s800E03A0","[23]"),
0x801BA200:("D_801BA200","f32","[16]"),
0x801BA200:("gDamageMultipliers","f32","[16]"),
0x801BA240:("defaultColCommon","ColCommon",""),
0x801BA258:("defaultColTouch","ColTouch",""),
0x801BA260:("defaultColBump","ColBump",""),
@ -469,14 +468,14 @@
0x801BA2B8:("defaultColTriParams","ColTriParams",""),
0x801BA2EC:("defaultColQuadParams","ColQuadParams",""),
0x801BA32C:("D_801BA32C","UNK_TYPE1",""),
0x801BA338:("D_801BA338","UNK_PTR",""),
0x801BA34C:("D_801BA34C","UNK_PTR",""),
0x801BA360:("D_801BA360","UNK_PTR",""),
0x801BA338:("collisionAddATFuncs","collision_add_func","[5]"),
0x801BA34C:("collisionAddACFuncs","collision_add_func","[5]"),
0x801BA360:("collisionAddOTFuncs","collision_add_func","[5]"),
0x801BA38C:("D_801BA38C","UNK_TYPE1",""),
0x801BA3A8:("D_801BA3A8","UNK_PTR",""),
0x801BA3BC:("collisionFuncTableATwithAC","collision_func","[25]"),
0x801BA420:("collisionFuncTableOTwithOT","collision_func","[25]"),
0x801BA484:("D_801BA484","UNK_TYPE4",""),
0x801BA484:("D_801BA484","ActorA0",""),
0x801BA4A0:("D_801BA4A0","UNK_PTR",""),
0x801BA4B4:("D_801BA4B4","UNK_TYPE1",""),
0x801BA4C8:("D_801BA4C8","UNK_TYPE1",""),
@ -514,16 +513,15 @@
0x801BD8C0:("D_801BD8C0","UNK_TYPE4",""),
0x801BD8C4:("D_801BD8C4","UNK_TYPE2",""),
0x801BD8C6:("D_801BD8C6","UNK_TYPE2",""),
0x801BD8D0:("D_801BD8D0","UNK_TYPE1",""),
0x801BD8FC:("D_801BD8FC","UNK_TYPE1",""),
0x801BD904:("D_801BD904","UNK_TYPE1",""),
0x801BD8D0:("fireObjCollisionInit","ColCylinderInit",""),
0x801BD8FC:("D_801BD8FC","FireObjLightParams","[2]"),
0x801BD910:("initialGameStateInfo","GameStateMetaInfo",""),
0x801BD940:("D_801BD940","GameStateMetaInfo",""),
0x801BD970:("titleGameStateInfo","GameStateMetaInfo",""),
0x801BD9A0:("mainGameStateInfo","GameStateMetaInfo",""),
0x801BD9D0:("openingGameStateInfo","GameStateMetaInfo",""),
0x801BDA00:("fileChooseGameStateInfo","GameStateMetaInfo",""),
0x801BDA30:("D_801BDA30","GameStateMetaInfo",""),
0x801BDA30:("daytelopGameStateInfo","GameStateMetaInfo",""),
0x801BDA60:("D_801BDA60","UNK_TYPE4",""),
0x801BDA70:("D_801BDA70","UNK_TYPE2",""),
0x801BDA74:("D_801BDA74","UNK_TYPE2",""),
@ -929,8 +927,8 @@
0x801C1C70:("D_801C1C70","Gfx","[6]"),
0x801C1CA0:("D_801C1CA0","Gfx","[12]"),
0x801C1D00:("D_801C1D00","Gfx","[1]"),
0x801C1D10:("D_801C1D10","UNK_TYPE1",""),
0x801C1D1C:("D_801C1D1C","UNK_PTR",""),
0x801C1D10:("D_801C1D10","Vector3f",""),
0x801C1D1C:("roomDrawFuncs","room_draw_func","[4]"),
0x801C1D30:("intToBitPosition","u32","[32]"),
0x801C1DB0:("D_801C1DB0","UNK_TYPE2",""),
0x801C1DB2:("D_801C1DB2","UNK_TYPE2",""),
@ -1018,8 +1016,8 @@
0x801C3C50:("D_801C3C50","UNK_TYPE1",""),
0x801C3C80:("D_801C3C80","UNK_TYPE1",""),
0x801C3C88:("D_801C3C88","UNK_TYPE1",""),
0x801C3CA0:("sceneTable","SceneTableEntry","[113]"),
0x801C5724:("D_801C5724","UNK_PTR",""),
0x801C3CA0:("gSceneTable","SceneTableEntry","[113]"),
0x801C5720:("gSceneEntranceTable","SceneEntranceTableEnty","[110]"),
0x801C5C50:("D_801C5C50","UNK_PTR",""),
0x801C5C9C:("D_801C5C9C","UNK_TYPE1",""),
0x801C5CB0:("D_801C5CB0","UNK_PTR",""),
@ -1040,9 +1038,6 @@
0x801C5EC4:("D_801C5EC4","UNK_TYPE2",""),
0x801C5F44:("D_801C5F44","UNK_TYPE4",""),
0x801C5FC0:("D_801C5FC0","UNK_TYPE4",""),
0x801C5FC8:("D_801C5FC8","UNK_TYPE4",""),
0x801C5FCC:("D_801C5FCC","UNK_TYPE4",""),
0x801C5FD0:("D_801C5FD0","UNK_TYPE4",""),
0x801C66D0:("D_801C66D0","UNK_TYPE2",""),
0x801C6798:("D_801C6798","UNK_TYPE4",""),
0x801C67B0:("D_801C67B0","UNK_TYPE1",""),
@ -1058,12 +1053,12 @@
0x801C6890:("D_801C6890","UNK_TYPE1",""),
0x801C6898:("D_801C6898","SaveContext_struct1",""),
0x801C68C0:("D_801C68C0","SaveContext_struct2",""),
0x801C68E4:("D_801C68E4","SaveContext_struct3",""),
0x801C696C:("saveDefaultChecksum","u16",""),
0x801C6970:("D_801C6970","char","[]"),
0x801C6998:("D_801C6998","UNK_TYPE1",""),
0x801C69BC:("D_801C69BC","UNK_TYPE1",""),
0x801C6A44:("D_801C6A44","UNK_TYPE1",""),
0x801C68E4:("gSaveDefaultInventory","SaveContextInventory",""),
0x801C696C:("gSaveDefaultChecksum","u16",""),
0x801C6970:("D_801C6970","SaveContext_struct1",""),
0x801C6998:("D_801C6998","SaveContext_struct2",""),
0x801C69BC:("D_801C69BC","SaveContextInventory",""),
0x801C6A44:("D_801C6A44","u16",""),
0x801C6A48:("D_801C6A48","UNK_TYPE1",""),
0x801C6A50:("D_801C6A50","UNK_TYPE1",""),
0x801C6A58:("D_801C6A58","UNK_TYPE1",""),
@ -2488,6 +2483,7 @@
0x801ED8D4:("D_801ED8D4","UNK_TYPE1",""),
0x801ED8D8:("D_801ED8D8","UNK_TYPE1",""),
0x801ED8DC:("D_801ED8DC","UNK_TYPE1",""),
0x801ED8E0:("D_801ED8E0","Mtx",""),
0x801ED920:("D_801ED920","UNK_TYPE1",""),
0x801ED930:("D_801ED930","UNK_TYPE1",""),
0x801ED940:("D_801ED940","UNK_TYPE1",""),
@ -2499,24 +2495,18 @@
0x801EDA18:("D_801EDA18","UNK_TYPE1",""),
0x801EDA24:("D_801EDA24","UNK_TYPE1",""),
0x801EDA30:("D_801EDA30","UNK_TYPE1",""),
0x801EDA40:("D_801EDA40","UNK_TYPE1",""),
0x801EDA80:("D_801EDA80","UNK_TYPE1",""),
0x801EDA8C:("D_801EDA8C","UNK_TYPE1",""),
0x801EDA98:("D_801EDA98","UNK_TYPE1",""),
0x801EDAA8:("D_801EDAA8","UNK_TYPE1",""),
0x801EDA40:("D_801EDA40","z_Matrix",""),
0x801EDA80:("D_801EDA80","ColTriParams",""),
0x801EDAF8:("D_801EDAF8","UNK_TYPE1",""),
0x801EDB48:("D_801EDB48","UNK_TYPE1",""),
0x801EDB54:("D_801EDB54","UNK_TYPE1",""),
0x801EDB60:("D_801EDB60","UNK_TYPE1",""),
0x801EDB70:("D_801EDB70","UNK_TYPE1",""),
0x801EDB48:("D_801EDB48","ColTriParams",""),
0x801EDB7C:("D_801EDB7C","UNK_TYPE1",""),
0x801EDB88:("D_801EDB88","UNK_TYPE1",""),
0x801EDB98:("D_801EDB98","UNK_TYPE1",""),
0x801EDB9C:("D_801EDB9C","UNK_TYPE1",""),
0x801EDBA0:("D_801EDBA0","UNK_TYPE1",""),
0x801EDBA4:("D_801EDBA4","UNK_TYPE1",""),
0x801EDBA8:("D_801EDBA8","UNK_TYPE1",""),
0x801EDBB0:("D_801EDBB0","UNK_TYPE1",""),
0x801EDBA8:("D_801EDBA8","ColSphereCollisionInfo",""),
0x801EDBB0:("D_801EDBB0","ColTriParams",""),
0x801EDBD4:("D_801EDBD4","UNK_TYPE1",""),
0x801EDBD8:("D_801EDBD8","UNK_TYPE1",""),
0x801EDBDC:("D_801EDBDC","UNK_TYPE1",""),
@ -2605,122 +2595,12 @@
0x801EF600:("D_801EF600","ColTriParams",""),
0x801EF638:("D_801EF638","ColTriParams",""),
0x801EF66D:("D_801EF66D","UNK_TYPE1",""),
0x801EF670:("saveContext","SaveContext",""),
0x801F067C:("D_801F067C","UNK_TYPE1",""),
0x801F067D:("D_801F067D","UNK_TYPE1",""),
0x801F067E:("D_801F067E","UNK_TYPE1",""),
0x801F067F:("D_801F067F","UNK_TYPE1",""),
0x801F0680:("D_801F0680","UNK_TYPE1",""),
0x801F0681:("D_801F0681","UNK_TYPE1",""),
0x801F0682:("D_801F0682","UNK_TYPE1",""),
0x801F0683:("D_801F0683","UNK_TYPE1",""),
0x801F0684:("D_801F0684","UNK_TYPE1",""),
0x801F0686:("D_801F0686","UNK_TYPE2",""),
0x801F0688:("D_801F0688","UNK_TYPE1",""),
0x801F0750:("D_801F0750","UNK_TYPE1",""),
0x801F2430:("D_801F2430","UNK_TYPE1",""),
0x801F2434:("D_801F2434","UNK_TYPE1",""),
0x801F2E30:("D_801F2E30","UNK_TYPE1",""),
0x801F2E34:("D_801F2E34","UNK_TYPE1",""),
0x801F3310:("D_801F3310","UNK_TYPE4",""),
0x801F3314:("D_801F3314","UNK_TYPE2",""),
0x801F3318:("D_801F3318","UNK_TYPE4",""),
0x801F331C:("D_801F331C","UNK_TYPE4",""),
0x801F3320:("D_801F3320","UNK_TYPE4",""),
0x801F3324:("D_801F3324","UNK_TYPE1",""),
0x801F3330:("D_801F3330","UNK_TYPE1",""),
0x801F3334:("D_801F3334","UNK_TYPE1",""),
0x801F3337:("D_801F3337","UNK_TYPE1",""),
0x801F3364:("D_801F3364","UNK_TYPE1",""),
0x801F3394:("D_801F3394","UNK_TYPE1",""),
0x801F3397:("D_801F3397","UNK_TYPE1",""),
0x801F3424:("D_801F3424","UNK_TYPE1",""),
0x801F342B:("D_801F342B","UNK_TYPE1",""),
0x801F342C:("D_801F342C","UNK_TYPE1",""),
0x801F342E:("D_801F342E","UNK_TYPE1",""),
0x801F3440:("D_801F3440","UNK_TYPE1",""),
0x801F3441:("D_801F3441","UNK_TYPE1",""),
0x801F3442:("D_801F3442","UNK_TYPE1",""),
0x801F3443:("D_801F3443","UNK_TYPE1",""),
0x801F3444:("D_801F3444","UNK_TYPE1",""),
0x801F3450:("D_801F3450","UNK_TYPE1",""),
0x801F3454:("D_801F3454","UNK_TYPE1",""),
0x801F3458:("D_801F3458","UNK_TYPE1",""),
0x801F345C:("D_801F345C","UNK_TYPE1",""),
0x801F3460:("D_801F3460","UNK_TYPE1",""),
0x801F3464:("D_801F3464","UNK_TYPE1",""),
0x801F3470:("D_801F3470","UNK_TYPE1",""),
0x801F3474:("D_801F3474","UNK_TYPE4",""),
0x801F3484:("D_801F3484","UNK_TYPE4",""),
0x801F3488:("D_801F3488","UNK_TYPE1",""),
0x801F348C:("D_801F348C","UNK_TYPE1",""),
0x801F3490:("D_801F3490","UNK_TYPE1",""),
0x801F3494:("D_801F3494","UNK_TYPE1",""),
0x801F3498:("D_801F3498","UNK_TYPE1",""),
0x801F349C:("D_801F349C","UNK_TYPE1",""),
0x801F34C0:("D_801F34C0","UNK_TYPE1",""),
0x801F34C4:("D_801F34C4","UNK_TYPE1",""),
0x801F34C8:("D_801F34C8","UNK_TYPE1",""),
0x801F34CC:("D_801F34CC","UNK_TYPE1",""),
0x801F34D0:("D_801F34D0","UNK_TYPE1",""),
0x801F34D4:("D_801F34D4","UNK_TYPE1",""),
0x801F34F8:("D_801F34F8","UNK_TYPE1",""),
0x801F34FC:("D_801F34FC","UNK_TYPE1",""),
0x801F3500:("D_801F3500","UNK_TYPE1",""),
0x801F3504:("D_801F3504","UNK_TYPE1",""),
0x801F3508:("D_801F3508","UNK_TYPE1",""),
0x801F350C:("D_801F350C","UNK_TYPE1",""),
0x801F3530:("D_801F3530","UNK_TYPE1",""),
0x801F3534:("D_801F3534","UNK_TYPE1",""),
0x801F3538:("D_801F3538","UNK_TYPE1",""),
0x801F353C:("D_801F353C","UNK_TYPE1",""),
0x801F3540:("D_801F3540","UNK_TYPE1",""),
0x801F3544:("D_801F3544","UNK_TYPE1",""),
0x801F3586:("D_801F3586","UNK_TYPE1",""),
0x801F3587:("D_801F3587","UNK_TYPE1",""),
0x801F3588:("D_801F3588","UNK_TYPE1",""),
0x801F3589:("D_801F3589","UNK_TYPE1",""),
0x801F358A:("D_801F358A","UNK_TYPE1",""),
0x801F358B:("D_801F358B","UNK_TYPE1",""),
0x801F358E:("D_801F358E","UNK_TYPE1",""),
0x801F3592:("D_801F3592","UNK_TYPE2",""),
0x801F3596:("D_801F3596","UNK_TYPE2",""),
0x801F3598:("D_801F3598","UNK_TYPE2",""),
0x801F359C:("D_801F359C","UNK_TYPE2",""),
0x801F359E:("D_801F359E","UNK_TYPE2",""),
0x801F35A0:("D_801F35A0","UNK_TYPE2",""),
0x801F35A6:("D_801F35A6","UNK_TYPE1",""),
0x801F35A8:("D_801F35A8","UNK_TYPE1",""),
0x801F35AA:("D_801F35AA","UNK_TYPE2",""),
0x801F35AC:("D_801F35AC","UNK_TYPE1",""),
0x801F35AF:("D_801F35AF","UNK_TYPE1",""),
0x801F35B0:("D_801F35B0","UNK_TYPE1",""),
0x801F35B2:("D_801F35B2","UNK_TYPE1",""),
0x801F35B3:("D_801F35B3","UNK_TYPE1",""),
0x801F35B5:("D_801F35B5","UNK_TYPE1",""),
0x801F35B6:("D_801F35B6","UNK_TYPE1",""),
0x801F35B8:("D_801F35B8","UNK_TYPE1",""),
0x801F35BA:("D_801F35BA","UNK_TYPE2",""),
0x801F35BC:("D_801F35BC","UNK_TYPE1",""),
0x801F35C0:("D_801F35C0","UNK_TYPE1",""),
0x801F35C1:("D_801F35C1","UNK_TYPE1",""),
0x801F35C2:("D_801F35C2","UNK_TYPE2",""),
0x801F35C5:("D_801F35C5","UNK_TYPE1",""),
0x801F35C6:("D_801F35C6","UNK_TYPE2",""),
0x801F35C8:("D_801F35C8","UNK_TYPE1",""),
0x801F35CA:("D_801F35CA","UNK_TYPE2",""),
0x801F35D0:("D_801F35D0","UNK_TYPE1",""),
0x801F35D4:("D_801F35D4","UNK_TYPE1",""),
0x801F35D8:("D_801F35D8","UNK_TYPE1",""),
0x801F35DC:("D_801F35DC","UNK_TYPE1",""),
0x801F35E0:("D_801F35E0","UNK_TYPE1",""),
0x801F35E4:("D_801F35E4","UNK_TYPE1",""),
0x801F35E8:("D_801F35E8","UNK_TYPE1",""),
0x801EF670:("gSaveContext","SaveContext",""),
0x801F3F38:("D_801F3F38","UNK_TYPE2",""),
0x801F3F3A:("D_801F3F3A","UNK_TYPE1",""),
0x801F3F3B:("D_801F3F3B","UNK_TYPE1",""),
0x801F3F3C:("D_801F3F3C","UNK_TYPE1",""),
0x801F3F60:("staticContext","StaticContext*",""),
0x801F3F60:("gStaticContext","StaticContext*",""),
0x801F3F70:("D_801F3F70","UNK_TYPE1",""),
0x801F3F80:("D_801F3F80","UNK_TYPE1",""),
0x801F3F83:("D_801F3F83","UNK_TYPE1",""),
@ -2788,7 +2668,6 @@
0x801F4F66:("D_801F4F66","UNK_TYPE1",""),
0x801F4F6A:("D_801F4F6A","UNK_TYPE1",""),
0x801F4F70:("lightsList","LightsList",""),
0x801F4F78:("D_801F4F78","UNK_TYPE1",""),
0x801F5100:("mainHeap","Heap",""),
0x801F5130:("D_801F5130","UNK_TYPE1",""),
0x801F5270:("D_801F5270","UNK_TYPE1",""),
@ -2813,10 +2692,11 @@
0x801F59F8:("D_801F59F8","UNK_TYPE1",""),
0x801F5A00:("D_801F5A00","UNK_TYPE1",""),
0x801F5A08:("D_801F5A08","UNK_TYPE1",""),
0x801F5A1E:("D_801F5A1E","UNK_TYPE1",""),
0x801F5A2C:("D_801F5A2C","UNK_TYPE1",""),
0x801F5A90:("D_801F5A90","UNK_TYPE1",""),
0x801F5A90:("D_801F5A90","GlobalContext*",""),
0x801F5A96:("D_801F5A96","UNK_TYPE1",""),
0x801F5A98:("D_801F5A98","UNK_TYPE1",""),
0x801F5A98:("D_801F5A98","UNK_TYPE2",""),
0x801F5AA0:("D_801F5AA0","UNK_TYPE1",""),
0x801F5AA4:("D_801F5AA4","UNK_TYPE1",""),
0x801F5AA8:("D_801F5AA8","UNK_TYPE1",""),
@ -2850,7 +2730,8 @@
0x801F6B34:("D_801F6B34","UNK_TYPE1",""),
0x801F6B38:("D_801F6B38","UNK_TYPE1",""),
0x801F6B3C:("D_801F6B3C","UNK_TYPE1",""),
0x801F6B44:("D_801F6B44","UNK_TYPE4",""),
0x801F6B40:("gShrinkWindowContext","ShrinkWindowContext",""),
0x801F6B44:("gShrinkWindowContextPtr","ShrinkWindowContext*",""),
0x801F6B50:("D_801F6B50","UNK_TYPE4",""),
0x801F6B58:("D_801F6B58","UNK_TYPE1",""),
0x801F6BF0:("D_801F6BF0","UNK_TYPE1",""),
@ -2885,7 +2766,7 @@
0x801F8150:("lastRenderFrameTimestamp","u64",""),
0x801F8160:("siEventCallbackQueue","OSMesgQueue",""),
0x801F8178:("siEventCallbackBuffer","OSMesg","[1]"),
0x801F8180:("rspSegmentPhysAddrs","u32","[16]"),
0x801F8180:("gRspSegmentPhysAddrs","u32","[16]"),
0x801F81C0:("schedContext","SchedThreadStruct",""),
0x801F84F8:("mainIrqmgrCallbackNode","OSMesgQueueListNode",""),
0x801F8500:("mainIrqmgrCallbackQueue","OSMesgQueue",""),
@ -3286,8 +3167,8 @@
0x808037A0:("selectOverlayInfo","OverlayBlockSizes",""),
0x808037B4:("selectOverlayRelocations","u32","[397]"),
0x80803DEC:("selectOverlayInfoOffset","u32",""),
0x80803FC0:("D_80803FC0","UNK_TYPE1",""),
0x80803FC8:("D_80803FC8","UNK_TYPE1",""),
0x80803FC0:("openingEntrances","u32","[2]"),
0x80803FC8:("openingCutscenes","u32","[2]"),
0x80803FD0:("openingOverlayBlockInfo","OverlayBlockSizes",""),
0x80803FE4:("openingOverlayRelocations","u32","[10]"),
0x8080400C:("openingOverlayBlockInfoOffset","u32",""),
@ -3321,15 +3202,15 @@
0x808144D8:("D_808144D8","UNK_TYPE2",""),
0x808144DC:("D_808144DC","UNK_TYPE1",""),
0x808144E8:("D_808144E8","UNK_TYPE1",""),
0x80814510:("D_80814510","UNK_TYPE1",""),
0x80814510:("D_80814510","Gfx","[5]"),
0x80814538:("D_80814538","UNK_TYPE2",""),
0x80814548:("D_80814548","UNK_TYPE2",""),
0x80814550:("D_80814550","UNK_TYPE2",""),
0x80814550:("fileChooseSkyboxRotation","s16",""),
0x80814554:("D_80814554","UNK_TYPE1",""),
0x8081455C:("D_8081455C","UNK_TYPE1",""),
0x80814564:("D_80814564","UNK_TYPE2",""),
0x80814568:("D_80814568","UNK_PTR",""),
0x8081461C:("D_8081461C","UNK_TYPE1",""),
0x80814568:("D_80814568","filechoose_update_func","[45]"),
0x8081461C:("D_8081461C","s16","[2]"),
0x80814620:("D_80814620","UNK_TYPE2",""),
0x80814638:("D_80814638","UNK_TYPE1",""),
0x80814644:("D_80814644","UNK_TYPE1",""),
@ -3349,9 +3230,9 @@
0x80814744:("D_80814744","UNK_TYPE1",""),
0x80814764:("D_80814764","UNK_TYPE4",""),
0x80814774:("D_80814774","UNK_TYPE1",""),
0x8081477C:("D_8081477C","UNK_PTR",""),
0x8081479C:("D_8081479C","UNK_TYPE1",""),
0x808147A8:("D_808147A8","UNK_TYPE1",""),
0x8081477C:("D_8081477C","filechoose_update_func","[8]"),
0x8081479C:("D_8081479C","filechoose_update_func","[3]"),
0x808147A8:("D_808147A8","filechoose_update_func","[3]"),
0x808147C0:("D_808147C0","UNK_TYPE2",""),
0x808147C8:("D_808147C8","UNK_TYPE2",""),
0x808147D0:("D_808147D0","UNK_TYPE4",""),
@ -3365,9 +3246,9 @@
0x80814800:("filechooseOverlayInfo","OverlayBlockSizes",""),
0x80814814:("filechooseOverlayRelocations","u32","[409]"),
0x80814E7C:("filechooseOverlayInfoOffset","u32",""),
0x80815FF0:("D_80815FF0","UNK_TYPE1",""),
0x80816000:("D_80816000","UNK_TYPE4",""),
0x80816010:("D_80816010","UNK_TYPE4",""),
0x80815FF0:("D_80815FF0","u32","[4]"),
0x80816000:("D_80816000","u32","[4]"),
0x80816010:("D_80816010","u32","[4]"),
0x80816020:("daytelopOverlayInfo","OverlayBlockSizes",""),
0x80816034:("daytelopOverlayRelocations","u32","[24]"),
0x8081609C:("daytelopOverlayInfoOffset","u32",""),
@ -8911,7 +8792,7 @@
0x80A1A414:("objRailliftOverlayRelocations","u32","[55]"),
0x80A1A4FC:("objRailliftOverlayInfoOffset","u32",""),
0x80A1B260:("D_80A1B260","UNK_TYPE1",""),
0x80A1B28C:("D_80A1B28C","UNK_TYPE1",""),
0x80A1B28C:("D_80A1B28C","FireObjInitParams",""),
0x80A1B29C:("D_80A1B29C","UNK_TYPE2",""),
0x80A1B2A8:("D_80A1B2A8","UNK_TYPE1",""),
0x80A1B2C0:("D_80A1B2C0","UNK_TYPE4",""),
@ -13982,7 +13863,7 @@
0x80BD7A04:("bgIknvDoukutuOverlayRelocations","u32","[39]"),
0x80BD7AAC:("bgIknvDoukutuOverlayInfoOffset","u32",""),
0x80BD81D0:("bgIknvObjInitData","ActorInitData",""),
0x80BD81F0:("D_80BD81F0","UNK_TYPE1",""),
0x80BD81F0:("BgIknvObjCollisionInit","ColCylinderInit",""),
0x80BD8220:("bgIknvObjOverlayInfo","OverlayBlockSizes",""),
0x80BD8234:("bgIknvObjOverlayRelocations","u32","[27]"),
0x80BD82AC:("bgIknvObjOverlayInfoOffset","u32",""),

128
undef.txt
View File

@ -119,6 +119,7 @@ D_801ED8CC = code_bss_start + 0x0000992C;
D_801ED8D4 = code_bss_start + 0x00009934;
D_801ED8D8 = code_bss_start + 0x00009938;
D_801ED8DC = code_bss_start + 0x0000993C;
D_801ED8E0 = code_bss_start + 0x00009940;
D_801ED920 = code_bss_start + 0x00009980;
D_801ED930 = code_bss_start + 0x00009990;
D_801ED940 = code_bss_start + 0x000099A0;
@ -132,14 +133,8 @@ D_801EDA24 = code_bss_start + 0x00009A84;
D_801EDA30 = code_bss_start + 0x00009A90;
D_801EDA40 = code_bss_start + 0x00009AA0;
D_801EDA80 = code_bss_start + 0x00009AE0;
D_801EDA8C = code_bss_start + 0x00009AEC;
D_801EDA98 = code_bss_start + 0x00009AF8;
D_801EDAA8 = code_bss_start + 0x00009B08;
D_801EDAF8 = code_bss_start + 0x00009B58;
D_801EDB48 = code_bss_start + 0x00009BA8;
D_801EDB54 = code_bss_start + 0x00009BB4;
D_801EDB60 = code_bss_start + 0x00009BC0;
D_801EDB70 = code_bss_start + 0x00009BD0;
D_801EDB7C = code_bss_start + 0x00009BDC;
D_801EDB88 = code_bss_start + 0x00009BE8;
D_801EDB98 = code_bss_start + 0x00009BF8;
@ -236,122 +231,12 @@ D_801EF5C8 = code_bss_start + 0x0000B628;
D_801EF600 = code_bss_start + 0x0000B660;
D_801EF638 = code_bss_start + 0x0000B698;
D_801EF66D = code_bss_start + 0x0000B6CD;
saveContext = code_bss_start + 0x0000B6D0;
D_801F067C = code_bss_start + 0x0000C6DC;
D_801F067D = code_bss_start + 0x0000C6DD;
D_801F067E = code_bss_start + 0x0000C6DE;
D_801F067F = code_bss_start + 0x0000C6DF;
D_801F0680 = code_bss_start + 0x0000C6E0;
D_801F0681 = code_bss_start + 0x0000C6E1;
D_801F0682 = code_bss_start + 0x0000C6E2;
D_801F0683 = code_bss_start + 0x0000C6E3;
D_801F0684 = code_bss_start + 0x0000C6E4;
D_801F0686 = code_bss_start + 0x0000C6E6;
D_801F0688 = code_bss_start + 0x0000C6E8;
D_801F0750 = code_bss_start + 0x0000C7B0;
D_801F2430 = code_bss_start + 0x0000E490;
D_801F2434 = code_bss_start + 0x0000E494;
D_801F2E30 = code_bss_start + 0x0000EE90;
D_801F2E34 = code_bss_start + 0x0000EE94;
D_801F3310 = code_bss_start + 0x0000F370;
D_801F3314 = code_bss_start + 0x0000F374;
D_801F3318 = code_bss_start + 0x0000F378;
D_801F331C = code_bss_start + 0x0000F37C;
D_801F3320 = code_bss_start + 0x0000F380;
D_801F3324 = code_bss_start + 0x0000F384;
D_801F3330 = code_bss_start + 0x0000F390;
D_801F3334 = code_bss_start + 0x0000F394;
D_801F3337 = code_bss_start + 0x0000F397;
D_801F3364 = code_bss_start + 0x0000F3C4;
D_801F3394 = code_bss_start + 0x0000F3F4;
D_801F3397 = code_bss_start + 0x0000F3F7;
D_801F3424 = code_bss_start + 0x0000F484;
D_801F342B = code_bss_start + 0x0000F48B;
D_801F342C = code_bss_start + 0x0000F48C;
D_801F342E = code_bss_start + 0x0000F48E;
D_801F3440 = code_bss_start + 0x0000F4A0;
D_801F3441 = code_bss_start + 0x0000F4A1;
D_801F3442 = code_bss_start + 0x0000F4A2;
D_801F3443 = code_bss_start + 0x0000F4A3;
D_801F3444 = code_bss_start + 0x0000F4A4;
D_801F3450 = code_bss_start + 0x0000F4B0;
D_801F3454 = code_bss_start + 0x0000F4B4;
D_801F3458 = code_bss_start + 0x0000F4B8;
D_801F345C = code_bss_start + 0x0000F4BC;
D_801F3460 = code_bss_start + 0x0000F4C0;
D_801F3464 = code_bss_start + 0x0000F4C4;
D_801F3470 = code_bss_start + 0x0000F4D0;
D_801F3474 = code_bss_start + 0x0000F4D4;
D_801F3484 = code_bss_start + 0x0000F4E4;
D_801F3488 = code_bss_start + 0x0000F4E8;
D_801F348C = code_bss_start + 0x0000F4EC;
D_801F3490 = code_bss_start + 0x0000F4F0;
D_801F3494 = code_bss_start + 0x0000F4F4;
D_801F3498 = code_bss_start + 0x0000F4F8;
D_801F349C = code_bss_start + 0x0000F4FC;
D_801F34C0 = code_bss_start + 0x0000F520;
D_801F34C4 = code_bss_start + 0x0000F524;
D_801F34C8 = code_bss_start + 0x0000F528;
D_801F34CC = code_bss_start + 0x0000F52C;
D_801F34D0 = code_bss_start + 0x0000F530;
D_801F34D4 = code_bss_start + 0x0000F534;
D_801F34F8 = code_bss_start + 0x0000F558;
D_801F34FC = code_bss_start + 0x0000F55C;
D_801F3500 = code_bss_start + 0x0000F560;
D_801F3504 = code_bss_start + 0x0000F564;
D_801F3508 = code_bss_start + 0x0000F568;
D_801F350C = code_bss_start + 0x0000F56C;
D_801F3530 = code_bss_start + 0x0000F590;
D_801F3534 = code_bss_start + 0x0000F594;
D_801F3538 = code_bss_start + 0x0000F598;
D_801F353C = code_bss_start + 0x0000F59C;
D_801F3540 = code_bss_start + 0x0000F5A0;
D_801F3544 = code_bss_start + 0x0000F5A4;
D_801F3586 = code_bss_start + 0x0000F5E6;
D_801F3587 = code_bss_start + 0x0000F5E7;
D_801F3588 = code_bss_start + 0x0000F5E8;
D_801F3589 = code_bss_start + 0x0000F5E9;
D_801F358A = code_bss_start + 0x0000F5EA;
D_801F358B = code_bss_start + 0x0000F5EB;
D_801F358E = code_bss_start + 0x0000F5EE;
D_801F3592 = code_bss_start + 0x0000F5F2;
D_801F3596 = code_bss_start + 0x0000F5F6;
D_801F3598 = code_bss_start + 0x0000F5F8;
D_801F359C = code_bss_start + 0x0000F5FC;
D_801F359E = code_bss_start + 0x0000F5FE;
D_801F35A0 = code_bss_start + 0x0000F600;
D_801F35A6 = code_bss_start + 0x0000F606;
D_801F35A8 = code_bss_start + 0x0000F608;
D_801F35AA = code_bss_start + 0x0000F60A;
D_801F35AC = code_bss_start + 0x0000F60C;
D_801F35AF = code_bss_start + 0x0000F60F;
D_801F35B0 = code_bss_start + 0x0000F610;
D_801F35B2 = code_bss_start + 0x0000F612;
D_801F35B3 = code_bss_start + 0x0000F613;
D_801F35B5 = code_bss_start + 0x0000F615;
D_801F35B6 = code_bss_start + 0x0000F616;
D_801F35B8 = code_bss_start + 0x0000F618;
D_801F35BA = code_bss_start + 0x0000F61A;
D_801F35BC = code_bss_start + 0x0000F61C;
D_801F35C0 = code_bss_start + 0x0000F620;
D_801F35C1 = code_bss_start + 0x0000F621;
D_801F35C2 = code_bss_start + 0x0000F622;
D_801F35C5 = code_bss_start + 0x0000F625;
D_801F35C6 = code_bss_start + 0x0000F626;
D_801F35C8 = code_bss_start + 0x0000F628;
D_801F35CA = code_bss_start + 0x0000F62A;
D_801F35D0 = code_bss_start + 0x0000F630;
D_801F35D4 = code_bss_start + 0x0000F634;
D_801F35D8 = code_bss_start + 0x0000F638;
D_801F35DC = code_bss_start + 0x0000F63C;
D_801F35E0 = code_bss_start + 0x0000F640;
D_801F35E4 = code_bss_start + 0x0000F644;
D_801F35E8 = code_bss_start + 0x0000F648;
gSaveContext = code_bss_start + 0x0000B6D0;
D_801F3F38 = code_bss_start + 0x0000FF98;
D_801F3F3A = code_bss_start + 0x0000FF9A;
D_801F3F3B = code_bss_start + 0x0000FF9B;
D_801F3F3C = code_bss_start + 0x0000FF9C;
staticContext = code_bss_start + 0x0000FFC0;
gStaticContext = code_bss_start + 0x0000FFC0;
D_801F3F70 = code_bss_start + 0x0000FFD0;
D_801F3F80 = code_bss_start + 0x0000FFE0;
D_801F3F83 = code_bss_start + 0x0000FFE3;
@ -419,7 +304,6 @@ D_801F4F60 = code_bss_start + 0x00010FC0;
D_801F4F66 = code_bss_start + 0x00010FC6;
D_801F4F6A = code_bss_start + 0x00010FCA;
lightsList = code_bss_start + 0x00010FD0;
D_801F4F78 = code_bss_start + 0x00010FD8;
mainHeap = code_bss_start + 0x00011160;
D_801F5130 = code_bss_start + 0x00011190;
D_801F5270 = code_bss_start + 0x000112D0;
@ -444,6 +328,7 @@ D_801F59F4 = code_bss_start + 0x00011A54;
D_801F59F8 = code_bss_start + 0x00011A58;
D_801F5A00 = code_bss_start + 0x00011A60;
D_801F5A08 = code_bss_start + 0x00011A68;
D_801F5A1E = code_bss_start + 0x00011A7E;
D_801F5A2C = code_bss_start + 0x00011A8C;
D_801F5A90 = code_bss_start + 0x00011AF0;
D_801F5A96 = code_bss_start + 0x00011AF6;
@ -481,7 +366,8 @@ D_801F6B30 = code_bss_start + 0x00012B90;
D_801F6B34 = code_bss_start + 0x00012B94;
D_801F6B38 = code_bss_start + 0x00012B98;
D_801F6B3C = code_bss_start + 0x00012B9C;
D_801F6B44 = code_bss_start + 0x00012BA4;
gShrinkWindowContext = code_bss_start + 0x00012BA0;
gShrinkWindowContextPtr = code_bss_start + 0x00012BA4;
D_801F6B50 = code_bss_start + 0x00012BB0;
D_801F6B58 = code_bss_start + 0x00012BB8;
D_801F6BF0 = code_bss_start + 0x00012C50;
@ -516,7 +402,7 @@ D_801F80F8 = code_bss_start + 0x00014158;
lastRenderFrameTimestamp = code_bss_start + 0x000141B0;
siEventCallbackQueue = code_bss_start + 0x000141C0;
siEventCallbackBuffer = code_bss_start + 0x000141D8;
rspSegmentPhysAddrs = code_bss_start + 0x000141E0;
gRspSegmentPhysAddrs = code_bss_start + 0x000141E0;
schedContext = code_bss_start + 0x00014220;
mainIrqmgrCallbackNode = code_bss_start + 0x00014558;
mainIrqmgrCallbackQueue = code_bss_start + 0x00014560;