Commit Graph

1239 Commits

Author SHA1 Message Date
notyourav c03df2f478
Merge pull request #349 from hatal175/gustjar
Decompile the rest of itemGustJar
2022-02-04 21:37:30 -08:00
Tal Hayon 3dce1fe0a0 match sub_0806D138 2022-02-05 01:39:51 +02:00
Tal Hayon 71f85e6308 clang format 2022-02-04 15:31:45 +02:00
Tal Hayon 5d88f7ebd6 Decompile asmfuncs in code_08077B98 2022-02-04 14:20:43 +02:00
Tal Hayon 0a3d0ac4e1 Decompile the rest of itemGustJar 2022-02-03 21:25:23 +02:00
Henny022p 91f1de0b7a clang format 2022-02-03 06:43:22 +01:00
Henny022p b769e0e192 added some documentation about droptables 2022-02-03 06:18:17 +01:00
Henny022p bbc3a88415 CreateRandomDrop and droptables 2022-02-03 05:52:50 +01:00
notyourav 67d369c53b
Merge pull request #346 from hatal175/sittingperson 2022-02-02 12:36:02 -08:00
notyourav db8dfd44b2
Merge pull request #345 from octorock/object97 2022-02-02 12:34:37 -08:00
notyourav c0f68e9056
Merge pull request #342 from hatal175/scissorsbeetle 2022-02-02 01:29:40 -08:00
hatal175 75699ef2b1
Remove superfluous line
Co-authored-by: notyourav <65437533+notyourav@users.noreply.github.com>
2022-02-02 11:16:32 +02:00
notyourav 6c5a8a3600
Merge pull request #344 from hatal175/cucco 2022-02-02 00:55:41 -08:00
notyourav 408fec1619
Merge pull request #343 from octorock/wizzrobes
Decompile Wizzrobes
2022-02-01 22:09:53 -08:00
octorock 99076969de Decompile Object97 2022-02-02 07:07:01 +01:00
notyourav dcc3ac2192
Merge pull request #341 from Henny022p/subtask 2022-02-01 20:28:25 -08:00
notyourav b455aaf013
Merge pull request #340 from hatal175/npcenum 2022-02-01 20:06:21 -08:00
notyourav c125fbb7f3
Merge pull request #339 from hatal175/fxenum 2022-02-01 20:01:22 -08:00
notyourav a98b65a061
Merge pull request #338 from hatal175/projenum 2022-02-01 19:15:48 -08:00
notyourav fccda2459d
Merge pull request #337 from octorock/push-and-pull 2022-02-01 18:47:18 -08:00
notyourav 3c81dd4103
Merge pull request #336 from hatal175/businessScrub 2022-02-01 18:32:08 -08:00
notyourav b354442b54
Merge pull request #335 from hatal175/surfacetype 2022-02-01 15:53:59 -08:00
notyourav 7bd2b432e4
Merge pull request #334 from hatal175/playerstateflags 2022-02-01 15:04:56 -08:00
notyourav 9d96c00ae9
Merge pull request #333 from hatal175/playercontrolmode 2022-02-01 14:41:13 -08:00
Tal Hayon fb2c85738e Decompile asm_funcs in sittingPerson 2022-02-01 23:33:59 +02:00
Tal Hayon 38011442e0 Decompile the rest of cucco 2022-02-01 21:29:06 +02:00
octorock 5ab9443679 Decompile Wizzrobes 2022-01-31 21:25:43 +01:00
Tal Hayon fe33694919 Decompile scissorsBeetle 2022-01-31 20:01:32 +02:00
Henny022p 2a53ee4bf2 merge master 2022-01-31 17:30:51 +01:00
Henny022p 9b60d9c5e2 sorted pause menu 2022-01-31 17:21:01 +01:00
notyourav 2b8d880ffc
Merge pull request #332 from hatal175/spawnstate
Use PlayerSpawnType enum in a few places
2022-01-31 00:21:12 -08:00
hatal175 2a9ffcba05
Remove unused struct members 2022-01-30 19:57:19 +02:00
notyourav 8dfc9f47f2
Merge pull request #330 from hatal175/playeractions
Use PlayerActions enum in several places
2022-01-29 22:43:26 -08:00
Tal Hayon 1c82153294 Use npc enum when possible 2022-01-30 02:23:45 +02:00
Tal Hayon d7146c7f1b Use Fx enum in more places 2022-01-30 02:19:19 +02:00
Tal Hayon 64c56499f9 Use projectile enum when possible 2022-01-30 02:11:16 +02:00
notyourav 40dd696e1d
Merge pull request #327 from hatal175/entitykind 2022-01-29 15:54:12 -08:00
octorock fb9174c0d3 Decompile most of PullableMushroom 2022-01-30 00:35:09 +01:00
octorock 96a2c5bbfe Decompile BlockPushed 2022-01-30 00:25:53 +01:00
octorock d50cdc86aa Decompile BigIceBlock 2022-01-30 00:22:29 +01:00
octorock fa53dc24bd Decompile SmallIceBlock 2022-01-30 00:19:14 +01:00
notyourav c151aa8863
Merge pull request #325 from hatal175/cuccoaggr 2022-01-29 15:16:03 -08:00
octorock c22b1c266b Decompile PushableFurniture 2022-01-30 00:14:39 +01:00
octorock 937de4f321 Decompile PushableStatue 2022-01-30 00:07:56 +01:00
octorock 23424bf194 Decompile PushableGrave 2022-01-29 23:56:04 +01:00
octorock ff7147e9da Decompile PushableRock 2022-01-29 23:55:23 +01:00
Tal Hayon b4f8429a2c Use PlayerFlags where possible 2022-01-30 00:32:10 +02:00
Tal Hayon bdb4aaef17 Decompile businessScrubPrologue 2022-01-30 00:28:48 +02:00
hatal175 ad657a3823
Merge branch 'master' into entitykind 2022-01-29 22:22:53 +02:00
notyourav d34aa9166f
Merge pull request #331 from hatal175/framestate 2022-01-29 11:26:17 -08:00
notyourav f610f3f4e8
Merge pull request #329 from hatal175/priority 2022-01-29 11:22:18 -08:00
notyourav dd4cd859a0
Merge pull request #328 from hatal175/entflags 2022-01-29 11:06:44 -08:00
notyourav 885ce54cec
Merge pull request #326 from hatal175/ballchainsolder 2022-01-29 11:00:24 -08:00
notyourav c77d45400b
Merge pull request #324 from hatal175/SFXEverywhere 2022-01-29 10:52:17 -08:00
notyourav 870f14893d
Merge pull request #323 from hatal175/object2a 2022-01-29 10:42:49 -08:00
Tal Hayon 63bffd9b34 Use SurfaceType in LilyPadLarge 2022-01-29 16:26:35 +02:00
Tal Hayon 1f2a791e49 Use PlayerControlMode in a few places 2022-01-29 15:54:09 +02:00
Tal Hayon 326143afcc Use PlayerSpawnType enum in a few places 2022-01-29 15:51:23 +02:00
Tal Hayon 3c2b1d5522 Use FrameState enum in a few places 2022-01-29 15:46:55 +02:00
Tal Hayon b34067cb0b Use PlayerActions enum in several places 2022-01-29 15:43:09 +02:00
Tal Hayon c3e3b499e0 Use Priority enum in Object6A 2022-01-29 15:38:13 +02:00
Tal Hayon d78359e9a2 Use EntityFlags enum where applicable 2022-01-29 15:34:30 +02:00
Tal Hayon 578fb3d1d8 Using EntityKind enum in various places 2022-01-29 15:12:23 +02:00
Tal Hayon 1c8f403340 Decompile ballChainSoldier 2022-01-29 15:03:45 +02:00
Tal Hayon ef103fd121 Decompile cuccoAggr 2022-01-28 20:14:47 +02:00
Tal Hayon 416a4b1191 Use sfx sounds enum whereever applicable 2022-01-28 13:11:05 +02:00
Tal Hayon 7a2fefb8a4 Decompile object2a 2022-01-28 12:47:54 +02:00
notyourav fd9049f598
Merge pull request #322 from hatal175/gibdo 2022-01-28 01:57:35 -08:00
Tal Hayon a5ff01f1bd clang format 2022-01-28 01:24:10 +02:00
Tal Hayon 3bac38339e Match gibdo functions and move to new entity structure 2022-01-28 01:22:32 +02:00
Tal Hayon 44449601b5 Decompile eu variants 2022-01-27 23:40:11 +02:00
notyourav a6817c4b9e
Merge pull request #320 from octorock/nonmatch
Unify asm for ASM_FUNCs
2022-01-27 12:58:58 -08:00
notyourav 6e50cf6c95
Merge pull request #319 from hatal175/phonograph 2022-01-27 12:34:39 -08:00
octorock 423231bdc6 Unify asm for ASM_FUNCs 2022-01-27 12:03:58 +01:00
notyourav d9c2998ae9
Merge pull request #317 from hatal175/spinybeetle 2022-01-27 02:57:30 -08:00
Tal Hayon 2cb23a3046 Review fixes 2022-01-27 08:27:50 +02:00
Tal Hayon dd9cedeef7 Decompile phonograph functions 2022-01-26 23:37:23 +02:00
Tal Hayon 81d8e5cd0c Decompile sub_08057450 2022-01-26 18:36:29 +02:00
Tal Hayon 8b30386759 Decompile spiny beetle 2022-01-26 18:33:14 +02:00
notyourav 6e509c40bd
Merge pull request #316 from hatal175/FindPalette
Match FindPalette
2022-01-24 22:41:47 -08:00
notyourav 8ab9c66df0
Merge pull request #315 from hatal175/ShowNPCDialogue
Decompile ShowNPCDialogue
2022-01-24 22:41:18 -08:00
Henny022p 82fa5159fd sorted kinstone and figurine menu 2022-01-25 00:44:48 +01:00
notyourav 45c595246a
Merge pull request #314 from hatal175/manager1
Work on manager1 asm_func
2022-01-24 15:39:44 -08:00
Tal Hayon 6a10dfe491 Match FindPalette 2022-01-25 00:52:18 +02:00
Tal Hayon 4f80ee63a3 Decompile ShowNPCDialogue 2022-01-25 00:22:27 +02:00
Tal Hayon 22211f4840 Work on manager1 asm_func 2022-01-25 00:19:42 +02:00
octorock d550d58ff3 Decompile BigPushableLever 2022-01-24 22:24:07 +01:00
octorock a6657fbd33 Decompile HittableLever 2022-01-24 21:52:22 +01:00
octorock b7abbfd927 Decompile PullableLever 2022-01-24 21:33:30 +01:00
octorock c7c6c6010c Decompile PushableLever 2022-01-24 18:41:48 +01:00
notyourav 97164d57cd
Merge pull request #312 from hatal175/sub_0806F0A4
Decompile sub_0806F0A4
2022-01-23 21:41:51 -08:00
Henny022p 6fd53ccfa0 started working on generic menu structs 2022-01-24 02:16:20 +01:00
Henny022p 0e57341980 decomp subtask.c 2022-01-24 01:46:08 +01:00
Tal Hayon 7ad3963170 clang format 2022-01-23 23:42:39 +02:00
Tal Hayon 425b4afaeb Renaming according to review 2022-01-23 23:40:56 +02:00
Tal Hayon 2319592bcd Decompile sub_0806F0A4 2022-01-23 23:37:59 +02:00
Tal Hayon 70e2ef5877 Merge remote-tracking branch 'upstream/master' into coord 2022-01-23 17:24:55 +02:00
Tal Hayon a1ae3b229b Decompile coord.s 2022-01-23 17:21:08 +02:00
theo3 737302d9d1 pressure plate ok 2022-01-22 11:32:56 -08:00
notyourav 93e745e963
Merge pull request #309 from notyourav/fp
fixed point stuff
2022-01-21 21:31:20 -08:00
theo3 a6f8dabcea fixed point stuff 2022-01-21 21:28:44 -08:00
Tal Hayon 3ffddc6c0e Decompile enemy66 2022-01-21 12:33:22 +02:00
notyourav 1726303213
Merge pull request #303 from hatal175/gleerok
Work on gleerok
2022-01-20 22:56:21 -08:00
Tal Hayon 204b7fcb3f Review fixes 2022-01-21 08:12:31 +02:00
Tal Hayon b9ede0c0cd Work on gleerok 2022-01-21 08:07:29 +02:00
notyourav 5244e059ba
Merge pull request #307 from hatal175/enemy49
Decompile Enemy49
2022-01-20 22:06:06 -08:00
Tal Hayon dbdcf4337a Decompile Enemy49 2022-01-21 08:02:26 +02:00
notyourav 0cf1dca4d2
Merge pull request #304 from octorock/lilypadLarge
Decompile LilypadLarge
2022-01-20 21:42:18 -08:00
notyourav eeb685220e
Merge pull request #302 from hatal175/PutItemOnSlot
Remove assembly instruction from PutItemOnSlot
2022-01-20 21:27:47 -08:00
notyourav bfd7b56933
Merge pull request #301 from hatal175/sub_080809D4
Remove asm directive from sub_080809D4
2022-01-20 21:23:51 -08:00
theo3 86dd589875 Merge remote-tracking branch 'upstream/master' into lilypadLarge 2022-01-20 20:13:28 -08:00
octorock 2da2b2b33e Decompile LilypadLarge 2022-01-20 14:06:59 +01:00
Tal Hayon 1004695922 Remove assembly instruction from PutItemOnSlot 2022-01-18 09:35:04 +02:00
Tal Hayon 25c9535e41 Remove asm directive from sub_080809D4 2022-01-18 09:18:53 +02:00
Tal Hayon c6d7453ed6 Match sub_0803AA98 2022-01-18 04:38:46 +02:00
Henny022p 4517e77563 decomp figurine menu 2022-01-17 03:11:40 +01:00
Henny022p 8ad65efb7c decomp kinstone menu 2022-01-16 23:32:07 +01:00
Tal Hayon d04a806abf Match CopyOAM 2022-01-14 04:18:42 +02:00
notyourav 68161d76d8
Merge pull request #298 from hatal175/sub_080177A0 2022-01-13 10:53:21 -08:00
notyourav c3046e4f8c
Merge pull request #297 from nonmatch/patch-31 2022-01-13 10:52:30 -08:00
notyourav b136cea485
Merge pull request #296 from hatal175/crow 2022-01-13 10:52:12 -08:00
Tal Hayon d4bc136bd7 Match sub_080177A0 2022-01-13 17:00:40 +02:00
hatal175 d2ceac97c9 Match sub_08056FEC 2022-01-13 03:14:46 +01:00
Tal Hayon 1cac914e23 Decompile crow 2022-01-13 04:04:53 +02:00
hatal175 0a7dd3781d Match sub_08034A10 2022-01-13 01:45:25 +01:00
notyourav db40a8d833
Merge pull request #294 from hatal175/sub_080348A4 2022-01-12 14:07:57 -08:00
notyourav 91a59c3845
Merge pull request #288 from octorock/nonmatch 2022-01-12 10:48:00 -08:00
Tal Hayon 96573e38aa Match sub_080348A4 2022-01-12 20:41:05 +02:00
notyourav a34b5fe55d
Merge pull request #293 from nonmatch/patch-29 2022-01-12 10:40:52 -08:00
notyourav 40f6a15e1f
Merge pull request #292 from nonmatch/patch-27 2022-01-12 10:40:29 -08:00
notyourav cb50175d59
Merge pull request #291 from nonmatch/patch-26 2022-01-12 10:38:50 -08:00
notyourav 453e400945
Merge pull request #281 from hatal175/sub_0806D5D4 2022-01-12 10:35:01 -08:00
hatal175 0faf1767cb Match sub_0803473C 2022-01-12 19:27:02 +01:00
hatal175 b71a46546a Match sub_08043770 2022-01-12 15:54:39 +01:00
hatal175 adffd0e7ff Match sub_080626E0 2022-01-12 15:10:53 +01:00
octorock b0b39514c2 Unify asm for non-matching functions
So that tools can easier work with them.
2022-01-12 12:16:36 +01:00
Tal Hayon 5476829893 Rename itemOnA and itemOnA, fix jp demo 2022-01-12 06:23:06 +02:00
notyourav 3cd77bb034
Merge pull request #290 from nonmatch/patch-25
Match sub_08034B38
2022-01-11 19:57:15 -08:00
notyourav 7c2153f2f9
Merge pull request #289 from nonmatch/patch-24
Match sub_080347B4
2022-01-11 19:56:56 -08:00
notyourav 3ba9461b08
Merge pull request #287 from nonmatch/patch-23
Match sub_0803A188
2022-01-11 19:56:16 -08:00
notyourav 5512cfb997
Merge pull request #286 from hatal175/sub_08090E64
Match sub_08090E64
2022-01-11 19:55:54 -08:00
notyourav 0c6e21c4c6
Merge pull request #285 from hatal175/sub_08061464
Decompile sub_08061464
2022-01-11 19:48:55 -08:00
notyourav a71c2243d0
Merge pull request #284 from nonmatch/patch-19
Match sub_0802594C
2022-01-11 19:48:19 -08:00
notyourav 6993c3967f
Merge pull request #283 from nonmatch/patch-16
Match PlayerItemBomb
2022-01-11 19:47:41 -08:00
notyourav 981c6a487f
Merge pull request #282 from nonmatch/patch-15
Match sub_08068190
2022-01-11 19:47:29 -08:00
notyourav 00d104e28c
Merge pull request #280 from nonmatch/patch-14
Match sub_080AA320
2022-01-11 19:46:57 -08:00
notyourav 410ea3871a
Merge pull request #279 from nonmatch/patch-13
Match sub_08068190
2022-01-11 19:46:38 -08:00
notyourav 5c3dc144ab
Merge pull request #278 from nonmatch/patch-12
Match sub_0806265C
2022-01-11 19:44:51 -08:00
notyourav 22caeae4ba
Merge pull request #277 from nonmatch/patch-11
Match sub_08068190
2022-01-11 19:44:31 -08:00
notyourav a33338a5bc
Merge pull request #276 from nonmatch/patch-10
Match sub_08068190
2022-01-11 19:41:28 -08:00
notyourav 28ab5262ec
Merge pull request #275 from hatal175/takkuri 2022-01-11 19:34:08 -08:00
hatal175 9fa3217cdb Match sub_08034B38 2022-01-11 21:13:37 +01:00
hatal175 8ae5153cef Match sub_080347B4 2022-01-11 21:02:27 +01:00
hatal175 c147c56151 Match sub_0803A188 2022-01-11 18:30:43 +01:00
Tal Hayon b21576892f Match sub_08090E64 2022-01-11 18:40:50 +02:00
Tal Hayon 4d44777caf Decompile sub_08061464 2022-01-11 18:37:12 +02:00
hatal175 68fceeb3c4 Match sub_0802594C 2022-01-11 17:06:08 +01:00
hatal175 b09b80f9d9 Match PlayerItemBomb 2022-01-11 15:42:07 +01:00
hatal175 9cb81ae723 Match sub_0806A26C 2022-01-11 15:14:35 +01:00
Tal Hayon 6b0f125be0 Match sub_0806D5D4 2022-01-11 16:01:04 +02:00
hatal175 91e58924d6 Match sub_080AA320 2022-01-11 14:17:58 +01:00
hatal175 11b81686e5 Match Sturgeon 2022-01-11 14:06:26 +01:00
hatal175 24b87e8d1e Match sub_0806265C 2022-01-11 13:53:48 +01:00
hatal175 d37e3df116 Match sub_080621AC 2022-01-11 13:35:52 +01:00
hatal175 beaeb8406d Match sub_0806F998 2022-01-11 13:13:34 +01:00
Tal Hayon 045f00141c Rename OBJECT_RUPEE 2022-01-11 13:01:20 +02:00
Tal Hayon d852efec29 Merge remote-tracking branch 'upstream/master' into takkuri 2022-01-11 12:58:21 +02:00
Tal Hayon c3bada6cd0 Decompile takkuri 2022-01-11 12:56:44 +02:00
Tal Hayon 71ae6e9adf Decompile flyingskull 2022-01-11 12:22:00 +02:00
notyourav 688508b1af
Merge pull request #271 from hatal175/bombarossa
Decompile Bombarossa
2022-01-09 23:47:06 -08:00
notyourav 2ccc45995c
Merge pull request #269 from hatal175/sub_0801D898
Decompile sub_080451CC
2022-01-09 23:46:51 -08:00
notyourav e0194734ab
Merge pull request #272 from Ibot02/gyorg
Gyorg
2022-01-09 23:46:09 -08:00
notyourav 3684f8ba88
Merge pull request #273 from hatal175/variousdata
Add data to previously decompiled code
2022-01-09 23:28:49 -08:00
notyourav 0fba48297a
Merge pull request #270 from hatal175/curtain
Decompile curtain
2022-01-09 23:20:53 -08:00
Tal Hayon 8e56dfeec0 curtain: Added const data 2022-01-10 07:25:41 +02:00
Tal Hayon 37d6730844 Add data to previously decompiled code 2022-01-10 07:22:21 +02:00
notyourav 326c6be536
Merge pull request #268 from nonmatch/patch-9
Match sub_08062634
2022-01-09 20:57:29 -08:00
notyourav 8413785bd4
Merge pull request #267 from nonmatch/patch-8
Match sub_080611D4
2022-01-09 20:51:43 -08:00
notyourav 027cada70b
Merge pull request #266 from nonmatch/patch-7
Match sub_0801D898
2022-01-09 20:47:37 -08:00
Tal Hayon 0386804a2f clang format 2022-01-10 06:26:31 +02:00
Tal Hayon 54236cacb5 Review fixes 2022-01-10 06:24:41 +02:00
notyourav 177ac7fe63
Merge pull request #265 from nonmatch/patch-6 2022-01-09 15:39:35 -08:00
notyourav e394539e05
Merge pull request #264 from hatal175/soundreqvals 2022-01-09 15:29:59 -08:00
HookedBehemoth dc30b65569 Match sub_08062634 2022-01-09 23:00:20 +01:00
Ibot02 4fc5a7c3e4 Merge branch 'master' into gyorg 2022-01-09 20:46:03 +01:00
notyourav 8a82cda2de
Merge pull request #263 from hatal175/steam 2022-01-09 11:27:47 -08:00
notyourav 69aff9c464
Merge pull request #262 from hatal175/barrelInside 2022-01-09 11:27:34 -08:00
notyourav e819493e7f
Merge pull request #261 from nonmatch/patch-5 2022-01-09 11:27:18 -08:00
Ibot02 85fa74cc57 Gyorg: Rename heap struct 2022-01-09 19:58:04 +01:00
Tal Hayon ca028349df Decompile Bombarossa 2022-01-09 20:32:43 +02:00
Tal Hayon c1c356d22a clang format 2022-01-09 19:27:24 +02:00
Tal Hayon 4b13a7f19c Decompile curtain 2022-01-09 19:26:42 +02:00
Tal Hayon 841bc9af47 Decompile sub_080451CC 2022-01-09 17:11:16 +02:00
hatal175 d421e24de3 Match sub_080611D4 2022-01-09 15:37:23 +01:00
hatal175 291446ca84 Match sub_0801D898 2022-01-09 12:14:07 +01:00
hatal175 b26882d9b5 Match sub_08054A60 2022-01-09 10:49:00 +01:00
Tal Hayon 4f43dc0196 Use sound enum in all SoundReq calls 2022-01-09 10:22:33 +02:00
notyourav 7b87141d9b
Merge pull request #260 from hatal175/goldenoctorock 2022-01-08 21:54:56 -08:00
notyourav b67cf7d606
Merge pull request #259 from nonmatch/patch-1 2022-01-08 21:49:01 -08:00
notyourav 1aea699901
Merge pull request #258 from hatal175/vaatiarm 2022-01-08 21:46:35 -08:00