mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 12:04:29 +00:00
Code Issues Projects Releases Wiki Activity
1140 commits 1 branch 0 tags 464 MiB
Commit graph

410 commits

Author SHA1 Message Date
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
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
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
fig02
d975d809b8
Merge pull request #51 from Thar0/z_view 
Decompile z_view.c
 2020-04-05 13:54:17 -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
62c6549eec Fixes in PR #50 (2) 
- Fix a typo
 2020-04-05 16:01:46 +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
Thar0
668d35b77f Cleanups, Use VT macros 2020-04-05 02:50:46 +01:00
Random
168d90b6b0 Add log macros 
- Add log macros required to match `Graph_GetNextGameState`
 2020-04-04 19:28:53 +02:00
Thar0
9b6cf8a92a Merge https://github.com/zeldaret/oot into z_view 2020-04-04 18:20:45 +01:00
Thar0
5dea0fd785 Decompile most of z_view 2020-04-04 18:17:56 +01:00
Random
fed29c029c Run format.sh 2020-04-04 18:38:05 +02: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
KrimtonZ
0ae9804655 run clang 2020-04-02 13:02:10 -05: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
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
fig02
340fbd5a40 adjusting sub98 init structs across actors 2020-03-31 05:00:04 -04:00
Roman971
e99b2af35a Merge branch 'master' into z_rcp 2020-03-31 10:02:59 +02:00
zelda2773
c05de00a96 ovl_Obj_Comb fix struct 2020-03-30 23:46:54 -04: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
KrimtonZ
b9f2d4c707 more skelanime wip 2020-03-30 20:12:49 -05: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
KrimtonZ
b337e1d518 Merge branch 'master' into skelanimeupdates 2020-03-30 07:03:12 -05:00
fig02
dd0541751c Merge remote-tracking branch 'upstream/master' into elemental-arrows 2020-03-30 05:52:27 -04:00
Roman971
f5ffe8687d Decompile z_rcp.c (1 non matching left) 2020-03-29 18:47:38 +02:00
Random
462c284a17 Fixes in PR #41 
- Use  VT macros in code_800D31A0.c
- Change D_8012DBC0 to false instead of 0
- Fix brace style
 2020-03-29 11:57:52 +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
6e2872ba6c Fixed floats in ovl_En_Ds 2020-03-27 16:26:10 -04:00
zelda2773
105ea6c5cd Decompiled ovl_En_Ds 2020-03-27 10:32:46 -04:00
KrimtonZ
23987fa467 minor struct updates 2020-03-26 14:03:04 -05:00
KrimtonZ
e03c7377b9 name SkelAnime struct members 2020-03-25 22:01:24 -05:00
Ethan Roseman
a4be535164 Merge branch 'master' into ovl_En_Ru2_new 2020-03-25 18:56:09 -04:00
Ethan Roseman
36119f6c65 PR suggestions 2020-03-25 18:39:51 -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
582b32d39c Fix Draw Callbacks, fix segmented address in z_en_bird 2020-03-25 11:43:11 -05:00
KrimtonZ
095924d05a clang formatting 2020-03-25 11:07:09 -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
KrimtonZ
a99840162b minor formatting updates, match func_800A4A20 2020-03-24 14:01:00 -05:00
KrimtonZ
f2c65d615b fix jenkins build errors, small prototype update 2020-03-24 13:06:15 -05:00
KrimtonZ
ee356fe203 run clang on functions.h 2020-03-24 12:29:59 -05:00
KrimtonZ
db3cfe1b61 use clang, modify z64animation.h and z64dma.h to use open braces on newline 2020-03-24 12:16:13 -05: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
KrimtonZ
0d93e48035 skelanime WIP, name Matrix_TranslateThanRotateZYX, match Matrix_Translate 2020-03-23 16:31:24 -05:00
Roman971
d2729f9d88 Split z_path.c and Rename some small files and functions 2020-03-23 21:18:53 +01:00
KrimtonZ
6072055c85 fix merge conflics 2020-03-22 20:57:25 -05:00
KrimtonZ
d136468ace Merge branch 'master' into skelanime 2020-03-22 20:35:10 -05:00
KrimtonZ
2a158f79ce skelanime WIP 2020-03-22 20:24:00 -05:00
Roman971
64b5536ab8 Fix remaining non matchings 2020-03-23 01:38:31 +01:00
Roman971
51290f6126 Partially format header files 2020-03-22 22:50:15 +01:00
Ethan Roseman
4600faad8b 5 to go 2020-03-22 16:40:08 -04:00
Roman971
251aea64ab Add comments and macros to prevent match issues with formatting 2020-03-22 21:09:54 +01:00
Roman971
b372169893
Merge pull request #22 from Random06457/master 
Decompiled z_sample.c
 2020-03-22 20:04:39 +01:00
glank
fd7c3c9e56 Responding to PR comments 2020-03-22 18:55:23 +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
fig02
a3bac9fbb2
Merge pull request #17 from glankk/code_800FCE80 
code_800FCE80 OK
 2020-03-21 21:46:44 -04:00
fig02
65213ab140
Merge pull request #19 from Random06457/master 
Decompiled code_800ACE70.c
 2020-03-21 21:43:21 -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
Roman971
f0026cee24
Merge pull request #16 from fig02/en_dog 
en_dog OK
 2020-03-22 00:46:28 +01:00
Ethan Roseman
c6a7cb2c8e Beginning 2020-03-21 19:05:38 -04:00
Ethan Roseman
61a32a5820 1 more down, slight documentation 2020-03-21 14:27:58 -04:00
Random
ea882fb46d Decompiled code_800ACE70.c 
`code_800ACE70` : OK
 2020-03-21 19:09:05 +01:00
glank
882a7ba1f5 Move Path to z64scene.h 2020-03-21 12:31:58 +01:00
glank
fa4c848cad Merge branch 'master' into z_en_tk 2020-03-21 12:31:29 +01:00
KrimtonZ
7bf1c2fb50 Merge branch 'master' into skelanime 2020-03-20 21:53:46 -05:00
KrimtonZ
96ba073f19 skelanime, wip 2020-03-20 21:51:12 -05:00
glank
0cf75356a5 code_800FCE80 OK 2020-03-21 03:43:48 +01:00
fig02
dff17518ef pr review changes 2020-03-20 20:42:57 -04:00
KrimtonZ
db5f70ad1c skelanime wip 2020-03-20 16:12:26 -05: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
225e7e9db9 fix function prototype 2020-03-20 08:21:33 -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
fig02
a6bad6ab70
Merge pull request #11 from wedarobi/master 
Decomp z_lib.c
 2020-03-19 22:13:17 -04:00
Roman971
c0965dcbe6
Merge pull request #5 from mzxrules/z_debug 
z_debug.c
 2020-03-20 01:44:59 +01:00
wed
8a74686890 Changes 2020-03-20 11:25:53 +11:00
mzxrules
858e937519 tweak defines 2020-03-19 20:10:32 -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
Faschz
6da87a9268 Omit unnecessary padding 2020-03-19 17:08:49 -05:00
mzxrules
8063249af4 changes 2020-03-19 18:06:41 -04: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
e285671a03 Fix whitespace 2020-03-18 21:26:41 -05: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
fig02
436aa85d39
Merge pull request #6 from Thar0/ovl_Door_Ana 
ovl_Door_Ana OK
 2020-03-18 16:12:05 -04:00
Thar0
97538a2f14 ovl_Door_Ana OK 2020-03-18 14:59:46 +00:00
KrimtonZ
e73ac1ed58 Adjust SkelAnime struct to 44 bytes, fix usage of SkelAnime to account for new size 2020-03-18 09:41:18 -05:00
mzxrules
32fe030b42 new repo, OK++ 2020-03-18 10:27:49 -04:00
KrimtonZ
aa2d45310d start z_skelanime.c 2020-03-17 22:15:19 -05: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
fig02
898a103b78 move en_dog progress from old repo 2020-03-17 04:38:46 -04:00
Jack Walker
087f561f77 First proper commit. 2020-03-17 00:31:30 -04:00