Commit Graph

543 Commits

Author SHA1 Message Date
Parker Burnett 3d430a5733
En_bubble OK (#995)
* bubble OK

* fixing elfbulb

* flag fix

* PR comments

* PR comments

* missed a fix

* PR fixes

* don't know how this got in there

* u to s

* small fix
2022-09-14 12:46:16 -03:00
Alejandro Asenjo 90ade1be9f
ovl_En_Js Decompiled (#991)
* progress

* progress

* func_80968E38 (thanks @engineer124)

* progress

* remove comments

* general cleanup

* warnings

* all functions matching

* macros

* final details

* format

* ovl_En_Js Decompiled

* PLAYER_AO enums

* fix

* pr review

* re preview

* pr review

* pr review

* pr review

* resolving after merge

* conflict resolution

* pr review

* pr review

* pr review
2022-09-14 12:37:21 -03:00
Maide 98501be8df
Obj_Usiyane (#902)
* Obj_Usiyane

* PR

* RP

* PR
2022-09-14 12:32:22 -03:00
petrie911 c5254084c2
Matched several functions (#1020)
* matchmaker, matchmaker

* more matches

* one fix

* I'll format you good

* cleanup

Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
2022-08-15 14:55:42 -04:00
engineer124 82fe521721
Audio Sfx (code_801A5BD0 and selected sfx functions in code_8019AF00.c) OK and Documented (#798)
* Rename functions

* code_801A5BD0 OK

* PR 1, improve spacing

* Rename unused struct

* Rename Sfx Variables

* PR Feedback, update names

* Add comment

* cleanup vars

* Fix merge

* Rework documentation, include more functions in sfx system

* PR suggestions

* fix AudioSfx_MuteBanks

* missed enum

* more cleanup

* more suggestions
2022-08-15 14:39:57 -04:00
Derek Hensley 24ba04d70c
Effect Deaddd OK (#1019)
* OK

* cleanup

* Add unused comment
2022-08-15 14:31:36 -04:00
Alejandro Asenjo 4b545bc259
ovl_Oceff_Wipe7 OK (#1009)
* progress

* ovl_Oceff_Wipe7 OK

* pr review

* format

* renamings
2022-08-15 14:27:30 -04:00
Alejandro Asenjo e77b07296a
ovl_Dm_Char09 Decompiled (#996)
* progress

* progress

* 1 function left

* all functions matching

* data imported

* ovl_Dm_Char09 decompiled

* format

* sfx

* constants

* ovl_Dm_Char09 PR

* pr review

* pr review

* format

* csIndex back to temp until we know proper behav.
2022-08-15 14:20:03 -04:00
Tom Overton e44c98884b
EnRat (Real Bombchu) OK and Documented, object_rat documented 🐀💣 (#966)
* EnRat_Init and EnRat_Destroy OK

* Tons of actionFuncs and other stuff

* EnRat_Update OK

* func_80A566E0 OK and better match for func_80A56EB8

* All draw functions OK

* EnRat OK

* Document object_rat

* Port documentation from Bom_Chu

* Document/name a few more things

* Name all funcs and struct vars

* Un-name unk_18D

* Name some more stuff

* Final round of docs before I ask for help

* Let's just PR this I suppose

* Respond to isghj5's review

* Name a variable I forgot to name

* hookedState stuff

* Clean up forward declares

* Fix after merge

* Respond to reviews

* Limbs -> Limb

* Names for these rascally Vec3f temps

* Name all the vec3fs for real this time

* world -> surface

* surfaceTangent -> forwardPos; there are many tangents, but only one is forward

* Use Elliptic's names + documentation

* worldForwardInHome -> worldPlusForwardInHome
2022-08-15 14:16:31 -04:00
Blythe f66ef00aeb
EnSGoro OK and documented (#895)
* EnSGoro OK and documented

* Format fix attempt for EnSGoro

* Requested format changes

* EnSGoro additional cleanup

* Fixed updated names

* fork merge (wip - don't review)

* Misc. formatting updates

Also had to un-eat some changes made upstream in functions.txt and variables.txt.

* A couple minor tweaks
2022-08-15 14:12:54 -04:00
engineer124 d9a10948d3
aisetnextbuf.c OK (code_80194790.c) (#982)
* aisetnextbuf OK

* format

* Function headers

* Add comment
2022-08-09 20:49:20 -04:00
Tom Overton f4f0ce7523
EnPp (Hiploop) OK and documented, object_pp documented (#997)
* EnPp OK

* Format

* Animation naming consistency

* Respond to jpburnett's review

* Animation name consistency
2022-08-09 20:44:07 -04:00
Alejandro Asenjo 1aaf0fbc7e
ovl_Dm_Ah Decompiled (#988)
* current progress

* all functions matching

* data imported correctly (thanks @Maide)

* ovl_Dm_Ah Decompiled

* warnings

* moved the (Player *) casting for cb consistency

* renamings

* thank you @hensldm

* Jenkins being Jenkins

* correction
2022-08-09 20:38:39 -04:00
Lucas f3c6e451fb
ovl_Dm_Char06 OK (#986)
* `ovl_Dm_Char06` decompiled

* Suggested changes

* Minor changes

* Formatting
2022-08-09 20:33:57 -04:00
Parker Burnett b14656c529
En_pst OK (#983)
* first matches

* pst OK

* fix to be OK

* cleaning stuff up

* feedback

* updating names, PR feedback

* PR 3

* whoopsie on the object

* 4got 2 update the name

* fixing anim name

* PR comment
2022-08-09 20:30:11 -04:00
Lucas 1afeaaf734
ovl_Mir_Ray2 OK (#981)
* `ovl_Mir_Ray2` decompiled

* Suggested changes
2022-08-09 20:26:35 -04:00
Lucas 75aad26df1
`ovl_Obj_Makekinsuta` decompiled (#980) 2022-08-09 20:21:56 -04:00
Alejandro Asenjo ed7102727f
ovl_Obj_Taru Decompiled, object documented (#979)
* all functions matching, thanks Anon58 and mzxrules

* data imported, objects documented

* ovl_Obj_Taru Decompiled, object documented

* warnings fixed

* boolean and renamings
2022-08-09 20:15:50 -04:00
Lucas 1cbf26a5d1
ovl_Obj_Danpeilift decompiled and documented (#973)
* `ovl_Obj_Danpeilift` decompiled

* Rename functions

* Change arg1 to index

* Improve ObjDanpeilift_Move match

* Upcast macro
2022-08-09 20:11:29 -04:00
Derek Hensley b716e76d3e
Effect EnFire OK (#977)
* OK

* Gameplay keep fire

* &

* &2

* PR

* Fire textures

* Second mask
2022-08-07 19:59:23 -04:00
Maide 5f9d4ca059
En_Bigpamet (#910)
* En_Bigpamet

* a

* PR

* a

* PR

* PR

* Update src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c

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

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-08-07 19:33:51 -04:00
Derek Hensley d0313fa766
Effect EnIce OK (#976)
* Ok

* Material/Model

* Cleanup

* format

* IceFragment Assets

* PR
2022-08-07 19:29:03 -04:00
Derek Hensley bc3883d098
Effect Fhgflash OK (#975)
* OK

* format

* extract tex explicitly

* FHGFLASH_SHOCK_NO_ACTOR

* typo

* Hitmark

* sZeroVec

* eff
2022-08-07 19:24:05 -04:00
Derek Hensley 9f6bacbb88
Effect Firetail OK (#974)
* OK

* description

* gEffFire1DL

* format

* PR
2022-08-07 19:18:54 -04:00
chloe!! db844b8ee8
ovl_Bg_Hakugin_Elvpole OK (#970)
* decomp ovl_Bg_Hakugin_Elvpole, 1 nonmatching

* func_80ABD92C OK, minor cleanups

* format

* review fixes

* more cleanups
2022-08-07 19:13:42 -04:00
Lucas 191e779189
ovl_Bg_Last_Bwall OK (#971)
* `ovl_Bg_Last_Bwall` decompiled

* Suggested changes

* Rename ObjRobliftModelInfo

* Rename functions

* Remove upcast macro

* Suggested changes
2022-08-07 19:08:54 -04:00
Alejandro Asenjo 4a33baf936
ovl_Obj_Mure3 Decompiled (#969)
* all functions matching

* data imported + fix constants

* ovl_Obj_Mure3 decompiled

* pr reviews

* pr review

* pr review
2022-08-07 18:58:05 -04:00
Alejandro Asenjo a6bec3ecc2
ovl_En_Test2 Decompiled (#968)
* all functions matching

* all functions matching

* data problem

* ovl_En_Test2 Decompiled

* format + fix constants

* final details

* pr review

* pr review

* pr review
2022-08-07 18:52:01 -04:00
Maide d88aa7ebbe
En_Paper (#923)
* En_Paper

* PR
2022-08-07 18:47:00 -04:00
EllipticEllipsis 91b2bc3a88
EnGe1 OK and documented, document `z_snap` (#952)
* Move PictoActor typedefs to z64actor.h

* OK, data imported

* Minor snap stuff

* Name most functions and variables

* Name most of object, apart from animations

* Document snap

* Fix actors to use the PictoActor struct

* Format

* Finish documenting EnGe1

* Finish documenting z_snap and related actors

* Format

* Review, format

* Name last couple of things

* bss

* Review

* Review

* bss

* Introduce z64snap.h, add SCREEN_TO_DEVICE macros

* Back to PROJECTED_TO_SCREEN
2022-08-04 05:53:53 +01:00
Alejandro Asenjo 8f7f3d24c7
ovl_En_Mkk Decompiled (#959)
* progress

* all functions matching

* fixes

* progress

* ovl_En_Mkk Decompiled

* format

* spec

* pr review

* pr review

* format

* pr review
2022-08-04 05:42:00 +01:00
Alejandro Asenjo 7412ac7e8b
ovl_En_Viewer Decompiled (#955)
* ovl_En_Viewer Decompiled

* PR review

* macros
2022-08-04 05:37:01 +01:00
Lucas b939665a06
`ovl_Bg_Crace_Movebg` OK (#943)
* `ovl_Bg_Crace_Movebg` decompiled

* Suggested changes

* Minor changes

* Minor changes

* Change padding type
2022-08-04 05:27:28 +01:00
EllipticEllipsis 26c8cdd221
New relocation-generating program (#393)
* git subrepo clone git@github.com:EllipticEllipsis/fado.git tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "d202857b"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "d202857b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Makefile adjustments and additions to build fado

* git subrepo pull --force tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "46c4d751"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "46c4d751"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull --force tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "88114ebc"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "88114ebc"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Fix typo in makefile

* Fix it, maybe?

* git subrepo pull tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "f7efb10a9"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "f7efb10a9"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Update build tools
2022-08-04 04:49:25 +01:00
Alejandro Asenjo 4693978015
ovl_Shot_Sun Decompiled (#905)
* matching functions, warnings and data pending.

* ovl_Shot_Sun Decompiled

* space

* pr review

* unk1202E -> lastPlayedSong Rename

* defines

* OCARINA_SONG enums

* format

* OCARINA_SONG Enums

* pr review

* pr review
2022-07-24 10:15:16 -04:00
engineer124 6fc12c3a70
Inventory Editor Ok and Documented (z_kaleido_debug.c) (#954)
* Match Debug Menu

* Many docs and discussions

* Missed one

* A bit more

* More PR Suggestions

* phrasing

* hex health

* Fix
2022-07-23 15:44:49 -04:00
engineer124 f3f147cc3d
`z_draw` OK and Documented (#900)
* Import data for z_draw

* Match z_draw

* cleanup

* rupees

* Some object gi docs

* More documents

* Add explanation on function names

* more cleanup

* Fixed some things

* More docs

* Object docs WIP, still not done. I'll continue tomorrow

* More WIP, should just be mask gi objects left now

* Some masks done, many more to go

* cleanup

* Last masks finish

* Shield Stolen

* cleanup

* Apply various dicussions

* remove casts

* PR Suggestions

* Sync PowderKeg
2022-07-23 15:25:20 -04:00
Chloe cde8874bb1
ovl_Dm_Char03 OK (#963)
* Decompile ovl_Dm_Char03

* review fixes

* more review fixes

* remove leading zeroes
2022-07-23 15:05:04 -04:00
Lucas 3a1f3a04c0
`ovl_En_Okarina_Tag` OK (#953)
* `ovl_En_Okarina_Tag` decompiled

* Suggested changes

* Minor changes
2022-07-23 14:31:24 -04:00
Anghelo Carvajal 3f49adb91d
`ovl_Obj_Um` OK (#887)
* Pass the whole actor in mips2c

* hacky way to fix some types

* decomp a few functions and second mips2c pass

* draw

* another mips2c pass

* some functions

* Init almost matching

* mips2c pass

* Match update and a few more

* A bunch of functions

* horses gonna horse

* func_80B7A860

* mips2c pass

* func_80B7984C

* func_80B795A0

* func_80B783E0

* func_80B78764

* Tried func_80B7BEA4

* func_80B79BA0

* func_80B7A494

* func_80B7A614

* lots of non equivalents

* fix

* Match func_80B77770

* func_80B7BEA4

* import data

* func_80B7B93C

* minor fixes

* ObjUm_Init

* func_80B7AF30

* func_80B7B18C

* func_80B7BABC

* func_80B77FA4

* func_80B7B598

* func_80B781DC is equivalent

* func_80B781DC

* func_80B7BABC

* Cleanup

* limbs

* minor members renames

* First docs pass

* small pass

* yes

* another pass

* more renames

* flags defines

* arePotsBroken

* some flags

* yet another docs pass

* Some members named

* Add weekEventReg docs

* small rename

* And more

* Another 2

* actorfixer and other fixes

* format

* Use extracted object symbols

* fixes

* Some stuff improved

* very minor naming

* format

* remove debugging stuff

* cleanup

* Some EnHorse stuff

* horse params

* ! FAKE

* Update include/functions.h

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

* review

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

* review

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update assets/xml/objects/object_um.xml

* IS_BANDIT_TYPE

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

* review

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* remove a fake match

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse/z_en_horse.h

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

* Update src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

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

* anim enum

* name anim enum

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

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

* remove repeated forward declarations

* fixes

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* comment

* review

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

* areAllPotsBroken

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

* fix merge

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-07-23 14:00:32 -04:00
engineer124 601f44cb7f
audio_seqplayer.c OK and partial docs (#833)
* Import audio_seqplayer progress from main audio branch

* cleanup

* Better docs

* Small fix

* More

* Cleanup and update

* PR Suggestions

* PR Suggestions

* mute flags
2022-07-22 06:21:02 +01:00
Alejandro Asenjo fed7cec4ed
ovl_Bg_Haka_Bombwall partially decompiled (1 NON_MATCHING) (#947)
* progress

* 1 non matching + reloc issues?

* final details

* format

* final details

* reverting changes to ovl_Bg_Kin2_Bombwall

* undefined_syms

* undef

* warnings

* pr review
2022-07-22 06:15:20 +01:00
Alejandro Asenjo 6dd31c00e5
ovl_Eff_Change Decompiled (#946)
* all functions matching

* progress

* ovl_Eff_Change Decompiled

* ovl_Eff_Change Decompiled

* space

* spec
2022-07-22 06:09:44 +01:00
Derek Hensley 5c7f21f6d2
Effect Gfire Ok (#941)
* OK

* description
2022-07-22 06:02:55 +01:00
Derek Hensley 64ea6665bd
Effect Gspk OK (#939)
* OK

* cleanup

* newline
2022-07-22 05:58:08 +01:00
Alejandro Asenjo d1d1bf8ec6
ovl_Dm_Char04 Decompiled (#925)
* all functions matching

* Data imported

* ovl_Dm_Char04 Decompiled

* ovl_Dm_Char04 Decompiled

* pr reviews

* number

* parenthesis

* renamings i forgot

* more renamings

* Elliptic number magic

* cast remove

* timer
2022-07-22 05:43:36 +01:00
Alejandro Asenjo a935cbc6ae
ovl_Obj_Ocarinalift Decompiled (#920)
* all functions matching

* data imported

* ovl_Obj_Ocarinalift Decompiled

* pr review

* params prefix

* Jenkins re-run

* pr review

* pr review
2022-07-22 05:27:02 +01:00
EllipticEllipsis c8c55a15d3
EnBjt OK and documented (#912)
* OK, data imported

* Fix some typos

* Start docs

* Struct almost finished

* Start object, add state enum

* undefined_syms

* Finish object, name some more stuff

* Name a few states and another function

* PlayState

* Minor tweaks in z_room and z_sub_s

* Complete documentation

* spec

* Review 1

* functions.txt

* Schedule result enum

* Rename schedule results

* Review

* Remove update comments

* Inventory_DeleteItem

* PLAYER_STATE

* Format

* Review

* Update struct name
2022-07-22 05:17:06 +01:00
Alejandro Asenjo f0e4581e22
ovl_En_Sth2 Decompiled and Documented (#898)
* ovl_En_Sth2 Decompiled and Documented

* &

* enum

* space

* pr review

* warnings

* pr review

* trailing coma + format

* pr review

* trailing coma

* review

* focusOffset
2022-07-22 04:57:49 +01:00
Derek Hensley 6661b566a9
Effect Gripple (#940)
* OK

* description

* undef

* format
2022-07-19 12:32:00 -04:00
Chloe 215164738b
ovl_Obj_Purify OK (#937)
* ovl_Obj_Purify decompiled and partially documented

* document member names

* variable names and format

* oops missed some booleans

* review fixes

* more review fixes

* even more review fixes

* rename ObjPurifyInfoList to sObjPurifyInfo
2022-07-19 12:27:01 -04:00
Alejandro Asenjo 095a312937
ovl_Bg_Fu_Mizu Decompiled (#935)
* All functions matching + data imported

* ovl_Bg_Fu_Mizu Decompiled

* heightTarget
2022-07-19 12:21:51 -04:00
EllipticEllipsis 69e514b37e
EnBat OK and documented (#924)
* OK, start documentation

* Name some more stuff

* Name rest of functions and bss var, tidy up floats

* Document object and paramflags

* Cleanup bat

* Cleanup crow

* Cleanup firefly

* Couple of minor things in arrow

* Review 1

* PLAYER_STATE

* Remove unnecessary f32 casts

* Review

* Review
2022-07-19 12:16:36 -04:00
Alejandro Asenjo bd94105568
ovl_Eff_Lastday Decompiled (#921)
* all functions matching

* ovl_Eff_Lastday Decompiled

* renaming

* final clean up

* enums

* pr review

* pr review

* Prefix

* renamings
2022-07-19 12:10:35 -04:00
Alejandro Asenjo aebbebd6cf
ovl_Obj_Lift Decompiled and Documented (#917)
* progress

* all functions matching

* data imported

* ovl_Obj_Lift Decompiled and Documented

* pr review

* chain assignments

* pr review

* fixes

* yOffsets
2022-07-19 12:05:40 -04:00
Alejandro Asenjo ba886cc8fa
ovl_Dm_Al Decompiled + Some Documentation (#913)
* all functions matching, data isn't?

* cleanup in progress

* ovl_Dm_Al Decompiled

* pr review

* Documentation Fixes and new entries

* forgot one

* pr review
2022-07-19 12:01:26 -04:00
Alejandro Asenjo abf70f6dd2
ovl_Eff_Kamejima_Wave Decompiled (#908)
* almost there

* ovl_Eff_Kamejima_Wave Decompiled

* Us removal

* minor clean up

* pr review

* review

* sikihi rollback and function name fix

* params rename

* SetVtxAlpha

* params prefix

* Jenkins re-run
2022-07-19 11:54:30 -04:00
Alejandro Asenjo a22e72acfe
ovl_En_Sekihi Decompiled and Documented (#907)
* progress

* All functions matching

* ovl_En_Sekihi Decompiled and Documented

* pr review

* pr review

* params enum

* corrections and renaming

* pr review

* Update src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c

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

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-19 11:49:07 -04:00
Alejandro Asenjo ba1c5803ad
ovl_Bg_Fire_Wall decompiled (#890)
* progress

* xml

* data imported

* all matching functions

* ovl_Bg_Fire_Wall decompiled

* review

* review

* GET_PLAYER

* EnEncount4

* AT_HIT

* pr reviews

* pr review
2022-07-19 11:44:51 -04:00
Alejandro Asenjo d150a04e6a
ovl_Obj_Hsblock decompiled (#866)
* ovl_Obj_Hsblock decompiled

* PlayState + PR Reviews

* s

* pr review

* sFocusHeights

* displaylists rename

* bring up names from OOT

* fix

* fix

* xml comment
2022-07-19 11:38:47 -04:00
Parker Burnett 356fde3045
En_Ik OK (#821)
* starting en_ik

* updating and more matching funcs

* matched more functions and ran format.sh

* matched another, started on init

* updating things with master, and more matches

* another function down

* some more progress

* some documenting

* master merge

* maybe some progress?

* one more func left

* IK OK

* inital cleanup passthrough

* fixing warnings and formatting

* some cleanup

* touch up

* more docs

* doin dat dere docs

* actorfixer

* finishing function names

* initial round of fixes

* format

* Naming things

* namefixer

* review comments pt2

* comment updates

* PR Feedback

* forgot a format

* naming enum

* more fixes

* minor fix

* minor fix

* format

* fixes for daaays

* for some reason these keep showing up?

* fixing blob

* names

* fixes

* naming things...can't discern the last ones...

* updating TLUT and names

* formating and fisxes

* fixing func name

* naming effect variable

* name fixer, and renaming variable

* Fixing xml

* forgot to fix name
2022-07-18 04:19:11 +01:00
engineer124 8e45eb7b1f
`z_parameter`: Items & Import Data (#799)
* Import Data

* More functions

* cleanup

* Add Enum

* Many changes, PR and add-ons

* Fix bss

* Better data

* Extra space

* DoubleDefense is boolean

* Missed a macro

* More enums missed

* macro -> enum

* More item cleanup...

* missing/wrong quest items

* Next PR Review

* Revert Interface_AddMagic to Parameter_AddMagic

* Remove QUEST_HEART_CONTAINER

* Fix bss

* Move Color_RGB16 up + fix incorrect numbers

* Add texture pointers

* Add comment

* EQUIP_SLOT_A

* rm redundant comment

* Fix merge

* PR Suggestions

* fix bss
2022-07-12 00:45:55 -04:00
Tom Overton e9d4b31c3d
z_map_exp OK and somewhat documented (#877)
* z_map_exp OK

* some names

* Some more docs

* Update prototypes in functions.h

* Use reg name

* namefixer

* Respond to review

* Respond to review

* Respond to review

* Add some blank lines after breaks, whoops

* Respond to review

* Respond to Engineer's review, pt 2

* Respond to Engineer's review, Pt 3

* Add newline char to end of z64map.h

* Respond to engineer's review, Pt 4

* Respond to multiple reviews
2022-07-11 23:23:01 -04:00
Lucas 2995d72965
`ovl_En_Fall2` OK (#916)
* `ovl_En_Fall2` decompiled

* Suggested changes

* Minor suggestions

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

* Don't commit directly from github

* Define vertices in xml, add macro

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11 22:44:19 -04:00
Alejandro Asenjo 6616f542f1
ovl_Elf_Msg4 decompiled (#884)
* ovl_Elf_Msg4 decompiled

* pr review

* GET_PLAYER

* actorPtr should stay Actor*

* pr review

* SWITCHFLAG

* ELFMSG5_GET_FF

* parenthesis

* pr review

* conflict
2022-07-11 22:40:17 -04:00
Alejandro Asenjo a2f78fbc44
ovl_En_Bh Decompiled (#906)
* ovl_En_Bh Decompiled

* some minor things

* Documentation

* pr review

* gEnBh - > gBh

* noneSkel nonsense fix

* pr review

* pr review
2022-07-11 22:36:11 -04:00
Lucas 9726a30109
`ovl_En_Part` OK (#903)
* `ovl_En_Part` decompiled

* Suggested changes

* Rename body part displaylist

* Suggested changes

* Rename displaylist and params enum

* Remove randvar, rename enum from params to type
2022-07-11 22:32:35 -04:00
Maide 9969b204bc
Obj_Chikuwa (#893)
* Obj_Chikuwa

* PR
2022-07-11 22:25:54 -04:00
Maide 122e4f3982
Obj_Toudai (#892)
* Obj_Toudai

* PR
2022-07-11 22:21:04 -04:00
Maide 2167cb6a77
Bg_Iknv_Doukutu (#891)
* Bg_Iknv_Doukutu

* PR
2022-07-11 22:14:14 -04:00
Alejandro Asenjo 69b4bd8998
ovl_Bg_F40_Flift decompiled (#885)
* ovl_Bg_F40_Flift decompiled

* format

* pr reviews

* pr review
2022-07-11 22:10:29 -04:00
Alejandro Asenjo 9bcd3e2fea
ovl_Elf_Msg5 decompiled (#882)
* ovl_Elf_Msg5 decompiled

* pr review changes

* pr reviews

* ELFMSG5_GET_FF
2022-07-11 22:06:44 -04:00
Alejandro Asenjo 6dec68464f
ovl_Elf_Msg2 decompiled (#881)
* ovl_Elf_Msg2 decompiled

* pr review changes

* ELFMSG2_GET_SWITCHFLAG
2022-07-11 22:03:04 -04:00
Alejandro Asenjo 3ab8b60a12
ovl_Elf_Msg decompiled (#880)
* ovl_Elf_Msg decompiled

* pr review

* ELFMSG_GET_SWITCHFLAG
2022-07-11 21:59:29 -04:00
Alejandro Asenjo d352761bb6
ovl_En_Gamelupy decompiled (#878)
* ovl_En_Gamelupy decompiled

* pr review

* pr review

* pr review
2022-07-11 21:56:01 -04:00
Derek Hensley 0346fde02b
Effect Gsplash OK (#876)
* Ok

* Save?

* undef syms
2022-07-11 21:51:56 -04:00
Derek Hensley f85a398162
Effect Hahen Ok (#875)
* OK

* format

* gameplay keep

* undef syms

* drawFlags -> params

* Format

* Fix railskb include

* DL consistency with OoT

* Hex
2022-07-11 21:48:37 -04:00
Derek Hensley 94372c3670
Effect Hitmark Ok (#874)
* OK

* gameplay keep

* undef syms

* Cleanup

* format

* HitMark -> Hitmark

* Remove EffectSsHitmark_Spawn from functions.h

* PR
2022-07-11 21:45:03 -04:00
Alejandro Asenjo a4d93ee3eb
ovl_Bg_Open_Shutter decompiled (#870)
* ovl_Bg_Open_Shutter decompiled

* format

* Co-authored-by: EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by: Maide eeeedddccc@hotmail.co.uk
Co-authored-by: Tom-Overton tom.overton@outlook.com

* PlayState

* pr review

* pr review

* Come on Jenkins

* rumble needed?

* namefixer.py
2022-07-11 21:41:19 -04:00
Chloe 78a29fb17b
ovl_Dm_Char02 decompiled (#869)
* ovl_Dm_Char02 decompiled

* remove m2c comments

* remove ovl_Dm_Char02 data in spec

* ran format.sh

* fix format version

* use our reloc

* fix reviews

* rename context/playstate structs

* format

* more review fixing

* even more review fixing
2022-07-11 21:37:42 -04:00
Alejandro Asenjo 8856e07166
ovl_Obj_Lupygamelift decompiled (#868)
* ovl_Obj_Lupygamelift decompiled

* pr review

* PlayState

* review
2022-07-11 21:33:59 -04:00
Alejandro Asenjo 5ffdc0a387
ovl_Obj_Jgame_Light decompiled (#867)
* ovl_Obj_Jgame_Light decompiled

* xml

* doc

* pr review

* playstate

* playstate

* pr review

* pr review

* missing macro

* pr review

* pr review

* pr review

* pr review

* isOn
2022-07-11 21:30:18 -04:00
Alejandro Asenjo 2bcb88c05f
ovl_Elf_Msg3 decompiled (#865)
* progress

* ovl_Elf_Msg3 decompiled

* pr review changes

* PlayState

* if else

* chained assignment

* pr review changes
2022-07-11 21:26:29 -04:00
Alejandro Asenjo c35d699d8a
ovl_Obj_Shutter decompiled (#864)
* ovl_Obj_Shutter decompiled

* pr review

* format

* Empty-Commit

* rename
2022-07-11 21:23:12 -04:00
Alejandro Asenjo ffb90132c6
ovl_Obj_Demo decompiled (#860)
* ovl_Obj_Demo decompiled

* pr review

* pr review changes

* Empty-Commit

* pr review
2022-07-11 21:19:45 -04:00
Alejandro Asenjo 35961a7cb9
ovl_Demo_Getitem decompiled (#861)
* ovl_Demo_Getitem decompiled

* * PlayState
* PR reviews

* pr review changes

* renaming

* objectIndex
2022-07-11 21:13:29 -04:00
Alejandro Asenjo 5178d2cd9a
ovl_En_Onpuman decompiled (#859)
* ovl_En_Onpuman decompiled

* pr review

* PlayState + reviews

* pr review
2022-07-11 21:09:40 -04:00
Isghj ea42d8d118
Ds2n: OK (unused potion shop man from OoT) (#858)
* Ds2n: OK

* Ds2n: requested changes

* EnDs2n: GlobalCtx is dead

* Ds2n: formater pls

* Update src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h

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

* Update src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h

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

* Update src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c

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

* Ds2n: more limbs named

* Ds2n: right, formatter for longer limb names

* EnDs2: moved comment back... did git merge the wrong way?

* Ds2n: broken anim is clearly wrong, its something else

* Ds2n: almost mappeded entire blob

* Ds2n: found another texture

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11 21:06:06 -04:00
Alejandro Asenjo 6052230233
ovl_Bg_Botihasira decompiled (#857)
* ovl_Bg_Botihasira decompiled

* pr fixes

* PR review changes

* undef syms

* PlayState

Co-authored-by: SonicDcer <noreply@github.com>
2022-07-11 21:02:15 -04:00
Alejandro Asenjo bc2ca6bc7f
ovl_Bg_Icefloe decompiled (#855)
* ovl_Bg_Icefloe decompiled

* reloc

* pr review changes

* xml renaming

* displayList rename

* renaming

* almost forgot

* Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com

* PlayState + reviews

Co-authored-by: SonicDcer <noreply@github.com>
2022-07-11 20:58:06 -04:00
Alejandro Asenjo ed2f1390bc
ovl_Eff_Zoraband decompiled (#854)
* ovl_Eff_Zoraband decompiled

* != 0

* alpha and stateFlags

* name fix

* pr review fix

* PlayState

Co-authored-by: SonicDcer <noreply@github.com>
2022-07-11 20:51:53 -04:00
Alejandro Asenjo 3cdb4597f3
ovl_Bg_Spout_Fire decompiled (#853)
* ovl_Bg_Spout_Fire decompiled, asset decomp pending

* object_fwall decompiled

* fwall Texture leftovers name update from OOT

* pr review fixes

* pr review fixes

* renaming

* xml

* xml

* xml

* xml

Co-authored-by: SonicDcer <noreply@github.com>
2022-07-11 20:47:58 -04:00
TrulyNaN 84ce52ae4e
ovl_Bg_Ikana_Mirror OK and documented (#873)
* test commit

* undoing test commit

* making sure this is the right repo

* removing test file

* init for OSH bombable wall started. put back Actor* in function declarations.

* BgKin2Bombwall_Init is matching.

* started z_bg_kin2_bombwall destroy function. One mismatch right now.

* BgKin2Bombwall_Destroy matches.

* BgKin2Bombwall_Draw matches.

* Fixed BgKin2Bombwall_Init

* BgKin2Bombwall_Init and BgKin2Bombwall_Destroy both match. Fixed s32 array in struct.

* BgKin2Bombwall_Draw and BgKin2Bombwall_Update match.

* Only func_80B6E020 and func_80B6E090 left to match in ovl_Bg_Kin2_Bombwall.

* func_80B6E020 from ovl_Bg_Kin2_Bombwall matches.

* Went from 8925 to about 5-6k diff score for func_80B6E090 in ovl_Bg_Kin2_Bombwall

* Took func_80B6E090 from about 5300 diff score to about 4300 diff score in ovl_Bg_Kin2_Bombwall.

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 4k ish to 3277

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 3277 to 2262.

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 2262 to 1589.

* only slight progress on ovl_Bg_Kinw_Bombwall's func_80B6E090

* Got to 1473 diff score on ovl_Bg_Kinw_Bombwall's func_80B6E090

* Put in the changes made by EllipticEllipsis and hensldm for ovl_Bg_Kin2_Bombwall's func_8066E090.

* renamed some symbols. Fake symbol removal makes nonzero diff, but rom OK's after make.

* moving declarations around, ordering.

* One.word.away. from importing data in ovl_Bg_Kin2_Bombwall.

* ovl_Bg_Kin2_Bombwall data imported. Matching.

* Edited spec for reloc of ovl_Bg_Kin2_Bombwall.

* Removed extra comments for ovl_Bg_Kin2_Bombwall.

* unpushed stuff. dunno.

* forgot to save z_bg_kin2_bombwall.c

* need to commit before make-ing in master.

* Ported z_bg_kin2_bombwall's code. Data next.

* Imported data for merging z_bg_kin2_bombwall. Yes, I yelled when it OK'd.

* Added comments to remember what does what in z_bg_kin2_bombwall.

* Some comments in z_bg_kin2_bombwall.c and function names ideas.

* Added comments for function name ideas. Cleaned up temps in z_bg_kin2_bombwall except in func_80B6E090.

* Renamed most functions and some variables in z_bg_kin2_bombwall.

* Made a name suggestion for func_80B6E020 after testing in game.

* Ran format.sh.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

1 and 0 replaced by true and false in func_80B6E020.

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

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

Bending to the x-- supremacy.

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

* PR fixes (not done yet) including more consistent use of THIS, removing arg0 and arg1 variable names, standardizing params for z_bg_kin2_bombwall, turning some if-return to if-else, removing unnecessary casts.

* Applied isghj5's and EllipticEllipsis' suggestions except for the object file in z_bg_kin2_bombwall. Object file next.

* Screwd up formatting.

* Thinking of playing with object_kin2_obj.

* Documented most of object_kin2_obj based on bombwall, fence and shelf actors.

* Had forgotten an arg1 in z_bg_kin2_bombwall.c

* First commit for ovl_Bg_Ikana_Mirror branch.

* Started decompiling ovl_Bg_Ikana_Mirror. Setup functions and _Update done matching.

* Replaced a float by its fractional representation. I need to learn float magic.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h

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

* Applied more formatting and naming remarks from PR about the C file. Assets and object stuff next.

* Display lists and collision header in z_bg_kin2_bombwall.c renamed after their descriptive names in the object's XML file. Name for Ocean Spider House drawers chests left to change.

* Working on BgIkanaMirror_Destroy. Stack and registers left essentially.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* One extra line in an if, collision naming convention applied and renamed Ocean Spider House nightstands to drawers chests.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* Changed drawers chest to chest of drawers in object_kin2_obj and z_bg_kin2_shelf.

* Removed some unnecessary comment.

* almost done with BgIkanaMirror_Destroy function.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* BgIkanaMirror_Destroy OK.

* Almost done with BgIkanaMirror_Init. Mostly stack stuff left.

* Registers and stack left to fix for BgIkanaMirror_Init.

* BgIkanaMirror_Init matching.

* Ran permuter to improve BgIkanaMirror_Draw's score.

* Actually not mad at permuter for BgIkanaMirror_Draw headstart.

* Matched func_80B7F730 in ovl_Bg_Ikana_Mirror. Progress on its _Init done too.

* func_80B7FA9C in ovl_Bg_Ikana_Mirror is matching. _Init left then documentation.

* Mistake in last commit message: actually, _Draw is left for ovl_Bg_Ikana_Mirror.

* Going to do some groceries, so pushing. About 2/3 across func_80B7FBA4 in ovl_Bg_Ikana_Mirror.

* func_80B7FBA4 in ovl_Bg_Ikana_Mirror is matching. _Draw then data left.

* Need to switch branch.

* Fixed BgKin2Bombwall_SpawnEffects after the Rand_Next() type update.

* Switching branch.

* Learning to decomp draw functions with BgIkanaMirror_Draw. YEP

* Switching branch.

* Went through the first wave of graphics macros attempts for BgIkanaMirror_Draw.

* Removed some temps in BgIkanaMirror_Draw.

* Second pass of macro attempts for BgIkanaMirror_Draw.

* Diff score for BgIkanaMirror_Draw at 1873. Getting there.

* BgIkanaMirror_Draw diff score down to 854. 4 instructions off and registers to fix.

* Instructions are matching for BgIkanaMirror_Draw. Registers left.

* BgIkanaMirror_Draw matches. Data next. Adding some co-authors

* BgIkanaMirror_Draw matches. Data next. Adding some co-authors

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Tom-Overton <hensley.derek58@gmail.com>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>

* Data imported and OK.

Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>

* Removed commented lines of unused code and useless externs. Documenting C file and object next.

* Renamed fields in actor and variables in 3 functions for ovl_bg_ikana_mirror. Some conventions applied.

* Renamed more variables in the struct and C file for ovl_bg_ikana_mirror.

* More cleanups and naming in ovl_Bg_Ikana_Mirror.

* Renamed some functions in ovl_Bg_Ikana_Mirror. More cleanups. Object documentation next once function names confirmed.

* Renamed collision header, animated textures and display lists for ovl_Bg_Ikana_Mirror in ovl_Bg_Ikana_Mirror and object_ikana_obj. Some textures left to rename.

* Renamed textures only used by ovl_Bg_Ikana_Mirror. Must go back through docs for conventions and styles plus an extra cleanup before PR.

* Went through merging and review docs for extra cleanups. Adding co-authors for documentation.

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>

* Creating branch to merge ovl_Bg_Ikana_Mirror.

* Fixed the merge from zeldaret/mm. ovl_Bg_Ikana_Mirror OK and documented. PR-ready.

* Applied first batch of fixes from PR comments. Adding co-authors for documentation and a function rewrite.

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>

* Renamed the colliders in ovl_Bg_Ikana_Mirror's struct and fixed naming in object file plus spacing cleanups.

* Full rename for data and temps with respect to the mirror's and light rays' respective colliders.

* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.h

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

* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c

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

* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c

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

* Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c

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

* Formatting needed to be applied after commiting suggestions.

* Renamed more textures and removed unnecessary array sizes in the data.

* Forgot to run formatter.

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>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Isghj5 <isghj5@gmail.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
2022-07-11 20:43:19 -04:00
Anghelo Carvajal 45eed680d6
`code_8013EC10` and `code_80182CE0` (`z_rumble` and `sys_rumble`) (#763)
* First pass

* import bss

* cleanup warnings

* PadMgr_ControllerHasRumblePak

* z64rumble.h

* rename file to z_rumble.c

* format

* Update src/code/z_rumble.c

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

* Update src/code/z_rumble.c

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

* name a temp

* minor cleaning

* bss

* match code_80182CE0

* import data and cleanups

* Rename RumbleManager struct and sys_rumble file

* Rename functions from sys_rumble

* Rename parameter to distSq

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

* more notes and a bit of cleaning

* Name Rumble_Add and Rumble_AddForced

* some extra notes

* Rename Rumble_Override and Rumble_Request

* document states

* minor renames

* actorfixer

* format

* very minor docs

* whoops

* remove redundant prevent_bss_reordering

* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c

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

* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c

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

* Update src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c

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

* namefixer

* Update src/code/sys_rumble.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* fix

* Elliptic review

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

* minor cleanups

* Update include/z64rumble.h

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

* review

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

* Update src/code/sys_rumble.c

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

* Update src/code/z_rumble.c

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

* review

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

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-29 22:08:03 +01:00
Alejandro Asenjo f77c4770f7
ovl_Obj_Y2lift decompiled (#856)
* ovl_Obj_Y2lift decompiled

* format

* pr review fixes

* clean up

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 21:35:37 +01:00
TrulyNaN 53fc438d81
Merge z_bg_kin2 bombwall (#840)
* test commit

* undoing test commit

* making sure this is the right repo

* removing test file

* init for OSH bombable wall started. put back Actor* in function declarations.

* BgKin2Bombwall_Init is matching.

* started z_bg_kin2_bombwall destroy function. One mismatch right now.

* BgKin2Bombwall_Destroy matches.

* BgKin2Bombwall_Draw matches.

* Fixed BgKin2Bombwall_Init

* BgKin2Bombwall_Init and BgKin2Bombwall_Destroy both match. Fixed s32 array in struct.

* BgKin2Bombwall_Draw and BgKin2Bombwall_Update match.

* Only func_80B6E020 and func_80B6E090 left to match in ovl_Bg_Kin2_Bombwall.

* func_80B6E020 from ovl_Bg_Kin2_Bombwall matches.

* Went from 8925 to about 5-6k diff score for func_80B6E090 in ovl_Bg_Kin2_Bombwall

* Took func_80B6E090 from about 5300 diff score to about 4300 diff score in ovl_Bg_Kin2_Bombwall.

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 4k ish to 3277

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 3277 to 2262.

* Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 2262 to 1589.

* only slight progress on ovl_Bg_Kinw_Bombwall's func_80B6E090

* Got to 1473 diff score on ovl_Bg_Kinw_Bombwall's func_80B6E090

* Put in the changes made by EllipticEllipsis and hensldm for ovl_Bg_Kin2_Bombwall's func_8066E090.

* renamed some symbols. Fake symbol removal makes nonzero diff, but rom OK's after make.

* moving declarations around, ordering.

* One.word.away. from importing data in ovl_Bg_Kin2_Bombwall.

* ovl_Bg_Kin2_Bombwall data imported. Matching.

* Edited spec for reloc of ovl_Bg_Kin2_Bombwall.

* Removed extra comments for ovl_Bg_Kin2_Bombwall.

* unpushed stuff. dunno.

* forgot to save z_bg_kin2_bombwall.c

* need to commit before make-ing in master.

* Ported z_bg_kin2_bombwall's code. Data next.

* Imported data for merging z_bg_kin2_bombwall. Yes, I yelled when it OK'd.

* Added comments to remember what does what in z_bg_kin2_bombwall.

* Some comments in z_bg_kin2_bombwall.c and function names ideas.

* Added comments for function name ideas. Cleaned up temps in z_bg_kin2_bombwall except in func_80B6E090.

* Renamed most functions and some variables in z_bg_kin2_bombwall.

* Made a name suggestion for func_80B6E020 after testing in game.

* Ran format.sh.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

1 and 0 replaced by true and false in func_80B6E020.

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

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

Bending to the x-- supremacy.

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

* PR fixes (not done yet) including more consistent use of THIS, removing arg0 and arg1 variable names, standardizing params for z_bg_kin2_bombwall, turning some if-return to if-else, removing unnecessary casts.

* Applied isghj5's and EllipticEllipsis' suggestions except for the object file in z_bg_kin2_bombwall. Object file next.

* Screwd up formatting.

* Thinking of playing with object_kin2_obj.

* Documented most of object_kin2_obj based on bombwall, fence and shelf actors.

* Had forgotten an arg1 in z_bg_kin2_bombwall.c

* Replaced a float by its fractional representation. I need to learn float magic.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h

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

* Applied more formatting and naming remarks from PR about the C file. Assets and object stuff next.

* Display lists and collision header in z_bg_kin2_bombwall.c renamed after their descriptive names in the object's XML file. Name for Ocean Spider House drawers chests left to change.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* One extra line in an if, collision naming convention applied and renamed Ocean Spider House nightstands to drawers chests.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* Changed drawers chest to chest of drawers in object_kin2_obj and z_bg_kin2_shelf.

* Removed some unnecessary comment.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

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

* Fixed BgKin2Bombwall_SpawnEffects after the Rand_Next() type update.

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

Rand_Next() update.

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

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

Rand_Next() update.

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

* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com

* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com

* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com

* Adding Co-authors
Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com

* Adding Co-authors

Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by Derek-Hensley hensley.derek58@gmail.com
Co-authored-by Maide eeeedddccc@hotmail.co.uk
Co-authored-by Tom-Overton tom.overton@outlook.com
Co-authored-by Fig02 fig02srl@gmail.com
Co-authored-by Parker-Burnett burnettparker@gmail.com
Co-authored-by isghj5 isghj5@gmail.com

* Adding Co-authors

Co-authored-by: EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by: Derek-Hensley hensley.derek58@gmail.com
Co-authored-by: Maide eeeedddccc@hotmail.co.uk
Co-authored-by: Tom-Overton tom.overton@outlook.com
Co-authored-by: Fig02 fig02srl@gmail.com
Co-authored-by: Parker-Burnett burnettparker@gmail.com
Co-authored-by: isghj5 isghj5@gmail.com

* Adding Co-authors

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com>
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Parker-Burnett <burnettparker@gmail.com>
Co-authored-by: isghj5 <isghj5@gmail.com>

* Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.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>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: Tom-Overton <tom.overton@outlook.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Parker-Burnett <burnettparker@gmail.com>
Co-authored-by: isghj5 <isghj5@gmail.com>
2022-06-20 20:57:09 +01:00
mzxrules 361d8573e9
z_obj_tsubo OK (#784)
* 4 unattempts left

* z_obj_tsubo OK

* name some functions

* implement suggestions

* implement EllipticEllipsis changes

* implement more suggestions
2022-06-20 20:44:12 +01:00
Alejandro Asenjo c6963e27d0
ovl_Item_Etcetera decompiled (#849)
* ovl_Item_Etcetera decompiled

* PR review fixes

* PR Review Fixes

* pr review fixes

* pr review fixes

* pr review fixes

* final

* merge

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 17:26:48 +01:00
Tom Overton a039a2f34a
BgIkanaDharma (punchable pillar segments in STT) OK (#851)
* Bg_Ikana_Dharma decompiled

* Bg_Ikana_Dharma more stuff

* remove & from function pointers

* use THIS macro

* use THIS macro

* return -> else

* GET_PLAYER

* slightly better match (this2 only used once)

* fix warnings; name variables

* better match in BgIkanaDharma_Init; more param macros

* Rebase to latest master and some minor cleanup

* More cleanup

* Document object

* Respond to isghj5's review

* Respond to Elliptic's review

* Better pack macro

* Respond to hensldm's review

Co-authored-by: immibis <immibis@gmail.com>
2022-06-20 00:38:51 +01:00
Alejandro Asenjo 064b3e5493
ovl_Obj_Rotlift decompiled (#850)
* ovl_Obj_Rotlift decompiled

* fixes

* fixes 2

* format

* PR review fixes

* PR review fixes

* PR review fixes

* PR review fixes

* PR review fixes

* pr review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20 00:31:01 +01:00