Commit Graph

75 Commits

Author SHA1 Message Date
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
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
Yanis42
d55a756a59 Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-09-16 14:57:30 +02:00
cadmic
09c1816e2d Add OOT_PAL_N64 and move other shorthands to versions.h (#2188)
* Move definitions of OOT_NTSC/OOT_PAL/OOT_MQ to versions.h

* Add PAL_N64 shorthand
2024-09-12 05:24:31 -04:00
Yanis42
30fa2a60c3 Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-08-28 13:09: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
Yanis42
650046a6e2 Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-08-19 13:06:37 +02:00
Tharo
d3b9ba17da [Audio 4/?] Build Samplebanks, match Audiotable (#2032)
* [Audio 4/?] Build Samplebanks, match Audiotable

* Fix some makefile formatting

* Add missing scope in MARK chunk handling

* Add comment to generate asm file when buffer bug data is emitted, remove duplicate CC4 definition

* Adjust comment

* SBCFLAGS

* Remove unnecessary comments on notes_lut

* Split build directories creation command into several to avoid it becoming too long

* objcopy -j -> --only-section

* Fix mkdir warning when extracted/VERSION/assets doesn't exist
2024-08-14 20:54:31 -04:00
Yanis42
05401196ca Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-08-14 15:55:05 +02:00
Dragorn421
dd48d34270 Update c_cpp_properties.json for VSCode (#2033) 2024-08-11 19:34:05 -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
Yanis42
073a6aeaf9 Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-08-08 20:24:58 +02:00
Dragorn421
ff2abf36a1 Remove tutorial, link to the latest zeldaret/oot:main revision with it (#2013)
* Remove tutorial, link to the latest zeldaret/oot:main revision with it

* proofreading here too

* rename to decompiling_tutorial

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
2024-08-02 21:20:54 -04:00
Yanis42
1d65c71197 Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-08-01 17:36:32 +02:00
Dragorn421
9963e7f5d5 Update vs code config and provide c_cpp_properties.json with all supported versions (#2010)
* Update oot-gc-eu-mq-dbg example vscode config and provide c_cpp_properties.json with all supported versions

* remove N64 prefix from config names

* newline at end of file
2024-07-31 23:19:46 -04:00
Yanis42
a068969282 Merge remote-tracking branch 'decomp/main' into decomp_merge_4 2024-07-30 00:36:11 +02:00
cadmic
5515aa1705 Configure incbins in version config instead of using the Debug ROM (#2005)
* Run CPP for data/*.s

* Configure incbins in version config instead of using the Debug ROM
2024-07-28 00:24:13 -04:00
Yanis
20a0613120 Merge zeldaret/main (#106)
* 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

* 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

* 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

* Delete disassembly data for gc-eu-mq (#1942)

* Player Docs: "sUpperBodyIsBusy" (#1944)

* document upperbodybusy

* change wording for comment and rename upperanimblendweight

* format

* review

* Fix miscategorized scenes (#1946)

* Fix miscategorized scenes

* Sort includes

* Player Docs: Action Interrupt (#1947)

* document action interrupt

* format

* new function comment

* format

* add a note about items

* format

* Add gc-eu-mq to CI (#1943)

* Add gc-eu-mq to CI

* Give up on scripting

* Revert quotes changes

* 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

* 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

* Force string.o to be in boot for gcc builds (#1948)

In retail builds, memcpy is linked in code, not boot, but GCC likes to call memcpy when copying structs so currently GCC builds immediately crash in __osInitialize_common.

* Rename yDistToWater -> depthInWater (#1950)

* Rename yDistToWater -> yDistUnderWater

* yDistUnderWater -> depthInWater

* Check baserom hash before decompression (#1952)

* Remove Cygwin support (#1951)

* update installation docs

* setup fixes

* tabs

---------

Co-authored-by: cadmic <cadmic24@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-05-10 18:21:07 +02:00
cadmic
87a6e75242 Remove Cygwin support (#1951) 2024-05-07 17:52:18 +02:00
Yanis42
e31ba09d72 Merge remote-tracking branch 'decomp/main' into v2 2024-03-05 16:56:42 +01: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
Dragorn421
a6f646dc65 Introduce extracted/VERSION, with text extracted there (#1730)
* Introduce assets/_extracted/VERSION, with text extracted there

* move to `extracted/text/`

* Update gitignore s

* rework args for msgenc.py

* put mkdir with others, until theyre all moved at once

* move 0xFFFC back to being extracted, making it use specific macro `DEFINE_MESSAGE_NES` to handle its special behavior

* prettier gitignore

* Move messages 0xFFFC, 0xFFFD to committed message_data.h
2024-03-01 22:09:57 -05:00
Yanis42
7adaf0ff41 hacker-mq -> hackeroot-mq 2024-02-04 12:30:03 +01:00
Yanis42
e590e518f2 fixed compression issues 2024-02-04 12:16:55 +01:00