alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,770 Commits 19 Branches 2 Tags
75fd81ab57b57c0197b8d3387dc9061418b4fa09
Commit Graph

49 Commits

Author SHA1 Message Date
codemann8
75fd81ab57 Merged in DR v1.4.1.6 2024-02-23 11:11:59 -06:00
codemann8
84992d010f Fix for playing correct track after Agas and GT cutscene 2023-11-05 08:39:13 -06:00
aerinon
2a789b04e4 Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	bookofmudora.asm
#	build.bat
#	catfish.asm
#	compasses.asm
#	contrib.asm
#	darkworldspawn.asm
#	entrances.asm
#	events.asm
#	floodgatesoftlock.asm
#	flute.asm
#	framehook.asm
#	goalitem.asm
#	halfmagicbat.asm
#	heartpieces.asm
#	hooks.asm
#	inventory.asm
#	invertedmaps.asm
#	itemtext_lower.asm
#	lampmantlecone.asm
#	mantle.asm
#	msu.asm
#	music.asm
#	newhud.asm
#	newitems.asm
#	pendantcrystalhud.asm
#	ram.asm
#	rngfixes.asm
#	roomloading.asm
#	shopkeeper.asm
#	stats.asm
#	stats/credits.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	tables.asm
#	tablets.asm
#	utilities.asm
#	zoraking.asm
 2023-08-23 13:02:39 -06:00
cassidoxa
cb16ffc20b Merge branch 'master' into decompressed 
Also some pendant receipt and palette fixes
 2023-08-02 17:40:38 -04:00
cassidoxa
8ed4cbda1d Palette handling & sprite props data tables 
Statically assign item data tables
Fix some save-related bugs
Fix dungeon item notice in "this dungeon" with free dungeon items
 2023-08-01 17:13:47 -04:00
codemann8
20f8ef457e Converting item GFX drawing to use pottery draw method 2023-05-05 20:54:36 -05:00
cassidoxa
7426ce5945 More RAM labels 
Fixed tablets checking for item collected, uses NpcFlags+1
Deleted mantle.asm, moved to lampmantlecone.asm
 2022-11-24 18:34:35 -05:00
cassidoxa
09d15f3294 Another WRAM label pass 
Deleted compression.asm
 2022-11-22 00:36:39 -05:00
cassidoxa
788cceaab9 Continue labeling and documentation in ram.asm, main rando block 
Deleted several unused modules and some commented code
Reorganized some routines to clean up modules
Moved some memory into mirrored WRAM
Refactored NMI hook aux routine
Removed old fake flipper fix
 2022-11-16 21:38:28 -05:00
cassidoxa
43f753b517 ram.asm initial commit. Replaced all address defines with labels 
Value defines styled without quotes, # moved to load/store/cmp site
Added registers.asm (copied from spannerisms JP disassembly)
Added a bunch of length annotations
Deleted old or trivial commented out code
Deleted: ganonfixes.asm, map.asm, seedtag.asm
Replaced obsolete credits.asm with creditsnew.asm
Moved scratch space at $7F5020-3F to mirrored WRAM (7E1E70-8F)
Moved clock RAM to mirrored WRAM (7E1E90-9F)
dialog.asm: FreeDungeonItemNotice preserves callee-preserved scratch RAM
Toast buffer moved to mirrored WRAM (7E1E0E-0F)
servicerequest.asm: long store to $012E converted to word length store
 2022-11-05 00:50:25 -04:00
codemann8
7c7664224e Merged DR v1.0.1.0 2022-07-08 05:32:08 -05:00
cassidoxa
9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
codemann8
ba8a9aeb90 Merged in Upstream ER changes 2022-02-04 06:04:26 -06:00
cassidoxa
c048589c02 Add static file name feature by special request 
Move compass count ram init to compasses.asm
Rename WRAMEquipment and SRAMEquipment to EquipmentWRAM/SRAM
 2022-02-02 16:51:50 -05:00
cassidoxa
b91ac58b47 Merge branch 'master' into sram 2022-01-20 11:16:31 -05:00
Catobat
78148fb4f3 Fix witch item bug 2022-01-20 01:30:21 +01:00
codemann8
b20f9ddd67 Merged DR v0.5.1.7 2022-01-06 02:13:05 -06:00
aerinon
c88a301708 Merge branch 'master' into DRMain 
# Conflicts:
#	tables.asm
 2022-01-05 14:26:48 -07:00
cassidy
6f58b9f959 Merge branch 'master' into sram 2021-12-28 00:30:13 -05:00
spannerisms
04fa0fc1a1 match expected usage 2021-12-20 16:42:56 -05:00
cassidy
c8ea2c6dce Move compass counts to ROM and trackable RAM 
Add flag if compass HUD count has been displayed in SRAM
Move low hearts fix from tables.asm to bugfixes.asm
Rearrange dungeon stats in SRAM to match door rando ROM
 2021-12-16 17:19:55 -05:00
cassidy
fa76b61df0 Change addresses to labels and remove SRAM trace calls 2021-12-16 17:19:54 -05:00
cassidy
e4d917c47c First pass-through adding labels 
Added items, equipment, and tracking/indicators
Added playername changes
Removed some defines
 2021-12-16 17:19:54 -05:00
codemann8
2215b16240 Merge branch 'DRMain' into OWMain 2021-10-21 21:26:38 -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
codemann8
6c616a20b2 Made world checks table-based rather than based on OW ID 2021-06-03 00:50:25 -05: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