1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 21:40:03 +00:00
Commit graph

988 commits

Author SHA1 Message Date
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
Roman971
4932e93ba2
Decompile 2 small files (code_8006BA00.c and code_8006C3A0.c) (#101)
* Decompile code_8006C3A0.c (handling "env" flags)

* Decompile code_8006BA00.c (handling sound sources)
2020-04-30 22:00:39 -04:00
Roman971
d0ba37b148
Various makefile improvements (#99)
- Find file and directories automatically, which removes the need for explicit listing and .mk files
- Rename OPTIMIZATION to OPTFLAGS for consistency with other variables
- Reorder some lines to make the file easier to work with
- Remove the recipe for asm/overlays/ going through iconv, which is no longer necessary
2020-04-30 21:49:35 -04:00
Roman971
9bb151006a
Add installation instructions to the README (+ minor improvements) (#100) 2020-04-30 21:47:42 -04:00
krimtonz
5525365f7f
Decompiles most FBDemo and transition functions (#92)
* Decompile fbdemo (transition) files

* run format.sh

* reformat vtx array, fill in a couple unk

* match TransitionTriforce_IsDone

* add VTX macro, add DW_ wrapping around triangle macros

* use new VTX macro, name graphic assets

* Naming updates

* pr updates

* naming updates

* remove symbols for COLOR_BUFFER, D_08000000, and D_09000000
2020-04-30 14:41:09 -04:00
krimtonz
16b304d548
Split remaining z_camera files (#98)
* split func_800473A0.s

* split func_80051B3C.s

* split func_80054478

* split func_8004B5A0, match a few functions

* rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96)

* rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf

* rename Matrix_RotateRPYf to Matrix_JointPosition

* rename Matrix_RotateZYX to Matrix_RotateRPY

* extract camera floats, and jump tables

* decompile baby functions

priv_wip

wip

* rename struct_80045714 to VecSph
2020-04-30 10:49:11 -04:00
krimtonz
58e38276c6
rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf (#96)
* rename Matrix_TranslateThenRotateZYX to Matrix_RotateRPYf

* rename Matrix_RotateRPYf to Matrix_JointPosition

* rename Matrix_RotateZYX to Matrix_RotateRPY
2020-04-28 00:14:27 -04:00
Ethan Roseman
d58983494c
Decompiled ovl_En_Ma1 (#83)
* first steps

* some more

* fixing merge

* more progress

* progs

* Decompiled ovl_En_Ma1

* newline

* Pr suggestion

* Fixing some small things

* Update src/overlays/actors/ovl_En_Ma1/z_en_ma1.c

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Removing padding

* Fixing script

* Fixing some things

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-04-27 01:47:35 -04:00
Dragorn421
e126e37084
func_800418D0 and func_800417A0 in z_bgcheck.c, matching (#79)
* func_800418D0 and func_800417A0 in z_bgcheck.c, matching

* func_800417A0 cleanup

* More func_800418D0 cleanup

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-04-26 21:12:27 -04:00
krimtonz
28387947e2
vtx extractor (#94) 2020-04-26 18:14:41 -04:00
Synray
ff25b89b13
Finish code_8007BF90 (#95)
* Finish code_8007BF90

* Review changes

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-04-25 22:55:19 -04:00
mzxrules
aa91a7ee32
z_collision_check.c (#73)
* func_8005B280 ok

* func_8005B65C OK

* split out func_8005BD50

* func_8005B7C0 OK

* func_8005B7F4 OK

* func_8005B824 OK

* func_8005B860 ok

* improve sanity

* func_8005B6B0 ok, ColliderInit_Actor structs added

* func_8005B884 ok

* func_8005BBF8 ok, split out func_8005BF50

* split more stuff out of func_8005C050.s

* func_8005C050 OK

* func_8005BA30 fakish OK, func_8005BAD8 real OK

* func_8005BB48 OK, func_8005BA84 almost decomp'd, but type issues

* func_8005BB10 Ok

* func_8005BF50 OK

* func_8005BE50 OK

* func_8005BD50 OK

* func_8005BCC8 Ok

* func_8005BC28

* func_8005BB8C func_8005BBB0 func_8005BBD4 Ok

* save my work commit

* func_8005C2BC fake OK

* func_8005C5B0 ok

* func_8005C608 ok

* func_8005C6C0 ok

* func_8005C6F8 ok

* func_8005C730 ok

* func_8005C774 func_8005C798 func_8005C7BC OK

* func_8005C7E0 ok, func_8005C810 split

* func_8005C810 OK

* func_8005C8C8 ok

* func_8005C964 OK

* func_8005CA88 ok

* func_8005CBAC ok

* func_8005C124 func_8005C1AC func_8005C234 func_8005CC98 OK

* func_8005CD34 func_8005CDD0 Ok

* func_8005CE6C ok

* func_8005CEC4 ok

* func_8005CEDC ok

* func_8005CF90 Ok

* standardize type names/vars more

* func_8005D3BC ok

* func_8005D40C OK, z64.h CollisionCheckContext

* func_8005D4B4 func_8005D4C8 ok

* partial data section migration

* improve function documentation, OT->OC

* Actor_CollisionCheck_SetOC ok

* Actor_CollisionCheck_SetAT Actor_CollisionCheck_SetAC Ok

* func_8005BA84 ok

* func_800611A0 ok

* func_80061274 ok

* clean up func_80061274

* func_8006139C ok

* func_8005E9C0 and dependencies OK

* minor cleanup to func_8005E9C0

* func_8005EC6C OK!

* func_8005E81C ok

* func_8005E604 ok

* func_8005E2EC func_8005E4F8 OK

* func_8005DE9C OK func_8005D8AC disassembled

* func_8006146C func_8006268C ok

* func_8005EEE0 ok

* func_8005F17C

* func_8005F39C ok

* func_8005F5B0 decompiled, not matching

* func_8005F7D0 decomp, func_8005D218 and func_8005D324 OK

* func_8005FA30 ok, split more functions

* func_8005FC04 ok

* func_8005FDCC k

* func_8005FF90 OK OK OK

* func_80060204 dead

* func_800604B0 ok

* func_80060704 func_80060994 ok, func_80060C2C somewhat disassembled. AT to AC matrix doneish

* func_800635D0 ok, func_80062ECC not so much

* OcLine oks

* D_8011DF28 functions disassembled

* D_8011DF5C functions OK

* setAT_SAC. setAC_SAC, setOC_SAC OK

* func_80061C98 decompiled, func_80061BF4, func_80061C18 OK

* func_800617D4 ok, func_800614A4 disassembled

* CollisionCheck_OC D_8011DFAC functions OK

* func_80062530 ok

* CollisionCheck_generalLineOcCheck subfunctions OK

* func_800622E4 ok

* after a long fought battle, func_80061F64 has fallen.

* func_800628A4 disassembled

* func_800627A0 func_8006285C OK

* ActorCollider_Cylinder_Update, func_80062718, func_80062734 ok

* func_80062CD4 decompiled, import EffShield/EffSpark types from MM

* various SubActor98 struct functions OK

* func_8005D4DC func_8005D62C ok

* .data section migrated, more OKs, fix NON_MATCHINGs to use effect structs

* func_80060C2C ok

* minor code tweaks

* func_80061C98 ok somehow

* Attempt to fix some unknowns, move types out of z64actor, add set3 ColliderInit types

* Apply changes

* formatting

* tweak a couple function names

* krim changes, func naming

* missed some things

* function renames

* Implement GenColliderInit.py utility

* Implement pr changes, GenColliderInit.py, DamageTable.py, z_collision_btltbls.c fully matching

* func_800614A4 ok

* Implement Roman's fixes, name Collider unknowns, rename COLTYPE -> COLSHAPE and define new COLTYPE

* collisionCheckCtx -> colChkCtx, fix small things
2020-04-25 22:43:35 -04:00