engineer124
03947a3ccb
Merge branch 'master' into voice
2022-07-24 09:43:24 +10:00
engineer124 and GitHub
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 and GitHub
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 and GitHub
6472f68323
Map Select: Docs and Cleanup ( #962 )
...
* Add Map Select Docs
* cleanup
* brackets
* Another typo
2022-07-23 15:30:19 -04:00
engineer124 and GitHub
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
fbb38416ca
ovl_En_Po_Sisters and object_po_sistersDocumented (#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
Derek Hensley and GitHub
63447c5649
General Cleanup 7 ( #944 )
...
* (f32*) cast
* fireobj
* BgKeikokuSaku h file newline
* dmchar07 flag defines
* EnKakasi h file comments
* ObjKibako2Contents
* ++ ^ 1
* func_80B4BA84
* EnBji01
* EnShn
* render modes
* D_80097F90
* xprintf
* WeatherTag
* Sram_InitDebugSave
* func_80C1DF18
* func_80183430
* ObjRaillift_Move
* DmChar00Struct
* format
* DmNb csAction
* Revert "EnKakasi h file comments"
This reverts commit a6b5f97826f4eb5140050c65cdc40cd142d5a573.
* title
2022-07-23 15:15:09 -04:00
engineer124 and GitHub
dfd00a8c1f
Match 3 functions ( #964 )
2022-07-23 15:09:55 -04:00
Chloe and GitHub
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 and GitHub
260be2c36b
Hex Cleanup ( #960 )
...
* Hex Cleanup
* PR Suggestions
2022-07-23 14:57:47 -04:00
Derek Hensley and GitHub
eff952b944
General Cleanup 8 ( #958 )
...
* EnBigokuta
* EnBji
* Soldiers
* Start harfgibud
* Finish harfgibud
* Pamela
* PametFrog
* format
* bigslime
* bji comment
* PR + small cleanup of Eye Tex anims
* Shikashi
2022-07-23 14:53:06 -04:00
Tom Overton and GitHub
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 and GitHub
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
Lucas and GitHub
3a1f3a04c0
ovl_En_Okarina_Tag OK (#953 )
...
* `ovl_En_Okarina_Tag` decompiled
* Suggested changes
* Minor changes
2022-07-23 14:31:24 -04:00
Tom Overton and GitHub
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 and GitHub
fba92d828a
Some minor cleanup involving stray fairies ( #949 )
...
* Some minor cleanup involving stray fairies
* Fix build
2022-07-23 14:17:35 -04:00
Tom Overton and GitHub
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 and GitHub
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
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
mzxrules
4ae7b95206
Merge remote-tracking branch 'upstream/master' into z_map_
2022-07-22 21:15:35 -04:00
Tom Overton and GitHub
aa87f0de89
Fix namefixer.py ( #972 )
...
* Fix namefixer.py
* Fix contributing link (I think)
2022-07-23 02:11:23 +01:00
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
dc950a93ea
fix bss
2022-07-23 00:52:17 +10:00
engineer124
b2a9c40b30
Merge branch 'master' into voice
2022-07-23 00:49:56 +10:00
engineer124 and GitHub
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
engineer124andGitHub
ChloeandGitHub
Tom OvertonandGitHub
LucasandGitHub
mzxrules
