falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,266 Commits 1 Branch 0 Tags 313 MiB
Commit Graph

55 Commits

Author SHA1 Message Date
Derek Hensley 5631915dd5 Fog 2022-10-04 22:05:58 -07:00
Derek Hensley 8582c2a7e2 Transitions 2022-10-04 21:19:22 -07:00
Derek Hensley 4e809f1c17 Motion Blur 2022-10-04 20:29:59 -07:00
Derek Hensley c8d7e4de3b Merge remote-tracking branch 'upstream/master' into play 2022-10-04 17:38:41 -07:00
engineer124 841da5f138
View & Shrink_Window Docs (#1049) 
* view and shrink_window docs

* cleanup

* move func declaration to header

* move struct to local

* PR Suggestions

* g to s
 2022-10-02 11:32:57 -03:00
engineer124 ab5fd663cc
Quake & Distortion Cleanup (#1102) 
* quake cleanup

* cleanup

* more cleanup

* remove cast

* q comes before r...

* unname goron function, leave it to another PR

* PR Suggestions
 2022-09-30 23:01:39 -03:00
engineer124 f2d272f50b misc play docs 2022-09-30 11:11:01 -04:00
engineer124 918e263e78 merge master 2022-09-30 10:09:44 -04:00
Derek Hensley 3a723efb15
SceneNum -> SceneId (#1036) 
* sceneNum -> sceneId

* horse data scene -> sceneId

* Clean up scene table

* format

* PR comments

* Some more

* It helps if you actually save the file

* PR

* Remove comment

* Format

* Conflicts
 2022-09-30 03:22:59 +01:00
engineer124 5e860dd3e7
`z_parameter`: Hud Visibility (#942) 
* Begin interface alpha docs

* More Interface Alpha

* cleanup docs

* Minor fixes

* Apply Discord Discussions

* More discussions

* More suggestions from OoT

* fix merge
 2022-09-28 19:47:46 -03:00
engineer124 1c8d95d04b merge master 2022-09-25 18:48:20 -04:00
engineer124 37a9b8e3c4
ActorContext Flags (#1060) 
* actor context flags

* bracket cleanup

* comment out recursive name-fixer

* Empty-Commit
 2022-09-24 16:29:21 -03:00
engineer124 a50d643d36 format 2022-09-02 10:47:00 -04:00
petrie911 419e019b0d two more matches 2022-08-21 15:36:53 -05:00
engineer124 16758bd7bd Play_Draw WIP Thanks @petrie911 2022-08-20 16:57:11 -04:00
engineer124 a0f786c2ad small docs 2022-08-20 12:00:43 -04:00
engineer124 9001ed07b7 slightly more docs 2022-08-20 11:47:33 -04:00
engineer124 0cebae413e more cleanup 2022-08-20 11:35:43 -04:00
engineer124 8673cbe677 cleanup Play_Update 2022-08-20 11:21:40 -04:00
petrie911 e4da6f9555 Play Update, sort of 2022-08-20 09:53:57 -05:00
engineer124 b4463f0d5f import transition docs from OoT 2022-08-20 02:03:34 -04:00
Derek Hensley 6476e90bb7 Match func_80166B30 and diff fake match in Init 2022-08-19 17:37:12 -07:00
engineer124 28ef080dbf more docs and cleanup 2022-08-19 19:30:53 -04:00
engineer124 2542117c42 fix func_801656A4 2022-08-19 19:19:54 -04:00
engineer124 36ce1ab877 add docs from debug 2022-08-19 19:16:59 -04:00
petrie911 d9231f1dbb synray does it again 2022-08-19 18:11:58 -05:00
engineer124 e975c4df38 cleanup 2022-08-19 18:41:33 -04:00
engineer124 a1ed41ecea match Play_Main thanks to debug 2022-08-19 18:22:55 -04:00
engineer124 dbc31ad4c7 Merge branch 'play' of https://github.com/Decompollaborate/mm into play 2022-08-19 17:38:46 -04:00
engineer124 397c36c27b import D_801DFA18 2022-08-19 17:38:21 -04:00
Derek Hensley dd363101b7 Matched func_801691F0 2022-08-19 00:12:00 -07:00
Derek Hensley a595688346 Matched func_80169100 2022-08-19 00:09:31 -07:00
Derek Hensley e1c17c5da3 Match func_80168DAC 2022-08-19 00:01:29 -07:00
Derek Hensley afffe39763 Match func_80167F0C 2022-08-17 21:44:34 -07:00
Derek Hensley f5e71876ef Match func_80167DE4 (from debug) 2022-08-17 21:19:40 -07:00
Derek Hensley 628d39ea03 Match func_80165DB8, func_80165DCC, func_80165DF0, func_80165E04 2022-08-17 21:08:27 -07:00
Derek Hensley b01fac18b3 Match func_80165658 2022-08-17 21:06:07 -07:00
Derek Hensley 74cb1aa6e0 Match func_80165460 (from debug) 2022-08-17 21:03:49 -07:00
engineer124 5b6043cf6d small fixes 2022-08-16 15:25:50 -04:00
engineer124 6693c168a8 cleanup, fake match Play_Init 2022-08-16 15:22:21 -04:00
Derek Hensley 6ab0b075cd Bring over progress from another branch 
Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com>
 2022-08-15 23:35:50 -07:00
Derek Hensley 132dd6a373
Entrance Macro (#987) 
* POC

* fix

* Fix typo

* token POC

* The rest

* small cleanup

* More small cleanup

* ENTRANCE

* arg renames

* EntranceIndex -> Entrance

* format

* PR

* PR2

* Remove layer from entrance macro

* namefixer plus comments

* format
 2022-08-15 14:45:28 -04:00
engineer124 a80637fd59
Decompile and Document Camera `z_play` functions (#933) 
* Document z_play camera functions

* cleanup function names

* PR Suggestion

* Fix master merge, add comments

* fix merge

* small fix

Co-authored-by: angie <angheloalf95@gmail.com>
 2022-08-09 20:01:55 -04:00
engineer124 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 5f6c3df4ce
Transition System Docs (#883) 
* Transition docs from OoT

* Cleanup

* Missed a spot
 2022-07-22 15:05:20 +01:00
Anghelo Carvajal 87506f7c19
`z_player_lib`: Part 1 (#688) 
* fix some symbols and file splits

* PLAYER_STATE macros

* Move over a few functions

* AP functions and update struct

* another small bunch

* Add player_lib prototypes

* A few more functions

* Some fixes and add stuff to actorfixer

* format

* bss

* Elliptic's review

* Engineer's review

* Some renames and cleanups

* bss

* A bit of cleaning up

* Player_DrawZoraShield

* format

* actorfixer, bss and format

* Forgot to merge master again

* Rename some LinkGoron dlists

* PlayerMeleeWeaponAnimation enum

* format

* actorfixer, bss and format

* more bss

* actorfixer

* format

* actorfixer and format

* bss

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* sEnvironmentTextTriggers

* Update include/z64save.h

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/code/z_player_lib.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* breman mask march comment

* fix

* fixes

* bss

* RESPAWN_MODE_RETURN

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* format

* Engineer's review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_player_lib.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update include/z64player.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* format

* unused mwas

* fixes

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
 2022-07-11 23:43:46 -04:00
Tom Overton 158d1b26b0
PlayState rename (#835) 
* PlayState rename

* Make this work with the latest master and run format

* Respond to hensldm's review

* Respond to Elliptic's review

* Add Effect_GetPlayState to namefixer.py

* Add missed comma
 2022-06-26 11:57:37 -04:00
Derek Hensley 37d3934e2c
Code_800E8EA0 Docs (#832) 
* Start

* Add notes from OOT

* D_801D0D50 -> gDbgCamEnabled

* Rotation Functions

* Text function

* RotateBack -> RotateForward

* Flags functions

* Document rotation func returns

* Remove comment from play

* Rename play function, add notes about Flags, add notes about focus

* Update notes a little

* Update src/code/code_800E8EA0.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Fix apostrophes

* Bring over OoT changes

* TurnTo -> Track in SubS systesm

* format and remove OoT specific comment

* Remove old comments

* namefixer

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2022-06-20 01:16:30 +01:00
Anghelo Carvajal 72bae2b6ba
`z_kaleido_setup` (#768) 
* KaleidoSetup_Init

* func_800F4C0C

* func_800F4A10 NON_EQUIVALENT

* fixes

* func_800F4A10

* import data

* Rename Play_InCsMode

* Name KaleidoSetup_Update

* minor cleanup

* Update src/code/z_play.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Bom/z_en_bom.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Gs/z_en_gs.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/code/z_kaleido_setup.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/code/z_kaleido_setup.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/code/z_kaleido_setup.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/overlays/actors/ovl_Door_Ana/z_door_ana.c

* unname D_801BDB00

* format

* a

* actorfixer

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
 2022-03-29 22:04:41 +01:00
Anghelo Carvajal b08880f7a7
`z_sram_NES` with 2 NON_MATCHINGs and 1 NON_EQUIVALENTs (#531) 
* Rename Sram_InitDebugSave

* Sram_InitDebugSave

* err

* Sram_IncrementDay

* non_matchings

* func_80146F5C and protos

* func_80146EE8

* func_80145698

* func_80143A54

* Split SaveContext

* problems with bss

* Fix bss

* more

* a small bunch

* Fix warnings

* almost everything

* two attempts

* at least compiles

* import data

* bss

* format

* stuff?

* Progress?

* More progress

* clean up data a little

* More progress

* disaster

* re split data

* A bit less of a disaster

* Fix renamed stuff

* data stuff

* fix conflicts

* format

* CycleSceneFlags

* some enums

* cleanup

* Fix merge issues

* format

* some changes

* format

* Lots of progress on z_sram_NES, but no matches yet

* SaveContent Documentation

* Oops

* Oops2

* Document more SaveContext

* Oops, don't need that anymore

* add small comment

* Another comment

* dekuPlaygroundPlayerName

* Fix merge issues

* format

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* remove magic number

* format

* fix merge issues

* bss

* format

* macro cleanup

* review

* merge issues

* review

* cleanup

* UNK_TYPE1

* Fix

* Remove comment

* small change

* conflicts

* review

* fix

* fixes

* format

* Update actorCtx renames part

* Match func_80143B0C thanks to Petrie and Anon

* minor cleaning pass

* format

* cleanup

* more minor cleanups

* Macros for accessing gSaveContext.save.stolenItems

* Introduce STOLEN_ITEM_NONE and remove CLEAR_STOLEN_ITEM_

* format

* Update include/macros.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* @hensldm review

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Rename QUEST_SONG_NEW_WAVE

* Add scene name comments to D_801C5FC0

* rename horseData.yaw

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* // = CUR_UPG_VALUE(UPG_WALLET);

* run actorfixer and format

* fix bss

* Fix merge problems and run format

* Some improvements to func_801457CC by anon

* bss

* format

* run actorfixer

* actorfixer, bss and format

* Use original names for the RESPAWN_MODE enum because the current ones are bad

* QUEST_SONG_BOSSA_NOVA

* some minor fixes on the SaveContext struct according to the debug rom

* Merge Inventory.items and Inventory.masks

* a

* simplify saveBuf accesses

* A few func renames

* actorfixer

* bss

* fixes

* bss

* actorfixer

* actorfixer and format

* actorfixer

* whoops

* whops

* bss

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2022-03-27 12:37:02 -03:00