1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-11 17:30:25 +00:00
Commit graph

1455 commits

Author SHA1 Message Date
Jordan Longstaff
d0bc691ec8
Child Ruto Part 9: Camera setting (#2577)
* Child Ruto Part 9: Camera setting

* Add comment

* Rename "Jabu-Jabu context" to "Big Octo platform"

* Rename getter and setter
2025-06-04 15:11:37 -04:00
fig02
28cc9d68cf
Remove "z64" prefix from all headers (#2518)
* z64 - a

* z64 - b

* z64 - c

* z64 - d

* z64 - e

* z64 - f

* z64 - g

* z64 - h

* z64 - i

* z64 - l

* z64 - m

* z64 - o

* z64 - p

* z64 - q

* z64 - r

* z64 - s

* z64 - t

* z64 - v

* restore file

* fix merge

* fix merge

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2025-06-04 14:38:33 -04:00
Dragorn421
e8b708a448
T() macro loose ends 2 (#2564)
* More T() in niw_girl, ossan, rr, ta, tana, wall_tubo, yabusame_mark

* Add and use LOG_STRING_T()

* include debug.h in translation.h

* Kyaaaaaa

* bss

* comment on Yabusame mato possible typo

* Revert "Kyaaaaaa"

This reverts commit 95097831fa.

* (Kuzu)hara

* 原 -> "-Hara" from dev name, possibly
2025-06-04 13:15:01 -04:00
Dragorn421
c903555e83
Commit some assets/overlays/ (#2582)
* Commit (inline) some assets/overlays/

* rm padding

* ovl_file_choose
2025-06-04 07:44:10 -04:00
Jordan Longstaff
4980836ba3
Child Ruto Part 11: Idle Carry Timer (#2579)
* Child Ruto Part 11: Carry timer

* Rename carry timer as suggested
2025-06-04 06:58:38 +02:00
Jordan Longstaff
7085b48483
Child Ruto Part 10: Head rotation (#2578)
* Child Ruto Part 10: Head rotation

* Rename head turn speed variable
2025-06-04 06:39:19 +02:00
Jordan Longstaff
dec2c89c10
Child Ruto Part 8: Init branches (#2576) 2025-06-03 21:47:10 -04:00
Dragorn421
66f367e449
Commit g_pn_*.c files (#2573) 2025-06-03 20:30:44 -04:00
Dragorn421
31f8c32ed9
Rename damageEffect -> damageReaction (#2554)
* CollisionCheckInfo.damageEffect -> damageReaction

* damageEffect -> damageReaction in other structs/temps

* DMGEFF -> DMGREAC

* EnSkb.lastDamageEffect -> lastDamageReaction

* EnTest.lastDamageEffect -> lastDamageReaction

* enums: DamageEffect -> DamageReaction

* cleanup: EnGeldBDamageReactions -> EnGeldBDamageReaction

* DMG_ENTRY effect -> reaction

* cleanup: GELDB_DMG_ -> GELDB_DMGREAC_

* PEAHAT_DMG_EFF -> PEAHAT_DMGREAC

* cleanup: RR_DMG_ -> RR_DMGREAC_

* cleanup: EnWallmas DAMAGE_EFFECT_ -> WALLMAS_DMGREAC_

* cleanup: EnPeehat's DamageReaction -> EnPeehatDamageReaction

* format

* review

* _DMGREAC_ -> _DMG_REAC_

* _DMG_REAC_ -> _DMG_REACT_

* format
2025-06-03 18:45:32 -04:00
Dragorn421
0c1b1231d3
T() macro loose ends 1 (#2563)
* more T() in debug_malloc.c graph.c z_actor.c malloc.c

* more T() in Zl2, Zl3

* T() diving_game, fire_rock

* T() girla

* more T() in heishi[124]

* T() in hs2, kakasi2, ru2

* format

* keaton

* Diving GO
2025-06-03 06:40:55 -04:00
Jordan Longstaff
1627f8415b
Child Ruto Part 2: Rename resurfacing animation (#2569) 2025-06-02 12:15:29 -04:00
Dragorn421
a4182086ee
T() macro in overlays 9 (#2552)
* T() okarina_effect, ossan, reeba, rr

* T() ru1, sb, sth, syateki_itm

* T() syateki_niw, ta, takara_man, tite

* T() tubo_trap, wall_tubo, weather_tag, wf

* T() wonder_talk, wonder_talk2

* review
2025-06-01 17:53:13 +02:00
Pepe20129
1f9bf023a0
Document kaleido debug menu (#2506)
* Document kaleido debug menu

* Fix BSS

* bss

* Address reviews

* bss

* add #pragma increment_block_number to z_parameter and let CI do its thing

* bss

* buffer -> digitBuf

* reformat comments on sSectionPositions. trick clang-format into not ruining the array by adding // comments on their own line

* rename to KaleidoScope_DrawInventoryEditor

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2025-06-01 17:10:49 +02:00
Dragorn421
f4028e49b9
T() macro in overlays 10 (#2553)
* T() mm2, niw, file_choose, file_nameset, kaleido_equipment, kaleido_item

* T() girla, ossan, xc

* review
2025-06-01 09:37:42 -04:00
Dragorn421
84d4b6701f
T() macro in overlays 8 (#2551)
* There is no bank!!

* T() horse_game_check, hs, ice_hono, insect

* T() ishi, kusa

* T() kakasi, kakasi2, kakasi3

* T() Got the rail data

* T() ko, ny, okarina_tag

* review

* review2
2025-05-31 14:14:22 +02:00
Dragorn421
e991255a45
T() macro in overlays 7 (#2545)
* T() fish, fr, g_switch

* T() ge1, ge2, gm, goroiwa

* T() heishi1-3

* review
2025-05-28 02:04:48 +09:00
Dragorn421
6459f33800
T() macro in overlays 6 (#2544)
* z_en_dns.c and questionable translation for 売りナッツ

* T() dnt_demo, dnt_jiji, dnt_nomal with translating the probably misspelled デグナッツ as deku scrub (japanese text of the game uses デクナッツ (note the second character is slightly different) and is translated to english as Deku Scrub)

* T() dy_extra, encount2, ex_ruppy, fhg_fire, fire_rock

* review

* なにみの? -> What?
2025-05-28 01:46:27 +09:00
Dragorn421
1eaae98ed3
T() macro in overlays 4 (#2533)
* T() macro in various overlays

* revert problematic T() in mir_ray
2025-05-27 18:00:25 +02:00
Dragorn421
ecb9b64354
Commit icon_item_static (#2546)
* cp extracted/PAL_VERSION/... assets/...

* make NTSC compatible

* include cleanup

* progress

* progress2

* format

* comments
2025-05-26 17:44:06 -04:00
Dragorn421
6b9656b42a
Commit object_link_child (#2542)
* add Vtx resources to object_link_child.xml

* object_link_child.xml limb enum and tlut blob

* cp extracted/... assets/...

* start cleanup, delete useless declarations

* inhibit object_link_child.c source gen

* move textures _WIDTH and _HEIGHT to .c, remove useless tex decls

* comments

* fixup object_link_boy comments

* remove unreferenced DLs decls

* rm 0 padding

* format the .c

* fixup

* bss
2025-05-26 16:59:33 -04:00
Dragorn421
b3a16a61d4
Cleanup colliders 4 (#2470)
* cleanup around `ColliderJntSphElement` usage

* cleanup around `ColliderCylinder` usage

* cleanup around `ColliderCylinderInit` usage

* cleanup around `ColliderTrisElement`, `ColliderTris` usage

* cleanup around `ColliderTrisElementInit`, `ColliderTrisInit` usage

* cleanup around `ColliderQuadInit` usage

* sColliderInit -> sCollider<Type>Init

* format

* triElemInit -> triElementInit
2025-05-26 19:15:33 +02:00
Dragorn421
c854743d84
T() macro in overlays 5 (#2537)
* T() in some ovl_En_*

* T() in some more ovl_En_*

* old man appears
2025-05-25 17:57:27 -04:00
Dragorn421
4201359f89
Finalize and commit object_link_boy (#2528)
* Finalize and commit object_link_boy

* bss

* format

* dont write extracted/.../object_link_boy.c

* sizes for dls and texs

* fix OK

* TEX_LEN
2025-05-25 20:21:16 +02:00
Dragorn421
b44ff69ded
Pause doc: Equipment page (#2538)
* [Pause menu docs] Equipment page

* final name
2025-05-25 13:59:05 +02:00
Dragorn421
6d56b1b8e0
Cleanup includes in header files (#2540)
* Cleanup includes in header files

* include libc headers without libc/ prefix

* fix

* fix2

* fix3

* fix4

* some bss lol

* bss

* fix
2025-05-24 16:20:51 -04:00
Dragorn421
d6cf6d6adb
T() macro in overlays 3 (#2532)
* T() "There is no such action!!!!!!!!"

* T() z_boss_mo, fix z_bg_mori_elevator

* T() in ovl_Obj_

* T() in ovl_Demo_

* dont break up strings

* missed 1

* "push-pull" -> "push/pull"
2025-05-23 09:26:40 -04:00
Dragorn421
1e556e3a3d
New assets system (#2481)
* wip: New assets system tm

Builds gc-eu-mq-dbg OK from clean after
1) make setup
2) python3 -m tools.assets.extract -j
3) replace 0x80A8E610 with sShadowTex in extracted/gc-eu-mq-dbg/assets/overlays/ovl_En_Jsjutan/sShadowMaterialDL.inc.c
4) make various symbols in extracted data like sTex static

* use variables from config.yml for gMtxClear and sShadowTex addresses

* Write source with static for overlays using `HACK_IS_STATIC_ON` hack

* gc-eu-mq-dbg OK from clean with `make setup && make`

* implement more skeleton-related types, cleanups, fixups

* fix extracted data to no longer produce compilation warnings

* implement more of RoomShapeImage types

* yeet XmlPath from ExternalFile usage

* Implement PlayerAnimationDataResource (link_animetion data)

* fix csdis CS_TIME extra arg

* dmadata file names no longer hardcoded for gc-eu-mq-dbg

* ntsc-1.0 OK

* xml fixes

* slightly improve standard output

* rm extract_assets.py

* generate and use Limb enums (TODO: check Skin skels and implement for Curve skels)

* handle dependencies between xmls

* introduce RawPointers xml attribute to ignore specific pointers and keep them raw

* add tools/extract_assets.sh

* fixups

* only extract if xmls changed or if -f (force) is used

* fixups, gc-eu OK

* all versions OK

* check attributes of xml resources elements

* Implement legacy skelanime resources

* fix ASSET_FILES_BIN_EXTRACTED/COMMITTED: look for .u8.bin specifically instead of just .bin

* implement JFIFResource

* fix png/jpg wildcards: look specifically for .u64.png .u32.png .u64.jpg

* Makefile: Add rules to build .png, .bin and .jpg in assets/ too

* start writing actual docs

* extract sTransCircleDL and sTransWipeDL

* misc cleanup/fixes, pygfxd 1.0.3

* refactor CDataExt.set_write callback args to use a dataclass

* Move {} to in-source

* misc

* more progress on spec

* fix missing braces in n64dd_error_textures.c

* finish xml spec doc

* assets xmls fixes

* some cleanup, use `gNameTex_WIDTH/HEIGHT` macros in dlists

* handle hackmode_syotes_room, fix compile

* C build_from_png

* rm tools/assets/bin2c

* rm ZAPD

* format

* remove rule to generate dmadata_table.py

* CC0 license (and some import cleanup)

* dont try to build zapd (rmd)

* simplify palettes with single user (ci images with a non-shared palette)

* add docs on how images are handled

* bss

* allow -j N

* fix n64texconv python bindings memory management

* move -j at the end of calling extraction script

* with -j, update last_extracts.json as each job completes rather than only if all complete

* make interrupting less jank by making child processes ignore sigint

* use enum names in `SCENE_CMD_SKYBOX_SETTINGS`

* `multiprocessing.get_context("fork")`

* import rich, except ImportError s

* fix optional rich usage

* .bss

* .bss

* .bss

* assets extraction: -j -> -j$(N_THREADS)

* .bss

* change LIMB_NONE/MAX defaults to be FILE_OFFSET instead of SKELNAME

* 0XHEX -> 0xHEX

* fix bss

* Proper includes for assets

mostly proper, some includes like dlists resources always causing a sys_matrix.h include (when not every dlist references gIdentityMtx) could be done better

* rm z64.h

* rm z64.h take two

* bss

* Make .u64 suffix for pngs optional

* fixup: rm .u64 suffix from n64dd image paths

* Remove elemtype suffixes from .bin and .jpg files

* Update images.md

* some build_from_png cleanup, more error handling, comments

* Handle skybox textures

Introduce "sub-format" suffix for pngs, with sub-formats split_lo and split_hi being used for skybox textures

* fixup for older python

* improve collision output some

* fully use SURFACETYPE[01] macros in writing extracted surface types

* use WATERBOX_PROPERTIES in extracted waterboxes

* some SceneCommandsResource cleanup

* format EnvLightSettingsList output
2025-05-18 01:29:09 +02:00
Dragorn421
0c6c112cb9
AVOID_UB: FileSelect_LoadGame out of bounds gBitFlags[-1] (#2527) 2025-05-12 07:25:22 -04:00
Tharo
2a8785ffef
C23 Compatibility (#2525) 2025-05-05 05:31:35 -04:00
GhostlyDark
3152557b49
Update z_magic_fire rectangle to be based on screen size (#2521) 2025-05-01 09:03:20 -04:00
fig02
f7a270655b
Delete macros.h; Delete global.h (#2516) 2025-04-27 12:48:11 -04:00
fig02
ea22c2ac38
create ACTOR_FLAGS_CHECK_ALL (#2515) 2025-04-26 19:07:52 -04:00
fig02
bed76a3bf3
add array_count.h (#2514) 2025-04-26 18:17:02 -04:00
fig02
25b2fa4bca
macros.h 3/5: Split various macros (#2512)
* split out various macros

* fix

* fix2

* fix dw

* libc path

* fix macro

* does this fix bss

* fix bss
2025-04-25 21:12:35 -04:00
fig02
2341c44a6c
Use official macros for Physical Address conversion (#2511) 2025-04-24 14:53:18 -04:00
fig02
de59ad3db7
macros.h 1/?: PRINTF and T (#2509)
* create printf and translation headers

* non-overlays complete

* printf finished

* move T macro

* edit comment

* fix error

* fix bss

* remove is_64

* fix bss
2025-04-23 19:31:49 -04:00
fig02
2278bcb2c3
Remove Variables.h; Decouple z64.h from global.h (#2507)
* progress

* z64.h issues sorted

* remove variables.h

* format

* n64 fix

* another fix

* did the wrong fix

* fix libleo

* fix bss

* review

* remove instead of comment
2025-04-19 22:04:08 -04:00
fig02
655ec77138
variables.h: migrate all remaining varaibles, remove other dependencies except z64.h (#2505)
* move remaining variables from variables.h

* fix other dependencies

* extra newline

* fix and adjust comment

* is this the problem

* fix bss
2025-04-16 08:22:42 -04:00
fig02
0c5282ba66
variables.h cleaning: migrate audio variables (#2504)
* migrate audio variables, fix libultra thing

* remove extra newlines

* fix

* add required pragmas

* fix bss

* audio table fixes

* fix bss
2025-04-11 02:10:19 -04:00
fig02
80564bf40b
variables.h cleaning: migrate libultra variables (#2503)
* variables.h cleaning: migrate libultra variables

* another increment_block_number

* fix bss
2025-04-06 22:32:40 -04:00
fig02
5133db15a3
Remove functions.h (#2501)
* split most of functions.h

* osdriverominit

* forgot include

* fix

* remove functions.h

* temporary fix for fix_bss

* fix bss

* revert fix_bss.py change
2025-04-05 19:16:52 -04:00
fig02
7416f413db
SoundMode -> SoundOutputMode (#2475)
* SoundOutputMode, and move SoundSetting

* missed a couple

* format

* move SoundSetting
2025-03-27 01:47:44 -04:00
Dragorn421
919b78ecbe
T() macro in overlays 2 (#2487)
* T() "Warning : move BG"

* more T() up to (incl.) z_bg_spot09

* T() done up to (including) z_bg_*

* bulk T() "main/draw mode is wrong"

* -> "the main mode is wrong"

* "Lon Lon"
2025-03-27 01:24:59 -04:00
Tharo
65b317abc3
Fix some hardcoded sfx ids (#2496) 2025-03-26 17:58:29 -04:00
Dragorn421
05faab33f1
T() macro in overlays 1 (#2486)
* More T()

* More T(), up to (including) z_bg_mori*

* home pos~~e~~
2025-03-26 14:15:06 -04:00
mzxrules
cf1a39c26f
Reduce dependencies on global.h (10) (#2490)
* reduce z64.h size

* fix z_cheap_proc.inc.c

* ,bss

* remove temp delcaration
2025-02-26 17:18:30 -05:00
mzxrules
2e4c42719b
Reduce dependencies on global.h (9) (#2488)
* split game states

* split all GameState headers

* match fig names

* deduplicate headers from bad merge

* split z64actor.h into z64actor_profile.h, z_actor_dlftbls.h

* fix compile error

* .bss
2025-02-24 20:55:55 -05:00
fig02
5ddb3e68b6
Clean out z64.h (#2484)
* Clean out z64.h

* fix version include

* overlay.h

* pr suggestion

* try fixing main.c

* add back forward declare

* fix bss

* header guard

* prefix
2025-02-22 14:01:09 -05:00
fig02
2e4d7a1101
Create headers for Game States (#2482)
* make headers for gamestates

* fixes

* fixes 2

* bss
2025-02-20 07:50:13 -05:00
fig02
4cfb5f05a0
Use "entry" terminology in map select (#2479)
* use entry terminology in map select

* missed one
2025-02-19 19:59:21 -05:00