* Import data for z_draw
* Match z_draw
* cleanup
* rupees
* Some object gi docs
* More documents
* Add explanation on function names
* more cleanup
* Fixed some things
* More docs
* Object docs WIP, still not done. I'll continue tomorrow
* More WIP, should just be mask gi objects left now
* Some masks done, many more to go
* cleanup
* Last masks finish
* Shield Stolen
* cleanup
* Apply various dicussions
* remove casts
* PR Suggestions
* Sync PowderKeg
* PlayState rename
* Make this work with the latest master and run format
* Respond to hensldm's review
* Respond to Elliptic's review
* Add Effect_GetPlayState to namefixer.py
* Add missed comma
* Progress
* cleanup
* Fix comment
* progress
* OK
* Review pt1
* Update comments
* update comments some more
* Renamings
* Add headers and some parens cleanup
* Remove zelda64
* PR review
* bss
* Explain each relocation type a bit in the header comment
* Relocate_Addr macro
* Split off into z64load.h
* Adjust comment slightly based on OOT review
* OverlayRelocationType -> MIPSRelocationType
* Last bit of cleanup from OoT
* format
* Split off functions
* Bring code over
* Rename
* clean up variables.h
* Bring over some more code as well as cleanup
* remove newline in functions.h
* format
* Add plane functions
* Remove from actorfixer
* Add some more docs to plane functions
* Use temp for better format
* change func_8013E8F8 to return an s32
* rename origin back to pos
* format
* Add docs to SubS_ComputePlane
* format
* gfxContextPtr -> globalCtx
* bss
* Better docs of SubS_ComputePlane
* Normal -> unitVec
* Review pt. 1
* Update plane comment
* SubS_ActorAndPlayerAreFacing -> SubS_ActorAndPlayerFaceEachOther
* Add subs texture defines
* Update include/z64math.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* boot_800862E0 OK
* Ran format.sh
* attempt at fixing bss reordering
* boot_800862E0 OK (for real this time)
* Run formatter
* Changes u32 pointers to uintptr_t and sizes to size_t
* Run formatter
* Fix bss reordering
* Delete baserom.mm.us.rev1.z64:Zone.Identifier
* Cleanup and some notes
* Try my best to document
* remove comments
* Remove D_80097508 from variables.h
Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* First pass of `func_800BCCDC`
* river_sound OK (copy progress from audio WIP)
* Copy progress from `code_8019AF00.c` (still waiting for data to be imported)
* More docs
* feedback
* Add in `code_8019AF00.c` functions
* format
* params
* Minor cleanup
* Small fix
* one more
* Better names
* Add comment, cleanup Idx
* Fix bss
* Fix BSS
* Being documenting `Actor_DrawDamageEffects` and apply to actors
* More doc progress
* Small cleanup
* Document display lists
* more cleanup
* Fix Typo
* PR Review
* Shock -> Spark
* Missed one
* Missed another
* Fix dust textures
* Remove `_tex` from `light_orb_tex` (so that it matches convention)
* electric stun -> electric spark
* Fix mistake
* Fix float
* spark -> sparks where applicable
* Missed even more shocks...
* Name `drawDmgEffTimer` for consistency
* Fix BSS
* starting
* a bunch
* and another bunch
* a bunch
* Match func_800EB1DC
* func_800EB4B4
* func_800EB6F8
* 2 more
* fix prototype of a random kankyo function
* func_800EBD60 non matching
* func_800EC678 matched?
* func_800EC6D4
* break
* func_800ECD7C
* A bunch of functions
* func_800EE200
* func_800EDF78 and func_800EE0CC
* func_800EDBE0 NON_MATCHING
* Cutscene_Init NON_MATCHING
* func_800EA324 NON_EQUIVALENT
* Fix warnings
* func_800EC924 NON_EQUIVALENT
* Cutscene_ProcessCommands NON_EQUIVALENT
* Format
* Split z_demo data and import it
* Import bss
* Match func_800EB364
* Rename Cutscene_Command_SetTime
* Improve Cutscene_ProcessCommands a bit (still not equivalent, probably)
* Improve Cutscene_ProcessCommands thanks to engineer and anon
* Cutscene_ProcessCommands NON_MATCHING
* Name some commands
* Fix
* Renames based on Engineer knowledge of Audio stuff
* More command names
* Cutscene_Command_GiveTatlToPlayer
* Some cutscene commands macros
* more command macros
* Macros for unknown commands
* Improve Cutscene_Command_Textbox a bit
* Rename stuff
* Name Terminator and Camera
* MOTIONBLUR
* Macros for textbox commands
* CS_PLAYER_ACTION_LIST
* A few macro renames
* Small cleaning
* A bit more of cleanup
* Rumble
* Entrance comments in func_800EB6F8
* Some var renames
* CS_CMD_FADESCREEN
* More clean up
* Clean functions protos
* Move CutsceneStateHandler out of z64.h
* Cutscene_DoNothing
* Cutscene_IsPlayingCs & Cutscene_GetSceneSetupIndex
* And more renames
* name some stuff in the cutscenecontext struct
* npcActionIndex->actorActionIndex
* Undo names of CS_STATE_ enum
* Name Cutscene_ActorTranslate family of functions
* small docs pass
* sfxconvert and format
* Hopefully last cleanup
* Add some missing functions to actorfixer
* Fix merge issues and remove trailing commas
* Cutscene commands fix
* Cutscene_Command_Misc improved by engineer
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Address review
* bss
* Match Cutscene_Command_Textbox by anon58
* Fix merge issues
* Match Cutscene_Command_Misc by @hensldm
* review
* float time macros
* fix merge issues
* format
* Fix building assets
* fix merge issues
* format
* Fix
* format
* fix merge issues
* fix
* fix
* format
* fix issues and run format
* bss
* Fix conflicts, bss and formatter
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64cutscene.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64cutscene.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64cutscene.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* address review and fix some stuff
* fix merge problems
* more fixes and format
* Fixes
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/code/z_demo.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Engineer suggestions
* format
* Elliptic review
* Use dec for ShrinkWindow_SetLetterboxTarget
* add a few comments
* Cutscene_Command_ChooseCreditsScenes
* Update src/code/z_demo.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* format
* some cleanups and some comments
* change actorActionCmd from hex to dec in the codebase
* minor comment on textboxcmd
* ahhhh
* Update src/code/z_demo.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* brackets
* minor comments
* rewording
* im dumb
* brackets
* another bracket
* Dawn of the New Day
* Update src/code/z_demo.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* fixes
* Cutscene_Command_TransitionFX by Anon
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* First
* Part2
* Save now or forever hold your peace
* Part3
* Building
* OK
* Cleanup
* Merge
* PR
* PR
* Merge
* PR
* PR
* Use oyu
* Use names
* TexturePtr
* Match Player_GetHeight
* Another bunch
* Fix merge conflict
* rename Gfx_DrawDListXlu
* add WEEROR
* Actor_Spawn
* almost Actor_SpawnTransitionActors and Actor_Delete
* A bunch of small actors
* More renames
* format
* Some Player renames
* a few more
* import data
* run formatter
* func_800B7170
* whoops
* Fix merge issues
* Whoops 2
* func_800B83BC and func_800B83F8
* Actor_IsActorFacingPlayerAndWithinRange
* add some prototypes
* match Actor_UpdateBgCheckInfo
* func_800B7678
* mark Actor_SpawnAsChildAndCutscene as non_matching
* Actor_Draw
* Update is chaotic
* 2 new matches
* func_800BC8B8
* Another bunch
* function renames
* run formatter
* cleanup
* remove unnecesary casts
* add missing sfx
* Fix renames
* fix merge
* func_800BF7CC
* small bunch
* another bunch
* func_800BE184 non_matching
* two more
* split z_cheap_proc
* Another bunch
* another bunch
* a few and a non matching
* yeee
* a
* Actor_DrawAll non_equivalent
* Actor_RecordUndrawnActor
* i don't know what to put in this commit message
* func_800B4B50 non matching
* func_800B42F8 non matching
* func_800B5040
* func_800B5814 non_equiv
* func_800B6584
* func_800B6608
* func_800B6680
* func_800B7E04
* func_800B8118
* func_800b9170
* ,
* func_800BC4EC
* func_800BA6FC
* func_800BA798
* func_800BA8B8
* Actor_LoadOverlay
* small cleanup
* func_800BB2D0
* meh
* func_800BBAC0
* func_800BC270
* func_800B5208 non matching
* Fix warnings
* meh
* rename some ActorShadow_ functions
* fairy
* Flags_
* fix warnings
* format
* Actor_PickUp and family
* func_800B8E58
* match Actor_RemoveFromCategory
* another bit of docs
* Match func_800B86C8
* And another bit
* rename Player_GetRunSpeedLimit
* func_800B9E84
* func_800BE63C
* func_800BB8EC
* match func_800B5814
* match func_800B9334
* cleanup
* fix conflicts: first pass
* another fix
* actorfixer fix
* fix conflicts
* func_800BE680 non_equivalent
* Improve func_800BE680 a bit
* func_800BE680 equivalent (?)
* func_800BE680 equivalent
* Actor_UpdateActor equivalent
* format
* use some ExchangeItemID enum values
* Some more cleaning
* more cleanup
* More name stealing from OoT
* match func_800B82EC
* match func_800B9D1C and a bit of cleanup
* Add ACTOR_FLAGS placeholders
* Renames and match func_800BE184
* last pass of name stealing
* format
* fix conflicts
* more cleanup
* more cleanup
* cleanup and OVERLAY_RELOCATION_OFFSET macro
* Remove prototypes of obviously internal-only functions,
update variable names,
forward declare where necessary,
remove all `param_\d`s
* remove newlines
* minor rename
* Use ACTOR_FLAGS in z_actor
* Match func_800BE3D0
* Rename movement functions
* Document Actor_CalcOffsetOrientedToDrawRotation
* velX -> horizontalSpeed
* A bit of documentation for actor movement functions
* format
* Fix merge issues
* format
* Format
* Fix renames
* fix warnings
* fix conflicts
* review :D
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Fix
* format
* Actor_SpawnSetupActors
* engineer review
* Update src/code/z_actor.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* A bunch of Engineer's reviews
* more Engineer's review
* a
* whoops
* run actorfixer
* c'mon
* 😮💨
* whoops
* warning
* More engineer's review
* run format
* I'm dumb
* a
* match func_800BE680
* Match Actor_DrawZTarget
* Match Actor_SpawnAsChildAndCutscene, fix non-equivalent in Actor_UpdateActor
* Fix merge issue
* format
* update actor
* Steal a bit of @Thar0 documentation from OoT's z_message
* Run actorfixer
* Fix renames
* Match func_800B4B50 thanks to @hensldm
* Improve ActorShadow_DrawFeet thanks to @hensldm
* whoops
* Actor_PlaySfxAtProjectedPos
* Actor_UpdateActor matched by @hensldm
* Match func_800BA2FC by @hensldm
* Match Actor_SpawnTransitionActors by @hensldm
* Match func_800BB604 by @hensldm
* Match Actor_DrawAll by @hensldm
* ActorShadow_DrawFeet by @hensldm
* Actor_UpdateAll by @hensldm
* Match func_800BCCDC by @engineer124
* Small Actor_PlaySfxAtPos by @engineer124
* ACTOR_FLAGS_ALL and a bit of cleanup
* Add invisible comment
* Small docs pass
* Fix merge
* Engineer's review
* format lol
* Actor_DrawDoorLock docs
* Actor_SpawnShieldParticlesMetal
* fix merge issues
* sActorFaultClient
* fix
* commit message
* Run actorfixer.py && format.sh
* Fix warnings
* fixes
* format
* bss
* Update include/functions.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Address review
* Fix merge issues, format and such
* fix merge issues
* Add ACTORCAT_MAX
* actorList -> actorLists
* Fix merge issues
* format
* Enable WERROR on jenkinsfile
* Fix merge
* Use object symbols
* address review
* format
* review
* fix merge issues
* fix
* VRAM_PTR_SIZE, small cleanup and format
* review
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* Migrated data
* Migrate particleOverlayTable
* Import data for effect_soft_sprite, add g to effect table, minor cleanup of z64effect.h
* Name data
* Comment out static variable in variables.h
* Use better macros
* PR review and other cleanup
* Update bug comment
* Effect_Ss_Stick OK
* fix spec
* space between declarations and code
* Gfx -> Gfx[], fix spacing
* add deku stick to description
* add fragment to file description
* use autogenned gameplay_keep symbol
* migrated data and bss for z_kaleido_manager, renamed ovl_Player_Actor to ovl_player_actor to make it work with the data
* z_kaleido_manager OK
* add to functions.h variables.h and variables.txt
* init
* rename parameters in func_80163700
* rename func_80163700 to KaleidoManager_FaultAddrConvFunc
* change u32 casts to uintptr_t casts in z_kaleido_manager. (u8 *) casts must stay, they are the only casts that match
* ran format, uintptr_t
* made suggested changes
* Bigpo: object documentation starts and already issues
* Bigpo: almost all named
* Bigpo: done with object except ubused blobs
* Bigpo: added flame docs to gameplay_keep and minor cleaning, format pass
* Bigpo: forgot to remove sym and replace everywhere, with formater pass
* Bigpo: forgot about actorfixer
* Bigpo: disasm cant find asset xml values, have to put this undefined sym back for now
* Bigpo: warnings
* Bigpo: remove extern for gameplay_keep display list reference from aqua
* EnBigpo: suggested fixes to header calls and function name
Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Decompile various effect files and cleanup z_effect.c
* Decompile z_eff_tire_mark.c and cleanup structs
* Small cleanups
* Apply most review suggestions
* Apply more review suggestions
* Change eff_shield_particle vertices to be extracted as an asset
* Add relevant effect functions to actorfixer.py
* Import audio init params
* Add comments describing what these sizes represents
* Fix variables.txt
* Remove leading zero's from gTatumsPerBeat
* Name variables
* first few functions
* two more almost matching functions
* Rebase to NBS, get it to compile
* BgCheck_RaycastFloorStaticList OK, fix-up some functions
* BgCheck_SphVsStaticWall OK! and a few others
* more z_bgcheck NON_MATCHINGS
* OK more functions, reorganize external reference #defines
* More functions OK, more struct fixes
* More OKs
* Decomp all the way to the end of bgcheck
* All functions attempted
* Rename functions
* formatting, data migration
* Give names to unk structs, rename some structs, fix some non-equivalent functions
* WaterBox_GetSurfaceImpl OK
* BgCheck_ResetPolyCheckTbl OK, improve WaterBox_GetSurface2 codegen, eliminate warnings and clean up source.
* BcCheck3_BgActorInit ->BgCheck3_BgActorInit, fix warnings
* pr change requests
* fix crc maybe
* implement more changes
* implement alf's changes
* Copy over z64audio.h from audio WIP
* Cleanup z64audio.h
* PR Suggestions
* Improvements from Audio doc WIP
* More cleanup
* Remove a few structs, Introduce OcarinaSongId
* More cleanup from audio docs WIP
* Fix
* aisetfreq OK
* Add a lot of HW_REG and some other macros to libultra
* Format
* Remove extra volatile
* Review
* De-C guNormalize
* Correct typo in crc.c
* OK
* Symbols and other documentation
* Remove externs
* spec
* More documentation, decompile the texture files,
some uintptr_t and size_t
* Top-of-file comment
* Move symbols back into right order
* Use some defines
* Missed an osTvType and a size_t
* Add missing header to os.h
* Use segment symbol macros
* Remove duplicate header
* Address review suggestions
* Create enums (non-matching monkaBSS)
* Add effect enum
* Almost fix bss reordering (1 different word)
* Fix capacity
* Fully fix bss
* Add PlayerBoots
* PR Feedback & add missing playerForm enums
* Clean-Up
* Script to check global bss ordering
* Bit of cleanup
* Format
* Remove global_bss_check PR
* Fix bss
* Add enums to new PRs & previously missed ones
* Remove Effect Enums
* Missed one
* Format
* Remove old prevent_bss_reordering.h comments
* Use a better macro
* A few more uses of enums found
* Add enums to recent PRs
* Improve GI enums
* Add enums from new PRs
* PR Suggestions
* format
* Fix bss
* Fix mistake in GI
* No actually, part of it was correct before
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
* 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
* 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
* 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>
* Draw OK, Update very much not
* Flag table imported
* Update OK
* Actually OK this time
* Begin documenting
* Rename some stuff
* Rename functions
* spec
* Review
* Format
* Anghelo's review
* Fix lifemeter bss
* Format
* Missed one
* idle.c bss
* Decompile update and stuff
* Decompile some more
* func_80A41FA4 non_matching
* init is a disaster
* Import bss
* match func_80A41D70
* Improve func_80A42AB8 a bit
* equivalent EnTest4_Init
* Import data
* CLOCK_TIME
* Run formatter
* func_80A42AB8 may be equivalent now, not completely sure
* match func_80A42AB8
* Some minor renames
* Name some struct members
* Format
* format in bigpo
* fix merge issue
* Apply suggestions from code review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Description: Day transition effects
* Un-rename unk_144
* Update include/macros.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* sIsLoaded
* Update src/overlays/actors/ovl_En_Test4/z_en_test4.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* review
* format
* daytemp
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* ovl_opening OK
* un-format z64save.h
* Actually change the other uses of nextCutsceneIndex
* format
* Review
* engineer's review
* Get it to match again
* Migrate data to C
* ObjEtcetera_Init OK
* ObjEtcetera_Destroy OK
* ObjEtcetera_Update OK
* func_80A7C690 OK
* func_80A7C718 OK
* func_80A7C168 OK
* func_80A7BE8C OK
* Make the draw functions take Actor*
* CollisionCheck_SetAC should take a Collider
* func_80A7BDC8 OK (with silly dummy label meme)
* func_80A7C1F0 OK
* unk_276 is almost certainly a u16 since I constantly have to cast it, so just retype it
* func_80A7BF08 OK
* Some minor cleanup
* Convert D_80A7C80C to array of CollisionHeader*
* Finish defining struct to prepare for func_80A7C308
* func_80A7C308 OK
* Move gameplay_keep symbols to variables.h
* Explanatory comment at the top
* Type gameplay_keep animation headers too
* Update the spec (why do I always forget this?)
* Rename func_80A7BDC8 to ObjEtcetera_PerformFlutter (name still up for debate)
* Name objIndex
* Document the types of flowers
* Name displayListPtr
* Name burrowFlag and provide a macro
* Name specialFlutterScale and clean up some things with newer understanding
* Give the draw functions (bad) names
* Name ObjEtcetera_Idle
* Name ObjEtcetera_Setup (name sucks but oh well lol)
* Name ObjEtcetera_ReturnToIdle. These names all suck but they're a start
* Document some of ObjEtcetera_Idle's behavior
* Name and document objectIds
* Remove the burrow macro because it's frankly more confusing for now
* Name the draw functions something slightly better
* MUCH better names for things + more documentation
* Clean up ObjEtcetera_Setup a bit
* Call it NUMBER_OF_FLOWER_TYPES instead
* A few more name changes
* Link -> Player in comments
* displayListPtr -> dList
* Trailing commas + format
* Move initialization of type up
* Improve conditional check
* Use BGCHECK_SCENE macro
* Move initialization of floorBgId up
* Use documentation comment style
* Match ObjEtcetera_DoNormalOscillation without a dummy label
* param_2 -> arg1
* Insert blank line after scoped pad
* OBJETCETERA_TYPE -> DEKU_FLOWER_TYPE
* Cleanup and rename enum
* Break up ObjEtcetera_Setup a bit and convert DekuFlowerType to an s32 to remove warnings
* Whoops, run format
* Delete leading 0 on struct comments
* Rename pad to requiredScopeTemp to match my other PR
* OK, data imported, document
* spec
* Match cosf, document sinf and cosf
* Some more documentation, switch fu back
* Format
* Little more documentation
* Document coss too
* Move macros
* Review, add some .s
* Fix headers, review
* Started uncommenting statics, but then realized this actor has BSS, lol.
* Import .data and .bss. Run format.sh.
* ObjSyokudai_Init OK and mostly documented.
* ObjSyokudai_Destroy OK and fully documented.
* ObjSyokudai_Draw OK and partially documented.
* Good progress on ObjSyokudai_Update, but NOT OK.
* Instruction match, but needs regalloc and stack.
* Stack is closer now.
* Obj_Syokudai OK, no new warnings, ran formatter.
* Documented .data and .bss variables.
* Final documentation pass before PR.
* Add header, fix build errors.
* Use COLTYPE_METAL and COLTYPE_WOOD macros.
* Apply suggestions from code review
engineer124's suggestions.
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Apply suggestions from code review
engineer124: WaterBox* instead of UNK_PTR
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
engineer124: AC_HARD -> AC_HIT so Jenkins stops complaining
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Hopefully fix Jenkins via z_bg_lotus WaterBox*.
* Rename sp2C to waterBox in BgLotus.
* Run format.sh.
* Update include/functions.h
Change func_800F22C4 param_1 from s8 to s16.
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Change func_801A5CFC param_1 to sfxId in prototype
* Document interactions.
* Run formatter.
* Clarify that posDiff is relative to stick *tip*.
* Changed interaction comparisons to better fit enum
* snuffTimer enum
* Added more #defines.
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* eeeee
* nonequivalents
* draw
* Import data
* Match Daytelop_LoadGraphics
* draw kinda better
* extract daytelops and gameover
* SEGMENT_ROM macros
* Use extracted symbols for daytelop
* match Daytelop_Draw
* Fix bss
* draw cleanup
* Daytelop_Update from non equivalent to non matching
* Some renames and spec
* Run formatter
* enum
* sfx
* Use SEGMENT_ROM_START macros everywhere
* more macros
* run formatter
* Add description
* update variables.txt
* Remove extra stuff in gbi.h
* Would this fix it?
* and again
* whoops
* Apply suggestions from code review
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Tharo's suggestions
* match Daytelop_Update
* run formatter
* fix merge issues
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Import bss to boot_main and idle, match last function in idle
* Some pointer cleanup in idle, spec
* Clean up idle, add build.c, add bss to CIC6105
* Import rand bss
* sptask bss and a macro
* sptask updated to use libultra macros
* siacs.c bss
* Macros in CIC and idle
* controller bss
* seteventmesg bss
* spec
* pimgr and piacs bss
* initialize OK, threadsave, initialize, pimgr bss
* Match DmaMgr_Start
* Fix bss reorder using separate file
* Small cleanup of hex/dec in buffer sizes
* Add comment, remove unused bss from spec
* Merge remote-tracking branch 'upstream/master' into boot_bss
* Format
* Delete files
* remove commented-out structs
* Bit more cleanup
* Addressed reviews
* Format
* z_lifemeter done.
* fix new warning I didn't saw. add variables.txt
* suggested changes
* add new texture ptrs to undefined_sym, changed heartTex & temp to TexturePtr in LifeMeter_Draw
* change hex literal to decimal and other small suggestions
* change bool to u32; change hexa literal to decimal in LifeMeter_IsCritical; renamed undefined sym to their D_02 addresses
* re-applied format.sh on z_lifemeter
* coding style fixes
* fix typo in undefined_sym
* named func and vars.
* changed modulo check
* add extra line after var declaration in LifeMeter_Draw
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* changed unkTimer to camelCase; timer constant as decimal; flip some comparison in LifeMeter_Draw
* uncomment & rename func_ in functions.h
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Andzura <andzura@andzura.fr>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* wip
* fix
* add disassembler
* Disasm builds OK
* Variable addends
* More wip
* Rodata migration implemented
* Cleanup old tools
* Try fix submodule -> subrepo merge
* git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "602e609"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "602e609"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Builds again but assets are totally broken
* git subrepo pull --force tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "1ffdb08a"
upstream:
origin: "https://github.com/simonlindholm/asm-processor.git"
branch: "master"
commit: "1ffdb08a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables
* rm z64compress in preparation for subrepo
* git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "eb11085c"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "eb11085c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Fix asset extraction
* Fix diff-init make rule
* Split code bss
* Split assumed linker bug padding from assembly files
* add filelists for mm.us.rev1
* Maybe working, but I'm not sure
* add overlays to spec
* Add rodata to actos
* Everything compiles
* Make a lot of C files for code
* Add almost every file in code to spec
* whoops
* 3 code files left
* add scenes to spec
* More progress on progress.py
* Fix skelanime in spec
* audio files!
* Fix merge issues
* Fix some C files in code
* Fix remaining code files
* Use existing O1 C files in spec
* reorder boot order in spec
* update spec
* fault.c
* Convert relocs on completed actors, fixbaserom uses current rom name
* more boot files
* Add VT macros and script
* finish already existing boot files
* most of libultra
* fix 64bits libultra files
* Use C files for libultra, wrap some functions in NON_MATCHING
* Remove duplicate of OS_CLOCK_RATE from fault.c
* C files for fbdemos
* delete dumb files
* bootstrap C files, still need to add them to the spec
* update fixbaserom
* boot OK?
* I forgot to commit the spec
* C for gamestates
* C for kaleido
* Change all includes to ""
* copy actor sizes script from oot
* I forgot to delete those files
* Basic C files for effects
* Add effects initvars names
* Remove mislabelled boot functions from header/txt
* Begin porting bootstrap_fx, some sizes
* Fix <>
* Fix enum
* Fix diff.py
* fix libultra stuff
* update regconvert
* update setup warnings
* add some missing ;
* Fix some makefile stuff and other fixes on some non_matching functions
* add executable flag in extract_baserom and fixbaserom
* fix relative path
* copy assist from oot
* fix map path
* another assist path fix
* Delete C files for handwritten files
* add code_801A51F0 to spec
* add gfxbuffers to spec
* Move rodata to top of each file when possible
* UNK_TYPEs for func_801A51F0
* Remove kaleido rodata from spec
* Update spec and undefined_syms for recent merge
* GCC warnings and fix errors in nonmatchings,
* round percentage numbers
* progress script: format changes
* progress: error on non-existing files
* fix warning in z_scene_table
* Match 2 nonmatchings in z_actor
* Warnings in lightswitch and invadepoh
* Fix warning in z_actor_dlftbls
* I though I fixed this one
* whoops
* Comment out CC_CHECK
* Removed redundant ultra64.h includes
* Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms
* Completed gamestates bootstrap
* Split kaleido_scope
* Remove section.h and segment.h, move keep object externs to a common location in variables.h
* Completed effects bootstrap
* Segmented address externs for effects, fbdemos, gamestates and kaleido
* Move actor data externs out of the if 0
* Segmented address externs for actors
* Prepare actionfunc detection
* fix script, how did it even work before
* Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler
* Automated actionFunc detection in actors
* Segmented addresses from player .text
* rm old segment addrs script and fix build
* Move sizes folder to tools
* Make build.py executable
* New Jenkinsfile Prayge
* Remove numpy dependencies
* Add warnings_disasm_current.txt
* my bad
* Update spec and undefined_syms
* Add z_eff_ss_hahen to pametfrog
* git subrepo pull (merge) --force tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "163ca2af"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "163ca2af"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Make z64compress print to stdout
* sneeky commit to update warnings tooling
* test
* Another test
* Mark fixing overlay reloc generating as a TODO
* Update warnings stuff
* Communicate the return code from running z64compress back to the Makefile through the wrapper
* Run formatter, remove extra commented copy of function
* Re-fix some includes
* Convert atan to hex to conform to decided style
* Some tidying up, remove c for fp and the other two handwritten code files
* BSS in z_collision_check & z_scene_proc
* add static back in
* Fix timerintr bss, add file to spec, some cleanup
* Remove externs
* Newline
* Readd enums
* Typo
* Colours
* Comments for hitmark enum values
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Improvements and suggestions
* Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* merge main
* Match Init
* Clear_Tag OK
* Full documentation
* More docs
* Fix function
* Fix MakeFile for assets and Fix texture swapped names
* Fix name
* Improve name and remove pad
* Can't stop the minor tweeks
* Adding potential Makefile fixes
* Minor name change
* Another name fix... and format
* PR Suggestion & Add Overlay File Description
* Re-documentation to match OoT WIP (more to come)
* Finish docs from OoT
* Fix merge and format
* Minor touch-ups
* Cleaner conditional
* First decomp pass: Matched everything w/ data
* Minor cleanup of func_80AE2F78
* Documented
* Format
* Some cleanup and PR suggestions
* Format
* Add the word player to a few functions to specify it is the player trying to buy
* Add controller macros
* Move common shopkeeper defines
* name unk274 and add note to unk27A
* Remove macros and just use flag defines
* Convert Controller Macros to take globalCtx
* Fix merge conflicts
* Create z_quake.c file
* Match all quake functions with OoT counterparts (quake2 left)
* z_quake OK
* Document first half of quake
* More docs
* more cleanup
* remember to format!
* PR Suggestions
* More PR Suggestions
* Improve match in EnFirefly_Draw
* Vestigial fishing files, add enums
* Improve scripts, add ColChkInfo one
* Some minor actor cleanup (static etc)
* C file for Fishing, remove some local vars from variables.h
* Remove comma and format
* Newline
* Review suggestions
* First pass, 5 still non matching
* data
* cleanup
* Progress on func_808F33B8
* func_808F33B8 is ugly but it matches
* func_808F5728 ugly but matches
* cleanup
* More cleanup/doc a possible inifite loop bug
* Cleanup of the switch
* Readd functions returns
* More progress on THE switch
* Everything matches but the MACROS
* OK
* Add new global Animaion struct
* fix arg name
* PR suggestions pt 1
* PR suggestions pt 2
* Fix up a few things
* Add comment about walking flag
* update functions.txt
* Update 7 to more explicit bits
* More PR cleanup
* First pass
* second pass
* Everything matches now
* Fix ori
* final pass
* Add description
* Fix warnings (I hope)
* move dlist to top of the file
* Fix conflicts
* not ok, why?
* OK!
* fix data
* finish data etc
* work on save context
* save finished
* first func done
* roomInf
* done for now
* add missing file
* add most og names for struct members
* fix accidental change
* Update z_en_ginko_man.c
* Update z_scene.c
* maybe fix stuff hopefully
* proto
* sasa
* Update include/z64save.h
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update z64save.h
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* almost every function
* atans ok
* import data and rodata
* format `atan_first_8th_array`
* fix signature and rodata
* rename to angle
* Rename the functions to match their OoT counterparts
* rename code_0x8017FEB0 to sys_math_atan
* match function
* major cleanups
* rename switch functions
* use graph_alloc to fix fake matches
* more documentation
* more matches, lots of changes
* lots more work
* format
* Update z_scene_proc.c
* very hard lagrange interpolation function OK!
* remove any remaining
* documentation done, only two functions left
* a few more things
* one function left!
* document another oot leftover
* last function decompiled, not matched yet
* scene_proc complete
* start work on z_scene
* done with z_scene
* remove unessecary typedefs
* fix some things to remove warnings
* Add z_scene_table and decomp data
* Delete ctx.c
* add draw cfg enum
* cleanup
* most scene table functions done
* done for now
* all scene files done
* Update include/z64scene.h
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* add missing macros
* fix some renames
* scene texture file rename
* added temporary structs so it still builds
* more structs
* even more old structs
* fix boyo
* should fix compile error
* lets hope nothing broke
* ub comment back
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* start prerender
* match func_8016FDB8
* fix fake af match
* actually add prerender
* Delete ctx.c
* test
* lots of oot transfers
* lots of new functions done
* match even more functions
* slowly thread functions
* two prerender functions left
* some docs
* make names more consistent with oot
* ready for pr?
* Update PreRender.c
* z_en_item00 WIP 17/21 match, rest close to matching
* Split .rodata for z_en_item00
* Item00 documentation, some misc cleanup
* Minor cleanup
* Fixup for z_collision_check
* Address feedback
* Delete old file
* Fix bad merge
* 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
Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
Additionally, updated code to use PHYSICAL_TO_VIRTUAL and ALIGN16 macros.
Additionally, retyped gRspSegmentPhysAddrs back to u32 as in OOT. These get the straight return value of PHYSICAL_TO_VIRTUAL, so they are u32.
engineer124