1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 22:36:01 +00:00
Commit graph

628 commits

Author SHA1 Message Date
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
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
chandler
22e9e2b6a2 removed asm files for EnAni and BgHidanFirewall 2020-04-09 15:22:48 -04: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
dark-samus
5c5fa61d4e fix 3 non-matchings in z_demo.c 2020-04-06 18:38:31 -04:00
fig02
b9ac7fdfea
Merge pull request #52 from ethteck/ovl_Bg_Spot12_Saku
Decompiled ovl_Bg_Spot12_Saku
2020-04-05 14:40:02 -04:00
Random
43acba22a9 Fixes in PR #50 (3)
- Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps
- Rename gfxArr to dispRefs
2020-04-05 19:29:30 +02:00
Random
02eaaa2039 Fixes in PR #50
- Rename "sGraph_UpdateTime" to "sGraphUpdateTime"
- Rename "Graph_Ct"/"Graph_Dt" to "Graph_Init"/"Graph_Destroy"
- Change the LOG_STRING macro
- Rename "LOG_VALUE" to "LOG_NUM"
- Fix brace style
- Rename "UcodeInfo"/"UcodeDisas" to "UCodeInfo"/"UCodeDisas"
- Fix field names in "UCodeDisas"
- Fix typo in "GraphicsContext"
- Change the size of unknown fields in "GraphicsContext" to hex
- Rename "game_init_func" to "gameStateInitFunc"
2020-04-05 12:32:08 +02:00
Ethan Roseman
546811bba8 Decompiled ovl_Bg_Spot12_Saku 2020-04-04 22:48:30 -04:00
Random
f818fb5299 Decompile graph.c
- decompile `graph.c` (2 non-matchings left)
- decompile `z_game_dlftbls.c`
- add noop macros in `gbi.h`
2020-04-04 18:12:59 +02:00
fig02
b96c016948
Merge pull request #49 from shawlucas/en_tana
Decompiled ovl_En_Tana and ovl_Bg_Spot05_Soko
2020-04-02 18:47:39 -04:00
KrimtonZ
7fa588f81f Merge branch 'master' into skelanimeupdates 2020-04-02 12:44:53 -05:00
KrimtonZ
3ab1af0c24 pr updates 2020-04-02 12:44:19 -05:00
shawlucas
c218f38635 Fixed merge conflict 2020-04-02 09:40:01 -07:00
shawlucas
2d11436367 Decompiled ovl_Bg_Spot05_Soko 2020-04-01 17:32:20 -07:00
shawlucas
36b9f914dc Removed asm files from En_Tana 2020-04-01 14:42:47 -07:00
zelda2773
a62877a543 Merge remote-tracking branch 'upstream/master' 2020-04-01 13:19:43 -04:00
KrimtonZ
25dcb73520 Merge branch 'master' into skelanimeupdates 2020-03-31 20:59:51 -05:00
KrimtonZ
32bda67e0f Name a few unknown parameters 2020-03-31 20:53:53 -05:00
KrimtonZ
f069777b19 name more skelanime struct members, match all but 1 function, name more functions, some documentation 2020-03-31 20:19:21 -05:00
KrimtonZ
75f570f4ac skelanime wip 2020-03-31 18:29:09 -05:00
fig02
8d37f3a15e Merge remote-tracking branch 'upstream/master' into elemental-arrows 2020-03-31 05:03:25 -04:00
Roman971
e99b2af35a Merge branch 'master' into z_rcp 2020-03-31 10:02:59 +02:00
KrimtonZ
8f54c82a96 rename SkelAnime_ChangeAnimation functions 2020-03-30 22:37:01 -05:00
KrimtonZ
8c993d9676 Merge branch 'master' into skelanimeupdates 2020-03-30 22:22:54 -05: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
KrimtonZ
24babfa95a skelanime update wip 2020-03-30 17:53:26 -05:00
Roman971
f64174730c Decompile z_elf_message.c (1 non matching left) 2020-03-30 22:29:55 +02:00
fig02
dd0541751c Merge remote-tracking branch 'upstream/master' into elemental-arrows 2020-03-30 05:52:27 -04:00
fig02
ea7aebc731 arrow_light OK 2020-03-30 05:25:53 -04:00
Roman971
f5ffe8687d Decompile z_rcp.c (1 non matching left) 2020-03-29 18:47:38 +02:00
Random
5f027cb431 Decompile z_quake.c and code_800D31A0.c
- `code_800D31A0.c` : OK
- `z_quake.c` : OK
2020-03-29 03:24:39 +02:00
fig02
10c74eb958
Merge pull request #39 from zelda2773/master
Decompiled ovl_En_Ds
2020-03-28 02:45:24 -04:00
fig02
fde5369eae fire arrow almost done, draw func regalloc 2020-03-28 02:41:49 -04:00
zelda2773
105ea6c5cd Decompiled ovl_En_Ds 2020-03-27 10:32:46 -04:00
fig02
ba5df8eb51
Merge pull request #37 from ethteck/ovl_En_Ru2_new
Decompiled ovl_En_Ru2
2020-03-26 20:12:38 -04:00
zelda2773
c52cb091ab Bg_Gjyo_Bridge OK 2020-03-26 01:22:08 -04:00
Ethan Roseman
a4be535164 Merge branch 'master' into ovl_En_Ru2_new 2020-03-25 18:56:09 -04:00
KrimtonZ
864cb28e27 remove skelanime data files, few extra namings, add non_matching for func_800A2E70 2020-03-25 14:38:16 -05:00
KrimtonZ
498d19655b Merge branch 'master' into skelanime 2020-03-25 10:52:04 -05:00
KrimtonZ
8970968cfc name SkelAnime_InitLinkAnimetion, name load animation types and callbacks, rename several segement addresses in decompiled actors 2020-03-25 10:51:25 -05:00
fig02
50dd042189
Merge pull request #36 from ethteck/ovl_Bg_Spot12_Gate
Decompiled ovl_Bg_Spot12_Gate
2020-03-25 11:39:04 -04:00
fig02
80b0f9b5fe
Merge pull request #35 from JoshDuMan/nonmatching
Match z_en_bird.c's last function.
2020-03-25 11:38:37 -04:00
Ethan Roseman
c559068eda Done 2020-03-24 22:24:33 -04:00
Ethan Roseman
735a6c93c5 One more 2020-03-24 21:52:39 -04:00
Ethan Roseman
7376fe5cad Decompiled ovl_Bg_Spot12_Gate 2020-03-24 21:42:07 -04:00
JoshDuMan
f0c033ce70 Match func_809C1CAC 2020-03-24 19:52:07 -04:00
fig02
17765e2586
Merge pull request #34 from pixel-stuck/master
match final non-matching in sys_cfb.c
2020-03-24 19:51:57 -04:00
Ethan Roseman
29cbc5c999 2 more 2020-03-24 17:00:46 -04:00
dark-samus
4b7f998b20 match final non-matching in sys_cfb.c 2020-03-24 16:53:09 -04:00
KrimtonZ
8bbac143cd Merge branch 'master' into skelanime 2020-03-24 11:56:37 -05:00
KrimtonZ
ac4a51bf8f Rename SkelAnime functions, which in turn modified a bunch of actor functions. Move necessary skelanime function calls to functions.h, remove unnecessary skelanime functions from functions.h, other skelanime cleanup 2020-03-24 11:52:12 -05:00
Ethan Roseman
b3f865dc58 Merge branch 'master' into ovl_En_Ru2_new 2020-03-24 00:30:09 -04:00
Ethan Roseman
2fcc450890
Merge branch 'master' into ovl_Bg_Spot09_Obj 2020-03-24 00:20:17 -04:00
Ethan Roseman
c4bb9bed4c Done 2020-03-24 00:16:01 -04:00
dark-samus
94e4c2b91f fix final non-matching in fault_drawer.c 2020-03-23 19:46:07 -04:00
Roman971
c2b9feb5d3
Merge pull request #27 from ethteck/ovl_Bg_Haka_Megane
Decompiled ovl_Bg_Haka_Megane
2020-03-23 23:19:57 +01:00
fig02
78a4684e32
Merge pull request #28 from Roman971/z_path.c
Rename/document some small files and Decompile z_path.c
2020-03-23 18:09:18 -04:00
Ethan Roseman
4ab558d628 Almost done 2020-03-23 17:33:12 -04:00
KrimtonZ
0d93e48035 skelanime WIP, name Matrix_TranslateThanRotateZYX, match Matrix_Translate 2020-03-23 16:31:24 -05:00
Roman971
7fcc79fc4d Decompile Path_CopyLastPoint 2020-03-23 21:20:30 +01:00
Roman971
e88ea64835 Decompile Path_OrientAndGetDistSq 2020-03-23 21:19:54 +01:00
Roman971
a9d4fec113 Decompile Path_GetByIndex 2020-03-23 21:19:24 +01:00
Roman971
d2729f9d88 Split z_path.c and Rename some small files and functions 2020-03-23 21:18:53 +01:00
shawlucas
ae0401e310 Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Bg_Zg 2020-03-23 12:10:17 -07:00
Ethan Roseman
c79cbf7d9c Merge branch 'master' into ovl_Bg_Haka_Megane 2020-03-23 14:43:28 -04:00
fig02
1ea7fe8165 merge master 2020-03-23 06:57:38 -04:00
dark-samus
7db0ed672a remove asm for Yaz0_DecompressImpl 2020-03-23 06:54:52 -04:00
Lucas Shaw
6a45dcba7f Fixed merge conflict 2020-03-22 22:57:24 -07:00
Lucas Shaw
8c99bdd00f ovl_Bg_Zg OK 2020-03-22 22:55:05 -07:00
Ethan Roseman
4c3b764461 Almost done 2020-03-23 01:31:03 -04:00
fig02
8cd9a881d0 fire arrow progress 2020-03-22 23:10:37 -04:00
fig02
d879f2acb0
Merge pull request #24 from Roman971/non-matchings
Fix remaining non matchings and Update progress script
2020-03-22 23:08:37 -04:00
Roman971
64b5536ab8 Fix remaining non matchings 2020-03-23 01:38:31 +01:00
Ethan Roseman
80bced5204 Decompiled ovl_Bg_Gate_Shutter 2020-03-22 17:56:08 -04:00
Ethan Roseman
4600faad8b 5 to go 2020-03-22 16:40:08 -04:00
Roman971
b372169893
Merge pull request #22 from Random06457/master
Decompiled z_sample.c
2020-03-22 20:04:39 +01:00
glank
d7b0ba7c06 Merge branch 'master' into z_en_tk 2020-03-22 18:43:40 +01:00
Random
bd00e0d1da Decompiled z_sample.c
`z_sample.c` : 1 non matching left
2020-03-22 17:37:38 +01:00
shawlucas
f581128e6b Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Bg_toki_swd 2020-03-21 20:38:59 -07:00
fig02
a3bac9fbb2
Merge pull request #17 from glankk/code_800FCE80
code_800FCE80 OK
2020-03-21 21:46:44 -04:00
fig02
8057d95195
Merge pull request #20 from ethteck/ovl_Demo_Geff
Decompiled ovl_Demo_Geff
2020-03-21 21:42:02 -04:00
shawlucas
08b73fe685 fixed merge conflict 2020-03-21 18:14:17 -07:00
Roman971
f0026cee24
Merge pull request #16 from fig02/en_dog
en_dog OK
2020-03-22 00:46:28 +01:00
Ethan Roseman
05a6cee5f5 Migrated rodata 2020-03-21 19:31:43 -04:00
Ethan Roseman
bb5ce4a656 Finished 2020-03-21 17:33:39 -04:00
shawlucas
9a04a76296 ovl_bg_toki_swd OK 2020-03-21 14:30:05 -07:00
Lucas Shaw
f374ac8d2b started ovl_bg_toki_swd 2020-03-21 11:54:45 -07:00
Ethan Roseman
61a32a5820 1 more down, slight documentation 2020-03-21 14:27:58 -04:00
glank
fa4c848cad Merge branch 'master' into z_en_tk 2020-03-21 12:31:29 +01:00
Ethan Roseman
31deeb865b Merge branch 'master' into ovl_Demo_Geff 2020-03-21 03:16:37 -04:00
Ethan Roseman
3e8c79c670 More 2020-03-21 03:16:18 -04:00
glank
0cf75356a5 code_800FCE80 OK 2020-03-21 03:43:48 +01:00
fig02
8e60e7d101 Merge remote-tracking branch 'upstream/master' 2020-03-20 21:53:58 -04:00
Random
1fe00fcce1 Changes in PR #15 (2)
- Documented z_msgevent.c
2020-03-20 17:15:39 +01:00
Random
8779aaa758 Decompiled various small files
- Decompiled `code_8006C360.c`
- Decompiled `prenmi_buf.c` (previously `code_8007BE60.c`)
- Decompiled `code_8007BF10.c`
- Documented `sys_ucode.c`
2020-03-20 15:26:43 +01:00
fig02
ea075560c8 merge bombiwa 2020-03-20 08:25:26 -04:00
fig02
9c9ad6160b
Merge pull request #13 from Thar0/ovl_Obj_Bombiwa
Decompiled ovl_Obj_Bombiwa
2020-03-20 08:22:53 -04:00
fig02
aa603ca229 merge and change scene thing 2020-03-20 08:17:48 -04:00
fig02
f3b509eb68 en_dog OK 2020-03-20 08:04:35 -04:00
Ethan Roseman
78c14f7fad More progress 2020-03-20 02:20:55 -04:00
fig02
a6bad6ab70
Merge pull request #11 from wedarobi/master
Decomp z_lib.c
2020-03-19 22:13:17 -04:00
Thar0
f263ce0b9c Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Obj_Bombiwa 2020-03-20 00:52:28 +00:00
Thar0
adbcbb6434 Decompile Obj_Bombiwa 2020-03-20 00:50:20 +00:00
Roman971
c0965dcbe6
Merge pull request #5 from mzxrules/z_debug
z_debug.c
2020-03-20 01:44:59 +01:00
Ethan Roseman
2d00e319fe Merge branch 'master' into ovl_Demo_Geff 2020-03-19 20:07:08 -04:00
Ethan Roseman
db822f7d0f More 2020-03-19 20:06:46 -04:00
Roman971
9f434ad733
Merge pull request #12 from Random06457/master
Decompiled z_title.c
2020-03-20 01:01:21 +01:00
Random
c931cd5837 Decompiled z_title.c
`z_title.c` : matching
2020-03-19 23:29:33 +01:00
wed
a01f868a1a Finish z_lib.c 2020-03-20 08:48:38 +11:00
glank
86c4472662 ovl_En_Tk OK 2020-03-19 13:01:17 +01:00
Faschz
b0e6f3b698 Decompiled ovl_En_Lightbox 2020-03-18 20:12:13 -05:00
Roman971
85237605e2 Fix and cleanup ovl_En_Tubo_Trap (4/7 matched) 2020-03-18 21:22:00 +01:00
Roman971
373dc7d2d8 Fix ovl_Demo_Go non matchings (2/3 matched)
`z_demo_go.c` is now functionally equivalent and almost fully matched.

Note that I added a Vec3i struct in `z64actor.h` now used in `CsCmdActorAction`.

Also fixed some missing VT codes in various actor strings.
2020-03-18 21:21:45 +01:00
Thar0
97538a2f14 ovl_Door_Ana OK 2020-03-18 14:59:46 +00:00
mzxrules
32fe030b42 new repo, OK++ 2020-03-18 10:27:49 -04:00
Roman971
76eb52ab52 Various fixes/matches
- Matched all remaining functions in `__osMalloc.c`, 2 functions in `code_8007BF90.c`, 1 in `code_800A9F30.c`, 2 in `fault.c`, 1 in `fault_drawer.c`, 1 in `gfxprint.c`, 2 in `z_camera.c`
-  Improved most other remaining non matchings to ensure they are actually equivalent and to get them closer to matching
- Added a `alloc.h` header file in the process of working on `fault.c` non matchings
- Decompiled `padmgr.c` data/bss in order to improve padmgr non matchings
- Removed unused `z_en_wallmas.c` data files
- Moved functions confirmed to be in `z_cheap_proc.c` to their own file with that name
2020-03-18 01:09:31 +01:00
Ethan Roseman
6fc191b45b Migrated rodata 2020-03-17 16:33:41 -04:00
Jack Walker
087f561f77 First proper commit. 2020-03-17 00:31:30 -04:00