cadmic
04498f808f
[PAL N64] Match file select language selection ( #2240 )
...
* [PAL N64] Match file select language selection
* sInitialLanguageInputTimerY -> sInitialLanguageInputTimerX
2024-09-28 13:12:57 -04:00
cadmic
2f3c8084c9
[PAL N64] Set up build system and extract assets for pal-1.0 and pal-1.1 ( #2205 )
...
* [PAL N64] Set up build system and extract assets
* TOOD -> TODO
* Apparently this is what the formatter wants
2024-09-26 15:19:23 -04:00
cadmic
f7a0117e7d
[ntsc-1.0/1.1] Match z_boss_ganon.c and z_boss_ganon2.c changes from PAL 1.0 ( #2228 )
2024-09-25 23:36:58 -04:00
cadmic
dc9782b5b3
[PAL N64] Rename file select assets ( #2197 )
2024-09-16 16:40:20 -04:00
AJ Otto
58d8abfe03
Added eye texture offsets for extraction for object_oE5.xml ( #2181 )
...
* Blob object_oE5_Blob_003A40 corrected to extract eye half open and eye closed textures for object_oE5
* Fixed spacing in object_oE5 xml file for commit
2024-09-10 13:53:49 -04:00
cadmic
e52d135e15
[ntsc-1.2] Import n64dd code from Decompollaborate/n64dd ( #2136 )
...
* Import n64dd code from Decompollaborate/n64dd
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
* Don't stub out missing textures
* Remove @brief
* Add low-effort file comments
* Match OoT if style
* Fix n64dd matching due to int vs long
* Fix English n64dd error textures
* Compress n64dd segment
* Align n64dd to 0x40
---------
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2024-09-08 03:37:15 +09:00
fig02
88c4475967
Target -> Attention (System Rename) ( #2149 )
...
* TargetContext -> Attention
* targetCtx -> attention
* Target_ -> Attention_
* FindTargetableActor -> FindActor
* targetableActorP -> attentionActorP
* data vars (and 1 function I missed)
* targetMode -> attentionRangeType
* attention range enum comments
* ATTENTION_RANGE_
* attention range data
* TargetColor -> AttentionColor
* missed one
* fixup color variables
* targetArrowOffset -> lockOnArrowOffset
* focus pos comment
* targetPriority -> attentionPriority
* assets
* loose-ends
* Attention System Description
* format
* skj range type
* enemy bgm
2024-09-07 09:23:04 -04:00
Dragorn421
3a9ebfbbad
Pause doc: World map points ( #2141 )
...
* Pause doc: World map points
* bss
* `WORLD_MAP_POINT_HYLIA_LAKESIDE` -> `_LAKE_HYLIA`
2024-09-07 17:14:08 +09:00
Dragorn421
dc469461a9
Pause docs: WorldMapArea enum and related data ( #2130 )
...
* Pause docs: WorldMapArea enum and related data
* `WORLD_MAP_AREA_20` -> `_QUESTION_MARK`
* bss
2024-09-04 17:51:08 -04:00
Tharo
f1911cd937
[Audio 7/?] Extract sequences to assembly ( #2119 )
...
* [Audio 7/?] Extract sequences to assembly
Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
* Suggested changes, some extra sequence disassembler cleanup
* Remove unused multiprocessing import and regen assets/xml/audio/sequences
---------
Co-authored-by: MNGoldenEagle <17274702+MNGoldenEagle@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
2024-09-05 02:55:04 +09: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
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
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
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
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
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
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
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
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
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
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
Dragorn421
abb4201e57
Fix misc 18 ( #1423 )
...
* two more ABS
* fixup item_name_static texs outnames
* fixup CollisionCheck_SetOCvsOC docs
* Cleanup int comments alignments
* collsion -> collision
* `SQ*` macros fixup
* use `LERP` more
* static -> `s` prefix
* grammar: dont -> don't
* 3
2022-11-13 23:47:25 +01:00
Derek Hensley
d8175501ad
Objects tw and tr ( #1410 )
...
* Tr
* Update from MM prs
* Twinrova kotake and koume
* Animations
* textures
* DLs and final clean up
* limb enum
* blobs
* Move blobs
2022-11-02 00:42:16 +01:00
Derek Hensley
2cb423d9ec
Document object_os ( #1414 )
2022-10-21 19:57:49 -04:00
Tom Overton
c3dc299448
Document all non-Koume/Kotake parts of object_tw ( #1401 )
...
* Document all non-Koume/Kotake parts of object_tw
* Fix the names of two textures I accidentally swapped
2022-10-12 15:56:28 -04:00
Tom Overton
a6276fb5c1
Document object_bdoor (boss doors) ( #1403 )
2022-10-12 13:12:26 -04:00
louist103
e7558cc305
Fix mori_tex object ( #1380 )
...
* Update object_mori_tex.xml
* Update object_mori_objects.xml
* Update object_mori_objects.xml
* Update object_mori_hineri1.xml
* Update object_mori_hineri1a.xml
* Update object_mori_hineri2.xml
* Update object_mori_hineri2a.xml
* fixed segment
* Update assets/xml/objects/object_mori_tex.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Change water_tex to water
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2022-10-07 13:57:32 -04:00
Tom Overton
a99d41bf35
Document object_bw (Torch Slug) ( #1390 )
...
* Document object_bw (Torch Slug)
* Get rid of "Wrapper" terminology
2022-10-06 22:10:49 -04:00
HylianFreddy
8c17339e06
Document Bg_Ice_Shelter (Red Ice) ( #1358 )
...
* Doc BgIceShelter
* Fix comment and add macro
* Various fixes
* Rename switch flag macro
2022-10-06 21:57:26 -04:00
Tom Overton
a2c8eabbc5
Document everything in ovl_Boss_Ganon2.xml ( #1377 )
...
* Document everything in ovl_Boss_Ganon2.xml
* Add translation I forgot to do
* Remove leading zeroes
2022-10-02 16:47:27 -04:00
Tom Overton
82e04ede5f
Replace player animation names with original names derived from OoT3D ( #1369 )
...
* Name every player animation after the original name from OoT3D
* Also update link_animetion with original names
2022-09-12 20:43:06 +02:00
