Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2025-03-01 09:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,152 Commits 1 Branch 0 Tags
Commit Graph

495 Commits

Author SHA1 Message Date
Alejandro Asenjo
e47dc7da25
ovl_Oceff_Wipe3 OK (#1001) 
* all functions matching

* ovl_Oceff_Wipe3 decompiled

* bss

* pr review

* pr review

* renamings

* pr review
 2022-09-14 12:57:47 -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
Parker Burnett
3d430a5733
En_bubble OK (#995) 
* bubble OK

* fixing elfbulb

* flag fix

* PR comments

* PR comments

* missed a fix

* PR fixes

* don't know how this got in there

* u to s

* small fix
 2022-09-14 12:46:16 -03:00
Alejandro Asenjo
90ade1be9f
ovl_En_Js Decompiled (#991) 
* progress

* progress

* func_80968E38 (thanks @engineer124)

* progress

* remove comments

* general cleanup

* warnings

* all functions matching

* macros

* final details

* format

* ovl_En_Js Decompiled

* PLAYER_AO enums

* fix

* pr review

* re preview

* pr review

* pr review

* pr review

* resolving after merge

* conflict resolution

* pr review

* pr review

* pr review
 2022-09-14 12:37:21 -03:00
Maide
98501be8df
Obj_Usiyane (#902) 
* Obj_Usiyane

* PR

* RP

* PR
 2022-09-14 12:32:22 -03: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
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
Derek Hensley
24ba04d70c
Effect Deaddd OK (#1019) 
* OK

* cleanup

* Add unused comment
 2022-08-15 14:31:36 -04:00
Alejandro Asenjo
4b545bc259
ovl_Oceff_Wipe7 OK (#1009) 
* progress

* ovl_Oceff_Wipe7 OK

* pr review

* format

* renamings
 2022-08-15 14:27:30 -04:00
Alejandro Asenjo
e77b07296a
ovl_Dm_Char09 Decompiled (#996) 
* progress

* progress

* 1 function left

* all functions matching

* data imported

* ovl_Dm_Char09 decompiled

* format

* sfx

* constants

* ovl_Dm_Char09 PR

* pr review

* pr review

* format

* csIndex back to temp until we know proper behav.
 2022-08-15 14:20:03 -04:00
Tom Overton
e44c98884b
EnRat (Real Bombchu) OK and Documented, object_rat documented 🐀💣 (#966) 
* EnRat_Init and EnRat_Destroy OK

* Tons of actionFuncs and other stuff

* EnRat_Update OK

* func_80A566E0 OK and better match for func_80A56EB8

* All draw functions OK

* EnRat OK

* Document object_rat

* Port documentation from Bom_Chu

* Document/name a few more things

* Name all funcs and struct vars

* Un-name unk_18D

* Name some more stuff

* Final round of docs before I ask for help

* Let's just PR this I suppose

* Respond to isghj5's review

* Name a variable I forgot to name

* hookedState stuff

* Clean up forward declares

* Fix after merge

* Respond to reviews

* Limbs -> Limb

* Names for these rascally Vec3f temps

* Name all the vec3fs for real this time

* world -> surface

* surfaceTangent -> forwardPos; there are many tangents, but only one is forward

* Use Elliptic's names + documentation

* worldForwardInHome -> worldPlusForwardInHome
 2022-08-15 14:16:31 -04:00
Blythe
f66ef00aeb
EnSGoro OK and documented (#895) 
* EnSGoro OK and documented

* Format fix attempt for EnSGoro

* Requested format changes

* EnSGoro additional cleanup

* Fixed updated names

* fork merge (wip - don't review)

* Misc. formatting updates

Also had to un-eat some changes made upstream in functions.txt and variables.txt.

* A couple minor tweaks
 2022-08-15 14:12:54 -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
Tom Overton
f4f0ce7523
EnPp (Hiploop) OK and documented, object_pp documented (#997) 
* EnPp OK

* Format

* Animation naming consistency

* Respond to jpburnett's review

* Animation name consistency
 2022-08-09 20:44:07 -04:00
Alejandro Asenjo
1aaf0fbc7e
ovl_Dm_Ah Decompiled (#988) 
* current progress

* all functions matching

* data imported correctly (thanks @Maide)

* ovl_Dm_Ah Decompiled

* warnings

* moved the (Player *) casting for cb consistency

* renamings

* thank you @hensldm

* Jenkins being Jenkins

* correction
 2022-08-09 20:38:39 -04:00
Lucas
f3c6e451fb
ovl_Dm_Char06 OK (#986) 
* `ovl_Dm_Char06` decompiled

* Suggested changes

* Minor changes

* Formatting
 2022-08-09 20:33:57 -04:00
Parker Burnett
b14656c529
En_pst OK (#983) 
* first matches

* pst OK

* fix to be OK

* cleaning stuff up

* feedback

* updating names, PR feedback

* PR 3

* whoopsie on the object

* 4got 2 update the name

* fixing anim name

* PR comment
 2022-08-09 20:30:11 -04:00
Lucas
1afeaaf734
ovl_Mir_Ray2 OK (#981) 
* `ovl_Mir_Ray2` decompiled

* Suggested changes
 2022-08-09 20:26:35 -04:00
Lucas
75aad26df1
ovl_Obj_Makekinsuta decompiled (#980) 2022-08-09 20:21:56 -04:00
Alejandro Asenjo
ed7102727f
ovl_Obj_Taru Decompiled, object documented (#979) 
* all functions matching, thanks Anon58 and mzxrules

* data imported, objects documented

* ovl_Obj_Taru Decompiled, object documented

* warnings fixed

* boolean and renamings
 2022-08-09 20:15:50 -04:00
Lucas
1cbf26a5d1
ovl_Obj_Danpeilift decompiled and documented (#973) 
* `ovl_Obj_Danpeilift` decompiled

* Rename functions

* Change arg1 to index

* Improve ObjDanpeilift_Move match

* Upcast macro
 2022-08-09 20:11:29 -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
Maide
5f9d4ca059
En_Bigpamet (#910) 
* En_Bigpamet

* a

* PR

* a

* PR

* PR

* Update src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c

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

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2022-08-07 19:33:51 -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
Derek Hensley
9f6bacbb88
Effect Firetail OK (#974) 
* OK

* description

* gEffFire1DL

* format

* PR
 2022-08-07 19:18:54 -04:00
chloe!!
db844b8ee8
ovl_Bg_Hakugin_Elvpole OK (#970) 
* decomp ovl_Bg_Hakugin_Elvpole, 1 nonmatching

* func_80ABD92C OK, minor cleanups

* format

* review fixes

* more cleanups
 2022-08-07 19:13:42 -04:00
Lucas
191e779189
ovl_Bg_Last_Bwall OK (#971) 
* `ovl_Bg_Last_Bwall` decompiled

* Suggested changes

* Rename ObjRobliftModelInfo

* Rename functions

* Remove upcast macro

* Suggested changes
 2022-08-07 19:08:54 -04:00
Alejandro Asenjo
4a33baf936
ovl_Obj_Mure3 Decompiled (#969) 
* all functions matching

* data imported + fix constants

* ovl_Obj_Mure3 decompiled

* pr reviews

* pr review

* pr review
 2022-08-07 18:58:05 -04:00
Alejandro Asenjo
a6bec3ecc2
ovl_En_Test2 Decompiled (#968) 
* all functions matching

* all functions matching

* data problem

* ovl_En_Test2 Decompiled

* format + fix constants

* final details

* pr review

* pr review

* pr review
 2022-08-07 18:52:01 -04:00
Maide
d88aa7ebbe
En_Paper (#923) 
* En_Paper

* PR
 2022-08-07 18:47:00 -04:00
EllipticEllipsis
91b2bc3a88
EnGe1 OK and documented, document z_snap (#952) 
* Move PictoActor typedefs to z64actor.h

* OK, data imported

* Minor snap stuff

* Name most functions and variables

* Name most of object, apart from animations

* Document snap

* Fix actors to use the PictoActor struct

* Format

* Finish documenting EnGe1

* Finish documenting z_snap and related actors

* Format

* Review, format

* Name last couple of things

* bss

* Review

* Review

* bss

* Introduce z64snap.h, add SCREEN_TO_DEVICE macros

* Back to PROJECTED_TO_SCREEN
 2022-08-04 05:53:53 +01:00
Alejandro Asenjo
8f7f3d24c7
ovl_En_Mkk Decompiled (#959) 
* progress

* all functions matching

* fixes

* progress

* ovl_En_Mkk Decompiled

* format

* spec

* pr review

* pr review

* format

* pr review
 2022-08-04 05:42:00 +01:00
Alejandro Asenjo
7412ac7e8b
ovl_En_Viewer Decompiled (#955) 
* ovl_En_Viewer Decompiled

* PR review

* macros
 2022-08-04 05:37:01 +01:00
Lucas
b939665a06
ovl_Bg_Crace_Movebg OK (#943) 
* `ovl_Bg_Crace_Movebg` decompiled

* Suggested changes

* Minor changes

* Minor changes

* Change padding type
 2022-08-04 05:27:28 +01:00
EllipticEllipsis
26c8cdd221
New relocation-generating program (#393) 
* git subrepo clone git@github.com:EllipticEllipsis/fado.git tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "d202857b"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "d202857b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Makefile adjustments and additions to build fado

* git subrepo pull --force tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "46c4d751"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "46c4d751"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull --force tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "88114ebc"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "88114ebc"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Fix typo in makefile

* Fix it, maybe?

* git subrepo pull tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "f7efb10a9"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "f7efb10a9"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Update build tools
 2022-08-04 04:49:25 +01:00
Alejandro Asenjo
4693978015
ovl_Shot_Sun Decompiled (#905) 
* matching functions, warnings and data pending.

* ovl_Shot_Sun Decompiled

* space

* pr review

* unk1202E -> lastPlayedSong Rename

* defines

* OCARINA_SONG enums

* format

* OCARINA_SONG Enums

* pr review

* pr review
 2022-07-24 10:15:16 -04:00
engineer124
6fc12c3a70
Inventory Editor Ok and Documented (z_kaleido_debug.c) (#954) 
* Match Debug Menu

* Many docs and discussions

* Missed one

* A bit more

* More PR Suggestions

* phrasing

* hex health

* Fix
 2022-07-23 15:44:49 -04:00
engineer124
f3f147cc3d
z_draw OK and Documented (#900) 
* Import data for z_draw

* Match z_draw

* cleanup

* rupees

* Some object gi docs

* More documents

* Add explanation on function names

* more cleanup

* Fixed some things

* More docs

* Object docs WIP, still not done. I'll continue tomorrow

* More WIP, should just be mask gi objects left now

* Some masks done, many more to go

* cleanup

* Last masks finish

* Shield Stolen

* cleanup

* Apply various dicussions

* remove casts

* PR Suggestions

* Sync PowderKeg
 2022-07-23 15:25:20 -04:00
Chloe
cde8874bb1
ovl_Dm_Char03 OK (#963) 
* Decompile ovl_Dm_Char03

* review fixes

* more review fixes

* remove leading zeroes
 2022-07-23 15:05:04 -04:00
Lucas
3a1f3a04c0
ovl_En_Okarina_Tag OK (#953) 
* `ovl_En_Okarina_Tag` decompiled

* Suggested changes

* Minor changes
 2022-07-23 14:31:24 -04:00
Anghelo Carvajal
3f49adb91d
ovl_Obj_Um OK (#887) 
* Pass the whole actor in mips2c

* hacky way to fix some types

* decomp a few functions and second mips2c pass

* draw

* another mips2c pass

* some functions

* Init almost matching

* mips2c pass

* Match update and a few more

* A bunch of functions

* horses gonna horse

* func_80B7A860

* mips2c pass

* func_80B7984C

* func_80B795A0

* func_80B783E0

* func_80B78764

* Tried func_80B7BEA4

* func_80B79BA0

* func_80B7A494

* func_80B7A614

* lots of non equivalents

* fix

* Match func_80B77770

* func_80B7BEA4

* import data

* func_80B7B93C

* minor fixes

* ObjUm_Init

* func_80B7AF30

* func_80B7B18C

* func_80B7BABC

* func_80B77FA4

* func_80B7B598

* func_80B781DC is equivalent

* func_80B781DC

* func_80B7BABC

* Cleanup

* limbs

* minor members renames

* First docs pass

* small pass

* yes

* another pass

* more renames

* flags defines

* arePotsBroken

* some flags

* yet another docs pass

* Some members named

* Add weekEventReg docs

* small rename

* And more

* Another 2

* actorfixer and other fixes

* format

* Use extracted object symbols

* fixes

* Some stuff improved

* very minor naming

* format

* remove debugging stuff

* cleanup

* Some EnHorse stuff

* horse params

* ! FAKE

* Update include/functions.h

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

* review

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

* review

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update assets/xml/objects/object_um.xml

* IS_BANDIT_TYPE

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

* review

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* remove a fake match

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Horse/z_en_horse.h

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

* Update src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

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

* anim enum

* name anim enum

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

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

* review

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

* remove repeated forward declarations

* fixes

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c

Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>

* comment

* review

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

* areAllPotsBroken

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

* fix merge

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
 2022-07-23 14:00:32 -04:00
engineer124
601f44cb7f
audio_seqplayer.c OK and partial docs (#833) 
* Import audio_seqplayer progress from main audio branch

* cleanup

* Better docs

* Small fix

* More

* Cleanup and update

* PR Suggestions

* PR Suggestions

* mute flags
 2022-07-22 06:21:02 +01:00
Alejandro Asenjo
fed7cec4ed
ovl_Bg_Haka_Bombwall partially decompiled (1 NON_MATCHING) (#947) 
* progress

* 1 non matching + reloc issues?

* final details

* format

* final details

* reverting changes to ovl_Bg_Kin2_Bombwall

* undefined_syms

* undef

* warnings

* pr review
 2022-07-22 06:15:20 +01:00
Alejandro Asenjo
6dd31c00e5
ovl_Eff_Change Decompiled (#946) 
* all functions matching

* progress

* ovl_Eff_Change Decompiled

* ovl_Eff_Change Decompiled

* space

* spec
 2022-07-22 06:09:44 +01:00
Derek Hensley
5c7f21f6d2
Effect Gfire Ok (#941) 
* OK

* description
 2022-07-22 06:02:55 +01:00
Derek Hensley
64ea6665bd
Effect Gspk OK (#939) 
* OK

* cleanup

* newline
 2022-07-22 05:58:08 +01:00
Alejandro Asenjo
d1d1bf8ec6
ovl_Dm_Char04 Decompiled (#925) 
* all functions matching

* Data imported

* ovl_Dm_Char04 Decompiled

* ovl_Dm_Char04 Decompiled

* pr reviews

* number

* parenthesis

* renamings i forgot

* more renamings

* Elliptic number magic

* cast remove

* timer
 2022-07-22 05:43:36 +01:00
Alejandro Asenjo
a935cbc6ae
ovl_Obj_Ocarinalift Decompiled (#920) 
* all functions matching

* data imported

* ovl_Obj_Ocarinalift Decompiled

* pr review

* params prefix

* Jenkins re-run

* pr review

* pr review
 2022-07-22 05:27:02 +01:00
EllipticEllipsis
c8c55a15d3
EnBjt OK and documented (#912) 
* OK, data imported

* Fix some typos

* Start docs

* Struct almost finished

* Start object, add state enum

* undefined_syms

* Finish object, name some more stuff

* Name a few states and another function

* PlayState

* Minor tweaks in z_room and z_sub_s

* Complete documentation

* spec

* Review 1

* functions.txt

* Schedule result enum

* Rename schedule results

* Review

* Remove update comments

* Inventory_DeleteItem

* PLAYER_STATE

* Format

* Review

* Update struct name
 2022-07-22 05:17:06 +01:00