Commit Graph

95 Commits

Author SHA1 Message Date
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
theo3 3fe2c8fc74 functions.h fix 2020-07-15 01:43:50 -07: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 882aef9fdc code_08077B98 2020-07-14 22:09:07 -07:00
theo3 fc0727243d LinkState members renamed for conformancy 2020-07-14 16:54:35 -07:00
chandler 3797c700b3 one non-matching in keaton 2020-07-14 18:46:58 -04: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 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 1bd6c3b5a4 entity.spriteOrder -> entity.spriteRendering 2020-07-09 12:04:14 -07:00
theo3 cd25d3c120 entity.h bitfields 2020-07-09 02:40: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
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
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 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
21aslade 933417209a mineralWaterSource.c OK
Also modified entity.h to include BoundingBox
2020-06-20 21:45:19 -06:00
theo3 e3f0187dcd fixed COORD_TO_TILE 2020-06-19 22:55:03 -07:00
notyouraveragehooman 969241a1d0
Revert "Revert "mask.c OK"" 2020-06-19 22:43:20 -07:00
notyouraveragehooman 9b9fff2f36
Revert "mask.c OK" 2020-06-19 22:41:34 -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 b093824bde entity.h UPDATE 2020-06-18 15:48:30 -07:00
theo3 f8ae0eaef7 entity.h fixup 2020-06-18 03:21:47 -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 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 80214ba9ee symbol StartCutscene 2020-06-15 21:49:06 -07:00
theo3 d92be5f9cc begin rem 2020-06-15 21:19:18 -07:00
theo3 ebe4a20bf7 entityData.h->room.h 2020-06-15 15:51:45 -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