mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-04 16:55:56 +00:00
Code Issues Projects Releases Wiki Activity
484 commits 1 branch 0 tags 471 MiB
Commit graph

250 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
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
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
fig02
a45e7920bc
Merge pull request #60 from gamestabled/ovl_En_Ani 
ovl_En_Ani
 2020-04-10 16:48:40 -04:00
chandler
4c8ff91da7 made suggested changes 2020-04-09 00:10:43 -04:00
Random
0c0c15018f Run format.sh 2020-04-08 18:45:50 +02: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
chandler
81cad9fe7d made limbIndex decimal 2020-04-07 23:50:08 -04:00
chandler
2b8bc8ce6d made suggested changes 2020-04-07 23:39:10 -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
2bf2cef35e small change in firewall.h 2020-04-07 11:51:12 -04:00
chandler
e14b6eefec made recently suggested changes 2020-04-07 11:03:10 -04:00
chandler
fa7874137b matching 2020-04-07 10:57:04 -04:00
chandler
83caab6e68 simplified a float 2020-04-06 17:31:24 -04:00
chandler
bd23567bfd a couple more suggestions 2020-04-06 17:08:24 -04:00
chandler
9864211cdc made suggesed changes 2020-04-06 16:41:05 -04:00
chandler
0265ad21c0 merge with upstream 2020-04-06 14:38:23 -04:00
chandler
78c65878ed more fixing PR 2020-04-06 03:19:13 -04:00
chandler
553329a9e6 reverting en_ani to PR firewall (im a git noob) 2020-04-06 03:15:25 -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
Gamestabled
dda2641082 begain work on EnAni 2020-04-06 03:05:47 -04:00
Gamestabled
e5a5f0a46d changed some names 2020-04-06 03:05:39 -04:00
Gamestabled
1eb36220e5 6 functions matching 2020-04-06 03:05:33 -04:00
glank
6b04aba0ea Tidy up known render and combine modes 2020-04-05 23:40:06 +02: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
Ethan Roseman
653f067d14
Update src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c 
Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-04-05 11:54:00 -04:00
Ethan Roseman
53a43cf5ed
Update src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c 
Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-04-05 11:53:47 -04: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
220a1a5840 Naming the initChain 2020-04-04 22:52:54 -04:00
Ethan Roseman
546811bba8 Decompiled ovl_Bg_Spot12_Saku 2020-04-04 22:48:30 -04:00
Random
168d90b6b0 Add log macros 
- Add log macros required to match `Graph_GetNextGameState`
 2020-04-04 19:28:53 +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
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
09f430240b Made suggested changes 2020-04-02 10:11:31 -07:00
shawlucas
c218f38635 Fixed merge conflict 2020-04-02 09:40:01 -07:00
fig02
999044cdcd
Merge pull request #45 from zelda2773/master 
Decompiled ovl_Obj_Comb
 2020-04-02 12:15:38 -04:00
shawlucas
2a1bf81765 Removed NULL from dlist tables. Found out it was just padding 2020-04-01 17:40:56 -07:00
shawlucas
64b66029ad Merge branch 'ovl_Bg_Spot05_Soko' into en_tana 2020-04-01 17:28:25 -07:00
shawlucas
45ce20a6e0 Decompiled ovl_Bg_Spot05_Soko 2020-04-01 17:28:00 -07:00
shawlucas
9f35711e8f Made suggested changes 2020-04-01 14:57:57 -07:00
shawlucas
a40827fc25 Merge branch 'master' of https://github.com/zeldaret/oot into en_tana 2020-04-01 14:35:00 -07:00
shawlucas
76bc423dd3 Decompiled ovl_En_Tana, ran format.sh 2020-04-01 14:34:48 -07:00
KrimtonZ
495582cc94 Merge branch 'master' into skelanimeupdates 2020-04-01 14:05:17 -05:00
ProjectRevoTPP
9008b30046 remove unneeded comments 2020-04-01 13:30:26 -04:00
zelda2773
a62877a543 Merge remote-tracking branch 'upstream/master' 2020-04-01 13:19:43 -04:00
ProjectRevoTPP
b3f92538ad Merge branch 'master' of https://github.com/zeldaret/oot into fix_spot15_saku 2020-04-01 13:14:27 -04:00
ProjectRevoTPP
c40c29dd8f fix remaining nonmatchings in z_bg_spot15_saku 2020-04-01 13:14:15 -04:00
KrimtonZ
25dcb73520 Merge branch 'master' into skelanimeupdates 2020-03-31 20:59:51 -05:00
KrimtonZ
75f570f4ac skelanime wip 2020-03-31 18:29:09 -05:00
zelda2773
5059e623fb ovl_Obj_Comb renamed functions and variables 2020-03-31 10:13:21 -04:00
fig02
6ec73a5f1c fix merge issues 2020-03-31 05:07:23 -04: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
zelda2773
730b788f6e ovl_Obj_Comb add header 2020-03-31 00:03:53 -04: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
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
daa7877c96 pr changes 2020-03-30 14:52:06 -04:00
fig02
9cb03972af fix clang formatting change 2020-03-30 06:04:36 -04:00
fig02
dd0541751c Merge remote-tracking branch 'upstream/master' into elemental-arrows 2020-03-30 05:52:27 -04:00
fig02
d8cd8450c4 clang 2020-03-30 05:31:08 -04:00
fig02
ea7aebc731 arrow_light OK 2020-03-30 05:25:53 -04:00
fig02
da159ec528 arrow_ice OK 2020-03-29 12:47:58 -04:00
Roman971
f5ffe8687d Decompile z_rcp.c (1 non matching left) 2020-03-29 18:47:38 +02:00
fig02
7cc6b00fac fire arrow ok 2020-03-29 05:23:40 -04: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
8a45d9ec25 Format 2020-03-27 17:05:08 -04:00
zelda2773
6e2872ba6c Fixed floats in ovl_En_Ds 2020-03-27 16:26:10 -04:00
zelda2773
4621e066a9 More fixes 2020-03-27 13:28:14 -04:00
zelda2773
a754e399d0 Minor fix 2020-03-27 10:46:32 -04:00
zelda2773
1dc2b8b576 Changed line spacing 2020-03-27 10:37:04 -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
Ethan Roseman
ab7b0a50ab PR comments 2020-03-26 19:33:39 -04:00
zelda2773
1b347f247a Made suggested changes 2020-03-26 10:15:13 -04:00
fig02
3c9fe35311 fire arrow progress 2020-03-26 04:36:10 -04:00
zelda2773
c52cb091ab Bg_Gjyo_Bridge OK 2020-03-26 01:22:08 -04:00
Ethan Roseman
b646d535f3 tiny change 2020-03-25 19:01:43 -04: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
Ethan Roseman
73cc2073fd
Update src/overlays/actors/ovl_En_Ru2/z_en_ru2.c 
Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-03-25 17:34:38 -04:00
Ethan Roseman
5510186f98 newline 2020-03-25 13:53:20 -04: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
18676c531d set types for more segment addresses 2020-03-25 10:59:49 -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