6ff77ab092
Recomp v0.6 ( #1215 )
2023-03-18 08:03:17 -03:00
58022571ba
subrepo asm-processor ( #1212 )
...
* yeet
* git subrepo clone git@github.com:simonlindholm/asm-processor.git tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "bbd86ea1f"
upstream:
origin: "git@github.com:simonlindholm/asm-processor.git"
branch: "main"
commit: "bbd86ea1f"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2023-03-17 15:16:30 +11:00
a17949e730
Document z_en_time_tag ( #1140 )
...
* time-tag docs
* simplify enums
* PR Reviews
* PR Suggestions
* small change
* small fix
* PR Suggestions
* add extra func ref
* rm raw text from first actor I decompiled
* Stock Pot Inn
* fix master merge
2023-03-16 13:47:38 +11:00
2987390a20
Audio `seqplayer.c`: AudioSeq_ to AudioScript_ ( #1202 )
...
* AudioSeq_ to AudioScript_
* Update src/audio/lib/playback.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* format
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-15 11:09:49 +11:00
0c3a48ef94
Subrepos update ( #1208 )
...
* git subrepo pull tools/asm-differ --force
subrepo:
subdir: "tools/asm-differ"
merged: "ae408664a"
upstream:
origin: "https://github.com/simonlindholm/asm-differ "
branch: "main"
commit: "ae408664a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull (merge) tools/fado --force
subrepo:
subdir: "tools/fado"
merged: "8d896ee97"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "8d896ee97"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/graphovl --force
subrepo:
subdir: "tools/graphovl"
merged: "dab4addae"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git "
branch: "master"
commit: "dab4addae"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/z64compress --force
subrepo:
subdir: "tools/z64compress"
merged: "43035d97f"
upstream:
origin: "https://github.com/z64me/z64compress.git "
branch: "main"
commit: "43035d97f"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/ZAPD --force
subrepo:
subdir: "tools/ZAPD"
merged: "23929ec93"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "23929ec93"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Revert "git subrepo pull tools/z64compress --force"
This reverts commit 2e487b5008
2023-03-15 10:51:47 +11:00
c833969ea7
`z_actor` documentation pass ( #1154 )
...
* ActorContext_unk_1F4
* a
* ACTOR_FLAG_IGNORE_QUAKE
* ACTOR_FLAG_TALK_REQUESTED and ACTOR_FLAG_CANT_LOCK_ON
* actorCtx->unkC => ctorCtx->halfDaysBit
* HALFDAYBIT defines
* actor.halfDaysBits
* format
* Actor_InitHalfDaysBit
* Name actor-killing functions
* cleanup variables.h a bit
* DAWN
* bss
* Actor_RequestRumble and Actor_GetArrowDmgFlags
* name vars of func_800BC620
* format
* fix missing PLAYER_IA
* Actor_OfferGetItem
* Actor_SetClosestSecretDistance
* freezeCategoryPlayerFlags1
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* DROPFLAG_
* a
* COLORFILTER
* format
* sCategoryFreezeMasks
* Actor_OfferCarry
* review
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* change hex to dec
* COLORFILTER_INTENSITY_FLAG
* format
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* shiftedHalfDaysBit
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* cleanup
* Undo Actor_RequestRumble
* Undo ACTOR_FLAG_IGNORE_QUAKE
* format
* Remove COLORFILTER_GET_BUFFLAG
* Undo Actor_KillAllFromUnloadedRooms
* format
* Update Actor_OfferGetItem comment
* Update Actor_OfferGetItem description
* diving
* bss
* namefixer
* format
* speed
* review
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-09 12:35:23 -05:00
496b4928ea
Rename `GameInfo` to `RegEditor` ( #1178 )
...
* Rename RegEditor and move it to regs.h
* bring over some minor doc from oot
* add missing include
* Update tools/disasm/variables.txt
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* update comment
* bss
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-08 23:53:38 -05:00
2f1e7b3de8
Stack cleanups ( #1193 )
...
* Use STACK and STACK_TOP everywhere
* format
* remove fake variable
* bss
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/boot_O2_g3/boot_main.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
* renames
* more renames
* and more
* whoopsie, forgot those too
* hopefully the last cleanup
* forgot some stuff
* a
* bss
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-03-08 15:25:51 -03:00
9f529aaf2a
HF progress script ( #1200 )
2023-03-08 13:54:56 -03:00
184f5858ff
Debug mode ( #1185 )
...
* OK
* Docs
* PR
* Format
* Update include/z64debug_display.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64debug_display.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-03-08 00:06:49 -05:00
c917880261
Misc cleanup 13 ( #1189 )
...
* FaultAddrConv Functions
* Invisible Ruppe macros
* skybox
* Z64 header defines
* ActorId
* remove i from KaleidoManager_FaultAddrConv
* size_t and parens
2023-03-07 23:44:18 -05:00
d7af72273d
z64frameadvance.h ( #1182 )
2023-03-07 23:19:08 -05:00
9b33e6a3a5
rename audio files ( #1188 )
2023-03-08 00:14:43 -03:00
e8f906100b
NPC Tracking ( #1184 )
...
* npc tracking
* fix func declaration
* more cleanup
* rm named var
* more cleanup
2023-03-07 23:33:16 -03:00
e50ab59cf7
Documented `object_sth` and `object_ahg`, both used by `EnSth` (Moon gazer who wants to buy Ocean spiderhouse) ( #1169 )
...
* object_sth/object_ahg: docs
* Ssh: formatter
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Oops missed one
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Seth: fixes
* Sth: more requested changes
* Apply suggestions from code review
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Sth/Ahg: requested changes
* Apply suggestions from code review
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* Sth: further function name requested changes
* Sth: minor note
* Sth: fix animation name
* Sth: forgot to rename saved flag
* Seth: change ocean wallet week reg name
* Sth: some requested changes
* Sth: fixed week event reg, added more
* Sth/Ssh/Si: changed from two defines to 1
* Si/Sth/Ssh: mistook fanfare for sfx, token define renamed
* Sth/Ssh/Sekihi: requested changes and some weekregflag docs
* Sekihi: fix missing header for skull count
* Sekihi: moved flag description to z64save
* Sekihi: moved flag description to z64save
* Sth: removed flag
* Update include/z64save.h
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
---------
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2023-03-07 20:54:12 -03:00
2cce8f6767
Introduce BgCheckFlags Defines ( #1195 )
...
* flags
* cleanup
* adjust comment
2023-03-04 19:53:56 -03:00
8b025badd1
`z_fireobj.h` header ( #1179 )
...
* fireobj.h
* name states and cleanups
* minor cleanups
* format
* bss
* review
* bss
* review
2023-03-04 15:53:10 -03:00
e8f3039264
speedXZ -> speed ( #1186 )
...
* speedXZ to speed
* brackets
2023-03-03 11:07:51 -03:00
cc8772a896
Name `Actor_PlaySfx` and `Player_PlaySfx` ( #1190 )
...
* name funcs
* namefixer
* function comments
2023-03-03 00:09:16 -05:00
5729b6d3f1
actor math cleanup ( #1187 )
2023-03-02 21:16:00 -03:00
263fca77c3
EnSi OK ( #1174 )
...
* [decomp,actor] Decompile Init,Destroy & unnamed functions (func_8098CA20 is WIP)
* [ovl_En_Si] Match func_8098CA20 function
* [0vl_En_Si] Comment data in spec
* [ovl_En_Si] Start documentation & cleanup
* [ovl_En_Si] Clang format
* [spec] Update ovl_En_Si reloc target
* Style fixes & adjust fanfare parameter
* Remove goto & styling fixes
* Styling fixes
* Remove unnecessary function declarations & dead code
* Styling fixes & doc (MR suggestions)
* Move GET_CHEST_FLAG macro to header file
* Rename colliderSphere variable to collider
* Rename func_8098CA20 to EnSi_UpdateCollision
* Rename func_8098CBDC to EnSi_DraggedByHookshot
* Rename func_8098CAD0 to EnSi_GiveToken
* Rename func_8098CB70 to EnSi_Wait
* Styling adjustment
* Update tools/disasm/function.txt with new function names
---------
Co-authored-by: Francis <francis.jeanneau@sparkmicro.com>
2023-03-01 22:17:30 -03:00
c70ccf14d9
Add original asset names for all `object_e*` and `object_f*` files ( #1181 )
...
* Add original asset names for all `object_e*` and `object_f*` files
* Add c_keyframe note to fall2
2023-02-28 09:41:54 -05:00
1e03e13b37
`z_eff_footmark` cleanup ( #1180 )
...
* z64eff_footmark.h
* arraycount and other clenaups
* flag
* extract data
* gEffFootprints
* singular
* minor cleanup
* review
* pos
* mf
* format
2023-02-27 17:56:04 -05:00
2080f9906f
EnStopHeishi OK ( #1156 )
...
* merge data
* its broken
* func_80AE7718
* IDK for now
* OK
* cleanups
* format
* PR fixes
* Delete BuildInfo.h
* PR fixes
* PR fixes
* PR fixes
* Update z_en_stop_heishi.c
2023-02-24 13:42:59 -03:00
8eb54f4b32
TransitionFade OK ( #1160 )
...
* Match fade
* Some adjustments from OoT PR
* Missed 1
* iREG(50)
* Fill
* Sync
* PR review
2023-02-24 13:20:18 -03:00
e75c51e841
WeekEventFlags: Entrance Cutscenes Watched ( #1166 )
...
* entrance regs
* cleanup comments
* add comment
* comments
* missed a space
* fix placement of comment
2023-02-24 12:08:06 -03:00
69f7540e33
EnGe2 (Gerudo in Purple) OK and documented, object_gla documented ( #1071 )
...
* OK, data imported
* Permuter settings
* Name data, a few functions and variables, cleanup
* Small amount of cleanup on some related actors
* Oops
* Document object
* Type and other macros
* Some cutscene stuff and temporary function names
* Proper path function names
* Name a couple more functions
* A couple more function names
* Name PathStatus enum
* Name rest of functions and formalise the documentation a bit
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* limbs
* Format
* Review
* format
* weekeventregconvert and format
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2023-02-24 11:59:17 -03:00
3e257354c1
Add original asset names for all object_d* files ( #1162 )
2023-02-21 17:43:34 -03:00
4c4c0d7307
Document `object_po_fusen` (Poe Balloon from romani ranch) ( #1167 )
...
* PoFusen: Documented object
* PoFusen: Cleaning and docs
* Apply suggestions from code review
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* PoFusen: fixes for requested changes, and additional changes
* PoSisters: replace NONEFFECT with NONE
* Fusen/Sisters: requested changes
* Fusen: more requested changes
* Fusen: removed documentation at request
* Apply suggestions from code review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Po Fusen/Sisters: fix dmgeff naming
* Po Fuse/Sisters: more enum/define/limb name cohesive
* Apply suggestions from code review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* PoSisters: comment caplitalization
---------
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2023-02-21 17:09:08 -03:00
50bd6056e2
Document EnSyatekiWf and do some slight cleanup on object_wf and other Syateki actors ( #1168 )
2023-02-21 16:42:20 -03:00
a7fd595136
Debloating `z64.h` 1: Introducing `z64skybox.h` ( #1150 )
...
* z64skybox.h
* Add a few placeholder values on the enum
* Remove unused structs on z64.h
* Update include/z64skybox.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* move skybox functions
* format
* Revert ARRAY_COUNT(msg)
* bss
* whoops
* Update include/z64.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* SkyboxDraw -> Skybox_
* use enum in z_play
* format
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-02-21 16:31:11 -03:00
5bc388b9a9
Introduce `object_table.h` ( #1136 )
...
* object_table
* segmentsymbols
* format
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* bss
* add more descriptions to the object_table
* DEFINE_OBJECT_SIZE_ZERO
* Update include/tables/object_table.h
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Rename `z_scene_dlftbls.c` to `object_table.c`
* bss
* bss
* bss
* bss
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2023-02-21 16:05:12 -03:00
5941e09b22
Fbdemo (TransitionTile) OK ( #1163 )
...
* Fbdemo OK
* Cleanup
* sync and format
* Fix functions.h
* format
* SQ
2023-02-21 15:36:56 -03:00
6f60872ddb
Lens docs ( #1123 )
...
* match MirRay_ReflectedBeam
* match Actor_DrawLensActors
* match func_80B9E8D4
* lens docs
* more lens docs
* fix
* cleanup
* move define down
* Actor_AddToLensActors
* small comment adj
* add one more comment
* fix bss
2023-02-21 15:06:22 -03:00
9297e6dd52
EnDekubaba OK and documented, object_dekubaba documented, EnKarebaba documented ( #1088 )
...
* OK, struct documented
* Data imported, update spec
* Name data
* Name all functions and variables
* Document object
* Bit more documentation
* Document Karebaba
* Add note to object_dekubaba
* Bit more cleanup
* Review
* Shadow
* Review
* Rename functions, add hit enum
* Figured out the enum
* Review
* MarkForDeath -> Kill
2023-02-21 14:30:09 -03:00
38edda8508
Fix Website 404 and Format script error message ( #1161 )
...
* Fix Website 404
* format script fix
2023-02-07 19:29:17 -05:00
ab8d34b8dc
Play (2 NON_MATCHINGS) ( #1109 )
...
* Bring over progress from another branch
Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
* cleanup, fake match Play_Init
* small fixes
* Some small cleanup
* Match func_80165460 (from debug)
* Match func_80165658
* Match func_80165DB8, func_80165DCC, func_80165DF0, func_80165E04
* Match func_80167DE4 (from debug)
* Match func_80167F0C
* Match func_80168DAC
* Matched func_80169100
* Matched func_801691F0
* import D_801DFA18
* match Play_Main thanks to debug
* cleanup
* synray does it again
* add docs from debug
* fix func_801656A4
* more docs and cleanup
* Match func_80166B30 and diff fake match in Init
* import transition docs from OoT
* Play Update, sort of
* cleanup Play_Update
* more cleanup
* slightly more docs
* small docs
* Play_Draw WIP Thanks @petrie911
* progress?
* two more matches
* format
* misc play docs
* transitions cleanup
* Motion Blur
* Transitions
* Fog
* Bombers notebook + small cleanup
* bss
* Camera Functions
* Picto functions
* Init
* MotionBlur Clean up
* Floor Surface
* Pictographs some more
* regs
* fix circular dependency problem
* Cleanup PR commits outside play
* namefixer
* PR picto
* PR audio
* PR small clean ups
* debug strings
* Picto defines
* bss
* enums
* remove void
* typedefs
* Hireso -> BombersNotebook
* bss comments
* bss and I8/I5 functions
* Smaller PR comments
* Transitions
* Combine enums
* Revert "Combine enums"
This reverts commit 0da1ebcaed
2023-01-14 12:18:13 -03:00
e2b61f88e4
sys_cmpdata OK ( #1065 )
...
* sys_cmpdata decomp
* implement suggestions
* sys_cmpdata OK
* format
* implement suggestion
* make bss data public
* format bleh
2023-01-14 00:29:50 -03:00
e4e0aed7cb
Update MinimapList struct + ZAPD ( #1165 )
...
* Update MinimapList struct
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "5786abbdd"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "5786abbdd"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "dbb99be"
2023-01-01 14:04:19 -03:00
c52414ff79
ovl_En_Zod OK with some Docs ( #1115 )
...
* func_80BAF1EC matching
* progress
* Draw
* progress
* Co-authored-by: darkeye darkeye@users.noreply.github.com
* progress
* Co-authored-by: petrie911 petrie911@users.noreply.github.com
* header fix
* data imported OK, textures extracted
* reloc ok
* cleanup
* fogNear
* cleanup
* animations
* textIds
* some docs
* Co-authored-by: EllipticEllipsis <EllipticEllipsis@users.noreply.github.com>
* EnZodAnimations
* more docs
* docs
* default
* pr review
* singular
* pr review
* Actor_Kill
* revert text comments
* 0xFFFF
* pr review
* pr review
* enum in order
* ForeArm <-> Arm
* .
* .
* default in switch
2022-12-26 17:39:47 -03:00
9c37452bf7
`audio_thread.c` OK and Documented (code_80192BE0.c) ( #1117 )
...
* copy docs from audio
* PR Suggestions Round 1
* more PR suggestions
* fix bss
* PR Suggestions
* oops, duplicate
* apply OoT Feedback, fix bss
* cleanup
* spacing
* bss
Co-authored-by: angie <angheloalf95@gmail.com>
2022-12-08 17:41:03 -03:00
a5425e4ffc
Import `EnAObj`'s data and a few cleanups ( #1111 )
...
* try to import data
* bss
* spec
* name actionfuncs
* macros for params
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-12-08 16:47:03 -03:00
bbbe0b1821
code_801780F0 OK and documented, EnPaper documented ( #1061 )
...
* File split
* Split, OK and documented
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
* Document relevant parts of DmBal
* Some EnPaper docs
* Document EnPaper
* Name functions
* Defake Actor_UpdateActor a bit
* Reword
* \cdot
* Fiddle with the description of the DE again
* Actually force is probably more correct
* Probably time to stop fiddling
* Format?
* Review
* Remove bug comment
* Review
* Rename to su_mtx, split off code_80140CE0
* Format
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2022-12-08 16:33:21 -03:00
b73d18b154
`z_parameter`: Main ( #1157 )
...
* main docs
* formatting and bss issues
* PR Suggestions
* missed enums
* better macros/enums
* restrictions improvement, still wip
* fix name, more common restriction patterns
* more restrictions cleanup
* rm comment
2022-12-08 15:54:38 -03:00
ea83e49e6e
Fado, part 2 ( #1012 )
...
* Makefile adjustments and additions to build fado
* Fix typo in makefile
* Fix it, maybe?
* Update build tools
* Update build tools
* rm cfg files
2022-12-06 21:15:23 -05:00
90469fd442
Use pointer types instead of s32 ( #1151 )
...
* pointers
* remove from segment_symbols
* format
2022-11-21 19:45:46 -03:00
fccd760be1
Add original asset names for all `object_b*` and `object_c*` files (and some related stuff) ( #1152 )
2022-11-21 16:31:28 +00:00
f92c4e6b02
`z_parameter`: Time (1 non-matching) ( #1144 )
...
* import time docs
* cleanup
* fix display list
* missed one
* three-day events
* PR Suggestions and cleanup
* adjust comment
* more macros
* PR Suggestions
* move InterfaceContext
2022-11-20 20:20:09 -03:00
1792268c94
`z_parameter`: Minigames ( #1131 )
...
* minigame docs
* cleanup
* vertices and cleanup
* fix bss
* change to perfectLetters
* fix parameter static
* more PR, namefixer
* PR Suggestions
2022-11-19 14:13:05 -03:00
eafc5bb4c1
Document object_boss07 (Majora assets) ( #1145 )
...
* Document object_boss07 (Majora assets)
* Respond to hensldm's review
* Respond to Elliptic's review
2022-11-15 00:22:13 +00:00
Derek Hensley