Commit Graph
170 Commits
Author SHA1 Message Date
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
MaideandGitHub 92302fa6d6 En_Ishi (#538)
* En_Ishi

* PR

* PR

* Merge
2022-01-04 06:51:21 +00:00
MaideandGitHub af52799bc7 Obj_Flowerpot (#539)
* Obj_Flowerpot

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

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

* PR

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

* ptrs

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

* What even is spelling anyway

* PR

* PR
2022-01-04 06:02:29 +00:00
Derek HensleyandGitHub 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
06a08a3322 Ovl obj jg gakki (#512)
* add gakki decompilation

* add gakki header file

* modify spec to remove data

* Use THIS macro for this = thisx

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Change reloc include to the generated one

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* spacing variables and functions

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* spacing variables and functions

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* spacing variables and functions

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* clean up unnecessary mips_to_c hints

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* clean up old mips_to_c hints

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* variable cleanup and lookup

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

* remove unnecessary cast

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

* rerun format after code review

* fix naming convention

* add variable name hints for data

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

* reformatted file

* Fix collider naming

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

* fix more renaming

Co-authored-by: Savino Jossi <sj@redballoonsecurity.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-04 05:38:41 +00:00
Lucas ShawandGitHub 9e5382076a ovl_Obj_Roomtimer OK (#505)
* ovl_Obj_Roomtimer OK

* add packed params

* made suggested changes

* fixed
2022-01-04 05:25:41 +00:00
Lucas ShawandGitHub 005fd64e41 ovl_Obj_Dowsing ok (#504)
* ovl_Obj_Dowsing OK

* update spec

* params pack

* made suggested changes
2022-01-04 05:10:13 +00:00
Nick SturgeonandGitHub 78cb55ce97 ovl_En_Ruppecrow OK with documentation (#502)
* Implement EnRuppecrow_Init

* Implement EnRuppecrow_Destroy

* Implement EnRuppecrow_Update

* Implement EnRuppecrow_Draw

* Implement func_80BE2260, func_80BE2808

* Implement func_80BE30F4

* Implement func_80BE2F6C

* Implement func_80BE35A4

* Implement func_80BE2728

* Initial work on func_80BE2B80

* Implement func_80BE2B80

* Implement func_80BE2794

* Implement func_80BE3354

* Implement func_80BE348C

* Implement func_80BE2E18

* Implement func_80BE2D4C

* Run format script for cleanup

* Implement func_80BE2668

* Implement func_80BE3178

* Implement func_80BE32DC

* Initial work on func_80BE2874

* Implement func_80BE2874

* Implement func_80BE2330

* Implement func_80BE24CC

* Move static data into C file

* Rename D_WORDs to static names

* Format and document EnRuppecrow

* Update documentation

* Apply feedback

* Remove unecessary struct padding

* Implement review suggestions

* Run actorfixer

* Use object header
2022-01-04 05:02:53 +00:00
retroandGitHub 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
kyleburnetteandGitHub 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
MaideandGitHub 520a2ecc68 Obj_Snowball (1 non-matching) (#468)
* Obj_Snowball

* PR

* PR & Object

* PR
2022-01-04 04:45:14 +00:00
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
fc37051216 En_Fish (#450)
* En_Fish

* R

* PR

* PR

* Update src/overlays/actors/ovl_En_Fish/z_en_fish.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:29:49 +00:00
MaideandGitHub f66a9f8d0e Object_Kankyo (1 non-matching) (#445)
* Object_Kankyo

* Removing permuter

* PR

* Re-add description

* PR
2022-01-04 04:24:35 +00:00
MaideandGitHub 22a759a923 En_Peehat (#444)
* En_Peehat

* Fix

* Revert m2ctx

* PR

* Warning

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

* Warning

* PR

* undef

* PR
2022-01-04 04:09:32 +00:00
MaideandGitHub 6b50345831 En_Water_Effect (#435)
* En_Water_Effect

* PR

* PR

* undef

* PR
2022-01-04 04:03:47 +00:00
MaideandGitHub 4ee7dc1da6 En_Bomjima (1 non-equiv) (#433)
* En_Bomjima

* Damn caps

* PR

* PR

* undef

* PR
2022-01-04 03:57:40 +00:00
MaideandGitHub 934c562471 En_Wiz_Fire (#406)
* En_Wiz_Fire

* Remove padding

* PR

* PR

* Object

* Undef

* PR
2022-01-04 03:51:11 +00:00
MaideandGitHub 0b45e0f87a En_Go (3 non-matching) (#405)
* En_Go

* PR

* PR

* Object

* Undef

* PR
2022-01-04 03:45:36 +00:00
kyleburnetteandGitHub 3af87ca611 pfsreadwrite file OK, contpfs OK and data/bss migrated, pfsgetstatus OK (#385)
* pfsreadwrite file OK, contpfs OK and data/bss migrated, pfsgetstatus OK

* Made tharo's suggestions

* Update pfsgetstatus.c

* Made suggested changes (other than uintptr_t)
2022-01-04 03:29:11 +00:00