1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +00:00

z_bgcheck.c, 800430A0.c, 80043480.c (#256)

* beginning of migrating changes

* got matching

* changed order a bit

* clean up bgcheck

* fix conflict

* fix conflict again

* first stab at identifying types, some oks

* Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs

* more OKs, z_bgcheck.bss migration, update some sys_math3d.c args

* couple more OKs

* pushing some OKs

* fix compilation issues

* code_800430A0.c OK, more files decomp'd

* 8003A3E0 big OK :)

* Decomp most of func_8003C614, decomp helper funcs

* Decomp SurfaceType, CamData, and WaterBox property related functions

* more OKs, big OK in 8003C078

* more OKs, more progress, move a function definition in z_collision_check to functions.h

* more clean-ups, more OKs, dyn_vtx is now defined as u8*

* 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better

* data migrated, more OKs

* 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled

* func_80040284, 800409A8 non_matching, add IS_ZERO macro

* All asm files have C representations, some big OKs, lots of minor tweaks

* More OKs, non-matching code cleanup

* 8003FBF4 and 80040BE4 OK, improve codegen for most functions

* format z_bgcheck.c

* fix warnings, compile errors on NON_MATCHING

* func_8003EE80 is now NON_MATCHING

* begin documenting some functions

* formatting

* more documentation, func_8003A95C OK

* fix PHYSICAL_TO_VIRTUAL changes

* fix var rename

* More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP

* func_8004239C ok, more NON_MATCHING improvements, more documentation

* Implement most suggested changes

* Convert comments to slower comments

* /**

* Implement ZAP2 changes

* my anti-virus ate my format.sh results

* Rename a couple hundred functions, fix minor stuff

* rename var so that clang formats correctly

* run format.sh

* implement Petrie's matches/suggestions

* format

* matches

* and the asm

* slight error

* Add SSList

* two more matches

* stuff

* implement code changes

* clean up Petrie's matchings

Co-authored-by: Arthur <arthurtilly413@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
mzxrules 2021-01-08 06:12:58 -05:00 committed by GitHub
parent 209f0d21b8
commit 3cef03f5ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
416 changed files with 6610 additions and 13487 deletions

View file

@ -293,6 +293,11 @@ D_05017A60 = 0x05017A60;
// z_door_toki
D_06007888 = 0x06007888;
// z_bg_hidan_kousi
D_0600E2CC = 0x0600E2CC;
D_0600E380 = 0x0600E380;
D_0600E430 = 0x0600E430;
// z_bg_spot01_idomizu
D_060007D0 = 0x060007D0;
@ -326,6 +331,12 @@ D_06000150 = 0x06000150;
// z_bg_spot18_shutter
D_06000534 = 0x06000534;
// z_bg_spot18_obj
D_06002FE4 = 0x06002FE4;
D_0600261C = 0x0600261C;
D_06002BC0 = 0x06002BC0;
D_06002370 = 0x06002370;
// z_bg_umajump
D_06001438 = 0x06001438;
D_06001220 = 0x06001220;
@ -607,6 +618,14 @@ D_060002A8 = 0x060002A8;
// z_bg_haka_megane
D_06001250 = 0x06001250;
D_06001830 = 0x06001830;
D_06001AB8 = 0x06001AB8;
D_06004330 = 0x06004330;
D_060044D0 = 0x060044D0;
D_06004780 = 0x06004780;
D_06004940 = 0x06004940;
D_06004B00 = 0x06004B00;
D_06004CC0 = 0x06004CC0;
// z_bg_haka_meganebg
D_06000118 = 0x06000118;
@ -1766,6 +1785,13 @@ D_06000B30 = 0x06000B30;
D_06003CE0 = 0x06003CE0;
D_060037B8 = 0x060037B8;
// z_en_a_keep or en_a_obj
D_040394B0 = 0x040394B0;
D_0403A120 = 0x0403A120;
D_0403A480 = 0x0403A480;
D_0403A7F0 = 0x0403A7F0;
D_06000730 = 0x06000730;
// z_en_kusa
D_060002E0 = 0x60002E0;
D_040355E0 = 0x40355E0;