Commit Graph

101 Commits

Author SHA1 Message Date
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 d649701eb8
Delete archway.s 2020-07-01 17:55: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 841a20ca2d main npc funcs named 2020-06-17 21:25:52 -07:00
theo3 0dbd3a87c6 keese.c 2020-06-16 15:04:52 -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 80214ba9ee symbol StartCutscene 2020-06-15 21:49:06 -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