1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 17:54:15 +00:00
Commit graph

689 commits

Author SHA1 Message Date
louist103
66e9475b25
Decomp BgYdanHasi (#263)
* Decomp BgYdanHasi

* PR fixes.

* More PR fixes

* FIx issue with missing Extern
2020-07-18 23:06:26 -04:00
Kelebek1
83d08078c3
Gossip Stone, 1 nonmatching (#251)
* Gossip Stone, 1 nonmatching

* Appease the Fig

* spec

* Fix last function ordering

* Ethan Review 1

* a

* Hidden PR notes QQ

* a

* Fixed now??

* a
2020-07-18 20:35:12 -04:00
Ethan Roseman
06d1743d22
Effect rodata migration (#268)
* Some rodata migrated

* Migrated all effect rodata

* cleanup

* clean

* Removing .balign
2020-07-18 20:34:23 -04:00
Nathan Faltermeier
a982d40480
Decompile ovl_En_Insect (#244)
* Start decompiling bugs

* Decomp func_80A7BFA0

* Match 4 functions

* Match a few functions, really close on another

* Consolidate if statements

* Progress on func_80A7C86C

* Decompile a few small functions

* func_80A7CEC0 still needs stack and regalloc work

* Finish up func_80A7CEC0, do a couple functions

* Start on func_80A7D460

* func_80A7D460 is mostly down to regalloc

* Match update and draw, more work on func_80A7D460

* func_80A7D460 is really close to matching

* func_80A7D460 matches

* Cleanup

* Run formatter

* Missed reversing a couple flout comparisons

* Apply suggestions from code review

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

* PR Comments

* PR Comments #2

* Missed one

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-18 17:40:27 -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
fig02
24ab14f748
Change Colors To Decimal (#260)
* fix colliderinit typo

* convert as many colors i can find to decimal

* fix GPACK_RGBA5551, merge fhgFire

* fix remaining colors

* remove unwanted file

* alpha as 1
2020-07-16 21:37:53 -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
snablu
4e1fc875c3
Decompiled z_en_md.c (#246)
* Decompile z_bg_haka_trap.c

* Update spec

delete old .reloc.s file

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

* Deleted reloc.s and made style changes to function pointers and local vars

* Renamed timer field, added more useful temp names

* Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues

* Commented dual purpose of unk_16A and formatted file again

* Decompiled z_en_md.c

decompiled EnMd_Init

Decompiled EnMd_Draw

Decompiled EnMd_Destroy and EnMd_Update

Decompiled func_80AAC104

Decompiled func_80AAA92C

Decompiled func_80AAA93C

Decompiled func_80AAA274

Decompiled func_80AAA308

Decompiled func_80AAA39C

Decompiled func_80AAA474

Decompiled func_80AAA508

Decompiled func_80AAA5A4

Decompiled func_80AAA638

Decompiled func_80AAA6D4

Decompiled func_80AAA768

Decompiled func_80AAA7FC

Decompiled func_80AAA890

Decompiled func_80AAA93C

Decompiled func_80AAA250

Decompiled func_80AAB874

Decompile func_80AAAA24

Decompiled func_80AABD0C

Decompiled func_80AAB8F8

Decompiled func_80AAAE94

Decompiled func_80AAACF8

Decompiled func_80AAADE0

Decompiled func_80AAAE14

Decompiled func_80AAB03C

Decompiled func_80AAB0E0

Decompiled func_80AAB370

Decompiled func_80AAB4DC

Decompiled func_80AAB5A4

Decompiled func_80AABC10

Decompiled func_80AAAC78

Decompiled func_80AABEF0

Decompiled func_80AAB158

Decompiled func_80AAAF04

Decompiled func_80AAB948

Migrated data into C file

Commented out data file (migrated data)

Removed data file from spec

about to try changing alpha type

cleaned up functions except for last two

fixed player and player2 issue

Decompiled z_en_md.c

* updated actor field names to match upstream changes

* deleted old asm nonmatchings (whoops)

* Update src/overlays/actors/ovl_En_Md/z_en_md.h

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* removed unnecessary forward declarations

* got rid of unnecessary temps in path functions, added names based on strong copy paste similarity with en_kz, minor formatting changes

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* pass EnMd* to appropriate functions instead of Actor*

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* finish renaming limb draw funcs

* inlined vector data and moved static data

* Update src/overlays/actors/ovl_En_Md/z_en_md.c

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

* ran formatter and completed name change in PostLimbDraw

* removed address-of array for sAnimations

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-14 15:59:45 -04:00
Ethan Roseman
eb10acb8ed
Decompiled ovl_En_Blkobj (#242)
* Decompiled ovl_En_Blkobj

* PR suggestions

* gfx commands
2020-07-14 01:15:43 -04:00
Lucas Shaw
b251f3f7e3
fix func_8008EF30 (#250) 2020-07-12 19:12:18 -04:00
Sirius902
8c72e1dea6
Decompiled ovl_Shot_Sun (#236)
* match ShotSun_Init

* match ShotSun_Destroy

* match func_80BADDCC

* break up unk_19C to add spawnTimer

* ShotSun_Update

* func_80BADE74

* work on func_80BAE05C

* make func_80BAE05C closer

* use proper macros for osSyncPrintf

* format if statement better and add temp player pointer func_80BAE05C

* Reorder spawnPos to match stack args later

* match func_80BAE05C

* almost match func_80BADF0C

* Remove temporary and add parenthesis

* change part of comment and move last unk_1A4 assignment to be similar to decompiler

* Change do while(false) to if (1)

* func_80BADF0C

* change comment

* update spec

* fix vt macro

* cleanup and name

* remove asm

* remove data

* remove extern

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

* remove & for function pointers

* rename and retype D_02007020

* format

* remove tiny whitespace

* reorder if statement

* finish renaming

* replace cast with bitwise operation

* move globally used functions to functions.h

* reorder description

* move headers for EnItem00 and EnAObj to z64actor.h

* retype Item_DropCollectible and Item_DropCollectible2 to return EnItem00*

* rename ShotSun_StartFairyCountdown to ShotSun_TriggerFairy

* rename ShotSun_FairyCountdown to ShotSun_SpawnFairy

* add unk_E3EC field to MessageContext

* rename to ShotSun_UpdateHyliaSun for now

* remove != 0 on flag check

* remove unsigned suffix and use enum constant for Item_DropCollectible call

* add unk_95C field to Player

* add ub comment

* retype unk_1A4 and remove explicit struct padding

* Update src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c

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

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-12 19:03:38 -04:00
Tharo
a00015a1ac
Disassemble more cutscenes (#241)
* Add cutscene disassembler script

* Add more debug info

* Use addresses instead of already disassembled data, emit array declaration

* Disassemble more cutscene data, fix csdis bug where BGM commands would output too many args

* Fix similar bug for LIGHTING command, fix line ending from previous commit

* Remove CS_PAD

* Update ZAP2

* Disassemble ovl_Demo_Sa cutscene data
2020-07-12 11:38:38 -04:00
fig02
c589285826
Clean up SkelAnime_GetFrameCount usage (#245)
* fix colliderinit typo

* clean up SkelAnime_GetFrameCount usage

* line breaks
2020-07-11 22:39:34 -04:00
glankk
4fb01c6b21
Add 64-byte alignment requirement to the buffers segment (#247) 2020-07-11 11:23:54 -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
Ethan Roseman
7f6e9d55fe
Decompiled ovl_Demo_Sa (#231)
* Decompiled ovl_Demo_Sa

* PR suggestions

* ff -> alpha

* PR suggestions

* Reverting cutscene data
2020-07-08 19:40:09 -04:00
Ethan Roseman
f3edd3ee77
Decompiled ovl_En_Si (#239)
* Decompiled ovl_En_Si

* Description

* Update src/overlays/actors/ovl_En_Si/z_en_si.c

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

* Update src/overlays/actors/ovl_En_Si/z_en_si.c

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

* Update src/overlays/actors/ovl_En_Si/z_en_si.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-07 06:39:06 -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
61544b873d
Various SFX fixes (#237)
* Various SFX fixes

* Fix sfx references in z_en_zl2.c
2020-07-04 23:30:21 -04:00
Ethan Roseman
a5aee3d691
Decompiled ovl_En_Zl2 (2 nonmatchings) (#223)
* Almost dun

* 3 more, progress...

* 2 more

* Fixing field rename

* improvement

* 1 more

* progress

* more

* work

* Preparing for PR

* Comments

* tidbits

* more tidbits

* fixes

* PR comments

* Nonmatching reloc

* PR suggestions

* PR suggestions
2020-07-04 14:34:51 +02:00
Tharo
f2ead7f2c9
Add cutscene disassembler script (#235)
* Add cutscene disassembler script

* Add more debug info

* Use addresses instead of already disassembled data, emit array declaration
2020-07-03 19:01:57 -04:00
Roman971
4a64c556b0
Fix and improve some non matchings (#229) 2020-06-30 14:44:07 -04:00
Roman971
b55fc9a4e0
Replace unnecessary Vtx_t uses by Vtx (#228) 2020-06-28 18:28:12 -04:00
Tharo
27d059b041
Configure Doxygen (#206)
* Configure Doxygen

* Clean up filter_global_asm.py

* Add documentation guide

* Fix small issue with markdown rendering

* Change @bug to lowercase in documenting guide

* Folder restructure, new logo

* Allow embedding LaTeX in doc comments, update Documenting guide

* Resize logo

* Change description to match new repo description, leave version number unspecified
2020-06-28 14:42:16 -04:00
krimtonz
a316f8d88d
match func_80034B54 (#227)
* match func_80034B54

* remove asm
2020-06-25 10:03:40 -04:00
fig02
13117fd837
fix colliderinit typo (#226) 2020-06-24 23:20:51 -04:00
fig02
d77dbe0465
Rename culling related variables (#225)
* rename some things

* reword one comment

* rename vars

* fix bgjyalift
2020-06-24 21:20:31 -04:00
krimtonz
6b2a013cca
suppress unused parameters, unused variables, and missing braces (#224) 2020-06-24 19:21:08 -04:00
louist103
7946d6698c
Decomp BgJyaLift (#216)
* Re upload

* Decomp BgJyaLift

* Fixed issues

Fixed issues from review

* Edits after review

* Review Fixes

Made some fixes and also changed an unknown variable name

* Fixes to file

Fixed some styling things and renamed the last function

* Added fixes

Added roman's fixes

* Delete filemap.pyc

* Fixes

Removed ctx.c and replaced tabs with spaces spec.
2020-06-24 18:34:31 -04:00
Ethan Roseman
054f6dc04d
Fail the Jenkins build if there's any unused asm (#222)
* Check for unused asm

* Deleting some unused asm
2020-06-23 13:59:59 -04:00
Roman971
c376b3f195
Update diff script (#220) 2020-06-22 01:10:23 -04:00
Ethan Roseman
22d79e5e95
CSV Progress (2) (#219)
* CSV Progress (2)

* Git time
2020-06-21 20:58:56 -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
Ethan Roseman
afce6a3c36
Output progress to csv file (#218) 2020-06-21 17:50:32 -04:00
Ethan Roseman
5f61c105b4
Decompiled ovl_Bg_Spot01_Idohashira (1 non-matching) (#213)
* Almost done

* one non-matching

* PR suggestions

* Further suggestions

* minor correction
2020-06-21 17:50:01 -04:00
Ethan Roseman
7c2072ee23
Improved mips_to_c context script (#214)
* Improved context script

* .gitignore
2020-06-18 21:12:58 -04:00
fig02
67d13fe190
Arms_Hook OK (#210)
* Arms_Hook OK

* cleanup

* decr

* remove redundant include

* missed some things

* rename things

Co-authored-by: dark-samus <mathmcclintic@gmail.com>
2020-06-17 15:44:22 -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
Ethan Roseman
dcdaf850b6
Decompiled ovl_Bg_Spot18_Obj (#204)
* Decompiled ovl_Bg_Spot18_Obj

* quick fix

* Added description to c file

* Update z_bg_spot18_obj.c

* PR suggestions

* PR suggestion
2020-06-17 08:02:28 -04:00
Lucas Shaw
b86edcf92c
Matched some controller files (#178)
* 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
2020-06-17 07:16:30 -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
fig02
1c98ac27eb
Actor struct cleanup (#208)
* cleanup a few things

* fix mistake

* yawTowardsLink

* run format

* pr suggestion
2020-06-14 00:09:51 -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
Roman971
df3bfbc168
Fix sym_info.py and first_diff.py scripts to properly handle .bss (#205) 2020-06-12 21:56:17 -04:00
snablu
4e70a24274
Decompile z_bg_haka_trap.c (#201)
* Decompile z_bg_haka_trap.c

* Update spec

delete old .reloc.s file

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

* Deleted reloc.s and made style changes to function pointers and local vars

* Renamed timer field, added more useful temp names

* Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues

* Commented dual purpose of unk_16A and formatted file again

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
2020-06-11 17:39:47 -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