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

699 commits

Author SHA1 Message Date
Roman971
2c5ad24c3f
Migrate z_common_data.c's .bss to C (#157) 2020-05-26 08:50:51 -04:00
Random
3d050f2861
Decompile a bunch of small files (#160)
* Decompile a bunch of small files

* Rename dacrate to dacRate

* Run format.sh

* Minor fixes in PR #160
2020-05-25 23:18:14 +02:00
gamestabled
13b1dc03bb
EnHintnuts OK (#154)
* merged from upstream

* matching

* named functions

* made suggested changes
2020-05-24 04:30:24 -04:00
Blackop778
e6b00f03bf
Decompile en_guest (#151)
* Start work on ovl_En_Guest

* Match func_80A5046C and func_80A50518

* Everything but func_80A509D4 matches

* Match last function, cleanup, rename stuff

* Run formatter

* Temp didn't need to be used

* I should have ran the formatter again

* Use tcrf translation for debug string

* Apply suggestions from code review

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>

* Rename  references to function  and fix semicolon

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>

* PR Suggestions

* More comments

Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2020-05-23 04:21:36 +02:00
Random
89b0977e39
Decompile code_8008E6A0.c / Add CHECK_PAD macro (#156)
* Decompile code_8008E6A0.c

* Delete "counter" file
2020-05-22 08:33:10 -04:00
krimtonz
9a478a96ec
Decompiles Overlay_DoRelocation (#149)
* decompile Overlay_DoRelocation

* add non-matching comments
2020-05-20 08:53:42 -04:00
Tharo
43dfaa7518
Create Macros for Cutscene Data (#63)
* Added additional (potentially unused) fields to macros, now builds OK

* Ran formatter, attempted better macro formatting

* Formatted unknown fields as hex, further cleanups

* Rename and prefix macros, use command base macros, format cutscenes with indents

* Move command macros into a new file and include it globally

* Generate cutscene command macros for Bg_Toki_Swd, Cleanups

* Rename CS_TEXTBOX commands to CS_TEXT, fix typo ic command_macros_base.h

* Introduce CS_CMD_CONTINUE and CS_CMD_STOP

* Remove apparently redundant arguments in certain commands, include the values in the macros directly

* Re-add cutscene terminator destination enum values to example cutscene data

* Format what should be floats as hex, Change actorAnim to actorAction

* Allow floating-point representation of values in cutscene data (asm-processor hack)

* Include cutscene commands only where necessary, documentation fixes

* Rename actor actions to npc actions, separate player action from npc actions

* Remove PlayerActionIDs for now as relevant information on it is not yet decompiled

* Generate cutscene data for en_ru1, remove apparent redundancies in CS_LIGHTING and CS_PLAY/STOP/FADE_BGM commands, relax static requirement in asm-processor CutsceneData float conversion
2020-05-20 07:37:28 -04:00
Roman971
2bccbe7679
Remove unused asm files (#150) 2020-05-20 07:01:23 -04:00
Tharo
5df0e9b6f8
Decompile some more of z_player_lib (#137)
* Progress on z_player_lib, Named fields in Player struct

* More functions decompiled

* Matched another function

* A few more functions

* Ran formatter

* Rename some variables and add comments where appropriate, change types of unknowns

* Create PlayerActionFunc type

* Fix uncaught syntax error and issues from effects merge

* Rename invincible to invincibilityTimer, refactor long comments in Player struct

* Properly rename all occurences of invincibilityTimer
2020-05-19 20:15:48 -04:00
krimtonz
b8b334f90a
Decompiles fcurve_skelanime, code_8006C510, and actor MagicWind (#135)
* decompile z_fcurve_skelanime and code_8006C510

* format

* Decomp Magic_Wind

* PR Updates

* add space between ActorFunc and MagicWindFunc

* missing pr updates
2020-05-19 16:27:25 -04:00
Roman971
c599318a17
Improve and fix some non matchings (#148) 2020-05-19 15:55:49 -04:00
Roman971
e29b77919b
Decompile most effect files in "code" (#144)
- `z_effect`: Matched and essentially all documented.
- `z_eff_spark.c`: Decompiled (1 non matching left) and mostly documented.
- `z_eff_shield_particle.c`: Matched and mostly documented.
- `z_eff_blure.c`: Decompiled (5 non matchings left) and partially documented.
- `z_effect_soft_sprite.c`: Matched and mostly documented.
- `z_eff_ss_dead.c`: Matched but not documented.
- `z_effect_soft_sprite_dlftbls.c`: "Matched" (only data, contains the effect ss overlay table).
- `z_effect_soft_sprite_old_init.c`: Not decompiled, but functions are categorized by effect ss overlay. And they should be decompiled at the same time as their corresponding effect ss in the future.

Other changes:
- Added a lot of types/enums to `z64effect.h`and moved+renamed some structs from `z64.h` to this header
- Added effect ss overlay segments to `segment_symbols.h` and effect ss init vars to `initvars.h`
- Added a macro called `VTX_T` to generate a `Vtx_t` in the same style as `VTX`
- Fixed `flg_set.c` .bss to be in the right file
- Removed `tools/overlayhelpers/batchdisasm` since it's no longer relevant
- Removed unused leftover asm from recent PRs
2020-05-18 14:24:00 -04:00
Zelllll
785011c33c
Decompile En_Dha (#130)
* Decompile En_Dha

* Removed original reloc data and fixed actor struct

* Update z_en_dha.c

- Removed unnecessary line breaks
- Changed `colliderSphere` to `collider` and `colliderSphereItem` to `colliderItem`
- Removed unnecessary & pointers
- Renamed various functions

* Update z_en_dha.h

Changed collider names

* Fixed all issues with `En_Dha`

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Dha/z_en_dha.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* All suggested changes applied

* Update z_en_dha.c

Fixed unresolved changes that were marked as resolved. Whoops!

Co-authored-by: Zelllll <elijah@DESKTOP-QDIECM7.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-18 04:34:34 -04:00
Random
b9999bbb13
Decompile code_800E6840.c / osAiSetNextBuffer.c (#143)
* Decompile code_800E6840.c / osAiSetNextBuffer.c

* move status' assignment outside the condition
2020-05-16 15:31:35 +02:00
Tharo
63985a0011
Rename variables in code_800FD970 (#142)
* Decompile code_800FD970

* Comment cleanups, ensure formatter won't cause a matching issue later

* Make code_800FD970 variables static and rename

* Delete data and bss asm files
2020-05-15 18:53:58 -04:00
Tharo
47e25298a0
Decompile code_800FD970 (#141)
* Decompile code_800FD970

* Comment cleanups, ensure formatter won't cause a matching issue later
2020-05-15 13:58:14 -04:00
Random
82b464b864
remove game.s (#140) 2020-05-15 05:14:38 -04:00
Random
1a51ad5944
Decompile z_vr_box_draw.c (#138)
* Decompile z_vr_box_draw.c

* Rename vrbox to skybox

* run format.sh
2020-05-15 05:14:07 -04:00
Random
d556999b2b
Decompile remaining z_vis... files (#131)
* Decompile z_vismono.c / code_800AD920.c

- z_vismono.c: OK
- code_800AD920.c: OK

* Minor fixes in PR #131
2020-05-15 05:02:39 -04:00
Ethan Roseman
461525b40c
Resolve last NON_MATCHING in Oceff_Storm (#139) 2020-05-15 04:59:09 -04:00
Ethan Roseman
d35a47e044
Decompiled ovl_Bg_Hidan_Kousi (#136) 2020-05-14 19:42:26 -04:00
krimtonz
44ffb7ec62
Decomp game.c (#129)
* decomp most of game.c

* improve GameState_DrawInputDisplay matching

* fix merge conflicts

* pr suggestions

* remove builtin math functions
2020-05-14 19:11:33 -04:00
Synray
efa9742984
Match Audio_NoteSetVelPanReverb (#132) 2020-05-14 15:25:54 -04:00
mzxrules
23ad9cec33
Fix GenColliderInit bugs, add filemap.py for mapping rom/vram addresses (#133) 2020-05-14 15:25:32 -04:00
fig02
2a7bdc5c28
en_fu OK (#126)
* 1 function left

* 1 function left

* en_fu OK, still need to document

* en_fu OK

* spec comment

* remove asm files

* clang and final fixes

* fix floormas formatting things

* pr suggestions

* pr suggestions 2
2020-05-13 21:18:45 -04:00
Random
08d9fee6e4
Decompile speed_meter.c and add VIEWPORT_INIT macro (#127)
* Decompile speed_meter.c and add VIEWPORT_INIT macro

- speed_meter.c: OK
- Add VIEWPORT_INIT(viewport, by, rx, ty, lx) macro

* get rid of some magic numbers

* use early return instead of a big if block in SpeedMeter_DrawTimeEntries
2020-05-12 23:05:55 -04:00
Tharo
74a654ecae
Decompile audioMgr (#124)
* Decompile most of AudioMgr

* Decompile most of audioMgr

* Decompile audioMgr

* Remove commented out rodata from spec

* Small cleanup

* Last function OK, renamed functions and removed asm

* Remove sched.h and audiomgr.h and include contents in z64.h

* Un-comment prototypes in functions.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Remove prototypes from audioMgr.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-10 20:04:41 -04:00
Lucas Shaw
8e7ca2d497
35/37 Functions Decompiled in ovl_En_Heishi2 (#117)
* started

* did more work

* did some more

* Update

* Merged master

* EnHeishi2_Update OK

* func_80A549E8 OK

* func_80A54954 OK

* EnHeishi2_Draw OK

* Removed unused asm

* func_80A543A0 OK

* func_80A53638 OK. Fixed type of func_8008F08C

* done for rn, will work on it later

* func_80A53850 OK

* func_80A53F30 OK

* func_80A53D0C OK

* Made cylinderInit in En_Ma3 static

* Made suggested changes. Removed return from functions by adding else

* Made suggested changes. Removed a.out file that accidentally got added

* Made suggested changes

* moved #include <vt.h> from header to c file

* fixed formatting

* added line break

* Made suggested changes

* ran format

* Fixed unk_2F2
2020-05-10 19:44:04 -04:00
Lucas Shaw
7d7c851289
ovl_En_Heishi3 OK (#121)
* almost done with heishi3

* heishi3 ok

* Added function names to heishi3

* EnHeishi3 OK

* Made some suggested changes. Still have questions about others

* Made suggsted changes

* fixed formatting

* fixed formatting
2020-05-10 19:19:27 -04:00
Random
3e5ed389b9
Decompile the remaining Oceff actors + Add ichaindis.py (#125)
* Decompile the remaining Oceff actors + Add ichaindis.py

- z_oceff_spot.c: OK
- z_oceff_storm.c : 1 non-matching left
- Add ichaindis.py

* Rename SetActionFunc to SetupAction + Add Actor descriptions

* Minor fixes in PR #125
2020-05-10 13:09:26 -04:00
Random
40836f5d82
Decompile z_oceff_wipe (#122)
* Decompile z_oceff_wipe

- z_oceff_wipe: OK
- z_oceff_wipe2: OK
- z_oceff_wipe3: OK
- z_oceff_wipe4: OK
- Add patched libmalloc to ido 7 to prevent segfaults
- Add CUR_CAM macro

* Rename CUR_CAM to ACTIVE_CAM

* Fixes in PR #122
2020-05-09 16:58:02 -04:00
Ethan Roseman
4c68c61df5
Fixing Dockerfile (#123) 2020-05-07 23:58:42 -04:00
krimtonz
0ebe904d0c
En_Floormas OK (#97)
* EnFloorMas wip

* floormaster formatting

* floormaster wip

* ovl_En_Floormas OK

* pr recommendations

* pr updates
2020-05-07 19:18:09 -04:00
Roman971
5acc4e2f66
Fix some jump table labels being treated as separate functions (#120) 2020-05-06 14:56:35 -04:00
Roman971
f7187808bc
Fix BSS of 2 actors to avoid hardcoded increments in the spec (#119) 2020-05-05 19:09:57 -04:00
Roman971
1425678d8a
More actor cleanup Part 3 (#118)
* Add custom types for actor specific functions (like actions)

* Add a forward struct declaration for all other actors
2020-05-05 18:53:15 -04:00
Roman971
f114df8929
More actor cleanup Part 2 (#116)
* Change all main actor functions to take a 'Actor* thisx' argument

* Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 15:02:51 -04:00
zelda2773
8efddb0fe0
Decompiled ovl_Bg_Ddan_Kd (#110)
* Decompiled ovl_Bg_Ddan_Kd

* ovl_Bg_Ddan_Kd renamed arguments
2020-05-04 14:29:53 -04:00
Ethan Roseman
713de9b942
Decompiled ovl_En_Cow (#113)
* Beginning the Cow

* Decompiled ovl_En_Cow

* Giving the cow milk
2020-05-04 12:11:37 -04:00
Ethan Roseman
ca20f56c09
Decompiled ovl_En_Ma3 (re-created) (#114)
* Decompiled ovl_En_Ma3

* PR suggestions
2020-05-04 12:03:12 -04:00
Nathan Faltermeier
a65554d586
Decompile most of ovl_En_Horse_Ganon (#108)
* Work on horse ganon

* Match destroy, init matches but need mv data -> .c

* Match EnHorseGanon_Draw and func_80A68E14

* Move some data to .c

* Decomp func_80A68870

* EnHorseGanon_Update nearly matches

* func_80A68FA8 and func_80A686A8 match

* Fix EnHorseGanon_Init, start on func_80A68B20

* match func_80A68B20

* Migrate data but something doesn't match

* Matches with migrated data, fix most warnings

* Rename some variables, some clean up

* A little more cleanup before PR

* Move commented out code to NON_MATCHING blocks

* Run formatter and delete unused line, char -> u8

* Update function was matched
Also imports another type from z_skin.Seeing as they are somewhat
tentative I decided not to put them in any global file.

* Update src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>

* PR Changes

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* PR Changes round 2

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-05-04 11:43:04 -04:00
Roman971
10d45ed7ea
Fix offset and size comments in collision_check structs (#115) 2020-05-04 07:04:32 -04:00
Roman971
e4846409f9
Fix non matchings in En_Item00 and En_A_Obj (the 2 "code" actors) (#112) 2020-05-03 17:04:11 -04:00
Roman971
e36015837b
Rename effects ss C files to z_eff_ss_* instead of z_effect_ss_* (#109)
Just rectifying effect files to their correct original names, which was planned for a while.
2020-05-02 00:05:44 -04:00
Roman971
3ca6082084
More actor cleanup Part 1 (#107)
* Fix naming and structs in z_en_item00.c and z_en_a_keep.c

* Decompile init vars in z_en_item00.c and z_en_a_keep.c

* Create missing .h files for the last few actors

* Fix some collider member names in actor structs

* Fix old actors not properly using "actionFunc" / "SetupAction"

* Remove some local temporary actor structs

* Fix some actor header includes to be absolute instead of relative
2020-05-01 14:26:16 -04:00
Roman971
2b38920d7e
Update README with "qemu-irix" instead of "qemu-irix.zip" (#106) 2020-05-01 13:19:40 -04:00
Lucas Shaw
1be400f5c4
Fixed misspelling of circle in z_fbdemo_circle.c (#105) 2020-05-01 13:15:10 -04:00
Roman971
9f98210488
Decompile z_map_exp.c (2 non matchings left) (#104)
Also documented the map data table (not decompiled yet however), and added a DungeonItem enum to use with gSaveContext.dungeonItems reads/writes.
2020-05-01 11:09:20 -04:00
Roman971
9f1c996db5
Remove unused asm left recently (#103) 2020-05-01 07:21:01 -04:00
Ethan Roseman
363d5d4194
Decompiled ovl_En_Ma2 (#93)
* first steps

* some more

* fixing merge

* more progress

* progs

* Decompiled ovl_En_Ma1

* newline

* Pr suggestion

* 2 to go

* Makefile machinery work

* Updating Jenkinsfile

* Initial setup for OSX repo support

* Adding ido7 to repo

* Makefile reversion

* Iniital Dockerfile

* iconv fix

* Docker stuff

* Dun

* Fixing stuff

* Updating Dockerfile

* Update README-OSX.md

* Restore functions.h

* Formatting

* Defining some funcs

* Renaming funcs

* Removing unnecessary README-OSX

* Addressing PR comments
2020-05-01 06:08:39 -04:00