Commit Graph

936 Commits

Author SHA1 Message Date
Tharo 43a3ad88dc
Handwritten asm build prep, add handwritten asm for the code segment (#1807)
* Convert entry.s to IDO, use objcopy instead of ipl3.s and audio/lib/stack.s, add handwritten asm for the code segment

* Fix disasm, review comments

* Other suggestions
2025-07-31 13:00:42 -04:00
engineer124 d31ceacfdf
Document Player's Face and z_actor FaceChange functions (#1777)
* player face docs

* more docs

* cleanup

* toto

* more comments

* fix bss, names

* better comment

* PR, fix comment

* fix bss

* sEyeTextures comment

* FaceChange_UpdateBlinkingNonHuman

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2025-06-03 18:59:25 -07:00
Derek Hensley 13d92a413b
Misc Fixes (#1809)
* EnAn MsgScriptCallback

* Version check

* Write .extracted-assets.json to outputDir

* Fix m2ctx

* Fix boot_functions.csv
2025-05-25 19:10:03 -07:00
Derek Hensley c99e2328ef
Fix_bss script update and fixes (#1805)
* Hardcode dealing with unreference bss at the start of files

* format
2025-05-25 09:33:14 -07:00
Derek Hensley 530e6d7fe7
Seperate baserom segments dir from output dir (#1802) 2025-05-24 09:58:06 -04:00
Derek Hensley 9ca02c79b5
Misc fixes (#1800)
* disasm_fix

* dtor

* Fault_LogThreadContext

* rearrange microcode

* sGfxPrintFont size of 0x800

* Move (null) to stackcheck

* vimgr bss

* sfx

* Remove code_801D1E80

* z_en_hy_code

* Fix assembler messages with endlabels and dlabels

* xlitob data

* Move skin unused bss pad to rumble
2025-03-24 10:52:10 -03:00
Ozero4 9213dc7a5e
func_80183070 to Sys_Freeze (#1686) 2025-03-04 19:06:23 -08:00
Derek Hensley b9c7cbcbf6
EffectSs Sync (#1799)
* gEffectSsOverlayTable

* Sync with OoT docs
2025-03-03 13:22:56 -03:00
Isghj fde2b78a92
`En_Kaizoku` and `object_kz` documented: the pirate fighter miniboss (#1788)
* Kaizoku: some docs

* Kaizoku: more docs

* Kaizoku: more docs

* Kaizoku: all object labeled

* Kaizoku: more docs

* More docs

* Kaizoku: more docs

* Kaizoku: more docs

* Kaizoku: more docs

* Kaizoku: first pass complete

* format

* Kaizoku: minor tweaks

* Kaizoku: Anghelos requested changes pass1

* Kaizoku: minor docs

* Kaizoku: get'n't

* Kaizoku: format

* Apply suggestions from code review

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

* Kaizoku: back to OK

* Kaizoku: more requested changes

* Kaizoku: outfit and lipstick color enums

* Kaizoku: rename object assets from gKaizoku to gFighterPirate

* Kaizoku: LIMB_FULL

* Kaizoku: some requested changes

* Kaizoku: more requested changes

* Apply suggestions from code review

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

* Kaizoku: back to matching

* Kaizoku: requested changes

* Kaizoku: missed change

* Apply suggestions from code review

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Kaizoku: back to matching and more requested changes

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2025-02-26 16:59:58 -08:00
Derek Hensley 61961fb938
Remove asm-processor in favor of preprocess.sh (#1760)
* Remove asm-processor in favor of preprocess.sh

* Remove duplicate CMD_F

* preprocess_pragmas gitignore

* Mac fixes

* Macos + clang as cc check fixes

* Need quotes for paths with spaces

* Fix bss
2025-02-21 18:02:19 -08:00
Derek Hensley 8d9750652e
Small sys_flashrom clean up (#1795)
* sys_flashrom cleanup

* Remove uncessary data word from function names

* format
2025-02-21 17:00:11 -08:00
Isghj 6f626d9186
`EnIshi` documentation pass, and `gameplay_field_keep` assets labeled (#1794)
* Ishi: some docs

* Ishi: more docs

* Ishi: more docs

* Ishi: field_keep assets labeled

* Ishi: format

* Ishi: minor docs/fixes

* Ishi: requested changes

* Spawn and Dust Funcs

* Ishi: only us version

* Ishi/Bombiwa: more requested changes

* Ishi: format

* Apply suggestions from code review

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

* Ishi: back to matching

* Ishi: a value got inverted somehow

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2025-02-21 16:31:45 -08:00
Derek Hensley 4780abbfd8
Misc FAKE fixes (#1783)
* CutsceneCamera_UpdateSplines fake match

* CutsceneCamera_Init -1 splineIndex

* Eye Point comment

* func_80B781DC better fake

* func_80B32F04

* ObjSwitch_Update

* ObjSwitch_InitTrisCollider

* ObjAqua_Init

* EnTrt_ItemGiven

* func_80C10E98 partly

* EnTest7_WarpCsWarp this to 1

* EnTest6_InvertedSoTCutscene better fake

* EnTest6_DrawAmmoDropRupee

* EnPoSisters_MatchPlayerY

* func_8095B76C

* EnMinifrog_Init

* func_80A5C0B8

* EnKnight_UpdateEffects

* EnKnight_FlyingHeadAttack

* EnKakasi_Init

* EnInvadepoh_ModelInfo_GetNextFaceAnim

* BgAstrBombwall_InitCollider like func_809CE068

* Player_UpdateInterface

* Player_CsAction_TranslateReverse

* DynaPoly_AddBgActorToLookup better fake

* CutsceneManager_FindEntranceCsId

* func_800AE930 better fake

* Math3D_CylVsLineSeg better fake

* MapDisp_InitBossRoomStorey

* Play_Init

* EnTimeTag_Diary_Wait better fake

* Remove fake label from Player_SwordFromIA

* Player_PostLimbDrawGameplay partly

* EffectBlure_AddVertex prev temp

* Player_PostLimbDrawGameplay attempt 2

* AudioMgr_StopAllSfxExceptSystem

* Camera_Normal0

* Camera_Jump2

* Camera_Normal3

* PR review
2025-02-16 09:30:27 -08:00
Derek Hensley 1241a8ca5c
Move spec to spec folder (#1790) 2025-02-02 13:37:38 -08:00
Tharo 84a89c8f46
GCC Compiler Support (#1791)
* GCC Compiler Support

* Update mkldscript
2025-02-02 13:15:55 -08:00
Sirius902 89b7bb0d71
Fix /bin/bash -> /usr/bin/env bash (#1793) 2025-01-29 21:16:26 -08:00
Derek Hensley c767f49455
Extract Incbins (#1776)
* extract incbins infastructure

* rspboot incbin

* rsptext incbin

* rspdata incbin

* aspMainStack incbin

* ipl3 incbin
2025-01-27 13:15:16 -03:00
Derek Hensley 74266850b0
Download IDO recomp instead of commiting binaries (#1781)
* download ido

* silence curl
2025-01-12 08:52:50 -08:00
Tharo e8e73fe771
Sync soundfont_compiler.c with recent OoT change, give automatic names to sequence 0 channels that implement sfx (#1784)
* Sync soundfont_compiler.c with recent OoT change, give automatic names to sequence 0 channels that implement sfx

* Fix bss
2025-01-12 08:30:17 -08:00
Derek Hensley da09352606
Move D_80097508 out of system_heap.c (#1779) 2024-12-28 08:27:25 -03:00
Tharo 06b06ab507
Check in makerom files (#1758)
* Check in makerom files

* Fix disasm for asm files in src
2024-12-22 15:48:13 -08:00
engineer124 4724a2b7fe
Standardize "ActorMovement" over "ActorMove" (#1773)
* actor movement

* cleanup

* missed one
2024-12-21 14:15:10 +11:00
Tharo 047c505b96
Remove gSystemHeap and the system_heap spec segment, use _buffersSegmentEnd to represent the start of the system heap (#1767) 2024-12-19 16:38:44 +11:00
engineer124 6156df5fee
Document Culling (#1759)
* culling docs

* cleanup

* PR suggestions
2024-12-15 19:11:29 +11:00
Derek Hensley 9e2ef99d2e
Ports over OoT's version config (#1750)
* Port over version_config from OoT

* extract_text

* remove need for calling by python modules

* Remove extract audio comment

* Newline

* pyyaml
2024-12-13 18:54:39 -08:00
Tharo fc8d1165c8
[Audio 9/9] Loose ends (#1755)
* [Audio 9/9] Loose ends

* Fix sampleconv memset bug

* Doc updates from oot
2024-12-13 16:27:45 -08:00
louist103 f6d4a8731e
Name OOT samples in sample bank 0 (#1695)
* Name samples

Fix FileName

FIx

Revert "FIx"

This reverts commit 510dcd8c03242f49d88173357c36fd0cc8911945.

Fix

* Formatting fixes

* fix

* \n

* snake case

* format

* Bank 2

* Fix extract assets

* Update SampleBank_0.xml

* Fix copy errors
2024-12-12 17:46:26 -08:00
Tom Overton fa240048cf
Boss07 (Majora) OK and documented [mm-n64-us.z64 OK] (#1753)
* more matches

* more functions

* merge, I hope

* wrath done-ish

* 5 nonmatchings

* more matchings

* more improvements

* more stuff

* stuff

* docs part 1 / infinity

* more docs

* .

* more adjustments

* linked assets

* Document object_boss07 and match Boss07_Incarnation_Intro (thanks Synray!)

* more stuff

* play part 2

* lol merge

* update

* unk types

* SWEET GOOGLY MOOGLY IT MATCHES

* cam fixes

* adjust damage stuff

* if?

* stuff

* signs

* macro stuff. clean up later

* names

* Some small cleanup

* cleanup and docs

* more cleanup

* Wrath shadow docs

* Use `EVENTINF_INTRO_CS_WATCHED_MAJORA` after merging

* Update functions.txt

* Types cleanup

* Some low hanging fruit

* Undefined_syms.txt

* More static -> battle handler

* Lots of naming cleanup

* Remove z_boss_07_dmgtbl.inc
The reasoning behind removing this file is simple; it wasn't all that long, so extracting it out to an included file didn't really add much, and it made refactoring and/or things much harder, since you needed to check in multiple places to change things.

* Get most of the limb stuff named (and actually update the spec)

* Some minor cleanup

* Updating the repo with what we talked about in discord

* Some syncing with Odolwa and other misc name stuff

* Some Odolwa/Bio Baba sync

* Another bit of Odolwa/Bio Baba sync

* Name a lot of incarnation limb variables

* Finalize the incarnation intro variable stuff

* Fix a goof

* `incarnationWrathTransition` variables

* `generalCollider` and always use "tentacle"

* Completely remove "shot," always use "projectile"

* Clean up `Boss07_Mask_Draw`

* Name `maskShakeTimer`

* Give better names to a few more things

* Some beam-related struct vars

* undefined_syms

* More beam names

* More beam stuff

* Beam, pt 100000

* Some intro struct members

* Some timers

* More non-beam stuff, back to beam

* Done with beam finally

* All but one of the subcam variables, some other stuff

* Some variable names and cleanup

* More cleanup

* jumpSfxTimer -> landSfxTimer

* actionState -> subAction and a little bit of syncing with Odolwa

* A couple more variables sync

* Buncha variables

* Lots of non-whip variables

* Commit what I have before starting on some of the grab stuff

* All but one struct var done

* Lots of header cleanup

* Finish the header file

* Fix build after merging main

* Damage effect enums

* Update damage effect enums for Incarnation and Wrath

* Update damage effect enums for Mask and Remains

* First pass at top damage effects

* Do a few sub action enums so I have something to show

* Fix the damage effect enums, clean up a lot of subaction enums

* All remaining sub action enums, cleanup damage effect enums, other misc cleanup

* Finish enums

* Finish data

* Push up what I have

* Consistency

* scroll -> texScroll

* low hanging fruit

* PR + small fix

* Happy with >20% of functions

* Happy with >40% of functions

* Happy with >60% of functions

* Happy with >75% of functions

* Happy with >90% of functions

* Happy with >95% of functions

* Happy with `Boss07_Wrath_DeathCutscene`

* Happy with `Boss07_Mask_FireBeam`

* Happy with `Boss07_Wrath_CheckWhipCollisions`

* Happy with everything but `Boss07_Mask_Draw`

* Happy with all functions I think?

* Clean up forward declarations

* Write a half-decent file header

* Fix after merging

* Fix some minor stuff here and there

* Minor fix in the file header because I forgot I renamed this

* Respond to engineer's review

* Respond to Anghelo's review

* Replace as many actor lookups with for-loops as I can in Odolwa/Majora

* Change the comment about the hookshot from a `@note` to a `@bug`

* `drag` -> `deceleration`

* Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam`

* Use decimal numbers in the various `FillShadowTex` functions

---------

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2024-12-10 18:06:55 -08:00
engineer124 3c16f534de
Document Light-Based Actor Flags (#1754)
* light flags template

* first attempt

* typo

* improve names

* improve comments
2024-12-05 20:48:38 -08:00
engineer124 33e4afd4d5
Player Docs: Slide on Slope (#1752)
* slide on slope

* cleanup
2024-12-02 17:11:00 -08:00
Derek Hensley a8dbb5ac27
Small Misc Clean (#1751)
* Fix z64item comment

* titleCtxt -> titleCtx

* combine gfx buffers bss into 1 file
2024-12-01 07:01:42 -03:00
engineer124 009708773e
Player Docs: First 8 Start Modes (#1749)
* start mode docs

* better comments

* improve owl docs

* reorder comment to more important first

* brief comment
2024-11-30 09:57:08 -08:00
engineer124 4c3fa3efd4
Document Actor Ocarina Interaction (#1748)
* ocarina interaction

* cleanup

* 0x

* document zora exception

* add comment
2024-11-29 09:58:42 -08:00
engineer124 b84e27c732
Name Remaining Hookshot Actor Flags (#1746)
* hookshot attachment

* period

* hookshot flags

* fix ordering

* comment, fix ordering

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2024-11-27 14:33:13 -03:00
engineer124 ba693efb08
Document Hookshot Attachment (#1745)
* hookshot attachment

* period
2024-11-26 11:26:55 +11:00
engineer124 a448168d37
Player Docs: Rename Init Mode to Start Mode (#1744)
* rename to start mode

* cleanup

* rm declarations
2024-11-22 17:04:34 -08:00
engineer124 0b51a16453
Player Docs: Spin Attack (#1741)
* spin attack

* cleanup

* fix bss

* PR review

* sync func name

* add todo
2024-11-20 15:48:50 -08:00
engineer124 70e97dc285
Player Docs: Init Action Cleanup (#1743)
* init action cleanup

* boomerang

* revert name
2024-11-20 10:15:28 +11:00
engineer124 00bafced8e
Player Docs: Zora Boomerang (#1739)
* zora boomerang

* missed some

* more docs

* cleanup docs

* more cleanup

* Player_IsUsingZoraBoomerang
2024-11-17 16:37:11 -08:00
engineer124 a957342583
Player Docs: Talking (#1738)
* player talk

* cleanup

* fix comment
2024-11-17 16:26:59 -08:00
engineer124 9cd9099a04
Player Docs: Z Targeting (#1736)
* z target docs

* Player_UpdateZTargeting

* func docs

* more cleanup
2024-11-07 16:54:21 -08:00
engineer124 318e391272
Animation Cleanup: En_Z* (#1727)
* cleanup

* more progress

* finish off z

* one more thing

* one more animIndex

* fix spacing
2024-11-06 20:43:28 -08:00
engineer124 d60a032b11
Further Attention Docs (#1732)
* more attention docs

* more docs

* cleanup

* more cleanup

* spacing

* more attention docs

* small cleanup

* consistency
2024-10-23 17:44:44 -07:00
engineer124 19495ba8e9
dyna switches (#1731) 2024-10-22 18:48:01 -07:00
engineer124 ec9b5839ad
Cleanup gSPMatrix, rename `Matrix_New` -> `Matrix_Finalize`, add MATRIX_FINALIZE_AND_LOAD (#1729)
* mtx-finalize

* cleanup gSPMatrix
2024-10-22 17:51:00 -07:00
engineer124 694d3b3965
turn in place (#1728) 2024-10-22 17:26:19 -07:00
engineer124 13c42b487d
carry flag (#1725) 2024-10-20 17:58:25 -07:00
engineer124 d03e8719e6
Player Docs: Idle and Fidget (#1723)
* idle and fidget docs

* more cleanup

* cleanup

* regs

* spacing
2024-10-20 07:35:03 -07:00
engineer124 781d1d1119
Target -> Attention (System Rename) Part 2 (#1721)
* remaining attention rename

* cleanup
2024-10-20 07:05:53 -07:00
Derek Hensley eee5762a55
Clean up gitignores (#1715)
* Clean up gitignores

* c m2c file
2024-10-18 17:45:18 -07:00