Commit Graph

733 Commits

Author SHA1 Message Date
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 eed1fe5ff6.
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
Tom Overton
a9c2449c11
Bring merged assets up to current standards (#570)
* Bring merged assets up to current standards

* Clarify bigslime
2022-01-16 18:36:19 +00:00
Anghelo Carvajal
194c99d80b
Subrepos update (#613)
* a

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

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

* git subrepo pull tools/z64compress --force

subrepo:
  subdir:   "tools/z64compress"
  merged:   "9e7a6dbfa"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "9e7a6dbfa"
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:   "bf16ff7c4"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "bf16ff7c4"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Revert "git subrepo pull tools/z64compress --force"

This reverts commit a7cc87394e.
2022-01-16 18:30:31 +00:00
engineer124
9e6a6eee4c
Audio_Effects OK and Documented (#549)
* Audio_Effects OK

* Remove duplicate

* PR Suggestion

* Small cleanup

* Small Touchup
2022-01-16 18:24:58 +00:00
Maide
332c71c9b1
Update (#608) 2022-01-16 18:20:03 +00:00
ZoeyZolotova
94a2e5a3d7
Update and fix a few comments for the banker. (#598)
* Update and fix a few comments for the banker.

* Change 'Link' to 'the player' and remove some actual message quotes.
2022-01-16 18:14:09 +00:00
EllipticEllipsis
b2a42dcf8b
Two small xmls for parameter-related asset files (#548) 2022-01-16 18:07:19 +00:00
EllipticEllipsis
924fa9aadf
EnMag OK and documented (#547)
* Name textures in object_mag

* Corrections

* tabs -> spaces

* OK, data imported

* Remove obsolete comment

* Start documentation

* Defines for most texture sizes

* Name most static variables, add state enum

* Macros, name all the statics

* Couple of minor tweaks to other files

* Name some more effect stuff

* Fix kanfont data

* Name everything else, move macros

* Format

* Review
2022-01-16 17:55:03 +00:00
Maide
b47941968d
En_Ig (#533)
* En_Ig

* UNK_TYPE1

* Remove syms

* PR

* PR

* Merge

* Merge
2022-01-16 17:46:08 +00:00
Parker Burnett
7aa3766d67
En_hgOK (#394)
* en_hgo OK

* Formatting changed somehow?...hopefully this fixes

* who would win, Cammoguy or one letter?

* format

* addressing review comments

* fixing PR comments

* fixing and merging master

* forgot to format

* fixes warnings?

* minor documentation...don't have tools to do more

* Fixing things, hopefully OK

* formatting...

* clean-up undefined syms
2022-01-16 09:37:21 -05:00
Maide
816971d98c
En_Kanban (1 non-matching) (#419)
* En_Kanban

* PR

* PR

* Object

* undef

* PR

* Merge

* Merge

* Merge
2022-01-12 15:37:26 +00:00
Anghelo Carvajal
c44e26a143
__osMalloc.c OK (#395)
* __osRealloc

* match __osCheckArena

* cleanup

* Import bss, unreferenced strings and cleanup

* format

* Reviews

* Move convert.h to ultra64/

* Make the os_malloc.h header

* potato

* renames and fixes

* format

* small doc pass
}

* format

* minor changes

* Introduce system_malloc.h

* Docs pass

* fix

* format

* stuff

* Apply suggestions from code review

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

* review

* format

* remove repeated sentence

* Apply suggestions from code review

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* include headers

* review

* Rename __osMallocAddHeap

* remove @brief

* Update src/boot_O2/__osMalloc.c

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

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-11 23:25:14 +00:00
engineer124
133e02a8a7
z_sound_source OK (#353)
* z_sound_source OK

* Fix Pos

* Lib_PlaySfxByPos

* Change function names

* format

* Update names to match OoT

* cleanup from the merge

* Fix name
2022-01-11 00:27:36 +00:00
Anghelo Carvajal
6069a1585f
z_actor with some documentation, with 1 NON_EQUIVALENTs (#401)
* Match Player_GetHeight

* Another bunch

* Fix merge conflict

* rename Gfx_DrawDListXlu

* add WEEROR

* Actor_Spawn

* almost Actor_SpawnTransitionActors  and Actor_Delete

* A bunch of small actors

* More renames

* format

* Some Player renames

* a few more

* import data

* run formatter

* func_800B7170

* whoops

* Fix merge issues

* Whoops 2

* func_800B83BC and func_800B83F8

* Actor_IsActorFacingPlayerAndWithinRange

* add some prototypes

* match Actor_UpdateBgCheckInfo

* func_800B7678

* mark Actor_SpawnAsChildAndCutscene as non_matching

* Actor_Draw

* Update is chaotic

* 2 new matches

* func_800BC8B8

* Another bunch

* function renames

* run formatter

* cleanup

* remove unnecesary casts

* add missing sfx

* Fix renames

* fix merge

* func_800BF7CC

* small bunch

* another bunch

* func_800BE184 non_matching

* two more

* split z_cheap_proc

* Another bunch

* another bunch

* a few and a non matching

* yeee

* a

* Actor_DrawAll non_equivalent

* Actor_RecordUndrawnActor

* i don't know what to put in this commit message

* func_800B4B50 non matching

* func_800B42F8 non matching

* func_800B5040

* func_800B5814 non_equiv

* func_800B6584

* func_800B6608

* func_800B6680

* func_800B7E04

* func_800B8118

* func_800b9170

* ,

* func_800BC4EC

* func_800BA6FC

* func_800BA798

* func_800BA8B8

* Actor_LoadOverlay

* small cleanup

* func_800BB2D0

* meh

* func_800BBAC0

* func_800BC270

* func_800B5208 non matching

* Fix warnings

* meh

* rename some ActorShadow_ functions

* fairy

* Flags_

* fix warnings

* format

* Actor_PickUp and family

* func_800B8E58

* match Actor_RemoveFromCategory

* another bit of docs

* Match func_800B86C8

* And another bit

* rename Player_GetRunSpeedLimit

* func_800B9E84

* func_800BE63C

* func_800BB8EC

* match func_800B5814

* match func_800B9334

* cleanup

* fix conflicts: first pass

* another fix

* actorfixer fix

* fix conflicts

* func_800BE680 non_equivalent

* Improve func_800BE680 a bit

* func_800BE680 equivalent (?)

* func_800BE680 equivalent

* Actor_UpdateActor equivalent

* format

* use some  ExchangeItemID enum values

* Some more cleaning

* more cleanup

* More name stealing from OoT

* match func_800B82EC

* match func_800B9D1C and a bit of cleanup

* Add ACTOR_FLAGS placeholders

* Renames and match func_800BE184

* last pass of name stealing

* format

* fix conflicts

* more cleanup

* more cleanup

* cleanup and OVERLAY_RELOCATION_OFFSET macro

* Remove prototypes of obviously internal-only functions,
update variable names,
forward declare where necessary,
remove all `param_\d`s

* remove newlines

* minor rename

* Use ACTOR_FLAGS in z_actor

* Match func_800BE3D0

* Rename movement functions

* Document Actor_CalcOffsetOrientedToDrawRotation

* velX -> horizontalSpeed

* A bit of documentation for actor movement functions

* format

* Fix merge issues

* format

* Format

* Fix renames

* fix warnings

* fix conflicts

* review :D

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

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

* Fix

* format

* Actor_SpawnSetupActors

* engineer review

* Update src/code/z_actor.c

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

* A bunch of Engineer's reviews

* more Engineer's review

* a

* whoops

* run actorfixer

* c'mon

* 😮‍💨

* whoops

* warning

* More engineer's review

* run format

* I'm dumb

* a

* match func_800BE680

* Match Actor_DrawZTarget

* Match Actor_SpawnAsChildAndCutscene, fix non-equivalent in Actor_UpdateActor

* Fix merge issue

* format

* update actor

* Steal a bit of @Thar0 documentation from OoT's z_message

* Run actorfixer

* Fix renames

* Match func_800B4B50 thanks to @hensldm

* Improve ActorShadow_DrawFeet thanks to @hensldm

* whoops

* Actor_PlaySfxAtProjectedPos

* Actor_UpdateActor matched by @hensldm

* Match func_800BA2FC by @hensldm

* Match Actor_SpawnTransitionActors by @hensldm

* Match func_800BB604 by @hensldm

* Match Actor_DrawAll by @hensldm

* ActorShadow_DrawFeet by @hensldm

* Actor_UpdateAll by @hensldm

* Match func_800BCCDC by @engineer124

* Small Actor_PlaySfxAtPos by @engineer124

* ACTOR_FLAGS_ALL and a bit of cleanup

* Add invisible comment

* Small docs pass

* Fix merge

* Engineer's review

* format lol

* Actor_DrawDoorLock docs

* Actor_SpawnShieldParticlesMetal

* fix merge issues

* sActorFaultClient

* fix

* commit message

* Run actorfixer.py && format.sh

* Fix warnings

* fixes

* format

* bss

* Update include/functions.h

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

* Address review

* Fix merge issues, format and such

* fix merge issues

* Add ACTORCAT_MAX

* actorList -> actorLists

* Fix merge issues

* format

* Enable WERROR on jenkinsfile

* Fix merge

* Use object symbols

* address review

* format

* review

* fix merge issues

* fix

* VRAM_PTR_SIZE, small cleanup and format

* review

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2022-01-10 12:04:28 -05:00
EllipticEllipsis
b74bec0e1d
Move parameter_static and week_static to interface (#545)
* Move parameter_static and week_static to interface

* Move bump_texture_static to Segments

* Newline
2022-01-04 07:36:52 +00:00
Derek Hensley
7611d833d9
SubS Actor Getters OK (#475)
* Bring over matching actor getters

* Add arg names

* Rename functions

* Adjust rename_sym script to update sizes csvs

* Fix wrong function prototype

* whitespace

* Rename functions

* Fix actorfixer

* Format

* Add function comments and file header

* Fix merge

* format

* Fix merge

* format

* Move D_0407D590 down

* Fix merge

* Steal idea from z_actor PR to return  directly

* Swap function name order

* Fix merge
2022-01-04 07:28:25 +00:00
Tom Overton
be952305d8
Document object_stream (#553)
* Document XML

* Finish documentation

* Add file header comment

* Single line comment styling
2022-01-04 07:19:15 +00:00
Tom Overton
e7ba2c507d
Document stray fairy related objects (#552) 2022-01-04 07:10:18 +00:00
Tom Overton
6125d48b07
Document object_kibako (#542)
* Document object_kibako

* File comment header

* Single line comment styling
2022-01-04 07:04:30 +00:00
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
92302fa6d6
En_Ishi (#538)
* En_Ishi

* PR

* PR

* Merge
2022-01-04 06:51:21 +00:00
Tom Overton
f48e1f8de8
Document kibako2 object (#541)
* Document kibako2 object

* Remove "1" from "gLargeCrateTLUT". Was a leftover from OoT

* File header comment and tlut naming

* Single line comment styling
2022-01-04 06:45:46 +00:00
Maide
af52799bc7
Obj_Flowerpot (#539)
* Obj_Flowerpot

* PR
2022-01-04 06:37:52 +00:00
Maide
d90a15ba6e
En_Kame (#536)
* En_Kame

* PR
2022-01-04 06:25:29 +00:00
Maide
0a5bc25e8d
Obj_Hugebombiwa (#535)
* Obj_Hugebombiwa

* PR

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

* ptrs

* PR
2022-01-04 06:11:59 +00:00