1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-28 15:56:51 +00:00
Commit graph

302 commits

Author SHA1 Message Date
Darin
c864ce0de2
z_bg_spot15_rrbox OK (#375)
* Initial work on spot15_rrbox

* Few functions done with OK

* Added destroy function

* Fixed up struct, made actionFunc and completed more functions

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* Another function

* File entirely working

* Replaced padding with better variables

* Replaced more padding

* Ran format script and some other minor layout changes

* Removed assembly files

* Made update function consistent with other base functions

* Renamed variable

* Removed data file

* Updated reloc location in spec

* Removed old reloc file

* Made init chain static

* Minor fixes

* Fixed various minor issues

* More minor cleanup

* Even more minor cleanup

* Minor cleanup

* More minor cleanup

* Minor fix

* Fixed up more variable names

* Apply suggestions from code review

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* More cleanup

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2020-09-26 20:06:26 -04:00
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
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
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
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
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
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
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
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
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
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
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
Roman971
49609dd78b
Match/Improve a bunch of non matchings (#342) 2020-08-23 17:50:30 -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
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
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
louist103
da58af403b
Decomp EnNiwGirl (#306)
* Fix Repo

* Update z_en_niw.h

* PR fixes

* Update z_en_niw_girl.c

Add all masks to switch at 142

* Added currentMask enum

* Small fixes

* Cleaned up a lot of little things

* PR fixes
2020-08-15 19:37:26 -04:00
Ethan Roseman
40fc24420a
Decompiled ovl_Demo_Im (#296)
* First steps

* more

* more

* clean

* Decompiled ovl_Demo_Im

* fixes

* comment update

* consistency

* PR comments
2020-08-15 14:07:28 -04:00
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
Random
d8d789d2a5
Match a few functions (#324)
* match a few functions

* run formath.sh

* minor fixes
2020-08-15 13:23:29 -04:00
Tom Overton
d3b88e1b1c
Ovl_Bg_Spot01_Idomizu OK (#303)
* Init OK (with weird goto)

* func_808ABB84 matching

* BgSpot01Idomizu_Destroy matching

* Run ./format.sh

* BgSpot01Idomizu_Update matching

* Remove Init's goto

* BgSpot01Idomizu_Draw matching

* Delete BgSpot01Idomizu asm files

* Variable naming and cleanup

* Update spec

* Delete unused ASM

* Address review feedback

* Fix fake match in Draw caused by not doing dispRefs[4]
2020-08-14 00:17:25 -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
i82orbom
34c73dda62
Decompiles z_bg_ingate (#301)
* Decompiles z_bg_ingate

	* BgIngate_SetupAction
	* BgIngate_Init
	* BgIngate_Destroy
	* BgIngate_Update
	* func_80892990
	* func_80892890
	* BgIngate_Draw
Removes unused asm's
Formats z_bg_ingate.c

* Addresses PR comments

* Fixes usage of cutscene id instead of regular scene

* Addresses PR comments
2020-08-04 14:30:46 -04:00
louist103
91299ed21f
Decomp BgJyaBombiwa (#294)
* Decomp BgJyaBombiwa

* Delete z_bg_jya_bombiwa.data.s

* Delete z_bg_jya_bombiwa.reloc.s

* PR fixes

* Delete cur_list.txt

* Delete old_data_list.txt

* Delete data_list.txt

* Delete old_list.txt

* PR fixes

* PR fixes
2020-08-04 20:01:40 +02:00
Lucas Shaw
c3421dda0c
ovl_Item_Etcetera OK (#281)
* started item_etcetera

* ovl_Item_Etcetera OK

* z_item_etcetera cleanup

* fixed

* removed padding

* z_item_etcetera updates

* made suggested changes

* change member in enum
2020-07-29 00:17:26 -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
Ethan Roseman
56156d5577
Decompiled ovl_Obj_Makeoshihiki (#285)
* Decompiled ovl_Obj_Makeoshihiki

* typo

* PR comments

* oops

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Update src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c

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

* Fixing dumb thing

* oops

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-24 17:37:44 -04:00
fig02
c94aaa327a
Fix EnBombf_Update (#290)
* fix colliderinit typo

* EnBombf_Update OK

* fix thisx to effect call
2020-07-23 18:29:24 -04:00
Lucas Shaw
e3afc9ab5c
ovl_Bg_Mori_Hineri OK (#279)
* bg_mori_hineri OK

* added description and removed reloc

* made suggested changes from fig

* made suggested changes

* Named a few functions in ovl_Bg_Mori_Hineri
2020-07-23 06:51:02 -04:00
Ethan Roseman
5f3f065aa7
Decompiled ovl_Bg_Jya_Block (#286)
* Decompiled ovl_Bg_Jya_Block

* PR comments
2020-07-22 23:44:18 -04:00
Ethan Roseman
8a309a4e19
Finished ovl_Demo_Go (#287)
* Finished ovl_Demo_Go

* renaming arg
2020-07-22 20:15:56 -04:00
Nick
3c3cfa6751
z_en_bg_hidan_rsekizou (#282)
* RSekizou 4/5

* func_8088C70C on its way.

* ROM got shifted?

* RSekizou is OK

* Cleanup

* Removed unused ASM. Jenkins!

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

* Tidy Roman-ization. ;)

* UNK_TYPE array instead of illegal UNK_PTR array.

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-22 17:12:47 -04:00
louist103
4c8ed0e328
Bg jya1flift (#269)
* Update ZAP2

* BgJya1flift progress

* BgJya1flift Progress

* Rename unknown variables

* BgJya1flift Progress

* Finish Decomp for BgJya1flift

FInished decomp and added missing functions to functions.h

* Fix struct padding

* PR fixes

* PR fixes

* Pr Fixes
2020-07-22 03:48:31 -04:00
Kelebek1
9ddc6b5d6d
EnGirlA (#233)
* EnGirlA all matching but 2

* Fix warnings, remove files

* PR 1

* Fix

* aaa

* Put this asm file back

* Revert "Put this asm file back"

This reverts commit 7e8e1080d7.

* PR

* Fix

* GirlA matched

* Unused asm
2020-07-21 00:06:50 -04:00
Tharo
e6cee80a7b
Decompile ovl_Bg_Haka_Tubo (#280)
* Bg_Haka_Tubo OK

* Ran formatter

* Review suggestions

* Fix commented field offsets in header

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

* Fix other field offset

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

* Named data and made static

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-20 19:57:02 -04:00
Lucas Shaw
b39cddd576
ovl_Obj_Dekujr OK (#276)
* started dekujr

* ovl_Obj_Dekujr OK

* cleanup

* Made suggested changes
2020-07-20 18:06:04 -04:00
Kelebek1
00836ddebc
EnBx (#266)
* EnBx

* Memes

* PR

* PR
2020-07-20 02:49:42 -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
Ethan Roseman
e672778b0e
Fx bootstrap (#278)
* script

* update

* dun?
2020-07-19 19:42:59 -04:00
Lucas Shaw
3dd521eef5
ovl_En_Okarina_Tag OK (#273)
* started okarinatag

* did more

* z_en_okarina_tag OK

* finished okarinatag

* Made suggested changes
2020-07-19 17:41:59 -04:00
Ethan Roseman
71e65af9b7
Decompiled ovl_Door_Gerudo (#274)
* Decompiled ovl_Door_Gerudo

* Update include/z64actor.h

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

* Update src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c

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

* Update src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c

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

* Update include/z64actor.h

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-19 16:36:18 -04:00
fig02
15038468ac
En_Bom and En_Bombf (#264)
* data migrated

* progress

* progress

* enbom ok

* cleanup

* progress

* still have stack issues

* bombf done

* done i think

* review comments 1

* add type enums

* move enums and use -1

* remove unwanted file
2020-07-19 14:04:30 -04:00
Ethan Roseman
15f75b0ddd
Decompiled ovl_Item_B_Heart <3 (#271)
* Decompiled ovl_Item_B_Heart <3

* Update src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c

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

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
2020-07-19 12:54:30 -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
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
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
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
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
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
Roman971
4a64c556b0
Fix and improve some non matchings (#229) 2020-06-30 14:44:07 -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
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
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
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
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
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
Lucas Shaw
a0ef48e987
Migrated rodata (#199) 2020-06-09 12:06:23 -04:00
Random
8afab54c23
Decompile mempak.c (#191) 2020-06-07 19:38:33 -04:00
Random
8705d40e54
Split ovl_file_choose and ovl_kaleido_scope (#167)
* Split ovl_file_choose and ovl_kaleido_scope

* Split ovl_kaleido_scope's rodata/data/bss

* fix

* fix spec

* spec fix

* hopefully last spec fix

* hopefully last spec fix 2

* fix

* Add comments on file boundaries

* fix
2020-06-07 13:52:43 -04:00