Commit Graph

758 Commits

Author SHA1 Message Date
Derek Hensley
6e62ae4075
SubS Animations and LimbRotTables (#624)
* Bring over the matching code, rename struct vars to be consistent, and move animation structs to z64animation.h

* Clean up function prototypes

* Format and some stack var renames

* Update tutorial

* Rename animation structs

* Rename SubS functions

* Rename Actor function

* Rename arg names

* Bring over code for func_8013D9C8

* Rename and cleanup

* Some more cleanup

* Small cleanup

* Animmode enum

* Adjust actorfixer

* More uses of animmode enum, as well as fixing typo

* Change hex 0xD to 13

* typo

* Fix merge

* Format

* Fix merge

* Actorfixer

* Format
2022-02-14 02:10:56 +00:00
engineer124
01ca078226
Import code_8019AF00.c (Audio) data & bss, introduce z64ocarina.h (#575)
* Import code_8018AF00 Data

* code_8019AF00.c BSS Imported

* format

* Small touch-up

* rename `bgm.h` to `sequence.h`

* Missed a variable

* PR Feedback 1
2022-02-14 01:38:46 +00:00
Maide
7565f9f052
En_Insect (#652)
* En_Insect

* WHO DIDN'T FORMAT?!

* PR
2022-02-14 01:32:56 +00:00
Tom Overton
18e714e098
Document object_cow (#650)
* Document object_cow

* Respond to reviews

* Reorder flags
2022-02-14 01:28:19 +00:00
Maide
a5e631d03f
En_Zov (#649)
* En_Zov

* PR

* PR
2022-02-14 01:18:42 +00:00
Tom Overton
3597e4809f
En_Jg (Goron Elder) OK and documented. Also document object_jg (#594)
* Migrate data to C

* Init / Destroy / Update / Draw

* Functions called from Update

* Better Init match

* A few more functions

* A few more functions

* Drum-spawning function OK

* EnJg OK

* Name a few struct vars

* Name some static vars

* Name limbs

* Name limb DLs

* Name some textures

* Name all remaining textures

* First pass animation names + use object in actor file

* Add drum to XML + clean it up

* Better translations, thanks Emily!

* Some more documentation

* Improvements

* Params accessor for s_goro

* Proper object symbols for Jg_Gakki

* Delete unnecessary undefined_syms

* Text defines for my own sanity

* Some more names

* Document point/path stuff

* Name every function, even if the names are bad

* Params macro for if he's in goron shrine

* Some misc improvements

* Document EnJg_GetShrineGoronToFocusOn better

* Final cleanup before PR

* Change action name because this actor is dumb!

* Run actorfixer

* Rename some variables now that a function is named

* ProcessTalkRequest takes GameState

* Run actorfixer

* Use new actor flags

* Update text ID names to match my text ID PR

* Define the limb enum in the object

* Be consistent about where the EnumName is

* Don't name limbs after the actor

* Basic enum for drum limb

* Fix stuff after merge

* Do if/else if/else

* Remove textId defines

* Decimal weekEventReg accesses
2022-02-13 20:07:26 -05:00
Maide
45cee7d8af
Obj_Dhouse (#648)
* Obj_Dhouse

* PR

* PR
2022-02-14 00:58:19 +00:00
Tom Overton
d588870b7a
Document sun textures/displaylist (#642)
* Document sun textures/displaylist

* Fix gSunEvening1Tex's outname

* Add comment explaining the textures should be 64x64
2022-02-14 00:40:19 +00:00
Derek Hensley
0625803c17
Ovl_En_Cne_01 Ok and Documented (#641)
* Decomp and document Cne01

* Document object_cne

* split enhy header from z64

* Cleanup

* Actually include new z_en_hy header

* Actor flags

* Add header to object_cne

* screen defines

* Useage of ENHY_LIMB_MAX
2022-02-14 00:30:30 +00:00
Tom Overton
7ba82882b2
Clean up En_Giant header (#614)
* Clean up En_Giant header

* Run ./format.sh

* Move defines to be near the enums

* Move the limb enum to the object
2022-02-14 00:21:28 +00:00
Tom Overton
009ad45f48
Add comment to Arrow_Ice xml and update DL names (#605)
* Add comment to Arrow_Ice xml and update DL names

* Update asset names

* Improve texture names
2022-02-14 00:14:58 +00:00
Maide
9e9b84cb2c
Dm_Char05 (#583)
* Dm_Char05

* Params

* Syms

* Earpstone

* Merge
2022-02-13 23:58:41 +00:00
Maide
5fe04d87e0
Bg_Ikana_Rotaryroom (#573)
* Bg_Ikana_Rotaryroom

* Merge

* Merge

* PR

* PR
2022-02-13 23:39:10 +00:00
Maide
66b309218c
Bg_Dblue_Movebg (#568)
* Bg_Dblue_Movebg

* UNK_TYPE1

* PR

* Match Draw (thanks Anon58)

* Match

* data

* PR
2022-02-13 23:24:26 +00:00
Maide
5fa02d9725
En_Arrow (1 non-matching) (#551)
* En_Arrow

* Remove comment

* UNK_TYPE1

* Add thing

* Merge

* Merge

* PR

* PR

* PR
2022-02-13 23:14:13 +00:00
Parker Burnett
0f7f5de084
En_am OK (#501)
* en_am ok

* clean up

* applying feedback and some docs, need finish still

* this should fix things

* fixing things

* fixing things and running format

* post actor_fixer

* adding object header and fixing comments

* formatting and adding enum for limbs

* addressing pr, naming things, cleanup

* fixing enum in header

* doing some docs and fixing format
2022-02-13 12:02:31 -05:00
Averane
40d1bc00fe
EnDemoheishi OK and documented (#584)
* EnDemoheishi decomp first pass

* object decomp

* whitespace between declarations and statements added

* various PR fixes

* format for CI

* various PR fixes 2 + format

* missed one texture output name

* fix texture docs in unrelated files

* fix demoheishi shared texture naming

* made object sdn properties generic for soldiers

* missed outName modifications

* fixed references to updated function names

* reverting some texture changes to unrelated objects & use object specific names for lips and fingers textures

* added textId comment

* various PR comments addressed

* added enum for animations

* reverting halt animation naming

* moved animation enum to actor class

* fixed enum names

* fix typo

* more PR fixes

* format

* fix for broken build after other PR merge

* format

* merge fixes

* isTalking

* Enum - Calf to shin

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

* Object - Calf to shin

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

* DList - Calf to Shin

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

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-02-05 19:52:39 -05:00
engineer124
2104c16362
code_8012EC80.c OK and Documented + parameter_static extraction (#534)
* Match remaining functions of code_8012EC80.c

* parameter_static extracted and OK

* Small Progress

* Documentation all over the place

* Finish Documenting

* Cleanup

* Name more textures

* Update knowledge on deku playground player name

* All textures from parameter_static known now

* Finish documenting and validating parameter_static

* More up-to-date SaveContext docs

* More docs

* More cleanup

* Sun -> Star

* Minor touchup

* More cleanup

* pictograph -> pictoBox

* Remove the "unused" part

* More accurate name: hour lines

* It's gsDPLoadTextureBlock, not gsDPSetTextureImage

* Fix parameter_static and merge issues

* More docs from new PRs and Parameter WIP

* Missed a name

* Move parameter_static to interface assets

* Clean up code_8012EC80.c data

* Fix comment

* Add comments to parameter_static

* Oops

* fix merge

* Missed a PR review suggestion

* Fix merge
2022-02-05 01:49:21 +00:00
engineer124
bcdd99df08
Importing audio_data.c (#473)
* import audio_data.c

* frequency of -> harmonic

* Name remaining filter data

* Note to Pitch
2022-02-05 00:39:21 +00:00
Maide
69d7a2e585
Obj_Bean (#467)
* Obj_Bean

* Fix non-matching (thanks engineer)

* PR

* undef

* fmt

* PR

* PR

* Merge

* Merge

* PR
2022-02-05 00:27:29 +00:00
Maide
e257491e19
Obj_Ice_Poly (#610)
* Obj_Ice_Poly

* PR
2022-02-04 23:58:18 +00:00
LtPeriwinkle
4460d086d4
EnZo OK and documented (#503)
* EnZo OK, sort of documented

* fix variable naming

* fix suspicious match, add -ing to `PlayWalkSound`

* name `FollowPath`, waypoint struct member

* update description to say unused

* name `TreadWater`, fix a snake case i missed

* name `Walk`

* cleanup a bit

* address comments

pointers -> symbols, remove static and array length, inline data,
define var on same line, update file description, use ARRAY_COUNT

* space things out, move data, add ENZO_NO_PATH

* fix ENZO_NO_PATH define

* remove array pad, dec for size, thisx in limbdraw, renames in draw

* name some object_zo stuff, use symbols

* funny single member damage enum

* name textures

* name the rest of the used items in object_zo

* name the dlist

* suggestions

* actually fix the return false

* formatting
2022-01-30 18:09:17 -03:00
engineer124
35d8154ef0
Audio Playback OK and Mostly Documented (#556)
* Audio Playback OK

* name a temp

* cleanup functions.h
2022-01-30 18:02:44 -03:00
engineer124
bc7249960d
Rename "Quake2" -> "Distortion" (#588)
* rename `quake2` -> `distortion`

* Small touch-up

* cleanup and better spacing

* PR Feedback from OoT

* missed a small thing

* Name `billboardMtx` using better knowledge of sys_matrix functions thanks to `z_view`

* Add documentation to `SurfaceType_GetConveyorType`

* Cleanup Conveyor Type docs

* update cycle to phase
2022-01-30 17:55:42 -03:00
Tom Overton
50a9df7804
Document the boulder fragments in gameplay_keep and clean up En_Baguo (#574)
* Document the boulder fragments in gameplay_keep and clean up En_Baguo

* Remove the boulder fragment from variables.h

* Run ./format.sh

* Move limb enum to object
2022-01-30 17:47:00 -03:00
Tom Overton
4543b5ade6
Document object_obj_tokeidai and improve documentation on ovl_Obj_Tokeidai (#569)
* Document object_obj_tokeidai XML

* Change "outer ring" to "minute ring" to better describe what it is

* Rename "sun and moon disk" to "sun and moon panel"

* Preserve ordering

* Standardize on "staircase to rooftop"

* Standardize on calling it "Exterior Gear" to contrast with all the interior stuff

* Lots more documentation

* Make it more obvious that the macros refer to clock time, not regular time

* More documentation and spacing

* Better document counterweight draw

* Respond to Anghelo's and engineer's reviews

* Split tokeidai into separate files

* Revert "Split tokeidai into separate files"

This reverts commit eed1fe5ff63c9dee7a6799b42090b27d62f60773.
2022-01-30 17:41:21 -03:00
Derek Hensley
5ebc7c0e35
Document Object Ctower Rot (#530)
* Clean up actors

* Start documenting object

* Finish object and some other cleanup

* Review comments

* palette -> tlut

* File header

* DL as prefix for empties
2022-01-30 17:31:48 -03:00
Maide
ade2f678b8
Boss_06 (2 non-matching) (#557)
* Boss_06

* Format

* BSS

* Merge

* PR
2022-01-30 17:25:38 -03:00
Tom Overton
0e6662aafd
Document objects used with En_Fall (fall, fall2, lodmoon, moonston) (#558)
* Document lodmoon

* Document moonston

* Document the open-mouth moon part of fall2

* Document object_fall

* Move flags to .c

* palette -> tlut

* File header comment

* OPEN_DISPS/CLOSE_DISPS spacing

* Lots more spacing

* Add spaces after breaks

* Better describe the subtypes

* More fixes

* Be a little more specific in fireball comments

* Respond to Elliptic's second review

* I need to stop forgetting to run ./format.sh

* Single line comment styling

* Preserve ordering
2022-01-30 17:19:41 -03:00
Maide
5eb1b417de
En_Hint_Skb (#554)
* En_Hint_Skb

* Merge

* Actorfixer fail

* Merge

* PR
2022-01-30 17:13:46 -03:00
Tom Overton
5f425bf73c
Document object_boss03 (#559)
* Document object_boss03

* Actually run ./format.sh

* Preserve ordering

* Move Tanron3 limb enum to object

* Don't name the limb enum after the actor
2022-01-30 17:07:22 -03:00
Maide
06a14e73ea
En_Scopenuts (#560)
* En_Scopenuts

* Merge

* PR

* Fix

* PR
2022-01-30 17:00:19 -03:00
Maide
b8c33ffa54
En_Rg (1 non-matching) (#565)
* En_Rg

* UNK

* PR

* PR

* Merge

* Merge

* PR

* textures
2022-01-30 16:53:54 -03:00
Maide
a00601671d
En_Zos (#609)
* En_Zos

* Merge
2022-01-30 16:48:40 -03:00
EllipticEllipsis
f5740dab41
contramwrite OK (#578) 2022-01-30 16:43:03 -03:00
LtPeriwinkle
af26d4edac
EnBigokuta OK and documented + object_bigokuta documented (#563)
* EnBigokuta like half matched

* match all but 2 functions

* match all the functions

* import data

* name object stuff

* use new object symbols, do some documenting

* fix name of headUndersideTex

* name some struct members

* finish documenting

* Address comments

spacing, unkFunc comments, temp names, remove parens, reorder pads,
data formatting, limb enum

* address comments

* move empty line

* change the ARRAY_COUNT
2022-01-30 16:37:39 -03:00
EllipticEllipsis
7879b49785
contramread OK (#577)
* contramread OK

* Review
2022-01-30 15:52:19 -03:00
Maide
e4010be70c
Obj_Oshihiki (#636) 2022-01-29 20:00:43 -05:00
EllipticEllipsis
e442808dfc
Extract nes_font_static (#555) 2022-01-29 19:22:03 -05:00
Maide
c840e04c27
En_Trt2 (#448)
* Trt2

* Whoops

* PR

* PR

* PR

* Merge

* Merge

* Merge

* bgcheck

* I got trolled >:
2022-01-29 18:45:32 -05:00
Lucas Shaw
850823c2ee
ovl_Obj_Kzsaku OK (#506)
* ovl_Obj_Kzsaku OK

* add packing macro

* made suggested changes

* switch pad order

* made some suggested changes. still don't know completely about naming

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-01-23 09:40:47 -03:00
Anghelo Carvajal
5e4c8e0506
scene_textures (#550)
* scene texture xml generator

* Create XMLs for every scene_texture except 3 and 7

* Manually add blobs

* add XMLs for not used ones

* update spec

* Add scene_texture as external files to every scene that uses them

* add gsDPLoadTextureBlock_4b

* gsDPLoadMultiBlock

* gsDPLoadTLUT_pal16

* gsDPLoadMultiBlock_4b

* Add back the blob I removed...

* address review

* Fix tluts

* delete script
2022-01-22 17:49:35 -03:00
Maide
7ed396f09e
Cleanup object syms (#546)
* First

* Part2

* Save now or forever hold your peace

* Part3

* Building

* OK

* Cleanup

* Merge

* PR

* PR

* Merge

* PR

* PR

* Use oyu

* Use names

* TexturePtr
2022-01-22 13:30:32 -05:00
Anghelo Carvajal
2a913635a4
ZAPD hotfix (#629)
* git subrepo pull tools/ZAPD

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

* git subrepo pull tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "119a6883e"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "119a6883e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2022-01-21 04:40:12 +00:00
Derek Hensley
1531f5b56f
General Cleanup (#600)
* Remove excess prevent_bss_reordering.h

* Cleanup THIS and globalCtx2

* Iceblock relocs

* Format

* PR plus more this

* door spiral

* THIS and globalCtx2 swap, along with sSetupDL in firefly

* Revert ObjMure change

* door_spiral and unused in en_test5

* PR comments
2022-01-19 12:03:05 -03:00
Tom Overton
97b47fa14b
Fix some more dummy label matches (#619)
* Fix some more dummy label matches

* Add missing space

* Add a space to force Jenkins to run again

* Remove the previous space
2022-01-19 10:37:18 -03:00
Maide
6d52cee5fe
En_Bom (#537)
* Broken

* En_Bom

* PR

* PR

* Merge

* PR
2022-01-18 22:19:15 -05:00
Anghelo Carvajal
399f5a1b33
Split rsp files (#602) 2022-01-17 15:45:20 -05:00
EllipticEllipsis
0da2ed135b
git subrepo pull (merge) --force tools/ZAPD (#618)
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0ba781304"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0ba781304"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2022-01-17 01:05:00 +00:00
Derek Hensley
aa90d1ee2b
SubS Skelanime functions (#572)
* Bring code over

* Change ActorDraw typedefs from actor to thisx

* Rename functions

* Format

* Rename and clean up limb draws

* Some more limb draw cleanup

* Some more cleanup

* Function comments

* Last bit of cleanup

* update tutorial

* More tutorial and format

* Remove extra newlines form actorfixer

* Missed one

* Remove some unnecessary casts

* Fix SkelAnime transform functions in functions.h

* Remove bug comments, and add note

* Remove some more unneeded casts and rename one variable

* format

* Fix merge

* Format
2022-01-16 20:14:34 +00:00