Commit Graph
1263 Commits
Author SHA1 Message Date
engineer124andGitHub c6ec00f0dd Match func_80142440 (z_vr_box.c OK) (#1127)
* match func_80142440

* run full formatter

* docs and cleanup

* PR Suggestions
2022-10-28 02:28:33 +01:00
Alejandro AsenjoandGitHub d76266d91e matched ovl_Bg_Ikana_Bombwall && ovl_Bg_Haka_Bombwall NON_MATCHING effect functions (#1096)
* progress

* 1 non matching + reloc issues?

* final details

* format

* final details

* reverting changes to ovl_Bg_Kin2_Bombwall

* undefined_syms

* undef

* warnings

* pr review

* fix non_matchings

* pr review

* numbers

* few renames

* names

* pos
2022-10-28 02:14:42 +01:00
7b81d6e950 Kaleido_Update OK and documented (#1113)
* Kaleido Update

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

* fill in enums

* PR Suggestions

* more PR Suggestions

* missed one

* pause state range macros

* fix bss

* PR suggestions, doc roll

Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
2022-10-23 02:44:23 +01:00
d863e7aeef ovl_En_Rz OK (#1029)
* progress

* 4 functions left

* progress

* all functions matching

* ovl_En_Rz OK

* formatting

* a few things here and there

* whoops!

* pr review

* pr review

* remove temp

* pr review

* pr review

* casts removed

* merge fix

* pr review

* pr changes

* macros and enums

* struct

* defines in c file

* EnRzType in Header

* ROSA_SISTERS

* sEyeTextures

* animations

* @bug

* sEnRzEyeTextures

* func_80BFC674

* switch spaces and default

* format

* static

* animation docs

* link anim enum

* Rosa Sisters animations enum

* comment

* a few things

* EN_RZ_GET_SISTER fix

* comment on array size

* path enum

* EnRz_SetupPath

* EnRz_PathStatus

* EnRzPathStatus

* EnRz_Walk

* EnRz_StopToThink

* pr review

* singular

* step

* EnRz_GetPathStatus

* Actor_Kill

* review

Co-authored-by: Angie <angheloalf95@gmail.com>
2022-10-22 15:18:42 +01:00
Derek HensleyandGitHub c1a0d0bd2b EnOsn (Happy Mask Salesman) and object_osn Docs (#1135)
* Inital cleanup

* Object

* Docs

* Small things

* PR
2022-10-22 04:12:38 +01:00
6b588eb3d7 Last function in z_debug_display (#1134)
* path

* format

* testing, fix later

* Elliptic's stuff

* array count

Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
2022-10-21 23:55:27 -03:00
Tom OvertonandGitHub f4904ab793 Document object_boss01 (Odolwa) (#1132)
* Document limbs

* Finish object

* Forgot this translation

* Respond to all reviews
2022-10-21 21:36:32 -03:00
f8c167384e ovl_fbdemo_wipe5 OK (#1015)
* ovl_fbdemo_wipe5 OK

* format

* add trailing newline

* bring over gbi.h

* review

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

* format

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* minor clenaups

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c

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

Co-authored-by: Chloe <>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-22 00:12:35 +01:00
6842a065f0 ovl_En_Encount4 OK (#989)
* `ovl_En_Encount4` decompiled

* Style changes

* Suggested changes

* Suggested changes

* Formatting

* review

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* a

Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-21 23:44:20 +01:00
7d753ddabb z_en_lift_nuts.c OK (#889)
* progress

* progress

* merge

* progress

* .

* progress

* two functions left!

* one function left

* it matches!

* update

* Updated spec

* globalcontext to playstate

* cleanup

* Made suggested changes

* ran format.sh

* made suggested changes

* Made suggested changes

* various fixes

* review

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

* format

* Update src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

* yes

Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-21 18:28:36 +01:00
Parker BurnettandGitHub a848bb138d Hg and Hgo documented (#1112)
* inital work

* en_hg done-zo

* finished hgo

* forgot to format...

* review comments from anon

* fixing review comments

* fixing comments

* update name

* fix
2022-10-21 04:01:59 +01:00
dca019f9fa Match 4 functions in BGcheck, remove nonequivalency in DynaPoly_ExpandSRT and BgHakaBombwall (#1128)
* match 1

* more matches

* one thing

* cleaned up conditionals

* move bss

* format

* I swear that's all of the ()

Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
2022-10-21 02:34:21 +01:00
Tom OvertonandGitHub 75d7cf668c Document object_boss_hakugin (Goht) (#1133) 2022-10-21 01:30:17 +01:00
Tom OvertonandGitHub 1d1b6986af Document object_dnq (Deku Princess) (#1130)
* Document object_dnq (Deku Princess)

* Respond to reviews
2022-10-18 12:25:59 +01:00
8a714af8d0 Introduce actor_table.h (#985)
* Make actor_table.h

* DECLARE_OVERLAY_SEGMENT

* InitVars

* Remove InitVars from actor headers

* format

* Use table for ActorID enum

* Move segment symbols declarations back to segment_symbols.h

* add newline to actor_table.h

* Add effects back to segnt_symbols.h

* Update include/tables/actor_table.h

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

* Update src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* name unused parameters

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* format

* Revert "name unused parameters"

This reverts commit 14fe63313a32b4779ccfb6cf71cb227542a3958f.

* Remove `const` from InitVars

* Add underscore to unused parameters

* ActorID -> ActorId

* bss

* missing symbols and bss

* lower diff a bit

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-16 20:06:47 -03:00
Tom OvertonandGitHub b570e0c98e object_dno (Deku King) documented (#1126) 2022-10-16 19:14:15 -03:00
92d93701a9 ovl_En_Nb OK (#1030)
* mips2c general pass

* EnNb_Init

* EnNb_Destroy

* EnNb_Update

* draw functions

* func_80BBFE8C

* func_80BC0D84 non_matching

* func_80BBFE60 and minor fixes

* a bunch of functions

* And another bunch

* An attempt to the last function

* import data

* Match func_80BC0D84

* Use extracted symbols instead of hardcoded ones

* Match last function

* format

* Update the reloc in the spec

* regconvert and draw

* Small docs pass

* actorfixer and format

* Minor renames

* schedule

* cleanups

* namefixer

* minor cleanups

* yeet printing stuff

* Schedule and anims cleanup

* stateFlags

* Name limbs and anims

* Name more stuff in the asset

* Finish naming simple stuff

* format

* merge fixes

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

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

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

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

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

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

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.c

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

* EnNb_UpdateSkelAnime

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

* fix typo

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.c

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

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.c

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

* review

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* MTXMODE_APPLY

* review

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

* format

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Update src/overlays/actors/ovl_En_Nb/z_en_nb.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>

* clamps

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>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-16 16:44:03 -03:00
Ethan RosemanandGitHub 7b572e8c53 Update Jenkinsfile 2022-10-16 17:20:16 +09:00
62b465b3ea ovl_Bg_Dkjail_Ivy OK (#1014)
* ovl_Bg_Dkjail_Ivy OK

* Co-authored-by: petrie911 petrie911@users.noreply.github.com

* xml

* pr review

* pr review

* pos / vel / accel

* format

* angle

* Update src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* in-function static

* BgDkjailIvy_SetIdle

* _WaitForCut

* setup

* pr review

* Actor_Kill

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-16 04:36:25 +01:00
29a7a6714a Rename elf_message to QuestHint (sync with oot) (#1124)
* rename elf_message to QuestHint

* port more things and review

* command arg name

* Update include/z64scene.h

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

* Update src/code/z_scene.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-10-16 03:04:14 +01:00
bd373940ac z_player_lib: Part 2 (#938)
* preparations

* import data

* PLAYER_STATE1

* PLAYER_STATE2

* PLAYER_STATE3

* import bss

* format stuff

* bss cleanup

* more cleaning and some naming

* face

* cleaning up link human object a bit

* Remove PHYSICAL_TO_VIRTUAL2

* Update src/code/z_player_lib.c

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

* review

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

* format

* /* CAT */

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* naming some stuff on objects

* format

* invert flags endian

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* format

* drawmask

Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* naming

* another round of human object naming

* enum renames

* sActionModelGroups and use enum as types

* PlayerAnimType

* PLAYER_MODELTYPE_

* determined ranges of PlayerModelType

* name PLAYER_MODELGROUP_DEFAULT

* format

* sheath

* dlist groups placeholder namse

* PLAYER_MODELGROUP_BOTTLE

* Some fierce deity naming

* Right hands

* zora skel dlists

* deku limb dlists

* left hands

* name most modelgroups

* more hand naming

* regs as dec

* fix in horse

* Use BUTTON_ITEM_EQUIP macro

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* reformat D_801AED58

* Sword sheaths

* swords and shields

* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* playerForm on Player_DrawImpl

* fomat

* Update src/code/z_player_lib.c

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

* Update assets/xml/objects/gameplay_keep.xml

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

* review

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

* VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex))

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

* singular limb enum names

* fix bss

* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* name goron shielding limbs

* name limb

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* bss

* bss

* format

* namefixer

* bss

* bss

* bss

* bss

* format

* bss

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* fix bss

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-10-15 19:12:01 -03:00
Tom OvertonandGitHub 638f5062cb Replace Actor_MarkForDeath with Actor_Kill (#1118)
* Replace `Actor_MarkForDeath` with `Actor_Kill`

* Replace if-else with early returns, as per hensldm's review

* Respond to Elliptic's review

* Redundant spelling
2022-10-15 05:35:55 +01:00
Tom OvertonandGitHub a38f45b268 Document Elegy of Emptiness shell assets in gameplay_keep (#1121)
* Document Elegy of Emptiness shell assets in gameplay_keep

* Format
2022-10-15 03:52:33 +01:00
engineer124andGitHub a4f0d8ea88 Match 3 Functions (z_actor OK, z_mir_ray OK, z_mir_ray3 OK) (#1122)
* match MirRay_ReflectedBeam

* match Actor_DrawLensActors

* match func_80B9E8D4

* void
2022-10-15 02:05:20 +01:00
b35accc955 ObjY2Shutter OK and documented (#1119)
* ovl_Obj_Y2shutter decompiled

* cleanups

* more review fixes

* format

* document shutter assets and add ShutterType enum

* rename xml assets, remove unnecessary parenthesis

* move ShutterType enum to header file

* forgot enum in comparison

* Respond to review

* Finish docs

* Raise/Lower -> Open/Close

Co-authored-by: Chloe <kojlax@protonmail.com>
Co-authored-by: Chloe <>
2022-10-14 08:59:13 -03:00