Commit Graph

309 Commits

Author SHA1 Message Date
Dragorn421 52a510f379 [cc0 oot] dekubaba (#2797)
* [cc0 oot] dekubaba

* EnDekubabaActionFunc

* EnDekubaba cleanup

* dekubaba: more cleanup

* dekubaba more cleanup
2026-09-30 12:18:54 +00:00
Dragorn421 83cb14d821 [cc0 oot] object_wf and z_en_wf (#2786)
* [cc0 oot] object_wf and z_en_wf

* docs

* EnWfActionFunc

* EnWf cleanup

* enwf review
2026-09-30 12:10:44 +00:00
Dragorn421 d90d9750b6 Fix misc 25 (#2829)
* #ifndef ENVIRONMENT_H_ -> #ifndef ENVIRONMENT_H (remove trailing underscore)

* rm from makefile suggestion about additional assets/ folder (just use assets/)

* BgCheck_AnyLineTest 1-3 : change 0/1 args in calls to false/true

* func_8083C6B8 returns bool

* parens cleanup

* fix typos

* cleanup UNK_TYPE uses

* fix ACTOR_ID_MAX value comment

* EnDh.limbRotTable -> morphTable

* some xml formatting

* bool -> s32

* shadowAlpha = 0xFF -> 255

* EnRu1_SetPlatformCamSetting/EnRu1_GetPlatformCamSetting: use CAM_SET_

* rm leading & in extracted references to jfif data arrays

* remove references to zapd

* gPoeComposerFlatHeadDL_000060E0_Tex -> object_po_composer_000060E0_Tex in HACK_no_warn_bad_dims_Texs

* correct SKYBOX_CUTSCENE_MAP comment
2026-09-30 14:02:57 +02:00
Dragorn421 39070bb9dd Fix misc 24 (#2760)
* rm PROJECT_DIR var from makefile

* fix tlutoffset missing 0x prefix

* fix FTOFIX32 redef warning

* `@bug:` -> `@bug`

* playerFloorPoly -> sPlayerFloorPoly

* fix settingChangeSuccessful use as bool

* fix broken english

* osEPiStartDma: use OS_MESG_PRI_HIGH

* EffectSsHahen_SpawnBurst: pass OBJECT_ for objId

* remove extra parens

* fix trailing comma warnings in enums

* EnRu1: decimal alpha

* fix parens

* fix ATELEM_SFX_NORMAL comment (collider "type" was renamed to material)

* fix comment in Math3D_TriChkPointParaYImpl

* use ANIMMODE_ more

* Remove leading 0s from enum comments (as they indicate octal in C)
2026-09-24 05:56:15 +02:00
ChaseDream c2aff68a86 Fix 8 incorrect hanzi in charmap.chn.txt and extract_text.py (#2827)
Second pair of eyes for #2383: manually re-checked the extracted hanzi against the in-game message font glyphs and their message context. 8 entries were misread lookalikes; codepoints are unchanged so this only affects the human-readable labels, not the extracted bytes.

- ⋯ (U+22EF) → … (U+2026) @0xA109 — the font glyph matches the standard horizontal ellipsis
- 蠃 → 赢 @0xA12E — 000F "你贏啦!!" (bombchu bowling prize); 蠃 is a snail/clam, the glyph re-reads as 赢
- 噓 → 嘘 @0xA5DA — simplified form used throughout the simplified text
- 咩 → 哞 @0xA5F1 — message 2006, a cow talking about producing milk; 咩 is a sheep's bleat, 哞 a cow's moo (牛, not 羊, on the right)
- 亳 → 毫 @0xA605 — 201B "一根毫毛" (a single hair); 亳 is a place name, the glyph lacks its extra upper-right stroke
- 汊 → 汉 @0xA621 — 203F "懶漢" / 404E "男子漢" (lazy fellow / manly man); 汊 means a stream branch
- 鰓 → 鳃 @0xA68E — simplified form (fish gill)
- 寃 → 冤 @0xA75B — standard form (寃 is the variant spelling)
Apply the same replacements to CHN_CHARS in tools/extract_text.py (extraction charmap) so the build matches; charmap.chn.txt is used for building, CHN_CHARS for extraction.
2026-09-14 14:15:11 +02:00
Dragorn421 d01089e81a [cc0 oot] object_zf and z_en_zf (#2791)
* [cc0 oot] object_zf and z_en_zf

* fixups

* ENZF_TYPE_LIZALFOS_PAIRED_ -> ENZF_TYPE_LIZALFOS_PAIRED_MINIBOSS_

* EnZf cleanup
2026-08-31 16:59:24 +00:00
Dragorn421 1e2bd9e46a [cc0 oot] Biri (#2794)
* [cc0 oot] Biri

* name biri anims (by usage, Z64Utils cant preview them)

* fixup bari/biri mixup

* EnBili cleanup

* biri cleanup

* biri: merge var ini with decl
2026-08-31 16:03:49 +00:00
Dragorn421 e5daae2850 [cc0 oot] bowling things (#2793)
* [cc0 oot] bowling things

* bowling fixups

* bowling things cleanup
2026-08-31 15:46:12 +00:00
Dragorn421 fe068a1396 [cc0 oot] Bari (#2795)
* [cc0 oot] Bari

* revert using biri params

* EnVali cleanup

* bari cleanup

* bari cleanup
2026-08-31 15:37:51 +00:00
Dragorn421 761db13884 [cc0 oot] Keese (#2798)
* [cc0 oot] Keese

* bodyType -> bodyElementalType

* cleanup EnFirefly

* keese cleanup
2026-08-31 15:29:52 +00:00
Dragorn421 e9b8786fcb [cc0 oot] BgDyYoseizo (#2796)
* [cc0 oot] BgDyYoseizo

* BgDyYoseizo small cleanup

* bgdyyoseizo comment on D_80875440
2026-08-31 17:21:31 +02:00
Jordan Longstaff 58d06849af Document EnIn (AKA the hard-working Ingo) (#2778)
* Document `EnIn` (AKA the hard-working Ingo)

* Fix variable references

* Revert switch

* Rename race outcome functions for clarity

* Apply suggestions
2026-08-19 14:03:48 +02:00
Dragorn421 a883cd019a [cc0 oot] gameplay_keep (#2781)
* [cc0 oot] gameplay_keep

* gFishIn{Air,Water}Anim
2026-08-05 18:32:02 +02:00
Dragorn421 c24098a6f4 [cc0 oot] object_tp and z_en_tp (#2785)
* [cc0 oot] object_tp and z_en_tp

* docs

* fixup
2026-08-04 06:49:47 +02:00
Jordan Longstaff 2b29808f8d Document EnHs and EnHs2 (Carpenter's son) (#2758)
* Document `EnHs` and `EnHs2` (Carpenter's son)

* focusOffset -> sFocusOffset

* Rename tracking flag fields

* Roll back subrepo changes

* Remove comment on trackingFlags

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2026-05-23 09:00:29 +02:00
Dragorn421 4b742bf3cf Assets system: reconcile xml versions using implicit and relative offsets (#2614)
* Assets system: reconcile xml versions using implicit offsets

* simplify

* remove other object_mag xmls

* Introduce relative offsets: `Offset=".+0x421"`, more sizable `ResourceDesc`s, update spec

* fix

* reconcile object_mo xml

* reconcile object_tw xml

* reconcile object_xc xml (and add Tlut="gNameTLUT" to Texture resources)

* reconcile object_fd xml

* reconcile object_kingdodongo xml

* bss

* reconcile gameplay_keep.xml
2026-05-09 20:36:05 +00:00
Dragorn421 7054e8fe79 Fixups around textboxSegment (#2743) 2026-05-03 19:05:10 +02:00
Dragorn421 b56b5fc2c8 Commit objects 2: object_spot15_obj, object_spot16_obj, object_spot17_obj, object_syokudai, object_ta, object_timeblock (#2645)
* commit object_timeblock

* commit object_ta

* commit object_syokudai

* commit object_spot17_obj

* format

* commit object_spot16_obj

* fixup

* commit object_spot15_obj
2026-04-10 13:13:54 +02:00
Tharo 970af5600a Audio: Fix note values (#2716)
Due to the layout of the pitch_frequencies lookup table, note values
computed in extraction were reflected around middle C (midi note
number 60). This didn't matter for matching, values would successfully
roundtrip. However when using samples in external programs or
converting soundfonts to standard formats the note values would lead
to incorrect playback of sounds. This change corrects the note values
so that external programs correctly infer the pitch of the sound when
played at a particular MIDI key.
2026-03-10 06:22:28 +09:00
Dragorn421 0491c21475 Use OOT_NTSC instead of OOT_REGION to check for ntsc in gkeep (#2703)
* Use `OOT_NTSC` instead of `OOT_REGION` to check for ntsc in gkeep

* bss
2026-02-24 21:48:21 +01:00
Dragorn421 abdae818bd Fix misc 23 (#2699)
* remove noop macros Fault_SetFontColor Fault_SetCharPad under PLATFORM_N64

* remove duplicate declarations in sfx.h

* use render mode presets more

* decimal for alpha values

* fix some z_camera comments typos

* fix references to preprocess.sh (used to be preprocess.py)

* remove outdated comment on deps in makefile

* code_800AD920 was renamed to z_viszbuf

* fix capitalization typo: gOcarinaofTimeDesignTex -> gOcarinaOfTimeDesignTex

* fix typo: gLinkAdultEyesClosedfTex, gLinkChildEyesClosedfTex -> remove extra f

* fix typo: gCrstalSwitchRedTex, gCrstalSwitchBlueTex -> gCrystal

* fix PARAMS_GET_U amount of bits
2026-02-22 19:08:12 +01:00
mzxrules 8b30a77346 z_bg_haka_meganebg documentation pass (#2685)
* document z_bg_haka_meganebg

* Dragorn suggestions and @bug documentation

* i swear i was good at grammar as a child
2026-02-22 09:35:51 +01:00
mzxrules b0a03cc1a4 bg_haka_megane documentation pass (#2684)
* document bg_haka_megane

* BGHAKAMEGANE_TYPE_MAX

* dragorn suggestion
2026-02-18 08:15:05 +01:00
mzxrules 1884569a98 bg_haka_trap documentation pass (#2683)
* document pass on bg_haka_trap

* formatting

* suggestions

* dragorn suggestions
2026-02-17 16:09:54 +01:00
mzxrules 3d4e8e32c3 z_bg_haka_zou documentation pass (#2687)
* document z_bg_haka_zou

* suggestions

* dragorn suggestions
2026-02-17 13:39:53 +01:00
Tharo dbe1a80541 Commit and split gameplay_keep (#2612)
* Commit and split gameplay_keep

* Remove debugging bits

* format

* bss

* merge gameplay_keep_0x400 into link_textures

* Name some unused NTSC stuff

* Rename files for some of the newly named unused NTSC stuff

* name more gkeep files

* format

* spin_attack

* name fish anims files

* name some eff_ files

* name a bunch more files

* Add underscore in not-final names

* cleanup limb enum names (remove g prefix)

* split gameplay_keep_0x34020.c into gBugCrawlAnim.c + bug_skel.c

* door.h -> door_skel.h

* gArrowNAnim -> gArrowN_Anim

* split arrow_anims into gArrow1_Anim + gArrow2_Anim

* fix merge

* bss

* bss

* Fix bss

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2026-02-16 15:32:37 +01:00
Dragorn421 b5f980570c Pause docs: UIOverlay quads dimensions (#2644) 2025-06-28 15:23:00 +09:00
Dragorn421 6234d7f2aa Commit objects 1: tp, triforce_spot, umajump, vase, yukabyun, zg (#2634)
* commit object_zg

* commit object_yukabyun

* commit object_vase

* commit object_umajump

* commit object_triforce_spot

* commit object_tp

* fixup1

* format
2025-06-25 13:09:14 +02:00
Dragorn421 affb39624f Pause docs: "uiOverlay" quads (renamed from "InfoPanel") (#2635)
* Pause docs: "InfoPanel" quads

* bss

* rename infoPanelVtx to decorVtx

* rename to uiOverlayVtx / UI_OVERLAY_QUAD_

* fixup
2025-06-25 00:08:26 +02:00
Dragorn421 05a2818557 Assets: Move limb enums into xmls 4 (#2631) 2025-06-15 14:32:54 -04:00
Dragorn421 d3ed137878 Assets: Move limb enums into xmls 3 (#2630) 2025-06-15 13:55:11 -04:00
Dragorn421 2054637cab Name most object_gi_* textures (#2629)
* Name most `object_gi_*` textures

* gGiButterflyTex
2025-06-14 23:06:12 +02:00
Dragorn421 7547603989 Pause doc: DrawInfoPanel textures (#2628)
* Pause doc: DrawInfoPanel textures

* plural Widths
2025-06-14 22:06:53 +02:00
Dragorn421 e4e14a6bcf Assets: Move limb enums into xmls 2 (#2626) 2025-06-12 17:23:47 -04:00
Dragorn421 1df6a3ee12 Assets: Move limb enums into xmls 1 (#2625) 2025-06-12 15:46:13 -04:00
Dragorn421 7ddd468ed6 object_zo: finalize, split and commit (#2624) 2025-06-10 19:36:16 -04:00
Dragorn421 dba40d9dc3 Remove Static from xmls (#2616) 2025-06-10 18:20:10 -04:00
Dragorn421 939b292991 Commit object_ganon_anime3 (#2611)
* Commit object_ganon_anime3

* rm from write_source.txt

* bss
2025-06-09 15:07:35 -04:00
Dragorn421 d4a87889ff Commit some assets/overlays/ 2 (#2610)
* Commit some `assets/overlays/` 2

* format
2025-06-09 07:06:46 -04:00
Dragorn421 714f43b9e9 Commit do_action_static (#2597)
* Commit `do_action_static`

* fix

* rm do_action_static from write_source.txt
2025-06-07 21:31:57 -04:00
Dragorn421 c418bbb19c Add Vtx[] resources in xmls for (partially) documented assets 10 (#2609)
* Add Vtx[] resources in xmls for (partially) documented assets 10

* bss
2025-06-07 17:57:18 -04:00
Dragorn421 484abb1d39 Add Vtx[] resources in xmls for (partially) documented assets 9 (#2607) 2025-06-08 00:26:59 +09:00
Dragorn421 37a89e340f Add Vtx[] resources in xmls for (partially) documented assets 8 (#2606) 2025-06-07 17:10:36 +02:00
Dragorn421 da40e39c97 Add Vtx[] resources in xmls for (partially) documented assets 7 (#2605)
* Add Vtx[] resources in xmls for (partially) documented assets 7

* bss
2025-06-07 10:51:44 -04:00
Dragorn421 600d680970 Add various undocumented resources in xmls 4 (#2604) 2025-06-07 09:52:23 -04:00
mracsys ed02a9db65 Add additional Bazaar display list definitions (#2494)
* add unreferenced display lists to shop1 room 0 xml

* match naming scheme

* add missed display lists for shop1 room 0
2025-06-06 19:23:01 -04:00
Dragorn421 7a816391bb Remove OutName from xmls (both on File and Texture) (#2596) 2025-06-06 22:07:53 +02:00
Dragorn421 e1fb3a974f Add various undocumented resources in xmls 3 (#2595) 2025-06-06 14:44:13 -04:00
Dragorn421 f73e564817 Add various undocumented resources in xmls 2 (#2594) 2025-06-06 13:24:44 -04:00
Dragorn421 747006fdd4 Add Vtx[] resources in xmls for (partially) documented assets 5 (#2587) 2025-06-05 21:38:01 -04:00