Tom Overton and GitHub
7bdbca10a5
Use proper sequence names in certain actors ( #1241 )
...
* Use proper sequence names in certain actors
* Fix z_en_jgame_tsn too
* func_801A1FB4 enums
2023-05-14 10:38:38 +10:00
engineer124
0ab669a539
merge master
2023-05-13 19:26:44 +10:00
Derek Hensley and GitHub
cc6cc8da96
Add a Couple Disasm Hacks (Fix NON_MATCHING Builds) ( #1231 )
...
* collision check bss
* play_hireso
2023-05-13 15:32:19 +10:00
Tom Overton and GitHub
b312b76db7
Document a bug involving quick-killing the Wizrobe ( #1233 )
...
* Document a bug involving quick-killing the Wizrobe
* Update wording in EnWiz_SelectPlatform
* Add missing "it" to comment
2023-05-13 13:48:14 +10:00
Derek Hensley and GitHub
d796187c01
Check md5sum in fixbaserom before trying to decompress ( #1240 )
2023-05-11 12:49:02 -04:00
engineer124 and GitHub
67dc6879bb
match KaleidoScope_DrawQuestStatus ( #1238 )
2023-05-11 09:21:16 +10:00
StickyThwomp and GitHub
c9a89ae2bb
Matched last remaining function in z_en_tru.c. ( #1237 )
...
* Matched last remaining function in z_en_tru.c.
(Also touched up other similar functions for uniformity)
* Fix spec file, revert unnecessary deltas, and change variable ordering.
2023-05-09 20:15:45 +01:00
eaf682dc05
Transition table ( #1210 )
...
* transition_table.h
* format
* Update include/tables/transition_table.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
* review
* review
* bss
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
2023-05-04 00:43:27 -04:00
petrie911
2a56a97f9b
all funcs provisionally named
2023-05-03 12:20:50 -05:00
petrie911
fe86fa9412
naming and such
2023-05-03 09:08:34 -05:00
petrie911
690c773f5c
stuff
2023-05-01 09:56:28 -05:00
petrie911
21826bec78
merge
2023-04-25 12:30:13 -05:00
fc3da8451a
Match Room_DrawCullable ( #1232 )
...
* Match Room_DrawCullable
* format
* Update src/code/z_room.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
2023-04-24 11:02:30 +10:00
Anghelo Carvajal and GitHub
539950bdc2
Update m2ctx.py ( #1176 )
...
* Preserve macros in m2ctx
* add more includes to m2ctx.py
* review
* review
* remove duplicated entries
2023-04-23 09:58:22 -04:00
Derek Hensley
42224bae65
Merge remote-tracking branch 'upstream/master' into sys_math3d
2023-04-21 22:43:24 -07:00
engineer124 and GitHub
24454b2277
cs state cleanup ( #1229 )
2023-04-21 15:54:47 -04:00
Tom Overton and GitHub
40846f3d3a
Ensure all boss title cards are extracted as IA8 ( #1230 )
2023-04-20 22:39:08 +01:00
9d25fad407
Cutscene Documentation (z_eventmgr.c OK) ( #1164 )
...
* begin cutscene docs
* more docs
* more docs
* z_eventmgr.c OK
Co-authored-by: Thar0 <Thar0@users.noreply.github.com >
* cutscene camera
* commands WIP
* more docs
* merge master
* csId, oof
* more cleanup
* more docs, csCam
* more cleanup
* more docs
* more
* cleanup functions.h
* better misc cmd docs
* apply discord discussions
* small adjustment
* more cleanup
* more docs
* more cleanup
* more cs cam docs
* small fix
* cmd cleanup
* small cleanup
* better match, thanks anon
* remove last return
* PR suggestions, small cleanup
* next PR review
* rm internal funcs from functions.h
* more PR
* add comment
* csCam interp typedef handler
* cleanup, scene cmd
* missed an enum use
* ActorCutscene -> CutsceneManager, PR Suggestions
* more PR Suggestions
* more actorCutscene cleanup
* R_USE_DEBUG_CUTSCENE
* more small docs
* move functions to cutscene.h
* PlayerCsId
* fix bss
* missed some function headers
* more scene cleanup
* more scene cleanup
* missed one
* CS_SPAWN_FLAGS
* wrong usage of macro
* more cleanup
* name last cs transition types
* IsNext bool
* update namefixer
* fix namefixer
* more cleanup
* add comment
* fixed enums for motion blur
* consistent cutscene lists
* cutscene entry func consistent
* PR Suggestion
* fig review
* fix additionalCsId name in actor
* more pr review
* bss
---------
Co-authored-by: Thar0 <Thar0@users.noreply.github.com >
Co-authored-by: angie <angheloalf95@gmail.com >
2023-04-19 13:52:00 -04:00
petrie911
3ff090636b
fixes and formats
2023-04-19 09:29:43 -05:00
petrie911
0353064d68
Merge remote-tracking branch 'upstream/master' into Mine
2023-04-19 08:36:53 -05:00
543c38ae06
z_player_lib: Dawn of the final PR (#1142 )
...
* Player_GetMask and Player_RemoveMask
* some comments
* Player_ActionToBottle and Player_GetBottleHeld
* Player_DrawGetItemImpl and Player_DrawGetItem
* func_80123420 OK
* Decompile a few more functions
* Decompile a few more functions
* func_80122760
* func_80122868, func_801229A0 and func_801229EC
* func_80122F28
* func_8012301C
* func_801242B4
* func_801242DC
* func_80124420 nonmatching
* func_80126440
* func_801240C8 and func_801240DC
* func_8012405C and func_80124088
* func_80124020
* Player_IsBurningStickInRange
* func_8012754C
* func_80125318 and func_80125CE0
* func_801229FC
* func_80127B64
* func_80127488
* func_80122D44
* func_80122BA4
* func_80122C20 attempt
* func_80122EEC
* func_80122F9C
* func_80122FCC and func_8012300C
* func_80123448
* func_801234D4
* func_801235DC
* func_80123960
* func_80123BD4
* func_80123AA4
* func_801239AC
* func_801241B4
* func_80123C58 and func_80123C90
* func_80123D50 and func_80123DA4
* func_80123DC0, func_80123E90 and func_80123F14
* func_80124110 and func_80124148
* func_80124168 and func_80124190
* func_80124278
* func_80124F18 non_equivalent
* func_80125340 and func_8012536C
* func_801263FC
* func_801265C8
* func_8012669C
* func_80128B74
* func_80123140
* func_801246F4
* func_801253A4 NON_MATCHING
* func_801262C8
* func_80126AB4
* func_80126B8C
* func_80127438
* func_801278F8 NON_MATCHING
* Fix data split
* cleanup externs
* func_80128BD0 compiles...
* Rename Player_SetEquipmentData
* fix merge issues
* Fix types
* Improvement? Worse? I don't know at this point
* func_80128640 attempt
* func_80127BE8
* func_80127A60
* func_80127594 attempt
* func_801271B0
* func_8012364C NON_MATCHING
* func_80124618
* func_80124CC4 non matching
* func_801251C4
* func_80125580 non equivalent
* func_80128388
* cleanup
* remove some hardcoded pointers
* object symbol cleanup
* func_80124870 NON_EQUIVALENT
* name overridlimbdraw arguments
* func_80125D4C NON_EQUIVALENT
* func_80126BD0 NON_MATCHING
* Match func_80126BD0 thanks to anon58
* func_80127DA4 NON_EQUIVALENT
* fix merge issues
* some stealing from OoT
* small rename pass and cleanup
* Improve some
* CLAMP and fix warnings
* func_80125580 matched by mzx
* cleanup func_80128BD0 a bit
* import data
* func_80124CC4
* Rename objectFileTable to gObjectTable
* Improve func_80124FF0 thanks to maide
* fix renames
* Match func_80124FF0 thanks to Maide
* cleanup
* More cleaning up
* import bss
* Add PLAYER_STATE macros
* a bit more of cleanup
* run formatter
* func_80128BD0 a bit more deecent
* Add player limb enum
* Use limb enum
* cleanup and format
* Use symbols for player dlists groups
* A bunch more of pointers
* more object pointers
* Change the remaining object pointers
* Add a few missing dlist in link_child
* Small rename
* whoops
* Work on NON_MATCHINGs
* Cleanup
* Steal OoT renames from "sword" to "meleeWeapon"
* Fix some symbols
* Match func_80127594 and format
* Match func_80127DA4
* Matched func_801284A0
* Annotate D_801F59AC
* Matched func_80128640
* Some cleanup
* format
* stuffs
* some cleanups
* import stuff from pr
* swords and shields
* fixes
* bss
* cleanup Player_OverrideLimbDrawGameplayCommon
* progress on func_80125D4C
* PlayerMeleeWeapon enum
* Player_BButtonSwordFromAP
* GET_B_SWORD_FROM_AP
* GET_MELEE_WEAPON_FROM_AP
* PlayerBottle
* PlayerExplosive and PlayerSword
* misc fixes
* Various changes fromplayer_actor
* z64player.h stuff from player_actor
* Fixes
* skelanime stuff
* placeholders on z64item.h, save macros and ther cleanups
* <= PLAYER_AP_MINUS1
* Player_UpdateBunnyEarsKinematics
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* cleanup
* bodyPartsPos
* comment
* sizeof(u16)
* typo
* merge fixes
* fix
* fixes
* format
* fix merge
* fix merge
* func_80125D4C
Co-authored-by: engineer124 <engineer124engineer124@gmail.com >
* func_80128BD0 improvement
* minor renames
* format
* whoops
* small cleanup
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* format
* _B_
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* format
* remove gap
* whoops
* clanups
* remove stuff from permuter_settings
* steal some OoT docs
* some other docs vscode didn't add to the last commit
* format
* data as infunction-static data
* OoT docs stealing
* Improvements on Player_PostLimbDrawGameplay
* More improvement
* Match Player_PostLimbDrawGameplay
Co-authored-by: engineer124 <engineer124engineer124@gmail.com >
* cleanups
* Convert unk_AF0 into an union and some other cleanups
* bss
* headLimbRot and upperLimbRot
* fix naming
* cleanups
* bss
* bss
* Update src/code/z_player_lib.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* pr review
Co-authored-by: engineer124 <engineer124engineer124@gmail.com >
* bss
* gesture
* namefixer
* gestureInfo
* IA_MIN and BOTTLE_EMPTY
* review
Co-authored-by: engineer124 <engineer124engineer124@gmail.com >
* review
* D_801F59B0_LEN
* Remove LevelOfDetail enum
* bss
* review
* review
* gLinkDekuClosedFlowerDL gLinkDekuOpenFlowerDL
* _B_
* Player_DrawStrayFairyParticles
* fix build
---------
Co-authored-by: kyleburnette <kyle@kyleburnette.com >
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk >
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com >
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com >
Co-authored-by: engineer124 <engineer124engineer124@gmail.com >
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
2023-04-18 23:01:05 -04:00
f9c638117c
Rename LinkAnimation to DmaAnimation and other skelanime misc cleanups ( #1147 )
...
* Rename LinkAnimation to PlayerAnimation
* remove the remaining link stuff
* Move functions out of functions.h
* cleanup returns
* more cleanups
* format
* format again
* format again again
* Remove internal functions from header
* legacy
* bss
* linkAnimSegment
* Update src/overlays/actors/ovl_En_Yb/z_en_yb.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* bss
* `DmaAnimation` rename
* more DMA i missed
* Revert "more DMA i missed"
This reverts commit 6c0ca44f450c92d8c12374fa243c8b17d46527d3.
* Revert "`DmaAnimation` rename"
This reverts commit 1d2626514c94158001566fa664222b0dcf34a4f7.
* Add LinkAnimationHeader rename to namefixer.py
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
2023-04-18 22:38:22 -04:00
Anghelo Carvajal and GitHub
3c107cb148
Add SaveInfo substruct to SaveContext ( #1191 )
...
* SaveInfo
* fix accesses in sram_NES.c
* some more fixing
* more fixes
* format
* fix unk
* namefixer
* format
* bss
* review
* weekeventregconvert
* namefixer
* bss
2023-04-18 18:54:32 -04:00
engineer124 and GitHub
b8af819165
DynaPoly Docs Pass ( #1194 )
...
* dyna docs
* init flags
* more docs
* cleanup
* partial PR review
* another bracket
* hold to press
* PR cleanup
2023-04-18 18:36:53 -04:00
38d21bbe97
Name some SurfaceType_ functions ( #1155 )
...
* enums
* renaming functions
* fixes
* SurfaceType_IsSoft
* type fixing
* format
* Update src/code/z_bgcheck.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/code/z_bgcheck.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* Update src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* review
Co-authored-by: engineer124 <engineer124engineer124@gmail.com >
* SurfaceType_GetFloorEffect
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com >
* format
* bss
* cleanups
* extra material docs
* cleanup
* cleanups
* Remove Bg prefix
* minor fixes
* Remove BG_
* SURFACE_MATERIAL_DIRT_SHALLOW
* format
* bss
* bss
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
* format
* format again
* bug
* format
* namefixer
* bss
* bss
* bss
* review
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com >
Co-authored-by: engineer124 <engineer124engineer124@gmail.com >
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com >
2023-04-18 18:14:36 -04:00
Tom OvertonandGitHub
engineer124
Derek HensleyandGitHub
engineer124andGitHub
StickyThwompandGitHub
petrie911
