fig02
33391c0a5b
Name Remaining Hookshot Actor Flags ( #2306 )
...
* name remaining hookshot flags
* tweak comments
* period
2024-11-23 23:19:27 -05:00
cadmic
bccb219ea3
Fix typos found by codespell ( #2229 )
2024-09-26 00:21:00 -04:00
fig02
05b908d0eb
Document autoLockOnActor ( #2212 )
...
* document autoLockOnActor
* format.py
* backtick
* grammar
* comment adjustments
* word
* letter
2024-09-21 14:49:45 -04:00
fig02
cc0b1bb127
PLAYER_STATE1_DEAD (#2204 )
...
* PLAYER_STATE1_DEAD
* change comment
* format
2024-09-17 08:21:47 -04:00
Dragorn421
48780cd2b1
Colliders: elemType -> elemMaterial ( #2189 )
...
* elemType -> elemMaterial
* format
2024-09-16 18:11:01 -04:00
Dragorn421
f193311013
Colliders: colType -> colMaterial ( #2186 )
...
* colType -> colMaterial
* fixups
2024-09-11 21:18:46 -04:00
fig02
2056ae5f1a
Document Attention/Lock-on Related Actor Flags ( #2161 )
...
* document actor flags 0, 2, 3, and 27
* format
* fly -> hover
* wodring
2024-09-07 17:53:48 -04:00
fig02
88c4475967
Target -> Attention (System Rename) ( #2149 )
...
* TargetContext -> Attention
* targetCtx -> attention
* Target_ -> Attention_
* FindTargetableActor -> FindActor
* targetableActorP -> attentionActorP
* data vars (and 1 function I missed)
* targetMode -> attentionRangeType
* attention range enum comments
* ATTENTION_RANGE_
* attention range data
* TargetColor -> AttentionColor
* missed one
* fixup color variables
* targetArrowOffset -> lockOnArrowOffset
* focus pos comment
* targetPriority -> attentionPriority
* assets
* loose-ends
* Attention System Description
* format
* skj range type
* enemy bgm
2024-09-07 09:23:04 -04:00
fig02
dbb059c6a7
Target Mode Enum [Target Docs 7/?] ( #2133 )
...
* TargetMode Enum
* format
* add default comment
* bss
* bss 2
* fix bss 3
2024-09-04 23:46:03 -04:00
Tharo
eaf955ad22
Generic actor params getters ( #1359 )
...
* Initial PARAMS_GET macros
* NOSHIFT macro
* Use number of bits rather than raw mask values
* Add descriptions for each generic macro
* Reformat
* Adjust comment
* format
* edit en_door macro names
* edit redead macro name
* edit bdan switch macro name, and remove unneeded comments in go2
* mizushutter macro names
* remove PARAMS_GET_S, rework ishi switch flag handling
* actually remove PARAMS_GET_S
* remove PARAMS_GET2_S
* PARAMS_GET_U and PARAMS_GET_S
* format
* fix merge
* format
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-08-14 21:29:43 +02:00
cadmic
e6bc4bd8cb
Add names to all typedef'd structs, unions, and enums ( #2028 )
...
* Add names to all typedef'd structs, unions, and enums
* wtf vs code
* Use a better regex
2024-08-12 03:07:48 -04:00
cadmic
9eec8af498
Add "do {} while (0);" to CLOSE_DISPS ( #2025 )
2024-08-10 18:48:27 -04:00
fig02
078e21f6c6
InitVars -> Profile (#2011 )
...
* rename ActorInit
* rename actorInit
* rename initInfo
* EffectSs Profile
* _InitVars -> _Profile
* format, loose ends
* revert tutorial
2024-08-02 17:50:02 -04:00
Dragorn421
68a86d2d00
Colliders: change "touch, bump" to AT and AC (elems) ( #1637 )
...
* toucherFlags, bumperFlags -> atElemFlags, acElemFlags
* TOUCH_ -> ATELEM_
* BUMP_ -> ACELEM_
* ColliderElementTouch,Bump -> ColliderElementDamageInfoAT,AC
* toucher,bumper -> atDmgInfo,acDmgInfo
* Update docs and zcolchk funcs names
* run formatter
* remove the last mentions of "bump" for colliders
* Update renamed functions in disasm
2024-03-04 19:33:08 -05:00
cadmic
c86bf5011b
Match entity actors O-T ( #1826 )
2024-02-26 21:39:44 -05:00
Dragorn421
4982f32384
Name actor flags 1: ACTOR_FLAG_REACT_TO_LENS, ACTOR_FLAG_IGNORE_POINT_LIGHTS ( #1583 )
...
* 7 -> `ACTOR_FLAG_REACT_TO_LENS`
* move comment above actor flag
* 22 -> `ACTOR_FLAG_IGNORE_POINT_LIGHTS`
* newlines between flags
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 10:48:54 -05:00
Dragorn421
1a8772e540
Cleanup z_collision_check 1 ( #1427 )
...
* Cleanup `z_collision_check.c` and structs
* Revert `other*` names to master, split to other pr
* WIP/experimental: `ColliderCylinderElement`
* Revert "WIP/experimental: `ColliderCylinderElement`"
This reverts commit cfc8c32ace
2024-01-11 10:30:47 -05:00
Dragorn421
8718a5c8c0
Remove (ActorFunc) casts in initvars ( #1571 )
...
* Remove `(ActorFunc)` casts in initvars, use `/**/` trick for format
Achieved by using the following regex:
(ActorInit.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*\n\};)
replaced with
$1$2/**/ $3$4/**/ $5$6/**/ $7$8/**/ $9$10/**/ $11$12/**/ $13$14/**/ $15$16/**/ $17$18/**/ $19
plus a change from /**/ to #if 0 #endif in docs/
* Manual fixes
2023-10-30 10:19:16 -04:00
fig02
e37b993483
Name movement related functions in z_actor ( #1476 )
...
* rename functions
* dragorns name suggestions
* Revert "dragorns name suggestions"
This reverts commit dd4626ce5e
2022-12-30 13:55:14 -05:00
fig02
92e03cf747
speedXZ -> speed ( #1477 )
...
* speedXZ -> speed
* +=
* revert arg in player function
* anon review
* engineer review
* forgot one
* last review
* revert decimal
2022-12-24 12:18:57 -05:00
engineer124
be22b836f6
Name Actor_PlaySfx and Player_PlaySfx ( #1469 )
...
* name two main actor sfx functions
* adjust comments
* fix double s in player
* fix commas
2022-12-18 23:18:21 -05:00
Anghelo Carvajal
c420885513
z_actor documentation pass (#1445 )
...
* Actor_Offer* and Actor_SetClosestSecretDistance
* color filter stuff
* KillAll
* format
* comment
* Update src/code/z_actor.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* review
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* format
* COLORFILTER_INTENSITY_FLAG
* Remove -
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* yeet COLORFILTER_GET_XLUFLAG
* bug
* frug
* Undo Actor_KillAllFromUnloadedRooms
* update Actor_OfferGetItem comment
* Update Actor_OfferGetItem description
* diving
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2022-12-12 21:23:14 -05:00
Dragorn421
c0a0688dc5
Remove const from ActorInit initvars declarations ( #1417 )
2022-10-24 19:29:38 -04:00
Roman971
2f4c25da53
Fix many missing NULLs ( #1389 )
...
* Fix many missing NULLs
* Fix a raw actor id in en_horse
2022-10-04 01:18:50 -04:00
Tharo
4f65d08eb5
Rumble doc ( #1375 )
...
* Rumble doc
* Fixes, suggested changes
* Improve padmgr retrace callback related code
* Name some rumble-adjacent things, further suggested changes
* Further suggested changes
* Suggested changes
2022-09-27 12:40:26 -04:00
engineer124
1d19f37b26
Rename "Sound" to "Sfx" ( #1292 )
...
* First attempt
* More
* rename
* more sound -> sfx / sound effect (#7 )
* PR Suggestions
* PR Suggestions
* Small fix
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2022-07-30 09:05:27 -04:00
Dragorn421
2f07874a5f
Remove BINANG_SUB ( #1297 )
2022-07-12 12:17:07 -04:00
Roman971
b0bfa9eb69
Fix asset file includes to always start with assets/ ( #1260 )
...
* Fix asset includes to consistently start with assets/
* Fix header paths in asset xmls to start with assets/
* Remove -Iassets from compiler options
2022-06-06 15:37:25 -04:00
Dragorn421
1a41694d58
Add enum for setup dls and name z_rcp.c functions ( #1196 )
...
* Introduce `SetupDL` enum
* wip
* wip
* Remove comments on each setupdl index
* Name setup dl functions by setupdl index
* `Gfx_SetupDl` -> `Gfx_SetupDL`
* Run formatter
* globalctx -> play
* fix regressions
* `Gfx_SetupDL` -> `Gfx_SetupDL_` (add separating underscore)
* `CallSetupDL` -> `SetupDL`
2022-06-03 18:25:48 -04:00
Tharo
451b24f79b
Fix a number of warnings when compiling with GCC ( #1239 )
...
* Silence a number of GCC warnings
* Remove
* Suggested changes
* Format
* Fix comment in en_go2
2022-06-03 18:51:23 +02:00
fig02
2e6279bc8e
PlayState Rename ( #1231 )
...
* global context -> play
* fix PlayState* PlayState
2022-05-21 14:23:43 -04:00
Tom Overton
74bed3ec9b
Document En_Rd ( #1179 )
...
* Port a ton of stuff from MM
* Damage effect enum
* Enum for type
* Enum for action
* Limb enum
* Match MM styling as much as possible
* Divide object into sections
* Document values in EnRdDamageEffect
* Respond to Dragorn's review
* Apply Dragorn's suggestion for the union
* Respond to Dragorn's second review
* Move all actions away from -ing
* Fix typos
* Respond to Fig and Roman's reviews
* Fix build error, whoops
* Bring back // fallthrough
2022-05-07 16:43:01 +02:00
Dragorn421
ca77b26c90
Fix misc 11 ( #1209 )
...
* Pass boolean for `freezeFlag` to `Actor_SetDropFlag`
* Use `else if`s in `func_80835F44`
* Cleanup `transitionCtx` usage of instance data
* `TransitionContext.setEnvColor` -> `TransitionContext.setUnkColor`
* Fixup one comment
* linebreaks (#1 )
* Run formatter
Co-authored-by: fig02 <fig02srl@gmail.com>
2022-05-04 21:25:26 +02:00
playerskel
32e66c2da8
document most navi enemies as enum type ( #1110 )
...
* document most navi enemies as enum type
* enum value auto increments, add enemy default for 0
* also define and comment navi enemy tektite blue
* Update include/z64actor.h
Co-authored-by: mzxrules <mzxrules@gmail.com>
* Update include/z64actor.h
Co-authored-by: mzxrules <mzxrules@gmail.com>
* Update include/z64actor.h
Co-authored-by: mzxrules <mzxrules@gmail.com>
* Update include/z64actor.h
Co-authored-by: mzxrules <mzxrules@gmail.com>
* Update include/z64actor.h
Co-authored-by: mzxrules <mzxrules@gmail.com>
* Update include/z64actor.h
Co-authored-by: mzxrules <mzxrules@gmail.com>
* apply navi enemy updates accepted so far
* update names
* review
* review
* freezzard -> freezard
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2022-04-18 18:23:12 -04:00
Dragorn421
b9cc31dc74
Defines for flags passed to Actor_UpdateBgCheckInfo ( #1127 )
...
* Tool-assisted flags for `Actor_UpdateBgCheckInfo`
* Manual flags separation
* Run formatter
* Light doc on the flags
* `UPDBGCHECKINFOFLAG_` -> `UPDBGCHECKINFO_FLAG_` (what an improvement!)
* Run formatter
* Run formatter
2022-02-20 18:41:55 -05:00
Dragorn421
67f294774b
Defines for Actor#bgCheckFlags ( #1126 )
...
* First pass, tool assisted bgCheckFlags
* Few manual bgCheckFlags
* Run formatter
* Remove fake bgCheckFlags 10-15
* Move existing documentation to the defines
* Comment on `bgCheckFlags` and rephrase some doc
* Name obvious flags, and some cleanup
* Comment on flag 9 being wall-interaction-related (thanks engineer and fig)
* Run formatter
* `BGCHECKFLAG_7` -> `BGCHECKFLAG_GROUND_STRICT`
* Touch up water-related bgcheckflags doc
* `BGCHECKFLAG_9` -> `BGCHECKFLAG_PLAYER_WALL_INTERACT`
2022-02-18 21:16:19 -05:00
EllipticEllipsis
eadc477187
New relocation-generating program ( #1016 )
...
* Update makefiles
* git subrepo clone git@github.com:EllipticEllipsis/fado.git tools/fado
subrepo:
subdir: "tools/fado"
merged: "46c4d751a"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "46c4d751a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/fado
subrepo:
subdir: "tools/fado"
merged: "88114ebce"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "88114ebce"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* A few ideas for computing dependencies
* Remove reserved identifiers from spec.h and util.h
and add required headers
* Fix a couple more headers
* Program for reloc prerequisites
* git subrepo pull tools/fado
subrepo:
subdir: "tools/fado"
merged: "36a905f72"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "36a905f72"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Update makefile to make dependency files and use overlay's name
* git subrepo pull tools/fado
subrepo:
subdir: "tools/fado"
merged: "43c339a59"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "43c339a59"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Change awk to grep, delete ZAPD files, gitignore elf
* Delete all the cfg files
* Fix memory leaks
* Rename and add coloured errors
* Makefile tweaks
- preprocess spec before grep
- split order prerequisites via phony target to reduce dependency edges
- remove `resources` target
- remove separate overlays targets
- use `$(SPEC)` throughout
- change to using filenames of relocs for overlay names via `$*`
- Rearrange targets to better reflect their categories
* Update gitignore
* Review
* Add a check for the reloc file name
* get_segment_by_name
* get_stmt_id_by_stmt_name
* Cleaning up
* algorithm change
* function rename
* Fix typos
Co-authored-by: angie <angheloalf95@gmail.com>
2022-02-06 14:40:26 -05:00
Dragorn421
6479913daa
Defines for player state flags ( #1081 )
...
* script-assisted player state flags
* Run formatter
* manually convert state flags in `D_80116068`
* `PLAYER_STATE_FLAG_` -> `PLAYER_STATE`
* Run formatter
2022-01-17 19:04:07 -05:00
Dragorn421
a9284494f2
Use defines for actor flags ( #873 )
...
* Add ACTOR_FLAG_ defines
* Add ACTOR_FLAGS_ALL macro and use ACTOR_FLAG_* constants everywhere
* Remove unused ACTOR_FLAG_* constants
* actor flags in bigokuta & ko
* actor flags in obj_mure
* actor flags in stalfos, twinrova & ganon2
* actor flags in morpha & barinade
* name some previously missed actor flags
* found some comments using hex for actor flags
* Actor flags in ovl_En_Ganon_Mant
* Actor flags in EnWf
* Flags in en_zf
* Actor flags in BossGanon (FeelsOKMan)
* Remove `ACTOR_FLAG_NONE`
* Wrap expansion of `FLAGS` in parentheses
* `ACTOR_FLAGS_ALL` -> `CHECK_FLAG_ALL`
* Move `CHECK_FLAG_ALL` to `macros.h`
* Run formatter
2021-12-05 19:11:38 -05:00
fig02
e635e34265
Remove THIS macro ( #1047 )
...
* remove THIS
* fix
* forgot dorf
2021-12-04 11:33:00 -05:00
petrie911
e51f50f0ff
Decompile z_kankyo ( #956 )
...
* working
* start color switch
* progress
* progress
* progress on bgm func
* progress
* game over matched (except the rodata meme)
* start update
* progress
* lightning docs done
* progress
* progress
* progress
* progress
* progress
* can compile at least
* suns state, progress on kankyo_update
* some new names
* progress
* progress
* progress
* new functions
* cleanup
* more matches
* another match
* now functional
* format
* better match
* hugely improved update
* cleanup/review
* remove old changes
* review2
* review3
* missed one
* review4
* change asm filenames
* update doorwarp1
* review5
* Kankyo_ -> Environment_
* format
* merge master and format functions.h
Co-authored-by: Jacob Young <jacobly0@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-09-20 12:51:35 -04:00
louist103
e3f1ccd902
Fix all headers to comply with C standard ( #957 )
...
* Fix all headers to comply with C standard
* fix a file in libultra
* Update include/stdbool.h
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update stdbool.h
* Update z64animation.h
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-09-15 19:24:19 -04:00
Roman971
15c3a5eb91
Remove InitVars declarations from actor headers ( #939 )
...
* Remove InitVars declarations from actor headers
* Remove unused files in ovl_En_Ms
2021-09-01 15:03:52 -04:00
engineer124
1117783731
Macros: PLAYER -> GET_PLAYER(globalCtx), ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx) ( #921 )
...
* PLAYER -> GET_PLAYER(globalCtx)
* ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx)
* PR Suggestions
* formatter
* Add brackets
* remove from actorfixer.py
* Bring back actorfixer.py change
2021-08-31 12:22:03 +02:00
Dragorn421
5e071a014d
Symbol cleanup ( #897 )
...
* symbol cleanup
* run formatter
* run formatter
* remove duplicate z_demo_ik symbols
* run formatter
2021-08-22 11:52:02 -04:00
louist103
556cdad7eb
Big cleanup ( #775 )
...
* Adult and child2 macros OK
* ICHAIN cleanup
* almost all overlay data
* format.sh
* func_8002FBAC NON_EQUIVALENT
* PR fixes (MZXrules)
* fix
* change //@ bug to //! @bug
* merge master and missed a //@bug
* fix ruto
* some more cleanup (#2 )
* more `! @bug` formatting cleanup
* parenthesis cleanup
* hex naviEnemyId
* run formatter
* replace `IS_NOT_` macros with `!IS_`
* run formatter
* run formatter
* PR fixes (fig)
* Missed something
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-08-22 01:12:57 +02:00
fig02
0a35c752e7
Some actor.c docs (in preparation for en_test) ( #820 )
...
* renames
* format
* format functions.h
* clean
* arg name
* remove asm
2021-06-22 08:51:04 +09:00
fig02
982c645167
Armos and object_am OK ( #652 )
...
* started
* all but 2
* OK
* docs progress
* lots of docs
* add gitkeep back
* all funcs named
* small fix
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0305ec2c2"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "0305ec2c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* object_am
* change
* ready i think
* last thing
* asm
* progress
2021-02-15 19:41:55 +01:00
petrie911
7c6b953f38
Change DECR to use -- ( #649 )
...
* DECR fix
* cleanup on some literals
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
2021-01-19 14:27:57 -05:00
fig02
00a5edea71
Actor Struct Changes (and a few related things) ( #617 )
...
* reformat header
* type -> category
* done for now i think
* some more stuff
* first -> head
* focus
* flag comment
* ground -> floor
* remove asm, name wrapper funcs
* name func, format
* review
* targetPriority, format
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0305ec2c2"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "0305ec2c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* comment
* review
* feet flags
* horse shadow
2021-01-18 16:04:04 -05:00
