1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-29 08:16:11 +00:00
Commit graph

114 commits

Author SHA1 Message Date
zelda2774
d68f9893fd
audio_playback, audio_effects OK (#313)
* audio_playback.c

* format.sh

* rename functions

* Audio_SequenceChannelProcessSound

* Audio_SequencePlayerProcessSound

* Audio_GetPortamentoFreqScale

* Audio_GetVibratoPitchChange

* Audio_GetVibratoFreqScale

* Audio_NoteVibratoInit, Audio_NoteVibratoUpdate

* Audio_NotePortamentoInit

* Audio_AdsrInit

* Audio_AdsrUpdate

* Common bitfield formatting

* format.sh

* review

Co-authored-by: zelda2774 <zelda2774@invalid>
2020-08-15 14:06:26 -04:00
Kelebek1
337aaf2937
Match Interface_Update (#322)
* Match Interface_Update

* z_actor.c func_8002C124
2020-08-15 14:03:03 -04:00
Random
d8d789d2a5
Match a few functions (#324)
* match a few functions

* run formath.sh

* minor fixes
2020-08-15 13:23:29 -04:00
AdamKiddle
54f762b419
z_skin_matrix.c decompiled (1 non matching, 1 non equivalent) (#243)
* func_800A7BE4 and func_800A7C20 done

- func_800A7BE4 copy of "Math_Vec3f_ToVec3s" in z_lib.c
- func_800A7C20 copy of "Math_Vec3s_ToVec3f" in z_lib.c

* done func_800A7A24

* func_800A76A4 done

* func_800A6E10 done

* func_800A6EF4 done

* func_800A6FA0 done

* func_800A72FC done

* Deleted z_skin_matrix.data.s and updated spec

* func_800A730C done

* func_800A735C done

* func_800A7E70 done, func_800A7C60 matching but I'm not happy with it (weird types in function params)

* Corrections. func_800A7C60 in skin_matrix done, Matrix_MtxFToMtx in sys_matrix done.

* func_800A7EC0 nonmatching

* func_800A8030 nonmatching but VERY close (two registers swapped)

* func_800A8030 done

* updating comments

* func_800A7704 done

* func_800A7894 done

* halfway through deciphering mips_to_c for func_800A73E0

* func_800A73E0 functional but non-matching (saved register differences and probably regalloc)

* Renaming some arguments and rewriting comments

* Renamed files across whole project and deleted asm nonmatchings

* ran format.sh

* fixed function name

* fixing multiplcation order in SkinMatrix_MtxFMtxFMult

* Corrections in SkinMatrix_MtxFMtxFMult

* Formatting changes after review

* Changes as per code review

* fixing rename error

* fixing rename error

* rename fixes

* fixing function rename error

* ran ./format.sh

* last couple of changes as per code review

* renamed SetScaling -> SetScale

* Skin_Matrix_Invert -> SkinMatrix_Invert

* Renaming and fixing debug message print

* Renamed argument "mf" to more specific "clear" in SkinMatrix_GetClear

* renamed again to "mfp"

* snake case to camel case changes
2020-08-08 11:23:16 -04:00
fig02
19c990b852
Bomb Related Effect Overlays (#283)
* fix colliderinit typo

* dead sound done

* deadsound documentation

* blast done

* progress

* spk init

* progress

* spark done

* ss bomb ok

* bomb done

* cleanup

* progress

* progress

* almost done with bomb2

* clean up gossip stone

* more

* cleanup and format

* remove unused asm file

* nonmatching reloc

* done i think

* mistakes

* fix headers

* idk how that got in here

* match bomb2

* asm file

* pr review
2020-07-28 15:49:00 -04:00
Tharo
741c140aef
Split remaining unsplit asm files and migrate more rodata (#277)
* Split files

* Format rodata

* Some more code rodata migrated

* Some more actor rodata migrated

* Migrate rodata for ovl_Boss_Ganon

* Migrate rodata for code_800EC960

* Remove unused rodata

* x1b occurences all lowercase b
2020-07-19 21:08:50 -04:00
fig02
5f7bce6e2e
Bg_Heavy_Block and Eff_Ss_Dust (#258)
* heavy_rock progress

* heavy block progress, 2 functions left

* progress

* progress

* heavy_block OK

* comments

* heavy block done

* eff ss dust ok

* naming

* done i think

* comment

* clean up dust usages

* remove docs

* remove reloc

* move enum and rename flag

* effect enum
2020-07-19 09:54:24 -04:00
jacobly0
e29442f1a9
Decomp and matching in fault.c and game.c (#265)
* Match Fault_WaitForInputImpl.

* Decomp Fault_AddAddrConvClient, similar issues as Fault_AddClient.

* Decomp Fault_WaitForButtonCombo, regalloc issues.

* Rename func_800D59F8 to Fault_WalkStack.

* Decomp Fault_DrawStackTrace.

* Decomp Fault_WalkStack.

* Decomp Fault_LogStackTrace.

* Match Fault_ThreadEntry.

* Improve Fault_DrawMemDump matching.

* Improve code consistency in fault.c.

* Match GameState_Update.

* Match GameState_Realloc.

* Match GameState_DrawInputDisplay.

* Trivial cleanup of sBtnChars.
2020-07-18 05:55:35 -04:00
Léo Peltier
bc14f6d93e
Decompile ovl_En_Fhg_Fire (#248)
* Decomp EnFhgFire_Init and EnFhgFire_SetActorFunc

* Decomp EnFhgFire_Destroy

* Decomp func_80A0F6F8

* Run format

* Decomp func_80A0FA90

* Decomp func_80A0FC48

* Decomp func_80A0FD8C

* Decomp EffectSsFhgFlash_Spawn

ex func_80029CF0

* Decomp EffectSsFhgFlash_Spawn2

ex func_80029D5C

* Decomp EnFhgFire_Update

* Decomp EnFhgFire_Draw, not matching

* Decomp func_80A10F18

* Move InitVars

* PR fixes

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-16 06:02:27 -04:00
Roman971
106f7a3f6a
Match and improve some non matchings (#254) 2020-07-15 11:23:57 -04:00
fig02
8b6e86649d
En_Heishi1 and Eff_Ss_Solder_Srch_Ball OK (#234)
* progress

* init ok and merge master

* enheishi1 and srchball OK

* cleanup

* cleanup

* cleanup

* more cleanup

* done

* more comments

* add file headers

* some review comments

* move vectors

* more review comments

* angle in decimal

* add prototype

* semicolon would be good

* fix

* make unset actor ids 0

* reword comment

* no &
2020-07-09 15:12:03 -04:00
Random
b4a7ac9d71
Decompile shrink_window.c (#232) 2020-07-08 21:54:39 -04:00
Lucas Shaw
7e195a3562
Matched most remaining libultra files (#221)
* osPfsIsPlug.c and osContSetCh.c OK

* update

* __osPfsGetStatus.c OK

* removed unused asm

* Updated all libultra controller files to use new structs instead of the temporary structs. Added os_pfs.h

* controller updates

* fixed header guard

* Made suggested changes

* guLookAt.c OK

* commit

* __osPfsSelectBank.c OK

* osPfsDeleteFile.c OK

* pfsreadwritefile.c OK

* osPfsFreeBlocks.c OK

* cleaned up ospfsfreeblocks

* started pfsinitpak.c

* pfsallocatefile.c OK

* contpfs.c decompiled with 1 non matching

* osPfsFindFile.c OK

* pfsinitpak.c decompiled. one non-matching

* Actually fixed merge conflict

* sins.c OK

* cosf.c sinf.c and sins.c OK

* moved osAfterPreNMI to its own file. Renamed code_801031F0 to contquery.c

* pfschecker.c OK

* final update and rename

* Removed makefile testing thing that i accidentally added

* Made suggested changes
2020-07-06 20:15:01 -04:00
Ethan Roseman
e6ca2dfd70
Fixed one non-matching in z_actor (#240) 2020-07-05 17:51:48 +02:00
Roman971
4a64c556b0
Fix and improve some non matchings (#229) 2020-06-30 14:44:07 -04:00
krimtonz
a316f8d88d
match func_80034B54 (#227)
* match func_80034B54

* remove asm
2020-06-25 10:03:40 -04:00
Random
ab1ec89f22
Decompile jpegdecoder.c, padsetup.c and code_800C3C20.c (#217)
* Decompile jpegdecoder.c, padsetup.c and code_800C3C20.c

* change func_800C3C20's prototype and rename some fields in jpeg related structs

* Fix comment in Jpeg_GetU16 and change func_800C3C20

* use a switch in padsetup.c
2020-06-21 18:43:14 -04:00
Random
4940621679
Decompile pausemgr.c (#211)
* Decompile pausemgr.c

* rename pausemgr to z_kaleido_setup

* replace 0x4b with SCENE_BOWLING

* fix conflict
2020-06-17 15:23:42 -04:00
Roman971
229e0c8629
Update asm processor and migrate/improve rodata for a few files (#209)
* Update asm processor

* Migrate or improve rodata for a few files
2020-06-14 19:24:09 -04:00
Roman971
06fc61c83d
Fix various non matching issues and introduce #ifdef NON_EQUIVALENT instead of #if 0 (#207) 2020-06-13 23:29:59 -04:00
fig02
031d946db7
z_select decompiled, 1 non matching left (#202)
* First pass z_select

* lots of progress. 2 non matchings and data stuff needed

* match Select_LoadGame

* z_select almost ok, 1 func left

* remove comments

* remove comments and add description

* remove unused flg_set asm

* set_next_gamestate macro

* pr suggestions 1

* pr suggestions 2

* map -> scene

* pr suggestions 3

Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
2020-06-13 22:59:58 -04:00
Random
a76356090b
Decompile flg_set.c (#200)
* Decompile flg_set.c

* Use a for loop and rename func_8002AAB0

* move the flag set array inside the function
2020-06-09 18:14:18 -04:00
Random
8afab54c23
Decompile mempak.c (#191) 2020-06-07 19:38:33 -04:00
Roman971
93e8dbcc9e
Decompile the last function in z_en_heishi2.c (#195) 2020-06-07 12:37:44 -04:00
Roman971
c10bcdc3c4
Fix and match func_800BFCB8 (#196) 2020-06-07 10:08:06 -04:00
cmon-meow
80ca848cfb
Actor* player.unk_684 (#193)
* Actor* player.unk_684

* delete 8008EEAC.s

* Update include/z64actor.h

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

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
2020-06-07 09:47:11 -04:00
Roman971
68f5d212a7
Fix remaining rom/ram pointers (#190) 2020-06-05 17:09:43 -04:00
Random
94d810193a
ucode_disas.c progress (#188)
* ucode_disas.c progress

* fix

* minor fixes

* minor comment changes
2020-06-05 13:18:39 -04:00
krimtonz
c78d93ad78
Remove hard-coded pointers in several files (#186)
* fix hard-coded pointers in code_800DACC0.data.s

* fix hard coded pointer in code_800E11F0.data.s

* fix hard coded pointers in code_800EC960.data.s

* remove fixed pointers in code_800F7260.data.s

* fix hard coded pointers in code_800F9280.data.s

* remove accidental comment

* fix hard coded jump table in Camera_Unique9.s
2020-06-04 17:51:14 -04:00
krimtonz
d6fc300ed2
rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c (#181)
* rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c

* pr updates
2020-06-04 01:59:17 -04:00
Roman971
78049aa5c5
Fix some missed and fake pointers in code (#180) 2020-06-01 18:55:34 -04:00
krimtonz
77137f5a04
Decompile z_camera data, and some camera WIP (#173)
* cleanup

* name camera action functions

* decompile a few small functions, name a few Camera struct members

* decompile camera data, decompile a few camera functions

* Split ASM for code_800BB0A0

* removing code_800BB0A0.s

* PR Requests, Camera WIP

* remove #define NON_MATCHING from db_camera
2020-06-01 17:54:47 -04:00
Tharo
5937aea1d5
Migrate rodata for z_message_PAL and code_80110450 (#174)
* Migrate rodata for z_message_PAL and code_80110450

* Delete code_80110450.rodata.s
2020-05-28 03:49:58 -04:00
Tharo
db987db9f8
Decompile flg_set data (#172)
* Decompile data for flg_set

* Ran formatter

* Remove data/ files
2020-05-27 12:46:59 -04:00
Kenix3
c350eaeda5
Scene Header Command 0x0B is now OK (#147)
* Scene Header Command 0x0B is now OK

* Delete func_8009899C.s

* Updates assert check on func_8009899C

Per Roman's suggestion of placing the __assert outside of the if (1)

* Updates func_8009899C to have array access rather than pointer math

* Removes deprecated comment in func_8009899C
2020-05-27 10:10:03 -04:00
Roman971
235b0b8e0b
Fix more raw pointers (rsp and part of .data) (#170)
Known files left with pointers in .data after this (possibly the only ones since I checked roughly everything):
- flg_set.c
- z_camera.c
- db_camera.c
- code_800D7CD0.c (ucode_disas.c)
- audio (not sure which ones, see the structure sheet)
2020-05-27 09:06:37 -04:00
Lucas Shaw
02fc5287cc
code_80106550 / llcvt.c and code_80104450 / ortho.c OK (#163)
* llcvt.c OK, added script from mm decomp to set mips3

* ortho.c OK

* added entries to functions.h

* named guNormalize.s
2020-05-27 03:48:07 -04:00
krimtonz
d48792870c
Decompiles sched.c (#145)
* decompile sched.c

* rename Game_AllocEnd to Game_Alloc in z_effect_soft_sprite.c

* pr updates
2020-05-26 11:39:27 -04:00
Roman971
1bb3e006cd
Move last 3 functions in z_message_PAL.c to a separate file (#158)
There is padding in 1.0 here, and rodata is also 16 bytes aligned at this point.
2020-05-26 10:32:18 -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
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
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
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
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