mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-25 14:16:11 +00:00
Code Issues Projects Releases Wiki Activity
627 commits 1 branch 0 tags 483 MiB
Commit graph

627 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sirius902
d7bf6d94f4 Merge remote-tracking branch 'upstream/master' 2020-09-05 20:11:12 -07: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
Sirius902
ce6dab8074 Merge remote-tracking branch 'upstream/master' 2020-09-03 18:35:05 -07: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
Sirius902
25b87f5763 Merge upstream 2020-08-27 12:26:52 -07:00
Sirius902
c059e13082 Merge remote-tracking branch 'upstream/master' 2020-08-27 12:26:19 -07: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
Sirius902
b7e3bdb309 merge upstream 2020-08-24 16:52:19 -07: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
Kelebek1
4bd417aeba
En_Syateki_Niw (#270) 
* All matching, apart from the ones that aren't.

* Fix conflcit and 1 func

* Bugz

* Conflict 2

* Header

* Remove asm

* PR

* PR

* undefined syms

* PR
 2020-08-20 18:34:18 -04:00
fig02
296b20e925
En_Light OK (#332) 
* fix colliderinit typo

* en_light OK

* format

* remove asm

* cleanup

* pr review

* no U

* few changes
 2020-08-19 22:57:31 -04:00
Kelebek1
c25b87923e
Attack_Niw (#272) 
* Attack!

* Decimal indexes

* a

* PR

* PR

* PR

* Why break it
 2020-08-19 22:17:42 -04:00
Roman971
3a22219d5d
Match Lights_Free (#333) 
* Match Lights_Free

* Remove bug comment
 2020-08-19 18:15:02 -04:00
krimtonz
4ad461c797
Match Overlay_Relocate (#330) 
* Finally match Overlay_DoRelocation

* remove asm, rename Overlay_DoRelocation to Overlay_Relocate

* formatter

* comment updates

* comment update
 2020-08-19 16:02:10 -04:00
i82orbom
07e6d25be2
Decompiles z_en_wonder_talk2.c (#312) 
* Decompiles z_en_wonder_talk2.c

	* EnWonderTalk2_Init

	* func_80B3A10C

	* func_80B3A770

	* EnWonderTalk2_Update

	* func_80B3A15C

	* func_80B3A4F8

	* func_80B3A3D4

* Removes unused asm

* Addresses PR comments

* Addresses PR comments #2

Co-authored-by: i82orbom <i82orbom i82orbom@github>
 2020-08-18 21:31:54 -04:00
i82orbom
c76bd0d2e4
Decompiles z_en_wonder_talk.c (#309) 
* Decompiles z_en_wonder_talk.c

	* EnWonderTalk_Init
	* EnWonderTalk_Update
	* func_80B395F0
	* func_80B391CC
	* func_80B3943C

Removes unused asm's

* Addresses PR comments

* Uses VT macros in z_en_wonder_talk

* Adds translations to stdout messages in comments

* Addresses additional PR comments

* Addresses PR comments #3

Co-authored-by: i82orbom <i82orbom@github>
Co-authored-by: i82orbom <i82orbom i82orbom@github>
 2020-08-18 18:27:03 -04:00
AdamKiddle
7a9c51375b
Elf_Msg, Elf_Msg2 OK (#317) 
* matched func_809AD700, ElfMsg2_Init

* func_809AD968 done

* func_809AD978 and func_809AD9F4 done

* func_809ADA28 done

* ElfMsg2_Update Done, ElfMsg2_Draw Started

* whole file decomped

* Matching and all symbols defined

* Formatting changes, not currently building

* run format.sh

* fixed typos in comments

* Changes to reflect comments

* C file matching, polish needed

* making parenthesis usage consistent

* Documenting draw function, Vtx and Gfx arrays

* Added japanese translation comments

* line spacing fix

* renaming stuff

* Early return in Draw

* naming updates

* Cleaning up names, comments and formatting after the merge

* comment cleanup

* more cleanup

* More cleanup

* Adding commas at end of arrays so they look nicer :)

* more cleanup

* removing unnecessary parentheses

* comment and code changes

* Name changes

* Renamings

* Removing documentation at top
 2020-08-18 14:31:34 -04:00
fullgrowngaming
13891f1366
z_en_yukabyun decompiled (#318) 
* Decomped Yukabyun (flying floor tiles)

* z_en_yukabyun

* Ran the formatting script, plus fixed negative number stuff in the Update function

* Changed unk_152 to unsigned to get rid of cast

* Made all the suggested changes.

* Update undefined_syms.txt

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
 2020-08-18 13:52:44 -04:00
Roman971
3dc3722570
Fix reloc data used for some actors and Match Bg_Spot01_Idohashira (#327) 2020-08-17 17:47:48 -04:00
krimtonz
f11a74d41d
Math3D and olib updates (#315) 
* wip

* Olib updates

* wip

* wip

* rename most Math3D functions, few matches, documentation

* wip

* document most of math3d

* pr updates

* pr updates

* add missing comment block finalizer
 2020-08-17 15:42:08 -04:00
Roman971
2826421c98
Match the last 2 functions in graph.c (#328) 
* Match the last 2 functions in graph.c

* Minor graph improvements
 2020-08-16 17:59:55 -04:00
zelda2774
46f8eee4fe
Fix some %hi's (#326) 
Co-authored-by: zelda2774 <zelda2774@invalid>
 2020-08-15 20:36:34 -04:00