Commit Graph

77 Commits

Author SHA1 Message Date
aerinon
07a3a9ad03 Catobat map fix
Cutoff table updated
Mutliworld mem location added for item ids
2021-08-31 15:35:19 -06:00
aerinon
842bb043e6 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	catfish.asm
#	compasses.asm
#	darkworldspawn.asm
#	hooks.asm
#	inventory.asm
#	newitems.asm
#	shopkeeper.asm
#	stats.asm
#	tables.asm

Adn some updates from DR
2021-05-13 12:11:40 -06:00
spannerisms
9744f846f7 sewers 2021-05-04 05:17:37 -04:00
spannerisms
bc91aac550 provide unchanging address for memeforce 2021-04-16 01:41:24 -04:00
spannerisms
c97475f422 BRL -> JMP 2020-12-27 08:04:32 -05:00
KatDevsGames
f26a10a526 Merge pull request #82 from aerinon/CountBottleFix
Prevent CountBottles from overwriting what is in register X.
2020-09-20 02:00:27 -04:00
randall.rupper
8cf3ccb13e Add PHX/PLX in a better spot to prevent CountBottles from overwritting X 2020-06-08 09:58:46 -07:00
Bonta-kun
2a5e305fc6 implement remote item checks 2020-06-08 09:25:25 -07:00
Bonta-kun
f843ef9eb8 bee trap 2020-06-08 09:24:07 -07:00
Bonta-kun
49ba8e064d Make sword upgrade appear as fighter sword for swordless players 2020-06-08 09:20:42 -07:00
Bonta-kun
94218b048b Dont replace multiworld items 2020-06-08 09:20:17 -07:00
Bonta-kun
ddd456c04e multiworld 2020-06-08 09:19:18 -07:00
randall.rupper
50ff7683ab Add PHX/PLX in a better spot to prevent CountBottles from overwritting X 2020-06-08 09:54:09 -06:00
compiling
001107aa3b Don't auto equip silvers when they are only usable at Ganon 2020-06-07 18:33:56 +10:00
Kat
bf6ecd979f various 2020-04-17 22:04:19 -04:00
Kat
f1eec27c3e Update newitems.asm 2020-03-30 02:44:34 -04:00
Kat
f14657ae05 various 2020-02-13 21:35:58 -05:00
Kat
b9e2bb3e23 various 2020-02-07 15:06:25 -05:00
sporchia
2e5cf2af97 fix for progressive bow hint 2019-10-12 10:55:29 -04:00
sporchia
c910afabe3 Update newitems.asm 2019-09-02 18:17:09 -04:00
sporchia
478ce60770 fix for progressive bow check 2019-09-02 18:16:19 -04:00
sporchia
638ca9ea27 fix extra : 2019-08-28 17:40:12 -04:00
Kevin Cathcart
d47b771f16 Turn in Triforce pieces support 2019-08-27 23:47:21 -04:00
Kat
5af7d13cb0 added limits for progressive bows 2019-08-25 13:46:10 -04:00
Kat
6ec8d5b552 various 2019-08-21 21:32:47 -04:00
Kat
7e45c3265e bow stuff 2019-08-21 14:26:55 -04:00
Kevin Cathcart
c2d5f9d846 Fix graphical issues from progressive bow 2019-08-11 13:41:25 -04:00
sporchia
abbc707751 branch label collision fix
* this was causing a free silver bow on any item pickup
2019-07-06 08:36:41 -04:00
Kat
f06a43dc59 progressive bow 2019-06-17 21:29:52 -04:00
Kat
e2704c05b8 stuff 2019-06-16 19:38:24 -04:00
Kat
4c85804f3e Update newitems.asm 2019-05-09 03:23:49 -04:00
Kevin Cathcart
93aead2d74 Remove no-text lag 2018-09-08 16:07:09 -04:00
Kevin Cathcart
edb3cbaaeb Standardize on JML for long jumps (instead of JMP.l) 2018-04-21 22:12:51 -04:00
Karkat
762b9bc3e7 let's dev 4/20/18
fixed keysanity textbox crashes (probably)
fixed bow graphic not getting updated after firing last arrow in non-retro
added fighter sword and progressive sword to shop exemption list
fixed (probably didn't) RNG item single
fixed standing keys from not being counted in hera basement
2018-04-20 22:49:04 -04:00
Karkat
c679e33011 disable event thing for normal mode 2018-04-08 18:46:25 -04:00
Karkat
0825db5c6f take-all support (testing) 2018-04-07 21:06:17 -04:00
Karkat
867272ab15 probably fix goal counter 2018-04-06 17:29:48 -04:00
Karkat
04b5b4d50d event build, not for production 2018-04-06 16:01:28 -04:00
Karkat
07f34b08f9 sprite swap finished & included but off by default 2018-04-05 16:11:55 -04:00
Kevin Cathcart
378dd9dd3b Really fix substitution table 2018-03-16 18:29:45 -04:00
Karkat
8f35ab8cb4 flute pickup / goal item stats clash 2018-03-16 15:05:27 -04:00
Karkat
42ba3cf7dc silver arrows restriction updated for collecting bow after silvers 2018-03-16 13:54:52 -04:00
Kevin Cathcart
ede55dee85 Fix 2nd silver arrow issue in easy mode
Don't use X/4 to index into `ItemSubstitutionRules`.
2018-03-16 10:36:55 -04:00
Karkat
d2576c9433 arrows for hard mode? 2018-03-12 23:17:41 -04:00
Karkat
838c85dc07 let's dev 2/23/18
fixed shops disregarding item counts (extra hitbox, etc)
fixed rupee arrows regarding requiring wooden arrows before being able to fire them
finished escape assist mode for ammo management in new game mode
2018-02-23 22:55:44 -05:00
Kevin Cathcart
711866d9b3 Update HUD arrow drawing code
Draw arrows (in normal spot) in retro hud only if you have arrows and draw the specific
type you have
2018-02-21 20:22:19 -05:00
sporchia
92ebe6b533 switch to ++ for this 2018-02-16 11:19:00 -05:00
Karkat
5c528b269e let's dev 2/15/18
added money arrow mode to classic
fixed generic key mode hud after falling into holes
2018-02-15 00:28:14 -05:00
Karkat
ac274f444c let's dev 2/11/18
fixes for retro/shops/generic keys
2018-02-11 00:02:49 -05:00
Karkat
39b20f9a05 let's dev 1/18/18
updated item limits
updated goal item counter
disabled replacement shopkeeper left on
fixed ice cave water walk setup
2018-01-18 00:03:34 -05:00