fig02
bd0941405d
Document Player's Face and z_actor FaceChange functions ( #1928 )
...
* create some enums
* gonna try struct instead of array
* struct works. add docs too
* inline function comments
* fix function comment
* name faces, move enums
* rename textures
* outnames
* remove comments
* change comment slightly
* fixup face comments
* review
* offset comments
* add and use PLAYER_FACE_MAX
* typo
* more comment on blinkDuration
* another change to the comment
2024-03-23 12:21:45 -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
39d4217ecf
Match retail BossFd2_UpdateMane ( #1908 )
2024-03-04 12:35:48 -05:00
cadmic
63a95da5db
Match retail BossMo_DrawCore ( #1907 )
2024-03-04 18:22:23 +01:00
cadmic
9c09dcd4cd
Match retail z_fishing.c ( #1905 )
2024-03-04 17:57:16 +01:00
cadmic
e7b1868d84
Match retail BossFd_DrawBody ( #1915 )
2024-03-03 17:07:51 -05:00
Dragorn421
feb64e6ad8
Match retail text for some actors ❤️ ( #1912 )
...
* Match retail text for some of my dear actors
* Fix fake `EnDoor_SetupType` match, ty cadmic
2024-03-02 15:36:38 -05:00
Dragorn421
ff81e2a891
Build fixups: build gc-eu-mq with extracted/dbg, remove asmproc pragmas ( #1911 )
...
* Remove asmproc recurse (somehow these two survived)
* Use `extracted/gc-eu-mq-dbg` anyway for gc-eu-mq
2024-03-02 12:47:10 -05:00
cadmic
6b9a2433ab
Match retail EnNiw_Update ( #1906 )
2024-03-01 22:20:05 -05:00
Dragorn421
bdee3d33b4
No longer use asm-processor ( #1824 )
...
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "b3bfa14cf"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "b3bfa14cf"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "110b9eb"
* use CS_FLOAT
* update csdis
* update committed csdata
* finish updating csdis.py
* add script to reextract committed csdata
* dont use asm-processor, use iconv for reencoding utf8 to eucjp
* remove asm-processor csdata usage remnants
* --cs-float hex
* delete tempfile at end of reencode.sh (may want to rm even if compilation fails though?)
* comment reencode.sh
* comment CMD_F
* do not break permuter guessing compile command, by not reencode.sh-wrapping compilation under PERMUTER (thanks anghelo)
* fix the permuter fix
* pad -> sBssDummyNeg1
* reencode.sh: rm tempfile on script exit (including on error)
* renumber sBssDummy vars in zcolchk from 0
* Revert "--cs-float hex"
This reverts commit 85267dc348
.
* Revert BSS changes
* Add linemarker to reencoded files for better error message
* fix audio/general.c bss
* make reencode.sh work on macOS
* touch up csdis, csdis_re
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
2024-03-01 16:12:22 -05:00
cadmic
c9e97a3055
Mostly match retail bosses, part 1 ( #1898 )
...
* Retail bosses part 1
* Use GameState* local variable in BossGanon/BossGanon2 draw helper functions
2024-03-01 12:43:02 -05:00
cadmic
a32221c36e
Match retail z_en_ds.c, z_en_horse.c, z_en_fhg_fire.c ( #1897 )
...
* Actually match z_en_ds.c
* Match z_en_horse.c
* Match z_en_fhg_fire.c
2024-02-27 02:30:42 -05:00
cadmic
57ae8ae1dd
Mostly match retail bosses, part 2 ( #1894 )
...
* Bosses part 2
* Remove newline
2024-02-26 22:16:38 -05:00
cadmic
1da87b1e7f
Match En actors D-G ( #1889 )
...
* Match entity actors D-G
* Remove SET_EN_GOROIWA_SPEED
* Actually match z_en_elf.c
* GET_EN_GOROIWA_SPEED -> EN_GOROIWA_SPEED
2024-02-26 21:55:30 -05:00
cadmic
c86bf5011b
Match entity actors O-T ( #1826 )
2024-02-26 21:39:44 -05:00
cadmic
cdd24f2ac6
Match retail En actors V-Z ( #1825 )
...
* Entity actors starting with Z
* Use CS_STATE_IDLE
* z -> playerPosZ
* Remove comment
2024-02-26 21:29:40 -05:00
cadmic
769986874c
Finish player ( #1895 )
2024-02-26 14:24:14 -05:00
cadmic
10bae68937
Match En actors A-C, and a few more ( #1890 )
2024-02-24 13:00:37 -05:00
cadmic
7d128adf83
Match more of player for retail ( #1893 )
2024-02-24 12:47:17 -05:00
cadmic
93295a842b
Match some entity actors H-N ( #1827 )
2024-02-22 09:08:40 -05:00
cadmic
33d8044e45
Match retail demo actors ( #1745 )
...
* Match GetCue functions
* Match retail demo actors
* Add redundant parentheses around kREG(X) == Y in z_demo_gt.c
* Remove goto in DemoEffect_DrawLightEffect
* Rename "dl"
* Comment on possible array
* Use the word "fake"
* Remove redundant return
2024-02-20 15:15:52 -05:00
cadmic
5c31e686f6
More bg actors ( #1743 )
2024-02-20 07:00:55 -05:00
cadmic
b32d0a91ed
Match even more retail actors ( #1720 )
...
* Match even more actors
* Add macro for DebugDisplay_AddObject
* Prefer OOT_DEBUG &&
* Better EnReeba_Stunned match
* Revert "Add macro for DebugDisplay_AddObject"
This reverts commit 8197823abb
.
* Prefer OOT_DEBUG && some more
* Reformatting
* Add fake match comment
2024-02-13 09:10:28 -05:00
fig02
f492c04186
match function ( #1737 )
2024-02-08 17:23:22 -05:00
cadmic
53b0114464
Match InitDynaPoly actors ( #1733 )
...
* Match InitDynaPoly actors
* Change BgJyaBombiwa_SetupDynaPoly pads to s32
* kzIceScale -> sKingZoraRedIceScale
2024-02-07 18:58:46 -05:00
engineer124
563f717bc6
Misc 1: Retail Overlay Actors OK ( #1703 )
2024-02-07 19:46:51 +01:00
fig02
13143f4743
Retail Player matches part 2 ( #1725 )
...
* match a couple
* match some more
* revert accidental newline removal
2024-02-05 23:30:50 -05:00
fig02
c240184229
Retail Player_Update/Noclip mode + some docs ( #1718 )
...
* matched but its kinda ugly
* goto
* semi-colon to stop formatter
* some more docs
* noclip function doc
* remove noclip function from retail
* newline
* format
* reword noclip function comment a bit and fix typo
* format
* changes to doc comments
* reorganize button check
2024-02-05 18:13:15 -05:00
fig02
a46941a195
Retail Player Matches part 1 ( #1712 )
...
* player matches part 1
* remove noclip if for now
* remove direvtive
2024-02-04 23:38:28 -05:00
cadmic
454b1caa52
Match more retail actors ( #1711 )
...
* More actors
* Format
2024-02-04 22:28:18 -05:00
Derek Hensley
06379c3109
Gamealloc, Graph, and Graphalloc retail OK ( #1675 )
...
* Gamealloc OK
* Graph + Graphalloc OK
* PR review
* gfxalloc
* new lines
* Remove imposter
2024-01-31 19:07:12 -05:00
fig02
8be8848f85
z_demo retail code matched ( #1655 )
...
* match all functions
* format
* clarify between 'dest' and 'skip' debug features
* format
* better match for CutsceneHandler_RunScript
* review
* format
* remove macro
2024-01-30 18:52:04 -05:00
cadmic
9816f62129
Define OOT_DEBUG=0 in retail builds ( #1658 )
...
* Define OOT_DEBUG=0 in retail builds
* Fix ifndef
* Replace VI_MODE_EDITOR_INACTIVE
* Revert "Replace VI_MODE_EDITOR_INACTIVE"
This reverts commit f7c4cae7c3
.
* Replace VI_MODE_EDITOR_INACTIVE, take 2
* Revert EnBom_Draw
2024-01-30 13:54:38 -05:00
engineer124
795f7e5251
z_parameter
retail OK (#1649 )
...
* z_parameter okay
* no u32
2024-01-28 16:20:21 -05:00
cadmic
0e6dc594e9
Match z_en_dodongo.c ( #1640 )
2024-01-28 13:17:57 -05:00
cadmic
88aa6de9ff
Match z_en_bom.c ( #1639 )
2024-01-28 13:03:33 -05:00
Phil
616d6d4e46
Named a couple things in z_boss_ganon2.c ( #1606 )
...
* Fixed minor style inconsistencies for CollisionCheckInfoInit
* Minor renaming in z_boss_ganon2.c
* Update z_boss_ganon2.c
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 11:56:16 -05:00
mzxrules
f4306900ee
en_honotrap MM sync ( #1564 )
...
* MM pr suggestions
* more changes to match MM
* linebreak in switch
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 11:38:14 -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
cadmic
324db1d578
Replace most osSyncPrintf calls with PRINTF macro ( #1598 )
...
* Replace most osSyncPrintf calls with PRINTF macro
* DEBUG -> OOT_DEBUG
2024-01-12 10:38:13 -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
.
* ac/atHitInfo -> HitElem
* rename some collider elements to "elem" (instead of item, info, hurtbox...)
* cut down on more "hitbox" usage
* name all `ColliderElement*` temps properly
* rearrange colcheck structs
* add collider shape name descriptions
* reword collider shape descriptions
* jntsph first again
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-11 10:30:47 -05:00
cadmic
cd917b0cb8
Create debug macros for common functions ( #1597 )
...
* Create debug macros for common functions
* Revert NDEBUG change
* MALLOCR -> MALLOC_R
* DEBUG -> OOT_DEBUG
* Use the same name for debug and non-debug matrix functions
* Fix file/line argument order
* Revert g[s]DPNoOp[Tag]
* Use SystemArena_MallocDebug directly in GameAlloc_MallocDebug
* MTXF_TO_MTX -> MATRIX_TO_MTX
2024-01-09 07:59:03 -05:00
engineer124
e146d7bc26
Introduce Face Reaction Enum ( #1586 )
...
* face reactions
* cleanup
* cleanup fake match
* PR Review
* while I'm here
* mask reaction
* small fix
* Small cleanup
* oops
2024-01-08 17:17:22 -05:00
Phil
dcab429bf2
Fixed minor style inconsistencies for CollisionCheckInfoInit ( #1603 )
2024-01-05 18:57:05 -05:00
Yanis42
21cb04db2c
Document `z_bg_mizu_movebg.c
` ( #1565 )
...
* document z_bg_mizu_movebg.c + assets
* remove temp comment
* renamed "temp" variable
* review 1
* format + type names comments at dLists/colHeaders
* review 2
* review 3
* named dragon statue 1
* float -> floating + review
* format
* review 5
2023-12-15 15:33:50 -05:00
fig02
2b5b0fac06
name shock and burn functions ( #1594 )
2023-12-15 08:53:51 -05:00
krm01
e3316c9fb1
[Doc] Actor Bg_Bdan_Objects (Jabu Jabu misc dungeon actors) ( #1577 )
...
* bdan_objects type 2
* other bdan object types
* finish off bigocto platform
* run formatter
* remove stray comment
* add namespacing prefix to enums
* abbreviate camera to cam
* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* fix typo on enum
* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* enum name fixes
* remove unnecessary enum assignment
* Waterbox -> WaterBox
* named union, sfx to use SFX_FLAG
* friendly names for enums
* fix over-eager sed rename
* indent union fields
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-12-11 10:55:35 -05:00
fig02
0ed57f61b7
Cleanup: Remove uneeded casts on collider members ( #1595 )
...
* rm casts
* format
2023-12-10 14:53:51 -05:00
hiisuya
cc96184a96
Doc Actor: En_Ma1 (Child Malon) ( #1584 )
...
* started malon documentation
* docd all event and inf table checks
* doc cleanup
* ran formatter
* fixed misnamed eventcheck
* revert isNotSinging oops
* removed unnecessary comments
* changed from handle to update
* revert vec3f name change
* moved texture information
* isNotSinging to singingDisabled
* rename of inftable and eventchk
* small cleanup
* anim enum change
* enum names for child malon limbs
2023-12-10 14:36:12 -05:00
engineer124
f2c06ce441
Misc Cleanup ( #1585 )
...
* misc cleanup
* more fake matches
* revert for sym
2023-11-22 04:19:31 -05:00