Commit Graph

126 Commits

Author SHA1 Message Date
Sauraen
cd5eb31dc8 Multiple F3DEX3 versions (#112)
* Working on it

* Loading ucode from ROM working

* Menu implemented

* Fixed ifdefs in debug

* Fixed crashing

* Cleanup

* Suppressed make auto generated messages

* Reorganized RSP wrapper assembly files

* Fixed merge bug
2024-05-17 15:35:01 +02: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
Yanis
b65f664159 Started Debug Menu (#104)
* started basic debugger

* documentation and added rectangle configurator

* updated f3dex3 patches + made some for profiling stuff

* started profiler

* fix issues and moved profiler functions to gamestate/hide by default

* fix folders not being created properly

* started menu

* memory management

* fix english

* debug disp

* started collision view

* improvements

* basic collider view

* revert profiler changes

* improvements
2024-05-08 12:04:46 +02:00
Yanis
4b0858ec14 Add Gamecube support (#102)
* updated gzinject to use cadmic's iso support

* first part

* changes

* fixed gzinject issues (cadmic)

* fixed issue where last scene doesn't get its romend

* fixed small "issue" with iso terminal printing

* better safeguard for f3dex3

* fixed libultra issues (thanks to cadmic)

* revert unwanted change

* small fix
2024-05-08 11:58:56 +02:00
Yanis
0451a24a00 fixed compression issue with yaz (#101) 2024-04-23 17:58:27 +02:00
Yanis
8b99d614ad Force deterministic builds and introduce `make verify` (#93)
* force deterministic builds + other things

* remove checksum comparison and check for modern sdk first

* remove package_author from makefile

* remove the build date entirely
2024-04-22 19:55:44 +02:00
Yanis42
fe7f1e47e4 fixes and updated readme 2024-04-21 19:59:53 +02:00
Yanis42
1dc6105517 Merge remote-tracking branch 'upstream/main' into mod_assets 2024-04-21 17:47:38 +02:00
Yanis
75a2b58a17 Merge pull request #87 from Yanis42/cool_makefile
Improved output of the build process
2024-04-21 16:27:04 +02:00
Yanis42
dcc2a01770 add the blink code 2024-04-20 02:28:11 +02:00
Yanis42
3eb1bfb401 cool output 2024-04-20 02:23:18 +02:00
Yanis42
8ae6adef9e basic mod_assets setup 2024-04-18 19:37:37 +02:00
Yanis42
21fd29d933 modern sdk support 2024-04-17 02:46:52 +02:00
Yanis42
0a063eb79c hotfix to the hotfix 2024-04-16 14:49:57 +02:00
Yanis42
3b83e40cc6 hopefully fixed build issues 2024-04-16 14:45:30 +02:00
Yanis42
381adf6914 Merge remote-tracking branch 'decomp/main' into v2 2024-04-11 00:47:39 +02:00
cadmic
93642f97bc Use gcc -E instead of cpp to fix macOS build (#1935)
* Use `gcc -E` instead of `cpp` to fix macOS build

* -xc++ -> -xc
2024-03-29 11:03:28 -04:00
Yanis42
e31ba09d72 Merge remote-tracking branch 'decomp/main' into v2 2024-03-05 16:56:42 +01:00
Yanis42
3f2fd94500 Merge remote-tracking branch 'decomp/main' into v2 2024-03-05 16:35:42 +01:00
cadmic
bf37ad1368 Move baserom segments to extracted/ (#1916)
* Move baserom segments to extracted/

* Add old baserom segments dir back to .gitignore

* Rename segments/ -> baserom/
2024-03-04 19:06:26 -05:00
cadmic
b9d1fe50cc Make distclean delete build artifacts for all versions (#1909) 2024-03-04 18:26:04 +01:00
cadmic
0407594107 Hacks for building nes_font_static and nes_message_data_static with gc-eu-mq (#1721)
* Hack nes_font_static and nes_message_data_static

* Make hardcoded config a bit more consistent

* Put debug ROM first

* Reword comment

* Move nes_font_static hack to spec

* Restore extracted/gc-eu-mq
2024-03-02 16:05:15 -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
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
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 85267dc348741b67ac9c12eb60e1e764793d0bb6.

* 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