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 and GitHub
5f6c3df4ce
Transition System Docs ( #883 )
...
* Transition docs from OoT
* Cleanup
* Missed a spot
2022-07-22 15:05:20 +01:00
engineer124 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
5c7f21f6d2
Effect Gfire Ok ( #941 )
...
* OK
* description
2022-07-22 06:02:55 +01:00
Derek Hensley and GitHub
64ea6665bd
Effect Gspk OK ( #939 )
...
* OK
* cleanup
* newline
2022-07-22 05:58:08 +01:00
Tom Overton and GitHub
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 and GitHub
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 and GitHub
d1d1bf8ec6
ovl_Dm_Char04 Decompiled ( #925 )
...
* all functions matching
* Data imported
* ovl_Dm_Char04 Decompiled
* ovl_Dm_Char04 Decompiled
* pr reviews
* number
* parenthesis
* renamings i forgot
* more renamings
* Elliptic number magic
* cast remove
* timer
2022-07-22 05:43:36 +01:00
Alejandro Asenjo and GitHub
a935cbc6ae
ovl_Obj_Ocarinalift Decompiled ( #920 )
...
* all functions matching
* data imported
* ovl_Obj_Ocarinalift Decompiled
* pr review
* params prefix
* Jenkins re-run
* pr review
* pr review
2022-07-22 05:27:02 +01:00
EllipticEllipsis and GitHub
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
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 and GitHub
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
mzxrules
bbdf16e7d4
func_80103A58 improvements, more OK
2022-07-19 13:08:16 -04:00
Derek Hensley and GitHub
6661b566a9
Effect Gripple ( #940 )
...
* OK
* description
* undef
* format
2022-07-19 12:32:00 -04:00
Tom OvertonandGitHub
mzxrules
engineer124
Alejandro AsenjoandGitHub
