Commit Graph

846 Commits

Author SHA1 Message Date
theo3 2325ed7144 Merge remote-tracking branch 'upstream/master' 2020-08-03 12:16:16 -07:00
theo3 b4a34e01bf object2A.c ok 2020-08-03 12:15:05 -07:00
Marcus Huderle b6864cfac6 Finish decompiling heartContainer.c 2020-08-02 12:23:25 -05:00
theo3 0d39bb7f11 goronMerchant.c 2020-07-24 14:18:58 -07:00
theo3 45298f8a96 librari.c OK 2020-07-23 23:50:37 -07:00
theo3 2d286c0b34 rupeeLike.c OK 2020-07-23 22:48:16 -07:00
theo3 67da19b92c structures.h 2020-07-22 23:05:12 -07:00
theo3 c650e7fcb2 jp title screen ok 2020-07-22 00:57:06 -07:00
theo3 2555185721 menu main func OK 2020-07-21 23:02:19 -07:00
theo3 25a3b49d4b upperInn OK 2020-07-18 14:50:31 -07:00
theo3 cf132572ac room entity funcs partially decomped 2020-07-18 01:06:00 -07:00
theo3 29fd48cc22 item.c 2020-07-16 21:03:49 -07:00
theo3 2527f9c188 Merge remote-tracking branch 'upstream/master' 2020-07-16 19:50:29 -07:00
theo3 0f07e1ab9b code_0804AA84.c 2020-07-16 12:50:59 -07:00
Macrepeh 002049798b
Update linker.ld 2020-07-16 10:49:35 -04:00
theo3 18069fcd80 menu def 2020-07-16 02:57:14 -07:00
theo3 ccb6ec4a9c merge dma funcs 2020-07-16 01:02:46 -07:00
theo3 92146289ad dmaZero.c 2020-07-16 00:57:45 -07:00
theo3 d49545317a input.c OK 2020-07-15 20:45:28 -07:00
theo3 035d4a150f tingleSiblings.c started 2020-07-15 20:12:52 -07:00
notyouraveragehooman c97a025a88
Merge pull request #3 from zeldaret/master
merge upstream
2020-07-15 18:53:33 -07:00
theo3 7d42d7c0de keese.c OK 2020-07-15 17:30:26 -07:00
chandler b80c5bd468 merge from upstream 2020-07-15 17:32:56 -04:00
chandler c6ff4964e5 one non-matching in beedle 2020-07-15 17:27:31 -04:00
notyouraveragehooman 6b01f03ce6
Merge branch 'master' into master 2020-07-15 01:40:49 -07:00
theo3 4b1bbd23e9 leever.c 1 nonmatching 2020-07-15 01:35:14 -07:00
theo3 49a7236b74 jailBars.c OK 2020-07-14 22:49:12 -07:00
theo3 24f95d6313 objectAF.c OK 2020-07-14 22:38:38 -07:00
theo3 882aef9fdc code_08077B98 2020-07-14 22:09:07 -07:00
notyouraveragehooman f89035be43
Merge pull request #23 from Macrepeh/master
Anju
2020-07-14 16:28:40 -07:00
notyouraveragehooman d9d2e806b0
Merge pull request #22 from gamestabled/keaton
one non-matching in keaton
2020-07-14 16:27:18 -07:00
theo3 f9bdae5fe6 melari.c OK 2020-07-14 16:22:45 -07:00
Macrepeh c0ed079d03
Update linker.ld 2020-07-14 19:14:32 -04:00
chandler 3797c700b3 one non-matching in keaton 2020-07-14 18:46:58 -04:00
theo3 ed5c6d08dd npc9.c OK 2020-07-13 19:57:32 -07:00
theo3 94b6040d7d townsperson.c 1 nonmatching 2020-07-13 19:49:27 -07:00
theo3 62ddaaa5f6 add subdirs 2020-07-13 15:27:20 -07:00
theo3 c47f16e5e7 postman.c 2020-07-13 13:44:50 -07:00
theo3 73b72d6696 forestMinish.c 1 nonmatching 2020-07-13 01:31:58 -07:00
theo3 6aba97697b gentari.c OK 2020-07-12 22:58:48 -07:00
theo3 d429f7f9cb mutoh.c OK 2020-07-12 22:27:28 -07:00
theo3 4f20b61b70 smoke.c, teachers.c OK 2020-07-12 17:14:46 -07:00
theo3 370c63e21e metalDoor.c OK 2020-07-12 16:28:53 -07:00
theo3 4cffc35604 railtrack.c 2020-07-12 15:54:01 -07:00
theo3 cdeae36d09 smith.c OK 2020-07-11 22:13:00 -07:00
theo3 9753a51b92 object9E.c OK 2020-07-11 01:59:40 -07:00
theo3 02cb79b6c4 swordsmanNewsletter.c OK 2020-07-10 22:34:55 -07:00
theo3 03a8e052af commented offsets in entity, linkState 2020-07-09 01:39:40 -07:00
theo3 bde7b45adb object86.c OK 2020-07-08 19:45:04 -07:00
theo3 6f08201b71 treeHidingPortal.c 2020-07-07 19:19:42 -07:00
21aslade 10033aabe9 Merge branch 'master' of https://github.com/zeldaret/tmc 2020-07-07 19:26:17 -06:00
21aslade f6f4d25bb9 Partially document lakitu.c
Also ran the newline portion of format.sh and split some data files
2020-07-07 19:24:38 -06:00
theo3 d49be370d4 header clean up 2020-07-07 16:48:16 -07:00
theo3 f9e9fe0141 dampe.c OK 2020-07-07 15:32:27 -07:00
theo3 c5897e647c lightableSwitch OK 2020-07-06 13:56:19 -07:00
notyouraveragehooman a4a932deb6
Merge pull request #21 from 21aslade/master
lakituCloud.c lakitu.c wheaton.c OK
2020-07-01 15:17:48 -07:00
theo3 18385e641e Merge branch 'master' of https://github.com/zeldaret/tmc 2020-07-01 15:13:34 -07:00
theo3 05a5fa0a28 miniFireballGuy.c 2020-07-01 15:13:27 -07:00
Macrepeh 1f7442f8e8
Update linker.ld 2020-07-01 17:53:12 -04:00
21aslade d21a0afec2 wheaton.c OK 2020-07-01 12:13:36 -06:00
21aslade 607c32ac5e lakitu.c OK
Also changed some parts of the entity struct and created trig.h
2020-07-01 12:03:23 -06:00
21aslade e241a70a31 Merge branch 'master' of https://github.com/zeldaret/tmc 2020-06-29 08:07:54 -06:00
21aslade 6304bbc3f2 lakituCloud.s OK
Also edited a few names in the entity struct to match usage more.
2020-06-28 22:05:36 -06:00
theo3 344de9129d defined areaPropertyLists.s 2020-06-23 15:15:27 -07:00
theo3 8f0c917ab5 manager27 OK 2020-06-21 01:40:18 -07:00
notyouraveragehooman beded558bf
Merge pull request #19 from 21aslade/master
mineralWaterSource.c OK
2020-06-21 00:17:19 -07:00
theo3 5373908c73 split managers 2020-06-21 00:16:58 -07:00
21aslade 933417209a mineralWaterSource.c OK
Also modified entity.h to include BoundingBox
2020-06-20 21:45:19 -06:00
theo3 94d3564e5f Merge branch 'master' of https://github.com/zeldaret/tmc 2020-06-19 23:40:03 -07:00
theo3 156f4d0c37 hangingSeed OK 2020-06-19 23:39:55 -07:00
notyouraveragehooman 969241a1d0
Revert "Revert "mask.c OK"" 2020-06-19 22:43:20 -07:00
theo3 6e6e4d3180 Merge branch 'master' of https://github.com/zeldaret/tmc 2020-06-19 22:42:01 -07:00
notyouraveragehooman 9b9fff2f36
Revert "mask.c OK" 2020-06-19 22:41:34 -07:00
theo3 49f8e37806 Merge branch 'master' of https://github.com/zeldaret/tmc 2020-06-19 22:36:43 -07:00
theo3 4240e9e42d chestSpawner 2020-06-19 22:36:36 -07:00
notyouraveragehooman ff875f593f
Merge pull request #16 from 21aslade/master
mask.c OK
2020-06-19 22:36:16 -07:00
theo3 82ee1318aa windTribespeople 2020-06-19 19:59:57 -07:00
21aslade d13da4af82 Merge branch 'master' of https://github.com/zeldaret/tmc 2020-06-19 13:34:22 -06:00
21aslade a27bcf72c6 mask.c OK
Not updated to latest changes to header files yet
2020-06-19 13:31:59 -06:00
theo3 cae2706938 thoughtBubble.c OK 2020-06-19 00:35:45 -07:00
theo3 32ad8dec4d greatFairy.c polishing 2020-06-18 03:04:57 -07:00
theo3 2f0baaf453 begin decomp gamestrings 2020-06-16 19:41:38 -07:00
theo3 0dbd3a87c6 keese.c 2020-06-16 15:04:52 -07:00
theo3 8740036073 npc table 2020-06-16 12:45:07 -07:00
theo3 1e384fe0a3 position.c tentative 2020-06-16 12:06:23 -07:00
theo3 c9ab3b9815 define COORD_TO_TILE 2020-06-16 11:19:52 -07:00
theo3 0105a247b8 windcrest.c, windTribeFlag.c OK 2020-06-16 10:31:22 -07:00
theo3 90a9cd39be flags.c OK 2020-06-16 09:02:57 -07:00
theo3 307c8cfc61 flags.c 2020-06-16 01:07:51 -07:00
theo3 d92be5f9cc begin rem 2020-06-15 21:19:18 -07:00
notyouraveragehooman e5f36eecff
Merge pull request #15 from 21aslade:master
Two functions in townMinish.c OK
2020-06-15 15:49:57 -07:00
theo3 8c45cd3f5d Merge branch 'master' of https://github.com/zeldaret/tmc 2020-06-15 15:48:22 -07:00
theo3 7bb61194f4 blade brothers decomped 2020-06-15 15:47:32 -07:00
21aslade 06f2cd289d Two functions in townMinish.c OK
Also created npc.h and format.sh'd various files.
A third function is outlined in townMinish.c, but currently
non-matching.
2020-06-15 16:23:10 -06:00
notyouraveragehooman 5f849940fc
Merge pull request #14 from lemon-sherbet/goron
goron OK
2020-06-15 13:59:46 -07:00
notyouraveragehooman c547b9b479
Merge pull request #13 from lemon-sherbet/malon
delete malon.s
2020-06-15 13:59:34 -07:00
theo3 f3f7b518cb bladeBrothers.c OK 2020-06-15 13:57:09 -07:00
lemon-sherbet 98f6999b3d goron OK 2020-06-15 19:11:52 +02:00
lemon-sherbet 4bde8a1ed9 delete malon.s
also change linker script to use malon.c. this was reverted by dd8cedb4c6
2020-06-15 16:04:07 +02:00
theo3 710f220077 Merge branch 'master' of https://github.com/zeldaret/tmc 2020-06-15 00:11:59 -07:00
theo3 8604daff6a smallPesto 2020-06-15 00:11:43 -07:00
chandler a9ef27fa23 talon OK 2020-06-15 02:39:21 -04:00
theo3 4d8721d19a defined object table 2020-06-14 20:31:22 -07:00
theo3 52f003086a converted enemy ptr table 2020-06-14 18:49:49 -07:00
theo3 bd307ea8eb bladeBrother.c start 2020-06-14 04:42:46 -07:00
theo3 dd8cedb4c6 Revert "Merge pull request #9 from gamestabled/malon"
This reverts commit 0c54eb2b4c, reversing
changes made to c312b101da.
2020-06-14 00:08:44 -07:00
chandler ce030bc8ac malon OK. made functions.h. fixed typos in format.sh. tidied up epona.c 2020-06-14 01:49:21 -04:00
theo cc298f0fd2 Merge branch 'master' of https://github.com/zeldaret/tmc 2020-06-13 14:54:58 -07:00
theo a98080504d sub_08070680 OK 2020-06-13 14:54:12 -07:00
notyouraveragehooman 6fdaee5d2e
Merge pull request #8 from Macrepeh/master
bladeTrap
2020-06-13 14:51:28 -07:00
notyouraveragehooman 60f1ea5913
Merge pull request #7 from lemon-sherbet/cow_npc
decompile cow
2020-06-13 14:51:17 -07:00
notyouraveragehooman f4d8c90e9d
Merge pull request #6 from gamestabled/zelda
zelda OK
2020-06-13 14:51:06 -07:00
macrepeh e0b6a041f0 . 2020-06-13 12:31:43 -04:00
macrepeh 4ce943b4a2 test 2020-06-13 12:14:36 -04:00
lemon-sherbet 556308d774 finish cow.c, delete cow.s 2020-06-13 13:43:14 +02:00
lemon-sherbet 791738fa5c first 3 functions 2020-06-13 10:59:01 +02:00
chandler 23dfe5affa zelda OK 2020-06-13 02:52:13 -04:00
theo a3be262635 definition streamlining 2020-06-12 21:55:38 -07:00
chandler 14bf24cb8f epona OK 2020-06-12 16:40:07 -04:00
theo fb28b125d4 cloud 2020-06-12 11:22:12 -07:00
theo d8eb7b1df7 Merge branch 'master' of https://github.com/zeldaret/tmc 2020-06-12 02:56:57 -07:00
theo ab1157d869 function renaming 2020-06-12 02:54:00 -07:00
notyouraveragehooman cc4c91682d
Merge pull request #4 from gamestabled/well
Well
2020-06-12 02:53:13 -07:00
notyouraveragehooman 4dbaee3bb4
Merge pull request #3 from gamestabled/giantLeaf
giantLeaf matching
2020-06-12 02:52:59 -07:00
chandler a0ff5a93b7 well OK 2020-06-12 04:22:06 -04:00
chandler 38aa328dfd giantLeaf OK 2020-06-12 03:33:18 -04:00
gamestabled 29d8ee9b06 bell matching 2020-06-12 00:21:54 -04:00
theo 1d305716d5 flag routine identification 2020-06-11 17:58:56 -07:00
theo 6f91fbbdb9 misc function renaming 2020-06-11 02:52:05 -07:00
theo ada93e7653 split all enemies 2020-06-10 16:10:46 -07:00
theo 25c7bddfb9 all objects split 2020-06-10 13:03:51 -07:00
theo 6d136c0516 split objects 2020-06-10 04:30:08 -07:00
theo 0bee9cff0b object1A complete 2020-06-09 02:23:38 -07:00
theo 9bf674b087 octorok 2020-06-09 01:47:11 -07:00
theo 5ed687df73 great fairy ~70% 2020-06-09 00:20:29 -07:00
theo e4ee89d5a6 updated symbols 2020-06-07 21:34:18 -07:00
theo 83d240e9a5 split npcs 2020-06-06 19:12:44 -07:00
theo 2554a7df5a fixed install.md 2020-06-06 13:49:18 -07:00
theo 7afbda2b4d asm splitting 2020-05-28 20:51:59 -07:00
theo 731ce9b7a5 textbox 2020-05-26 23:00:23 -07:00
theo bf919c8006 poggers 2020-05-24 21:34:18 -07:00
theo e0e05b1728 meddled some bits 2020-05-22 03:25:00 -07:00
theo e7470cdedd divide and conquer 2020-05-20 23:36:05 -07:00
theo b6b0248051 more refining 2020-05-19 00:27:11 -07:00
theo 1e34d9fcc6 split assemblies 2020-05-18 16:20:01 -07:00
jiangzhengwenjz 43225434d7 initial commit 2020-03-27 09:41:51 +08:00