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
1117 commits 1 branch 0 tags 464 MiB
Commit graph

904 commits

Author SHA1 Message Date
Ethan Roseman
1042a72fd2 Done 2020-03-23 15:23:50 -04:00
shawlucas
ae0401e310 Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Bg_Zg 2020-03-23 12:10:17 -07:00
shawlucas
3c53052726 updated ovl_bg_zg formatting 2020-03-23 12:10:06 -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
385f77fb48 match the final non-matching in boot! 2020-03-23 06:37:54 -04:00
Lucas Shaw
a3ba02618b Added description 2020-03-22 23:40:12 -07:00
Lucas Shaw
6a45dcba7f Fixed merge conflict 2020-03-22 22:57:24 -07:00
Lucas Shaw
62e7a8c037 formatting fix 2020-03-22 22:55:37 -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
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
Ethan Roseman
1876dc0c5c UNK_PTR->UNK_TYPE 2020-03-22 21:05:09 -04:00
Ethan Roseman
5f3db569f9 else if 2020-03-22 20:39:12 -04:00
Roman971
64b5536ab8 Fix remaining non matchings 2020-03-23 01:38:31 +01:00
Ethan Roseman
9408bc0770 clang-format 2020-03-22 19:32:28 -04:00
Ethan Roseman
6b84b3e2b2 +x on format.sh, header brace fix 2020-03-22 19:28:20 -04:00
Ethan Roseman
ab976edca4 Merge branch 'master' into ovl_Bg_Gate_Shutter 2020-03-22 19:21:39 -04:00
Ethan Roseman
0f7cc04f43 Removed header padding 2020-03-22 17:57:28 -04:00
Ethan Roseman
80bced5204 Decompiled ovl_Bg_Gate_Shutter 2020-03-22 17:56:08 -04:00
Roman971
51290f6126 Partially format header files 2020-03-22 22:50:15 +01:00
Roman971
8cfe7cce9f Format all src C files 2020-03-22 22:20:03 +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
Random
0db4629a63 Update PR #22 
minor fixes
 2020-03-22 19:32:44 +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
shawlucas
f581128e6b Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Bg_toki_swd 2020-03-21 20:38:59 -07:00
shawlucas
13e2c84dbf Made suggested changes 2020-03-21 20:37:35 -07: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
shawlucas
08b73fe685 fixed merge conflict 2020-03-21 18:14:17 -07:00
shawlucas
fd2dae78a2 added one space to a line 2020-03-21 18:11:02 -07:00
shawlucas
f1ae94c2f3 Made suggested changes to ovl_Bg_Toki_Swd 2020-03-21 18:08:45 -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
969c55bc29 Data 2020-03-21 19:41:04 -04:00
Ethan Roseman
7dbd4de24c Header 2020-03-21 19:20:54 -04:00
Ethan Roseman
124c93c5a9 Made suggested changes 2020-03-21 18:09:59 -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
Random
ec8889dc63 Changes in PR #19 
- Replaced old `gsDPSetOtherMode`s with gfxdis' output
- Replaced `Gwords` with `Gfx`
 2020-03-21 21:40:18 +01: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
Random
ea882fb46d Decompiled code_800ACE70.c 
`code_800ACE70` : OK
 2020-03-21 19:09:05 +01:00
glank
8bea82f041 Make variable names uglier and less readable 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
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
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
8e60e7d101 Merge remote-tracking branch 'upstream/master' 2020-03-20 21:53:58 -04:00
fig02
8c17271ca3 dogIsLost is infact a bool 2020-03-20 20:46:59 -04: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
3e764f6ed8 Changes in PR #15 
- Renamed `prenmi_buff.c` to `z_prenmi_buff.c`
 2020-03-20 18:13:47 +01:00
Random
1fe00fcce1 Changes in PR #15 (2) 
- Documented z_msgevent.c
 2020-03-20 17:15:39 +01:00
Random
bf07193791 Changes in PE #15 
- Removed `struct_8011F3F0`
- Removed old comment
 2020-03-20 15:26:44 +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
a3ddf65661 Cleanups, add trailing commas to several multi-line arrays/structs 2020-03-20 01:29:12 +00: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
wed
8a74686890 Changes 2020-03-20 11:25:53 +11:00
mzxrules
858e937519 tweak defines 2020-03-19 20:10:32 -04: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
011027bded Changes in PR #12 
- Changed `_gDPLoadTextureBlockTile` to `gDPLoadMultiBlock`
- Replaced literals with `MatrixMode` in Matrix function calls
- Changed `float`s to `f32`s
- Removed old comment
- Removed `z_title.reloc.s`
 2020-03-20 00:31:50 +01:00
Random
c931cd5837 Decompiled z_title.c 
`z_title.c` : matching
 2020-03-19 23:29:33 +01:00
mzxrules
8063249af4 changes 2020-03-19 18:06:41 -04:00
glank
8e5c9e78e4 Remove uses of VEC3_ADD 2020-03-19 23:00:39 +01:00
wed
a01f868a1a Finish z_lib.c 2020-03-20 08:48:38 +11:00
glank
d41ef6599d Responding to PR comments 2020-03-19 13:01:17 +01: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
149c8cf57e Update to sfx enum 2020-03-18 20:17:42 -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
50a0a5ff7f Cleanups, Named functions 2020-03-18 18:58:55 +00:00
mzxrules
dd4f67c3f5 convert z_debug.data 2020-03-18 12:31:36 -04:00
Thar0
44520cbba4 Remove macros include from z_door_ana.c, already included in header 2020-03-18 15:04:26 +00: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