mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-11 15:18:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

db_camera (#842)

Browse Source 
* Decompile shrink_window.c

* progress

* progress

* makefile

* progress

* match 8 functions

* 1 more match

* match 2 functions

* decompile func_800B9638

* fix flow

* migrate .bss

* doc

* name some stuff

* fixes

* comment fix

* remove scene .c files

* old z_camera .s files

* revert z_camera change

* revert unwanted z_camera change

* fixes

* remove unused files, run clang-format and fix non-matching

* fix clang-format causing non-matching

* remove newline + old comment in func_800B3BD4

* make db_camera global variables static

* add s prefix to startic variables

* change magic constants

* rename "unk_50"

* Match func_800B3BD4 and Match DbCamera_UpdateDemoControl (-bss)

* Lots of progress on update

* Mainly cleanup

* run format.sh + remove unused asm

* replace chevrons with add quotes

* remove useless cast + use correct empty argument function declaration

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
This commit is contained in:
Random
2021-07-26 00:34:25 +02:00
committed by GitHub
parent ed54be7cf6
commit d223e246c7
27 changed files with 2744 additions and 3224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+24 -25
View File
@@ -816,7 +816,6 @@ s32 func_800635D0(s32);
void func_800636C0(void);
void func_8006375C(s32 arg0, s32 arg1, const char* text);
void func_8006376C(u8 x, u8 y, u8 colorId, const char* text);
// ? func_8006376C(?);
// ? func_80063828(?);
void func_8006390C(Input* input);
// ? func_80063C04(?);
@@ -1443,13 +1442,13 @@ u32 ShrinkWindow_GetCurrentVal(void);
void ShrinkWindow_Init(void);
void ShrinkWindow_Destroy(void);
void ShrinkWindow_Update(s32 updateRate);
// ? func_800B3B50(?);
// ? func_800B3BD4(?);
// ? func_800B3DF8(?);
// ? func_800B3EBC(?);
// ? func_800B3EFC(?);
// ? func_800B3F38(?);
// ? func_800B3F54(?);
// ? DbCamera_AddVecSph(?);
// ? DbCamera_CalcUpFromPitchYawRoll(?);
// ? DbCamera_SetTextValue(?);
// ? DbCamera_Vec3SToF(?);
// ? DbCamera_Vec3FToS(?);
// ? DbCamera_CopyVec3f(?);
// ? DbCamera_Vec3SToF2(?);
// ? func_800B3F94(?);
// ? func_800B3FF4(?);
// ? func_800B404C(?);
@@ -1458,24 +1457,24 @@ void ShrinkWindow_Update(s32 updateRate);
// ? func_800B42C0(?);
// ? func_800B4370(?);
// ? func_800B44E0(?);
// ? func_800B4920(?);
// ? func_800B4A68(?);
// ? func_800B4AA8(?);
// ? func_800B4AE4(?);
// ? func_800B4B20(?);
void DbgCamera_Init(DBCamera* dbCamera, Camera* camera);
void DbgCamera_Enable(DBCamera* dbCamera, Camera* camera);
void DbgCamera_Update(DBCamera* dbCamera, Camera* camera);
// ? func_800B8730(?);
// ? func_800B87D8(?);
// ? func_800B8978(?);
// ? func_800B8A0C(?);
// ? func_800B8BA4(?);
// ? func_800B8F58(?);
// ? func_800B9060(?);
// ? DbCamera_PrintPoints(?);
// ? DbCamera_PrintF32Bytes(?);
// ? DbCamera_PrintU16Bytes(?);
// ? DbCamera_PrintS16Bytes(?);
// ? DbCamera_PrintCutBytes(?);
// ? DbCamera_Init(?);
// ? DbgCamera_Enable(?);
// ? DbCamera_Update(?);
// ? DbCamera_GetFirstAvailableLetter(?);
// ? DbCamera_InitCut(?);
// ? DbCamera_ResetCut(?);
// ? DbCamera_CalcMempakAllocSize(?);
// ? DbCamera_GetMempakAllocSize(?);
// ? DbCamera_DrawSlotLetters(?);
// ? DbCamera_PrintAllCuts(?);
// ? func_800B91B0(?);
void DbgCamera_FirstInit(Camera* camera, DBCamera* dbCamera);
// ? func_800B9638(?);
// ? DbCamera_Reset(?);
// ? DbCamera_UpdateDemoControl(?);
// ? func_800BB0A0(?);
s32 func_800BB2B4(Vec3f* pos, f32* roll, f32* fov, CutsceneCameraPoint* point, s16* keyframe, f32* curFrame);
s32 Mempak_Init(s32 controllerNb);
include/macros.h
+2
View File
@@ -9,6 +9,8 @@
#define SEGMENTED_TO_VIRTUAL(addr) PHYSICAL_TO_VIRTUAL(gSegments[SEGMENT_NUMBER(addr)] + SEGMENT_OFFSET(addr))
#define ALIGN16(val) (((val) + 0xF) & ~0xF)
#define ALIGN32(val) (((val) + 0x1F) & ~0x1F)
#define ALIGN256(val) (((val) + 0xFF) & ~0xFF)
#define SQ(x) ((x)*(x))
#define ABS(x) ((x) >= 0 ? (x) : -(x))
include/variables.h
+2 -27
View File
@@ -288,7 +288,6 @@ extern u8 gFontFF[]; // original name: "font_ff"
//extern ? D_8012CFAC;
//extern ? D_8012CFB0;
//extern ? D_8012CFB4;
//extern ? D_8012CFBC;
//extern ? D_8012CFC4;
//extern ? D_8012CFD0;
//extern ? D_8012CFE4;
@@ -297,32 +296,21 @@ extern u8 gFontFF[]; // original name: "font_ff"
//extern ? D_8012D020;
//extern ? D_8012D034;
//extern ? D_8012D05C;
//extern ? D_8012D066;
//extern ? D_8012D070;
//extern ? D_8012D079;
//extern ? D_8012D084;
//extern ? D_8012D08E;
//extern ? D_8012D0AC;
//extern ? D_8012D0C0;
//extern ? D_8012D0CA;
//extern ? D_8012D0D4;
//extern ? D_8012D0DB;
//extern ? D_8012D0DC;
//extern ? D_8012D0E4;
//extern ? D_8012D0EE;
//extern ? D_8012D0EF;
//extern ? D_8012D0F8;
//extern ? D_8012D102;
//extern ? D_8012D103;
//extern ? D_8012D10C;
//extern ? D_8012D110;
//extern ? D_8012D114;
//extern ? D_8012D11E;
//extern ? D_8012D128;
//extern ? D_8012D132;
//extern ? D_8012D13C;
//extern ? D_8012D14C;
//extern ? D_8012D158;
//extern ? sDbCameraColors;
//extern ? D_8012D170;
//extern ? D_8012D172;
extern KaleidoMgrOverlay gKaleidoMgrOverlayTable[KALEIDO_OVL_MAX];
@@ -3119,7 +3107,7 @@ extern u16 D_8015FCC0;
extern u16 D_8015FCC2;
extern u16 D_8015FCC4;
//extern ? D_8015FCC6;
//extern ? D_8015FCC8;
extern u8 D_8015FCC8;
//extern ? D_8015FCCA;
extern u8 D_8015FCF0;
extern Vec3f D_8015FCF8;
@@ -3146,11 +3134,6 @@ extern u8 D_80161010;
extern u8 D_801610D4;
extern u8 D_801610D5;
extern u8 D_801610DA;
//extern ? D_80161100;
//extern ? D_80161104;
//extern ? D_80161108;
//extern ? D_8016110C;
//extern ? D_80161110;
//extern ? D_80161118;
//extern ? D_8016111A;
//extern ? D_8016111C;
@@ -3158,22 +3141,14 @@ extern u8 D_801610DA;
//extern ? D_8016112C;
//extern ? D_80161138;
//extern ? D_8016113C;
//extern ? D_80161140;
//extern ? D_80161144;
//extern ? D_80161148;
//extern ? D_8016114A;
//extern ? sDbgEditorSlots;
//extern ? D_8016115E;
//extern ? D_80161160;
//extern ? D_8016116E;
//extern ? D_80161170;
//extern ? D_8016117E;
//extern ? D_80161180;
//extern ? D_80161240;
//extern ? D_80161250;
//extern ? D_801612D0;
//extern ? D_801612D2;
//extern ? D_801612EA;
//extern ? D_801612EC;
extern f32 gBossMarkScale;
extern PauseMapMarksData* gLoadedPauseMarkDataTable;