Commit Graph

560 Commits

Author SHA1 Message Date
Derek Hensley 9a4319827b
General Cleanup 9 (#961)
* small z64animation cleanup

* z64

* actor

* bgcheck

* collisioncheck

* curve

* cutscene

* effect

* item

* light

* math

* player

* save

* save

* schedule

* skin

* transition

* Remove leading 0s from size = 0x10

* z64schedule enum

* PR

* enums
2022-08-07 19:43:58 -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
Maide d88aa7ebbe
En_Paper (#923)
* En_Paper

* PR
2022-08-07 18:47:00 -04:00
engineer124 29bf8142b9
Introduce Sfx Tables (#927)
* SfxTables

* Fix indexing

* fix voice text

* Rename with ordering

* Restore defines
2022-08-04 06:04:13 +01: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
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
engineer124 dfd00a8c1f
Match 3 functions (#964) 2022-07-23 15:09:55 -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
engineer124 260be2c36b
Hex Cleanup (#960)
* Hex Cleanup

* PR Suggestions
2022-07-23 14:57:47 -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
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
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
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
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 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
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
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
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
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 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
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
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
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
Derek Hensley 9682995b04
Controller Macros Update (#852)
* macros

* Format, I will remember 1 day
2022-06-20 00:57:23 +01:00
Derek Hensley d318b1f285
SubS Time Paths (Finale) (#823)
* 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

* Fix waypoint comments

* Review pt. 1

* Add clarifying comment to SubS_TimePathing_FillWeightArray

* format.sh

* Fix order comments

* weightArray -> knots

* Review pt 1

* Review pt 2

* Update src/code/z_sub_s.c

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

* Update src/code/z_sub_s.c

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

Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-20 00:49:20 +01:00
Alejandro Asenjo 67345d9be5
z_bg_astr_bombwall decompiled (#841)
* z_bg_astr_bombwall decompiled

* review fixes

* formatting

* pr review fixes

* PR review fixes

* PR review fixes

Co-authored-by: SonicDcer <noreply@github.com>
2022-06-19 23:28:48 +01:00
EllipticEllipsis 7ca70d496d
Change `Rand_Next` to `u32`, document `rand.c` a bit more (#819)
* Change Rand_Next to u32, document rand.c a bit more

* Clean up the quotes a bit, add another note

* Format

* — -> -

* Review

* Remove unnecessary casts

* Remove quote, reformat the comments

* Fix new files

* Make docs a bit more consistent and specific

* Format
2022-06-19 04:14:55 +01:00
Maide 56c517dc07
Obj_Toge (#815)
* Obj_Toge

* Wat

* One more thing

* PR

* PR

* a

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-06-19 03:45:09 +01:00
EllipticEllipsis af0123de1e
`z_fcurve_data` OK, match last function in `z_fcurve_data_skelanime`, document SkelCurve system (#776)
* Match SkelCurve_Update

Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>

* Match and document z_fcurve_data

* Begin documenting SkelCurve

* More documentation

* Deformat header

* Pluralise knotCount

* Sort out jointTable

* Rename frameCount

* Format

* More documentation

* Cleanup on DemoEffect

* Remove space on typedef

* Format, couple of fixes in the header

* Review

* Oops

* Fix EnBox, DemoTreLgt, use macros in EnTorch

Co-authored-by: Kelebek1 <34639600+Kelebek1@users.noreply.github.com>
2022-06-19 03:38:10 +01:00
Derek Hensley 9bf84176d4
Load OK (#792)
* Progress

* cleanup

* Fix comment

* progress

* OK

* Review pt1

* Update comments

* update comments some more

* Renamings

* Add headers and some parens cleanup

* Remove zelda64

* PR review

* bss

* Explain each relocation type a bit in the header comment

* Relocate_Addr macro

* Split off into z64load.h

* Adjust comment slightly based on OOT review

* OverlayRelocationType -> MIPSRelocationType

* Last bit of cleanup from OoT

* format

* Split off functions
2022-06-19 03:28:55 +01:00
Maide 98ba755751
En_Horse_Link_Child (#806)
* EnHorseLinkChild

* PR

* PR
2022-06-19 03:23:25 +01:00
Maide dd8221c798
En_Time_Tag (#810)
* En_Time_Tag

* BSS

* PR

* PR
2022-06-19 03:19:33 +01:00
Derek Hensley 271b7c7827
Gfxprint OK (#826)
* Match last two functions as well as some cleanup

* One more small cleanup

* Reviews

* format

* Move internal GFXP_FLAG defines to c file

* Format
2022-06-19 02:56:10 +01:00
Tom Overton d1b75e4c4b
VisMono OK and documented (#829)
* VisMono OK and documented

* Add some more parentheses

* Fix functions.h

* Respond to hansldm's review
2022-06-19 02:46:41 +01:00
mzxrules ec43a32c26
z_en_box.c, z_demo_tre_lgt.c OK, some object_box documentation (#703)
* All functions attempted, 2 NON_MATCHINGs

* z_en_box OK, more documentation

* format

* en_box cleanups, fix GI item table

* z_demo_tre_lgt OK

* format.sh

* pr suggestions 1

* object_box improvements

* Merge remote-tracking branch 'origin/master' into z_en_box

* Revert "Merge remote-tracking branch 'origin/master' into z_en_box"

This reverts commit 5aacdf26e4.

* more suggested changes

* fix comment
2022-06-18 10:33:59 -04:00
EllipticEllipsis 8049dec339
`sys_matrix` OK, documented, rename some other mathematics functions (#787)
* Import data and bss, add some name options

* Decomp rest of stack functions,
remove RSPMatrix,
split header

* sys_matrix OK (thanks Tharo)

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

* pragma weaks in sinf and cosf, change documentation
change mcros to use 0x8000

* Rename sinf and cosf

* Correct initialisation of sMtxFClear

* More minor cleanup

* Rename stack functions

* Matrix_InsertMatrix -> Matrix_Mult

* The big transpose rename

* Fix MirRay_DrawReflectedBeam

* Matrix_InsertTranslation -> Matrix_Translate

* Matrix_Insert.Rotation_s -> Matrix_Rotate$1S
+ RotateY -> RotateYS

* Matrix_Insert(.)Rotation_f -> Matrix_Rotate$1F

* Matrix_RotateStateAroundXAxis -> Matrix_RotateXFApply
Matrix_SetStateXRotation -> Matrix_RotateXFNew

* Matrix_MultiplyVector3fByState -> Matrix_MultVec3f

* Matrix_MultiplyVector3fXZByCurrentState -> Matrix_MultVec3fXZ

* Matrix_GetStateTranslation -> Matrix_MultZero

* Matrix_GetStateTranslationAndScaled(.) -> Matrix_MultVec$1

* Matrix_FromRSPMatrix -> Matrix_MtxToMtxF

* Matrix_MultiplyVector3fByMatrix -> Matrix_MultVec3fExt

* Matrix_TransposeXYZ -> Matrix_Transpose

* Matrix_ToRSPMatrix -> Matrix_MtxFToMtx

* Matrix_AppendToPolyOpaDisp -> Matrix_MtxFToNewMtx
and document the conversion functions

* Matrix_NormalizeXYZ -> Matrix_ReplaceRotation

* Matrix_InsertRotationAroundUnitVector_f -> Matrix_RotateAxisF and S

* Matrix_InsertRotation -> Matrix_RotateZYX

* Document the last functions

* Small cleanup

* Matrix_JointPosition -> Matrix_TranslateRotateZYX

* Matrix_SetStateRotationAndTranslation -> Matrix_SetTranslateRotateYXZ

* func_8018219C -> Matrix_MtxFToYXZRot

* func_801822C4 -> Matrix_MtxFToZYXRot

* Fix files

* Format

* Review 1

* Renames

* Fix warning in EnDragon

* Format

* Convert `mode` to an actual enum

* Add enums, typedefs, externs to sys_matrix header

* Review

* One more

* More review

* Fix function names

* Format

* Fix names

* Format

* Review

* engineer's review

* Fix build

* Format

* Fix again

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2022-05-25 23:24:39 -04:00
Derek Hensley e1477702ca
EffectSsKirakira OK (#801)
* OK

* cleanup

* KiraKira -> Kirakira
2022-05-25 22:23:27 -04:00
Isghj 12b995093f
`EnNwc` OK and three objects documented (`object_niw` and `object_nwc` and `object_hs`) and some Actor docs( `EnNiw` and `EnAttackNiw` and `EnHg`) (#715)
* EnNwc: OK and some Niw Docs

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Update src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* EnNwc: Overwrite->Override

* EnAttackNiw: fix merges

* AttackNiw and Niw: some docs

* formater pass

* EnNwc: fixed savecontext change

* Niw and Attackniw: more docs

* Apply suggestions from code review

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

* Nwc,Niw: requested doc changes

* Nwc: extracted and marked broken texture

* Apply suggestions from code review

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

* EnNwc: more requested changes

* Nwc: more requested changes

* Apply suggestions from code review

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

* EnHs: object_hs documented, some ovl_En_Hs docs

* EnHs: animation names

* EnHs: some text docs

* EnHs: fear anim changed to shivering now that we know it was used in OOT

* EnHs: more docs and format pass

* Apply suggestions from code review

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

* EnHs: more docs and updates to var name changes

* Niw,Nwc,Hs: added description to object files

* Hs: changed from playerOffset to offset

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-05-25 22:19:38 -04:00
Derek Hensley a6e90d144c
SubS models (#807)
* Bring model code over

* SubS_UpdateLimb

* SubS_TurnToPoint

* SubS_TurnToPointMultiTarget

* Adjust comment

* Another comment

* Review

* options as structs

* bss

* adj -> step, SubS_TurnToPointMultiTarget -> SubS_TurnToPointStep, various comment cleanups

* Fix SubS_TurnToPointStep header comment
2022-05-25 21:44:09 -04:00
engineer124 c2c7240634
Improve Various Matchings and Cleanup (#809)
* Improve various matchings and cleanup

* Fix warnings

* Missed 2

* Few hex to dec

* PR Suggestions

* More PR Suggestions

* Document time calculation

* Improved use of macros

* DAY_LENGTH macro

* More cleanup of functions

Co-authored-by: hensldm <https://github.com/hensldm>

* Missing a space

* PR Suggestions

* Use DAY_LENGTH more
2022-05-25 21:36:49 -04:00
Maide e227684d9b
En_Boom (#813)
* En_Boom

* Match (thanks Anon)

* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.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-05-25 21:04:10 -04:00
Rozelette e67fb5cf16
code_801323D0 (z_schedule) (#509)
* OK

* Initial documentation pass

* Pass 2. Add script by Tharo

* Renamed source file

* Documentation cleanup

* Update to latest master

* Feedback

* Bad merge

* Permissions

* Clang format

* Feedback

* format

* Use calculation instead of constant

* Rename as per suggestions

* Fix bss ordering and minor merge conflicts (from Maide)

* Update to current codebase and address feedback

* Fixup names to match new enums

* Format

* Fix duplicate include

* BSS shenanigans
2022-05-21 12:08:19 -04:00
EllipticEllipsis 31f0e19b57
Enable full IDO warnings (#781)
* Fix a lot of IDO warnings (and some Clang ones)

* Format

* Put FULL_DISASM=0 back

* Fix bss
2022-04-22 05:48:41 +01:00
Derek Hensley e50c346ab8
SubS Shadows, Cutscenes, Exchange, and Planes (#773)
* Bring code over

* Rename

* clean up variables.h

* Bring over some more code as well as cleanup

* remove newline in functions.h

* format

* Add plane functions

* Remove from actorfixer

* Add some more docs to plane functions

* Use temp for better format

* change func_8013E8F8 to return an s32

* rename origin back to pos

* format

* Add docs to SubS_ComputePlane

* format

* gfxContextPtr -> globalCtx

* bss

* Better docs of SubS_ComputePlane

* Normal -> unitVec

* Review pt. 1

* Update plane comment

* SubS_ActorAndPlayerAreFacing -> SubS_ActorAndPlayerFaceEachOther

* Add subs texture defines

* Update include/z64math.h

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

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-04-22 05:11:54 +01:00
Derek Hensley bfe22610f7
EffectSsStone1 Ok (#730)
* EffectSsStone1 OK

* gameplay object stuff

* unk_C -> reg0

* Fix

* Reverse order of stone textures

* undef syms
2022-04-17 19:35:13 +01:00
Derek Hensley f4bb821b56
EffectSsSbn OK (#751)
* Ok

* Cleanup and document

* File header description

* rename scroll related regs

* undef syms

* Cleanup for PR

* Move comment

* Add todo
2022-04-17 19:07:25 +01:00
Maide bbc6dd77ea
Obj_Nozoki (#704)
* Obj_Nozoki

* GID

* PR

* Merge

* PR
2022-04-17 11:08:16 -04:00
Maide afd3ae243d
En_Test6 (#627)
* En_Test6

* ArrCount

* Always forget params

* PR

* Move defs

* PR

* Fix

* PR

* Merge

* Merge

* PR

* Fix

* PR

* PR

* Fix bss

* Match (thanks Anon)

* bss

* PR

* Merge

* bss

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
2022-04-09 05:38:54 +01:00
Derek Hensley 06412c070f
Cleanup 3 (#778)
* lights

* D_801D88A0 -> gScarecrowSpawnSongPtr

* Misc fixes

* CHECK_FLAG_ALL

* Trailing commas in enums

* matches

* Remove todo from lights bss

* Update src/overlays/actors/ovl_En_In/z_en_in.c

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

* thisx -> this2

* fix

* Todos

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-04-07 20:39:11 +01:00
Tom Overton 50c5ab0fc7
En_Dragon (Deep Python) OK and documented. object_utubo documented (#771)
* EnDragon_Init OK

* func_80B5EDF0 OK

* func_80B5EAA0 OK

* EnDragon_Destroy OK

* EnDragon_Update OK

* func_80B60138 OK

* func_80B5EE3C OK

* func_80B5EF88 OK

* func_80B5F418 OK

* func_80B5ED90 OK

* func_80B5EB40 OK (commented out because data is not imported yet)

* Import data into C

* Uncomment func_80B5EB40

* func_80B5EFD0 OK

* func_80B5F3A4 OK

* func_80B5F888 OK

* func_80B5FCC0 OK

* Draw functions OK

* func_80B5FD68 OK

* func_80B5F508 OK

* func_80B5F8D8 OK

* Better match on func_80B5FD68

* Use generated reloc

* Remove undefined_syms for this actor

* Some minor cleanup

* Make the data like Anghelo said

* Document object_utubo

* Name a bunch of stuff

* Name some more stuff

* Some documentation around death

* Documentation for actions

* Name a bunch of junk

* Use regs instead of directly accessing gGameInfo

* Name the player position vars

* Update weekEventReg references

* Name and list out states

* Name timer

* Document extend stuff

* Finish documentation

* Respond to Anghelo's review

* Respond to hensldm's review

* The thing Anghelo suggested *actually* matches
2022-04-06 21:03:27 -04:00
EllipticEllipsis 15dfaf0862
ABI FPR names (#767)
* Add o32 to disassembler and update macro.inc

* Add a variable for asm processor to makefile
and improve objdump flags

* Update diff settings

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

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

* Remove * import and implement option

* Fix some stuff in the makefile

* Update asm-processor

* Review

* Fix old var name
2022-03-31 18:22:19 +01:00
Maide 7280d10404
En_Horse (2 non-matching) (#413)
* En_Horse

* a

* Warnings

* Warnigns 2

* PR

* Formats

* Fix

* PR

* Merge

* Merge

* Merge
2022-03-29 22:15:26 +01:00
Anghelo Carvajal 72bae2b6ba
`z_kaleido_setup` (#768)
* KaleidoSetup_Init

* func_800F4C0C

* func_800F4A10 NON_EQUIVALENT

* fixes

* func_800F4A10

* import data

* Rename Play_InCsMode

* Name KaleidoSetup_Update

* minor cleanup

* Update src/code/z_play.c

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

* Update src/overlays/actors/ovl_En_Bom/z_en_bom.c

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

* Update src/overlays/actors/ovl_En_Gs/z_en_gs.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/code/z_kaleido_setup.c

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

* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c

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

* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c

* unname D_801BDB00

* format

* a

* actorfixer

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2022-03-29 22:04:41 +01:00
Derek Hensley 486e7cbe83
SubS General Pathing Helpers (#760)
* Brought code over and cleanup

* cleanup functions.h and format

* add comment

* Whitespace

* Format

* Update src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c

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

* Format

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 21:37:58 +01:00
Maide f5ba6986f9
Obj_Pzlblock (#755)
* Obj_Pzlblock

* PR
2022-03-29 21:05:33 +01:00
Derek Hensley ec9909c65c
Boot_800862E0 OK (#769)
* boot_800862E0 OK

* Ran format.sh

* attempt at fixing bss reordering

* boot_800862E0 OK (for real this time)

* Run formatter

* Changes u32 pointers to uintptr_t and sizes to size_t

* Run formatter

* Fix bss reordering

* Delete baserom.mm.us.rev1.z64:Zone.Identifier

* Cleanup and some notes

* Try my best to document

* remove comments

* Remove D_80097508 from variables.h

Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 20:42:44 +01:00
Maide 72265fac92
Obj_Entotu (#745)
* Obj_Entotu

* Time macro

* PR

* Merge
2022-03-29 18:56:20 +01:00
Isghj cbffe83c9b
EnWarpTag OK (Warping pedestals in Goron Trial) (#747)
* EnWarpTag: OK

* Apply suggestions from code review

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

* WarpTag: move macros

* WarpTag: format

* WarpTag: fix save entrance index

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-29 18:21:36 +01:00
Anghelo Carvajal 78acaef73d
`ovl_Boss_03`: Gyorg OK (#736)
* Boss03_Init NON_EQUIVALENT

* rand functions

* Boss03_Draw

* match the limb draws

* Match Boss03_Init by Synray and Engineer

* A bit of cleanup

* a bunch of functions

* another bunch of functions

* func_809E299C and GyorgEffect

* import data

* A bit of cleanup

* effects related functions

* func_809E2DA0

* func_809E34B8 NON_EQUIVALENT

* func_809E3968 NON_EQUIVALENT

* func_809E3D98

* func_809E421C NON_EQUIVALENT

* func_809E475C

* func_809E497C

* func_809E4C90

* func_809E6640 NON_MATCHING

* func_809E6A38

* Match func_809E6640 by Tharo

* func_809E7D00

* func_809E8810

* func_809E4E80 NON_EQUIVALENT

* func_809E5B64

* func_809E6CB4

* Boss03_Update NON_EQUIVALENT

* func_809E81E4 attempt

* Boss03_Update improvement thanks to Petrie

* func_809E81E4 NON_MATCHING

* func_809E34B8 is at least equivalent

* cleanups

* format

* import bss

* more cleanup and minor renames

* Match func_809E81E4

* cleanup effect functions

* a few more renames

* func_809E4E80 matched by Maide

* documentation pass

* name workTimer

* macros

* More renames

* Improve func_809E34B8 a bit and match Boss03_ChewPlayer

* defines placeholders for work timer, enum for effects and other minor renames

* actorfixer

* some cleanups

* effects named

* Some more renames and cleanups

* more cleanups

* Boss03_UpdateCollision, Boss03_SeaweedUpdate and Boss03_SeaweedDraw

* Rename more actionfuncs

* cleanup undefined syms

* collision stuff and run formatter

* more cleanups

* more cleanups i forgot to commit

* and yet more clenaup

* Add notes

* Remove debugging stuff

* format

* Match the last 3 functions by Anon58

* bit of cleaning

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* PR

* format

* Remove some if (1) from Boss03_IntroCutscene

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.h

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* PR

* address pr

* prevent_bss_reordering

* Anon review

* seaweed stuff thanks to elliptic

* format

* whoops

* huh

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* address PR

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Address PR

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

* Sectioning

* whoops

* a

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

* a

* kinda

* ,

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* Update src/overlays/actors/ovl_Boss_03/z_boss_03.c

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

* remove redundant comment

* actorfixer

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-03-29 17:41:44 +01:00
Maide 348e87083b
Bg_Breakwall (#733)
* Bg_Breakwall

* PR and match (thanks petrie)

* PR

* Merge
2022-03-29 17:11:08 +01:00
Maide 1ff183bc05
En_Test7 (#628)
* En_Test7

* Clean some stuff

* I hate BSS

* PR

* Fix

* Merge

* Fix

* Match (thanks Anon)

* PR

* PR

* PR

* Fix
2022-03-28 21:25:08 -04:00
Anghelo Carvajal b08880f7a7
`z_sram_NES` with 2 NON_MATCHINGs and 1 NON_EQUIVALENTs (#531)
* Rename Sram_InitDebugSave

* Sram_InitDebugSave

* err

* Sram_IncrementDay

* non_matchings

* func_80146F5C and protos

* func_80146EE8

* func_80145698

* func_80143A54

* Split SaveContext

* problems with bss

* Fix bss

* more

* a small bunch

* Fix warnings

* almost everything

* two attempts

* at least compiles

* import data

* bss

* format

* stuff?

* Progress?

* More progress

* clean up data a little

* More progress

* disaster

* re split data

* A bit less of a disaster

* Fix renamed stuff

* data stuff

* fix conflicts

* format

* CycleSceneFlags

* some enums

* cleanup

* Fix merge issues

* format

* some changes

* format

* Lots of progress on z_sram_NES, but no matches yet

* SaveContent Documentation

* Oops

* Oops2

* Document more SaveContext

* Oops, don't need that anymore

* add small comment

* Another comment

* dekuPlaygroundPlayerName

* Fix merge issues

* format

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* remove magic number

* format

* fix merge issues

* bss

* format

* macro cleanup

* review

* merge issues

* review

* cleanup

* UNK_TYPE1

* Fix

* Remove comment

* small change

* conflicts

* review

* fix

* fixes

* format

* Update actorCtx renames part

* Match func_80143B0C thanks to Petrie and Anon

* minor cleaning pass

* format

* cleanup

* more minor cleanups

* Macros for accessing gSaveContext.save.stolenItems

* Introduce STOLEN_ITEM_NONE and remove CLEAR_STOLEN_ITEM_

* format

* Update include/macros.h

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* @hensldm review

* Update include/functions.h

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

* Update include/functions.h

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

* Rename QUEST_SONG_NEW_WAVE

* Add scene name comments to D_801C5FC0

* rename horseData.yaw

* Update include/functions.h

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* Update src/code/z_sram_NES.c

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

* // = CUR_UPG_VALUE(UPG_WALLET);

* run actorfixer and format

* fix bss

* Fix merge problems and run format

* Some improvements to func_801457CC by anon

* bss

* format

* run actorfixer

* actorfixer, bss and format

* Use original names for the RESPAWN_MODE enum because the current ones are bad

* QUEST_SONG_BOSSA_NOVA

* some minor fixes on the SaveContext struct according to the debug rom

* Merge Inventory.items and Inventory.masks

* a

* simplify saveBuf accesses

* A few func renames

* actorfixer

* bss

* fixes

* bss

* actorfixer

* actorfixer and format

* actorfixer

* whoops

* whops

* bss

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-03-27 12:37:02 -03:00
Andzura 4f3202fd7e
z_message progress (#701)
* 8 functions matching, 1 non-matching, 45 untouched

* match func_801518B0

* match func_8014CC14

* matching 8 func, 1 non-matching

* matched func_80148CBC

* matched func_80156758

* matched func_80147564

* matched func_80151BB4

* matched func80152EC0/Message_Spawn_Song_Effect

* matched func_80151C9C

* WIP func_80148B98

* WIP func_80151938

* matched func_80151938

* matched func_80148B98

* matched func_80147734

* matched func_80147624

* WIP func_8014EBC

* match func_801518B0

* matched func_80147564

* matched func80152EC0/Message_Spawn_Song_Effect

* matched func_80151C9C

* WIP func_80148B98

* matched func_80151938

* matched func_80148B98

* matched func_80147734

* matched func_80147624

* WIP#2 func_8014EBC

* matched func_80149EBC

* WIP func_8014CCB4

* matched func_8014CCB4

* matched func_80151A68

* WIP func_8014D62C

* fix func_8015A68 signature

* z_message_nes & z_message_staff progress

* z_message_nes & z_message_staff renaming

* documenting z_message

* cleaning & renaming

* documenting MessageContext

* matched func_80151A68

* format

* naming convention fix

* re-add func_80147564

* apply renaming of Message_ShouldAdvanceSilent on the whole project

* re-format, add clang-format off/on in z_message.c needed for matching

* rename staff => credits; add renames in actorfixer.

* change rupees array to ascii

* remove useless comments

* change MessageContext.decodedBuffer to a union

* remove decodedBuffer from actorfixer

* applied AngheloAlf suggestions & ran sfxconvert on z_message.c

* rename message_struct => message_data_static; revert decodedBuffer as union creating differences.

* use true/false instead of 1/0

* use SET_FULLSCREEN_VIEWPORT macro in func_80152c64

* AngheloAlf suggestions.

* extract assign from dayTime calculation for readability in Message_LoadTimeNES

* remove bss_reordering from osFlash, idle & boot_main to typedef MessageTableEntry in message_data_static & make decodedBuffer an union.

* remove useless casts

* Changes hexa to ascii chars when it's meaningful;
add comments to func_8014CCB4 to show what hexa constant means.

* Hensldm suggestions

* ran actorfixer on new changes; fix new bss reordering error introduced with rebase

* use new TIME_TO_MINUTES_F macro

* re-ran format.sh

* hensldm suggestions #2 + overall cleaning

* remove useless parenthesis

* Update include/message_data_static.h

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

* actorfixer and format

* more fixes

Co-authored-by: Andzura <andzura@andzura.fr>
Co-authored-by: abaud <adrien.baud@inria.fr>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2022-03-27 12:09:47 -03:00
engineer124 02cb971616
En_Gakufu OK and Documented + Related Audio Functions (#662)
* Gakufu OK, copy progress from audio WIP

* Extraction

* import wip in prep for audio data import

* Add in `code_8019AF00.c` functions

* Finish docs

* Spacing

* Add enum

* Many PR suggestions

* Another enum

* PR Suggestions

* Fix bss

* Move comment higher

* Fix bss

Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 11:52:43 -03:00
louist103 928acac500
Bombers2 OK (#721)
* OK

* OK

* cleanups

* restore makefile

* format

* format

* format

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h

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

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h

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

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c

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

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c

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

* Update src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c

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

* Update src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c

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

* Update object_cs.xml

* fixes

* format

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2022-03-27 11:47:34 -03:00
engineer124 f1d1173558
River_Sound OK and Documented + River_Sound Related `z_actor`/`Audio` Functions (#661)
* First pass of `func_800BCCDC`

* river_sound OK (copy progress from audio WIP)

* Copy progress from `code_8019AF00.c` (still waiting for data to be imported)

* More docs

* feedback

* Add in `code_8019AF00.c` functions

* format

* params

* Minor cleanup

* Small fix

* one more

* Better names

* Add comment, cleanup Idx

* Fix bss

* Fix BSS
2022-03-27 11:42:19 -03:00
Tom Overton acd84bda77
En_Bb (Blue Bubble) OK and documented. object_bb documented (#713)
* EnBb_Init OK

* EnBb_Destroy OK

* func_808C20D4 OK

* func_808C2238 OK

* func_808C1FF4 OK

* func_808C1E94 OK

* func_808C2344 OK

* func_808C23EC OK

* EnBb_Update OK

* func_808C2E34 OK

* func_808C254C OK

* func_808C272C OK

* func_808C2B94 OK

* func_808C2A00 OK

* func_808C1F00 OK

* func_808C1F74 OK

* func_808C25E0 OK

* func_808C28CC OK

* func_808C2B1C OK

* func_808C2BD0 OK

* func_808C2C38 OK

* func_808C2CB4 OK

* func_808C2CF0 OK

* func_808C2D78 OK

* EnBb_Draw OK

* func_808C32EC OK

* func_808C3324 OK

* Migrate data to C

* Use generated reloc

* Object symbols and misc cleanup

* Name struct vars that are used with Actor_DrawDamageEffects

* Name most things in the object

* Name attackRange

* Good enough names for limbs for now

* Might as well name the limb draw stuff for now

* Name flame width/height

* Enum for damage effects

* Name some more stuff from OoT

* Name a lot more stuff

* First pass names on all functions

* Name jinxTimer on gSaveContext

* Name sLimbIndexToLimbPos

* First pass name to the rest of the limb draw system

* More cleanup

* Last cleanup before PR

* Incorporate Actor_DrawDamageEffect stuff

* Respond to hensldm's review
2022-03-26 02:57:18 +00:00
Derek Hensley 9a41b76f35
SubS ActorPathing (#689)
* Bring code over

* Clean up

* Renames

* Cleanup

* Split SubS stuff from z64 into z64subs

* newline

* Bss

* Name callbacks

* bss

* bss
2022-03-26 02:43:14 +00:00
Maide 10995051e0
En_Tanron5 (#653)
* En_Tanron5

* Stuff

* PR

* Fix

* Use x/z instead of x/y

* BSS

* Merge

* bss
2022-03-26 01:19:14 +00:00
Nick ce7aa87454
Oceff wipe6 (#686)
* Uncorrupted; Not OK

* Merged upstream -- actually OK

* Update assets/xml/overlays/ovl_Oceff_Wipe6.xml

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

* - Removed Extra 0 characters; clang-format-11

* Removed new warnings.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-24 23:45:37 -03:00
fig02 80cbdb956d
En_Tanron4 OK (seagulls) (#714)
* Seagull OK

* small fixes

* review 1

* review 2
2022-03-24 23:39:34 -03:00
Maide 5684b342b6
En_Vm (#678)
* En_Vm

* Hidden funcs >:

* PR

* PR
2022-03-24 22:55:58 -03:00
Maide 0fbbde8d7d
Demo_Syoten (#672)
* Demo_Syoten

* Fix build, use UNK_PTR

* Use Vtx

* Keyframe stuff

* PR

* BSS

* PR

* Fix fix
2022-03-24 22:41:04 -03:00
Maide f87c8290c8
En_Tsn (#651)
* En_Tsn

* PR

* PR

* Merge
2022-03-24 22:05:40 -03:00
engineer124 e77a22e8a9
Audio_Heap OK and Documented (#621)
* copy audio_heap progress from main branch

* Add filter bugs

* PR Review + Docs

* format

* typo

* Improve audio buffer notes

* Add documentation

* PR Feedback

* PR Suggestions

* Fix bss

* PR Suggestions

* PR typo

* Fix warning
2022-03-23 23:40:31 -04:00
engineer124 b852a9a930
Audio_Load OK and Documented (#620)
* Copy audio_load progress from main branch

* Fix warning

* fix UB

* cleanup WIP

* Add docs, bss still broken

* bss fix

* bytesRemaining with size_t

* PR Suggestions

* PR Suggestions

* Fix bss

* Fix bss

* PR Suggestions
2022-03-23 21:22:13 -04:00
Anghelo Carvajal 92c4d42f44
`z_skin` and `z_skin_awb` OK and documented a bit (#415)
* oot copypaste

* func_8013859C non matching and func_80138700

* protos

* the other functions

* func_80138300

* progress

* func_80137F58

* func_80137EBC

* func_80137B34 NON_MATCHING

* func_80137970

* func_8013835C

* z64skin

* some docs

* some bits

* Match func_80137B34

* Match Skin_DrawImpl

* Match Skin_Init tahnks to Anon

* Some docs?

* AnimatedLimb

* SkinVtx

* more names

* fix merge issue

* format

* another clean

* trailing comma

* cleanup

* format

* add some descriptions

* Import bss

* last cleanup

* Update ZAPD symbol map

* Reanme gIdentityMtx and gIdentityMtxF

* fix merge issues

* bss

* review

* Update include/z64skin.h

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

* bss

* Port @fig02 skin docs

* format and a few changes

* format

* Port over OoT review

* fixes

* Engineer's review

* format

* address pr

* Fix bss

* fix bss

* Update src/code/z_skin_awb.c

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

* bss

* bss

* undo

* pr

* Skin_Setup

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-03-23 17:30:34 -04:00
Derek Hensley d36b0d506d
Misc NON_MATCHINGS/NON_EQUIVALENTS (#696)
* Match the rest in fireObj

* Fix FireObjLightParams struct

* Fix up bomjima

* Match ObjSnowball

* 2 functions in EnGoroiwa

* Rename randMultiplier

* Minor cleanup

* More cleanup

* Boss02 Ok

* Match Boss06_Draw

* format

* bss

* Remove static from osFlash bss

* PR suggestions

* Remove LightInfoPositional

* 0x4000

* Format

* Cleanup

* Fix bombjima data

* Boss02 newline

* PR stuff

* Change func_8012CF0C to NON_EQUIVALENT

* Matched func_8012CF0C by AngheloAlf

* RSPMatrix -> Mtx

* Bubbles fix
2022-03-09 22:02:27 -03:00
engineer124 fe32df0e82
Document `Actor_DrawDamageEffects` (#645)
* Being documenting `Actor_DrawDamageEffects` and apply to actors

* More doc progress

* Small cleanup

* Document display lists

* more cleanup

* Fix Typo

* PR Review

* Shock -> Spark

* Missed one

* Missed another

* Fix dust textures

* Remove `_tex` from `light_orb_tex` (so that it matches convention)

* electric stun -> electric spark

* Fix mistake

* Fix float

* spark -> sparks where applicable

* Missed even more shocks...

* Name `drawDmgEffTimer` for consistency

* Fix BSS
2022-03-09 20:37:27 -03:00
Maide 040db7ac40
En_Mm3 (#671)
* En_Mm3

* PR

* Merge
2022-03-05 12:57:38 -03:00