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
e7b0daa2ec
[headers 7] Add sys_matrix.h ( #2150 )
...
* add sys_matrix.h, based on MM's
* move matrix debug macros to sys_matrix.h
* bss
2024-09-07 00:26:47 -04:00
cadmic
8a3ba35070
[ntsc-1.2] Match z_file_choose.c and z_boss_tw.c ( #2146 )
...
* Match z_file_choose.c
* Match z_boss_tw.c
* Format
* end: -> close_disps:
2024-09-07 00:12:12 -04:00
cadmic
2ce648a7c6
Miscellaneous libultra header fixes ( #2139 )
...
* Miscellaneous libultra header fixes
* Fix bss?
* Reword RCP timeout
2024-09-06 14:46:44 +02:00
cadmic
53b2110373
Clean up uses of !PLATFORM_N64 vs PLATFORM_GC ( #2134 )
...
* Clean up uses of !PLATFORM_N64 vs PLATFORM_GC
* Put N64 button colors first
2024-09-06 11:18:59 +02:00
cadmic
3faa1c6acc
Move button macros to include/controller.h ( #2138 )
...
* Move button macros to include/controller.h
* Fix z_mag button ordering
2024-09-06 10:24:19 +02:00
fig02
bb6177e936
Document Target_ShouldReleaseLockOn
[Target Docs 8/8] ( #2135 )
...
* target range and leash docs
* format
2024-09-05 12:44:06 -04:00
mzxrules
acb5c7f20c
Update Room Documentation ( #2015 )
...
* Update Room Documentation
* Write more complete documentation, implement suggestions.
* Function name changes; minor comment tweaks
* nit
* Resolve Dragorn fixes
* Resolve Fig suggestions, fix comment wording
* fix bss, fig suggestion
* bss
2024-09-05 21:08:21 +09:00
fig02
dbb059c6a7
Target Mode Enum [Target Docs 7/?] ( #2133 )
...
* TargetMode Enum
* format
* add default comment
* bss
* bss 2
* fix bss 3
2024-09-04 23:46:03 -04:00
fig02
6051251c92
istargeted -> islockedon ( #2132 )
2024-09-04 19:26:23 -04: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
cadmic
8153c952f6
[ntsc-1.2] Organize n64dd declarations and convert to 1.0 addresses ( #2127 )
...
* Reorganize n64dd declarations
* Fix bss
* Really fix bss
2024-09-05 03:56:24 +09:00
Dragorn421
aa1c7f3155
Pause doc: drawing the world map image ( #2129 )
2024-09-05 03:53:08 +09:00
fig02
907e440f3a
unk_664 -> focusActor [Target Docs 5/?] ( #2126 )
...
* unk_664 -> focusActor
* capitalization
* missed a temp
2024-09-05 03:33:30 +09:00
Dragorn421
af24970d89
Pause: Name temps in KaleidoScope_SetVertices
( #2088 )
...
* Pause doc: Name temps in `KaleidoScope_SetVertices`
* Update src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
Co-authored-by: cadmic <cadmic24@gmail.com>
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
2024-09-04 10:29:39 +02:00
cadmic
27ba989511
Match KaleidoScope_DrawEquipment and KaleidoScope_DrawItemSelect ( #2125 )
2024-09-04 02:12:33 -04:00
fig02
45158f57d6
Document Target_Update [Target Docs 4/?] ( #2123 )
...
* document Target_Update
* add comments
* try CLAMP (dbg is ok but ci will check retail)
2024-09-03 20:58:39 -04:00
fig02
2b25c31588
Document Target_Draw [Target Docs 2/?] ( #2115 )
...
* document Target_Draw
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* fix missed renames
* retail fix
* another fix
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2024-09-01 16:02:13 -04:00
cadmic
6e8b820184
[ntsc-1.2] Match z_game_over.c, PAL 1.1 fixes ( #2099 )
...
* Match z_game_over.c (PAL 1.1 change)
* Fix previous matches that are actually PAL 1.1 changes
* Add versions.h to global.h
* Add versions.h to z_game_over.c too
* And the others too
* Fix awkward wording
2024-08-28 21:00:06 -04:00
Dragorn421
68818044db
[ntsc-1.2] Decompile fault.c ( #2046 )
...
* wip decomp ntsc-1.2 fault.c
* more ntsc-1.2 fault.c
* decompiled fault_v1.c
* name fault_v1 functions, wip
* try to clean up build system (two versions of the fault system coexisting)
* cleanup
* cleanup2
* fix build gc-eu-mq-dbg
* match 2 more, ty anon
* matched
* review
* more review
* fixup spec
* `(uintptr_t)ptr op int` instead of `ptr op (type*)int`
* move fault.h out of global headers, properly include fault.h and versions.h
* compile all fault_*.c files regardless of version by overriding FAULT_VERSION
* n64 FaultMgr.framebuffer s32 -> u16*
* FaultMgr.framebuffer -> FaultMgr.fb
* make gc FaultMgr.fb u16* (yes, thats everything)
* bss
* fix Fault_Printf return type
* noop FaultDrawer_SetFontColor, FaultDrawer_SetCharPad in fault_n64
* fault_color_ stuff is only for fault_gc
* rm empty line in makefile
* I guess `D_80105A90_unknown` is `[sg]TotalAllocFailures`
* bss
* `Fault_WaitInput` -> `Fault_WaitForInput`
* use named fault funcs in pointers array
* FAULT_OOT{N64,GC} -> FAULT_{N64,GC}
* Apply suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* review, sync fault_{gc,n64}
* Apply `FPCSR_CE` suggestions from code review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2024-08-28 09:38:42 +02:00
Tharo
aa97586659
[Audio 6/?] Build Soundfonts and the Soundfont Table ( #2056 )
...
* [Audio 6/?] Build Soundfonts and the Soundfont Table
* Improve lots of error messages
* First suggested changes
* Make audio build debugging more friendly
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Some fixes from MM review
* Make soundfont_table.h generation depend on the samplebank xmls since they are read, report from which soundfont the invalid pointer indirect warning originates from
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-27 21:09:59 -04:00
cadmic
17debe8620
Match functions using gDPSetTileCustom ( #2100 )
2024-08-27 17:08:41 -04:00
cadmic
d2aca2239f
[ntsc-1.2] Match a bunch of small stuff ( #2094 )
...
* Match z_fbdemo_wipe1.c
* Fix gDPSetTileCustom
* Match z_eff_ss_dead.c
* Match src/code/audio_thread_manager.c
* Match z_parameter.c
* Match KaleidoScope_DrawWorldMap
* Format
* 1 -> AUDIOMGR_DEBUG_LEVEL_NO_RSP
* Actually match KaleidoScope_DrawWorldMap
* Add comment on duplicate code
* Revert "Fix gDPSetTileCustom"
This reverts commit de09338d92
.
2024-08-27 09:33:20 +02:00
cadmic
3795574878
Add all N64 version defines ( #2095 )
...
* Add all N64 ROMs to versions.h
* Remove OOT_ prefix from version defines
* Make it pretty
2024-08-26 11:43:59 -04:00
Dragorn421
c6d29691d0
[ntsc-1.2] Match z_en_ge3 ( #2078 )
...
* Match z_en_ge3
* change
2024-08-26 15:20:29 +02:00
Dragorn421
1d275fa9a5
[ntsc-1.2] Partially match z_en_mag ( #2079 )
...
* Partially match z_en_mag
* review
* Match func_80AEEA48_unknown (thanks cadmic)
2024-08-25 17:57:49 +02:00
Dragorn421
271eff9234
T() macro 4 ( #2084 )
...
* T() in z_kankyo.c
* T() in z_demo.c
* T() in z_effect.c
* remaining T() in z_sram.c
* T() in z_en_encount1.c
* T() in z_en_owl.c
* T() in z_en_wonder_item.c
* fix forgot T
* Demonstration -> Demo
2024-08-24 20:58:05 -04:00
Dragorn421
3fe7d04157
Pause: doc generating page vtx/quads (part 1) ( #2071 )
...
* Pause: doc generating page vtx/quads (part 1)
* format
2024-08-24 13:37:34 -04:00
Dragorn421
ea40688e4a
[ntsc-1.2] Match z_kaleido_debug.c, z_lmap_mark.c ( #2077 )
...
* Match z_kaleido_debug.c, z_lmap_mark.c
* consistent style for n64dd callbacks calls
2024-08-24 08:18:48 -04:00
Dragorn421
b40e51d8c8
[ntsc-1.2] Match kaleido_collect.c, kaleido_scope.c ( #2070 )
...
* Match kaleido_{collect,scope}
* review
2024-08-24 00:44:16 -04:00
Dragorn421
9b409f5ff4
Match z_select.c ( #2076 )
2024-08-23 20:38:50 -04:00
Dragorn421
614c411058
match z_title.c ( #2075 )
2024-08-23 16:26:53 -04:00
Dragorn421
bdfa56e72d
Pause docs: page backgrounds vertices and quads ( #2065 )
...
* Pause docs: page backgrounds vertices and quads
* update disasm metadata
2024-08-22 08:46:28 -04:00
Pepe20129
ec19402748
Document z_player
AnimSfxType and related functions ( #2057 )
...
* Document AnimSfxType and related functions
* Rename ANIMSFX_TYPE_DEFAULT to ANIMSFX_TYPE_NO_OFFSET
* Fix format
* Rename walking types and improve comments
* Apply comment suggestion
* Address review
* Fix format
* Address review
2024-08-21 17:06:45 -04:00
Dragorn421
ac2224f095
Add versions.h ( #2060 )
2024-08-20 17:19:16 -04:00
cadmic
3e516f48f3
Match more ntsc-1.2 overlay draw functions ( #2061 )
...
* Match more overlay draw functions
* Review
2024-08-20 16:22:05 -04:00
cadmic
aba1bb88a3
Fix missing DEG_TO_BINANG2 ( #2059 )
2024-08-19 19:15:14 -04:00
cadmic
d191e8714e
Allow building the Debug ROM without debug features ( #2052 )
...
* Allow building the Debug ROM without debug features
* Fix bss
* Add comment
* Reword again
* Fix bss
2024-08-19 23:58:31 +02:00
cadmic
46a5fa919b
Match ntsc-1.2 z_scene_table.c ( #2050 )
...
* Match z_scene_table.c
* Attempt to fix bss ordering
* Forward declare PlayState instead
* Untangle circular includes in z64scene.h
2024-08-19 10:24:02 +02:00
cadmic
006a00448d
Miscellaneous N64 actor changes ( #2048 )
...
* Misc N64 actor changes
* Apply naming suggestions
2024-08-19 07:00:04 +02:00
cadmic
74ab917804
Add DEG_TO_BINANG2/RAD_TO_BINANG2 to match ntsc-1.2 z_en_gs.c, z_en_mm.c, z_en_toryo.c ( #2047 )
...
* Add DEG_TO_BINANG2/RAD_TO_BINANG2
* Remove redundant cast
2024-08-18 21:55:25 -04:00
Tharo
ba5574be6d
[Audio 5/?] Build the Samplebank Table ( #2044 )
2024-08-17 17:42:15 -04:00
Dragorn421
56ca23663a
Fixup printf args fake matches ( #2049 )
2024-08-17 22:42:09 +02:00
cadmic
b82f54bb95
Decompile N64 anti-piracy checks in overlays ( #2042 )
...
* Decompile N64 anti-piracy checks in overlays
* Fix BSS splits (I think)
* Use physical address and comment on meaning
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
---------
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2024-08-15 23:44:05 -04:00
Tharo
eaf955ad22
Generic actor params getters ( #1359 )
...
* Initial PARAMS_GET macros
* NOSHIFT macro
* Use number of bits rather than raw mask values
* Add descriptions for each generic macro
* Reformat
* Adjust comment
* format
* edit en_door macro names
* edit redead macro name
* edit bdan switch macro name, and remove unneeded comments in go2
* mizushutter macro names
* remove PARAMS_GET_S, rework ishi switch flag handling
* actually remove PARAMS_GET_S
* remove PARAMS_GET2_S
* PARAMS_GET_U and PARAMS_GET_S
* format
* fix merge
* format
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-14 21:29:43 +02:00
cadmic
755604d5ff
Match a bunch of overlay draw functions ( #2034 )
...
* Match a bunch of actor draw functions
* Change z_demo_gt.c draw functions to take Actor* thisx
2024-08-12 13:42:53 -04:00
cadmic
e6bc4bd8cb
Add names to all typedef'd structs, unions, and enums ( #2028 )
...
* Add names to all typedef'd structs, unions, and enums
* wtf vs code
* Use a better regex
2024-08-12 03:07:48 -04:00
krm01
8df87038a0
[Doc] name function func_8002DBD0 to Actor_WorldToActorCoords ( #2029 )
...
* name function Actor_WorldToActorCoords
* clean up some misleading usages
2024-08-11 14:30:41 -04: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
krm01
9ff6758458
doc pass for gravestone actor ( #2026 )
2024-08-10 19:05:48 -04:00
cadmic
9eec8af498
Add "do {} while (0);" to CLOSE_DISPS ( #2025 )
2024-08-10 18:48:27 -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
.
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-09 20:58:46 -04:00
cadmic
1021c482af
gc-us OK ( #2018 )
...
Match BSS order and delete disassembly data
2024-08-08 03:26:48 -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
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
0da402b9de
Automate fixing BSS ordering ( #2009 )
...
* Automate fixing BSS ordering
* Typo
* Some cleanups
* Move pragma check after printing BSS info
* Some proofreading
* multiprocessing, require version, some colors
* Tweak output
* Black + mypy
* Move logging and sys.exit out of helper functions
* Use stdout instead of stderr in fix_bss.py
* Add suggestion to conflicting offsets error
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Remove var = list[T]()
* Improve error handling
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Add error if no pointers to BSS
* Add comment about process_file_worker
* Only print updates if stdout is a tty
* Use new binary-search-esque candidate generation algorithm
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Add Wikipedia link
* More comment tweaks
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-02 20:31:15 -04:00
fig02
078e21f6c6
InitVars
-> Profile
(#2011 )
...
* rename ActorInit
* rename actorInit
* rename initInfo
* EffectSs Profile
* _InitVars -> _Profile
* format, loose ends
* revert tutorial
2024-08-02 17:50:02 -04:00
cadmic
067d06bb56
Match NTSC loose ends ( #2004 )
...
* Match NTSC loose ends
* Add comment about giObjectSegment size
2024-07-28 00:09:05 -04:00
fig02
7fcbf3f4b2
Document ANIM_FLAG_PLAYER_2
as ANIM_FLAG_DISABLE_CHILD_ROOT_ADJUSTMENT
( #2001 )
...
* name ANIM_FLAG_DISABLE_CHILD_ROOT_ADJUSTMENT
* reword
* typo
2024-07-27 23:47:58 -04:00
cadmic
47fd023238
Match NTSC z_kanfont.c and z_message.c ( #1997 )
...
* Match NTSC z_kanfont.c and z_message.c
Co-authored-by: inspectredc <inspectredc@gmail.com>
* Apply suggestions from code review
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Remove now-unnecessary padding
* Remove msgBufDecoded comment
* Use == NULL for fake match
* Rename Message_DrawText{JPN,NES} -> Message_DrawText[Wide]
* Font_LoadKanji -> Font_LoadCharWide
* Restore FONT_MESSAGE_OFFSET/FONT_MESSAGE_LENGTH
---------
Co-authored-by: inspectredc <inspectredc@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2024-07-21 21:50:20 -04:00
fig02
ab2ca85227
Rename ANIM_FLAG_NO_MOVE
to ANIM_FLAG_ADJUST_STARTING_POS
( #1981 )
...
* rename flag and draft 1 of comment
* draft 2
* tweak wording
* format
* format
2024-07-21 19:27:25 -04:00
Tharo
17a88746e7
Fix a couple of render modes ( #1994 )
2024-07-17 19:45:22 -04:00
cadmic
aaad2e1caf
Match NTSC z_en_mag.c ( #1989 )
2024-07-17 19:11:24 -04:00
cadmic
4fbb48177f
Create FILENAME_ macros for NTSC filename encoding ( #1986 )
...
* Create FILENAME_ macros for NTSC filename encoding
* Add defines/comments for all filename characters
* FILENAME_EXCLAMATION_POINT -> FILENAME_EXCLAMATION_MARK to match kanji file
* hirigana -> hiragana
2024-07-17 18:36:17 -04:00
mzxrules
7eee97429f
Clean up custom LoadTextureBlock in z_map_mark.c and z_lmap_mark.c ( #1896 )
...
* experimental inc.c
* make it look proper
* make table types u32
* ZCONST -> COND_CONST
* Tharo suggestion and comment
* implement MM Decomp suggestions
* fix minor nits
* Update header guard
2024-07-17 17:35:37 -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
24571203df
Remove global.h from z_fishing ( #1977 )
2024-06-25 18:48:24 -04:00
fig02
a599d7d548
Rename ANIM_FLAG_PLAYER_7 to ANIM_FLAG_OVERRIDE_MOVEMENT ( #1969 )
...
* rename and add comments
* format
* override movement
* format
* rework comments
* Remove whitespace at end of lines
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-06-25 15:50:01 -04:00
Anghelo Carvajal
d8f2e9abc6
Move PlayState
to a new z64play.h
( #1966 )
...
* ActorContext
* frameadvance
* SfxSource
* GameOverContext
* RoomContext
* TransitionActorContext
* fix bss
* Move PlayState
* Move play functions to new header
* SAC_ENABLE
* no longer needed
* SAC_ENABLE again
* z_demo being silly
* comment
* format headers
* fix retail bss
* actually fix bss
* Cutscene_ProcessScript comment
* bss again
* Update src/code/z_demo.c
Co-authored-by: cadmic <cadmic24@gmail.com>
* rename to frame_advance and remove it from z64.h
* move macros too
* review
* Rename SequenceContext to SceneSequences
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
2024-06-25 15:13:31 -04:00
Dragorn421
2ce4742bf6
Fix misc 22 ( #1971 )
...
* remove trailing whitespace
* fix/docbug about dright for next page of fault menu
* // size = ...; -> // size = ...
* access `ColliderJntSph.elements` as an array
* fixup doc in PreRender.c
* empty line after decl
* gdSPDefLights1 xyz arguments for direction are signed 8bit values
* doc bug of bad use of free in EffDust actor
* decimal for Actor.colorFilterTimer
* shopItemEntries -> sShopItemEntries
* HEISHI4_AT_KAKRIKO_ENTRANCE -> HEISHI4_AT_KAKARIKO_ENTRANCE
* format
2024-06-24 18:39:08 -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 fc8027a75f
.
* make zapd addresses globals int64_t so they can store uint32_t addresses and -1
* slight cleanup extract_assets.py
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0285e11f0"
upstream:
origin: "https://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
fig02
e4eb5e27b3
Rename ANIM_FLAG_0
to ANIM_FLAG_UPDATE_XZ
( #1964 )
...
* rename anim flag 0
* review
* missed a word
2024-06-21 19:04:06 -04:00
Tharo
38921684a5
Add point lighting gbi features ( #1962 )
...
* Add point lighting gbi features
* Maybe fix bss ordering
2024-06-20 22:39:43 -04:00
mzxrules
8d83727429
Experiment: remove global.h dependency from sys_math, sys_math3d, z_lib ( #1956 )
...
* split sys_math, sys_math3d, z_lib from global.h
* suggestions
* forgot this
* more math stuff
* nit fix
* re-add ichain.h
* resolve tharo's comments
2024-06-19 00:00:23 -04:00
fig02
06bbdf88f1
Revamp "AnimationContext" Docs, now called "AnimTaskQueue" ( #1941 )
...
* start using task terminology
* more docs
* format
* cleanups
* MoveActor -> ActorMove
* missed a couple
* hopefully the last changes
* comment explaining the group change
* some review
* dragorn review
* remove accidental file
* fix matching issue, now use while loop
2024-06-18 23:46:36 -04:00
inspectredc
e88084fe65
Fix LensMode Enum Names ( #1954 )
2024-06-09 14:43:15 -04:00
Dragorn421
05c87518e7
Document pause page switching ( #1550 )
...
* Document pause page switching
* document initial scroll left setup, when opening the pause menu
* `PAUSE_MAIN_STATE_1` -> `PAUSE_MAIN_STATE_SWITCHING_PAGE`
* try a diagram of the pages layout in world space as a comment
* expand `nextPageMode` comment
* touch up pause camera header comments
* expand comment on irrelevant init `mainState = PAUSE_MAIN_STATE_SWITCHING_PAGE`
* expand doc on `sKaleidoSetup*` data
* expand docs on `gPageSwitchNextButtonStatus`
* add some doc on `sPageSwitch*` arrays
* SwitchPage -> PageSwitch
* add `PAGE_SWITCH_NSTEPS`
* `SWITCH_PAGE_*_PT` -> `PAGE_SWITCH_PT_*`
* peepoArtist
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-05-23 16:56:10 -04:00
cadmic
b86e1774cf
Rename yDistToWater -> depthInWater ( #1950 )
...
* Rename yDistToWater -> yDistUnderWater
* yDistUnderWater -> depthInWater
2024-04-28 17:29:06 -04:00
fig02
7e8b9144c2
Player Docs: Control stick buffers ( #1945 )
...
* name vars and add enum
* name some spin attack stuff
* fix right and left
* forward/backward
* format
* fix retail bss
* sControlStickWorldYaw
2024-04-22 17:35:22 -04:00
fig02
62b97badc9
Player Docs: Name some high level update calls ( #1593 )
...
* name some low hanging fruit
* revert burn and shock, doing in seperate pr
* add some function comments
* yaw func
* adjust comment
* some review
* unname UpdateZTarget
* Player_DetectRumbleSecrets
* fix dive do action name
2024-04-20 16:42:18 -04:00
fig02
7ea68e9506
Player Docs: Action Interrupt ( #1947 )
...
* document action interrupt
* format
* new function comment
* format
* add a note about items
* format
2024-04-19 11:01:04 -04:00
cadmic
9cbd57d329
Fix miscategorized scenes ( #1946 )
...
* Fix miscategorized scenes
* Sort includes
2024-04-18 22:21:34 -04:00
fig02
30eb05321d
Player Docs: "sUpperBodyIsBusy" ( #1944 )
...
* document upperbodybusy
* change wording for comment and rename upperanimblendweight
* format
* review
2024-04-17 16:24:52 -04:00
cadmic
d59ca6cea2
Set up gc-eu and match all code ( #1938 )
...
* Set up gc-eu and match all code
* Format
* Mark gc-eu-mq as WIP until it builds OK
* Move original/MQ map mark data to separate files
* Add #includes to .inc.c files to help out VS Code
* Use #if in spec instead of .inc.c files
2024-04-15 13:36:29 -04:00
fig02
295a8669b8
Player: Document "WaitForPutAway" ( #1936 )
...
* document put away delay
* functions.txt
* add a note on delaying indefinitely
* format
* typo
* delay -> wait for put away
* revert unintended formatting change
* add comment to struct member
* format
* fix functions.txt
2024-04-15 13:02:43 -04:00
cadmic
f643499462
Match retail BSS ordering ( #1927 )
...
* Match retail BSS ordering
* Revert moving some global variables to headers
* Adjust block numbers after header changes
* Fix debug build
* Overlay bss ordering
* Fix BSS ordering after header changes
* gc-eu-mq OK
* Implement preprocessor for #pragma increment_block_number
* Transfer usage comment from reencode.sh
* Use temporary directory instead of temporary file
* Move ColChkMassType back
2024-04-14 23:51:32 +02:00
cadmic
a94661054e
Revert "Replace ‾ with - in z_bg_gnd_iceblock.c for encoding into EUC-JP ( #1937 )" ( #1940 )
...
This reverts commit a9ec5e1245
.
2024-04-10 15:21:17 -04:00
cadmic
a9ec5e1245
Replace ‾ with - in z_bg_gnd_iceblock.c for encoding into EUC-JP ( #1937 )
2024-04-01 11:27:49 -04:00
fig02
86bd6e9232
Document en_ba damage bug ( #1934 )
...
* comment on en_ba collision bug
* format
2024-03-29 11:27:34 -04:00
fig02
7445169e42
targetActor -> talkActor ( #1933 )
2024-03-24 12:27:45 -04:00
cadmic
8456e4be8a
Match retail ovl_kaleido_scope ( #1931 )
...
* WIP
* cleanup
* small progress
* small cleanup
* Finish retail ovl_kaleido_scope
* GREG + markPoint -> markPoint + GREG
---------
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2024-03-23 12:58:02 -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
cadmic
872940d664
More data fixes ( #1929 )
2024-03-23 12:30:09 -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
68a86d2d00
Colliders: change "touch, bump" to AT and AC (elems) ( #1637 )
...
* toucherFlags, bumperFlags -> atElemFlags, acElemFlags
* TOUCH_ -> ATELEM_
* BUMP_ -> ACELEM_
* ColliderElementTouch,Bump -> ColliderElementDamageInfoAT,AC
* toucher,bumper -> atDmgInfo,acDmgInfo
* Update docs and zcolchk funcs names
* run formatter
* remove the last mentions of "bump" for colliders
* Update renamed functions in disasm
2024-03-04 19:33:08 -05:00
cadmic
39d4217ecf
Match retail BossFd2_UpdateMane ( #1908 )
2024-03-04 12:35:48 -05:00
cadmic
63a95da5db
Match retail BossMo_DrawCore ( #1907 )
2024-03-04 18:22:23 +01:00
cadmic
9c09dcd4cd
Match retail z_fishing.c ( #1905 )
2024-03-04 17:57:16 +01:00
cadmic
e7b1868d84
Match retail BossFd_DrawBody ( #1915 )
2024-03-03 17:07:51 -05:00
Dragorn421
feb64e6ad8
Match retail text for some actors ❤️ ( #1912 )
...
* Match retail text for some of my dear actors
* Fix fake `EnDoor_SetupType` match, ty cadmic
2024-03-02 15:36:38 -05:00
Dragorn421
ff81e2a891
Build fixups: build gc-eu-mq with extracted/dbg, remove asmproc pragmas ( #1911 )
...
* Remove asmproc recurse (somehow these two survived)
* Use `extracted/gc-eu-mq-dbg` anyway for gc-eu-mq
2024-03-02 12:47:10 -05:00
cadmic
6b9a2433ab
Match retail EnNiw_Update ( #1906 )
2024-03-01 22:20:05 -05:00
Dragorn421
bdee3d33b4
No longer use asm-processor ( #1824 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "b3bfa14cf"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "b3bfa14cf"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "110b9eb"
* use CS_FLOAT
* update csdis
* update committed csdata
* finish updating csdis.py
* add script to reextract committed csdata
* dont use asm-processor, use iconv for reencoding utf8 to eucjp
* remove asm-processor csdata usage remnants
* --cs-float hex
* delete tempfile at end of reencode.sh (may want to rm even if compilation fails though?)
* comment reencode.sh
* comment CMD_F
* do not break permuter guessing compile command, by not reencode.sh-wrapping compilation under PERMUTER (thanks anghelo)
* fix the permuter fix
* pad -> sBssDummyNeg1
* reencode.sh: rm tempfile on script exit (including on error)
* renumber sBssDummy vars in zcolchk from 0
* Revert "--cs-float hex"
This reverts commit 85267dc348
.
* Revert BSS changes
* Add linemarker to reencoded files for better error message
* fix audio/general.c bss
* make reencode.sh work on macOS
* touch up csdis, csdis_re
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
2024-03-01 16:12:22 -05:00
cadmic
c9e97a3055
Mostly match retail bosses, part 1 ( #1898 )
...
* Retail bosses part 1
* Use GameState* local variable in BossGanon/BossGanon2 draw helper functions
2024-03-01 12:43:02 -05:00
cadmic
a32221c36e
Match retail z_en_ds.c, z_en_horse.c, z_en_fhg_fire.c ( #1897 )
...
* Actually match z_en_ds.c
* Match z_en_horse.c
* Match z_en_fhg_fire.c
2024-02-27 02:30:42 -05:00
cadmic
57ae8ae1dd
Mostly match retail bosses, part 2 ( #1894 )
...
* Bosses part 2
* Remove newline
2024-02-26 22:16:38 -05:00
cadmic
1da87b1e7f
Match En actors D-G ( #1889 )
...
* Match entity actors D-G
* Remove SET_EN_GOROIWA_SPEED
* Actually match z_en_elf.c
* GET_EN_GOROIWA_SPEED -> EN_GOROIWA_SPEED
2024-02-26 21:55:30 -05:00
cadmic
c86bf5011b
Match entity actors O-T ( #1826 )
2024-02-26 21:39:44 -05:00
cadmic
cdd24f2ac6
Match retail En actors V-Z ( #1825 )
...
* Entity actors starting with Z
* Use CS_STATE_IDLE
* z -> playerPosZ
* Remove comment
2024-02-26 21:29:40 -05:00
cadmic
769986874c
Finish player ( #1895 )
2024-02-26 14:24:14 -05:00
cadmic
10bae68937
Match En actors A-C, and a few more ( #1890 )
2024-02-24 13:00:37 -05:00
cadmic
7d128adf83
Match more of player for retail ( #1893 )
2024-02-24 12:47:17 -05:00
cadmic
93295a842b
Match some entity actors H-N ( #1827 )
2024-02-22 09:08:40 -05:00
cadmic
33d8044e45
Match retail demo actors ( #1745 )
...
* Match GetCue functions
* Match retail demo actors
* Add redundant parentheses around kREG(X) == Y in z_demo_gt.c
* Remove goto in DemoEffect_DrawLightEffect
* Rename "dl"
* Comment on possible array
* Use the word "fake"
* Remove redundant return
2024-02-20 15:15:52 -05:00
cadmic
5c31e686f6
More bg actors ( #1743 )
2024-02-20 07:00:55 -05:00
cadmic
b32d0a91ed
Match even more retail actors ( #1720 )
...
* Match even more actors
* Add macro for DebugDisplay_AddObject
* Prefer OOT_DEBUG &&
* Better EnReeba_Stunned match
* Revert "Add macro for DebugDisplay_AddObject"
This reverts commit 8197823abb
.
* Prefer OOT_DEBUG && some more
* Reformatting
* Add fake match comment
2024-02-13 09:10:28 -05:00
fig02
f492c04186
match function ( #1737 )
2024-02-08 17:23:22 -05:00
cadmic
53b0114464
Match InitDynaPoly actors ( #1733 )
...
* Match InitDynaPoly actors
* Change BgJyaBombiwa_SetupDynaPoly pads to s32
* kzIceScale -> sKingZoraRedIceScale
2024-02-07 18:58:46 -05:00
engineer124
563f717bc6
Misc 1: Retail Overlay Actors OK ( #1703 )
2024-02-07 19:46:51 +01:00
fig02
13143f4743
Retail Player matches part 2 ( #1725 )
...
* match a couple
* match some more
* revert accidental newline removal
2024-02-05 23:30:50 -05:00
fig02
c240184229
Retail Player_Update/Noclip mode + some docs ( #1718 )
...
* matched but its kinda ugly
* goto
* semi-colon to stop formatter
* some more docs
* noclip function doc
* remove noclip function from retail
* newline
* format
* reword noclip function comment a bit and fix typo
* format
* changes to doc comments
* reorganize button check
2024-02-05 18:13:15 -05:00
Derek Hensley
f3df4d13b8
Overlay Effects Retail OK ( #1717 )
...
* Effect_Ss_Bomb Retail OK
* Effect_Ss_Bomb2 Retail OK
* Effect_Ss_Stone1 Retail OK
2024-02-05 02:12:28 -05:00
fig02
a46941a195
Retail Player Matches part 1 ( #1712 )
...
* player matches part 1
* remove noclip if for now
* remove direvtive
2024-02-04 23:38:28 -05:00
cadmic
454b1caa52
Match more retail actors ( #1711 )
...
* More actors
* Format
2024-02-04 22:28:18 -05:00
cadmic
0cbcebfded
Match some overlay effects files ( #1705 )
2024-02-03 17:36:35 -05:00
engineer124
387149fda0
Retail File Select OK ( #1695 )
...
* file select OK
* cleanup
* oops
* cleanup
2024-02-02 12:54:41 -05:00
fig02
8d0076b010
Match retail Title and Sample gamestates ( #1692 )
...
* match title and sample
* change to directive
* no bad return
2024-02-01 19:52:52 -05:00
engineer124
1e21f69b37
z_play retail OK ( #1688 )
...
* z_play OK
* cleanup spacing
* PR
2024-02-01 17:00:27 -05:00
Derek Hensley
06379c3109
Gamealloc, Graph, and Graphalloc retail OK ( #1675 )
...
* Gamealloc OK
* Graph + Graphalloc OK
* PR review
* gfxalloc
* new lines
* Remove imposter
2024-01-31 19:07:12 -05:00
fig02
8be8848f85
z_demo retail code matched ( #1655 )
...
* match all functions
* format
* clarify between 'dest' and 'skip' debug features
* format
* better match for CutsceneHandler_RunScript
* review
* format
* remove macro
2024-01-30 18:52:04 -05:00
Yanis42
24df1480a3
Match `z_select.c
` ( #1659 )
...
* match ``z_select.c``
* add missing newline
* missed newlines
* ifdef -> if
2024-01-30 14:17:49 -05:00
cadmic
9816f62129
Define OOT_DEBUG=0 in retail builds ( #1658 )
...
* Define OOT_DEBUG=0 in retail builds
* Fix ifndef
* Replace VI_MODE_EDITOR_INACTIVE
* Revert "Replace VI_MODE_EDITOR_INACTIVE"
This reverts commit f7c4cae7c3
.
* Replace VI_MODE_EDITOR_INACTIVE, take 2
* Revert EnBom_Draw
2024-01-30 13:54:38 -05:00
engineer124
795f7e5251
z_parameter
retail OK (#1649 )
...
* z_parameter okay
* no u32
2024-01-28 16:20:21 -05:00
cadmic
0e6dc594e9
Match z_en_dodongo.c ( #1640 )
2024-01-28 13:17:57 -05:00
cadmic
88aa6de9ff
Match z_en_bom.c ( #1639 )
2024-01-28 13:03:33 -05:00
Phil
616d6d4e46
Named a couple things in z_boss_ganon2.c ( #1606 )
...
* Fixed minor style inconsistencies for CollisionCheckInfoInit
* Minor renaming in z_boss_ganon2.c
* Update z_boss_ganon2.c
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 11:56:16 -05:00
mzxrules
f4306900ee
en_honotrap MM sync ( #1564 )
...
* MM pr suggestions
* more changes to match MM
* linebreak in switch
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 11:38:14 -05:00
Dragorn421
4982f32384
Name actor flags 1: ACTOR_FLAG_REACT_TO_LENS
, ACTOR_FLAG_IGNORE_POINT_LIGHTS
( #1583 )
...
* 7 -> `ACTOR_FLAG_REACT_TO_LENS`
* move comment above actor flag
* 22 -> `ACTOR_FLAG_IGNORE_POINT_LIGHTS`
* newlines between flags
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 10:48:54 -05:00
cadmic
324db1d578
Replace most osSyncPrintf calls with PRINTF macro ( #1598 )
...
* Replace most osSyncPrintf calls with PRINTF macro
* DEBUG -> OOT_DEBUG
2024-01-12 10:38:13 -05:00
Dragorn421
1a8772e540
Cleanup z_collision_check
1 ( #1427 )
...
* Cleanup `z_collision_check.c` and structs
* Revert `other*` names to master, split to other pr
* WIP/experimental: `ColliderCylinderElement`
* Revert "WIP/experimental: `ColliderCylinderElement`"
This reverts commit cfc8c32ace
.
* ac/atHitInfo -> HitElem
* rename some collider elements to "elem" (instead of item, info, hurtbox...)
* cut down on more "hitbox" usage
* name all `ColliderElement*` temps properly
* rearrange colcheck structs
* add collider shape name descriptions
* reword collider shape descriptions
* jntsph first again
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-11 10:30:47 -05:00
cadmic
cd917b0cb8
Create debug macros for common functions ( #1597 )
...
* Create debug macros for common functions
* Revert NDEBUG change
* MALLOCR -> MALLOC_R
* DEBUG -> OOT_DEBUG
* Use the same name for debug and non-debug matrix functions
* Fix file/line argument order
* Revert g[s]DPNoOp[Tag]
* Use SystemArena_MallocDebug directly in GameAlloc_MallocDebug
* MTXF_TO_MTX -> MATRIX_TO_MTX
2024-01-09 07:59:03 -05:00
engineer124
e146d7bc26
Introduce Face Reaction Enum ( #1586 )
...
* face reactions
* cleanup
* cleanup fake match
* PR Review
* while I'm here
* mask reaction
* small fix
* Small cleanup
* oops
2024-01-08 17:17:22 -05:00
Phil
dcab429bf2
Fixed minor style inconsistencies for CollisionCheckInfoInit ( #1603 )
2024-01-05 18:57:05 -05: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
fig02
2b5b0fac06
name shock and burn functions ( #1594 )
2023-12-15 08:53:51 -05:00
krm01
e3316c9fb1
[Doc] Actor Bg_Bdan_Objects (Jabu Jabu misc dungeon actors) ( #1577 )
...
* bdan_objects type 2
* other bdan object types
* finish off bigocto platform
* run formatter
* remove stray comment
* add namespacing prefix to enums
* abbreviate camera to cam
* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* fix typo on enum
* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* enum name fixes
* remove unnecessary enum assignment
* Waterbox -> WaterBox
* named union, sfx to use SFX_FLAG
* friendly names for enums
* fix over-eager sed rename
* indent union fields
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-12-11 10:55:35 -05:00
fig02
0ed57f61b7
Cleanup: Remove uneeded casts on collider members ( #1595 )
...
* rm casts
* format
2023-12-10 14:53:51 -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
engineer124
f2c06ce441
Misc Cleanup ( #1585 )
...
* misc cleanup
* more fake matches
* revert for sym
2023-11-22 04:19:31 -05:00