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

555 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
Tom Overton 77d8e386a3 Add comments to everything in the scene enum (#1052) 
* Add comments to everything in the scene enum

* Respond to isghj5's review

* Respond to Elliptic's review
 2022-09-27 13:42:15 +01: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
Tom Overton 72d24b9995 Give Deku Princess/King/Butler's objects the "correct" name (#1084) 
* Give Deku Princess/King/Butler's objects the "correct" name

* Document the actor/object discrepancy in the actors

* format
 2022-09-27 00:59:31 +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
Parker Burnett b4adfb0a22 Fbdemo_triforce OK with documentation (#1053) 
* close to done

* OK and doc'd

* PR feedback

* 4mat

* PR feedback round 2

* fixed engineers comment
 2022-09-24 14:49:07 -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
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
petrie911 bf26065867 EnAz and EnTwig (Beaver bros and the minigame rings) (#999) 
* leave it to beavers

* match

* merge

* catchup part 2

* fix warnings

* I accidentally the xml

* hopefully that's all of them

* lol merge

* linked object

* now with more enums

* Update src/overlays/actors/ovl_En_Az/z_en_az.c

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

* more fixes

* limbs and maths

* stuff

* more macro management

* last enum?

* more fixes

* fixed

* entrances

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2022-09-14 12:51:10 -03: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 8673cbe677 cleanup Play_Update 2022-08-20 11:21:40 -04: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 36ce1ab877 add docs from debug 2022-08-19 19:16:59 -04: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
Derek Hensley dd363101b7 Matched func_801691F0 2022-08-19 00:12:00 -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
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
Anghelo Carvajal a67571c2bf Purge ExchangeItemID enum (#1026) 
* Purge ExchangeItemID enum

* Add stff to namefixer

* Rename FISHING_ROD
 2022-08-15 15:04:42 -04:00
petrie911 c5254084c2 Matched several functions (#1020) 
* matchmaker, matchmaker

* more matches

* one fix

* I'll format you good

* cleanup

Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
 2022-08-15 14:55:42 -04:00
Tom Overton 78684187fe Make names related to animations more consistent (#998) 
* Make names related to animations more consistent

* Standardize on sAnimationInfo

* Respond to hensldm's review

* Standardize on ChangeAnim

* Respond to hensldm's review

* Small formatting thing

* Consistency after merging master

* A few more things I missed

* Respond to Elliptic's review

* Some more stuff that was requested
 2022-08-15 14:51:38 -04: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 82fe521721 Audio Sfx (code_801A5BD0 and selected sfx functions in code_8019AF00.c) OK and Documented (#798) 
* Rename functions

* code_801A5BD0 OK

* PR 1, improve spacing

* Rename unused struct

* Rename Sfx Variables

* PR Feedback, update names

* Add comment

* cleanup vars

* Fix merge

* Rework documentation, include more functions in sfx system

* PR suggestions

* fix AudioSfx_MuteBanks

* missed enum

* more cleanup

* more suggestions
 2022-08-15 14:39:57 -04:00
engineer124 0082c299c6 Decompile Camera Helper Functions (#1023) 
* helper functions

* more pr suggestions
 2022-08-15 14:36:33 -04:00
engineer124 d9a10948d3 aisetnextbuf.c OK (code_80194790.c) (#982) 
* aisetnextbuf OK

* format

* Function headers

* Add comment
 2022-08-09 20:49:20 -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
Derek Hensley b716e76d3e Effect EnFire OK (#977) 
* OK

* Gameplay keep fire

* &

* &2

* PR

* Fire textures

* Second mask
 2022-08-07 19:59:23 -04:00
Derek Hensley 9a4319827b General Cleanup 9 (#961) 
* small z64animation cleanup

* z64

* actor

* bgcheck

* collisioncheck

* curve

* cutscene

* effect

* item

* light

* math

* player

* save

* save

* schedule

* skin

* transition

* Remove leading 0s from size = 0x10

* z64schedule enum

* PR

* enums
 2022-08-07 19:43:58 -04:00
Derek Hensley d0313fa766 Effect EnIce OK (#976) 
* Ok

* Material/Model

* Cleanup

* format

* IceFragment Assets

* PR
 2022-08-07 19:29:03 -04:00
Derek Hensley bc3883d098 Effect Fhgflash OK (#975) 
* OK

* format

* extract tex explicitly

* FHGFLASH_SHOCK_NO_ACTOR

* typo

* Hitmark

* sZeroVec

* eff
 2022-08-07 19:24:05 -04:00
Maide d88aa7ebbe En_Paper (#923) 
* En_Paper

* PR
 2022-08-07 18:47:00 -04:00
engineer124 29bf8142b9 Introduce Sfx Tables (#927) 
* SfxTables

* Fix indexing

* fix voice text

* Rename with ordering

* Restore defines
 2022-08-04 06:04:13 +01:00