Pablo
7988ff4c1c
Fix build
2024-11-18 23:03:08 +01:00
Pablo
de8faf249c
Merge branch 'main' into reduce_interdependency
2024-11-18 20:25:52 +01:00
cadmic
5881164453
Fix VROM address handling in sym_info.py ( #2292 )
2024-11-17 17:34:23 -05:00
fig02
17edb82c0d
Decouple Debug Features From gc-eu-mq-dbg ( #2296 )
...
* rename OOT_DEBUG to DEBUG_FEATURES
* makefile changes
* add DEBUG_ASSETS
* fix DEBUG_FEATURES usages
* format
* fix errors
* review
* fix problem and review2
* review
* add DEBUG_FEATURES to DEBUG_ASSETS check
* review
* whoops
* format
2024-11-17 17:02:07 -05:00
cadmic
cf4dc98cc9
Use debug macros even in N64-only code ( #2298 )
...
* Use debug macros even in N64-only code
* Use UNK_FILE/UNK_LINE instead
2024-11-15 13:18:05 -05:00
Leonid Kapitonov
e46fcbdbc9
Document enum PauseState game over parts ( #2283 )
...
* [document] `enum PauseState`, game over parts
* apply Jenkins fixes (automatic code formatting)
also, as previously, i've rerun the "make" to check integrity
* add `PAUSE_STATE_GAME_OVER_*` comments
in case it helps to rename them later, if the need ever arises
* improve `PAUSE_STATE_GAME_OVER_SAVE_*` comments
also i've noticed, that `z64pause.h` doesn't comply fully with the `.clang-format`
temporary changing a couple of setting to
- ColumnLimit: 0
- AlignTrailingComments: false
fixes the issue. i don't want to push unrelated formatting here
* remove redundant comments
https://github.com/zeldaret/oot/pull/2283#discussion_r1827652667
* apply PR naming suggestions
reverified with
> `check_format.py ...`
> `make ...`
2024-11-15 03:37:10 -05:00
cadmic
c55a1dab57
fix_bss.py: Fix infinite loop after linker errors ( #2297 )
2024-11-14 12:35:35 -05:00
cadmic
8ce69c3ac9
Completely match ntsc-1.0/1.1 bss and add to CI ( #2294 )
2024-11-12 17:39:08 -05:00
Pepe20129
a04912a017
Use the T macro in z_select ( #2273 )
...
* Use the T macro in z_select
* Address reviews
* Apply Format
* Fix day & night
2024-11-12 13:35:59 -05:00
Tharo
2d454933f3
[Audio 9/?] Multiversion samplebank and soundfont extraction xmls, 1.0 and 1.1 audio extraction ( #2291 )
...
* [Audio 9/?] Multiversion samplebank and soundfont extraction xmls, 1.0 and 1.1 audio extraction
* Rework multiversion samplebanks to reduce duplicates
2024-11-12 08:47:34 -05:00
cadmic
d886ebe711
[ntsc-1.0/1.1] Match audio and loose ends ( #2293 )
...
* Match ntsc-1.0/1.1 loose ends
* Revert audioseq_padding
* Fix spelling
2024-11-11 17:50:56 -05:00
fig02
0d04f51e8e
Document Arrow Related Actor Flags ( #2284 )
...
* name arrow actor flags
* fix flag check
2024-11-05 07:31:28 -05:00
fig02
e50581b9fb
ACTOR_FLAG_ENKUSA_CUT -> ACTOR_FLAG_GRASS_DESTROYED (#2285 )
...
* rename enkusa cut to bush destroyed
* bush -> grass
* clump
2024-11-04 18:22:44 -05:00
Dragorn421
5b27899b9f
libu64 ( #2267 )
...
* libu64
* logutils.o -> debug.o in spec
* stackcheck.c is part of libu64
* review
* add paragraph about Overlay_Load calling an external function
* audio code*
2024-11-01 18:47:12 -04:00
Maciek
012c192f00
Missing python3-venv in Dockerfile ( #2282 )
2024-10-28 10:18:23 -04:00
Pablo
a4c0294b55
Fix some of BSS
2024-10-26 22:45:55 +02:00
Pablo
7230a2de6a
Hopefully fix the N64DD issues
2024-10-26 17:08:21 +02:00
Pablo
8eccba7846
Fix missing include in main.c
2024-10-26 15:52:27 +02:00
Pablo
ea89aaf475
Reduce header interdependency
2024-10-26 15:18:14 +02:00
Pepe20129
2c1d2d74bc
Document PLAYER_STATE1_SHIELDING ( #2279 )
...
* Document `PLAYER_STATE1_SHIELDING`
* Fix format
2024-10-24 22:14:34 -04:00
Charles Averill
6ea3982695
Remove hardcoded bash location in tools/preprocess.sh ( #2280 )
...
* Remove hardcoded bash location in tools/preprocess.sh
* Add more tolerant shebang to tools/preprocess.sh
2024-10-24 12:20:14 +02:00
fig02
3677c11140
Document ACTOR_FLAG_CAN_PRESS_SWITCHES ( #2275 )
...
* document switch activation
* format
* activate -> press
* fix comment
2024-10-20 23:19:14 -04:00
fig02
f4210323a2
Document ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT ( #2276 )
...
* name ACTOR_FLAG_HIT_PLAYER_THUMP_SFX
* ACTOR_FLAG_HIT_PLAYER_THUMP_SFX -> ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT
2024-10-20 22:29:50 -04:00
fig02
e55e909477
Document ACTOR_FLAG_UPDATE_DURING_OCARINA and PLAYER_STATE2_USING_OCARINA ( #2277 )
...
* Document ACTOR_FLAG_UPDATE_DURING_OCARINA
* document PLAYER_STATE2_USING_OCARINA
* format
* comment tweak
* treat var as flag
2024-10-17 21:44:35 -04:00
fig02
df1815cf8f
Document ACTOR_FLAG_THROW_ONLY ( #2274 )
...
* document ACTOR_FLAG_THROW_ONLY
* flip function name
* add comments
2024-10-15 14:10:21 -04:00
Derek Hensley
a53fb02699
EnHy + objects docs ( #1499 )
...
* document object_bba
* Clean up cne
* object bob
* object_aob
* object_cob
* object_bji
* object_ahg
* object_boj
* All functions named plus some cleanup
* enums
* Remove body wiggle comments
* Format
* Remove case comments
* comments with default
* Format
* format
2024-10-15 05:20:46 -04:00
cadmic
4f6e33e302
Add multiversion instructions to README ( #2247 )
...
* Add multiversion instructions to README
* Direct users toward Makefile
* Modify options "below" instead of "in the Makefile"
* Reword
2024-10-14 19:49:40 -04:00
mzxrules
2f54db142e
Rename RoomBehaviorType1 to RoomType ( #2271 )
...
* Rename RoomBehaviorType1 to RoomType
* suggestions
* Update include/z64scene.h
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-10-14 15:23:50 -04:00
Pepe20129
d0b4725869
Document Player_Action_8084F390 ( #2264 )
...
* Document Player_Action_8084F390
* Rename linkYawToStepTowards into shapeYawTarget
* Fix BSS
* Address reviews
* Fix format
* Address Review
2024-10-13 13:33:16 -04:00
mracsys
b275588728
Minor en_changer and en_bom_bowl_man documentation update ( #2272 )
...
* minor en_changer documentation update
* rename EnChanger->chestOpened to selectedChest, formatting
* update asm comment on EnChanger_OpenChests
* use EnExItemType enum instead of EXITEM_COUNTER define
2024-10-12 23:52:55 -04:00
mzxrules
eee7ba9bd5
Rename RoomBehaviorType2 ( #2270 )
...
* Rename RoomBehavior2
* fig proposal
* fig comment
2024-10-12 22:28:55 -04:00
Pepe20129
44460eeaec
Document Player_Action_SwingBottle ( #2263 )
...
* Document Player_Action_8084ECA4
* Name func_8083721C
* Add note
* Move BottleCatchAnimationData declaration
* Apply format
* Revert "Name func_8083721C"
This reverts commit aeb7ea83abe9bf122be5#1 )
* more docs
* struct comments
* format.py
* Revert "Merge branch 'main' of github.com:zeldaret/oot into bottle-info"
This reverts commit 10f1a4500368a66097c80cdb08f86ff2456ba9fb, reversing
changes made to 547280abf2a041a8f6884d43b2eada7802c7feec.
* add clarifying comment
* review, fix bss
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-10-11 16:31:06 -04:00
fig02
f79c9db649
Document Player_Action_TurnInPlace ( #2268 )
...
* document turn in place
* format
* modify comments
* sWaterSpeedFactor
2024-10-11 12:22:04 -04:00
cadmic
746adfc727
Use MASS_IMMOVABLE/MASS_HEAVY everywhere ( #2269 )
2024-10-10 23:48:26 -04:00
fig02
53c57599a4
Name talking action related things ( #2260 )
...
* name talking related things
* Player_Action_TalkExchangeItem -> Player_Action_ExchangeItem
* splitting action stuff to new PR
* format
2024-10-10 22:04:30 -04:00
fig02
fdf502dcdd
Document Player_Action_Idle ( #2266 )
...
* document Player_Action_Idle
* Player_DecelerateToZero
* cleanup R_RUN_SPEED_LIMIT usages
* format
* typo
* reorder reg
* shake timer is used for fall damage
* comment on shake timer only being processed in one place
* format and edit comment
* shakeTimer -> fallDamageStunTimer
2024-10-10 12:56:39 -04:00
Dragorn421
869bae3429
Pause doc: misc, fixups ( #2265 )
...
* use missed reg macros
* do action indexing cleanup
* misc
* doc fixup ish in KaleidoScope_SetPageVertices
* newline_police
* `43` -> `(PAGE_BG_QUADS + WORLD_MAP_QUAD_28)`
2024-10-09 22:09:58 -04:00
fig02
33251ccb51
name action wrappers ( #2261 )
2024-10-09 21:37:33 -04:00
Dragorn421
ba9c60552b
Player doc: some rotation logic/data ( #1443 )
...
* Docs: some player rotation logic/data
* Improve misleading comment
* rename temps
* unk_6AE_rotFlags
* format
* disasm metadata
2024-10-09 20:22:52 -04:00
cadmic
621b8f38c5
[ntsc-1.0/1.1] Match audio library ( #2243 )
...
* [ntsc-1.0/1.1] Match audio library
* Don't include versions.h in audio table headers
* Include versions.h where audio tables are used
2024-10-09 10:53:16 -04:00
cadmic
60f9607569
[ntsc-1.0/1.1] Match "system" files ( #2254 )
2024-10-09 09:48:53 -04:00
cadmic
d3bf8ae78b
[ntsc-1.0/1.1] Extract assets (except audio) for ntsc-1.0 and ntsc-1.1 ( #2253 )
...
* [ntsc-1.0/1.1] Extract assets (except audio) for ntsc-1.0 and ntsc-1.1
* Fix merge with pal-1.0/1.1
2024-10-09 14:22:57 +02:00
cadmic
2048a65dd8
[ntsc-1.0/1.1] Match line numbers in debug strings ( #2255 )
2024-10-09 13:41:16 +02:00
fig02
7dd8f2b6ad
Document Player_ChooseNextIdleAnim ( #2262 )
...
* document most of Player_ChooseNextIdleAnim
* finish documenting Player_ChooseNextIdleAnim
* capital letter
* dummy block numbers for the script
* fix bss
* bug comment
* SpeicalIdle -> Fidget, clean up related things
* fix rng chance comment
* normal -> default
* rework Player_CheckForIdleAnim
* swap idle anim defines
* remove COMMON_FIDGET
* add ARRAY_COUNT_2D
* change macro def
2024-10-08 00:19:10 -04:00
Dragorn421
93f22fcc42
[includes] z_collision_check.c ( #2252 )
...
* [includes] z_collision_check.c
* bss
2024-10-07 11:16:04 +02:00
fig02
1d0e243806
Player: Special Idle Animations ( #2259 )
...
* document special idle anims
* review
* format
* remove SPECIAL_IDLE_ANIMSFX_MAX
2024-10-05 10:26:15 -04:00
fig02
6b31fdad53
Player: AnimMovement ( #2245 )
...
* name top level stuff
* newlines
* Document Player AnimMovement
* tweak comment
* spelling
* review
* rework comment
2024-10-04 13:52:03 -04:00
cadmic
e9cbcb7ad9
Document bug in Camera_BGCheckInfo ( #2258 )
2024-10-04 04:04:53 -04:00
cadmic
089a2c4c0b
Add missing HS_FISHING constant ( #2256 )
...
* Add missing HS_FISHING constant
* It's actually doubly-bugged lol
* Format
2024-10-03 22:50:06 -04:00
cadmic
801fe22153
Fix build on certain Linux distributions ( #2257 )
2024-10-02 13:40:38 -04:00
