Commit Graph

685 Commits

Author SHA1 Message Date
Maide e7b326f5e4
En_Zog (#441)
* En_Zog

* Removing padding

* PR

* PR

* undef

* fmt
2021-12-27 02:08:35 +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 ba4f676f4e
Obj_Iceblock (#367)
* Obj_Iceblock

* PR

* PR

* Object

* Undef
2021-12-27 01:40:25 +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
EllipticEllipsis 56101f9dc9
Stop iconving data, remove optimisation flags from assets, only copy required baserom files (#522) 2021-12-27 01:18:04 +00:00
EllipticEllipsis 161c6ce24a
viswapcontext OK (#427) 2021-12-26 18:37:26 -05: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
Maide aad8f64c65
En_Gs (#431)
* En_Gs

* PR

* PR

* PR

* Update src/overlays/actors/ovl_En_Gs/z_en_gs.h

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-12-21 12:57:41 -03: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
Maide 985852f837
Fix actor struct offsets (#463)
* Fix offsets

* Bell

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-12-19 20:21:27 +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
LtPeriwinkle e579bf5587
Effect_Ss_Kakera (#469)
* Effect_Ss_Kakera OK

* fix variable naming and formatting

* GAMEPLAY_KEEP, assign Vec together, angles in hex

* rename bgcheck functions

* address style changes

* move/format data; use shift instead of multiply
2021-12-19 19:47:47 +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
mzxrules 9bf0a59044
z_bg_goron_oyu OK (#487)
* Initial Decomp of `z_bg_goron_oyu`
Note: Waterbox instead of ColHeader would make sense here, confirm and change accordingly.
Just to not break the match until its settled for func_800CA1AC...

* implement suggested changes, fix other style issues

* z_bg_goron_oyu OK

* minor improvements

* fix clear_tag issue, restore THIS

* missed this

* format.sh

* implement final changes

Co-authored-by: MMDecomp <mmdecomp@gmail.com>
2021-12-19 19:20:45 +00:00
Lucas Shaw c6c3768022
ovl_Obj_Yado ok (#500)
* ovl_Obj_Yado OK

* rename struct member

* rename colorFlag to isNight
2021-12-19 19:14:18 +00:00
Electrk 89829b9905
EnInvisibleRuppe OK (#508)
* EnInvisibleRuppe OK

* Style changes as per review

* Update reloc

* Apply feedback
2021-12-19 18:47:08 +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 d998e8d8c5
Fix readme badge (#515) 2021-12-19 18:27:14 +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
Tharo d62fb2b689
Initial object file xmls (#312)
* git subrepo pull --force tools/ZAPD

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

* Object xmls

* Fix bss reordering

* Setup has warnings now

* Fix object_gi_reserve01 dlist names

* rm xml -> c make rule

* git subrepo pull --force tools/ZAPD

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

* SPBranchList related warnings gone

* Remove some mis-detected animations

* git subrepo pull --force tools/ZAPD

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

* scene related setup warning gone

* Fix

* Newlines
2021-12-18 14:37:05 -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
Parker Burnett a6cd0e4427
Adding tools.md (#344)
* Filling in what I could

* Organise, add most of the other tools, etc.

* removing redundant file and filling in TOC

* addressing comments

* Merge branch 'master' into contributing_update_tools

* hopefully adding pngs and missing tools

* quick fix

* applying feedback

* adding clarity to the sheet section

* Update docs/tools.md

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update tools.md

* Update docs/tools.md

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-12-16 04:56:38 +00: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 ad02db9b82
Match func_809DAB78 (#495) 2021-12-07 03:18:25 +00:00
engineer124 6ae28a789a
Macro Clean up (#454)
* Add OS macros

* MTXMODE cleanup

* format

* More matrix mode macros missed
2021-12-07 02:13:18 +00:00
Tom Overton 93d7fe080b
Do another round of improvement on actor comment headers (#462)
* Update actor descriptions as of 11/3/2021

* Fix headers for everything I messed up

* Update headers as of 11/8/2021

* Update descriptions

* Update business scrub descriptions

* Respond to engineer's feedback

* Clean up Ruto description

* Mark chikuwa as unused

* Update description of blockstop

* Responding to Elliptic's review

* bigpi -> bigpo

* Update Trt2 description to be a little more clear

* Impove mu_pict description

* Add description for horse_game_check
2021-12-07 02:01:51 +00:00
Maide 22c72301dc
En_Rr (#458) 2021-12-07 01:45:23 +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 64ecb146ae
EnFr (#494)
* all matching

* implement feedback

* feedback

* feedback

* cleanup param macros
2021-12-06 22:28:48 +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
Maide 08cf506be7
Dm_Stk (#350)
* Dm_Stk

* PR
2021-12-06 21:45:28 +00:00
Maide f4dfeac4a9
En_Gm (#365)
* En_Gm

* Format

* PR

* Warnings

* Merge
2021-12-06 21:18:17 +00:00
Derek Hensley b5da6b9bf9
Fault and Fault_Drawer (3 MATCHING and 1 NON_MATCHING) (#434)
* Matched last functions except Fault_FindNextStackCall

* Bss in drawer and cleanup

* Update define and format

* PR comments

* Formating PR suggestions

* Small format

* Fault_FindNextStackCall

* Change grays to dark gray and light gray
2021-12-06 21:03:21 +00:00
Zach Banks b031598460
Disassembly performance improvements (speed, RAM) (#478)
* Improve disasm.py RAM usage using `bisect`

This is based on AngheloAlf's work in PR #477, but uses the built-in
library `bisect` instead of adding an external dependency.

* Caching vrom_variables for ~25% faster disasm.py
2021-12-06 20:21:01 +00:00
Derek Hensley e177e99933
Elf_Message OK (#457)
* Matched

* Rename function
2021-12-06 14:42:17 -05:00
Rozelette 56d76d6458
En_Cow 🐮 (#493)
* OK

* Address feedback

* Adjust comparison
2021-12-01 12:32:15 -05:00
mzxrules ce1de034df
z_obj_mure.c (#364)
* a bunch of OKs and close functions

* OK All but 1 function

* Clean up code

* Match

* implement suggestions

* OBJMURE_CHILD_STATE_DEAD

* Update src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c

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

* use enum for type tests

* add OBJMURE_TYPE_MAX

Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-11-30 22:18:58 -03:00
mzxrules 6b493d3f9d
z_bgcheck.c (#357)
* first few functions

* two more almost matching functions

* Rebase to NBS, get it to compile

* BgCheck_RaycastFloorStaticList OK, fix-up some functions

* BgCheck_SphVsStaticWall OK! and a few others

* more z_bgcheck NON_MATCHINGS

* OK more functions, reorganize external reference #defines

* More functions OK, more struct fixes

* More OKs

* Decomp all the way to the end of bgcheck

* All functions attempted

* Rename functions

* formatting, data migration

* Give names to unk structs, rename some structs, fix some non-equivalent functions

* WaterBox_GetSurfaceImpl OK

* BgCheck_ResetPolyCheckTbl OK, improve WaterBox_GetSurface2 codegen, eliminate warnings and clean up source.

* BcCheck3_BgActorInit ->BgCheck3_BgActorInit, fix warnings

* pr change requests

* fix crc maybe

* implement more changes

* implement alf's changes
2021-11-23 13:29:18 -03:00
Maide 837eb1c806
En_Tk (#338)
* En_Tk

* PR

* Warnings

Co-authored-by: root <root@Careface.localdomain>
2021-11-20 12:10:37 -03:00
engineer124 ea17d924e4
Audio BGM Macros (#460)
* Introduce bgms

* Fill in bgm enums

* Rename bgm to clearer names

* Fix spacing

* Fix "No_Music" define

* remove comment

* Improve bgm names, found another seqId function

* Another seqId function

* Another name change

* Woods of Mystery -> Sarias Song

* add saria's song bgm to pierre

* Another bgm function found!

* Add bgm's to `gSaveContext.seqIndex`
2021-11-20 11:01:37 -03:00