Commit Graph

34 Commits

Author SHA1 Message Date
Trueffel
64bd859db4 Debug Boot (DebugOpeningState) (#136)
* First pass of debug boot port

* mostly done

* general changes, test this comma in commit now

* Makefile update: The "," works now

* quotes also working now inside a string

* get rid of emulator path

* format

* review

* improvements (add skybox and improve print logic)

* cleanup and fix build issues

* format

---------

Co-authored-by: Yanis002 <35189056+Yanis002@users.noreply.github.com>
2025-01-02 18:14:50 +01:00
Yanis002
4e3ed2743a Merge remote-tracking branch 'decomp/main' into decomp_merge 2024-11-29 20:36:21 +01: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
Yanis42
f32f5406dd Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-10-17 15:50:29 +02: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
Yanis42
1b94c75a78 Merge remote-tracking branch 'upstream/develop/2.1.0' into decomp_merge_4 2024-09-27 19:01:08 +02:00
Yanis
f98edc4fcf Fixed release mode (#152)
* fixed release mode

* format

* move NDEBUG to the safeguards to allow building without RELEASE

* forgor to revert a test thing

* remove the todo for segment symbols
2024-09-27 18:58:28 +02:00
Yanis42
d55a756a59 Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-09-16 14:57:30 +02:00
Tharo
dbbeb656f8 [Audio 8/?] Check-in handwritten sequences, build sequences, automate various sfx arrays (#2137)
* [Audio 8/?] Check-in handwritten sequences, build sequences, automate various sfx arrays

* Fix whitespace in aseq.h

* Fix sequence 0 sfx id generator

* Suggested changes, adjust some MML syntax and add more instruction descriptions

* Correct some formatting in aseq.h

* Add the dir of the input .seq file to the list of includes to sequence assembling so that assembler-level includes like .include or .incbin work intuitively

* aseq.h tweaks

* MM review suggestions, aseq.h adjustments
2024-09-15 18:26:27 -04:00
cadmic
5419a18d79 [ntsc-1.2] Match N64 audio tables (#2183)
* Match N64 audio tables

* ifdef PERMANENT_POOL_SIZE rather than EXTRA_SIZE
2024-09-11 19:31:54 +09:00
Yanis42
f5aab0e70d fixed issues and added example scene (not commiting the map now) 2024-04-19 00:22:59 +02:00
Yanis42
3f2fd94500 Merge remote-tracking branch 'decomp/main' into v2 2024-03-05 16:35:42 +01:00
Derek Hensley
1b60dcf6dd Use Romfile in place of vromStart and vromEnd in structs (#1742)
* KaleidoMgrOverlay

* GameStateOverlay

* ActorOverlay

* EffectSsOverlay

* MapMarkDataOverlay

* Missed DEFINE_ACTOR_UNSET

* ROM_FILE_UNSET

* DEFINE_OBJECT_EMPTY

* DmaEntry

* ACTOR_UNSET

* romfile.h

* newline

* Format
2024-02-29 14:15:04 +01:00
Yanis42
7725efe646 Merge remote-tracking branch 'decomp/main' into v2 2024-02-06 23:35:19 +01:00
cadmic
d674dad3da Match compression for gc-eu-mq (#1704)
* Improve compression

* Format

* Typo

* Use Python assignment expression in tools/dmadata.py

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

* Review decompress_baserom.py

* Replace DEFINE_DEBUG_SCENE with CPP defines

* Pass is_zlib_compressed instead of version

* Reword NOLOAD comment in write_compress_ranges

* Remove redundant comment

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-02-03 23:59:19 +01:00
Yanis42
1bf7f41748 macros for "is debug and feature enabled" 2024-02-03 17:31:58 +01:00
Yanis42
40e7a86972 improved general features 2024-02-03 02:42:49 +01:00
Yanis42
36557818d4 initial debug features 2024-02-03 01:39:45 +01:00
Yanis42
403ada3ac9 pre-merge tweaks 2024-02-02 16:59:44 +01:00
Yanis42
cfef43f512 gdb + rest of the first batch of changes 2024-01-31 22:50:22 +01:00
Tharo
47ffb59f68 Generate gamestate overlay table with an include/tables/ header (#1504)
* Generate gamestate overlay table from an include/tables/ header

* GameStateIndex -> GameStateId, move to z64.h, add GameStateId enum name field to the gamestate table, adjust and improve gamestate table comment

* Shorten zeros in table definition

* Generate linker symbols, other suggested changes

* GAMESTATE_MAX -> GAMESTATE_ID_MAX like the others
2023-07-04 12:36:55 -04:00
Dragorn421
9bad1d108e Cleanup post good scene names (#1452)
* Cleanup scene names

* missing scene id use

* rename scene draw config functions

* remove now useless comments

* format

* fix double defense/magic swapped

* try precision on "from potion shop"

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2022-12-05 13:37:40 -05:00
Dragorn421
186ecc72b5 Name scenes (scene enum, entrance enum, various identifiers) (#1343)
* Comment names on titled scenes

* Comment some more scene names

* Comment some map assets symbol prefixes

* Name collapse sequence scenes (from the non-collapse equivalent scene's name + `_COLLAPSE`)

* Name ganon/ganondorf boss scenes (symbol prefix suffixed with `Scene` to prevent confusion with boss actors)

* Fix symbol prefix for back alley night scene

* Name the two grave scenes (normal and fairy's fountain variant)

* Name most houses, name/update misc scenes

Co-authored-by: fig02 <fig02srl@gmail.com>

* (hakaana) `GRAVE` -> `REDEAD_GRAVE` to be more specific

Co-authored-by: fig02 <fig02srl@gmail.com>

* `miharigoya_scene`: `market_guard_house`

* `kakariko_scene` -> `kakariko_center_house`

* `richards_house` -> `dog_lady_house` (for localization differences)

* Revert "Comment some map assets symbol prefixes"

This reverts commit 210a38a6288d5d2fa318059f31988ca7ceb5c708.

* remove other xml prefixes

* ganon_boss, ganondorf_boss

* comments to namefixer

* `KAKARIKO_CENTER_HOUSE` -> `KAKARIKO_CENTER_GUEST_HOUSE`

* two collapse sequence scenes -> `GANONS_TOWER_COLLAPSE_`interior/exterior

* Run namefixer

`find src include -type f -exec ./tools/namefixer.py {} \;`

* run formatter

Co-authored-by: fig02 <fig02srl@gmail.com>
2022-11-26 16:15:41 -05:00
Dragorn421
22b78f169f Fix misc 17 (#1392)
* Some cleanup on bgcheck waterbox y funcs

* Fix some typo/spelling

* EnFz_ApplyDamage match fixup

* Turn another sus construction into a switch

* Fixup comment on restoring MS as adult

* "doesnt, isnt" -> "doesn't, isn't"

* Hunt down whitespace at end of lines

* Format (clang-format does not like figs bug comment on bongo cutscene unskip sadge)

* Viewport z scale/translation: `0x1FF` -> `G_MAXZ/2` (see proman "9.7 Mixing CPU and SP Addresses", "12.7.6 Depth Source")

* static symbols: g -> s prefix

* Link young/old -> child/adult

* Fixups

* Get rid of signed vs unsigned comparison warning by changing room temps to s32

* waterbox search funcs consistency

* Revert "waterbox search funcs consistency"

This reverts commit 8f386e038f5e735f0f5f1240fc4da7bec4e8c7e2.

* `curWaterBox` -> `waterBox`
2022-10-13 04:06:49 -04:00
fig02
afbc312024 Rename "Scene Setup Index" to "Scene Layer" (#1300)
* setup -> layer

* IS_CUTSCENE_LAYER

* review

* backtick

* remove some more mentions of setup

* alt header block

* clarifying comment
2022-07-30 17:28:50 -04:00