Derek Hensley
77c9c97ff9
Overlay_Relocate and Overlay_Load retail OK ( #1662 )
...
* Overlay_Relocate OK
* Overlay_Load
* format
* PR + better match for Overlay_Load
2024-01-30 19:30:27 -05:00
Dragorn421
2beff8cbf4
Fixup vscode settings ( #1669 )
...
* Fixup VSCode settings
add missing include
explicitly define OOT_DEBUG to 1
* Change configuration name
* change config name
2024-01-30 19:20:45 -05:00
fig02
8be8848f85
z_demo retail code matched ( #1655 )
...
* match all functions
* format
* clarify between 'dest' and 'skip' debug features
* format
* better match for CutsceneHandler_RunScript
* review
* format
* remove macro
2024-01-30 18:52:04 -05:00
engineer124
af6b821193
Audio retail OK ( #1650 )
...
* general OK
* wait for data
* sfx and sequence
* PR Suggestions
* debug file
* data
* PR
2024-01-30 18:24:13 -05:00
Dragorn421
17f08788aa
subrepo and update asm-differ ( #1664 )
...
* git subrepo clone git@github.com:simonlindholm/asm-differ.git tools/asm-differ
subrepo:
subdir: "tools/asm-differ"
merged: "11eee5916"
upstream:
origin: "git@github.com:simonlindholm/asm-differ.git"
branch: "main"
commit: "11eee5916"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "110b9eb"
* ln -s ./tools/asm-differ/diff.py diff.py
2024-01-30 15:25:15 -05:00
cadmic
18b7030534
Revert bad uses of if (OOT_DEBUG) ( #1666 )
2024-01-30 15:19:00 -05:00
Derek Hensley
7b770dc1e0
vr_box OK ( #1663 )
2024-01-30 14:22:55 -05:00
Yanis42
24df1480a3
Match `z_select.c` ( #1659 )
...
* match ``z_select.c``
* add missing newline
* missed newlines
* ifdef -> if
2024-01-30 14:17:49 -05:00
cadmic
9816f62129
Define OOT_DEBUG=0 in retail builds ( #1658 )
...
* Define OOT_DEBUG=0 in retail builds
* Fix ifndef
* Replace VI_MODE_EDITOR_INACTIVE
* Revert "Replace VI_MODE_EDITOR_INACTIVE"
This reverts commit f7c4cae7c3
2024-01-30 13:54:38 -05:00
engineer124
6d09437c21
Retail z_quake.c and z_room.c OK ( #1661 )
...
* quake OK
* z_room OK
2024-01-29 21:08:35 -05:00
cadmic
5ba625b171
Match yaz0.c ( #1660 )
2024-01-29 18:14:30 -05:00
Yanis42
9f169a67cd
Match `game.c` - OK ( #1644 )
2024-01-29 15:27:29 -05:00
cadmic
68b41d6b0d
Refactor Makefile variables to use DEBUG ( #1657 )
2024-01-29 12:20:54 -05:00
cadmic
64d384b4c1
is_debug.c and boot_main.c OK ( #1641 )
...
* Match is_debug.c and boot_main.c
* Disable function declarations
* Remove /* OOT_DEBUG */
* Remove newlines around ifdef
2024-01-29 12:10:28 -05:00
cadmic
0f11f2f166
Tweak OPTFLAGS for some files for retail ( #1647 )
2024-01-29 10:36:41 -05:00
cadmic
be731f8a35
Move __osPfsInodeCache and __osPfsPifRam ( #1654 )
...
* Move __osPfsInodeCache to pfsgetstatus.c
* Move __osPfsInodeCache to contfps.c and __osPfsPifRam to pfsisplug.c
2024-01-29 07:30:29 -05:00
cadmic
6e0d67f9ec
Check formatting in CI ( #1652 )
...
* Check formatting in CI
* Move deleteDir() to cleanup section
* Revert "Move deleteDir() to cleanup section"
This reverts commit 4b0dd80cac
2024-01-29 07:25:58 -05:00
cadmic
8af0919e7d
Match idle.c ( #1643 )
2024-01-29 12:48:06 +01:00
engineer124
795f7e5251
z_parameter retail OK (#1649 )
...
* z_parameter okay
* no u32
2024-01-28 16:20:21 -05:00
Yanis42
8a8b6cf90b
Match `main.c` - OK ( #1645 )
...
* main.c OK
* removed comment
* better match
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-28 15:46:08 -05:00
Tharo
f893a83d15
Add file split for epidma.s in gc-eu-mq disassembly ( #1648 )
2024-01-28 15:34:00 -05:00
cadmic
0e6dc594e9
Match z_en_dodongo.c ( #1640 )
2024-01-28 13:17:57 -05:00
cadmic
88aa6de9ff
Match z_en_bom.c ( #1639 )
2024-01-28 13:03:33 -05:00
cadmic
98a3238822
Set up disassembly for gc-eu-mq ( #1613 )
...
* Disassemble gc-eu-mq
* Add script to report progress with matching
* Fix whitespace
* Change T|None to typing.Optional[T]
* Use typing.List
* More type annotations fixes for old Python versions
* Fix type errors
* More type annotations
* Use typing.Iterator
* Use $(PYTHON) for disassembly
* Don't use grouped targets to support very old Make versions
* Docs: suggest checking MM, mention virtualenv, clarify about expected/
* Update sym_info.py
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Sync functions.txt
* Start banned symbol range at 0x10000000
* Also ban symbols from 0xC0000000-0xFFFFFFFF
* Unban IPL symbols
* Fix first_diff.py
* Sync z_collision_check functions.txt
* Ban 0xA0 symbols too
* Touch .disasm sentinel file
* Copy -jN comment in docs
* diff.py flags: remove -3, add -s
* Update docs/retail_versions.md
Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>
* Comment that segments are still from the Debug ROM
* Revert "diff.py flags: remove -3, add -s"
This reverts commit bfaae66c1d
2024-01-28 18:09:03 +01:00
cadmic
e9a571054c
Delete venv if venv creation fails ( #1622 )
...
* Delete venv if venv creation fails
* Comment on shell magic
2024-01-27 19:40:29 -05:00
cadmic
5dd19e4862
Use virtualenv in Makefile for python dependencies ( #1619 )
...
* Use virtualenv in Makefile for python dependencies
* Create separate targets for venv creation and installation
* Fix install-python-deps prerequisite
* Try simplifying Jenkinsfile
* Simplify venv targets
* Fix merge
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-01-25 01:39:13 +01:00
cadmic
584e61a849
Add dependencies for tools to requirements.txt ( #1621 )
...
* Add dependencies for tools to requirements.txt
* Downgrade mapfile-parser
2024-01-24 19:03:57 -05:00
cadmic
16f9ff39be
Rename make compressed to make compress ( #1620 )
2024-01-24 18:02:53 -05:00
cadmic
0417e739cc
Suggest pip install -U -r requirements.txt ( #1618 )
...
* Suggest pip install -r requirements.txt
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-01-24 15:06:07 -05:00
Dragorn421
111c2e84ae
Fix mkdmadaata usage ( #1617 )
2024-01-24 13:34:34 -05:00
Anghelo Carvajal
3d9db8d34d
Setup rom decompression and compression ( #1614 )
...
* decompress baserom
* cleanup
* specific hash check
* rename baserom
* git subrepo clone (merge) --branch=5da3132606e4fd427a8d72b8428e4f921cd6e56f git@github.com:z64tools/z64compress.git tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "5da313260"
upstream:
origin: "git@github.com:z64tools/z64compress.git"
branch: "5da3132606e4fd427a8d72b8428e4f921cd6e56f"
commit: "5da313260"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* setup compression
* Add all compressed segments to the spec
* Update md5 files
* readme instructions
* cleanup
* Setup python dependencies on Jenkinsfile
* Update Makefile
Co-authored-by: cadmic <cadmic24@gmail.com>
* review
* . .venv/bin/activate
* update readme
* whoops
* Yeet other versions from decompress_baserom.py
* my bad
* Move everything to baseroms/VERSION/
* Active venv on each command
* jenkinsfile: use multiline syntax
* Put the correct path on the jenkinsfile
* Forgot to call per_version_fixes
* CC0
* Update readme
* Change where baserom segments are put into
* Update Makefile
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update crunch64
* Label compressed instead of uncompressed
* Update README.md
Co-authored-by: fig02 <fig02srl@gmail.com>
* Fix
* `make rom`
* baserom-uncompressed
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* review
* baserom-decompressed.z64
* ignore baseroms
* rm -rf tools/z64compress
* wip crunch64-based compress.py
* OK compress
* use ipl3checksum sum directly for cic update on compressed rom
* multithreading
* "docs"
* fix MT: move set_sigint_ignored to global level for pickling
* license compress.py
* rm junk
* Fix (or at least sort out) compress_ranges.txt dependencies
* Update tools/overlayhelpers/damage_table.py
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-24 13:00:10 -05:00
Dragorn421
5e406f754e
Small Math_Vec3f_Yaw doc ( #1433 )
...
* Small `Math_Vec3f_Yaw` doc
* remove actor from arg names
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-18 17:56:54 -05:00
cadmic
90a6268460
Test for __sgi instead of __GNUC__ for PRINTF macro ( #1612 )
2024-01-18 08:47:22 -05:00
cadmic
678af62ec3
Remove actor padding in non-debug versions ( #1611 )
...
* Remove actor padding in non-debug versions
* Remove dbgPad comment
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-01-16 12:15:34 -05:00
cadmic
6b5533ccd9
Create debug macros for LogUtils functions ( #1610 )
2024-01-16 09:59:02 -05:00
cadmic
a5fbfdba01
Move Scene_SetTransitionForNextEntrance to z_scene.c ( #1609 )
2024-01-16 09:50:28 -05:00
Phil
616d6d4e46
Named a couple things in z_boss_ganon2.c ( #1606 )
...
* Fixed minor style inconsistencies for CollisionCheckInfoInit
* Minor renaming in z_boss_ganon2.c
* Update z_boss_ganon2.c
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 11:56:16 -05:00
mzxrules
f4306900ee
en_honotrap MM sync ( #1564 )
...
* MM pr suggestions
* more changes to match MM
* linebreak in switch
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 11:38:14 -05:00
Dragorn421
4982f32384
Name actor flags 1: ACTOR_FLAG_REACT_TO_LENS, ACTOR_FLAG_IGNORE_POINT_LIGHTS ( #1583 )
...
* 7 -> `ACTOR_FLAG_REACT_TO_LENS`
* move comment above actor flag
* 22 -> `ACTOR_FLAG_IGNORE_POINT_LIGHTS`
* newlines between flags
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 10:48:54 -05:00
cadmic
324db1d578
Replace most osSyncPrintf calls with PRINTF macro ( #1598 )
...
* Replace most osSyncPrintf calls with PRINTF macro
* DEBUG -> OOT_DEBUG
2024-01-12 10:38:13 -05:00
adaliaramon
6eb3bf401c
Removed unused imports and other minor improvements ( #1602 )
...
* Removed unused imports and other minor improvements
* revert tools/ZAPD/ZAPD/genbuildinfo.py
* revert diff.py
* Update sym_info.py
* revert asm_processor/
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-01-11 11:04:53 -05:00
Dragorn421
1a8772e540
Cleanup z_collision_check 1 ( #1427 )
...
* Cleanup `z_collision_check.c` and structs
* Revert `other*` names to master, split to other pr
* WIP/experimental: `ColliderCylinderElement`
* Revert "WIP/experimental: `ColliderCylinderElement`"
This reverts commit cfc8c32ace
2024-01-11 10:30:47 -05:00
Dragorn421
f02d012ce7
add OOT_DEBUG define to vscode.md ( #1607 )
2024-01-09 15:22:51 -05:00
Yanis42
8a09f33c8f
Makefile: Change EMULATOR := to N64_EMULATOR ?= ( #1608 )
...
* ``EMULATOR :=`` -> ``N64_EMULATOR ?=``
* change other instances of EMULATOR and removed EMU_FLAGS
* missing one EMULATOR
2024-01-09 12:49:12 -05:00
cadmic
cd917b0cb8
Create debug macros for common functions ( #1597 )
...
* Create debug macros for common functions
* Revert NDEBUG change
* MALLOCR -> MALLOC_R
* DEBUG -> OOT_DEBUG
* Use the same name for debug and non-debug matrix functions
* Fix file/line argument order
* Revert g[s]DPNoOp[Tag]
* Use SystemArena_MallocDebug directly in GameAlloc_MallocDebug
* MTXF_TO_MTX -> MATRIX_TO_MTX
2024-01-09 07:59:03 -05:00
engineer124
e146d7bc26
Introduce Face Reaction Enum ( #1586 )
...
* face reactions
* cleanup
* cleanup fake match
* PR Review
* while I'm here
* mask reaction
* small fix
* Small cleanup
* oops
2024-01-08 17:17:22 -05:00
louist103
c1a499c3ae
ZAPD Update ( #1605 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "2b6f459b9"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "2b6f459b9"
git-subrepo:
version: "0.4.6"
origin: "???"
commit: "???"
* Update ZAPD
Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>
---------
Co-authored-by: Yanis42 <35189056+Yanis42@users.noreply.github.com>
2024-01-07 17:52:45 -05:00
Phil
dcab429bf2
Fixed minor style inconsistencies for CollisionCheckInfoInit ( #1603 )
2024-01-05 18:57:05 -05:00
cadmic
25ff0a27de
Create separate build directories based on version ( #1591 )
...
* Create separate build directories based on version
* Fix find_unused_asm.sh
* Remove find_unused_asm.sh from Jenkinsfile
* Revert diff.py
* Clarify that gc-eu-mq is not "supported" yet
* Revert xmlcreate.py (to be deleted)
* Remove gc-eu-mq for now
* Add version flags to diff_settings.py and sym_info.py
* --version -> --oot-version
* Fix --oot-version
* Revert adding version flags to tools
* Delete find_unused_asm.sh
* Revert changes to first_diff.py output in tutorial
* Factor out sed usages for spec
2024-01-05 23:27:19 +01:00
cadmic
1f9c28f370
Change ?= to := for Makefile variables ( #1599 )
...
* Change ?= to := for most Makefile variables
* Remove empty ?= assignments
* Revert "Remove empty ?= assignments"
This reverts commit 3db472faea
2023-12-16 16:45:02 -05:00
