Commit Graph
84 Commits
Author SHA1 Message Date
Derek HensleyandGitHub 49f55ff005 EnvFlags OK (#404)
* Matched

* Remove magic number

* Rename system to EnvFlags
2021-11-05 23:15:47 -03:00
EllipticEllipsisandGitHub 2907da61c3 xlitob.c OK (#417)
* xlitob.c OK

* spec
2021-11-05 12:03:11 -03:00
Tom OvertonandGitHub c706b2be70 En_Baguo (Nejiron) OK and mostly documented (#351)
* Migrate data to C

* EnBaguo_Init OK

* EnBaguo_Destroy OK

* func_80A3B220 OK

* func_80A3B2CC OK

* func_80A3B2CC OK

* func_80A3B794 OK

* func_80A3B5E0 OK

* func_80A3B7B8 OK

* EnBaguo_Update OK

* func_80A3B8F8

* func_80A3BE24 OK, some other not-OK junk

* func_80A3BE60 OK (wow this is bad!)

* Document the blink system

* func_80A3C17C OK

* Document timer and fix warnings

* func_80A3C008 OK

* Rename x/y/z so it's clear they are positions

* func_80A3BE60 OK in a not-crazy way

* func_80A3B958 OK

* func_80A3BF0C OK

* Make the rotation a Vec3s

* Update the spec to use the built reloc

* Use ARRAY_COUNT instead of hardcoded length

* Document the state stuff

* Document NejironParticle

* Document the rolling rotation stuff

* unk_1BC -> maxDistanceFromHome

* unk_1B8 -> zRollDirection

* Name the two draw functions

* Name the static variables properly

* Name all other functions

* Clean up forward declares

* Last bit of documentation and cleanup

* Add an enum for the rolling direction

* Add explanatory comment

* state -> action and move action descriptions inline

* Use enum for Stone Mask

* Use "Setup" for the setup function

* Document the damage effect

* Add some space around the for-loop

* ./format.sh

* Use % 8 everywhere

* Use -= instead of += a negative number

* Switch order of max check

* Use CLEAR_TAG_POP enum value

* eyeIndexTemp -> eyeIndex

* visible -> isVisible

* Move enums above structs

* Merge animation system changes

* yDist fix

* Respond to review feedback
2021-11-05 10:14:22 -03:00
MaideandGitHub 693c701025 Boss_02 (3 non-matching) (#324)
* Boss_02

* Fixups

* Warnings
2021-11-05 08:04:10 -04:00
MaideandGitHub 418e09bf6f En_Floormas (#307)
* En_Floormas

* Format
2021-11-04 18:30:05 -04:00
MaideandGitHub 31e4089a4b En_Goroiwa (3 non-matching) (#375)
* En_Goroiwa

* Fix names

* Params

* Revert PR
2021-11-04 14:42:01 -03:00
ad4c16d40f osFlash (#158)
* some matches

* Decompile code_0x80186A70 Add defines for KSEG0/1 and (Un)Cached RDRAM

* format

* cleanup

* moved osFlash and imported data

* implement fixes

* format again

* Update include/functions.h

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update include/variables.h

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* returns are needed

* format

* Update src/libultra/flash/osFlash.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* should be fixed

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: MMDecomp <mmdecomp@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-11-03 18:30:20 -04:00
louist103andGitHub 8e88768a70 Fireobj Kinda OK (#400)
* done

* format

* PR fixes

* revert formatting z64.h

* Update warnings_build_current.txt
2021-11-03 15:09:43 -03:00
60b9cd789e Demo_Kankyo (Lost Woods Sparkles) (#380)
* Demo_Kankyo

* DemoKankyo: docs

* DemoKankyo: documenting this is a pain...

* found bug

* DemoKankyo: docs

* DemoKankyo: function renamed

* DemoKankyo: docs

* DemoKankyo: more docks

* DemoKankyo: more docks

* DemoKankyo: docs and format

* DemoKankyo: requested changes

* DemoKankyo: bug documented

* PR feedback via docs

* DemoKankyo: minor documentation and format

* DemoKankyo: requested changes

* DemoKankyo: removed some old comments

Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2021-11-03 12:10:54 -03:00
louist103andGitHub fcbd524b5d Debug display mostly OK (#399)
* WIP

* done?

* remove something from variables.h

* missed a warning

* PR fixes (AngheloAlf)

* fix lights

* restore ZAPD makefile

* format

* format again

* fix a graph alloc

* Missed one in skin
2021-11-03 11:52:01 -03:00
Derek HensleyandGitHub 888627d364 Common data OK (#398)
* Matched common data

* Change one hex to dec
2021-11-03 11:15:39 -03:00
MaideandGitHub 5a4bceea2c En_Wf (#370)
* En_Wf

* PR

* Fix make and actorfixer

* Format

* Warnings
2021-11-01 11:47:04 -03:00
MaideandGitHub 829d1d4c2a En_Po_Sisters (#345)
* En_Po_Sisters

* Tharo magic

* Rebase

* PR

* Fix make and actorfixer

* Format
2021-10-31 16:07:08 -03:00
Tom OvertonandGitHub d4effceefd En_Elforg (Stray Fairy) OK and mostly documented (#359)
* Migrate data to C

* EnElforg_Init OK

* func_80ACC470 OK

* EnElforg_Destroy OK

* EnElforg_Update OK

* func_80ACCBD0 OK

* func_80ACCBB8 OK

* func_80ACD6EC OK

* func_80ACD59C OK

* func_80ACD6A8 OK

* func_80ACD610 OK

* func_80ACD878 OK

* Declare animated materials for Elforg

* EnElforg_Draw OK

* func_80ACCC98 OK

* func_80ACC7E4 OK

* func_80ACC8D4 OK

* func_80ACCEB0 OK

* func_80ACC994 OK

* PLAYER -> GET_PLAYER

* func_80ACCE4C OK

* func_80ACC934 OK

* func_80ACCAC0 OK

* func_80ACD2E4 OK

* func_80ACD1F0 OK

* func_80ACD164 OK

* func_80ACD1B0 OK (maybe fakematch but oh well)

* func_80ACD088 OK

* Better match for func_80ACD1B0

* Use compiled reloc

* Move static data to appropriate function

* Name sCylinderInit appropriately

* Add explanatory comment

* Clean up forward declarations

* Add macro for the flag

* Macro and enum for type

* Add STRAY_FAIRY_GET_PARAM_1C0 macro (no clue what this does)

* Document the area stuff

* Name some functions

* Document timer and direction

* Eliminate some early returns

* Tons more documentation

* Name remaining functions

* Document flags

* Name targetDistanceFromHome

* fairyFountainTimer -> secondaryTimer, since it's used outside of Fairy Fountains

* Name the unknown flag

* Name the collider fairy type

* Last bit of renaming/documenting

* Remove zero check

* Use hex constant for newAngle

* Merge animation updates

* Use 0x10000 instead of 65536.0f

* Use decimal for alpha

* Move yDifference initialization up to the same line as declaration

* Use +=/-=

* <= 30 instead of < 31

* += -1 -> --

* >= 81 -> > 80

* 0xDFFFFFFF -> ~0x20000000

* EnElforg_InitializeSpeedAndRotation -> EnElforg_InitializeParams
2021-10-31 13:25:10 -03:00
b1b114e142 Decompile graph.c (#274)
* Decompiled, 1 non-matching, add some bss reordering helpers

* Document stuff

* Review suggestions

* graphutil.c -> graphalloc.c

* Try to fix fault callback warnings

* Remove extra comments in GfxMasterList

* char pad -> u32 pad

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Fix gameState

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Other suggestions

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-10-29 15:30:48 -03:00
engineer124andGitHub dc47432ce0 En_Test4 OK (#366) 2021-10-27 16:02:44 -03:00
MaideandGitHub 8beaa7841e En_Mushi2 (#304)
* En_Mushi2

* Warnings

* Fix

* YOLO

* Format
2021-10-27 15:36:06 -03:00
MaideandGitHub de3fc29d51 En_Ot ~~(1 non-matching)~~ (#302)
* En_Ot

* Fix
2021-10-27 11:59:21 -03:00
MaideandGitHub c97a8e5225 En_Tite (#318)
* En_Tite

* Fix
2021-10-27 11:02:26 -03:00
MaideandGitHub a60c47a970 En_Fish2 (#292)
* En_Fish2

* Fix
2021-10-27 10:28:52 -03:00
Connor AndersonandGitHub 820d8b6270 ovl_En_Muto OK (#358)
* ovl_En_Muto OK

* Address initial PR comments

* Add heading to file

* Address additional PR comments

* Update ovl_En_Muto to new animation system
2021-10-25 10:00:07 -03:00
Tom OvertonandGitHub bfd1ab28a6 En_Giant OK and mostly documented (#346)
* Migrate data to C

* EnGiant_Destroy OK

* EnGiant_Init OK

* func_80B01A74 OK

* Comment what each of the quest items are

* Put a little comment for myself on func_80B01A74 because it was confusing me lol

* Very early names (they're all bad)

* func_80B01990 OK

* EnGiant_Update OK

* func_80B024AC OK

* func_80B023D0 OK

* func_80B024D8 OK

* func_80B02354 OK (this function is bad!)

* func_80B020A0 OK

* func_80B01EE8 OK

* func_80B01E84 OK

* func_80B0211C OK

* func_80B02234 OK

* unk_250 -> sfxId and label SFX

* func_80B02688 OK

* func_80B026C4 OK

* EnGiant_Draw OK

* Update spec

* Fix up the static data

* unk_24E -> alpha

* Document some of the animation stuff

* Name EnGiant_IsNotFreed

* Document the giant types better

* Minor cleanup

* Add explanatory comment

* Rename the functions in functions.txt too, whoops

* Document sFaceTextures and blink routine

* Document all the various animations

* Name EnGiant_PlaySound

* Document some functions and change an unknown to action

* Add an SFX id I missed

* Name all the action funcs

* Name last two functions

* Mark one case as unused

* Change func_800F5A8C to use arg0, arg1, arg2, etc.

* Move sFaceTextures to EnGiant_Draw and comment what they are

* EnGiant_IsNotFreed -> EnGiant_IsImprisoned

* Use booleans in EnGiant_IsImprisoned

* **/ -> */

* action -> csAction

* Make macros for all type conditional checks

* Add warning about inconsistency

* Document the cs actions

* Add some documentation to animation-changing functions

* Update the function name in functions.txt too

* Improve GIANT_TYPE macros

* Remove an unncessary early return

* Incorporate animation changes
2021-10-25 09:22:17 -03:00
ef53ba8261 z_game_over.c (#263)
* game over

* Fixes

* Revert save field rename

* Fix comment indent

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Add bss reordering stuff, fix bss reordering in z_scene_proc

* Enum uggestions, fix item id

* link -> player in enum comments

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-10-24 13:41:50 -03:00
dcf44596d2 Animation system updated, some more boot files decompiled (+6%), z_fcurve_data_skelanime decompiled (1 non-matching), some asm files split, etc (#89)
* Progress on various files

* gfxprint stuff

* split some rodata, add iconv for rodata string parsing

* z_std_dma rodata

* 2 nonmatchings in gfxprint

* mtxuty-cvt ok

* more

* match a function in idle.c

* progress

* Cleanup

* Rename BgPolygon to CollisionPoly

* progress

* some effect stuff

* more effect progress

* updates

* made suggested changes

* z_effect_soft_sprite_old_init mostly ok

* remove old effects enum

* gamealloc.c OK

* added more files

* motor.c almost done

* motor.c OK

* updates

* migration of two files

* listalloc.c oK

* z_fcurve_data_skelanime split

* z_fcurve_data_skelanime.c decompiled

* more files split

* z_malloc.c OK

* contpfs.c OK

* fault.c rodata migrated

* migrated fault_drawer rodata

* update

* update preprocess.py

* renamed functions in z_skelanime

* started z_skelanime cleanup

* like halfway through fixing z_skelanime

* animation system updated to meet oot standards

* remove unused animation structs

* rename matrix structs to fit oot

* Add -woff 712

* fix diff_settings.py because i accidentally broke it before

* fixed merge conflict, doesn't match though

* It matches now

* Updates

* Fixed warnings...added gcc code syntax checking

* Remove gcc check, added in Tharo's PR

* warnings fixed (i think)

* fixed all warnings i think

* ok

* not sure what to do

* Fix all warnings i think (z_en_a_keep needs some file cleanup thouguh)

* it matches if i do this

* remove comment

* accidentally put osPfsFreeBlocks in epilinkhandle.c

* memcmp -> bcmp

* change u32 size to size_t size, delete string.h because it caused unnecessary confusion with defining size_t twice

* format.sh

* MTXMODE_NEW and MTXMODE_APPLY to matrix functions

* Made suggested changes

* pragma sFaultDrawerFont instead of including in repo

* add some functions to functions.h

* Bss reordering fixed in z_collision_check...added hack to disasm.py

* Updated z_en_a_keep.c

* Missed suggestion in EnAObj_Destroy

* .

* update z_fcurve_Data_skelanime and z_skelanime with suggestions

* devmgr.c ok

* minor changes

* Addressed comments

* remove redundant file

* gfxp -> dlist in game.c

* updated actorfixer.py

* fixed warnings in z_malloc

* Change void* back to Actor*

* format

* Add the soft_sprit comments back

* Rename SV->Flex

* remove .common

* run format

* Update src/code/z_skelanime.c

* u32 channel

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-10-24 10:59:14 -04:00
EllipticEllipsisandGitHub 151e098e48 z_debug OK (#330)
* z_debug OK

* Rename function

* Remove duplicate struct

* Update z64.h
2021-10-14 12:25:14 -03:00