Commit Graph

249 Commits

Author SHA1 Message Date
Tom Overton
9c682e5e52
Document Deku Flower objects and other Obj_Etcetera-related cleanup (#544)
* Document Deku Flower objects

* Fix warnings, whoops

* Respond to Elliptic's review

* Better formatting

* Small typo fix
2022-01-04 06:57:45 +00:00
Maide
d90a15ba6e
En_Kame (#536)
* En_Kame

* PR
2022-01-04 06:25:29 +00:00
Maide
bf6a4c04be
En_Ssh (#532)
* En_Ssh

* ptrs

* PR
2022-01-04 06:11:59 +00:00
Maide
897e68fbae
Boss_04 (#529)
* Boss_04

* What even is spelling anyway

* PR

* PR
2022-01-04 06:02:29 +00:00
Derek Hensley
d3e4a3368f
Effect_soft_sprite_old_init and particleOverlayTable OK (#520)
* Migrated data

* Migrate particleOverlayTable

* Import data for effect_soft_sprite, add g to effect table, minor cleanup of z64effect.h

* Name data

* Comment out static variable in variables.h

* Use better macros

* PR review and other cleanup

* Update bug comment
2022-01-04 05:50:12 +00:00
Maide
c1858172b5
Refactor disasm for speedups (#465)
* First try

* OK

* Optimize .text a bit

* Split sections

* Fixups

* Combine .text

* async rodata

* Split code and rodata

* Almost there

* Done?

* Reduce console spam, add back extra space to delay slots

* Add makefile flag

* Prevent empty file creation and some wayward symbols

* Re-add printing

* Remove incorrect Boj_05 variables (thanks Anghelo for finding this)

* Cleanup formatting

* Update

* Update

* Change offsets back

* Make offsets object-relative
2022-01-04 05:17:22 +00:00
retro
de61e04312
EnMm2 OK (#492)
* all matching except draw

* all matching

* done except importing data

* data extracted

* added xml for asset extraction

* clang format

* remove global_asm macros

* bit of documentation

* format

* use THIS macro

* remove unnecessary &

* space between vars and code

* feedback

* use OPEN_DISPS, CLOSE_DISPS, and POLY_OPA_DISP++ macros

* remove comment

* use matrix macros

* change comment format

* change comment format

* rename assets in xml

* fix indent
2022-01-04 04:56:35 +00:00
kyleburnette
99761a9c0d
EnColMan OK (#479)
* EnColMan OK

* Fix description at top of file

* Made suggested changes

* Make suggested changes

* Format

* Include gameplay_keep and use symbols
2022-01-04 04:51:03 +00:00
Maide
9a0079de8a
En_Gb2 (#453)
* En_Gb2

* Negs

* PR

* Update src/overlays/actors/ovl_En_Gb2/z_en_gb2.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-04 04:35:21 +00:00
Maide
22a759a923
En_Peehat (#444)
* En_Peehat

* Fix

* Revert m2ctx

* PR

* Warning

* PR
2022-01-04 04:17:40 +00:00
Maide
429a5ee9ff
En_St (#443)
* En_St

* Warning

* PR

* undef

* PR
2022-01-04 04:09:32 +00:00
Maide
4ee7dc1da6
En_Bomjima (1 non-equiv) (#433)
* En_Bomjima

* Damn caps

* PR

* PR

* undef

* PR
2022-01-04 03:57:40 +00:00
Maide
0b45e0f87a
En_Go (3 non-matching) (#405)
* En_Go

* PR

* PR

* Object

* Undef

* PR
2022-01-04 03:45:36 +00:00
EllipticEllipsis
4a38b51ab4
Update recomp (#543)
* Update recomp

* Add fat binaries for macos
2022-01-04 03:20:21 +00:00
Maide
618b25f41d
En_Fishing (3 non-matching) (#378)
* En_Fishing

* PR

* PR

* Object

* Undef

* PR

* format
2022-01-03 18:48:37 -05:00
Maide
3d883491e1
En_Kusa2 (#363)
* En_Kusa2

* PR

* Warnings

* PR

* Match

* pepega
2022-01-01 13:09:44 -05:00
Tom Overton
44ccdbe0d5
En_Talk_Gibud (Gibdos in the well) OK and somewhat documented (#486)
* Good start

* More progress

* More progress, need to try importing data now

* Import data to C

* Match a tricky item function

* Matched another item function

* Improve definition of EnTalkGibudUnkStruct

* func_80AFFD3C OK

* Draw functions done

* EnTalkGibud_Init OK

* EnTalkGibud OK

* Document item and switch flag stuff

* Name all static variables

* Enum for animations

* Document type

* Document limb stuff

* Tons of documentation

* Document effect stuff

* Document most unknown struct vars

* Name most functions

* Name final function + document text IDs

* Organize forward declarations

* Name stack variables

* Document damage effects

* Document limbs

* One final pass

* Respond to Anghelo's review

* Respond to Anghelo's second review

* Add space to force Jenkins to rerun (testing PR dashboard, please ignore)

* Removing previously added space

* Fix limb enum to add LIMB_NONE

* Run ./format.sh, whoops

* Respond to hensldm review + small cleanup

* Respond to engineer's review

* Fix item enum

* This is a legacy PR, so using autogenned object symbols

* Fix merge conflict

* Move Talk_Gibud specific enums to .c
2021-12-28 02:15:32 +00:00
Tom Overton
527c54b66e
Obj_Tokeidai (Clock Tower) OK and mostly documented (#442)
* Migrate data to C

* ObjTokeidai_Init OK

* ObjTokeidai_Destroy OK

* func_80AB2BBC OK

* func_80AB3BB0 OK

* func_80AB29F8 OK

* func_80AB27B4 OK

* func_80AB2834 OK

* func_80AB2790 OK

* func_80AB28C8 OK

* ObjTokeidai_Update OK

* func_80AB4040 OK

* func_80AB3010 OK

* func_80AB3CCC OK

* func_80AB3240 OK

* func_80AB3C50 OK

* func_80AB4080 OK

* func_80AB4160 OK

* func_80AB319C OK

* func_80AB3BE8 OK

* func_80AB3BD8 OK

* func_80AB3B34 OK

* func_80AB3A7C OK

* func_80AB3ED0 OK

* func_80AB39BC OK

* func_80AB38B0 OK

* func_80AB3880 OK

* func_80AB363C OK

* func_80AB36C4 OK

* func_80AB3808 OK

* func_80AB365C OK

* func_80AB3598 OK

* func_80AB3544 OK

* func_80AB34CC OK

* func_80AB3370 OK

* func_80AB32F0 OK

* ObjTokeidai_Draw OK

* func_80AB4894 OK

* func_80AB4664 OK

* func_80AB4394 OK

* Use compiled reloc

* Initial documentation pass

* Little more documentation

* Last bit of first pass documentation

* Finish documentation

* Respond to review feedback

* Respond to Anghelo's feedback

* Incorporate new enum

* Respond to engineer's feedback

* Respond to engineer's feedback

* Update comments because the things I thought were unused ARE actually used

* Switch to using "Open" instead of "Transform"

* Run ./format.sh

* Respond to engineer + hensldm by removing some macros

* Fix func_801A3F54 argument

* Fix func_801A3F54 argument

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* This is a legacy PR, so using autogenned object symbols

* Move enum to .c

* Revert "Move enum to .c"

This reverts commit de13c50f0a.

* Move tokeidai-specific defines to .c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-12-28 02:10:15 +00:00
Maide
7cb71922e3
En_Geg (#436)
* En_Geg

* Format comments

* PR

* Object

* undef

* PR
2021-12-28 01:44:27 +00:00
Tom Overton
70419d6044
En_Fall (the moon, Moon's Tear, and effects) OK and mostly documented (#476)
* EnFall_Init OK

* EnFall_Destroy OK

* EnFall_Update OK

* func_80A6C3AC and func_80A6C3FC OK

* func_80A6BF90 OK

* func_80A6CA9C OK

* func_80A6CD38 OK

* func_80A6CF60 OK

* func_80A6C9A8 OK

* Import data into C

* func_80A6CB74 OK

* func_80A6CD74 OK

* func_80A6CF70 OK

* func_80A6CECC OK

* func_80A6D698 OK

* func_80A6D220 OK

* func_80A6D100 OK

* func_80A6D75C OK

* func_80A6D88C OK

* func_80A6D98C OK

* func_80A6DC20 OK

* func_80A6DA7C OK

* func_80A6DC40 OK

* func_80A6DD3C OK

* func_80A6E214 OK

* func_80A6E37C OK

* func_80A6C7C0 OK

* func_80A6D444 OK

* func_80A6C1DC OK

* func_80A6D504 OK

* func_80A6E07C OK

* Move all statics to in-function

* Migrate bss to C and use compiled reloc

* Clean up UnkFallStruct

* Initial documentation pass

* Some more function names

* Name some more unknowns

* Name yet more unknowns

* Name all struct variables and static data

* Do one last documentation pass

* Respond to engineer's style review

* Respond to hensldm's review

* This is a legacy PR, so using autogenned object symbols
2021-12-28 01:26:06 +00:00
EllipticEllipsis
96eff2a4fd
Building on Macs (#513)
* Building on Macs

* Add Mac building documentation

* Review

* Update for new z64compress

* Review

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "155a463a5"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "155a463a5"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Fix some obvious warnings

* Rewrite docs

* -;

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "fd5a7f434"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "fd5a7f434"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-12-28 01:07:41 +00:00
Maide
c291ebb232
fix the fixer (#540) 2021-12-27 13:04:44 -05:00
engineer124
f19571dfcd
Bigslime OK and Documented (#361)
* git subrepo pull tools/asm-differ --force

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "d218cdf0"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "d218cdf0"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/graphovl --force

subrepo:
  subdir:   "tools/graphovl"
  merged:   "f5fe93d7"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "f5fe93d7"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD --force

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "e7a8a48c"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "e7a8a48c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Bring Bigslime over from old branch

* Format

* Improve docs

* format

* More cleanup

* Fix Zero Vectors Name

* Improve docs

* Spelling/Grammar

* Small typo

* Extra space

* Fix zapd merge conflict

* tab

* Fix remaining names

* format

* Better documentation

* format

* fix

* Add names to identity matrices

* Minor Cleanup

* easier to read comments

* Another touch-up

* Missed a spot

* one more...

* typo

* Another typo

* Fix merge master, fix EnBigslime_ApplyDamageEffectBigslime

* PR Feedback

* Fix variable

* Add in gZeroVec3f in new prs

* Fix gZeroVec3f

* gZeroVec3f

* PR Feedback, move lots of static data inside functions

* Use z_actor decomp of `func_800BE680` for better macro name

* Naming gone wrong, but fixed now

* Fix dList

* Add an extra line of docs about shadows for a function

* dList -> shadowDList

* Next round of PR feedback

* Document object file, still need to double check some

* Small cleanup

* Improve and fix many docs, unname unknown material texture

* format

* Oops

* Clean up blobs from object file

* Aha! I finally get what's going on

* Remove Bigslime undefined_syms

* Remove more undefined symbols

Co-authored-by: Angie <angheloalf95@gmail.com>
2021-12-27 04:24:45 +00:00
Lucas Shaw
5455cbc0c8
z_kaleido_manager and z_kaleido_scope_call OK (#489)
* migrated data and bss for z_kaleido_manager, renamed ovl_Player_Actor to ovl_player_actor to make it work with the data

* z_kaleido_manager OK

* add to functions.h variables.h and variables.txt

* init

* rename parameters in func_80163700

* rename func_80163700 to KaleidoManager_FaultAddrConvFunc

* change u32 casts to uintptr_t casts in z_kaleido_manager. (u8 *) casts must stay, they are the only casts that match

* ran format, uintptr_t

* made suggested changes
2021-12-27 03:59:50 +00:00
engineer124
27903c6286
code_80194710 OK (Audio libultra_code_O2) (#474)
* code_80194710.c OK

* Add new line after variable declaration

* format

* Function declarations

* Name changes to match OoT

* Rename file

* s32 -> size_t
2021-12-27 03:51:37 +00:00
Isghj
af7525e2d3
[Object] Bigpo object documentation (+ some gameplay_keep) (#525)
* Bigpo: object documentation starts and already issues

* Bigpo: almost all named

* Bigpo: done with object except ubused blobs

* Bigpo: added flame docs to gameplay_keep and minor cleaning, format pass

* Bigpo: forgot to remove sym and replace everywhere, with formater pass

* Bigpo: forgot about actorfixer

* Bigpo: disasm cant find asset xml values, have to put this undefined sym back for now

* Bigpo: warnings

* Bigpo: remove extern for gameplay_keep display list reference from aqua

* EnBigpo: suggested fixes to header calls and function name

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-12-27 03:08:36 +00:00
Roman971
6c2f521373
Decompile and clean up some effect files (#342)
* Decompile various effect files and cleanup z_effect.c

* Decompile z_eff_tire_mark.c and cleanup structs

* Small cleanups

* Apply most review suggestions

* Apply more review suggestions

* Change eff_shield_particle vertices to be extracted as an asset

* Add relevant effect functions to actorfixer.py
2021-12-27 02:51:16 +00:00
Maide
5b7fb5bfde
En_Bomjimb (#461)
* En_Bomjimb

* PR

* PR
2021-12-27 02:14:19 +00:00
Maide
ae2ba19d7b
En_Aob_01 (#440)
* En_Aob_01

* PR

* Object

* Fix weird capitalisation

* undef
2021-12-27 02:01:37 +00:00
Maide
ddb3405219
En_Rail_Skb (#418)
* En_Rail_Skb

* PR

* PR

* Object

* undef
2021-12-27 01:55:16 +00:00
Maide
2df8e5d433
En_Elf (#371)
* En_Elf

* En_Elf

* PR

* PR

* Format
2021-12-27 01:47:56 +00:00
Maide
d3e8ea9e5a
En_Akindonuts (#349)
* En_Akindonuts

* Enums

* Rebase

* PR

* PR

* Object

* Uncomment blob

* Undef
2021-12-27 01:32:45 +00:00
Maide
cee404f6b2
Door_Warp1 (2 non-matching) (#347)
* Door_Warp1

* Rebase

* Rebase

* PR

* Object

* Format

* Undef

* def more

* Whoops
2021-12-27 01:25:39 +00:00
Maide
a3478c4056
En_Tru (1 non-matching) (#325)
* En_Tru

* Fixups

* PR

* The meme

* I rebased by accident sorry

* Add object memes

* Type
2021-12-22 16:25:00 +00:00
engineer124
51ee1c2c70
Name coordinate transformation matrix similar to OoT (#499)
* name coordiante transformation names similar to OoT

* update actorfixer
2021-12-19 20:32:41 +00:00
Derek Hensley
a7cece0fca
Code_800f07c0 OK with some documentation (#373)
* Matched func_800F07C0

* Matched func_800F0888

* Matched func_800F0944

* Matched func_800F09B4

* Matched func_800F0A94

* Matched func_800F0E94

* Matched func_800F0EEC

* Matched func_800F0F28

* Matched func_800F0FF0

* Matched func_800F10AC

* Matched func_800F112C

* Matched func_800F0DD4

* Matched func_800F0CE4

* Matched func_800F0A20

* Matched func_800F0BB4

* Fix functions.h

* Migrated data and add some doc comments, having BSS issues

* BSS fix

* Fix merge conflict

* Document

* Run Formatter

* Actually save functions.h

* Rename UnusedNPC to EnHy

* Change some rets and run format

* PR review

* Fix merge conflict

* Minor touchups

* Fix renamed func

* Change char to UNK_TYPE1

* Add header

* Rename two functions

* Fix capital X's in undefined_syms

* Convert char to UNK_TYPE1 in EnDoor

* Change huge ternary into if else for readability

* Fix up EnIn

* Better whitespace

* Format

* Revert UNK_TYPE1s in EnDoor

* Rename file

* Missed rename in undefined_syms
2021-12-19 20:14:36 +00:00
EllipticEllipsis
1274b81c5e
sys_ucode OK (#432)
* sys_ucode OK

* Update file split of data

* Format

* Name symbols, sizes -> u32

* Correct undefined_syms

* Format
2021-12-19 20:08:31 +00:00
engineer124
9b1fe6e91b
Importing Audio Init Params (#471)
* Import audio init params

* Add comments describing what these sizes represents

* Fix variables.txt

* Remove leading zero's from gTatumsPerBeat

* Name variables
2021-12-19 20:01:47 +00:00
Derek Hensley
98ba231fb0
pause (Frame Advance) OK (#455)
* Matched

* Rename and format

* typo

* Missed renames

* Revert "Missed renames"

This reverts commit 64d9f70464.

* Revert "typo"

This reverts commit 81696364d3.

* Revert "Rename and format"

This reverts commit aec7d245e8.

* Rename functions

* Add header explaining frame advance

* Header

* Format
2021-12-19 19:54:52 +00:00
Tom Overton
038eb997d0
En_Tanron3 (Gyorg's fishes) OK and somewhat documented (#376)
* Import data to C

* EnTanron3_Init OK

* EnTanron3_Destroy OK

* func_80BB897C OK

* func_80BB91D4 OK

* func_80BB9288 OK

* EnTanron3_Draw OK

* func_80BB95FC OK

* EnTanron3_Update OK

* func_80BB9308 OK

* func_80BB87D4 OK

* func_80BB85A0 OK

* func_80BB8A48 OK

* Update spec with compiled reloc

* Name most of the functions

* Name a few more things

* Merge animation system changes

* Name remaining unnamed variables

* Finish documentation

* Use modulo for fogTimer

* Move enum/structs to .h

* boss03Parent -> sGyorg

* D_80BB9720 -> sZeroVec

* Move initialization of effectPtr up

* Use 2 * M_PI

* Use MTXMODE_NEW

* 65536.0f -> 0x10000

* timer += 1 -> timer++

* Timer cleanup

* Remove unneccesary parentheses

* When performing bitwise operations on timer, use hex

* Lowercase "fish" in the comment at the top

* Respond to jpburnett's feedback

* Respond to Elliptic and Kenix's reviews

* Undo renaming the Gyorg var, but keep the comment

* Add a little bit more documentation

* Variable renames

* Remove a comment that no longer applies

* Document some swimming behavior

* PICK_DIRECTION -> PICK_NEW_DEVIATION

* Minor comment tweak

* Respond to Elliptic's review

* Remove timer inconsistency
2021-12-19 19:40:39 +00:00
Nick Sturgeon
70990bf43f
ovl_En_Test5 (Spring Water Modifier) OK with attempted documentation (#483)
* Implement asm functions in C

* Clean up code with documentation

* Apply styling suggestions

* Apply feedback
2021-12-19 19:34:28 +00:00
Tharo
8662b35a69
Update z64compress (#516)
* git subrepo pull (merge) --force tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "5da31326"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "5da31326"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Update wrapper

* If building with NON_MATCHING, do not pass --matching to z64compress
2021-12-19 18:34:50 +00:00
Anghelo Carvajal
a0370e38b4
Fix bug in progress.py (#518)
* Fix autogenarted names regex

* Use sizes from map file instead of reading the asm directly

* Speed up

* Fix gameplay_object_exchange_static being in the wrong category

* Fix regex again
2021-12-19 11:52:06 -05:00
Anghelo Carvajal
d4dc34ee71
Update progress script with new assets categories and update csv output format (#510)
* Reorganize csvs and progress.py

* Put stuff in the correct folders

* Reduce lots of repeated code

* Change csv output format

* Filter out automaticaly named variables in "Matching" progress calculation for assets

* Address Elliptic's review

* Don't count handwritten files in progress and add a way to fix files detected in the wrong section

* Add missing "total"

* More fixing

* Add two missing columns

* Update paths in Jenkinsfile

* Update progress shield in readme

* Update progress link
2021-12-18 16:37:37 +00:00
EllipticEllipsis
d5b71bd0f5
Tutorial (#362)
* ObjTree OK, data imported

* EnMs OK, data imported

* And the spec

* OK

* Some minor edits

* A lot of preliminary stuff

* Mostly complete beginning

* First draft of other functions doc

* Whoops, forgot the GlobalContext pad

* Draw functions (minus colour), create Data

* Data

* gitignore, some progress on documenting

* Review comments, continue documenting

* spec

* Finish off documentation

* undefined_syms

* Add a couple of todos

* One more

* At least add tools for object decomp

* Start conversion table stuff

* Document ObjTree

* Document EnMs

* Add more tables to conversions

* Maide's review

* Review

* Review

* Typos and incomplete thoughts

* Update vscode.md

* Correct function/variable names

* Review suggestions

* Format

* Missed one

* Rename functions and format

* Fix ObjTree

* Update actorfixer.py, fix some variable names

* Some review

* Review suggestions

* More review

* Hopefully fix all the thisx references

* Missed one
2021-12-16 18:47:18 -05:00
EllipticEllipsis
9ca4ec7604
ZAPD fixes in sys_initial_check, update subrepos (#507)
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "a3363333d"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "a3363333d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/asm-differ --force

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "70c33cc12"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "70c33cc12"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull (merge) tools/z64compress --force

subrepo:
  subdir:   "tools/z64compress"
  merged:   "ac5b1a0d0"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "ac5b1a0d0"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Use defines for texture sizes in sys_initial_check

* Update extract_assets.py

* Add null check

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "50242eca9"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "50242eca9"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2021-12-15 23:05:29 -05:00
Lucas Shaw
ff231e093a
z_vr_box_draw OK (#481)
* z_vr_box_draw OK

* ok

* Removed z_vr_box_draw.data.s, its actually z_sram_NES.data.s

* Added enum SkyboxId
2021-12-07 04:36:02 +00:00
engineer124
1ab0fb5557
Importing Audio Sfx Params (#472)
* Import audio sfx params

* Add TODO: description for this file
2021-12-07 00:39:51 +00:00
Tom Overton
d218c9be23
En_Stream (unused water vortex from OoT) OK (#480)
* En_Stream (unused water vortex from OoT) OK

* Better names in EnStream_PlayerIsInRange

* Enum for whether the player is in range
2021-12-06 23:52:18 +00:00
retro
5b7df3f1ca
EnHitTag OK (#482)
* EnHitTag all matching, data still not imported

* rename loop counter variable to i

* imported data

* use generated reloc

* cleanup

* name func_80BE20E8, document with ITEM00_RUPEE_GREEN enum, use if-return-implication in WaitForHit

* add switchflag param macro

* use previously unused pCylinder as function arguments

* use THIS macro and change switchflag macro to take actor pointer

* space between var declaration and code

* format

* rename pCylinder to cylinder

* rename cylinder to collider

* change ColliderCylinder* to pad

Co-authored-by: retro <retro@DESKTOP-KGV19SQ.localdomain>
2021-12-06 21:50:59 +00:00