1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-05 01:06:37 +00:00
Commit graph

1593 commits

Author SHA1 Message Date
Ethan Roseman
d58983494c
Decompiled ovl_En_Ma1 (#83)
* first steps

* some more

* fixing merge

* more progress

* progs

* Decompiled ovl_En_Ma1

* newline

* Pr suggestion

* Fixing some small things

* Update src/overlays/actors/ovl_En_Ma1/z_en_ma1.c

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Removing padding

* Fixing script

* Fixing some things

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-04-27 01:47:35 -04:00
Dragorn421
e126e37084
func_800418D0 and func_800417A0 in z_bgcheck.c, matching (#79)
* func_800418D0 and func_800417A0 in z_bgcheck.c, matching

* func_800417A0 cleanup

* More func_800418D0 cleanup

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-04-26 21:12:27 -04:00
krimtonz
28387947e2
vtx extractor (#94) 2020-04-26 18:14:41 -04:00
Synray
ff25b89b13
Finish code_8007BF90 (#95)
* Finish code_8007BF90

* Review changes

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-04-25 22:55:19 -04:00
mzxrules
aa91a7ee32
z_collision_check.c (#73)
* func_8005B280 ok

* func_8005B65C OK

* split out func_8005BD50

* func_8005B7C0 OK

* func_8005B7F4 OK

* func_8005B824 OK

* func_8005B860 ok

* improve sanity

* func_8005B6B0 ok, ColliderInit_Actor structs added

* func_8005B884 ok

* func_8005BBF8 ok, split out func_8005BF50

* split more stuff out of func_8005C050.s

* func_8005C050 OK

* func_8005BA30 fakish OK, func_8005BAD8 real OK

* func_8005BB48 OK, func_8005BA84 almost decomp'd, but type issues

* func_8005BB10 Ok

* func_8005BF50 OK

* func_8005BE50 OK

* func_8005BD50 OK

* func_8005BCC8 Ok

* func_8005BC28

* func_8005BB8C func_8005BBB0 func_8005BBD4 Ok

* save my work commit

* func_8005C2BC fake OK

* func_8005C5B0 ok

* func_8005C608 ok

* func_8005C6C0 ok

* func_8005C6F8 ok

* func_8005C730 ok

* func_8005C774 func_8005C798 func_8005C7BC OK

* func_8005C7E0 ok, func_8005C810 split

* func_8005C810 OK

* func_8005C8C8 ok

* func_8005C964 OK

* func_8005CA88 ok

* func_8005CBAC ok

* func_8005C124 func_8005C1AC func_8005C234 func_8005CC98 OK

* func_8005CD34 func_8005CDD0 Ok

* func_8005CE6C ok

* func_8005CEC4 ok

* func_8005CEDC ok

* func_8005CF90 Ok

* standardize type names/vars more

* func_8005D3BC ok

* func_8005D40C OK, z64.h CollisionCheckContext

* func_8005D4B4 func_8005D4C8 ok

* partial data section migration

* improve function documentation, OT->OC

* Actor_CollisionCheck_SetOC ok

* Actor_CollisionCheck_SetAT Actor_CollisionCheck_SetAC Ok

* func_8005BA84 ok

* func_800611A0 ok

* func_80061274 ok

* clean up func_80061274

* func_8006139C ok

* func_8005E9C0 and dependencies OK

* minor cleanup to func_8005E9C0

* func_8005EC6C OK!

* func_8005E81C ok

* func_8005E604 ok

* func_8005E2EC func_8005E4F8 OK

* func_8005DE9C OK func_8005D8AC disassembled

* func_8006146C func_8006268C ok

* func_8005EEE0 ok

* func_8005F17C

* func_8005F39C ok

* func_8005F5B0 decompiled, not matching

* func_8005F7D0 decomp, func_8005D218 and func_8005D324 OK

* func_8005FA30 ok, split more functions

* func_8005FC04 ok

* func_8005FDCC k

* func_8005FF90 OK OK OK

* func_80060204 dead

* func_800604B0 ok

* func_80060704 func_80060994 ok, func_80060C2C somewhat disassembled. AT to AC matrix doneish

* func_800635D0 ok, func_80062ECC not so much

* OcLine oks

* D_8011DF28 functions disassembled

* D_8011DF5C functions OK

* setAT_SAC. setAC_SAC, setOC_SAC OK

* func_80061C98 decompiled, func_80061BF4, func_80061C18 OK

* func_800617D4 ok, func_800614A4 disassembled

* CollisionCheck_OC D_8011DFAC functions OK

* func_80062530 ok

* CollisionCheck_generalLineOcCheck subfunctions OK

* func_800622E4 ok

* after a long fought battle, func_80061F64 has fallen.

* func_800628A4 disassembled

* func_800627A0 func_8006285C OK

* ActorCollider_Cylinder_Update, func_80062718, func_80062734 ok

* func_80062CD4 decompiled, import EffShield/EffSpark types from MM

* various SubActor98 struct functions OK

* func_8005D4DC func_8005D62C ok

* .data section migrated, more OKs, fix NON_MATCHINGs to use effect structs

* func_80060C2C ok

* minor code tweaks

* func_80061C98 ok somehow

* Attempt to fix some unknowns, move types out of z64actor, add set3 ColliderInit types

* Apply changes

* formatting

* tweak a couple function names

* krim changes, func naming

* missed some things

* function renames

* Implement GenColliderInit.py utility

* Implement pr changes, GenColliderInit.py, DamageTable.py, z_collision_btltbls.c fully matching

* func_800614A4 ok

* Implement Roman's fixes, name Collider unknowns, rename COLTYPE -> COLSHAPE and define new COLTYPE

* collisionCheckCtx -> colChkCtx, fix small things
2020-04-25 22:43:35 -04:00
Ethan Roseman
f9bdb1d58a
Docker Support for OSX (#91)
* Makefile machinery work

* Updating Jenkinsfile

* Initial setup for OSX repo support

* Adding ido7 to repo

* Makefile reversion

* Iniital Dockerfile

* Docker stuff

* fixbaserom cleanup

* Attempting to fix fixbaserom

* baserom_original -> input

* Revert "baserom_original -> input"

This reverts commit d9199462b6.

* Spiffing up readme for OSX
2020-04-24 20:34:00 -04:00
Synray
4d3d264624
Decompile code_801067F0, 80106860, 801068B0 (#89)
* Decompile code_801067F0, 80106860, 801068B0

* clang format

* Remove unnecessary casts
2020-04-23 10:59:25 +02:00
Roman971
0a59863457
Disassemble the rom header and entrypoint function (#87)
The actual boot code (ipl3) is still only incbin'd. If someone else wants to disassemble it properly, go ahead. I might do it eventually, but for now it doesn't seem required for shiftability or anything interesting.
2020-04-22 13:44:46 -04:00
Roman971
26b8e77f99
Fix ROM and function pointers in overlays (#88)
* Fix ROM pointers in overlays

ROM pointers are fewer but much harder to find so hopefully this is all of them.

* Fix function pointers in overlay data
2020-04-22 13:44:11 -04:00
Lucas Shaw
3c440ef7f1
Finished code_801031F0.c, guPosition.c, guLookAtHilite.c (#84)
* started microcode decomp

* Modified spec to fix error

* osContGetQuery OK

* Decompiled guLookAtHilite.c

* guPosition.c OK

* Fixed formatting

* osViSetEvent.c OK

* Deleted unnecessary files

* Made suggested changes, merged playblack.c

* Removed line breaks from comments

* Removed argument listing
2020-04-22 13:20:49 -04:00
JoshDuMan
06b731c494
Match sys_math.c and one in z_scene_table.c (#90)
* Match func_800CA63C

* Remove func_800CA63C.s

* Match func_8009BEEC?

* Remove func_8009BEEC.s
2020-04-22 12:18:53 -04:00
JoshDuMan
b8a0751518
Match coss.c (#86)
* Match coss.c

* Remove asm file.

* Update src/libultra_code/coss.c

Co-Authored-By: Lucas Shaw <49287729+shawlucas@users.noreply.github.com>

Co-authored-by: Lucas Shaw <49287729+shawlucas@users.noreply.github.com>
2020-04-21 17:40:56 -04:00
JoshDuMan
e050319e07
Decompile playback.c (#82)
* Decompile playback.c

* Remove rename_sym.sh

* Fixed for loop in pop_node_...

* Address krim's other issues

* Remove rename_sym again

* Address Roman's comments.

* Fix build and remove rename_sym another time.
2020-04-21 04:19:33 -04:00
Roman971
aecf375b84
Fix all RAM pointers in overlays (#81) 2020-04-19 11:57:38 -04:00
krimtonz
ee48867446
Math Files (#76)
* math3d wip

* math3d wip

* wip

* wip

* wip

* wip

* final update before pr

* run format.sh

* fix merge conflicts

* tharo suggestions update

* fig formatting suggestion

* math3d pr updates

* use sFactorialTbl in sys_math
2020-04-18 23:28:24 -04:00
Synray
eefbe9afe1
Decompile code_800D2E30 and use struct in code_800A9F30 (#80)
* Match func_800AA000

* Match z_camera/func_800437F0

* Decompile code_800D2E30, use struct in 800A9F30

* Format

* Remove 'U' from literals

* Remove bss, cleanup z_camera

* Review changes, rename temp

* Move externs to variables.h
2020-04-18 22:56:53 -04:00
Lucas Shaw
21750d5aee
Naming some functions in libultra_code, decompiling a decent amount. (#77)
* osgetactivequeue ok

* osspdevicebusy ok

* osGetCurrFaultedThread ok

* osSpRawStartDma OK

* __osSpSetPc and osViGetCurrentFramebuffer OK

* sinf, sins, and sptask OK

* coss OK

* cosf OK

* ran format.sh

* Updated PR to use ultratypes

* osContStartQuery OK

* ran format.sh

* Updated PR to fix issues

* Made suggested changes
2020-04-18 21:40:27 -04:00
krimtonz
4961eb0a90
SkelAnime Updates (#78)
* update naming, minor updates

* rename postLimbUpdate to postLimbDraw

* recently decompiled actor naming update
2020-04-18 14:08:12 -04:00
Ethan Roseman
cb5a604ea7
Decompiled ovl_En_Ru1 (#72)
* Decompiled ovl_En_Ru1

* Formatting

* Actor/TransitionDrawTable struct fixes

* addressing PR comments

* addressing PR comments (2)
2020-04-18 04:50:41 -04:00
Nicholas Estelami
62864ba11d
Update README.md 2020-04-17 18:05:21 -04:00
Roman971
262f6c507c
Decompile z_play.c and Match/Document some of z_view.c (#74)
* Decompile z_play.c and Match/Document some of z_view.c

Also fix the last non matching in z_sample.c and update some game state functions.

* Suggestions from PR #74

* Fix undefined reference to Gameplay_DrawOverlay

* Suggestion from PR #74 (2)

* Fix a fake argument in func_800BC450
2020-04-16 17:36:12 -04:00
Random
9ac1f8130d
Decompile jpegutils.c (#75)
* Decompile jpegutils.c

jpegutils.c : OK

* Fix a typo

* Fixes in PR #75

- Fix a type in JpegWork
- Remove clang-format off/on in z_quake.c
- Move the jpegutils rule at the end of makefile
2020-04-16 14:08:23 -04:00
Lucas Shaw
045a92d7c3
Big actor cleanup (fixed) (#69)
* Started doing cleanup

* did more work

* did more migration

* migrated more rodata and worked on some structs

* did more work

* Removal of ROOM field from initvars, some rodata migration, some string decompilation

* General update

* Decompiled vt strings

* Tool work

* Tool improvements

* 270 overlay rodata files remaining

* better float handling

* floats

* Many more floats

* migrated boss_mo

* assorted fixes

* Migrated 10

* tool improvements

* migrated 10

* 10 more

* 1 more

* did a few more

* fixes

* 10 more

* more floats

* Did some more, updated migrate-rodata.py to 'modify' the C file after processing in order to make to compiler process it as if it was changed.

* removed changes made to script by accident

* migrated largest rodata - ovl_fishing

* Did some more

* 114 remaining

* 99 left !

* almost done migrating rodata

* did some more, done for tonight

* almost done, tried add support to the script for z_player

* All possible rodata migrated in actor overlays

* update

* removed static from all overlays, ran format.sh

* Removed unknown actor structs

* converted a few floats

* Added new lines to header files that were missing them. Removed unused asm files

* Removed unused asm files

* Formatting newlines

Further formatting

spacing

.float spacing

More space formatting

More spacing formatting

Removing .balign 4 after floats

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2020-04-14 14:16:34 -04:00
silv3rwing07
5aef81071e
padmgr and related (#71)
* In process of moving changes over from old repo

* Merged in changes

* Finished import of padmgr changes from old repo

* Adjusted some volatile

* Improving padmgr volatile situation

* Almost matched osReadMempak

* Working on osMempakDataCRC

* Explanations and equivalents but no matches for osMempakAddrCRC and osMempakDataCRC

* OK after merge

* Matched osMempakAddrCRC and osMempakDataCRC

* Matched osReadMempak

* Updated PadMgr function names to be less like original code

* Changed variable names to make them further from original code

* Changed names and it stopped matching

* Undid clang-format steamrollering whitespace memes

* Cleaned up Input names

* More formatting changes

* Moved padmgr to z64.h, deleted padmgr.h
2020-04-14 13:17:25 -04:00
Ethan Roseman
16646aa34d
Decompiled ovl_Bg_Spot17_Funen (#67)
* First steps

* Decompiled ovl_Bg_Spot17_Funen

* static functions no more
2020-04-13 19:30:01 -04:00
Random
298abfb128
Decompile z_jpeg.c (#70)
* Decompile z_jpeg.c

- Decompile z_jpeg.c
- Move .bss variables from fault.c and fault_drawer.c into .s files to avoid bss reordering

* Rename JPEGWork to JpegWork and minor fix in Jpeg_GetU16
2020-04-13 19:03:10 -04:00
Ethan Roseman
f3c945cc82
Decompiled ovl_Bg_Bdan_Objects (#66)
* Decompiled ovl_Bg_Bdan_Objects

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Header update

* formatting

* Update include/z64.h

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Fixing structs

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-04-12 12:04:14 -04:00
pixel-stuck
d263b9dabd
add script to find (and optionally delete) old/unused asm files and delete all currently present old/unused asm files. (#65) 2020-04-11 22:39:49 -04:00
fig02
a45e7920bc
Merge pull request #60 from gamestabled/ovl_En_Ani
ovl_En_Ani
2020-04-10 16:48:40 -04:00
fig02
0f17ed8961
Merge pull request #55 from fig02/master
Fix make setup
2020-04-10 15:13:31 -04:00
fig02
37e78ba513
Merge pull request #61 from Random06457/master
Decompile sleep.c and printutils.c
2020-04-10 15:12:37 -04:00
chandler
4e54470b07 deleted data files for EnAni and BgHidanFirewall 2020-04-10 02:33:44 -04:00
chandler
22e9e2b6a2 removed asm files for EnAni and BgHidanFirewall 2020-04-09 15:22:48 -04:00
chandler
4c8ff91da7 made suggested changes 2020-04-09 00:10:43 -04:00
Random
6975b35591 remove useless parentheses 2020-04-08 20:24:46 +02:00
Random
0c0c15018f Run format.sh 2020-04-08 18:45:50 +02:00
Random
d0cf6e153b Decompile sleep.c and printutils.c
- Decompile sleep.c (OK)
- Decompile printutils.c (OK)
- Fix 1 non-matching in z_room.c
- Get rid of some magic numbers
2020-04-08 18:36:15 +02:00
chandler
81cad9fe7d made limbIndex decimal 2020-04-07 23:50:08 -04:00
chandler
2b8bc8ce6d made suggested changes 2020-04-07 23:39:10 -04:00
chandler
8f9ea21511 cleaned up a bit 2020-04-07 19:42:33 -04:00
chandler
d852f291e4 merged from master 2020-04-07 18:00:34 -04:00
fig02
0a25ab74c4
Merge pull request #58 from gamestabled/master
Bg_Hidan_Firewall
2020-04-07 13:26:59 -04:00
chandler
2bf2cef35e small change in firewall.h 2020-04-07 11:51:12 -04:00
chandler
e14b6eefec made recently suggested changes 2020-04-07 11:03:10 -04:00
chandler
fa7874137b matching 2020-04-07 10:57:04 -04:00
fig02
b71d74d20c
Merge pull request #59 from pixel-stuck/master
fix 3 non-matchings in z_demo.c
2020-04-07 08:50:36 -04:00
dark-samus
5c5fa61d4e fix 3 non-matchings in z_demo.c 2020-04-06 18:38:31 -04:00
chandler
83caab6e68 simplified a float 2020-04-06 17:31:24 -04:00
chandler
bd23567bfd a couple more suggestions 2020-04-06 17:08:24 -04:00
chandler
9864211cdc made suggesed changes 2020-04-06 16:41:05 -04:00