Dragorn421
b5f68ac54e
Merge branch 'main' into doc_pause_menu
2024-08-12 01:05:38 +02:00
cadmic
8366b8731e
Set up build system and disassembly for ntsc-1.2 ( #2021 )
...
* Set up build system for ntsc-1.2
* Set up disassembly for ntsc-1.2
* Add all unnamed functions to functions.txt
* Update docs/retail_versions.md for ntsc-1.2
* Format
* Update docs/retail_versions.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Remove mention of US
* OOT_N64 -> PLATFORM_N64, OOT_GC -> PLATFORM_GC
* Move mtxutil to libultra/gu
* Fix libultra/io bss splits
* Fix merge
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-11 06:20:43 -04:00
cadmic
d495436190
Match remaining GC retail versions ( #2019 )
...
* Match the remaining GC retail versions
* Fix BSS ordering for existing versions
* Disable clang-format for #pragma increment_block_number
* sramResetCode -> sSramResetCode
* Replace 0xFF3F with or-ing all buttons together
* Revert "Disable clang-format for #pragma increment_block_number"
This reverts commit 406b6d26c9
2024-08-09 20:58:46 -04:00
Tharo
ef329e633a
[Audio 2/?] Extract audio samples to wav ( #2020 )
...
* [Audio 2/?] Extract audio samples to wav
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
* How
* Hopefully fix warning I don't get locally
* Pad default sample filenames, comment on the vadpcm frame encoder functions, other suggested changes
* Small tweaks to above
* Remove some obsolete code
---------
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
2024-08-08 22:39:18 -04:00
cadmic
feac688313
Match NTSC file select ( #1998 )
...
* Match NTSC file select
Co-authored-by: inspectredc <inspectredc@gmail.com>
* nes -> eng in macros
* Duplicate more code but use less #ifs
* Format
---------
Co-authored-by: inspectredc <inspectredc@gmail.com>
2024-08-08 00:27:02 -04:00
Tharo
29acf96db2
[Audio 1/?] Extract Samplebanks and Soundfonts to XML ( #2008 )
...
* [Audio 1/?] Extract Samplebanks and Soundfonts to XML
* Remove config.py and use the version yamls for addresses, other suggested changes
* Adjust setup-audio
* Remove some commented out dead code (MM review)
2024-08-08 00:11:39 -04:00
cadmic
0186524300
Match NTSC z_kaleido_scope.c ( #1988 )
...
* Match NTSC z_kaleido_scope.c
* Use new REGs everywhere
* Add comments for YREG initialization
* Use new REGs everywhere for real
* Fix merge
2024-08-08 02:03:22 +02:00
Dragorn421
74c4839f8a
Merge commit 'ab2ca85227bb4ed245d3a39faedc25f793a39a45' into doc_pause_menu
2024-08-01 21:47:27 +02:00
Dragorn421
b6581fd43e
Merge commit 'bf3339a16d6bf1d48165853540f20aebfdf5367a' into doc_pause_menu
2024-08-01 21:39:02 +02:00
Dragorn421
7e49dfcabd
Merge commit 'baf1e8c1748b6440e5d594a8d0079d4eb2e3acee' into doc_pause_menu
2024-08-01 21:33:10 +02:00
Dragorn421
2b425dfa62
Merge commit '1b0e35c89ad8875272a568ae4ab1e301e99e9316' into doc_pause_menu
2024-08-01 21:32:54 +02:00
Dragorn421
1a5eb5cd92
Merge commit 'd8f2e9abc67163a366fa2e62ac5d2d7467dfdb65' into doc_pause_menu
2024-08-01 21:29:41 +02:00
Dragorn421
2b24b8a07a
Merge commit '87a6e752429a7821ae81dcf8bffc6cdf13803084' into doc_pause_menu
2024-08-01 21:23:12 +02:00
Dragorn421
eca2c3e10d
Merge commit '39de6ce293d4f2ea31013a746404d730aca3f061' into doc_pause_menu
2024-08-01 20:18:13 +02:00
cadmic
c83b93aae4
Match NTSC z_parameter.c and z_construct.c ( #1987 )
...
* Match NTSC z_parameter.c and z_construct.c
* Comment which REG collide
* Use new REGs everywhere
* Use new REGs everywhere for real
2024-07-17 18:52:38 -04:00
cadmic
bf3339a16d
Set up build system and disassembly for gc-us ( #1982 )
...
* Build gc-us
* Set up gc-us disassembly
* Don't disasm unchanged overlays
* Fix gc-eu-mq BSS
* romalign link_animetion for NTSC
* Explicitly set CPP defines to 0/1
* Add #ifs to segment_symbols.h
* Add sButtonTextures now
* Fix message _SHIFTL usage
* Don't ifdef LANGUAGE_MAX
2024-07-06 21:38:31 +02:00
Tharo
baf1e8c174
Reworked text extraction + add JP text extraction ( #1980 )
...
* Reworked text extraction + add JP text extraction
* Format
* Suggested changes
* Correct address for gc-us sJpnMessageEntryTable
Co-authored-by: cadmic <cadmic24@gmail.com>
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
2024-07-02 22:42:52 -04:00
cadmic
1b0e35c89a
Extract NTSC assets for gc-us ( #1973 )
...
* Extract NTSC assets for gc-us
* Extract kanji
https://github.com/zeldaret/mm/pull/1536
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
2024-06-26 06:22:26 -04:00
cadmic
4dc70fefee
Rename gTitleZeldaShieldLogoMQTex -> gTitleZeldaShieldLogoTex ( #1974 )
2024-06-24 17:50:45 -04:00
cadmic
9def6f4d0d
Set up multiversion assets with ZAPD and match gc-eu ( #1967 )
...
* Add ZAPD hack to deal with extracted/VERSION/ in include paths
* Extract assets to extracted/VERSION
* Add ZAPD flags to override virtual address / start offset / end offset
* Configure offsets for code and overlay assets
* Reorganize ZAPD configs
* Match gc-eu-mq
* Match gc-eu
* Remove old asset dirs during distclean
* Revert "Remove old asset dirs during distclean"
This reverts commit fc8027a75fhttps://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "0285e11f0"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-06-24 15:22:39 +02:00
cadmic
9cbd57d329
Fix miscategorized scenes ( #1946 )
...
* Fix miscategorized scenes
* Sort includes
2024-04-18 22:21:34 -04:00
cadmic
39de6ce293
Extract unused scene headers ( #1930 )
...
* Extract unused scene headers
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "1300a4f36"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "1300a4f36"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* Add more unused arguments to CS_LIGHT_SETTING
2024-03-23 12:38:05 -04:00
fig02
bd0941405d
Document Player's Face and z_actor FaceChange functions ( #1928 )
...
* create some enums
* gonna try struct instead of array
* struct works. add docs too
* inline function comments
* fix function comment
* name faces, move enums
* rename textures
* outnames
* remove comments
* change comment slightly
* fixup face comments
* review
* offset comments
* add and use PLAYER_FACE_MAX
* typo
* more comment on blinkDuration
* another change to the comment
2024-03-23 12:21:45 -04:00
Dragorn421
4ee4b93b4f
Merge branch 'main' into doc_pause_menu
2024-03-09 17:17:17 +01:00
Dragorn421
a6f646dc65
Introduce extracted/VERSION, with text extracted there ( #1730 )
...
* Introduce assets/_extracted/VERSION, with text extracted there
* move to `extracted/text/`
* Update gitignore s
* rework args for msgenc.py
* put mkdir with others, until theyre all moved at once
* move 0xFFFC back to being extracted, making it use specific macro `DEFINE_MESSAGE_NES` to handle its special behavior
* prettier gitignore
* Move messages 0xFFFC, 0xFFFD to committed message_data.h
2024-03-01 22:09:57 -05:00
Dragorn421
f53d0adebb
Merge commit '324db1d57830dcb2a45720445ac5d7904a6f5c6a^' into doc_pause_menu
2024-01-27 22:45:29 +01:00
Yanis42
21cb04db2c
Document `z_bg_mizu_movebg.c` ( #1565 )
...
* document z_bg_mizu_movebg.c + assets
* remove temp comment
* renamed "temp" variable
* review 1
* format + type names comments at dLists/colHeaders
* review 2
* review 3
* named dragon statue 1
* float -> floating + review
* format
* review 5
2023-12-15 15:33:50 -05:00
hiisuya
cc96184a96
Doc Actor: En_Ma1 (Child Malon) ( #1584 )
...
* started malon documentation
* docd all event and inf table checks
* doc cleanup
* ran formatter
* fixed misnamed eventcheck
* revert isNotSinging oops
* removed unnecessary comments
* changed from handle to update
* revert vec3f name change
* moved texture information
* isNotSinging to singingDisabled
* rename of inftable and eventchk
* small cleanup
* anim enum change
* enum names for child malon limbs
2023-12-10 14:36:12 -05:00
hiisuya
68bdbf7759
Doc Actor: En_Brob (Jabu Jabu Wobble Flesh Block) ( #1581 )
...
* brob function naming
* modified brob header file
* renamed skel, collision, and anims
* named limbs and dls
* renamed shock function
* ran formatter
* doc modifications
* Update assets/xml/objects/object_brob.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-11-19 05:11:52 -05:00
Javarooster
dc323052c3
Changed gLinkChildSlinghotStringDL to gLinkChildSlingshotStringDL ( #1576 )
2023-11-12 00:01:55 +01:00
Dragorn421
d43613694c
Merge branch 'master' into doc_pause_menu
2023-09-20 21:50:15 +02:00
Dragorn421
6b3e8d46cd
Merge commit 'd314cfe92395172612676a8ad007a0639c8d5666^' into doc_pause_menu
2023-09-20 18:49:54 +02:00
Billy
107c0288cc
Dekunut Salesman Docs ( #1493 )
...
* Dekunut Salesman Docs
* Update src/overlays/actors/ovl_En_Dns/z_en_dns.c
Remove extra param from debug logging
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* * Full Deku/Potion name usage
* Dialog -> CanBuy
* Revert debug logging symbols
* Proper declaration spacing
* Fix en_shopnuts header doc
* Biz -> Business
* Fix missed deku prefix's
* Synchronize CanBuy sticks and nuts
* Fix enum naming
* Clarified CanBuy success values
* anon review
* fig review
* macro changes
* fix macro usage
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2023-09-19 21:41:42 -04:00
Billy
fc3e0f080b
En_Cow Doc ( #1492 )
...
* Add Documentation for Cows
* Better naming for cow unlock flag
* Update with MM solutions and PR suggestions
* Readable conditions
* Decimal cycle counter
* Replace params with cow type
* Clean up type usage and function names
* Clean up cylinders
* Fix collider enum
* Rename EnCow rear collider
* Fix spacing
* PR fixes:
COLL -> COLLIDER enum
static prefix
Missed MM function naming
Specific actor flags naming
* Rename of healRot and breathTimer
* Document Epona's song reset behavior
* anon review
* fig review
* whitespace
* rework milk interaction stuff
* changes to milk comment
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2023-08-19 11:34:48 -04:00
Dragorn421
d6207b17c2
Doc/cleanup pass on effects 1 ( #1421 )
...
* Some doc/cleanup on `Effect_Ss_Fhg_Flash`
* Some doc/cleanup on `Effect_Ss_Blast`
* 11DA0 -> Billboard
* doc three lerp funcs in effectss
* Some doc/cleanup on `Effect_Ss_Bomb`
* `rTexIdx` -> `rTexIndex`
* lifespan
* `LIFESPAN` -> `EFFSSBOMB_LIFESPAN`
* --parentheses
* Add todo about "having zapd forward declare static variables"
* try rework comments on effects scale
* lightning -> "a ball of electrical arcs" ?
2023-08-15 20:28:12 -04:00
Dragorn421
47bd5d9525
Merge branch 'master' (early part) into doc_pause_menu
2023-08-15 14:57:47 +02:00
Robin Allen
e272186b5f
hyrulefield_point_name_eng → hyrule_field_point_name_eng ( #1521 )
...
To match the other asset names.
2023-08-13 11:56:48 -04:00
Tom Overton
fe1b59eccc
Ensure all boss title cards are extracted as IA8 ( #1512 )
...
* Ensure all boss title cards are extracted as IA8
* Drop `Boss` from some of the title card names
* Format
2023-07-03 13:12:51 -04:00
Dragorn421
eb75e00f91
Merge branch 'master' into doc_pause_menu
2023-06-27 14:29:20 +02:00
Tom Overton
e11c7d8e3b
Fix issues with texture sizes in object_mori_tex ( #1505 )
2023-06-20 23:34:57 -04:00
playerskel
9f0b7bb8a3
another round of trailing whitespaces ( #1495 )
2023-02-26 17:26:07 +01:00
Dragorn421
a49731dd06
Merge branch 'master' into doc_pause_menu
2022-12-26 16:29:33 +01:00
Derek Hensley
4a9873775c
TransitionFade docs and clean up other transitions ( #1459 )
...
* TransitionFade docs
* PR suggestions
* Fix
* Fill
* Other transitions + enums
* Prefix transition assests with trans
* Fix end_title
* format
* OutNames
* nitpicks PR
* cleaner
2022-12-24 03:46:56 +01:00
Dragorn421
b4d3d1d6d2
Merge branch 'master' into doc_pause_menu
2022-12-13 13:33:58 +01:00
Dragorn421
880e7c937c
Some cleanup/doc on the item icons ( #1263 )
...
* Some cleanup/doc on the item enum and icons
* `gItemIconBigBottlePoeTex` -> `gItemIconBottleBigPoeTex`
* Biggoron sword / giant knife items (?)
* `SPSTONE_` -> `SPIRITUAL_` ?
* `gItemIconBrokenBiggoronSwordTex` -> `gItemIconBrokenGoronsSwordTex`
* `gQuestIcon...MedallionTex` -> `gQuestIconMedallion...Tex`
* `ITEM_MAGIC_` -> `ITEM_MAGIC_JAR_`small/big
* `ITEM_BOW_ARROW_` -> `ITEM_BOW_`
* `MASK_BUNNY` -> `MASK_BUNNY_HOOD`
* Update `GID_` enum from `ITEM_` enum
* ITEM/GID`_ARROW_`small/medium/large -> 5/10/30
* Run formatter
* .
* fix regressions and revert bad ideas
* chicken
* obey the newline police and also prevent the range police from intervening
* fixups
* dimensions -> dimension (singular)
* Note on inconsequential oddities about the `gItemIcons` mapping
2022-12-12 21:45:54 -05:00
Dragorn421
61c4864972
Merge branch 'master' into doc_pause_menu
2022-12-11 10:52:27 +01:00
Parker Burnett
85a4d23fc6
Documentation For En_Ik ( #1190 )
...
* pushing up to save changes
* syncing up some more docs
* finishing what I can
* PR feedback
* fixing typo
* Addressing comments
* master merge
* naming object
* ummm committing this for now before catching up
* other review + my review
* more review
* review2
Co-authored-by: fig02 <fig02srl@gmail.com>
2022-12-08 13:57:17 -05:00
Dragorn421
5bd4d4dd49
Merge commit '274743738b0db3a07612d610059ee2490728667e' into doc_pause_menu
2022-11-27 12:56:19 +01:00
Charles Averill
9bdf6ded2f
Document En_Ko Animations ( #1306 )
...
* Document Kokiri Children animations
* Remove BOY, GIRL, and FADO prefixes
* Formatting
* Further prefix removal
* more fixups
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2022-11-21 16:30:27 -05:00
Derek Hensley
83c3b64b1c
Doc object_rs ( #1439 )
2022-11-21 06:12:54 -05:00
