1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-15 03:20:35 +00:00
Commit graph

766 commits

Author SHA1 Message Date
fullgrowngaming
85cf70bcd3
En_Rl OK (#378)
* Approx. half of en_rl matched

* More En_Rl work

* 5 functions left

* One function left

* En_Rl OK and all matching

* Formatted and cleaned up style things.

* Deleted asm and fixed spec

* Forgot to delete the stuff in the data folder again

* Made all requested changes.

* Forgot one requested change

* Implemented dragorn's documentation suggestions

* Implemented dragorn's documentation suggestions

* Made further requested changes

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-10-04 10:09:20 -04:00
fig02
269aa0f36f
en_reeba OK (#434)
* leever progress

* leever progress

* leever progress

* 2 non matchings

* test

* merge master, match two functions

* progress

* OK

* revert permissions change

* remove unwanted file

* review

* use decr

* merge

* merge and review

* early return

* vt
2020-10-04 09:17:44 -04:00
petrie911
5d39ae1cc7
Rakkatenjo (#419)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* bonk

* static var cleanup

* one more rename
2020-10-04 08:58:33 -04:00
petrie911
4ac8e70f5a
Obj_Syokudai (#412)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* torches

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* cleanup

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* small cleanup

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-04 08:54:09 -04:00
petrie911
a52743e8cd
Bg_Hidan_Curtain (#411)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* flame circles

* merge and description

* Update src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* formatting and other cleanup

* names

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-10-04 08:48:48 -04:00
petrie911
3576f4c169
Po event (#368)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* and now for poe sister stuff

* more matches

* awful control flow still needed

* complex control is comples

* matched and documented

* also remove .s

* ZAP

* .s files never die

* more cleaning

* a little more cleanup

* data cleanup

* merge and fix

* removing globalCtx2

* dlists

* forgot this

* now with ColHeader

* a little more

* one last name change
2020-10-04 08:45:23 -04:00
Dragorn421
2cea0d8b82
Fix ichaindis.py always outputting an unsigned value (#435) 2020-10-03 22:38:39 -04:00
petrie911
686b44d8f8
Bg_Mori_Kaitenkabe (#410)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* spinny wall

* cleanup

* wait for mori tex

* merge and better (?) names
2020-10-03 22:18:41 -04:00
Sirius902
046d0f2a44 Use quotes for vt import 2020-10-03 16:37:30 -07:00
Sirius902
8384e646a5 Merge branch 'master' into ovl_En_Ik 2020-10-03 16:37:06 -07:00
Sirius902
5a68ed0c5a Merge remote-tracking branch 'upstream/master' 2020-10-03 16:36:47 -07:00
Dragorn421
e270cd96bf
ovl_En_Box OK, documented (#356)
* ovl_En_Box OK, documented

* Update spec

* Removed useless union

* renames, remove comments, move internal enums from header

* stylistic changes

* Remove unneeded prototypes and use documentation format for doc comments

* Misread git's merge solution

* EnBox_SetupAction and Actor_SpawnAsChild

* Cleanup

* Merge effects, defines for movement flags, swap dList and dListHead, cleanup...
2020-10-03 18:42:10 -04:00
Random
174af7384d
libultra cleanup (#215)
* cleanup libultra

* fixes

- use quotes instead of <> for includes
- add macros for zelda specific thread priorities
- fix Makefile
- properly format the remaining pfs structs

* fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL

* remove ULTRA_ABS

* fix includes

* update z_player.c/z_lib.c + run format.sh

* merge upstream/master

* fix include in En_Goroiwa

* fix includes
2020-10-03 11:22:44 -04:00
Sirius902
b24b5d2dbe Progress 2020-10-03 02:08:48 -07:00
Sirius902
0afce8bd32 Sort declarations 2020-10-03 01:11:04 -07:00
Sirius902
706c9de919 Move and remove forward declarations 2020-10-03 01:01:48 -07:00
Sirius902
698e6969e3 Match some interesting stuff 2020-10-03 00:22:41 -07:00
Sirius902
307d70867b Fix func_80A7492C 2020-10-02 22:54:42 -07:00
Sirius902
9f8b35bd0c Ugly match for func_80A7492C 2020-10-02 22:34:54 -07:00
Sirius902
321b44a10d Work on func_80A7492C 2020-10-02 01:05:44 -07:00
Sirius902
ae3278de6c Type remaining data 2020-10-02 00:40:57 -07:00
Sirius902
8591572385 Fix data 2020-10-02 00:35:30 -07:00
Sirius902
7b04a7cfeb Figure out types for a lot of data 2020-10-02 00:27:21 -07:00
maekclena
6136ee6deb
ovl_En_Part (#383)
* ovl_En_Part

* PR review

* PR review

* Rebase

* PR review

* Oversight

* Rebase

* PR review
2020-10-01 18:51:05 -04:00
emilybrooks
7a8e00e49d
ovl_en_hs2 OK (#423)
* Decompiled ovl_en_hs2

* Replaced skelAnime pointer with pad, changed some values to hex, replaced early return with else statment, removed unnecessary padding in the header, removed unneeded & on a function pointer

* Replaced a tab with whitespace, removed address operator in front of ActorShadow_DrawFunc_Circle, moved vec3f inside the PostLimbDraw function

* Changed 0xFFFE to ~1
2020-10-01 07:49:47 -04:00
Sirius902
0faddf5321 Fix jump table 2020-10-01 00:31:10 -07:00
Sirius902
eb74a1854e More progress 2020-10-01 00:12:16 -07:00
Sirius902
6802960a77 Progress 2020-09-30 23:39:36 -07:00
Sirius902
78ca34d897 More graphics stuff 2020-09-30 23:06:01 -07:00
Sirius902
8c99be7682 Forgot one 2020-09-30 22:33:03 -07:00
Sirius902
a79f0bca8f Rename asm for named functions 2020-09-30 22:30:49 -07:00
Sirius902
2453af9697 Match some graphics functions 2020-09-30 22:27:47 -07:00
Sirius902
6dd443c0e3 Name, static, and move some stuff 2020-09-30 20:37:08 -07:00
Sirius902
2b51005739 Use thisx 2020-09-30 20:27:52 -07:00
Sirius902
0c92f891ba Match func_80A74398 2020-09-30 20:24:29 -07:00
Sirius902
bcacb5b148 Work on func_80A74398 2020-09-30 19:57:47 -07:00
Sirius902
8e5db49a8d Work on func_80A74398 2020-09-30 19:16:04 -07:00
Sirius902
7ebec4cae0 Fixes 2020-09-30 18:21:58 -07:00
Sirius902
0bcc99778c Match func_80A74398 more 2020-09-30 18:12:23 -07:00
Sirius902
6e200aa0ca Eh revert to _StartMusic 2020-09-30 17:48:55 -07:00
Sirius902
07a1e5da15 Rename to _PlayBGM 2020-09-30 17:32:26 -07:00
Sirius902
cf49171580 Correct prototype 2020-09-30 17:30:05 -07:00
Sirius902
33a067a021 Cleanup 2020-09-30 17:22:50 -07:00
Sirius902
9fe3cb43ef Use rom reloc 2020-09-30 17:06:28 -07:00
Sirius902
4f1ba11baa func_80A772EC 2020-09-30 16:00:33 -07:00
Sirius902
ab7d7135a1 Migrate bss for now ig 2020-09-30 15:31:57 -07:00
Sirius902
c0bdcfbe45 Fixes 2020-09-30 14:08:15 -07:00
Ethan Roseman
024d5d69bf
Decompiled ovl_Bg_Jya_Zurerukabe (#424)
* Decompiled ovl_Bg_Jya_Zurerukabe

* PR suggestions, cleanup

* PR suggestion
2020-09-30 16:09:52 -04:00
Tharo
d292d81958
Decompiled En_Holl (#253)
* Decompile most of En_Holl

* Two nonmatchings left

* Rename some variables, use EnHollActionFunc

* Minor cleanups

* Only regalloc issues left

* General cleanups

* 1 nonmatching left

* Delete data.s file

* Added some more documentation

* Improved nonmatching but OK still elusive, some cleanups

* Review changes

* Ran formatter

* More review changes

* Flip conditions that were previously missed

* DISP macros
2020-09-30 15:11:04 -04:00
Sirius902
e645bc6f70 Progress 2020-09-30 01:20:43 -07:00