Commit Graph

28 Commits

Author SHA1 Message Date
aerinon
93fe72466d Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
#	music.asm
2022-02-09 09:59:56 -07:00
Catobat
78148fb4f3 Fix witch item bug 2022-01-20 01:30:21 +01:00
aerinon
c88a301708 Merge branch 'master' into DRMain
# Conflicts:
#	tables.asm
2022-01-05 14:26:48 -07:00
spannerisms
04fa0fc1a1 match expected usage 2021-12-20 16:42:56 -05:00
aerinon
27654b9ac9 Merge remote-tracking branch 'baserom/master' into DRMain
# Conflicts:
#	hooks.asm
#	newhud.asm
#	utilities.asm
2021-10-21 14:15:54 -06:00
spannerisms
03c287a988 jingle jangle 2021-08-11 06:30:52 -04:00
spannerisms
187c2aa4a2 always fix 2021-07-29 09:44:21 -04: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
70933b01f8 WOW 2021-04-05 12:48:32 -04:00
spannerisms
f6f28d89a9 refactor bugfixes
reverse some labels for compactness and readability
2021-03-24 07:37:32 -04:00
aerinon
05e7f8eb96 Ported over pepper's shop code 2021-01-29 13:55:13 -07:00
compiling
3cae3a66a5 Fix fake world when fluting to pyramid twice 2020-06-20 19:43:45 -07:00
compiling
c02285306a Fix fake world when fluting to pyramid twice 2020-06-18 21:41:02 +10:00
qwertymodo
f0425c7a36 Fix pedestal pull ending animation 2019-10-12 13:04:45 -07:00
Kevin Cathcart
607974caeb Fix bunny pallete map bug and glove color bug 2019-08-23 22:00:46 -04:00
Myramong
49e2d54155 Wallmaster fix 2019-02-12 17:17:32 -04:00
Myramong
497970666b Fix pendant/crystal failing to spawn when using somaaria vs a boss. 2018-10-08 10:11:41 -03:00
Kevin Cathcart
8d3163633b Fixed mirror-based supperbunny in inverted. 2018-09-25 23:31:47 -04:00
Kevin Cathcart
3177ccc395 Fix For PoD accidentally arming EG. 2018-07-05 19:37:55 -04:00
Kevin Cathcart
a94e0e8012 Fixes for Tagalongs for ER
Fixes various tagalong issues that affect Entrance Randomizer, most
involving frog/blacksmith
2018-02-23 19:57:11 -05:00
Kevin Cathcart
60eafcaf46 Fix the dark world
Restore fake world fix to previous position

Change how the FixBunnyOnExitToLightworld Code works, and where it is
called from
2018-02-10 22:05:44 -05:00
Karkat
6728d21fd5 let's dev 2/9/18
bugfixes for shops
started implementation for takeany
started implementation for inverted
2018-02-09 00:32:45 -05:00
Kevin Cathcart
0c72ca9e0e Fix not being bunny after defeating aga2 w/o moon Pearl 2018-02-07 01:56:51 -05:00
Kevin Cathcart
16259ce158 Add light world check to more unbunny-ing code
This time the code that tries to unbunny you when leaving a dungeon.This
is needed to make ER's new cross world connects work properly.

Move the fake world fix to happen in time for this.
2018-02-07 01:56:50 -05:00
Karkat
20ce4fe0e2 let's dev 1/20/18 2018-01-20 00:15:04 -05:00
Karkat
7583e46504 let's dev 12/2/17
freestanding hera small key pickup stats
capitalism fairy fix
permabunny fix
save file crossover fix
started shopkeeper
2017-12-03 23:45:15 -05:00
Karkat
bacbf1c58a let's dev 6/10/17
fixed hobo music reset
fixed (maybe) freeroaming dungeon item text loader
cleaned up regular text loader
removed silver arrow indicator from item menu
added silver arrow indicator to hud for bowless silver state
added framework for static boss RNG
2017-06-10 00:20:47 -04:00
Karkat
f755a63925 initial checkin 2017-05-17 13:00:32 -04:00