1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 23:36:22 +00:00
Commit graph

640 commits

Author SHA1 Message Date
Peppers1612
b9b5724dec
BgPoSyokudai (#382)
* BgPoSyokudai: decomp Init()

* BgPoSyokudai: decomp Destroy()

* BgPoSyokudai: decomp Update()

* BgPoSyokudai: decomp Draw()

* BgPoSyokudai: remove data.s and reloc.s

* BgPoSyokudai: clarify switch flags 1D to 1F

* BgPoSyokudai: format following codestyle and remove macros
2020-09-21 03:30:58 -04:00
Ethan Roseman
807713a29b
Native MacOS build support (#399)
* MacOS build OK

* Adding build instructions for building mips-linux-binutils on MacOS

* *

* Update Makefile

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-09-21 03:00:28 -04:00
zelda2774
055d1d2bae
audio_heap: 1 non-matching (#381)
* Audio_AllocDmaMemory

* Audio_AllocDmaMemoryZeroed

* func_800DE238

* Audio_SessionPoolsInit

* func_800DE2B0

* func_800DE258

* Audio_DiscardSequence

* Audio_DiscardBank

* func_800DE12C

* Audio_ResetLoadStatus

* func_800DDE3C

* func_800DDE20

* Audio_InitMainPools

* Audio_SoundAllocPoolInit

* Audio_PersistentPoolClear

* Audio_TemporaryPoolClear

* func_800DE4A0

* Audio_PersistentPoolsInit

* Audio_TemporaryPoolsInit

* Formatting

* Audio_SeqAndBankPoolInit

* Audio_Alloc

* Audio_AllocZeroed

* func_800DE4B0

* func_800DF0CC

* func_800DF074

* func_800DF1D8

* func_800DF688

* func_800DF5DC, func_800DF630

* func_800DF7BC

* func_800DF7C4

* func_800DF888

* Fix AudioBufferParameters

* Audio_ResetStep

* Struct work

* oops

* structsss

* wip on func_800DFBF8

* func_800E04E8

* func_800E0540

* func_800E0964

* func_800E1148

* func_800DF5AC

* func_800E0E6C

* func_800E0E90

* func_800E0BF8

* func_800E0634

* func_800E05C4

* func_800E0CBC

* func_800E0C80

* naming

* func_800E0BB4

* func_800E0AD8

* func_800E0E0C

* func_800E0EB4

* func_800E06CC

* Audio_AllocBankOrSeq

* Use true/false macros

* fixup

* Format

* comments

* review

* unk instrument -> sfx

* Reword comment

* Change AVOID_UB to a comment

Co-authored-by: zelda2774 <zelda2774@invalid>
2020-09-20 13:22:09 -04:00
Ethan Roseman
9018841660
Decompiled ovl_Bg_Spot18_Shutter (#395)
* Decompiled ovl_Bg_Spot18_Shutter

* formatting

* PR fix
2020-09-20 12:14:32 -04:00
Dragorn421
d080b4ab17
Update asm-differ to commit 9d79eb9 2020-09-08 (#404) 2020-09-20 12:11:05 -04:00
Darin
d61ae83df1
Added ability to provide ichaindis a symbol (#385)
* Added ability to provide ichaindis a symbol and gave it ability to look up actor var names

* Minor fixes

* Fixed bug with output of script

* Refactored the ROM lookup for ichaindis

* Switched ichaindis to use filemap for ROM address lookup

* Removed unused import and constant

* Minor improvements to ichaindis

* Updated help text

* ichaindis will now only calculate Actor vars if needed

* Changed no-names switch to names switch
2020-09-20 11:16:00 -04:00
emilybrooks
7bd4686f1a
Ovl_Obj_Hana OK (#394)
* initial commit

* Deleted unused asm files.

* Formatting, simplified scale floats in HanaParams structs

* Removed a comment, replaced thisx with this->actor

* Renamed hanaParams data symbol, added missing static keywords, formatting

* Formatting suggestions
2020-09-20 09:37:54 -04:00
Andrew Zwicky
44dac7af67
ovl_Bg_Ice_Shutter (#377)
* Starting work on Bg_Ice_Shutter, want to commit
before attempting to use the permuter.

* Forgot to use the new UNK_TPYE in DynaPolyInfo_Alloc

* Resolving last asm issues by re-ordering and
updating .c file.

* Attempting to match by reordering things, removing no
longer used .s files from spec file.

* Adding in proper include path for _reloc file

* Removing unneeded parens and casts

* Removing extra space.

* Updated with review fixes

* Another round of review comments.

* Adding description to comment to clarify what these are.

* Adding in newline before draw function
2020-09-19 15:12:42 -04:00
Roman971
14191307e9
Decompile Player (#387)
* Setup player decomp

* Decompile z_player.c and z_player_lib.c

* Decompile remaining z_player.c functions

* Various player improvements

* Player progress (some non matchings and .data migrated)

* Player progress (reposition data and fix some non matchings)

* Cleanup, improve and document parts of z_player_lib.c/z_player.c

* Fix player renames in z_en_st.c

* Fix missing open/close disps in z_player.c

* Minor player fixes

* Address player comments
2020-09-18 21:45:39 -04:00
Roman971
b29c268f37
Use dummies to match bss ordering and some functions in z_collision_check.c (#393) 2020-09-15 18:41:38 -04:00
Random
bfef7f8d9d
Decompile PreRender.c (#319)
* Decompile PreRender.c

* use NON_EQUIVALENT and run format.sh

* Get rid of some magic values

* rename dList/dListp to dListHead/dList

* make func_800C213C NON_MATCHING

* replace more values with SCREEN_WIDTH/SCREEN_HEIGHT

* dList/dListHead with gfxp/gfx
2020-09-15 15:10:19 -04:00
petrie911
203cd19f8a
Darkmeiro decompilation (#320)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* forgot to remove ASM

* Now with better formatting

* removed some stray thisx

* Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c

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

* Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c

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

* Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c

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

* one more cleanup

* cleanup as per discussion

* fancy new names

* sfx

* ZAP

* more cleanup

* more cleanup

* and a little more

* renaming some stuff

* a little more tidying up

* bug comment

Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
2020-09-14 16:53:57 -04:00
fullgrowngaming
9891ac04c3
z_bg_menkuri_eye OK (#374)
* z_bg_menkuri_eye OK

* Fixed up a few things in Update

* Made all requested fixes.
2020-09-14 16:27:23 -04:00
Lucas Shaw
eba7a30d86
Matched fault.c (#389)
* Matched fault.c

* Removed unused asm
2020-09-14 13:57:17 -04:00
krimtonz
4d9f83da1b
Decompiles ovl_En_St (#349)
* decompile and match En_St

* document ovl_En_St

* Implement OPEN_DISPS, and remove useless comments

* styling updates, inline some declarations

* PR suggestions as well as changing the BlureInit colors to u8 arrays over RGBA types

* remove pointer from EnSt_SetupAction
2020-09-14 12:17:34 -04:00
fig02
2fd56429eb
Fix init chain issue (#379)
* fix colliderinit typo

* fix initchain
2020-09-09 14:06:14 -04:00
gamestabled
43a3ee9a93
BgHakaWater OK (#302)
* BgHakaWater OK

* minor style fixups

* made requested changes

* use true/false for isLowered
2020-09-08 22:48:35 -04:00
Dragorn421
507edd134e
ovl_Bg_Hidan_Dalm OK (#367)
* ovl_Bg_Hidan_Dalm OK, except _Init

* names and style changes

* OK, names, style
2020-09-07 08:29:58 -04:00
louist103
eef2a005b5
Decomp Heishi4 All OK (#364)
* Fixed upstream

* Migrate data, fix header, and begin Init function

* Lots of progress

* Almost done

* One non matching left

* Decomp EnHeishi4 All OK

* PR fixes

* PR fixes
2020-09-05 10:18:02 -04:00
fig02
bb1aacbd0b
z_lights.c OK (#343)
* rename some structs

* changes

* rename stuff and start a func

* progress

* progress

* progress

* remove unwanted file

* progress

* match last few funcs

* done, i think

* small changes

* match Lights_Draw (thanks krim)

* comments

* cleanup

* most pr suggestions

* name changes

* rename
2020-09-05 09:45:10 -04:00
i82orbom
612980f90c
Decompiles z_bg_spot01_objects2.c (#357)
* Starts z_bg_spot01_objects2

* z_bg_spot01_objects2.c almost finished

* Finishes z_bg_spot01_objects2.c

* Removes unused asm

* PR comments and rebased to master

* Addresses PR comments #2

Co-authored-by: i82orbom <i82orbom i82orbom@github>
Co-authored-by: i82orbom <i82orbom@github.com>
2020-09-04 18:28:45 -04:00
maekclena
d44dd61cd6
ovl_Effect_Ss_Extra (#339)
* ovl_Effect_Ss_Extra

* EffectSsExtra_Spawn

* Typo

* PR review

* PR review
2020-09-04 17:22:12 -04:00
Tharo
18775320f8
Match more z_fbdemo functions (#370)
* Match some and improve nonmatchings

* Remove pads in TransitionFade_Update, no effect towards matching

* Remove pragma comments, ran formatter

* Remove unused asm
2020-09-03 14:13:57 -04:00
notyouraveragehooman
48f2e10bef
fix m2ctx incompatibility on MacOS (#354) 2020-09-02 07:13:21 -04:00
zelda2774
c033b4b28e
audio_seqplayer, the easy half (#369)
* func_800E9340

* Audio_SequenceChannelDisable

* Audio_SeqChannelLayerFree

* Audio_SeqChannelLayerDisable

* Rename functions

* Audio_SeqChannelSetLayer

* Move gSequenceChannelNone into gAudioContext

* Audio_SequenceChannelInit

* Name functions

* Audio_M64ReadU8

* Audio_M64ReadS16

* Audio_M64ReadCompressedU16

* Audio_AudioListPopBack

* Audio_AudioListPushBack

* Audio_InitLayerFreelist

* Audio_SequencePlayerDisableAsFinished

* incomplete Audio_SequencePlayerDisable

* Audio_SequenceChannelEnable

* Audio_SequencePlayerDisableChannels

* Audio_SequencePlayerInitChannels

* struct fixes

* func_800E9ED8

* Name more functions

* Audio_SequenceChannelSetVolume

* Audio_SetInstrument

* Audio_GetInstrument

* confirm structs

* Audio_ResetSequencePlayer

* Audio_InitSequencePlayer

* Audio_InitSequencePlayers

* func_800EC734

* Find the right Audio_SoundAlloc

* Prune functions.h

* Move global vars into gAudioContext

* func_800EAEF4

* Audio_SeqChannelLayerProcessScript

* Audio_HandleScriptFlowControl

* func_800E9F64

* func_800EA0C0

* func_800EA440

* func_800EAAE0

* unbreak audio_effects

* Audio_ProcessSequence

* Audio_ProcessSequences

* Some audio_heap struct work and function naming

* Audio_SequencePlayerDisable

* ? instead of ! in z64audio.h

* Revert makefile change

* Formatting, player -> seqPlayerIndex

* Index -> Idx

Co-authored-by: zelda2774 <zelda2774@invalid>
2020-09-01 17:23:30 -04:00
Roman971
b8da64ee01
Improve PHYSICAL/VIRTUAL macros and match Interface_LoadActionLabel (#371) 2020-08-31 21:06:44 -04:00
Roman971
b4ac94a8fd
Match/Improve more non matching functions (#366)
* Match/Improve more non matchings

* Remove SET_NEXT_GAMESTATE from preserved macros
2020-08-30 12:51:46 -04:00
Roman971
2a2fdf7f3e
Introduce OPEN_DISPS/CLOSE_DISPS macros (#360) 2020-08-29 19:00:17 -04:00
fig02
1f1b5e39f5
attchaedA/attachedB renamed to parent/child (#358)
* fix colliderinit typo

* rename parent/child

* cleanup

* forgot to change something in functions.h

* SpawnAsChild

* format
2020-08-29 18:25:16 -04:00
i82orbom
468c592792
Decompiles z_bg_spot11_bakudankabe.c (#355)
* Starts z_bg_spot11_bakudankabe

* BgSpot11Bakudankabe_Init

* BgSpot11Bakudankabe_Destroy

* BgSpot11Bakudankabe_Update

* BgSpot11Bakudankabe_Draw

* func_808B2180

* func_808B2218 WIP

* Finishes z_bg_spot11_bakudankabe.c

* Removes forward declared function

* Addresses PR comments

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-28 21:14:20 -04:00
louist103
98ca965541
Decomp EnExRuppy (#331)
* PR fixes NOT MATCHING

* PR fixes

* Fix EnNiwGirl.h

* Update z_en_niw_girl.h

* Update z_en_niw_girl.c

* Delete ASM

* Ran format.sh and did some manual cleanup

* Update z_en_ex_ruppy.c

* Update z_en_ex_ruppy.c

* PR fixes

* Accidently left a git string in the file

* PR fixes

* PR fixes
2020-08-28 19:45:47 -04:00
Ethan Roseman
c905652f80 Removing binary 2020-08-28 18:20:23 -04:00
Half-asian
b687ef1143
ovl_Item_Ocarina OK (#299)
* first commit

* fixes

* remove unwanted file

Co-authored-by: fig02 <fig02srl@gmail.com>
2020-08-28 14:35:35 -04:00
fullgrowngaming
04a0d7c132
En_Dy_Extra OK and matching (#351)
* Almost done with en_dy_extra

* All matching other than draw function, which just has some stack issues + possibly a localGfxCtx issue.

* OK, one non-matching.

* z_en_dy_extra OK and matching

* Deleted asm and updated spec

* Changed colors to decimal and got rid of padding in the u8 array

* Ran format script again to clean up after last commit

* All requested fixes

* Made further requested changes
2020-08-28 02:30:09 -04:00
gamestabled
88ad705457
Ovl_Bg_Jya_Megami OK (#284)
* merge from upstream

* one non-matching in bg_jya_megami

* deleted asm files

* renamed unk_1D0

* some suggested changes

* megami OK, zero non-matchings

* deleted old reloc.s

* using a define rather than ARRAY_COUNT

* suggested changes

* some requested changes

* Setup -> Init
2020-08-27 18:00:36 -04:00
Ethan Roseman
845135d8e6
Decompiled ovl_Obj_Hsblock (#345)
* Decompiled ovl_Obj_Hsblock

* reloc

* Renaming

* PR suggestion

* PR comments

* Grouping action funcs
2020-08-27 17:12:02 -04:00
i82orbom
428554e717
Decompiles z_bg_spot17_bakudankabe.c (#347)
* Decompiles z_bg_spot17_bakudankabe.c

* More progress, BgSpot17Bakudankabe_Draw

* * func_808B6BC0 start

* Some progress *func_808B6BC0

* func_808B6BC0 almost there

* Cleanup and finished z_bg_spot17_bakudankabe.c

* Addresses PR comments

* Adds description to z_bg_spot17_bakudankabe

* Renames some variables

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-27 15:41:18 -04:00
i82orbom
740a54ac99
Decompiles z_bg_spot08_bakudankabe.c (#348)
* func_808B02D0

* BgSpot08Bakudankabe_Init

* BgSpot08Bakudankabe_Destroy

* BgSpot08Bakudankabe_Update

* Finishes z_bg_spot08_bakudankabe

* Update src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c

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

* Update src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c

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

Co-authored-by: i82orbom <i82orbom i82orbom@github>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-27 15:25:22 -04:00
Sirius902
dfaa4dc0cb
Decompiled ovl_Bg_Haka (#346)
* Progress

* match func_8087B7E8

* combine into else if

* match func_8087B938

* reorder condition to be more readable

* SFX macros

* clang fmt

* func_8087BAAC and func_8087BAE4

* match BgHaka_Draw

* attempt to remove dependency on asm data

* match file and remove asm

* reorder comparison

* clang format

* use bitwise not

* merge upstream

* fix ZAP2

* Update src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c

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

* Update src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c

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

* Update src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c

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

* implement fig's suggestions

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-27 11:48:38 -04:00
notyouraveragehooman
01122ed3e8
fix typo in MacOS docker instructions (#353) 2020-08-27 11:36:39 -04:00
i82orbom
9054feeefd
Decompiles z_bg_dodoago.c (#334)
* Starts decompiling z_bg_dodoago.c

	* Removes data

* * BgDodoago_SetupAction

* * BgDodoago_Destroy

* * func_80872288

* * BgDodoago_Draw

* * func_80871A08

* * BgDodoago_Init

* WIP

* * func_80871CF4

* * func_80871CF4

* WIP

* * BgDodoago_Update

* Finishes z_bg_dodoago

* Addresses PR comments

* Addresses PR comments #2

* Removes Setup forward declared function

* Addresses PR comments #3

Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-23 23:17:47 -04:00
Ethan Roseman
b78a777216
Update ZAP2 (#344) 2020-08-23 23:07:56 -04:00
Roman971
49609dd78b
Match/Improve a bunch of non matchings (#342) 2020-08-23 17:50:30 -04:00
zelda2774
281aaa0cb6
Speed up build a bit (#341)
* Speed up elf2rom

* Remove all built-in make rules

* Only perform a single mkdir

* Optimize elf2rom further

Co-authored-by: zelda2774 <zelda2774@invalid>
2020-08-23 13:43:26 -04:00
louist103
dea5f4aae5
Decomp BgYdanMaruta (#338)
* Fix

* fix

* Fixed upstream

* PR fixes

* PR fixes

* Fix ZAP2.  Hopefully
2020-08-23 06:44:22 -04:00
Ethan Roseman
6f54edd365
Ido Static Recomp (#337)
* Ido Recomp test

* try 2

* Recomp by default

* Fix Jenkinsfile

* Fix 2

* CFE errors

* CFE fix -O2

* Update Makefile

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

* Update README.md

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

* Update README.md

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

* PR suggestions

* PR updates

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-22 19:06:52 -04:00
fullgrowngaming
3cb03b2b2f
z_en_js OK (#336)
* Initial commit for en_js

* More work on decomping en_js

* More en_js work

* z_en_js OK

* Made requested changes/improvements

* Renamed arg in func_80A88F64

* Fixed undefined_symbols.txt

* Fixed undefined_symbols.txt

* Fixed undefined_symbols.txt
2020-08-22 02:24:07 -04:00
louist103
8d5d644647
Bg mori elevator one non matching (#293)
* BgMoriElevator Progress

* Decomp Progress

* Progress

* Progress

* Progress

* Progress

* Progress

* Finish Decomp for MoriElevator

* Test

* Update spec

* Update z_bg_mori_elevator.c

* PR fixes

* PR fixes

* PR fixes

* PR fixes

* Fixed a non matching

* Delete func_808A1800.s

* PR fixes

* PR fixes

* PR fixes

* PR fixes

* Run Clang-Format

* Change PlaceInGround to WaitAfterInit

* PR fixes

* Change a variable
2020-08-20 21:53:43 -04:00
i82orbom
888f1b315f
Decompiles z_bg_jya_goroiwa (#307)
* Decompiles z_bg_jya_goroiwa

	* BgJyaGoroiwa_Init
	* func_808979C0
	* BgJyaGoroiwa_Destroy
	* func_80897970
	* func_80897A2C
	* BgJyaGoroiwa_Draw
	* func_80897DF0
	* func_80897DDC
	* BgJyaGoroiwa_Update
	* func_80897B48

* Adds description header to z_bg_jya_goroiwa.c

* Addresses PR comments

* Addresses PR comments #2

* Addresses PR comments (padding)

* PR comments, change paddings to s32

Co-authored-by: i82orbom <i82orbom@github>
Co-authored-by: i82orbom <i82orbom i82orbom@github>
2020-08-20 21:53:00 -04:00
fullgrowngaming
b406e041b3
z_en_weather_tag decomp (#329)
* Initial commit of weather_tag actor decomp

* Formatted source files and updated spec.

* Fixed references to the environment context variable that I changed.

* Deleted the last of the asm (forgot the stuff in the data folder)

* Made all requested changes to z_en_weather_tag

* Forgot to change basereg

* Removed unnecessary field in weather tag struct

* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c

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

* That field in the header was totally necessary, not sure what I was thinking, sorry for all the commits

* Renamed what I thought was struct padding to more accurately represent the fact that that field is an unused variable.

* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-08-20 21:28:41 -04:00