1
0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 12:54:51 +00:00
Commit Graph

90 Commits

Author SHA1 Message Date
Ethan Roseman
7f6e9d55fe
Decompiled ovl_Demo_Sa (#231)
* Decompiled ovl_Demo_Sa

* PR suggestions

* ff -> alpha

* PR suggestions

* Reverting cutscene data
2020-07-08 19:40:09 -04:00
Ethan Roseman
a5aee3d691
Decompiled ovl_En_Zl2 (2 nonmatchings) (#223)
* Almost dun

* 3 more, progress...

* 2 more

* Fixing field rename

* improvement

* 1 more

* progress

* more

* work

* Preparing for PR

* Comments

* tidbits

* more tidbits

* fixes

* PR comments

* Nonmatching reloc

* PR suggestions

* PR suggestions
2020-07-04 14:34:51 +02:00
louist103
7946d6698c
Decomp BgJyaLift (#216)
* Re upload

* Decomp BgJyaLift

* Fixed issues

Fixed issues from review

* Edits after review

* Review Fixes

Made some fixes and also changed an unknown variable name

* Fixes to file

Fixed some styling things and renamed the last function

* Added fixes

Added roman's fixes

* Delete filemap.pyc

* Fixes

Removed ctx.c and replaced tabs with spaces spec.
2020-06-24 18:34:31 -04:00
Ethan Roseman
5f61c105b4
Decompiled ovl_Bg_Spot01_Idohashira (1 non-matching) (#213)
* Almost done

* one non-matching

* PR suggestions

* Further suggestions

* minor correction
2020-06-21 17:50:01 -04:00
fig02
67d13fe190
Arms_Hook OK (#210)
* Arms_Hook OK

* cleanup

* decr

* remove redundant include

* missed some things

* rename things

Co-authored-by: dark-samus <mathmcclintic@gmail.com>
2020-06-17 15:44:22 -04:00
snablu
4e70a24274
Decompile z_bg_haka_trap.c (#201)
* Decompile z_bg_haka_trap.c

* Update spec

delete old .reloc.s file

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>

* Deleted reloc.s and made style changes to function pointers and local vars

* Renamed timer field, added more useful temp names

* Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues

* Commented dual purpose of unk_16A and formatted file again

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
2020-06-11 17:39:47 -04:00
Tharo
b2df45ae06
Decompile ovl_Bg_Spot16_Doughnut (#187)
* Decompile ovl_Bg_Spot16_Doughnut

* Ran formatter

* Shorten float values

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Fix last float values

* Rename Update2 and Draw2

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-06-07 10:54:44 -04:00
fig02
78d0883f04
Actor Cleanups (#177)
* rename init chains, colchkinfo, colider inits, damage tables

* actor cleanups

* fix collider init script names

* small fixes

* ichain arg name

* change dynapoly types and names

* revert enru1 data name

* and the type

* pr suggestions
2020-05-31 05:55:48 -04:00
Ethan Roseman
13a94482e5
Decompiled ovl_En_Zl1 (#169)
* Some progress

* progs

* More

* 1 more

* Init

* Slightly better score on one function

* 1 down!

* some progress

* Prep for PR

* PR suggestions

* OK!

* Formatting

* formatting again

* PR comments

* updating ZAP2
2020-05-30 09:33:29 -04:00
fig02
ac97807762
En_Kz OK (#176)
* start kz

* remove irrelevant file

* kz progress

* en_kz progress

* match kz switch

* progress

* kz OK

* kz OK

* sync

* kz done

* delete asm files

* pr suggestions 1
2020-05-29 17:20:00 -04:00
Ethan Roseman
038ab888f6
Decompiled ovl_Bg_Treemouth (#168)
* Almost done

* header

* Decompiled ovl_Bg_Treemouth

* fixing undefined sims

* PR suggestions

* PR suggestions
2020-05-29 17:08:40 -04:00
Lucas Shaw
248c0587d6
ovl_End_Title OK (#161)
* One non matching left in ovl_End_Title

* ovl_End_Title OK

* formatting

* removed unused asm files

* changed 0xFF to 255

* updated dlist

* made suggested changes
2020-05-27 11:51:11 -04:00
Roman971
235b0b8e0b
Fix more raw pointers (rsp and part of .data) (#170)
Known files left with pointers in .data after this (possibly the only ones since I checked roughly everything):
- flg_set.c
- z_camera.c
- db_camera.c
- code_800D7CD0.c (ucode_disas.c)
- audio (not sure which ones, see the structure sheet)
2020-05-27 09:06:37 -04:00
gamestabled
c68d752813
EnHata OK (#155)
* EnHata OK

* made/attempted suggested changes. still havent been able to fix the THIS in Update
2020-05-26 20:05:09 -04:00
fig02
442b15c79f
en_sb OK (#159)
* en_sb OK

* en_sb done

* remove asm

* remove diff.txt

* pr changes

* pr changes 2

* merge master and add description
2020-05-26 11:57:54 -04:00
Half-asian
3175f5c988
En_Skjneedle OK (#162)
* En_Skjneedle OK

* fix

* file deletions

* file deletions 2

* fix extern

* fix

* cleanup
2020-05-26 10:53:27 -04:00
gamestabled
13b1dc03bb
EnHintnuts OK (#154)
* merged from upstream

* matching

* named functions

* made suggested changes
2020-05-24 04:30:24 -04:00
Blackop778
e6b00f03bf
Decompile en_guest (#151)
* Start work on ovl_En_Guest

* Match func_80A5046C and func_80A50518

* Everything but func_80A509D4 matches

* Match last function, cleanup, rename stuff

* Run formatter

* Temp didn't need to be used

* I should have ran the formatter again

* Use tcrf translation for debug string

* Apply suggestions from code review

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>

* Rename  references to function  and fix semicolon

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>

* PR Suggestions

* More comments

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2020-05-23 04:21:36 +02:00
Zelllll
785011c33c
Decompile En_Dha (#130)
* Decompile En_Dha

* Removed original reloc data and fixed actor struct

* Update z_en_dha.c

- Removed unnecessary line breaks
- Changed `colliderSphere` to `collider` and `colliderSphereItem` to `colliderItem`
- Removed unnecessary & pointers
- Renamed various functions

* Update z_en_dha.h

Changed collider names

* Fixed all issues with `En_Dha`

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* All suggested changes applied

* Update z_en_dha.c

Fixed unresolved changes that were marked as resolved. Whoops!

Co-authored-by: Zelllll <elijah@DESKTOP-QDIECM7.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-18 04:34:34 -04:00
Random
d556999b2b
Decompile remaining z_vis... files (#131)
* Decompile z_vismono.c / code_800AD920.c

- z_vismono.c: OK
- code_800AD920.c: OK

* Minor fixes in PR #131
2020-05-15 05:02:39 -04:00
fig02
2a7bdc5c28
en_fu OK (#126)
* 1 function left

* 1 function left

* en_fu OK, still need to document

* en_fu OK

* spec comment

* remove asm files

* clang and final fixes

* fix floormas formatting things

* pr suggestions

* pr suggestions 2
2020-05-13 21:18:45 -04:00
Lucas Shaw
8e7ca2d497
35/37 Functions Decompiled in ovl_En_Heishi2 (#117)
* started

* did more work

* did some more

* Update

* Merged master

* EnHeishi2_Update OK

* func_80A549E8 OK

* func_80A54954 OK

* EnHeishi2_Draw OK

* Removed unused asm

* func_80A543A0 OK

* func_80A53638 OK. Fixed type of func_8008F08C

* done for rn, will work on it later

* func_80A53850 OK

* func_80A53F30 OK

* func_80A53D0C OK

* Made cylinderInit in En_Ma3 static

* Made suggested changes. Removed return from functions by adding else

* Made suggested changes. Removed a.out file that accidentally got added

* Made suggested changes

* moved #include <vt.h> from header to c file

* fixed formatting

* added line break

* Made suggested changes

* ran format

* Fixed unk_2F2
2020-05-10 19:44:04 -04:00
Lucas Shaw
7d7c851289
ovl_En_Heishi3 OK (#121)
* almost done with heishi3

* heishi3 ok

* Added function names to heishi3

* EnHeishi3 OK

* Made some suggested changes. Still have questions about others

* Made suggsted changes

* fixed formatting

* fixed formatting
2020-05-10 19:19:27 -04:00
Random
3e5ed389b9
Decompile the remaining Oceff actors + Add ichaindis.py (#125)
* Decompile the remaining Oceff actors + Add ichaindis.py

- z_oceff_spot.c: OK
- z_oceff_storm.c : 1 non-matching left
- Add ichaindis.py

* Rename SetActionFunc to SetupAction + Add Actor descriptions

* Minor fixes in PR #125
2020-05-10 13:09:26 -04:00
Random
40836f5d82
Decompile z_oceff_wipe (#122)
* Decompile z_oceff_wipe

- z_oceff_wipe: OK
- z_oceff_wipe2: OK
- z_oceff_wipe3: OK
- z_oceff_wipe4: OK
- Add patched libmalloc to ido 7 to prevent segfaults
- Add CUR_CAM macro

* Rename CUR_CAM to ACTIVE_CAM

* Fixes in PR #122
2020-05-09 16:58:02 -04:00
krimtonz
0ebe904d0c
En_Floormas OK (#97)
* EnFloorMas wip

* floormaster formatting

* floormaster wip

* ovl_En_Floormas OK

* pr recommendations

* pr updates
2020-05-07 19:18:09 -04:00
zelda2773
8efddb0fe0
Decompiled ovl_Bg_Ddan_Kd (#110)
* Decompiled ovl_Bg_Ddan_Kd

* ovl_Bg_Ddan_Kd renamed arguments
2020-05-04 14:29:53 -04:00
Ethan Roseman
713de9b942
Decompiled ovl_En_Cow (#113)
* Beginning the Cow

* Decompiled ovl_En_Cow

* Giving the cow milk
2020-05-04 12:11:37 -04:00
Nathan Faltermeier
a65554d586
Decompile most of ovl_En_Horse_Ganon (#108)
* Work on horse ganon

* Match destroy, init matches but need mv data -> .c

* Match EnHorseGanon_Draw and func_80A68E14

* Move some data to .c

* Decomp func_80A68870

* EnHorseGanon_Update nearly matches

* func_80A68FA8 and func_80A686A8 match

* Fix EnHorseGanon_Init, start on func_80A68B20

* match func_80A68B20

* Migrate data but something doesn't match

* Matches with migrated data, fix most warnings

* Rename some variables, some clean up

* A little more cleanup before PR

* Move commented out code to NON_MATCHING blocks

* Run formatter and delete unused line, char -> u8

* Update function was matched
Also imports another type from z_skin.Seeing as they are somewhat
tentative I decided not to put them in any global file.

* Update src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>

* PR Changes

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* PR Changes round 2

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-04 11:43:04 -04:00
Roman971
e36015837b
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109)
Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 00:05:44 -04:00
Ethan Roseman
363d5d4194
Decompiled ovl_En_Ma2 (#93)
* first steps

* some more

* fixing merge

* more progress

* progs

* Decompiled ovl_En_Ma1

* newline

* Pr suggestion

* 2 to go

* Makefile machinery work

* Updating Jenkinsfile

* Initial setup for OSX repo support

* Adding ido7 to repo

* Makefile reversion

* Iniital Dockerfile

* iconv fix

* Docker stuff

* Dun

* Fixing stuff

* Updating Dockerfile

* Update README-OSX.md

* Restore functions.h

* Formatting

* Defining some funcs

* Renaming funcs

* Removing unnecessary README-OSX

* Addressing PR comments
2020-05-01 06:08:39 -04:00
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
Roman971
aecf375b84
Fix all RAM pointers in overlays (#81) 2020-04-19 11:57:38 -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
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
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
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
chandler
fa7874137b matching 2020-04-07 10:57:04 -04:00
chandler
0265ad21c0 merge with upstream 2020-04-06 14:38:23 -04:00
Gamestabled
9a87ce3c04 firewall OK 2020-04-06 03:06:00 -04:00
Gamestabled
a00a8bbaeb all functions match, now learning how to do data/rodata 2020-04-06 03:05:54 -04:00
Ethan Roseman
546811bba8 Decompiled ovl_Bg_Spot12_Saku 2020-04-04 22:48:30 -04:00
shawlucas
c218f38635 Fixed merge conflict 2020-04-02 09:40:01 -07:00
shawlucas
45ce20a6e0 Decompiled ovl_Bg_Spot05_Soko 2020-04-01 17:28:00 -07:00
zelda2773
eeb31944f8 Merge remote-tracking branch 'upstream/master' 2020-03-30 22:07:42 -04:00
zelda2773
ba49ef6a0e Decompiled ovl_Obj_Comb 2020-03-30 21:56:36 -04:00
fig02
10c74eb958
Merge pull request #39 from zelda2773/master
Decompiled ovl_En_Ds
2020-03-28 02:45:24 -04:00
zelda2773
105ea6c5cd Decompiled ovl_En_Ds 2020-03-27 10:32:46 -04:00
Ethan Roseman
a4be535164 Merge branch 'master' into ovl_En_Ru2_new 2020-03-25 18:56:09 -04:00