mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-11 03:39:59 +00:00
Code Issues Projects Releases Wiki Activity
1734 commits 1 branch 0 tags 501 MiB
Commit graph

1734 commits

This branch
This branch
All branches
Author SHA1 Message Date
cadmic
f7c6d25a6b Ban 0xA0 symbols too 2024-01-26 21:22:31 -08:00
cadmic
ba269b8096 Sync z_collision_check functions.txt 2024-01-26 16:33:54 -08:00
cadmic
f70cb4234f Fix first_diff.py 2024-01-25 09:11:39 -08:00
cadmic
52c716fd98 Unban IPL symbols 2024-01-24 23:25:57 -08:00
cadmic
c10a1e56bc Also ban symbols from 0xC0000000-0xFFFFFFFF 2024-01-24 23:15:14 -08:00
cadmic
fa51a54cd7 Start banned symbol range at 0x10000000 2024-01-24 23:00:52 -08:00
cadmic
6eefe9482f Sync functions.txt 2024-01-24 22:15:18 -08:00
cadmic
bf6f693eb4
Update sym_info.py 
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2024-01-24 21:31:06 -08:00
cadmic
ec59d604e2 Docs: suggest checking MM, mention virtualenv, clarify about expected/ 2024-01-24 18:01:42 -08:00
cadmic
f2ba27ae98 Don't use grouped targets to support very old Make versions 2024-01-24 17:08:31 -08:00
cadmic
e0889838d2 Merge remote-tracking branch 'upstream/main' into gc-eu-mq-disasm 2024-01-24 16:59:47 -08: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
95891c11cd Merge remote-tracking branch 'upstream/main' into gc-eu-mq-disasm 2024-01-24 16:14:18 -08: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
08038979a7 Merge remote-tracking branch 'upstream/main' into gc-eu-mq-disasm 2024-01-24 15:48:20 -08:00
cadmic
32856904c3 Use $(PYTHON) for disassembly 2024-01-24 15:27:57 -08:00
cadmic
16f9ff39be
Rename make compressed to make compress (#1620) 2024-01-24 18:02:53 -05:00
cadmic
a5d8f60222 Use typing.Iterator 2024-01-24 14:56:51 -08:00
cadmic
d864867cdb More type annotations 2024-01-24 14:50:53 -08:00
cadmic
96e94ae1f5 Fix type errors 2024-01-24 14:38:01 -08:00
cadmic
95745454e9 More type annotations fixes for old Python versions 2024-01-24 14:26:53 -08:00
cadmic
5f3097e65c Use typing.List 2024-01-24 14:24:39 -08:00
cadmic
477334e527 Change T|None to typing.Optional[T] 2024-01-24 14:13:37 -08:00
cadmic
a725db153a Fix whitespace 2024-01-24 14:13:07 -08:00
cadmic
eb7ef63e35 Add script to report progress with matching 2024-01-24 12:44:25 -08: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
cadmic
204bd3e312 Disassemble gc-eu-mq 2024-01-24 10:07:56 -08: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.

* ac/atHitInfo -> HitElem

* rename some collider elements to "elem" (instead of item, info, hurtbox...)

* cut down on more "hitbox" usage

* name all `ColliderElement*` temps properly

* rearrange colcheck structs

* add collider shape name descriptions

* reword collider shape descriptions

* jntsph first again

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
 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
Yanis42
21cb04db2c
Document `z_bg_mizu_movebg.c` (#1565) 
* document z_bg_mizu_movebg.c + assets

* remove temp comment

* renamed "temp" variable

* review 1

* format + type names comments at dLists/colHeaders

* review 2

* review 3

* named dragon statue 1

* float -> floating + review

* format

* review 5
 2023-12-15 15:33:50 -05:00
fig02
2b5b0fac06
name shock and burn functions (#1594) 2023-12-15 08:53:51 -05:00