Commit Graph

466 Commits

Author SHA1 Message Date
notyourav 6e509c40bd
Merge pull request #316 from hatal175/FindPalette
Match FindPalette
2022-01-24 22:41:47 -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 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 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 0e57341980 decomp subtask.c 2022-01-24 01:46:08 +01: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
notyourav 1726303213
Merge pull request #303 from hatal175/gleerok
Work on gleerok
2022-01-20 22:56:21 -08:00
Tal Hayon b9ede0c0cd Work on gleerok 2022-01-21 08:07:29 +02:00
notyourav 0cf1dca4d2
Merge pull request #304 from octorock/lilypadLarge
Decompile LilypadLarge
2022-01-20 21:42:18 -08:00
octorock 2da2b2b33e Decompile LilypadLarge 2022-01-20 14:06:59 +01:00
Tal Hayon 3f106a1bcf Delete inc file as well 2022-01-18 12:13:25 +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
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
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
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
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
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
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 cc82e19bfb Delete inc file 2022-01-11 18:39:52 +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
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
notyourav e0194734ab
Merge pull request #272 from Ibot02/gyorg
Gyorg
2022-01-09 23:46:09 -08: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
notyourav 177ac7fe63
Merge pull request #265 from nonmatch/patch-6 2022-01-09 15:39:35 -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 e819493e7f
Merge pull request #261 from nonmatch/patch-5 2022-01-09 11:27:18 -08: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
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
notyourav acec71d277
Merge pull request #256 from hatal175/ghostbrothers 2022-01-08 21:45:16 -08:00
hatal175 b1aef13a9d Match CreateItemDrop 2022-01-09 02:17:35 +01:00
Ibot02 f21b6a477f Match sub_08024E4C 2022-01-08 18:08:02 +01:00
Ibot02 08558c96bd Match sub_080249F4 2022-01-08 18:08:02 +01:00
Tal Hayon ab0ea2a697 vaatiarm: Fix sub_08043490 2022-01-08 14:30:51 +02:00
notyourav dd6953fac9
Merge pull request #255 from hatal175/gibdo 2022-01-08 01:19:00 -08:00
notyourav 1dacfa1745
Merge pull request #253 from hatal175/castorwild 2022-01-08 01:18:16 -08:00
Tal Hayon b4557f8778 Decompile ghostbrothers functions 2022-01-07 17:34:18 +02:00
Tal Hayon a4a05e5902 Fix some gibdo nonmatching 2022-01-07 09:52:05 +02:00
Tal Hayon 6d7e13c63c Decompile castleMaid functions 2022-01-07 08:06:47 +02:00
Tal Hayon 4023a0b288 Work on castorWildStatue 2022-01-07 04:42:12 +02:00
notyourav c437387f02
Merge pull request #251 from hatal175/fileselect 2022-01-06 09:35:04 -08:00
Tal Hayon 248bc9acc0 Decompile sub_080517B4 2022-01-06 14:35:25 +02:00
Tal Hayon 73c9b8dbb2 Work on projectile asm functions 2022-01-06 12:46:26 +02:00
theo3 3144d53159 doc entity.h 2022-01-05 17:52:39 -08:00
theo3 a1da1889e3 Fade documentation 2022-01-05 12:47:34 -08:00
notyourav fb6d16f20d
Merge pull request #243 from notyourav/gme
tasks, subtasks, game.c
2022-01-04 21:03:14 -08:00
theo3 7036ec73af game.c doc 2022-01-04 18:39:32 -08:00
notyourav 3a08d67c2f
Merge pull request #242 from hatal175/itemLantern
Decompile EU sub_08075ADC
2022-01-04 16:19:43 -08:00
theo3 52db70bb9d naming work 2022-01-03 23:58:02 -08:00
Tal Hayon 6e6517d287 Decompile EU sub_08075ADC 2022-01-03 08:31:20 +02:00
Tal Hayon 0280065914 Decompile EU sub_0801F428 2022-01-03 04:51:04 +02:00
theo3 415f5213a9 PlayerNormal ok 2022-01-02 16:10:29 -08:00
notyourav 466b508413
Merge pull request #238 from notyourav/clr
color.c, utils->common.c
2022-01-01 18:29:08 -08:00
theo3 1ca41b54a9 color.c, utils->common.c 2022-01-01 18:26:25 -08:00
Tal Hayon 09de51bef2 Decompile DispMessageFrame 2022-01-01 13:25:46 +02:00
notyourav 4ca44a90a9
Merge pull request #235 from hatal175/coord 2021-12-30 22:11:44 -08:00
Tal Hayon ed98ab4b76 Decompiled some coord.c functions 2021-12-31 02:41:30 +02:00
Tal Hayon 10562f5898 Tried to decompile dispCtrlSet 2021-12-30 12:48:00 +02:00
theo3 0e9a7a5e66 strip fake linker symbols 2021-12-29 02:59:02 -08:00
theo3 cbd0b7e6c9 rename files 2021-12-28 23:33:10 -08:00
theo3 0f65f8fd50 Identify player functions and update asm.h 2021-12-28 12:08:30 -08:00
notyourav 9456e38606
Merge pull request #225 from notyourav/asm_funcs
finish player, label script functions
2021-12-27 21:32:31 -08:00
notyourav d8dfff5de9
Merge pull request #224 from hatal175/collision
Improve nonmatching state in collision.c
2021-12-27 21:30:03 -08:00
notyourav 5b84008265
Merge pull request #223 from hatal175/PutItemOnSlot
Fix nonmatching PutItemOnSlot
2021-12-27 20:00:25 -08:00
notyourav 4fa53c17a0
Merge pull request #222 from hatal175/moblinspear
Decompile MoblinSpear_Action1
2021-12-27 19:58:02 -08:00
Tal Hayon 9efd8da104 Improve nonmatching state in collision.c 2021-12-28 05:27:27 +02:00
theo3 ebaa6d76fa merge 2021-12-27 18:23:03 -08:00
theo3 24750a6bb5 finish player.c 2021-12-27 17:14:52 -08:00
Tal Hayon 167fe1122e Fix nonmatching PutItemOnSlot 2021-12-27 17:06:51 +02:00
Tal Hayon f85a48be71 Decompile MoblinSpear_Action1 2021-12-27 15:58:45 +02:00
Ibot02 5896ae9831 gyorgFemale.c: ok 2021-12-27 13:19:34 +01:00
Tal Hayon 4241057135 Work on screenDemo.c 2021-12-27 09:58:35 +02:00
octorock 2ccf89a1fb Rename scripts 2021-12-26 23:22:16 +01:00
theo3 079260dbd6 name asm funcs 2021-12-25 21:28:44 -08:00
theo3 1f515e6958 doc surface types 2021-12-25 16:35:54 -08:00
theo3 1218a8b691 object6A ok 2021-12-22 22:13:30 -08:00
theo3 6cff332e57 header overhaul 2021-12-20 10:31:02 -08:00
theo3 3c4e1762d9 util files 2021-12-19 17:57:42 -08:00
theo3 28bf8b929f furniture ok 2021-12-16 21:12:43 -08:00
Ibot02 05edb3e24c Match sub_0801B8FC 2021-12-16 00:01:52 +01:00
theo3 3efaac9457 merge 2021-12-14 23:32:15 -08:00
theo3 34e69959df cleanup 2021-12-14 23:31:27 -08:00
octorock 2580b33a20 Decompile OctorokBoss 2021-12-13 21:55:22 +01:00
theo3 10d0d9e589 overworld 2021-12-12 01:50:09 -08:00
Ibot02 27789fa949 Manager14.c: ok 2021-11-30 14:50:02 +01:00
octorock 3a523cb74b Decompile entity init functions 2021-11-14 14:50:45 +01:00
octorock 9396484df6 Merge branch 'master' into asset-extraction 2021-11-12 12:13:13 +01:00
octorock b1e2175ffb Extract entity definitions 2021-11-12 11:04:37 +01:00
octorock a6d133e42d Merge branch 'master' into asset-extraction 2021-11-06 00:33:07 +01:00
theo3 a9bb5184d0 Merge remote-tracking branch 'upstream/master' into m 2021-11-05 01:58:55 -07:00
theo3 207d70ad77 dump flags to c 2021-11-05 00:05:15 -07:00
theo3 9cfbb3a27a entity changes, textbox changes 2021-11-04 20:56:03 -07:00
theo3 9ef31544e2 prep 2021-11-02 23:05:38 -07:00
octorock 21e3e54c5f Convert directly referenced entity lists 2021-10-25 00:14:36 +02:00
octorock 947f686906 Merge branch 'master' into demo-jp 2021-10-23 14:07:39 +02:00
Henny022p 195c62d641 rename functions and clean some code 2021-10-23 02:10:42 +02:00
Henny022p d1204ba2dc merge changes from master 2021-10-22 23:30:04 +02:00
octorock 47154cb556 Add DEMO_JP variant 2021-10-16 21:28:16 +02:00
octorock 6630a82057 Rename projectiles 2021-10-16 17:31:57 +02:00
octorock b1e3830872 Name CreateProjectile functions 2021-10-16 17:29:50 +02:00
Ibot02 2709802f33 manager10.c: ok 2021-09-30 12:24:22 +02:00
Ibot02 dff1c29f56 manager2B: match sub_0805D02C and sub_0805D11C 2021-09-29 11:27:12 +02:00
Ibot02 23413dadca manager15: removed unused nonmatching 2021-09-29 10:43:03 +02:00
Ibot02 d28b218904 manager12: removed unused nonmatching 2021-09-29 10:42:00 +02:00
Ibot02 8be102db29 managerC: matched sub_08058D34 2021-09-29 10:38:33 +02:00
Ibot02 f1447af6f8 managerF: delete unused nonmatchings 2021-09-29 10:28:12 +02:00
Ibot02 81c8e7622f manager4: matched sub_0805795C 2021-09-29 10:27:49 +02:00
Ibot02 86eae33e32 manager2: Deleted unused nonmatching 2021-09-29 10:23:49 +02:00
octorock 9283aa5afe Decompile manager32 2021-09-26 14:09:42 +02:00
octorock 08659c4001 Decompile manager12 2021-09-26 00:42:20 +02:00
octorock ff21673dfb Decompile manager37 2021-09-19 11:15:51 +02:00
octorock 578806e30a Decompile manager18 2021-09-19 10:22:46 +02:00
octorock 6d08b91b15 Decompile manager2 2021-09-19 09:50:12 +02:00
octorock ebe6d231bc Decompile manager23 2021-09-18 20:36:51 +02:00
octorock aa6cafcb98 Decompile manager31 2021-09-18 13:28:17 +02:00
octorock 9147fa8272 Decompile manager21 2021-09-18 12:57:32 +02:00
octorock 1b122a05b6 Decompile manager13 2021-09-18 12:26:19 +02:00
octorock 7a70c65680 Decompile manager33 2021-09-18 11:30:41 +02:00
octorock fe1e97f8ef Decompile manager1B 2021-09-18 10:35:50 +02:00
octorock d632913122 Decompile manager35 2021-08-30 17:56:40 +02:00
octorock 29d7c7bd6b Decompiler manager34 2021-08-30 17:56:05 +02:00
octorock 14323b92be Decompile manager2E 2021-08-30 17:55:34 +02:00
octorock 3f247035d0 Decompile manager19 2021-08-29 12:32:44 +02:00
octorock f4447dabc3 Decompile manager1F 2021-08-29 12:13:40 +02:00
octorock d0d4c3323e Decompile manager1D 2021-08-28 23:25:40 +02:00
octorock 612011c12b Split manager files 2021-08-28 22:46:19 +02:00
Henny022p 30dc95e512 decomp vaati reborn 2021-08-16 18:32:22 +02:00
octorock fd640407bb Split item files 2021-07-04 16:03:58 +02:00
octorock 813a824e8a Move demo screen into own file 2021-06-23 22:53:11 +02:00
octorock 5a301b97fa Disassemble functions 2021-06-23 08:30:45 +02:00
octorock 833d48b735 Add EU variant 2021-06-23 08:30:45 +02:00
octorock 57ab4df1a0 Add JP variant 2021-06-23 08:30:45 +02:00
Henny022p fa2779a383 first part of vaati reborn enemy 2021-06-19 13:20:51 +02:00
octorock 1721a05ef8 Decompile some projectiles 2021-06-10 21:27:27 +02:00
Henny022p a1a8e0d1fc decomp vaati reborn npc 2021-05-28 16:26:09 +02:00
Henny022p a0af1ae46d decomp vaati projectile 2021-05-28 14:17:45 +02:00
Henny022p 0d98d00c01 decomp vaati arm 2021-05-28 06:20:14 +02:00
octorock fce61af0b8 Split npc files 2021-05-27 22:16:22 +02:00
octorock 54ae9dfa85 Decompile kid 2021-05-27 22:10:26 +02:00
octorock bbc78fd2d2 Decompile npc5 2021-05-27 22:10:26 +02:00
octorock f2c69d0b7c Unify nonmatching namings 2021-05-13 01:16:24 +02:00
Henny022p 89c44805b2 decomp vaati.s 2021-05-11 16:13:16 +02:00
notyourav 3f1160c249
Merge pull request #155 from notyourav/moreply
more player
2021-05-01 17:20:30 -07:00
Henny022p edc21b146f merge latest changes 2021-05-02 01:50:02 +02:00
theo3 6b55ebe4d3 more player 2021-05-01 13:05:49 -07:00
Henny022p 3b7a042138 mazaal head 2021-05-01 20:29:12 +02:00
Henny022p f72a051069 mazaal bracelet decomp 2021-04-29 20:50:57 +02:00
theo3 c99408c849 merge + fix 2021-04-20 21:24:44 -07:00
Henny022p 5cebf089fd Merge branch 'master' into m4a 2021-03-22 10:18:20 +01:00
Henny022p e0ee481eeb matched 4 more functions 2021-03-22 07:08:24 +01:00
notyourav 8b81269271
Merge branch 'master' into ply 2021-03-17 20:23:01 -07:00
theo3 a39686c24c fix 2021-03-17 20:20:32 -07:00
Henny022p 9aa9a44e52 port m4a 2021-03-17 21:02:42 +01:00
theo3 af98f5f9a3 several more player functions done 2021-03-15 21:24:10 -07:00