461 Commits

Author SHA1 Message Date
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
Alejandro Asenjo
f0e4581e22
ovl_En_Sth2 Decompiled and Documented (#898)
* ovl_En_Sth2 Decompiled and Documented

* &

* enum

* space

* pr review

* warnings

* pr review

* trailing coma + format

* pr review

* trailing coma

* review

* focusOffset
2022-07-22 04:57:49 +01:00
Derek Hensley
6661b566a9
Effect Gripple (#940)
* OK

* description

* undef

* format
2022-07-19 12:32:00 -04:00
Chloe
215164738b
ovl_Obj_Purify OK (#937)
* ovl_Obj_Purify decompiled and partially documented

* document member names

* variable names and format

* oops missed some booleans

* review fixes

* more review fixes

* even more review fixes

* rename ObjPurifyInfoList to sObjPurifyInfo
2022-07-19 12:27:01 -04:00
Alejandro Asenjo
095a312937
ovl_Bg_Fu_Mizu Decompiled (#935)
* All functions matching + data imported

* ovl_Bg_Fu_Mizu Decompiled

* heightTarget
2022-07-19 12:21:51 -04:00
EllipticEllipsis
69e514b37e
EnBat OK and documented (#924)
* OK, start documentation

* Name some more stuff

* Name rest of functions and bss var, tidy up floats

* Document object and paramflags

* Cleanup bat

* Cleanup crow

* Cleanup firefly

* Couple of minor things in arrow

* Review 1

* PLAYER_STATE

* Remove unnecessary f32 casts

* Review

* Review
2022-07-19 12:16:36 -04:00
Alejandro Asenjo
bd94105568
ovl_Eff_Lastday Decompiled (#921)
* all functions matching

* ovl_Eff_Lastday Decompiled

* renaming

* final clean up

* enums

* pr review

* pr review

* Prefix

* renamings
2022-07-19 12:10:35 -04:00
Alejandro Asenjo
aebbebd6cf
ovl_Obj_Lift Decompiled and Documented (#917)
* progress

* all functions matching

* data imported

* ovl_Obj_Lift Decompiled and Documented

* pr review

* chain assignments

* pr review

* fixes

* yOffsets
2022-07-19 12:05:40 -04:00
Alejandro Asenjo
ba886cc8fa
ovl_Dm_Al Decompiled + Some Documentation (#913)
* all functions matching, data isn't?

* cleanup in progress

* ovl_Dm_Al Decompiled

* pr review

* Documentation Fixes and new entries

* forgot one

* pr review
2022-07-19 12:01:26 -04:00
Alejandro Asenjo
abf70f6dd2
ovl_Eff_Kamejima_Wave Decompiled (#908)
* almost there

* ovl_Eff_Kamejima_Wave Decompiled

* Us removal

* minor clean up

* pr review

* review

* sikihi rollback and function name fix

* params rename

* SetVtxAlpha

* params prefix

* Jenkins re-run
2022-07-19 11:54:30 -04:00
Alejandro Asenjo
a22e72acfe
ovl_En_Sekihi Decompiled and Documented (#907)
* progress

* All functions matching

* ovl_En_Sekihi Decompiled and Documented

* pr review

* pr review

* params enum

* corrections and renaming

* pr review

* Update src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c

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

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-19 11:49:07 -04:00
Alejandro Asenjo
ba1c5803ad
ovl_Bg_Fire_Wall decompiled (#890)
* progress

* xml

* data imported

* all matching functions

* ovl_Bg_Fire_Wall decompiled

* review

* review

* GET_PLAYER

* EnEncount4

* AT_HIT

* pr reviews

* pr review
2022-07-19 11:44:51 -04:00
Alejandro Asenjo
d150a04e6a
ovl_Obj_Hsblock decompiled (#866)
* ovl_Obj_Hsblock decompiled

* PlayState + PR Reviews

* s

* pr review

* sFocusHeights

* displaylists rename

* bring up names from OOT

* fix

* fix

* xml comment
2022-07-19 11:38:47 -04:00
Parker Burnett
356fde3045
En_Ik OK (#821)
* starting en_ik

* updating and more matching funcs

* matched more functions and ran format.sh

* matched another, started on init

* updating things with master, and more matches

* another function down

* some more progress

* some documenting

* master merge

* maybe some progress?

* one more func left

* IK OK

* inital cleanup passthrough

* fixing warnings and formatting

* some cleanup

* touch up

* more docs

* doin dat dere docs

* actorfixer

* finishing function names

* initial round of fixes

* format

* Naming things

* namefixer

* review comments pt2

* comment updates

* PR Feedback

* forgot a format

* naming enum

* more fixes

* minor fix

* minor fix

* format

* fixes for daaays

* for some reason these keep showing up?

* fixing blob

* names

* fixes

* naming things...can't discern the last ones...

* updating TLUT and names

* formating and fisxes

* fixing func name

* naming effect variable

* name fixer, and renaming variable

* Fixing xml

* forgot to fix name
2022-07-18 04:19:11 +01:00
engineer124
8e45eb7b1f
z_parameter: Items & Import Data (#799)
* Import Data

* More functions

* cleanup

* Add Enum

* Many changes, PR and add-ons

* Fix bss

* Better data

* Extra space

* DoubleDefense is boolean

* Missed a macro

* More enums missed

* macro -> enum

* More item cleanup...

* missing/wrong quest items

* Next PR Review

* Revert Interface_AddMagic to Parameter_AddMagic

* Remove QUEST_HEART_CONTAINER

* Fix bss

* Move Color_RGB16 up + fix incorrect numbers

* Add texture pointers

* Add comment

* EQUIP_SLOT_A

* rm redundant comment

* Fix merge

* PR Suggestions

* fix bss
2022-07-12 00:45:55 -04:00
Tom Overton
e9d4b31c3d
z_map_exp OK and somewhat documented (#877)
* z_map_exp OK

* some names

* Some more docs

* Update prototypes in functions.h

* Use reg name

* namefixer

* Respond to review

* Respond to review

* Respond to review

* Add some blank lines after breaks, whoops

* Respond to review

* Respond to Engineer's review, pt 2

* Respond to Engineer's review, Pt 3

* Add newline char to end of z64map.h

* Respond to engineer's review, Pt 4

* Respond to multiple reviews
2022-07-11 23:23:01 -04:00
Lucas
2995d72965
ovl_En_Fall2 OK (#916)
* `ovl_En_Fall2` decompiled

* Suggested changes

* Minor suggestions

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

* Don't commit directly from github

* Define vertices in xml, add macro

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11 22:44:19 -04:00
Alejandro Asenjo
6616f542f1
ovl_Elf_Msg4 decompiled (#884)
* ovl_Elf_Msg4 decompiled

* pr review

* GET_PLAYER

* actorPtr should stay Actor*

* pr review

* SWITCHFLAG

* ELFMSG5_GET_FF

* parenthesis

* pr review

* conflict
2022-07-11 22:40:17 -04:00
Alejandro Asenjo
a2f78fbc44
ovl_En_Bh Decompiled (#906)
* ovl_En_Bh Decompiled

* some minor things

* Documentation

* pr review

* gEnBh - > gBh

* noneSkel nonsense fix

* pr review

* pr review
2022-07-11 22:36:11 -04:00
Lucas
9726a30109
ovl_En_Part OK (#903)
* `ovl_En_Part` decompiled

* Suggested changes

* Rename body part displaylist

* Suggested changes

* Rename displaylist and params enum

* Remove randvar, rename enum from params to type
2022-07-11 22:32:35 -04:00
Maide
9969b204bc
Obj_Chikuwa (#893)
* Obj_Chikuwa

* PR
2022-07-11 22:25:54 -04:00
Maide
122e4f3982
Obj_Toudai (#892)
* Obj_Toudai

* PR
2022-07-11 22:21:04 -04:00
Maide
2167cb6a77
Bg_Iknv_Doukutu (#891)
* Bg_Iknv_Doukutu

* PR
2022-07-11 22:14:14 -04:00
Alejandro Asenjo
69b4bd8998
ovl_Bg_F40_Flift decompiled (#885)
* ovl_Bg_F40_Flift decompiled

* format

* pr reviews

* pr review
2022-07-11 22:10:29 -04:00
Alejandro Asenjo
9bcd3e2fea
ovl_Elf_Msg5 decompiled (#882)
* ovl_Elf_Msg5 decompiled

* pr review changes

* pr reviews

* ELFMSG5_GET_FF
2022-07-11 22:06:44 -04:00
Alejandro Asenjo
6dec68464f
ovl_Elf_Msg2 decompiled (#881)
* ovl_Elf_Msg2 decompiled

* pr review changes

* ELFMSG2_GET_SWITCHFLAG
2022-07-11 22:03:04 -04:00
Alejandro Asenjo
3ab8b60a12
ovl_Elf_Msg decompiled (#880)
* ovl_Elf_Msg decompiled

* pr review

* ELFMSG_GET_SWITCHFLAG
2022-07-11 21:59:29 -04:00
Alejandro Asenjo
d352761bb6
ovl_En_Gamelupy decompiled (#878)
* ovl_En_Gamelupy decompiled

* pr review

* pr review

* pr review
2022-07-11 21:56:01 -04:00
Derek Hensley
0346fde02b
Effect Gsplash OK (#876)
* Ok

* Save?

* undef syms
2022-07-11 21:51:56 -04:00
Derek Hensley
f85a398162
Effect Hahen Ok (#875)
* OK

* format

* gameplay keep

* undef syms

* drawFlags -> params

* Format

* Fix railskb include

* DL consistency with OoT

* Hex
2022-07-11 21:48:37 -04:00
Derek Hensley
94372c3670
Effect Hitmark Ok (#874)
* OK

* gameplay keep

* undef syms

* Cleanup

* format

* HitMark -> Hitmark

* Remove EffectSsHitmark_Spawn from functions.h

* PR
2022-07-11 21:45:03 -04:00
Alejandro Asenjo
a4d93ee3eb
ovl_Bg_Open_Shutter decompiled (#870)
* ovl_Bg_Open_Shutter decompiled

* format

* Co-authored-by: EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com
Co-authored-by: Maide eeeedddccc@hotmail.co.uk
Co-authored-by: Tom-Overton tom.overton@outlook.com

* PlayState

* pr review

* pr review

* Come on Jenkins

* rumble needed?

* namefixer.py
2022-07-11 21:41:19 -04:00
Chloe
78a29fb17b
ovl_Dm_Char02 decompiled (#869)
* ovl_Dm_Char02 decompiled

* remove m2c comments

* remove ovl_Dm_Char02 data in spec

* ran format.sh

* fix format version

* use our reloc

* fix reviews

* rename context/playstate structs

* format

* more review fixing

* even more review fixing
2022-07-11 21:37:42 -04:00
Alejandro Asenjo
8856e07166
ovl_Obj_Lupygamelift decompiled (#868)
* ovl_Obj_Lupygamelift decompiled

* pr review

* PlayState

* review
2022-07-11 21:33:59 -04:00
Alejandro Asenjo
5ffdc0a387
ovl_Obj_Jgame_Light decompiled (#867)
* ovl_Obj_Jgame_Light decompiled

* xml

* doc

* pr review

* playstate

* playstate

* pr review

* pr review

* missing macro

* pr review

* pr review

* pr review

* pr review

* isOn
2022-07-11 21:30:18 -04:00