Skip to content

Camera matches and work #2925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sadkellz merged 49 commits into from
Jul 23, 2026
Merged

Camera matches and work #2925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
c3fa7ec
improve Camera_8002B3D4
sadkellz Jul 15, 2026
9bb3e3c
imrpove Camera_8002B3D4
sadkellz Jul 15, 2026
3d89dbe
improve Camera_8002B3D4
sadkellz Jul 15, 2026
228d060
Camera_8002B3D4 improvements with gotos
sadkellz Jul 15, 2026
f31184f
match Camera_8002B3D4 with gotos
sadkellz Jul 15, 2026
f33d82b
remove gotos and match Camera_8002B3D4
sadkellz Jul 15, 2026
5a1c0a5
fix regressions
sadkellz Jul 15, 2026
be2c408
remove camera.static.h and fix symbols.txt
sadkellz Jul 15, 2026
99e21ed
Camera_80029CF8 improvements
sadkellz Jul 15, 2026
4498770
Camera_80029CF8 work
sadkellz Jul 15, 2026
023752b
Camera_80029CF8 work
sadkellz Jul 15, 2026
ae6ee85
match Camera_80029CF8
sadkellz Jul 15, 2026
19a9a99
format camera.c
sadkellz Jul 15, 2026
3c6b0d5
fix data for Camera_80029CF8
sadkellz Jul 15, 2026
56e2161
more camera data clean up
sadkellz Jul 15, 2026
12c0e8e
match Camera_8002A768
sadkellz Jul 16, 2026
2df33b1
match Camera_8002B694
sadkellz Jul 16, 2026
e34b0e9
match Camera_8002BD88
sadkellz Jul 16, 2026
7cc79f5
match Camera_8002C1A8
sadkellz Jul 16, 2026
8ef0885
match Camera_8002C5B4
sadkellz Jul 16, 2026
88b6670
improve Camera_8002C908
sadkellz Jul 16, 2026
9563663
Camera_8002CDDC work
sadkellz Jul 16, 2026
c87a84c
Camera_8002CDDC work
sadkellz Jul 17, 2026
1379fc9
Camera_8002CDDC work
sadkellz Jul 17, 2026
b703ff6
Camera_8002D318 work
sadkellz Jul 17, 2026
a784139
Camera_8002B3D4 rework
sadkellz Jul 17, 2026
87d6ae1
more Camera_8002B3D4 rework
sadkellz Jul 17, 2026
1611a5e
match Camera_8002B3D4
sadkellz Jul 18, 2026
9847d25
Camera_8002CDDC work
sadkellz Jul 18, 2026
a6c0eda
Camera_8002CDDC, Camera_8002C908 work
sadkellz Jul 18, 2026
895b3df
camera.c formatting
sadkellz Jul 18, 2026
b4dd3e9
Camera_8002D318 work
sadkellz Jul 18, 2026
f543dff
Camera_8002CB0C work
sadkellz Jul 18, 2026
4420d26
Camera_8002D85C work
sadkellz Jul 18, 2026
ccc8f93
match fn_800301D0, Camera_800304E0
sadkellz Jul 19, 2026
6a89662
Camera work
sadkellz Jul 20, 2026
b937a0f
Merge branch 'master' into camera
sadkellz Jul 20, 2026
aede7aa
fix merge from master regression
sadkellz Jul 20, 2026
33daf4c
fix gxlink regressions
sadkellz Jul 20, 2026
48b1955
attempt to fix symbols.txt
sadkellz Jul 20, 2026
7d65e08
match Camera_8002DDC4
sadkellz Jul 20, 2026
43f5b72
match Camera_800307D0
sadkellz Jul 20, 2026
9065b9e
match Camera_8002C908
sadkellz Jul 21, 2026
c41c487
remove inline from Camera_8002D318
sadkellz Jul 23, 2026
f269d84
update symbols.txt and camera.c formatting
sadkellz Jul 23, 2026
c89a8c0
Merge branch 'master' into camera
sadkellz Jul 23, 2026
8daf89b
resync camera @N symbols after master merge
sadkellz Jul 23, 2026
ae9a95d
update comment and remove unused CameraBounds to padding
sadkellz Jul 23, 2026
8c878f6
formatting
sadkellz Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 65 additions & 60 deletions config/GALE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20009,9 +20009,9 @@ lbDvd_803B72C0 = .rodata:0x803B72C0; // type:object size:0xC scope:local data:4b
lbl_803B72CC = .rodata:0x803B72CC; // type:object size:0x30 scope:local data:4byte
atanf_lookup = .rodata:0x803B7300; // type:object size:0xB8 scope:local data:float
...rodata.0 = .rodata:0x803B7300; // type:label scope:local
cm_803B73B8 = .rodata:0x803B73B8; // type:object size:0xC scope:global data:4byte
cm_WorldForward = .rodata:0x803B73B8; // type:object size:0xC scope:global data:4byte
cm_803B73C4 = .rodata:0x803B73C4; // type:object size:0xC scope:global data:4byte
cm_803B73D0 = .rodata:0x803B73D0; // type:object size:0xC scope:global data:4byte
cm_WorldUp = .rodata:0x803B73D0; // type:object size:0xC scope:global data:4byte
cm_803B73DC = .rodata:0x803B73DC; // type:object size:0xC scope:global data:4byte
mpIsland_TerrainPalette = .rodata:0x803B73E8; // type:object size:0xA0 scope:global data:4byte
Fighter_803B7488 = .rodata:0x803B7488; // type:object size:0xC scope:global data:4byte
Expand Down Expand Up @@ -20609,10 +20609,15 @@ cm_803BCB3C = .data:0x803BCB3C; // type:object size:0x14 scope:global
cm_803BCB50 = .data:0x803BCB50; // type:object size:0x14 scope:global
cm_803BCB64 = .data:0x803BCB64; // type:object size:0x38 scope:global
cm_803BCB9C = .data:0x803BCB9C; // type:object size:0x14 scope:global
cm_803BCBB0 = .data:0x803BCBB0; // type:object size:0x20 scope:global data:string
cm_803BCBD0 = .data:0x803BCBD0; // type:object size:0x7C scope:global
jumptable_803BCC4C = .data:0x803BCC4C; // type:object size:0x24 scope:local
lbl_803BCC70 = .data:0x803BCC70; // type:object size:0x30
@262 = .data:0x803BCBB0; // type:object size:0x20 scope:local data:string
@632 = .data:0x803BCBD0; // type:object size:0x9 scope:local data:string
@633 = .data:0x803BCBDC; // type:object size:0x19 scope:local data:string
@634 = .data:0x803BCBF8; // type:object size:0x19 scope:local data:string
@635 = .data:0x803BCC14; // type:object size:0x19 scope:local data:string
@636 = .data:0x803BCC30; // type:object size:0x19 scope:local data:string
@734 = .data:0x803BCC4C; // type:object size:0x24 scope:local
lbl_803BCC70 = .data:0x803BCC70; // type:object size:0x16 scope:local data:string
lbl_803BCC88 = .data:0x803BCC88; // type:object size:0x14 scope:local data:string
cm_803BCCA0 = .data:0x803BCCA0; // type:object size:0xF0 scope:local data:float
@82 = .data:0x803BCD90; // type:object size:0x9 scope:local data:string
@83 = .data:0x803BCD9C; // type:object size:0x21 scope:local data:string
Expand Down Expand Up @@ -26649,7 +26654,7 @@ str_gw_ssm = .sdata:0x804D3918; // type:object size:0x7 scope:local data:string
str_end_ssm = .sdata:0x804D3920; // type:object size:0x8 scope:local data:string
lbl_804D3928 = .sdata:0x804D3928; // type:object size:0x8
str_0_804D3930 = .sdata:0x804D3930; // type:object size:0x2 scope:local data:string
cm_804D3938 = .sdata:0x804D3938; // type:object size:0x2 scope:global data:string
@2157 = .sdata:0x804D3938; // type:object size:0x2 data:string
@237 = .sdata:0x804D3940; // type:object size:0x2 scope:local data:string
mpColl_804D3948 = .sdata:0x804D3948; // type:object size:0x2 scope:global data:string
@674 = .sdata:0x804D394C; // type:object size:0x7 scope:local data:string
Expand Down Expand Up @@ -28279,7 +28284,7 @@ cm_804D6458 = .sbss:0x804D6458; // type:object size:0x4 scope:global data:4byte
cm_804D645C = .sbss:0x804D645C; // type:object size:0x4 scope:global data:4byte
cm_804D6460 = .sbss:0x804D6460; // type:object size:0x4 scope:global data:4byte
cm_804D6464 = .sbss:0x804D6464; // type:object size:0x4 scope:global data:4byte
cm_804D6468 = .sbss:0x804D6468; // type:object size:0x8 scope:global data:4byte
cm_804D6468 = .sbss:0x804D6468; // type:object size:0x4 scope:global data:4byte
pl_804D6470 = .sbss:0x804D6470; // type:object size:0x4 scope:global data:4byte
staleAttackInstance = .sbss:0x804D6478; // type:object size:0x2 data:2byte
unk_804D6480 = .sbss:0x804D6480; // type:object size:0x2 data:2byte
Expand Down Expand Up @@ -29602,58 +29607,58 @@ lbl_804D7DF0 = .sdata2:0x804D7DF0; // type:object size:0x4 align:4 data:float
lbl_804D7DF4 = .sdata2:0x804D7DF4; // type:object size:0x4 align:4 data:float
lbl_804D7DF8 = .sdata2:0x804D7DF8; // type:object size:0x4 align:4 data:float
lbl_804D7DFC = .sdata2:0x804D7DFC; // type:object size:0x4 align:4 data:float
cm_804D7E00 = .sdata2:0x804D7E00; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E04 = .sdata2:0x804D7E04; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E08 = .sdata2:0x804D7E08; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E0C = .sdata2:0x804D7E0C; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E10 = .sdata2:0x804D7E10; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E14 = .sdata2:0x804D7E14; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E18 = .sdata2:0x804D7E18; // type:object size:0x8 scope:global align:8 data:double
cm_804D7E20 = .sdata2:0x804D7E20; // type:object size:0x8 scope:global align:8 data:double
cm_804D7E28 = .sdata2:0x804D7E28; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E2C = .sdata2:0x804D7E2C; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E30 = .sdata2:0x804D7E30; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E34 = .sdata2:0x804D7E34; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E38 = .sdata2:0x804D7E38; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E3C = .sdata2:0x804D7E3C; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E40 = .sdata2:0x804D7E40; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E44 = .sdata2:0x804D7E44; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E48 = .sdata2:0x804D7E48; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E4C = .sdata2:0x804D7E4C; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E50 = .sdata2:0x804D7E50; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E54 = .sdata2:0x804D7E54; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E58 = .sdata2:0x804D7E58; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E5C = .sdata2:0x804D7E5C; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E60 = .sdata2:0x804D7E60; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E64 = .sdata2:0x804D7E64; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E68 = .sdata2:0x804D7E68; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E6C = .sdata2:0x804D7E6C; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E70 = .sdata2:0x804D7E70; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E74 = .sdata2:0x804D7E74; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E78 = .sdata2:0x804D7E78; // type:object size:0x8 scope:global align:8 data:double
cm_804D7E80 = .sdata2:0x804D7E80; // type:object size:0x8 scope:global align:8 data:double
cm_804D7E88 = .sdata2:0x804D7E88; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E8C = .sdata2:0x804D7E8C; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E90 = .sdata2:0x804D7E90; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E94 = .sdata2:0x804D7E94; // type:object size:0x4 scope:global align:4 data:float
cm_804D7E98 = .sdata2:0x804D7E98; // type:object size:0x4 scope:global align:4 data:float
cm_804D7EA0 = .sdata2:0x804D7EA0; // type:object size:0x8 scope:global align:8 data:double
cm_804D7EA8 = .sdata2:0x804D7EA8; // type:object size:0x4 scope:global align:4 data:float
cm_804D7EAC = .sdata2:0x804D7EAC; // type:object size:0x4 scope:global align:4 data:float
cm_804D7EB0 = .sdata2:0x804D7EB0; // type:object size:0x4 scope:global align:4 data:float
cm_804D7EB8 = .sdata2:0x804D7EB8; // type:object size:0x8 scope:global align:8 data:double
cm_804D7EC0 = .sdata2:0x804D7EC0; // type:object size:0x4 scope:global align:4 data:float
cm_804D7EC8 = .sdata2:0x804D7EC8; // type:object size:0x8 scope:global align:8 data:double
cm_804D7ED0 = .sdata2:0x804D7ED0; // type:object size:0x8 scope:global align:8 data:double
cm_804D7ED8 = .sdata2:0x804D7ED8; // type:object size:0x8 scope:global align:8 data:double
cm_804D7EE0 = .sdata2:0x804D7EE0; // type:object size:0x8 scope:global align:8 data:double
cm_804D7EE8 = .sdata2:0x804D7EE8; // type:object size:0x8 scope:global align:8 data:double
cm_804D7EF0 = .sdata2:0x804D7EF0; // type:object size:0x8 scope:global align:8 data:double
cm_804D7EF8 = .sdata2:0x804D7EF8; // type:object size:0x4 scope:global align:4 data:float
cm_804D7EFC = .sdata2:0x804D7EFC; // type:object size:0x4 scope:global align:4 data:float
cm_804D7F00 = .sdata2:0x804D7F00; // type:object size:0x4 scope:global align:4 data:float
cm_804D7F04 = .sdata2:0x804D7F04; // type:object size:0x4 scope:global align:4 data:float
cm_804D7F08 = .sdata2:0x804D7F08; // type:object size:0x4 scope:global align:4 data:float
@514 = .sdata2:0x804D7E00; // type:object size:0x4 scope:local align:4 data:float
@243 = .sdata2:0x804D7E04; // type:object size:0x4 scope:local align:4 data:float
@241 = .sdata2:0x804D7E08; // type:object size:0x4 scope:local align:4 data:float
@242 = .sdata2:0x804D7E0C; // type:object size:0x4 scope:local align:4 data:float
@244 = .sdata2:0x804D7E10; // type:object size:0x4 scope:local align:4 data:float
@248 = .sdata2:0x804D7E14; // type:object size:0x4 scope:local align:4 data:float
@287 = .sdata2:0x804D7E18; // type:object size:0x8 scope:local align:8 data:double
@289 = .sdata2:0x804D7E20; // type:object size:0x8 scope:local align:8 data:double
@312 = .sdata2:0x804D7E28; // type:object size:0x4 scope:local align:4 data:float
@313 = .sdata2:0x804D7E2C; // type:object size:0x4 scope:local align:4 data:float
@381 = .sdata2:0x804D7E30; // type:object size:0x4 scope:local align:4 data:float
@382 = .sdata2:0x804D7E34; // type:object size:0x4 scope:local align:4 data:float
@513 = .sdata2:0x804D7E38; // type:object size:0x4 scope:local align:4 data:float
@515 = .sdata2:0x804D7E3C; // type:object size:0x4 scope:local align:4 data:float
@516 = .sdata2:0x804D7E40; // type:object size:0x4 scope:local align:4 data:float
@517 = .sdata2:0x804D7E44; // type:object size:0x4 scope:local align:4 data:float
@518 = .sdata2:0x804D7E48; // type:object size:0x4 scope:local align:4 data:float
@519 = .sdata2:0x804D7E4C; // type:object size:0x4 scope:local align:4 data:float
@520 = .sdata2:0x804D7E50; // type:object size:0x4 scope:local align:4 data:float
@558 = .sdata2:0x804D7E54; // type:object size:0x4 scope:local align:4 data:float
@559 = .sdata2:0x804D7E58; // type:object size:0x4 scope:local align:4 data:float
@560 = .sdata2:0x804D7E5C; // type:object size:0x4 scope:local align:4 data:float
@568 = .sdata2:0x804D7E60; // type:object size:0x4 scope:local align:4 data:float
@631 = .sdata2:0x804D7E64; // type:object size:0x4 scope:local align:4 data:float
@652 = .sdata2:0x804D7E68; // type:object size:0x4 scope:local align:4 data:float
@891 = .sdata2:0x804D7E6C; // type:object size:0x4 scope:local align:4 data:float
@1014 = .sdata2:0x804D7E70; // type:object size:0x4 scope:local align:4 data:float
@931 = .sdata2:0x804D7E74; // type:object size:0x4 scope:local align:4 data:float
@1112 = .sdata2:0x804D7E78; // type:object size:0x8 scope:local align:8 data:double
@1113 = .sdata2:0x804D7E80; // type:object size:0x8 scope:local align:8 data:double
@1122 = .sdata2:0x804D7E88; // type:object size:0x4 scope:local align:4 data:float
@1123 = .sdata2:0x804D7E8C; // type:object size:0x4 scope:local align:4 data:float
@1235 = .sdata2:0x804D7E90; // type:object size:0x4 scope:local align:4 data:float
@1236 = .sdata2:0x804D7E94; // type:object size:0x4 scope:local align:4 data:float
@1237 = .sdata2:0x804D7E98; // type:object size:0x4 scope:local align:4 data:float
@1234 = .sdata2:0x804D7EA0; // type:object size:0x8 scope:local align:8 data:double
@1642 = .sdata2:0x804D7EA8; // type:object size:0x4 scope:local align:4 data:float
@2155 = .sdata2:0x804D7EAC; // type:object size:0x4 scope:local align:4 data:float
@2156 = .sdata2:0x804D7EB0; // type:object size:0x4 scope:local align:4 data:float
@2185 = .sdata2:0x804D7EB8; // type:object size:0x8 scope:local align:8 data:double
@2186 = .sdata2:0x804D7EC0; // type:object size:0x4 scope:local align:4 data:float
@2187 = .sdata2:0x804D7EC8; // type:object size:0x8 scope:local align:8 data:double
@2188 = .sdata2:0x804D7ED0; // type:object size:0x8 scope:local align:8 data:double
@2189 = .sdata2:0x804D7ED8; // type:object size:0x8 scope:local align:8 data:double
@2190 = .sdata2:0x804D7EE0; // type:object size:0x8 scope:local align:8 data:double
@2412 = .sdata2:0x804D7EE8; // type:object size:0x8 scope:local align:8 data:double
@2413 = .sdata2:0x804D7EF0; // type:object size:0x8 scope:local align:8 data:double
@2414 = .sdata2:0x804D7EF8; // type:object size:0x4 scope:local align:4 data:float
@2415 = .sdata2:0x804D7EFC; // type:object size:0x4 scope:local align:4 data:float
@2456 = .sdata2:0x804D7F00; // type:object size:0x4 scope:local align:4 data:float
@2457 = .sdata2:0x804D7F04; // type:object size:0x4 scope:local align:4 data:float
@2476 = .sdata2:0x804D7F08; // type:object size:0x4 scope:local align:4 data:float
@1135 = .sdata2:0x804D7F10; // type:object size:0x4 scope:local align:4 data:float
@1136 = .sdata2:0x804D7F14; // type:object size:0x4 scope:local align:4 data:float
lbl_804D7F18 = .sdata2:0x804D7F18; // type:object size:0x4 align:4 data:float
Expand Down
3 changes: 3 additions & 0 deletions extern/dolphin/include/dolphin/mtx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ typedef f32 (*Mtx44Ptr)[4];
typedef f32 ROMtx[4][3];
typedef f32 (*ROMtxPtr)[3];

#define MTXDegToRad(a) ((a) * 0.01745329252f)
#define MTXRadToDeg(a) ((a) * 57.29577951f)

void MTXFrustum(Mtx m, f32 t, f32 b, f32 l, f32 r, f32 n, f32 f);
void MTXPerspective(Mtx m, f32 fovY, f32 aspect, f32 n, f32 f);
void MTXOrtho(Mtx m, f32 t, f32 b, f32 l, f32 r, f32 n, f32 f);
Expand Down
Loading
Loading