mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-10-16 19:51:23 +00:00
Code Issues Projects Releases Wiki Activity
2234 commits 1 branch 0 tags 565 MiB
Commit graph

2234 commits

This branch
This branch
All branches
Author SHA1 Message Date
feacur
5552e92eef apply review changes 2024-11-28 18:47:39 +01:00
feacur
279759f481 Merge branch 'main' into doc/cutscene_index 2024-11-20 15:58:40 +01:00
fig02
e0e0e93644
 		Player: Name all Start Modes (#2302) 
* name some start modes

* document blue warp mode

* Revert "document blue warp mode"

This reverts commit d4071a8123.

* name movement modes

* fix door mode comment, it is not broken

* Player_PutSwordInHand

* typo

* how the hell did that happen

* add sword clarification
 2024-11-20 03:22:55 -05:00
feacur
0cbe8a477f still, add a BSS pragma for z_demo.c 2024-11-20 01:09:57 +01:00
feacur
133a74fc78 ugh, use defines instead of an enum 
probably size of enum entries doesn't match well? originally these were
just numbers. besides, not like it's a real enumeration from zero to a
value or some bit flags
 2024-11-19 19:00:29 +01:00
feacur
1d84bca790 revert all local to the branch bss shifts 2024-11-19 18:50:11 +01:00
feacur
4b3e0dceb6 run fix_bss locally 
`ntsc-1.2` refused to comply though
 2024-11-19 18:35:59 +01:00
feacur
3530507e46 Merge branch 'main' into doc/cutscene_index 2024-11-19 16:31:38 +01:00
fig02
ae1a1adcf1
 		Player Docs: Begin "Start Mode" Documentation (#2301) 
* set up start mode

* note unused modes

* fix bss
 2024-11-18 18:47:41 -05:00
feacur
450e24e899 Merge branch 'main' into doc/cutscene_index 2024-11-18 00:49:36 +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
feacur
211bf7400d apply Jenkins fixes 
https://jenkins.deco.mp/job/OOT/job/PR-2286/14/console
 2024-11-13 20:40:38 +01:00
feacur
bee188dcd8 Merge branch 'main' into doc/cutscene_index 2024-11-13 20:11:01 +01: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
feacur
02a977f27d ok, now the last two CS_INDEX_* are less unknown 
the purpose of `CS_INDEX_BARRIER` is not quite clear still
 2024-11-05 18:58:03 +01:00
feacur
eb75a6dea4 use explicit scene layer names instead of numbers 2024-11-05 17:11:28 +01:00
feacur
d9bbd67137 rename the flag for automatic sceneLayer calc 
it gets assigned to the `nextCutsceneIndex`,
so `CS_INDEX_NONE` name was misleading
 2024-11-05 17:07:03 +01:00
feacur
6eaaa8706c rename the flag for freeing nextCutsceneIndex 2024-11-05 17:00:42 +01:00
feacur
2bd2ca20dd remove redundant comments, fix the header comment 
and add a comment chunk from https://github.com/zeldaret/oot/pull/2286#discussion_r1829108940
 2024-11-05 16:27:43 +01:00
fig02
0d04f51e8e
 		Document Arrow Related Actor Flags (#2284) 
* name arrow actor flags

* fix flag check
 2024-11-05 07:31:28 -05:00
feacur
32a2dd0ae2 apply a PR suggestion 
https://github.com/zeldaret/oot/pull/2286#discussion_r1829219841
 2024-11-05 13:16:22 +01:00
feacur
b8953fd0b9 apply Jenkins fixes 
https://jenkins.deco.mp/job/OOT/job/PR-2286/4/console

hmm, i do need this automation locally to
 2024-11-05 13:16:22 +01:00
feacur
2ec57c90a6 improve CS_INDEX_* naming, rem ENTRANCE suffix 
https://github.com/zeldaret/oot/pull/2286#discussion_r1829165205

reverified with
> `check_format.py ...`
> `make ...`
 2024-11-05 12:34:35 +01:00
feacur
8cbdf80d86 rename CS_INDEX_* with PR suggestions 
and some additional observations
reverified with
> `check_format.py ...`
> `make ...`

additionally:
- current clang-format lacks a rule for trailing commas
- compiler says about them `cfe: Warning 624`
 2024-11-05 12:17:39 +01:00
Leonid Kapitonov
2ae3bff3b8
 		apply a draft PR suggestion 
Co-authored-by: mzxrules <mzxrules@gmail.com>
 2024-11-05 11:26:18 +01:00
feacur
4049e33ba9 run check_format.py ... separetely 
so that it doesn't clutter previous commit. still, allowing `clangd LSP` to run format-on-save yields inconsistent results for me with the project's tooling, especially for header files
 2024-11-05 03:50:24 +01:00
feacur
050c736411 crudely rename enum CutsceneIndex entries 2024-11-05 03:47:32 +01:00
feacur
53cd39d38f introduce enum CutsceneIndex as a first step 2024-11-05 00:43:59 +01: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
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