mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-26 07:38:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,235 Commits 1 Branch 0 Tags
918e263e789b8ebb110f38baffccce44c9efda15
Commit Graph

357 Commits

Author SHA1 Message Date
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 8f2fe9b3c7 z_parameter: Timers (#1031) 
* import timers from parameter branch

* more cleanup

* small namechange

* improved docs

* more cleanup

* one more namechange

* another small cleanup...

* fix destroy

* plurals

* revert graphic function names

* PR suggestions, better docs

* revert namechange, better postman timer name

* oops

* fix merge

* fix merge

* fix bss

* PR Suggestions
 2022-09-29 09:57:44 -03: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 ee82e65c1a z_kaleido_item.c Ok and Documented (Pause Menu Item Page) (#1027) 
* import wip from kaleido

* small cleanup

* add for-loop comments

* pr review 1

* spacing

* Update src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
 2022-09-27 04:37:00 +01:00
engineer124 1c8d95d04b merge master 2022-09-25 18:48:20 -04:00
engineer124 00bf71460f Item cleanup: Item drops, rupees, signs (#1048) 
* item cleanup

* pr suggestions

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2022-09-24 16:45:53 -03:00
Derek Hensley 6d6304d1a0 Gamestates Cleanup (#1047) 
* Setup

* ConsoleLogo

* TitleSetup

* MapSelect

* FileSelect

* Daytelop

* Save file

* PreNMI

* Final cleanup and format

* Update include/functions.h

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

* DayTelop

* Split off setup

* split of prenmi

* readd SET

* shorten some gamestate member names

* Add comment about init

* Update include/z64.h

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Small cleanup of comments

* PR

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
 2022-09-24 16:40:40 -03:00
engineer124 0e1b244354 Audio: Various Cleanup and Docs (#1034) 
* cleanup and docs

* pr suggestions

* audio errors

* fix bss

* Empty-Commit
 2022-09-24 16:35:37 -03: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
Tom Overton 3d24a8be68 Document object_bdoor (Boss Doors) (#1087) 2022-09-24 16:15:18 -03:00
engineer124 cdee1fc45b z_kaleido_prompt.c Ok and Documented (Pause Menu Save/Continue Prompt. Unused) (#1045) 
* kaleido prompt ok

* fix pauseCtx
 2022-09-24 14:43:21 -03:00
Derek Hensley 71a18d70cf OK (#1040) 2022-09-24 14:36:55 -03:00
Derek Hensley 1402db4008 Effect Dfire OK (#1038) 
* OK

* rename function

* MTXMODE enum

* PR

* Format

* % -> &

* note
 2022-09-24 14:26:08 -03:00
Derek Hensley b5a9189cef Effect Deaddb OK (#1037) 
* OK

* Add description

* format

* Fix EffectSsDeadDbInitParams size comment
 2022-09-24 14:21:08 -03:00
Derek Hensley fb4ca3fb17 Effect DtBubble OK (#1017) 
* OK

* Some cleanup

* Format

* Name enum
 2022-09-24 14:09:46 -03:00
Derek Hensley f31056ef8a Effect Dust OK (#1016) 
* OK

* Some cleanup

* Description

* format

* Better name

* whoops

* Array count

* Name dust texture arrays

* Fix

* static

* Update dust tex outnames
 2022-09-24 14:04:03 -03:00
Parker Burnett 2c6816ba77 Add enum for tatl hint id (#993) 
* first round, need to investigate the others

* naming the remainder

* changed my mind on the name

* foooooormat

* fixing a number

* ...another one...

* names galore

* PR feedback

* fixing

* fixes

* 4mat

* adding "POE_SISTER"

* forgot a rename
 2022-09-14 14:01:06 -03:00
engineer124 6451bcf158 z_parameter: Magic (#934) 
* Document magic

* Cleanup

* Few fixes

* PR Suggestions, More Lens Docs

* Few comments

* missed a spot

* Better macros/names

* Deactivate Lens

* more PR suggestions

* fix names
 2022-09-14 13:49:17 -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
Derek Hensley 97d75c3811 Some small cleanup 2022-08-17 20:31:40 -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 bb96e47f8d General Cleanup 11 (#992) 
* char -> UNK_TYPE1

* SubS fixes

* func_800B8500

* macros

* misc

* A few more GET_{ACTOR} vs {ACTOR}_GETw

* More Macros

* fix

* PARSE_TYPE -> GET_TYPE

* 1 more
 2022-08-15 21:42:21 -04:00