Commit Graph

679 Commits

Author SHA1 Message Date
theo3 6328c148d2 loadRoom.c 2020-07-17 19:00:04 -07:00
theo3 db02fad00a item.c 2020-07-17 16:46:47 -07:00
theo3 a6a5367d6d Merge remote-tracking branch 'upstream/master' 2020-07-17 01:28:29 -07:00
notyouraveragehooman 9cc26a8a5d
Merge pull request #28 from pixel-stuck/master
Standardize Makefile
2020-07-17 01:26:20 -07:00
dark-samus a2641a5ef7 modify INSTALL.md to reflect Makefile changes 2020-07-17 03:59:52 -04:00
dark-samus 2f74406e92 standardize makefile a bit 2020-07-17 03:52:56 -04:00
notyouraveragehooman ad9681d24d
Update README.md 2020-07-16 21:24:20 -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
notyouraveragehooman c8fd62c703
Merge pull request #27 from Macrepeh:Macrepeh-patch-1
MoblinLady/MayorHagen
2020-07-16 19:44:22 -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
Macrepeh 38f9ec70bc
Delete moblinLady.s 2020-07-16 10:48:02 -04:00
Macrepeh 028138c5bb
Delete MayorHagen/MoblinLady 2020-07-16 10:47:10 -04:00
Macrepeh b40bcfb8c9
MoblinLady and MayorHagen 2020-07-16 10:46:02 -04:00
Macrepeh 520a19f94f
Merge pull request #3 from zeldaret/master
none
2020-07-16 10:43:52 -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
notyouraveragehooman e7ae99c1fa
Merge pull request #26 from notyouraveragehooman/master
keese.c, input.c
2020-07-15 20:52:03 -07:00
theo3 75223bab24 entity->spriteTileSize, entity->spriteIndex 2020-07-15 20:49:59 -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
notyouraveragehooman 400807e932
Merge pull request #25 from gamestabled:beedle
Beedle
2020-07-15 18:50:32 -07:00
theo3 7d42d7c0de keese.c OK 2020-07-15 17:30:26 -07:00
chandler ca5de28b09 beedle Ok 2020-07-15 20:10:22 -04: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 842e10502e
Merge pull request #2 from zeldaret/master
Merge pull request #24 from notyouraveragehooman/master
2020-07-15 01:58:25 -07:00
notyouraveragehooman 287e05a55f
Merge pull request #24 from notyouraveragehooman/master
Merge pull request #1 from zeldaret:master
2020-07-15 01:48:46 -07:00
notyouraveragehooman c21651c9c7
Merge pull request #1 from zeldaret:master
leever.c, partially decomped code_08077B98.s
2020-07-15 01:47:20 -07: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 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
theo3 fc0727243d LinkState members renamed for conformancy 2020-07-14 16:54:35 -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 c6a6888b43
Delete anju.s 2020-07-14 19:16:25 -04:00
Macrepeh 0ed6703315
Add files via upload 2020-07-14 19:15:39 -04: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
Macrepeh 9ee00ce656
Merge pull request #2 from zeldaret/master
mnerge
2020-07-14 17:28:41 -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