Commit Graph

577 Commits

Author SHA1 Message Date
Tom Overton fc94be22ac
Document object_az (Beaver Bros.) (#1083)
* Document object_az (Beaver Bros.)

* Respond to Elliptic's review
2022-09-24 16:09:58 -03:00
Derek Hensley c222747977
Object_trt documented + other shopkeeper cleanup (#1081)
* trt skel

* Some cleanup

* Textures

* Better Tex names

* Small renames

* Animations

* Animation enum

* trt2

* format

* Update assets/xml/objects/object_trt.xml

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

* Update assets/xml/objects/object_trt.xml

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

* Whitespace

* HairPiece -> Braid

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-09-24 16:03:34 -03:00
Tom Overton 76dc0dd867
Document object_dblue_object (Great Bay Temple objects) (#1077)
* Document everything except the unknown blob and the weird collision

* Add the last unused texture, thanks Tharo!

* Finish up documentation

* Respond to Elliptic's review
2022-09-24 15:51:10 -03:00
Tom Overton 8fa3a58b35
Document object_market_obj (West Clock Town Market) (#1074)
* Document object_market_obj (West Clock Town Market)

* Update the names of ground textures

* Respond to Elliptic's review
2022-09-24 15:40:36 -03:00
StickyThwomp d968e58f9c
Obj_Kendo_Kanban OK and Documented (Decomp was mostly done already) (#1057)
* stuff

* Renaming in-process

- Changed action names and setup names based on examples.
- Undid some ill-advised changes that broke matching.
- Misc variable naming. Need verification and not all complete.

* wip renaming

* A bit more progress on determining names for everything.

* Done with naming.

* Touchup before review

* Updates from review:

- Leave displacementY/unk_AC0 naming to z_actor work.
- Remove unnecessary include of z64math.h, indirect inclusion preferred
- Add trailing comma for better formatting of sDisplayLists
- Rename of static vectors sNullVec3f->sZeroVec, sUnitVectorX->sUnitVecX
- Restore pad instead of using local const. Change const to #define
- Prefer index over idx
- Remove 'b' prefix from bHasNewRootCornerPos
- Const -> Enum and formatting in ObjKendoKanban_IsPlayerOnTop
- Rename 'Aerial' to 'Tumble'

* Missed items in review:
- Missed an instance of displacementY->unk_AC0 renaming (Cause of build failure)
- Whitespace formatting
- UNK_TYPE2 undo

* More adjustments from review:
- Undo accidental formatting changes to z64player.h, restoring to master.
- Naming and Formatting changes.
- Removing some comments.

* From review, qualify enum and #define with obj name, whitespace cleanup.
2022-09-24 15:00:53 -03:00
Tom Overton 0aede274ae
Document BgInibsMoveBg (Twinmold's Arena) and object_inibs_object (#1055)
* Document BgInibsMoveBg (Twinmold's Arena) and object_inibs_object

* Respond to hensldm's review
2022-09-24 14:54:40 -03:00
Parker Burnett b4adfb0a22
Fbdemo_triforce OK with documentation (#1053)
* close to done

* OK and doc'd

* PR feedback

* 4mat

* PR feedback round 2

* fixed engineers comment
2022-09-24 14:49:07 -03:00
engineer124 cdee1fc45b
`z_kaleido_prompt.c` Ok and Documented (Pause Menu Save/Continue Prompt. Unused) (#1045)
* kaleido prompt ok

* fix pauseCtx
2022-09-24 14:43:21 -03:00
Derek Hensley 77be902c25
Effect Bomb2 Ok (#1039)
* OK

* PR
2022-09-24 14:31:20 -03:00
Derek Hensley 1402db4008
Effect Dfire OK (#1038)
* OK

* rename function

* MTXMODE enum

* PR

* Format

* % -> &

* note
2022-09-24 14:26:08 -03:00
Derek Hensley f31056ef8a
Effect Dust OK (#1016)
* OK

* Some cleanup

* Description

* format

* Better name

* whoops

* Array count

* Name dust texture arrays

* Fix

* static

* Update dust tex outnames
2022-09-24 14:04:03 -03:00
engineer124 6451bcf158
`z_parameter`: Magic (#934)
* Document magic

* Cleanup

* Few fixes

* PR Suggestions, More Lens Docs

* Few comments

* missed a spot

* Better macros/names

* Deactivate Lens

* more PR suggestions

* fix names
2022-09-14 13:49:17 -03:00
Alejandro Asenjo 33f7ede84f
ovl_Oceff_Spot OK (#1004)
* ovl_Oceff_Spot decompiled

* format

* renamings and pr review

* pr review

* pr review
2022-09-14 13:07:46 -03:00
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
Anghelo Carvajal a67571c2bf
Purge `ExchangeItemID` enum (#1026)
* Purge ExchangeItemID enum

* Add stff to namefixer

* Rename FISHING_ROD
2022-08-15 15:04:42 -04:00
Anghelo Carvajal 0f130c173d
Fix `EnHorseAction` enum (#1022)
* Fix enum

* Fix some constants

* ENHORSE_ACT_MOUNTED_IDLE_WHINNYING

* ACT -> ACTION
2022-08-15 15:01:07 -04:00
Tom Overton 78684187fe
Make names related to animations more consistent (#998)
* Make names related to animations more consistent

* Standardize on sAnimationInfo

* Respond to hensldm's review

* Standardize on ChangeAnim

* Respond to hensldm's review

* Small formatting thing

* Consistency after merging master

* A few more things I missed

* Respond to Elliptic's review

* Some more stuff that was requested
2022-08-15 14:51:38 -04:00
Derek Hensley 132dd6a373
Entrance Macro (#987)
* POC

* fix

* Fix typo

* token POC

* The rest

* small cleanup

* More small cleanup

* ENTRANCE

* arg renames

* EntranceIndex -> Entrance

* format

* PR

* PR2

* Remove layer from entrance macro

* namefixer plus comments

* format
2022-08-15 14:45:28 -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
engineer124 0082c299c6
Decompile Camera Helper Functions (#1023)
* helper functions

* more pr suggestions
2022-08-15 14:36:33 -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
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 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
engineer124 a80637fd59
Decompile and Document Camera `z_play` functions (#933)
* Document z_play camera functions

* cleanup function names

* PR Suggestion

* Fix master merge, add comments

* fix merge

* small fix

Co-authored-by: angie <angheloalf95@gmail.com>
2022-08-09 20:01:55 -04:00
Tom Overton dbe98b9776
Document powder keg assets (#967)
* Document powder keg assets

* Add "barrel" to one of the asset names

* Update variables.txt

* ptr -> fuseSegmentPtr
2022-08-07 19:38:37 -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
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 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
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
engineer124 e75d7020a9
AudioOcarina (1 NonMatching) (#911)
* AudioOcarina OK

* rm some comments

* PR Suggestions

* Add define

* cleanup
2022-08-04 05:21:50 +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 04dd8d7b62
Decompile/Document bgCam and actorCsCam (combination of Camera/BgCheck/Play) (#932)
* Document bgCam and actorCsCam

* index

* Small PR suggestions

* small suggestions

* player stateflags

* Fix bss

* Fix BSS

* Fix bss

* Fix bss
2022-07-23 15:51:14 -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 6472f68323
Map Select: Docs and Cleanup (#962)
* Add Map Select Docs

* cleanup

* brackets

* Another typo
2022-07-23 15:30:19 -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
Isghj fbb38416ca
`ovl_En_Po_Sisters` and `object_po_sisters`Documented (#930)
* EnPoSisters: basic docs back in

* EnPoSisters: some docs

* EnPoSisters: some docs

* EnPoSisters: more docs 2

* EnPoSisters: more docs

* PoSisters: documented most of object xml

* PoSisters: swapped DL

* PoSisters: more docs

* EnPoSisters: minor docs

* PoSisters: more docs

* PoSisters: fix wrong prefix

* PoSisters:Minor docks

* more doc

* more fun

* More functions named, all of them?

* doc

* EnPoSisters: docs, formater pass

* z_actor: removed comment, fixes formater

* Apply suggestions from code review

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

* PoSisters: formater

* PoSister: requested object xml changes

* Apply suggestions from code review

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

* PoSisters: remove bgId comment, add meg reverse timer comments, format

* PoSisters: megCountRemaining union and some comments, formater pass

* PoSisters: better first actionfunc name

* PoSisters: Skeleton -> Skel

* PoSisters: Formater pls

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-07-23 15:19:49 -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
Tom Overton fa8bebf209
Document DmChar02 and its animations, rename one struct var in DmStk (#951)
* Document DmChar02 and its animations, rename one struct var in DmStk

* Better description
2022-07-23 14:43:04 -04:00
Isghj 235ae9b11d
`EnNnh` (Butler's Son) Documentation and one Kakasi thing I missed (#957)
* EnNnh: Docs

* EnKakasi: added targetmode params macro

* EnNnh: requested move of object description
2022-07-23 14:36:08 -04:00
Tom Overton 40bfef9f02
Document object_ma2 (Cremia) (#950)
* Document object_ma2 (Cremia)

* Clarify what the box is for

* Use CREMIA_LIMB_MAX in Invadepoh
2022-07-23 14:26:45 -04:00
Tom Overton ba8e12a80b
Document object_ma1 (Romani) (#948)
* Document object_ma1 (Romani)

* Sync up one of the mouth name textures with how I did it for Cremia

* Specify what the box is for

* Respond to hensldm's review

* Sync texture names with what Anghelo is doing in his Obj_Um PR
2022-07-23 14:12:36 -04:00
Tom Overton 9449ced63f
En_Syateki_Man (Shooting Gallery Man) documented (#894)
* Document a ton of syateki_man

* Document swamp actor lists

* Document animations

* Document player positions

* Document talk flags

* Name wave and spawn index

* Name everything involved in the swamp game

* A hex score I missed

* Some slight town game doc

* Document octorok flags

* Better way of doing octorok flags

* Macros for getting/setting high scores

* Update a variable I missed

* Name remaining struct vars

* Create enum for shootingGameState

* Remove anonymous unions

* hitState -> hitType

* Comment for values next to enums

* Name some more stuff

* Name stuff in Town-RunGame

* Name sGameStartTimer

* Name some more stuff

* Name all static variables

* One more round of comments and such

* Respond to hensldm's review

* GET_INDEX -> GET_ID

* Respond to Elliptic's review (or at least the parts I can respond to right now)

* More review responses

* Add some stuff to z64saves.h I missed
2022-07-23 14:06:11 -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
Tom Overton aa87f0de89
Fix namefixer.py (#972)
* Fix namefixer.py

* Fix contributing link (I think)
2022-07-23 02:11:23 +01:00
Anghelo Carvajal addfe3a613
Decomp `Message_GetState`, add `TextState` enum and some header reorganization (#919)
* Message_GetState

* Rename msgCtx->msgLength

* Replace some enums

* TEXT_STATE_CLOSING

* use enum on switches

* use enum when assigning to a variable

* some minor cleanups

* minor cleanup

* TEXT_STATE_CHOICE

* remove unused temp

* z64message.h and z64view.h

* steal some stuff from OoT

* add some stuff to namefixer

* fix shift

* minor doc comment

* Update MessageContext struct from andzura's branch

Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com>

* some other TextState uses I missed

* format

* statetimer in dec

* review

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

* review

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

* review

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

* format

* Batch () commit

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

* review

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

* format

* bss

* use text state defines on new actors

* fix matching

* bss

Co-authored-by: Andzura <11079691+Andzura@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-07-22 20:51:20 +01:00
engineer124 f2b628241d
Cleanup SubCameras (#936)
* Cleanup SubCameras

* Add small bit of docs, remove comments

* Fix merge from master, missed test7
2022-07-22 15:24:37 +01:00
engineer124 5f6c3df4ce
Transition System Docs (#883)
* Transition docs from OoT

* Cleanup

* Missed a spot
2022-07-22 15:05:20 +01: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 64ea6665bd
Effect Gspk OK (#939)
* OK

* cleanup

* newline
2022-07-22 05:58:08 +01:00
Tom Overton 7732f5e96d
Boss_02 Documentation, Part 2: Document Twinmold Param Types and name most BSS variables (#931)
* Boss_02 Documentation, Part 2: Document Twinmold Param Types and name most BSS variables

* Respond to hensldm's review
2022-07-22 05:53:14 +01:00
Tom Overton 905c089beb
Document En_Dg (dog) and do some light cleanup on En_Racedog (#926)
* Document some low-hanging fruit in EnDg

* Animation and type documentation

* Document a bunch of stuff

* Name more functions

* Params macro

* Defines for dog flags

* Name all struct variables

* Give all animations better names

* Better name for Swim2

* Document/name a bunch of stuff

* Make index enum

* Respond to engineer's review

* Respond to mzx's review

* Fix up comment (again)

* Respond to hensldm's review
2022-07-22 05:48:55 +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
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
Derek Hensley cbeeeb172a
EnBaba Documented (Bomb Shop Lady) (#825)
* Merge in sub_s_models

* Update subs DL names

* Unused Weight pathing

* Function headers for weightpathing

* TimePathing WIP

* Timepathing, still unsure about unk184

* Move subs functions from functions.h to z64subs.h

* Add fake comment

* Some cleanup and renames

* Renames/cleanup of actors that use timepath

* Cleanup

* More cleanup

* Rename unk stuff

* Merge in upstream/master

* TimeElapsed -> elapsedTime

* Fix

* Final cleanup

* SubS Time Paths

* Still needs dialog action functions

* Fix waypoint comments

* Review pt. 1

* Baba review

* ScheduleResult -> ScheduleOutput

* Forgot to update functions.txt oops

* Add clarifying comment to SubS_TimePathing_FillWeightArray

* format.sh

* Finish up docs

* Fix order comments

* Fix

* Change bombShopkeeper struct member to

* Fix a few merge mistakes

* Add ScheduleOutput to namefixer

* format

* Format and fix merge

* Review

* PR

* z64schedule.h

* text summary

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-07-22 05:05:28 +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
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 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
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
Derek Hensley 03a7e00c4b
Hotfix (#929) 2022-07-12 06:24:29 +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
engineer124 fda5da2500
Introducing z64camera.h (#797)
* Introduce z64camera.h

* format

* Oops

* Change paramData to u8

* BINANG_TO_DEGF and DEGF_TO_BINANG to z64camera.h

* Fix bss, thanks Anon

* Update with docs from OoT

* Cleanup

* Fix activeCamId

* underwater

* remove interface alpha stuff

* Oops

* To Hex

* Cleanup cam settings comments

* PR Suggestions

* More PR Suggestions

* trackActor -> focalActor

* Fix merge

* Fix bss, thanks Anon
2022-07-12 00:25:40 -04:00
Anghelo Carvajal 628482f3c4
hotfix disasm for python 3.6 (#928) 2022-07-12 00:01:58 -04:00
Anghelo Carvajal 87506f7c19
`z_player_lib`: Part 1 (#688)
* fix some symbols and file splits

* PLAYER_STATE macros

* Move over a few functions

* AP functions and update struct

* another small bunch

* Add player_lib prototypes

* A few more functions

* Some fixes and add stuff to actorfixer

* format

* bss

* Elliptic's review

* Engineer's review

* Some renames and cleanups

* bss

* A bit of cleaning up

* Player_DrawZoraShield

* format

* actorfixer, bss and format

* Forgot to merge master again

* Rename some LinkGoron dlists

* PlayerMeleeWeaponAnimation enum

* format

* actorfixer, bss and format

* more bss

* actorfixer

* format

* actorfixer and format

* bss

* Update src/code/z_player_lib.c

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

* sEnvironmentTextTriggers

* Update include/z64save.h

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

* Update src/code/z_player_lib.c

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

* Update src/code/z_player_lib.c

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

* Update src/code/z_player_lib.c

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

* breman mask march comment

* fix

* fixes

* bss

* RESPAWN_MODE_RETURN

* review

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

* format

* Engineer's review

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

* Update src/code/z_player_lib.c

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

* review

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

* Update include/z64player.h

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

* review

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

* format

* unused mwas

* fixes

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-07-11 23:43:46 -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
engineer124 ab6ef2535e
Match and Document code_80172BC0.c (#909)
* Match code_80172BC0.c

* Better match

* brackets

* Fix
2022-07-11 23:14:07 -04:00
Derek Hensley 85b19de4ab
General Cleanup 4 (#871)
* PartTimerWorker -> PartTimer

* cleanup

* format

* objChan draw macro

* Fix macro

* Fix warning

* PR Review

* Missed 1 ull

* UINT16_MAX

* Remove todo from footmark

* Remove * from tex in AnimatedMat_DrawTexCycle
2022-07-11 23:06:21 -04:00
Tom Overton acb9216daa
Document object_uch (Aliens) and remove a dummy label match in EnInvadepoh (#899)
* Document object_uch (Aliens)

* Remove dummy label match that has been annoying me for a year!!!!!!!!!!!!!

* Respond to reviews

* Fix a small thing brought up in review

* Swap to gAlienJerkingAnim
2022-07-11 22:52:43 -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
Tom Overton c667452329
Document Twinmold Effects (#896) 2022-07-11 22:29:01 -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
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 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 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
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 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 54957f8735
Yet another disasm.py speedup (#918)
* starting point

* add rabbitizer stuff, but commented out

* kinda works now, except for symbols

* trying to fix using symbols for disassembly

* more fixes

* fix branches and some format changes

* make disasm.py runnable again 😅

* fix double words

* hopefully fix jumptables

* fix delay slot spacing on entry.s

* Fix delay slot shenanigans

* minor format update

* re enable multithreading

* add rabbitizer to requirements.txt and cleanup the file

* cleanup

* more cleanup

* more cleanups

* getImmOverride

* black

* hopefully final cleanup

* diff.py requirements

* Install python dependencies on jenkinsfile

* --no-cache

* Remove `--no-cache --upgrade`

* branch_likely_delay_slot_save

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

* review

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

* a

* Don't use $FpcCsr

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11 20:13:14 -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
Tom Overton 158d1b26b0
PlayState rename (#835)
* PlayState rename

* Make this work with the latest master and run format

* Respond to hensldm's review

* Respond to Elliptic's review

* Add Effect_GetPlayState to namefixer.py

* Add missed comma
2022-06-26 11:57:37 -04: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
Derek Hensley 37d3934e2c
Code_800E8EA0 Docs (#832)
* Start

* Add notes from OOT

* D_801D0D50 -> gDbgCamEnabled

* Rotation Functions

* Text function

* RotateBack -> RotateForward

* Flags functions

* Document rotation func returns

* Remove comment from play

* Rename play function, add notes about Flags, add notes about focus

* Update notes a little

* Update src/code/code_800E8EA0.c

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

* Fix apostrophes

* Bring over OoT changes

* TurnTo -> Track in SubS systesm

* format and remove OoT specific comment

* Remove old comments

* namefixer

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-06-20 01:16:30 +01:00
Tom Overton 6d371502e1
Actor effect cleanup (#828)
* Change "particle" to "effect" in most actors

* Undo accidental comment change

* Effect count defines

* Make struct names consistent

* Fix minislime

* Change particle to effect in Demo_Kankyo

* Some tiny things I missed
2022-06-20 01:11:47 +01:00