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

LTTP_RND_GeneralBugfixes.asm

@@ -3,74 +3,50 @@
 ;================================================================================
 lorom
 
+;===================================================================================================
+
+; THIS NEEDS TO BE THE FIRST INCLUDE BECAUSE IT CHANGES THINGS EVERYWHERE
+; If this were to be included later, it would almost certainly overwrite other changes
+incsrc "fastrom.asm"
+
 ;================================================================================
 
-;org $00FFC0 ; <- 7FC0 - Bank00.asm : 9173 (db "THE LEGEND OF ZELDA  " ; 21 bytes)
+;org $80FFC0 ; <- 7FC0 - Bank00.asm : 9173 (db "THE LEGEND OF ZELDA  " ; 21 bytes)
-;db #$23, $4E
+;db $23, $4E
 
-org $00FFD5 ; <- 7FD5 - Bank00.asm : 9175 (db $20   ; rom layout)
+org $80FFD5 ; <- 7FD5 - Bank00.asm : 9175 (db $20   ; rom layout)
-db #$30 ; set fast lorom
+db $30 ; set fast lorom
 
-;org $00FFD6 ; <- 7FD6 - Bank00.asm : 9176 (db $02   ; cartridge type)
+;org $80FFD6 ; <- 7FD6 - Bank00.asm : 9176 (db $02   ; cartridge type)
-;db #$55 ; enable S-RTC
+;db $55 ; enable S-RTC
 
-org $00FFD7 ; <- 7FD7 - Bank00.asm : 9177 (db $0A   ; rom size)
+org $80FFD7 ; <- 7FD7 - Bank00.asm : 9177 (db $0A   ; rom size)
-db #$0B ; mark rom as 16mbit
+db $0B ; mark rom as 16mbit
 
-org $00FFD8 ; <- 7FD8 - Bank00.asm : 9178 (db $03   ; ram size (sram size))
+org $80FFD8 ; <- 7FD8 - Bank00.asm : 9178 (db $03   ; ram size (sram size))
-db #$05 ; mark sram as 32k
+db $05 ; mark sram as 32k
 
-org $3FFFFF ; <- 1FFFFF
+org $BFFFFF ; <- 1FFFFF
-db #$00 ; expand file to 2mb
+db $00 ; expand file to 2mb
 
-org $1FFFF8 ; <- FFFF8 timestamp rom
+org $9FFFF8 ; <- FFFF8 timestamp rom
-db #$20, #$19, #$08, #$31 ; year/month/day
+db $20, $19, $08, $31 ; year/month/day
 
 ;================================================================================
 !ROM_VERSION_LOW ?= 1  ; ROM version (two 16-bit integers)
-!ROM_VERSION_HIGH ?= 2 ;
+!ROM_VERSION_HIGH ?= 4 ;
 
-org $00FFE0 ; Unused hardware vector
+org $80FFE0 ; Unused hardware vector
 RomVersion:
 dw !ROM_VERSION_LOW
 dw !ROM_VERSION_HIGH
 
 ;================================================================================
-
 !ADD = "CLC : ADC"
 !SUB = "SEC : SBC"
 !BLT = "BCC"
 !BGE = "BCS"
 
-!MS_GOT = "$7F5031"
-
-!REDRAW = "$7F5000"
-!GANON_WARP_CHAIN = "$7F5032";
-
-!TILE_UPLOAD_BUFFER = "$7EA180";
-
-!FORCE_HEART_SPAWN = "$7F5033";
-!SKIP_HEART_SAVE = "$7F5034";
-
-; MSU-1
-!REG_MSU_FALLBACK_TABLE = $7F50A0   ; 8 bytes
-!REG_MSU_DELAYED_COMMAND = $7F50A9
-!REG_MSU_PACK_COUNT = $7F50AA
-!REG_MSU_PACK_CURRENT = $7F50AB
-!REG_MSU_PACK_REQUEST = $7F50AC
-!REG_MSU_LOADED_TRACK = $7F50AD     ; 2 bytes
-!REG_SPC_LOADING = $7F50AF
-!MSU_LOADED_TRACK = $7F5400
-!MSU_RESUME_TRACK = $7F5401
-!MSU_RESUME_TIME = $7F5402          ; 4 bytes
-!MSU_RESUME_CONTROL = $7F5406
-!REG_MUSIC_CONTROL = $012B
-;!REG_MUSIC_CONTROL = $012C
-!REG_MUSIC_CONTROL_REQUEST = $012C
-
-!ONEMIND_ID = $7F5072
-!ONEMIND_TIMER = $7F5073
-
 function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<0))
 
 ; Feature flags, run asar with -DFEATURE_X=1 to enable
@@ -96,16 +72,16 @@ function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<
 !Dungeon_ChestData = "$01E96C"
 
 incsrc hooks.asm
-incsrc treekid.asm
 incsrc spriteswap.asm
 incsrc hashalphabethooks.asm
 incsrc sharedplayerpalettefix.asm
 incsrc ram.asm
 incsrc sram.asm
+incsrc registers.asm
+incsrc vanillalabels.asm
+incsrc menu/overworldmap.asm ; Overwrites some code in bank $8A
 
-;org $208000 ; bank #$20
+org $A08000 ; bank $20
-org $A08000 ; bank #$A0
-incsrc newitems.asm ; LEAVE THIS AS FIRST
 incsrc itemdowngrade.asm
 incsrc bugfixes.asm
 incsrc darkworldspawn.asm
@@ -113,7 +89,6 @@ incsrc lampmantlecone.asm
 incsrc floodgatesoftlock.asm
 incsrc heartpieces.asm
 incsrc npcitems.asm
-incsrc utilities.asm
 incsrc flipperkill.asm
 incsrc pendantcrystalhud.asm
 incsrc potions.asm
@@ -124,30 +99,28 @@ incsrc tablets.asm
 incsrc fairyfixes.asm
 incsrc rngfixes.asm
 incsrc medallions.asm
-incsrc inventory.asm
-incsrc ganonfixes.asm
 incsrc zelda.asm
 incsrc maidencrystals.asm
-incsrc zoraking.asm
-incsrc catfish.asm
 incsrc flute.asm
 incsrc dungeondrops.asm
 incsrc halfmagicbat.asm
-incsrc mantle.asm
 incsrc swordswap.asm
-incsrc scratchpad.asm
+incsrc stats.asm
-incsrc map.asm
 incsrc dialog.asm
 incsrc entrances.asm
-incsrc clock.asm
 incsrc accessibility.asm
 incsrc heartbeep.asm
 incsrc capacityupgrades.asm
+incsrc timer.asm
+incsrc doorframefixes.asm
+incsrc music.asm
+incsrc roomloading.asm
+incsrc icepalacegraphics.asm
 warnpc $A18000
 
-org $1C8000 ; text tables for translation
+org $9C8000 ; text tables for translation
-incbin i18n_en.bin
+incbin "data/i18n_en.bin"
-warnpc $1CF356
+warnpc $9CF356
 
 org $A18000 ; static mapping area
 incsrc framehook.asm
@@ -158,7 +131,7 @@ incsrc hud.asm
 warnpc $A18800
 
 org $A18800 ; static mapping area
-incsrc zsnes.asm
+
 warnpc $A19000
 
 org $A1A000 ; static mapping area. Referenced by front end. Do not move.
@@ -174,19 +147,11 @@ org $A1FF00 ; static mapping area
 incsrc init.asm
 
 org $A48000 ; code bank - PUT NEW CODE HERE
-incsrc timer.asm
-incsrc doorframefixes.asm
-incsrc music.asm
-incsrc roomloading.asm
-incsrc icepalacegraphics.asm
-incsrc firebarlayer.asm
 incsrc glitched.asm
 incsrc hardmode.asm
 incsrc goalitem.asm
 incsrc quickswap.asm
-incsrc endingsequence.asm
 incsrc cuccostorm.asm
-incsrc compression.asm
 incsrc retro.asm
 incsrc controllerjank.asm
 incsrc boots.asm
@@ -198,19 +163,17 @@ incsrc hashalphabet.asm
 incsrc inverted.asm
 incsrc invertedmaps.asm
 incsrc newhud.asm
-incsrc compasses.asm
 incsrc save.asm
 incsrc password.asm
 incsrc enemy_adjustments.asm
-incsrc stats.asm
 ;incsrc hudtext.asm
 incsrc servicerequest.asm
 incsrc elder.asm
 incsrc toast.asm
-incsrc darkroomitems.asm
 incsrc fastcredits.asm
 incsrc msu.asm
 incsrc dungeonmap.asm
+incsrc hextodec.asm
 incsrc multiworld.asm
 incsrc terrorpin.asm
 if !FEATURE_NEW_TEXT
@@ -218,130 +181,147 @@ if !FEATURE_NEW_TEXT
 endif
 warnpc $A58000
 
-;org $228000 ; contrib area
+org $A28000
-org $A28000 ; contrib area
+ItemReceiptGraphicsROM:
-incsrc contrib.asm
+; we need some empty space here so that 0000 can mean nothing
+fillbyte $00 : fill 32
+incbin "data/customitems.4bpp"
+warnpc $A2B000
+org $A2B000
+incsrc itemdatatables.asm ; Statically mapped
+incsrc decompresseditemgraphics.asm
+incsrc newitems.asm
+incsrc utilities.asm
+incsrc inventory.asm
+incsrc menu/hudalpha.asm
 warnpc $A38000
 
 org $A38000
+incsrc stats/credits.asm ; Statically mapped
 incsrc stats/main.asm
+incsrc stats/statConfig.asm
+FontTable:
+incsrc stats/fonttable.asm
 
-incsrc menu/overworldmap.asm ; overwrites some code in bank 0A
+incsrc doorrando/doorrando.asm ; bank 27/A7
-incsrc doorrando/doorrando.asm ; bank 27 likely A7 in the future
 ;bank 28/A8 for keydropshuffle / standing items
-incsrc keydrop/standing_items.asm
+incsrc keydrop/standing_items.asm ; bank 28/A8
-incsrc enemizer/main.asm ; this is originally in bank 36, but is currently in migratory status in bank 37
+incsrc enemizer/main.asm ; bank 36/B6
 
-org $308000 ; bank #$30
+org $B08000 ; bank #$30
 incsrc tables.asm
-warnpc $318000
+warnpc $B18000
 
-org $348000
+org $B48000
 incsrc spc.asm
 
-; uncomment for inverted adjustments
+org $B18000 ; bank $31
-;incsrc sandbox.asm
-
-org $318000 ; bank #$31
 GFX_Mire_Bombos:
-incbin 99ff1_bombos.gfx
+incbin "data/99ff1_bombos.gfx"
-warnpc $318800
+warnpc $B18800
 
-org $318800
+org $B18800
 GFX_Mire_Quake:
-incbin 99ff1_quake.gfx
+incbin "data/99ff1_quake.gfx"
-warnpc $319000
+warnpc $B19000
 
-org $319000
+org $B19000
 GFX_TRock_Bombos:
-incbin a6fc4_bombos.gfx
+incbin "data/a6fc4_bombos.gfx"
-warnpc $319800
+warnpc $B19800
 
-org $319800
+org $B19800
 GFX_TRock_Ether:
-incbin a6fc4_ether.gfx
+incbin "data/a6fc4_ether.gfx"
-warnpc $31A000
+warnpc $B1A000
 
-org $31A000
+org $B1A000
 GFX_HUD_Items:
-incbin c2807_v4.gfx
+incbin "data/c2807_v4.gfx"
-warnpc $31A800
+warnpc $B1A800
 
-org $31A800
+org $B1A800
-GFX_New_Items:
-incbin newitems.gfx
-;incbin eventitems.gfx ; *EVENT*
-warnpc $31B000
 
-org $31B000
+warnpc $B1B000
+
+org $B1B000
 GFX_HUD_Main:
-incbin c2e3e.gfx
+incbin "data/c2e3e.gfx"
-warnpc $31B800
+warnpc $B1B800
 
-org $31C000
+org $B1C000
 IcePalaceFloorGfx:
-incbin ice_palace_floor.bin
+incbin "data/ice_palace_floor.bin"
-warnpc $31C801
+warnpc $B1C801
 
-org $31C800
+org $B1C800
 Damage_Table:
-incbin damage_table.bin
+incbin "data/damage_table.bin"
-warnpc $31D001
+warnpc $B1D001
 
-org $31D000
+org $B1D000
 FileSelectNewGraphics:
-incbin fileselect.chr.gfx
+incbin "data/fileselectgfx.2bpp"
-warnpc $31E001
+warnpc $B1E001
 
-org $31E000
+org $B1E000
 InvertedCastleHole: ;address used by front end. DO NOT MOVE!
-incbin sheet73.gfx
+incbin "data/sheet73.gfx"
-warnpc $31E501
+warnpc $B1E501
 
-org $338000
+org $B38000
 GFX_HUD_Palette:
-incbin hudpalette.pal
+incbin "data/hudpalette.pal"
-warnpc $338041
+warnpc $B38041
 
-org $339000
+org $B39000
-incbin sheet178.gfx
+ExpandedTrinexx:
-warnpc $339600
+incbin "data/sheet178.gfx"
+warnpc $B39600
 
-org $339600
+org $B39600
 BossMapIconGFX:
-incbin bossicons.4bpp
+incbin "data/bossicons.4bpp"
 
 if !FEATURE_NEW_TEXT
-    org $339C00
+	org $B39C00
 	NewFont:
-    incbin newfont.bin
+	incbin "data/newfont.bin"
 	NewFontInverted:
-    incbin newfont_inverted.bin
+	incbin "data/newfont_inverted.bin"
-
+        SmallCharacters:
-    org $0CD7DF
+        incbin "data/smallchars.2bpp"
-    incbin text_unscramble1.bin
+        org $8CD7DF
-    org $0CE4D5
+        incsrc data/playernamecharmap.asm
-    incbin text_unscramble2.bin
+        org $8CE73D
+        incbin data/playernamestripes_1.bin
+        org $8CE911
+        incbin data/playernamestripes_2.bin
+        incsrc data/kanjireplacements.asm ; Overwrites text gfx data and masks in bank $8E
 endif
 
-org $328000
+org $B28000
 Extra_Text_Table:
 if !FEATURE_NEW_TEXT
     incsrc itemtext_lower.asm
 else
     incsrc itemtext.asm
 endif
-warnpc $32E000
+warnpc $B2E000
 
-org $32DFD0	; PC 0x195FD0
+org $B2DFD0	; PC 0x195FD0
 incsrc multiworldplayernames.asm
-warnpc $330000
+warnpc $B30000
 
 incsrc externalhooks.asm
 ;================================================================================
-org $119100 ; PC 0x89100
+org $919100 ; PC 0x89100
-incbin map_icons.gfx
+incbin "data/map_icons.gfx"
-warnpc $119401
+warnpc $919401
+;================================================================================
+org $9BB1E0
+incsrc custompalettes.asm
+warnpc $9BB880
 ;================================================================================
 org $AF8000 ; PC 0x178000
 Static_RNG: ; each line below is 512 bytes of rng
@@ -356,7 +336,7 @@ warnpc $B08000
 ;Bank Map
 ;$20 Code Bank
 ;$21 Reserved (Frame Hook & Init)
-;$22 Contrib Code
+;$22 Unused
 ;$23 Stats & Credits
 ;$24 Code Bank
 ;$26 Multiworld data
@@ -378,18 +358,18 @@ warnpc $B08000
 ;$3F reserved for internal debugging
 ;================================================================================
 ;RAM
-;$7E021B[0x1]: Used by race game instead of $0ABF to avoid witch item conflict
+;See ram.asm for label assignments
-;$7EC900[0x1F00]: BIGRAM buffer
+;$7EC900[0x1F00]: BigRAM buffer
 ;$7EF000[0x500]: SRAM mirror First 0x500 bytes of SRAM
 ;   See sram.asm for labels and assignments
 ;$7F5000[0x800]: Rando's main free ram region
-;   See tables.asm for specific assignments
+;   See ram.asm for specific assignments
 ;$7F6000[0x1000]: SRAM buffer mapped to vanilla save slots 1 and 2
 ;   See sram.asm for labels and assignments
 ;$7F7667[0x6719] - free ram
 ;================================================================================
 ;SRAM Map
-;See sram.asm for rando-specific assignments
+;See sram.asm for label assignments and documentation
 ;$70:0000 (5K) Game state
 ;  0000-04FF Vanilla Slot 1 (mirrored at $7EF000)
 ;  0500-14FF Ext Slot 1 (mirrored at $7F6000)
@@ -397,132 +377,26 @@ warnpc $B08000
 ;$70:3000 (0x16) Password
 ;$70:6000 (8K) Scratch buffers
 ;================================================================================
-;org $0080DC ; <- 0xDC - Bank00.asm:179 - Kill Music
-;db #$A9, #$00, #$EA
-;LDA.b #$00 : NOP
-;================================================================================
-;org $0AC53E ; <- 5453E - Bank0A.asm:1103 - (LDA $0AC51F, X) - i have no idea what this is for anymore
-;LDA.b #$7F
-;NOP #2
-;================================================================================
-;org $05DF8B ; <- 2DF8B - Bank05.asm : 2483
-;AND.w #$0100 ; allow Sprite_DrawMultiple to access lower half of sprite tiles
-;================================================================================
-;org $0DF8F1 ; this is required for the X-indicator in the HUD except not anymore obviously
-;
-;;red pendant
-;db $2B, $31, $2C, $31, $3D, $31, $2E, $31
-;db $2B, $25, $2C, $25, $2D, $25, $2E, $25
-;
-;;blue pendant
-;db $2B, $31, $2C, $31, $3D, $31, $2E, $31
-;db $2B, $2D, $2C, $2D, $2D, $2D, $2E, $2D
-;
-;;green pendant
-;db $2B, $31, $2C, $31, $3D, $31, $2E, $31
-;db $2B, $3D, $2C, $3D, $2D, $3D, $2E, $3D
-;================================================================================
-;org $00CFF2 ; 0x4FF2 - Mire H
-;db GFX_Mire_Bombos>>16
-;org $00D0D1 ; 0x50D1 - Mire M
-;db GFX_Mire_Bombos>>8
-;org $00D1B0 ; 0x51B0 - Mire L
-;db GFX_Mire_Bombos
 
-;org $00D020 ; 0x5020 - Trock H
+org $80D09C ; 0x509C - HUD Items H
-;db GFX_TRock_Bombos>>16
-;org $00D0FF ; 0x50FF - Trock M
-;db GFX_TRock_Bombos>>8
-;org $00D1DE ; 0x51DE - Trock L
-;db GFX_TRock_Bombos
-
-org $00D09C ; 0x509C - HUD Items H
 db GFX_HUD_Items>>16
-org $00D17B ; 0x517B - HUD Items M
+org $80D17B ; 0x517B - HUD Items M
 db GFX_HUD_Items>>8
-org $00D25A ; 0x525A - HUD Items L
+org $80D25A ; 0x525A - HUD Items L
 db GFX_HUD_Items
 
-; this used to be a pointer to a dummy file
+org $80D09D ; 0x509D - HUD Main H
-org $00D065 ; 005065 - New Items H
-db GFX_New_Items>>16
-org $00D144 ; 005114 - New Items M
-db GFX_New_Items>>8
-org $00D223 ; 005223 - New Items L
-db GFX_New_Items
-
-org $00D09D ; 0x509D - HUD Main H
 db GFX_HUD_Main>>16
-org $00D17C ; 0x517C - HUD Main M
+org $80D17C ; 0x517C - HUD Main M
 db GFX_HUD_Main>>8
-org $00D25B ; 0x525B - HUD Main L
+org $80D25B ; 0x525B - HUD Main L
 db GFX_HUD_Main
+
 ;================================================================================
-org $008781
-UseImplicitRegIndexedLocalJumpTable:
-
-org $00879c
-UseImplicitRegIndexedLongJumpTable:
-
-org $008333
-Vram_EraseTilemaps_triforce:
-
-org $008913
-Sound_LoadLightWorldSongBank:
-org $00891D
-    .do_load
-
-org $00893D
-EnableForceBlank:
-
-DungeonMask = $0098C0
-
-org $00D308
-DecompSwordGfx:
-
-org $00D348
-DecompShieldGfx:
-
-org $00D463
-Tagalong_LoadGfx:
-
-org $00D51B
-GetAnimatedSpriteTile:
-
-org $00D52D
-GetAnimatedSpriteTile_variable:
-
-org $00D84E
-Attract_DecompressStoryGfx:
-
-org $00E529
-LoadSelectScreenGfx:
-
-org $00F945
-PrepDungeonExit:
-
-org $00FDEE
-Mirror_InitHdmaSettings:
-
-org $01873A
-Dungeon_LoadRoom:
-
-org $02821E
-Module_PreDungeon:
-org $028296
-    .setAmbientSfx
 
 org $828AD9
 Underworld_SetBossOrSancMusicUponEntry:
 
-org $02A0A8
-Dungeon_SaveRoomData:
-
-org $02A0BE
-Dungeon_SaveRoomData_justKeys:
-
-org $02B861
-Dungeon_SaveRoomQuadrantData:
 
 org $02C11D
 CalculateTransitionLanding:
@@ -530,86 +404,6 @@ CalculateTransitionLanding:
 org $02D9B9
 Underworld_LoadSpawnEntrance:
 
-org $02FD8A ; 17D8A - Bank0E.asm: 3732 Note: Different bank
-LoadGearPalettes_bunny:
-
-org $02FD95 ; 17D95 - Bank0E.asm: 3742 Note: Different bank
-LoadGearPalettes_variable:
-
-org $02FEAB
-Filter_Majorly_Whiten_Color:
-
-org $05A51D
-Sprite_SpawnFallingItem:
-
-org $05DF6C ; 02DF6C - Bank05.asm : 2445
-Sprite_DrawMultiple:
-
-org $05DF70 ; 02DF70 - Bank05.asm : 2454
-Sprite_DrawMultiple_quantity_preset:
-
-org $05DF75 ; 02DF75 - Bank05.asm : 2461
-Sprite_DrawMultiple_player_deferred:
-
-org $05E1A7 ; 02E1A7 - Bank05.asm : 2592
-Sprite_ShowSolicitedMessageIfPlayerFacing:
-
-org $05E1F0
-Sprite_ShowMessageFromPlayerContact:
-
-org $05E219
-Sprite_ShowMessageUnconditional:
-
-org $05EC96
-Sprite_ZeldaLong:
-
-org $0680FA
-Player_ApplyRumbleToSprites:
-
-org $0683E6
-Utility_CheckIfHitBoxesOverlapLong:
-
-org $06A7DB
-Chicken_SpawnAvengerChicken: ; returns short
-
-org $06DC5C
-Sprite_DrawShadowLong:
-
-org $06DD40
-DashKey_Draw:
-
-org $06DBF8
-Sprite_PrepAndDrawSingleLargeLong:
-
-org $06DC00
-Sprite_PrepAndDrawSingleSmallLong:
-
-org $06EA18
-Sprite_ApplySpeedTowardsPlayerLong:
-
-org $06EAA6
-Sprite_DirectionToFacePlayerLong:
-
-org $06F12F
-Sprite_CheckDamageToPlayerSameLayerLong:
-
-org $06F86A
-OAM_AllocateDeferToPlayerLong:
-
-org $0791B3
-Player_HaltDashAttackLong:
-
-org $07999D
-Link_ReceiveItem:
-
-org $07E68F
-Unknown_Method_0: ; In US version disassembly simply called "$3E6A6 IN ROM"
-
-org $07F4AA
-Sprite_CheckIfPlayerPreoccupied:
-
-org $08C3AE
-Ancilla_ReceiveItem:
 
 org $08C505
 Ancilla_ReceiveItem_objectFinished:
@@ -626,11 +420,6 @@ GTCutscene_DrawSingleCrystal_SkipSparkle:
 org $08CF59
 GTCutscene_SparkleALot:
 
-org $08F710
-Ancilla_SetOam_XY_Long:
-
-org $0985E2 ; (break on $0985E4)
-AddReceivedItem:
 
 org $098605
 AddReceivedItem_notCrystal:
@@ -638,152 +427,5 @@ AddReceivedItem_notCrystal:
 org $098766
 AddReceivedItem_gfxHandling:
 
-org $098BAD
-AddPendantOrCrystal:
-
-org $098CFD
-AddWeathervaneExplosion:
-
-org $0993DF
-AddDashTremor:
-
-org $099D04
-AddAncillaLong:
-
-org $099D1A
-Ancilla_CheckIfAlreadyExistsLong:
-
-org $09AE64
-Sprite_SetSpawnedCoords:
-
-org $09AD58
-GiveRupeeGift:
-
-org $0ABA4F
-OverworldMap_InitGfx:
-
-org $0ABA99
-OverworldMap_DarkWorldTilemap:
-
-org $0ABAB9
-OverworldMap_LoadSprGfx:
-
 org $8AE817
 DungeonMapBossRooms:
-
-org $0CD7D1
-NameFile_MakeScreenVisible:
-org $0CDB3E
-InitializeSaveFile:
-org $0CDBC0
-InitializeSaveFile_build_checksum:
-
-org $0DBA71
-GetRandomInt:
-
-org $0DBA80
-OAM_AllocateFromRegionA:
-org $0DBA84
-OAM_AllocateFromRegionB:
-org $0DBA88
-OAM_AllocateFromRegionC:
-org $0DBA8C
-OAM_AllocateFromRegionD:
-org $0DBA90
-OAM_AllocateFromRegionE:
-org $0DBA94
-OAM_AllocateFromRegionF:
-
-org $0DBB67
-Sound_SetSfxPanWithPlayerCoords:
-
-org $0DBB6E
-Sound_SetSfx1PanLong:
-
-org $0DBB7C
-Sound_SetSfx2PanLong:
-
-org $0DBB8A
-Sound_SetSfx3PanLong:
-
-org $0DDB7F
-HUD_RefreshIconLong:
-
-org $0DDD32
-Equipment_UpdateEquippedItemLong:
-
-org $0DE01E ; 6E10E - equipment.asm : 787
-BottleMenu_movingOn:
-
-org $0DE346
-RestoreNormalMenu:
-
-org $0DE395
-Equipment_SearchForEquippedItemLong:
-
-org $0DE9C8
-DrawProgressIcons: ; this returns short
-
-org $0DED29
-DrawEquipment: ; this returns short
-
-org $0DFA78
-HUD_RebuildLong:
-
-org $0DFA88
-HUD_RebuildIndoor_Palace:
-
-org $0DFA88
-HUD_RebuildLong2:
-
-org $0EEE10
-Messaging_Text:
-
-org $0FFD94
-Overworld_TileAttr:
-
-org $1BC97C
-Overworld_DrawPersistentMap16:
-
-org $1BED03
-Palette_Sword:
-
-org $1BED29
-Palette_Shield:
-
-org $1BEDF9
-Palette_ArmorAndGloves:
-
-org $1BEE52
-Palette_Hud:
-
-org $1BEF96
-Palette_SelectScreen:
-
-org $1CFAAA
-ShopKeeper_RapidTerminateReceiveItem:
-
-org $1CF500
-Sprite_NullifyHookshotDrag:
-
-org $1CF537
-Ancilla_CheckForAvailableSlot:
-
-org $1DE9B6
-Filter_MajorWhitenMain:
-
-org $1DF65D
-Sprite_SpawnDynamically:
-
-org $1DF65F
-Sprite_SpawnDynamically_arbitrary:
-
-org $1DFD4B
-DiggingGameGuy_AttemptPrizeSpawn:
-
-org $1EDE28
-Sprite_GetEmptyBottleIndex: ; this is totally in sprite_bees.asm
-
-org $1EF4E7
-Sprite_PlayerCantPassThrough:
-;================================================================================

accessibility.asm

@@ -1,127 +1,118 @@
 ;================================================================================
 ; Accessibility Fixes
 ;================================================================================
-FlipGreenPendant:
-	LDA $0C : CMP #$38 : BNE + ; check if we have green pendant
-		ORA #$40 : STA $0C ; flip it
-	+
-	
-    LDA $0D : STA $0802, X ; stuff we wrote over "Set CHR, palette, and priority of the sprite"
-    LDA $0C : STA $0803, X
-RTL
-;================================================================================
 ConditionalLightning:
         CMP.b #$05 : BEQ ++
         CMP.b #$2C : BEQ ++
         CMP.b #$5A : BEQ ++
             LDA.l DisableFlashing : BNE ++
-                LDA.b #$32 : STA.w $9A
+                LDA.b #$32 : STA.w CGADSUBQ
                 RTL
         ++
                 LDA.b #$72
-        STA $9A
+        STA.b CGADSUBQ
 RTL
 ;================================================================================
 ConditionalWhitenBg:
         LDX.b #$00
         LDA.l DisableFlashing : REP #$20 : BNE +
-            LDA $00,X
+            LDA.b Scrap00,X
             JSR WhitenLoopReal
             RTL
         +
-            LDA $00
+            LDA.b Scrap00
             JSR WhitenLoopDummy
             RTL
 ;================================================================================
 WhitenLoopReal:
         -
-            LDA $7EC340, X : JSL Filter_Majorly_Whiten_Color : STA $7EC540, X
+            LDA.l PaletteBufferAux+$40, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$40, X
-            LDA $7EC350, X : JSL Filter_Majorly_Whiten_Color : STA $7EC550, X
+            LDA.l PaletteBufferAux+$50, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$50, X
-            LDA $7EC360, X : JSL Filter_Majorly_Whiten_Color : STA $7EC560, X
+            LDA.l PaletteBufferAux+$60, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$60, X
-            LDA $7EC370, X : JSL Filter_Majorly_Whiten_Color : STA $7EC570, X
+            LDA.l PaletteBufferAux+$70, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$70, X
-            LDA $7EC380, X : JSL Filter_Majorly_Whiten_Color : STA $7EC580, X
+            LDA.l PaletteBufferAux+$80, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$80, X
-            LDA $7EC390, X : JSL Filter_Majorly_Whiten_Color : STA $7EC590, X
+            LDA.l PaletteBufferAux+$90, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$90, X
-            LDA $7EC3A0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5A0, X
+            LDA.l PaletteBufferAux+$A0, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$A0, X
-            LDA $7EC3B0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5B0, X
+            LDA.l PaletteBufferAux+$B0, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$B0, X
-            LDA $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5C0, X
+            LDA.l PaletteBufferAux+$C0, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$C0, X
-            LDA $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5D0, X
+            LDA.l PaletteBufferAux+$D0, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$D0, X
-            LDA $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : STA $7EC5E0, X
+            LDA.l PaletteBufferAux+$E0, X : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$E0, X
             INX #2 : CPX.b #$10 : BEQ +
                 JMP -
         +
-            LDA $7EC3F0 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F0
+            LDA.l PaletteBufferAux+$F0 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F0
-            LDA $7EC3F2 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F2
+            LDA.l PaletteBufferAux+$F2 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F2
-            LDA $7EC3F4 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F4
+            LDA.l PaletteBufferAux+$F4 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F4
-            LDA $10 : CMP.w #$07 : BNE +
+            LDA.b GameMode : CMP.w #$0007 : BNE +
-            LDA $048E
+            LDA.b RoomIndex
-            CMP.w #$3C : BEQ ++
+            CMP.w #$003C : BEQ ++
-            CMP.w #$9D : BEQ ++
+            CMP.w #$009D : BEQ ++
-            CMP.w #$9C : BEQ ++
+            CMP.w #$009C : BEQ ++
-            CMP.w #$A5 : BEQ ++
+            CMP.w #$00A5 : BEQ ++
             +
-                LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F6
+                LDA.l PaletteBufferAux+$F6 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F6
-                LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F8
+                LDA.l PaletteBufferAux+$F8 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F8
                 BRA +++
             ++
-                LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F6
+                LDA.l PaletteBuffer+$F6 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F6
-                LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F8
+                LDA.l PaletteBuffer+$F8 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F8
                 BRA +++
             +++
-            LDA $7EC3FA : JSL Filter_Majorly_Whiten_Color : STA $7EC5FA
+            LDA.l PaletteBufferAux+$FA : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$FA
-            LDA $7EC3FC : JSL Filter_Majorly_Whiten_Color : STA $7EC5FC
+            LDA.l PaletteBufferAux+$FC : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$FC
-            LDA $7EC3FE : JSL Filter_Majorly_Whiten_Color : STA $7EC5FE
+            LDA.l PaletteBufferAux+$FE : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$FE
             REP #$10
-            LDA $7EC540 : TAY
+            LDA.l PaletteBuffer+$40 : TAY
-            LDA $7EC300 : BNE +
+            LDA.l PaletteBufferAux : BNE +
                 TAY
         +
-            TYA : STA $7EC500
+            TYA : STA.l PaletteBuffer
             SEP #$30
 RTS
 ;================================================================================
 WhitenLoopDummy:
         -
-            LDA $7EC340, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC540, X
+            LDA.l PaletteBufferAux+$40, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$40, X
-            LDA $7EC350, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC550, X
+            LDA.l PaletteBufferAux+$50, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$50, X
-            LDA $7EC360, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC560, X
+            LDA.l PaletteBufferAux+$60, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$60, X
-            LDA $7EC370, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC570, X
+            LDA.l PaletteBufferAux+$70, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$70, X
-            LDA $7EC380, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC580, X
+            LDA.l PaletteBufferAux+$80, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$80, X
-            LDA $7EC390, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC590, X
+            LDA.l PaletteBufferAux+$90, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$90, X
-            LDA $7EC3A0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5A0, X
+            LDA.l PaletteBufferAux+$A0, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$A0, X
-            LDA $7EC3B0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5B0, X
+            LDA.l PaletteBufferAux+$B0, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$B0, X
-            LDA $7EC3C0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5C0, X
+            LDA.l PaletteBufferAux+$C0, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$C0, X
-            LDA $7EC3D0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5D0, X
+            LDA.l PaletteBufferAux+$D0, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$D0, X
-            LDA $7EC3E0, X : JSL Filter_Majorly_Whiten_Color : LDA $7EC5E0, X
+            LDA.l PaletteBufferAux+$E0, X : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$E0, X
             INX #2 : CPX.b #$10 : BEQ +
                 JMP -
         +
-            LDA $7EC3F0 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F0
+            LDA.l PaletteBufferAux+$F0 : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$F0
-            LDA $7EC3F2 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F2
+            LDA.l PaletteBufferAux+$F2 : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$F2
-            LDA $7EC3F4 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F4
+            LDA.l PaletteBufferAux+$F4 : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$F4
-            LDA $10 : CMP.w #$07 : BNE + ; only light invisifloor if we're in dungeon submodule
+            LDA.b GameMode : CMP.w #$0007 : BNE + ; only light invisifloor if we're in dungeon submodule
-            LDA $048E
+            LDA.b RoomIndex
-            CMP.w #$3C : BEQ ++ ; hookshot cave
+            CMP.w #$003C : BEQ ++ ; hookshot cave
-            CMP.w #$9D : BEQ ++ ; gt right
+            CMP.w #$009D : BEQ ++ ; gt right
-            CMP.w #$9C : BEQ ++ ; gt big room
+            CMP.w #$009C : BEQ ++ ; gt big room
-            CMP.w #$A5 : BEQ ++ ; wizzrobes 1
+            CMP.w #$00A5 : BEQ ++ ; wizzrobes 1
             +
-                LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F6
+                LDA.l PaletteBufferAux+$F6 : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$F6
-                LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : LDA $7EC5F8
+                LDA.l PaletteBufferAux+$F8 : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$F8
                 BRA +++
             ++
-                LDA $7EC3F6 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F6
+                LDA.l PaletteBufferAux+$F6 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F6
-                LDA $7EC3F8 : JSL Filter_Majorly_Whiten_Color : STA $7EC5F8
+                LDA.l PaletteBufferAux+$F8 : JSL Filter_Majorly_Whiten_Color : STA.l PaletteBuffer+$F8
                 BRA +++
             +++
-            LDA $7EC3FA : JSL Filter_Majorly_Whiten_Color : LDA $7EC5FA
+            LDA.l PaletteBufferAux+$FA : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$FA
-            LDA $7EC3FC : JSL Filter_Majorly_Whiten_Color : LDA $7EC5FC
+            LDA.l PaletteBufferAux+$FC : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$FC
-            LDA $7EC3FE : JSL Filter_Majorly_Whiten_Color : LDA $7EC5FE
+            LDA.l PaletteBufferAux+$FE : JSL Filter_Majorly_Whiten_Color : LDA.l PaletteBuffer+$FE
             REP #$10
-            LDA $7EC540 : TAY
+            LDA.l PaletteBuffer+$40 : TAY
-            LDA $7EC300 : BNE +
+            LDA.l PaletteBufferAux : BNE +
                 TAY
         +
-            TYA : STA $7EC500
+            TYA : STA.l PaletteBuffer
             SEP #$30
 RTS
 ;================================================================================
@@ -129,144 +120,144 @@ RestoreBgEther:
         LDX.b #$00
         LDA.l DisableFlashing : REP #$20 : BNE +
         -
-            LDA $00,X
+            LDA.b Scrap00,X
-            LDA $7EC340, X : STA $7EC540, X
+            LDA.l PaletteBufferAux+$40, X : STA.l PaletteBuffer+$40, X
-            LDA $7EC350, X : STA $7EC550, X
+            LDA.l PaletteBufferAux+$50, X : STA.l PaletteBuffer+$50, X
-            LDA $7EC360, X : STA $7EC560, X
+            LDA.l PaletteBufferAux+$60, X : STA.l PaletteBuffer+$60, X
-            LDA $7EC370, X : STA $7EC570, X
+            LDA.l PaletteBufferAux+$70, X : STA.l PaletteBuffer+$70, X
-            LDA $7EC380, X : STA $7EC580, X
+            LDA.l PaletteBufferAux+$80, X : STA.l PaletteBuffer+$80, X
-            LDA $7EC390, X : STA $7EC590, X
+            LDA.l PaletteBufferAux+$90, X : STA.l PaletteBuffer+$90, X
-            LDA $7EC3A0, X : STA $7EC5A0, X
+            LDA.l PaletteBufferAux+$A0, X : STA.l PaletteBuffer+$A0, X
-            LDA $7EC3B0, X : STA $7EC5B0, X
+            LDA.l PaletteBufferAux+$B0, X : STA.l PaletteBuffer+$B0, X
-            LDA $7EC3C0, X : STA $7EC5C0, X
+            LDA.l PaletteBufferAux+$C0, X : STA.l PaletteBuffer+$C0, X
-            LDA $7EC3D0, X : STA $7EC5D0, X
+            LDA.l PaletteBufferAux+$D0, X : STA.l PaletteBuffer+$D0, X
-            LDA $7EC3E0, X : STA $7EC5E0, X
+            LDA.l PaletteBufferAux+$E0, X : STA.l PaletteBuffer+$E0, X
-            LDA $7EC3F0, X : STA $7EC5F0, X
+            LDA.l PaletteBufferAux+$F0, X : STA.l PaletteBuffer+$F0, X
             INX #2 : CPX.b #$10 : BNE -
             BRA ++
         +
         -
-            LDA $00
+            LDA.b Scrap00
-            LDA $7EC340, X : LDA $7EC540, X
+            LDA.l PaletteBufferAux+$40, X : LDA.l PaletteBuffer+$40, X
-            LDA $7EC350, X : LDA $7EC550, X
+            LDA.l PaletteBufferAux+$50, X : LDA.l PaletteBuffer+$50, X
-            LDA $7EC360, X : LDA $7EC560, X
+            LDA.l PaletteBufferAux+$60, X : LDA.l PaletteBuffer+$60, X
-            LDA $7EC370, X : LDA $7EC570, X
+            LDA.l PaletteBufferAux+$70, X : LDA.l PaletteBuffer+$70, X
-            LDA $7EC380, X : LDA $7EC580, X
+            LDA.l PaletteBufferAux+$80, X : LDA.l PaletteBuffer+$80, X
-            LDA $7EC390, X : LDA $7EC590, X
+            LDA.l PaletteBufferAux+$90, X : LDA.l PaletteBuffer+$90, X
-            LDA $7EC3A0, X : LDA $7EC5A0, X
+            LDA.l PaletteBufferAux+$A0, X : LDA.l PaletteBuffer+$A0, X
-            LDA $7EC3B0, X : LDA $7EC5B0, X
+            LDA.l PaletteBufferAux+$B0, X : LDA.l PaletteBuffer+$B0, X
-            LDA $7EC3C0, X : LDA $7EC5C0, X
+            LDA.l PaletteBufferAux+$C0, X : LDA.l PaletteBuffer+$C0, X
-            LDA $7EC3D0, X : LDA $7EC5D0, X
+            LDA.l PaletteBufferAux+$D0, X : LDA.l PaletteBuffer+$D0, X
-            LDA $7EC3E0, X : LDA $7EC5E0, X
+            LDA.l PaletteBufferAux+$E0, X : LDA.l PaletteBuffer+$E0, X
-            LDA $7EC3F0, X : LDA $7EC5F0, X
+            LDA.l PaletteBufferAux+$F0, X : LDA.l PaletteBuffer+$F0, X
             INX #2 : CPX.b #$10 : BNE -
             BRA ++
         ++
-JML $02FF51 ; Bank0E.asm : 3936 vanilla restore routine after loop which RTLs
+JML $82FF51 ; Bank0E.asm : 3936 vanilla restore routine after loop which RTLs
 ;================================================================================
 DDMConditionalLightning:
         LDA.l DisableFlashing 
         REP #$20
         BNE +
-            LDA.w $0000
+            LDA.w Scrap
             LDX.b #$02
-            JML $07FA7F ; Bank0E.asm : 4738 vanilla loop equivalent to below beginning at LDY #$00
+            JML $87FA7F ; Bank0E.asm : 4738 vanilla loop equivalent to below beginning at LDY #$00
         +
-            LDA.b $00 : LDX.b #$02 : LDY #$00
+            LDA.b Scrap00 : LDX.b #$02 : LDY.b #$00
         -
-            LDA $F4EB, Y : LDA $7EC560, X
+            LDA.w $F4EB, Y : LDA.l PaletteBuffer+$60, X
-            LDA $F4F9, Y : LDA $7EC570, X
+            LDA.w $F4F9, Y : LDA.l PaletteBuffer+$70, X
-            LDA $F507, Y : LDA $7EC590, X
+            LDA.w $F507, Y : LDA.l PaletteBuffer+$90, X
-            LDA $F515, Y : LDA $7EC5E0, X
+            LDA.w $F515, Y : LDA.l PaletteBuffer+$E0, X
-            LDA $F523, Y : LDA $7EC5F0, X
+            LDA.w $F523, Y : LDA.l PaletteBuffer+$F0, X
             INY #2
             INX #2 : CPX.b #$10 : BNE -
-            JML $07FAAC ; Bank0E.asm : 4754 both branches converge here
+            JML $87FAAC ; Bank0E.asm : 4754 both branches converge here
 ;================================================================================
 ConditionalGTFlash:
         LDA.l DisableFlashing : REP #$20 : BNE +
-            LDA $0000
+            LDA.w Scrap
         -
-            LDA $F9C1, Y : STA $7EC5D0, X
+            LDA.w $F9C1, Y : STA.l PaletteBuffer+$D0, X
             INY #2
             INX #2 : CPX.b #$10 : BNE -
             RTL
         +
-            LDA $00
+            LDA.b Scrap00
         -
-            LDA $F9C1, Y : LDA $7EC5D0, X
+            LDA.w $F9C1, Y : LDA.l PaletteBuffer+$D0, X
             INY #2
             INX #2 : CPX.b #$10 : BNE -
             RTL
 ;================================================================================
 ConditionalRedFlash:
         LDA.l DisableFlashing : REP #$20 : BNE +
-            LDA $00,X
+            LDA.b Scrap,X
-            LDA.w #$1D59 : STA $7EC5DA
+            LDA.w #$1D59 : STA.l PaletteBuffer+$DA
-            LDA.w #$25FF : STA $7EC5DC
+            LDA.w #$25FF : STA.l PaletteBuffer+$DC
             LDA.w #$001A
             RTL
         +
-            LDA $00
+            LDA.b Scrap00
-            LDA.w #$1D59 : LDA $7EC5DA
+            LDA.w #$1D59 : LDA.l PaletteBuffer+$DA
-            LDA.w #$25FF : LDA $7EC5DC
+            LDA.w #$25FF : LDA.l PaletteBuffer+$DC
             LDA.w #$0000
             RTL
 ;================================================================================
 ConditionalPedAncilla:
         LDA.l DisableFlashing : REP #$20 : BNE +
-            LDA $00,X
+            LDA.b Scrap,X
-            LDA $00 : STA $04
+            LDA.b Scrap00 : STA.b Scrap04
-            LDA $02 : STA $06
+            LDA.b Scrap02 : STA.b Scrap06
             RTL
         +
-            LDA $00
+            LDA.b Scrap
-            LDA $00 : LDA $04
+            LDA.b Scrap00 : LDA.b Scrap04
-            LDA $02 : LDA $06
+            LDA.b Scrap02 : LDA.b Scrap06
             RTL
 ;================================================================================
 LoadElectroPalette:
         REP #$20
-        LDA.w #$0202 : STA $0C
+        LDA.w #$0202 : STA.b Scrap0C
-        LDA.w #$0404 : STA $0E
+        LDA.w #$0404 : STA.b Scrap0E
-        LDA.w #$001B : STA $02
+        LDA.w #$001B : STA.b Scrap02
         SEP #$10
-        LDX $0C : LDA $1BEBB4, X : AND.w #$00FF : ADC #$D630
+        LDX.b Scrap0C : LDA.l $9BEBB4, X : AND.w #$00FF : ADC.w #$D630
         REP #$10 : LDX.w #$01B2 : LDY.w #$0002
         JSR ConditionalLoadGearPalette
         SEP #$10
-        LDX $0D
+        LDX.b Scrap0D
-        LDA $1BEBC1, X : AND.w #$00FF : ADC #$D648
+        LDA.l $9BEBC1, X : AND.w #$00FF : ADC.w #$D648
         REP #$10 : LDX.w #$01B8 : LDY.w #$0003
         JSR ConditionalLoadGearPalette
         SEP #$10
-        LDX $0E
+        LDX.b Scrap0E
-        LDA $1BEC06, X : AND.w #$00FF : ASL A : ADC #$D308
+        LDA.l $9BEC06, X : AND.w #$00FF : ASL A : ADC.w #$D308
         REP #$10 : LDX.w #$01E2 : LDY.w #$000E
         JSR ConditionalLoadGearPalette
         SEP #$30
-        INC $15
+        INC.b NMICGRAM
 RTL
 ;================================================================================
 ConditionalLoadGearPalette:
-        STA $00
+        STA.b Scrap00
         SEP #$20
         LDA.l DisableFlashing : REP #$20 : BNE +
-                LDA $00,X
+                LDA.b Scrap,X
         -
-                LDA [$00]
+                LDA.b [Scrap00]
-                STA $7EC500, X
+                STA.l PaletteBuffer, X
-                INC $00 : INC $00
+                INC.b Scrap00 : INC.b Scrap00
                 INX #2
                 DEY
                 BPL -
         RTS
         +
-                LDA $00
+                LDA.b Scrap
         -
-                LDA [$00]
+                LDA.b [Scrap00]
-                LDA $7EC500, X
+                LDA.l PaletteBuffer, X
-                INC $00 : INC $00
+                INC.b Scrap00 : INC.b Scrap00
                 INX #2
                 DEY
                 BPL -
@@ -281,13 +272,13 @@ RestoreElectroPalette:
         LDX.w #$01E2 : LDY.w #$000E
         JSR FillPaletteBufferFromAux
         SEP #$30
-        INC $15
+        INC.b NMICGRAM
 RTL
 ;================================================================================
 FillPaletteBufferFromAux:
         -
-            LDA $7EC300, X
+            LDA.l PaletteBufferAux, X
-            STA $7EC500, X
+            STA.l PaletteBuffer, X
             INX #2
             DEY
             BPL -

bookofmudora.asm

@@ -4,19 +4,20 @@
 LoadLibraryItemGFX:
 		LDA.l LibraryItem_Player : STA !MULTIWORLD_SPRITEITEM_PLAYER_ID
         %GetPossiblyEncryptedItem(LibraryItem, SpriteItemValues)
-	STA $0E80, X ; Store item type
+        JSL.l ResolveLootIDLong
-	JSL.l PrepDynamicTile
+        STA.w SpriteID, X
+        JSL.l PrepDynamicTile_loot_resolved
 RTL
 ;--------------------------------------------------------------------------------
 DrawLibraryItemGFX:
         PHA
-    LDA $0E80, X ; Retrieve stored item type
+        LDA.w SpriteID, X
         JSL.l DrawDynamicTile
         PLA
 RTL
 ;--------------------------------------------------------------------------------
 SetLibraryItem:
-	LDY $0E80, X ; Retrieve stored item type
+        LDY.w SpriteID, X
         JSL.l ItemSet_Library ; contains thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
@@ -25,25 +26,24 @@ RTL
 ;================================================================================
 ; Randomize Bonk Keys
 ;--------------------------------------------------------------------------------
-!REDRAW = "$7F5000"
-;--------------------------------------------------------------------------------
 LoadBonkItemGFX:
-	LDA.b #$08 : STA $0F50, X ; thing we wrote over
+	LDA.b #$08 : STA.w SpriteOAMProp, X ; thing we wrote over
 LoadBonkItemGFX_inner:
-	LDA.b #$00 : STA !REDRAW
+	LDA.b #$00 : STA.l RedrawFlag
 	JSR LoadBonkItem_Player : STA !MULTIWORLD_SPRITEITEM_PLAYER_ID
 	JSR LoadBonkItem
+        STA.w SpriteItemType, X
+        STA.w SpriteID, X
 	JSL.l PrepDynamicTile
 RTL
 ;--------------------------------------------------------------------------------
 DrawBonkItemGFX: 
         PHA
-	LDA !REDRAW : BEQ .skipInit ; skip init if already ready
+        LDA.l RedrawFlag : BEQ .skipInit
         JSL.l LoadBonkItemGFX_inner
         BRA .done ; don't draw on the init frame
 
 	.skipInit
-	
         JSR LoadBonkItem
         JSL.l DrawDynamicTileNoShadow
 
@@ -54,10 +54,10 @@ RTL
 GiveBonkItem:
 	JSR LoadBonkItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID
 	JSR LoadBonkItem
-	CMP #$24 : BNE .notKey
+	CMP.b #$24 : BNE .notKey
 	.key
 		PHY : LDY.b #$24 : JSL.l AddInventory : PLY ; do inventory processing for a small key
-		LDA CurrentSmallKeys : INC A : STA CurrentSmallKeys
+		LDA.l CurrentSmallKeys : INC A : STA.l CurrentSmallKeys
 		LDA.b #$2F : JSL.l Sound_SetSfx3PanLong
 		JSL CountBonkItem
 RTL
@@ -67,11 +67,11 @@ RTL
 RTL
 ;--------------------------------------------------------------------------------
 LoadBonkItem:
-	LDA $A0 ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
+	LDA.b RoomIndex ; check room ID - only bonk keys in 2 rooms so we're just checking the lower byte
-	CMP #115 : BNE + ; Desert Bonk Key
+	CMP.b #115 : BNE + ; Desert Bonk Key
     	LDA.l BonkKey_Desert
 		BRA ++
-	+ : CMP #140 : BNE + ; GTower Bonk Key
+	+ : CMP.b #140 : BNE + ; GTower Bonk Key
     	LDA.l BonkKey_GTower
 		BRA ++
 	+

boots.asm

@@ -1,28 +1,27 @@
 ;================================================================================
 ; Boots State Modifier
 ;--------------------------------------------------------------------------------
-!BOOTS_MODIFIER = "$7F50CE"
 ModifyBoots:
     PHA
-        LDA !BOOTS_MODIFIER : CMP.b #$01 : BNE +
+        LDA.l BootsModifier : CMP.b #$01 : BNE +
-            PLA : AND AbilityFlags : ORA.b #$04 : RTL ; yes boots
+            PLA : AND.l AbilityFlags : ORA.b #$04 : RTL ; yes boots
         + : CMP.b #$02 : BNE +
-            PLA : AND AbilityFlags : AND.b #$FB : RTL ; no boots
+            PLA : AND.l AbilityFlags : AND.b #$FB : RTL ; no boots
-        + : LDA FakeBoots : CMP.b #$01 : BNE +
+        + : LDA.l FakeBoots : CMP.b #$01 : BNE +
-            LDA $5B : BEQ ++ : LDA $59 : BNE + ; hover check
+            LDA.b LinkSlipping : BEQ ++ : LDA.b $59 : BNE + ; hover check
-                ++ : PLA : AND AbilityFlags : ORA.b #$04 : RTL ; yes boots, not hovering
+                ++ : PLA : AND.l AbilityFlags : ORA.b #$04 : RTL ; yes boots, not hovering
         +
     PLA
-    AND AbilityFlags ; regular boots
+    AND.l AbilityFlags ; regular boots
 RTL
 ;--------------------------------------------------------------------------------
 AddBonkTremors:
     PHA
-        LDA $46 : BNE + ; Check for incapacitated Link
+        LDA.b $46 : BNE + ; Check for incapacitated Link
             JSL.l IncrementBonkCounter
         +
-        LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+        LDA.l BootsModifier : CMP.b #$01 : BEQ +
-        LDA BootsEquipment : BNE + ; Check for Boots
+        LDA.l BootsEquipment : BNE + ; Check for Boots
             PLA : RTL
         +
     PLA
@@ -32,46 +31,46 @@ RTL
 BonkBreakableWall:
     PHX : PHP
         SEP #$30 ; set 8-bit accumulator and index registers
-        LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+        LDA.l BootsModifier : CMP.b #$01 : BEQ +
-        LDA BootsEquipment : BNE + ; Check for Boots
+        LDA.l BootsEquipment : BNE + ; Check for Boots
             PLP : PLX : LDA.w #$0000 : RTL
         +
     PLP : PLX
-    LDA $0372 : AND.w #$00FF ; things we wrote over
+    LDA.w $0372 : AND.w #$00FF ; things we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 BonkRockPile:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BNE + ; Check for Boots
+    LDA.l BootsEquipment : BNE + ; Check for Boots
         LDA.b #$00 : RTL
     +
-    LDA $02EF : AND.b #$70 ; things we wrote over
+    LDA.w TileActBE : AND.b #$70 ; things we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 GravestoneHook:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BEQ .done ; Check for Boots
+    LDA.l BootsEquipment : BEQ .done ; Check for Boots
     +
-    LDA $0372 : BEQ .done ; things we wrote over
+    LDA.w $0372 : BEQ .done ; things we wrote over
         JML.l moveGravestone
     .done
     JML.l GravestoneHook_continue
 ;--------------------------------------------------------------------------------
 JumpDownLedge:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BNE + ; Check for Boots
+    LDA.l BootsEquipment : BNE + ; Check for Boots
         ; Disarm Waterwalk
-        LDA $5B : CMP.b #$01 : BNE +
+        LDA.b LinkSlipping : CMP.b #$01 : BNE +
-            STZ $5B
+            STZ.b LinkSlipping
     +
-    LDA $1B : BNE .done : LDA.b #$02 : STA $EE ; things we wrote over
+    LDA.b IndoorsFlag : BNE .done : LDA.b #$02 : STA.b LinkLayer ; things we wrote over
     .done
 RTL
 ;--------------------------------------------------------------------------------
 BonkRecoil:
-    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
-    LDA BootsEquipment : BNE + ; Check for Boots
+    LDA.l BootsEquipment : BNE + ; Check for Boots
-        LDA.b #$16 : STA $29 : RTL
+        LDA.b #$16 : STA.b LinkRecoilZ : RTL
     +
-    LDA.b #$24 : STA $29 ; things we wrote over
+    LDA.b #$24 : STA.b LinkRecoilZ ; things we wrote over
 RTL

bugfixes.asm

@@ -2,8 +2,8 @@
 
 ;--------------------------------------------------------------------------------
 AssignKiki:
-    LDA.b #$00 : STA FollowerDropped ; defuse bomb
+    LDA.b #$00 : STA.l FollowerDropped ; defuse bomb
-    LDA.b #$0A : STA FollowerIndicator ; assign kiki as follower
+    LDA.b #$0A : STA.l FollowerIndicator ; assign kiki as follower
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -11,10 +11,9 @@ RTL
 ; Name: AllowSQ
 ; Returns: Accumulator = 0 if S&Q is disallowed, 1 if allowed
 ;--------------------------------------------------------------------------------
-!ITEM_BUSY = "$7F5091"
 AllowSQ:
-	LDA ProgressIndicator : BEQ .done ; thing we overwrote - check if link is in his bed
+	LDA.l ProgressIndicator : BEQ .done ; thing we overwrote - check if link is in his bed
-	LDA !ITEM_BUSY : EOR #$01
+	LDA.l BusyItem : EOR.b #$01
 	.done
 RTL
 ;--------------------------------------------------------------------------------
@@ -23,8 +22,8 @@ RTL
 ;0 = Reset Music
 ;1 = Don't Reset Music
 MSMusicReset:
-	LDA $8A : CMP.b #$80 : BNE +
+	LDA.b OverworldIndex : CMP.b #$80 : BNE +
-		LDA $23
+		LDA.b LinkPosX+1
 	+
 RTL
 ;--------------------------------------------------------------------------------
@@ -32,11 +31,11 @@ RTL
 ;--------------------------------------------------------------------------------
 ;0 = Become (Perma)bunny
 DecideIfBunny:
-	LDA MoonPearlEquipment : BNE .done
+	LDA.l MoonPearlEquipment : BNE .done
-	LDA CurrentWorld : AND.b #$40
+	LDA.l CurrentWorld : AND.b #$40
 	PHA : LDA.l InvertedMode : BNE .inverted
 	.normal
-		PLA : EOR #$40
+		PLA : EOR.b #$40
 		BRA .done
 	.inverted
 		PLA
@@ -47,9 +46,9 @@ RTL
 DecideIfBunnyByScreenIndex:
 	; If indoors we don't have a screen index. Return non-bunny to make mirror-based
 	; superbunny work
-	LDA $1B : BNE .done
+	LDA.b IndoorsFlag : BNE .done
-	LDA MoonPearlEquipment : BNE .done
+	LDA.l MoonPearlEquipment : BNE .done
-	LDA $8A : AND.b #$40 : PHA
+	LDA.b OverworldIndex : AND.b #$40 : PHA
 	LDA.l InvertedMode : BNE .inverted
 	.normal
 		PLA : EOR #$40
@@ -58,23 +57,14 @@ DecideIfBunnyByScreenIndex:
 		PLA
 	.done
 RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-;ReadInventoryPond:
-;	CPX.b #$1B : BNE + : LDA.b #$01 : RTL : +
-;	LDA EquipmentWRAM, X
-;RTL
-;--------------------------------------------------------------------------------
-
 ;--------------------------------------------------------------------------------
 FixBunnyOnExitToLightWorld:
-    LDA.w $02E0 : BEQ +
+    LDA.w BunnyFlag : BEQ +
         JSL.l DecideIfBunny : BEQ +
-        STZ $5D ; set player mode to Normal
+        STZ.b LinkState ; set player mode to Normal
-        STZ $02E0 : STZ $56 ; return player graphics to normal
+        STZ.w BunnyFlag : STZ.b BunnyFlagDP ; return player graphics to normal
     +
-RTS
+RTL
 ;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
@@ -83,17 +73,17 @@ RTS
 FixAga2Bunny:
     LDA.l FixFakeWorld :  BEQ + ; Only use this fix is fakeworld fix is in use
         LDA.l InvertedMode : BEQ +++
-            LDA.b #$00 : STA CurrentWorld ; Switch to light world
+            LDA.b #$00 : STA.l CurrentWorld ; Switch to light world
             BRA ++
         +++
-        LDA.b #$40 : STA CurrentWorld ; Switch to dark world
+        LDA.b #$40 : STA.l CurrentWorld ; Switch to dark world
     ++
 	JSL DecideIfBunny : BNE +
 		JSR MakeBunny
-		LDA.b #$04 : STA.w $012C ; play bunny music
+		LDA.b #$04 : STA.w MusicControlRequest ; play bunny music
 		BRA .done
 	+
-	LDA.b #$09 : STA.w $012C ; what we wrote over
+	LDA.b #$09 : STA.w MusicControlRequest ; what we wrote over
 	.done
 RTL
 ;--------------------------------------------------------------------------------
@@ -101,8 +91,8 @@ RTL
 ;--------------------------------------------------------------------------------
 MakeBunny:
     PHX : PHY
-	LDA.b #$17 : STA $5D ; set player mode to permabunny
+	LDA.b #$17 : STA.b LinkState ; set player mode to permabunny
-	LDA.b #$01 : STA $02E0 : STA $56 ; make player look like bunny
+	LDA.b #$01 : STA.w BunnyFlag : STA.b BunnyFlagDP ; make player look like bunny
 	JSL LoadGearPalettes_bunny
     PLY : PLX
 RTS
@@ -130,27 +120,27 @@ RTL
 ; Fix for SQ jumping causing accidental Exploration Glitch
 SQEGFix:
 	LDA.l Bugfix_PodEG : BEQ ++
-	STZ.w $047A ; disarm exploration glitch
+	STZ.w LayerAdjustment ; disarm exploration glitch
 ++	RTL
 
 ;--------------------------------------------------------------------------------
 ; Fix crystal not spawning when using somaria vs boss
 TryToSpawnCrystalUntilSuccess:
-	STX $02D8 ; what we overwrote
+	STX.w ItemReceiptID ; what we overwrote
 	JSL AddAncillaLong : BCS .failed ; a clear carry flag indicates success
 .spawned
-	STZ $AE ; the "trying to spawn crystal" flag
+	STZ.b RoomTag ; the "trying to spawn crystal" flag
-	STZ $AF ; the "trying to spawn pendant" flag
+	STZ.b RoomTag+1 ; the "trying to spawn pendant" flag
 .failed
 RTL
 
 ;--------------------------------------------------------------------------------
 ; Fix crystal not spawning when using somaria vs boss
 WallmasterCameraFix:
-	STZ $A7    ; disable vertical camera scrolling for current room
+	STZ.b CameraBoundV    ; disable vertical camera scrolling for current room
 	REP #$20
-	STZ $0618  ; something about scrolling, setting these to 0 tricks the game 
+	STZ.w CameraScrollN  ; something about scrolling, setting these to 0 tricks the game 
-	STZ $061A  ; into thinking we're at the edge of the room so it doesn't scroll.
+	STZ.w CameraScrollS  ; into thinking we're at the edge of the room so it doesn't scroll.
 	SEP #$20
 	JML Sound_SetSfx3PanLong ; what we wrote over, also this will RTL
 
@@ -158,8 +148,8 @@ WallmasterCameraFix:
 ; Fix losing glove colors
 LoadActualGearPalettesWithGloves:
 REP #$20
-LDA SwordEquipment : STA $0C
+LDA.l SwordEquipment : STA.b Scrap0C
-LDA ArmorEquipment : AND.w #$00FF
+LDA.l ArmorEquipment : AND.w #$00FF
 JSL LoadGearPalettes_variable
 JSL SpriteSwap_Palette_ArmorAndGloves_part_two
 RTL
@@ -167,24 +157,24 @@ RTL
 ;--------------------------------------------------------------------------------
 ; Fix Bunny Palette Map Bug
 LoadGearPalette_safe_for_bunny:
-LDA $10 
+LDA.b GameMode 
 CMP.w #$030E : BEQ .new ; opening dungeon map
 CMP.w #$070E : BEQ .new ; opening overworld map
 .original
 -
-	LDA [$00]
+	LDA.b [Scrap00]
-	STA $7EC300, X
+	STA.l PaletteBufferAux, X
-	STA $7EC500, X
+	STA.l PaletteBuffer, X
-	INC $00 : INC $00
+	INC.b Scrap00 : INC.b Scrap00
 	INX #2
 	DEY
 	BPL -
 RTL
 .new
 -
-	LDA [$00]
+	LDA.b [Scrap00]
-	STA $7EC500, X
+	STA.l PaletteBuffer, X
-	INC $00 : INC $00
+	INC.b Scrap00 : INC.b Scrap00
 	INX #2
 	DEY
 	BPL -
@@ -193,16 +183,16 @@ RTL
 ;--------------------------------------------------------------------------------
 ; Fix pedestal pull overlay
 PedestalPullOverlayFix:
-LDA.b #$09 : STA $039F, X	; the thing we wrote over
+LDA.b #$09 : STA.w AncillaGeneral, X ; the thing we wrote over
-LDA $1B : BNE +
+LDA.b IndoorsFlag : BNE +
-	LDA $8A : CMP.b #$80 : BNE +
+        LDA.b OverworldIndex : CMP.b #$80 : BNE +
-		LDA $8C : CMP.b #$97
+                LDA.b OverlayID : CMP.b #$97
 +
 RTL
 
 ;--------------------------------------------------------------------------------
 FixJingleGlitch:
-	LDA.b $11
+	LDA.b GameSubMode
 	BEQ .set_doors
 
 	LDA.l AllowAccidentalMajorGlitch
@@ -210,7 +200,7 @@ FixJingleGlitch:
 
 .set_doors
 	LDA.b #$05
-	STA.b $11
+	STA.b GameSubMode
 
 .exit
 	RTL
@@ -222,7 +212,43 @@ pushpc
 pullpc
 ;--------------------------------------------------------------------------------
 SetOverworldTransitionFlags:
-	LDA #$01
+	LDA.b #$01
-	STA $0ABF ; used by witch
+	STA.w OWTransitionFlag
-	STA $021B ; used by race game
+	STA.w RaceGameFlag
 	RTL
+;--------------------------------------------------------------------------------
+ParadoxCaveGfxFix:
+    ; Always upload line unless you're moving into paradox cave (0x0FF) from above (0x0EF)
+    LDA.b IndoorsFlag  : BEQ .uploadLine
+    LDX.b RoomIndex    : CPX.w #$00FF : BNE .uploadLine
+    LDX.b PreviousRoom : CPX.w #$00EF : BNE .uploadLine
+
+    ;Ignore uploading four specific lines of tiles to VRAM
+    LDX.w VRAMUploadAddress
+    ; Line 1
+    CPX.w #$1800 : BEQ .skipMostOfLine
+    ; Line 2
+    CPX.w #$1A00 : BEQ .skipMostOfLine
+    ; Line 3
+    CPX.w #$1C00 : BEQ .uploadLine
+    ; Line 4
+    CPX.w #$1E00 : BEQ .uploadLine
+
+.uploadLine
+    LDA.b #$01 : STA.w MDMAEN
+
+.skipLine
+    RTL
+
+.skipMostOfLine
+    ; Set line length to 192 bytes (the first 6 8x8 tiles in the line)
+    LDX.w #$00C0 : STX.w DAS0L
+    BRA .uploadLine
+;--------------------------------------------------------------------------------
+SetItemRiseTimer:
+        LDA.w ItemReceiptMethod : CMP #$01 : BNE .not_from_chest
+                LDA.b #$38 : STA.w AncillaTimer, X
+                RTL
+        .not_from_chest
+        TYA : STA.w AncillaTimer, X ; What we wrote over
+RTL

build.bat

@@ -1,2 +1,4 @@
-py -3 build.py
+del ..\working.sfc
-@echo %cmdcmdline%|find /i """%~f0""">nul && cmd /k
+copy ..\alttp.sfc ..\working.sfc
+%~dp0bin\windows\asar.exe LTTP_RND_GeneralBugfixes.asm ..\working.sfc
+cmd /k

build.sh

@@ -2,4 +2,4 @@
 
 rm ../working.sfc
 cp ../alttp.sfc ../working.sfc
-./asar LTTP_RND_GeneralBugfixes.asm ../working.sfc
+./bin/macos/asar -DFEATURE_NEW_TEXT=1 LTTP_RND_GeneralBugfixes.asm ../working.sfc

build_linux.sh

@@ -2,4 +2,4 @@
 
 rm ../working.sfc
 cp ../alttp.sfc ../working.sfc
-asar LTTP_RND_GeneralBugfixes.asm ../working.sfc
+./bin/linux/asar -DFEATURE_NEW_TEXT=1 LTTP_RND_GeneralBugfixes.asm ../working.sfc

capacityupgrades.asm

@@ -2,36 +2,26 @@
 ; Capacity Logic
 ;================================================================================
 IncrementBombs:
-    LDA BombCapacityUpgrades ; get bomb upgrades
+        LDA.l BombCapacity : BEQ + ; Skip if we can't have bombs
-	!ADD.l StartingMaxBombs : BEQ + ; Skip if we can't have bombs
                 DEC
-
+                CMP.l BombsEquipment : !BLT +
-    CMP BombsEquipment
+                        LDA.l BombsEquipment
-	
-	!BLT +
-    	LDA BombsEquipment
                         CMP.b #99 : !BGE +
-		INC : STA BombsEquipment
+                                INC : STA.l BombsEquipment
         +
 RTL
 ;--------------------------------------------------------------------------------
 IncrementArrows:
-    LDA ArrowCapacityUpgrades ; get arrow upgrades
+        LDA.l ArrowCapacity : DEC
-	!ADD.l StartingMaxArrows : DEC
+        CMP.l CurrentArrows : !BLT +
-
+                LDA.l CurrentArrows
-    CMP CurrentArrows
-	
-	!BLT +    
-    	LDA CurrentArrows
                         CMP.b #99 : !BGE +
-		INC : STA CurrentArrows
+                        INC : STA.l CurrentArrows
         +
 RTL
 ;--------------------------------------------------------------------------------
 CompareBombsToMax:
-    LDA BombCapacityUpgrades ; get bomb upgrades
+        LDA.l BombCapacity
-	!ADD.l StartingMaxBombs
+        CMP.l BombsEquipment
-
-    CMP BombsEquipment
 RTL
 ;--------------------------------------------------------------------------------

catfish.asm

@@ -1,42 +0,0 @@
-;================================================================================
-; Randomize Catfish
-;--------------------------------------------------------------------------------
-!HEART_REDRAW = "$7F5000"
-LoadCatfishItemGFX:
-	LDA.l CatfishItem_Player : STA !MULTIWORLD_SPRITEITEM_PLAYER_ID
-    LDA.l $1DE185 ; location randomizer writes catfish item to
-	JML PrepDynamicTile
-;--------------------------------------------------------------------------------
-DrawThrownItem:
-	LDA $8A : CMP.b #$81 : BNE .catfish
-	
-	.zora
-	LDA.b #$01 : STA !HEART_REDRAW
-    LDA.l $1DE1C3 ; location randomizer writes zora item to
-	BRA .draw
-	
-	.catfish
-    LDA.l $1DE185 ; location randomizer writes catfish item to
-	
-	.draw
-	JML DrawDynamicTile
-;--------------------------------------------------------------------------------
-MarkThrownItem:
-	PHA
-
-	LDA $8A : CMP.b #$81 : BNE .catfish
-
-	.zora
-    JSL.l ItemSet_ZoraKing
-	LDA ZoraItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID
-	BRA .done
-
-	.catfish
-    JSL.l ItemSet_Catfish
-	LDA CatfishItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID
-
-	.done
-	PLA
-	JSL Link_ReceiveItem ; thing we wrote over
-RTL
-;--------------------------------------------------------------------------------

clock.asm

@@ -1,248 +0,0 @@
-;--------------------------------------------------------------------------------
-; http://problemkaputt.de/fullsnes.htm
-; 2800h-2801h  S-RTC Real Time Clock I/O Ports
-; cartridge type change from #$02 to #$55 to enable S-RTC
-; SNES Cart S-RTC (Realtime Clock) (1 game)
-;
-; PCB "SHVC-LJ3R-01" with 24pin "Sharp S-RTC" chip. Used only by one japanese game:
-;   Dai Kaiju Monogatari 2 (1996) Birthday/Hudson Soft (JP)
-; 
-; S-RTC I/O Ports
-;   002800h S-RTC Read  (R)
-;   002801h S-RTC Write (W)
-; Both registers are 4bits wide. When writing: Upper 4bit should be zero. When reading: Upper 4bit should be masked-off (they do possibly contain garbage, eg. open-bus).
-; 
-; S-RTC Communication
-; The sequence for setting, and then reading the time is:
-;   Send <0Eh,04h,0Dh,0Eh,00h,Timestamp(12 digits),0Dh> to [002801h]
-;   If ([002800h] AND 0F)=0Fh then read <Timestamp(13 digits)>
-;   If ([002800h] AND 0F)=0Fh then read <Timestamp(13 digits)>
-;   If ([002800h] AND 0F)=0Fh then read <Timestamp(13 digits)>
-;   If ([002800h] AND 0F)=0Fh then read <Timestamp(13 digits)>
-;   etc.
-; The exact meaning of the bytes is unknown. 0Eh/0Dh seems to invoke/terminate commands, 04h might be some configuration stuff (like setting 24-hour mode). 00h is apparently the set-time command. There might be further commands (such like setting interrupts, alarm, 12-hour mode, reading battery low & error flags, etc.). When reading, 0Fh seems to indicate sth like "time available".
-; The 12/13-digit "SSMMHHDDMYYY(D)" Timestamps are having the following format:
-;   Seconds.lo  (BCD, 0..9)
-;   Seconds.hi  (BCD, 0..5)
-;   Minutes.lo  (BCD, 0..9)
-;   Minutes.hi  (BCD, 0..5)
-;   Hours.lo    (BCD, 0..9)
-;   Hours.hi    (BCD, 0..2)
-;   Day.lo      (BCD, 0..9)
-;   Day.hi      (BCD, 0..3)
-;   Month       (HEX, 01h..0Ch)
-;   Year.lo     (BCD, 0..9)
-;   Year.hi     (BCD, 0..9)
-;   Century     (HEX, 09h..0Ah for 19xx..20xx)
-; When READING the time, there is one final extra digit (the existing software doesn't transmit that extra digit on WRITING, though maybe it's possible to do writing, too):
-;   Day of Week? (0..6) (unknown if RTC assigns sth like 0=Sunday or 0=Monday)
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-macro A_x10()
-	ASL #1 : PHA
-	ASL #2 : !ADD 1,s
-	STA 1,s : PLA
-endmacro
-;--------------------------------------------------------------------------------
-macro A_x24()
-	ASL #3 : PHA
-	ASL #1 : !ADD 1,s
-	STA 1,s : PLA
-endmacro
-;--------------------------------------------------------------------------------
-macro A_x60()
-	ASL #2 : PHA
-	ASL #4 : !SUB 1,s
-	STA 1,s : PLA
-endmacro
-;--------------------------------------------------------------------------------
-macro Clock_ReadBCD()
-	LDA $002800 : PHA
-	LDA $002800 : %A_x10() : !ADD 1,s
-	STA 1,s : PLA
-endmacro
-;--------------------------------------------------------------------------------
-
-Clock_Test:
-	JSL.l Clock_Init
-	JML.l Clock_IsSupported
-
-;--------------------------------------------------------------------------------
-; Clock_Init
-;--------------------------------------------------------------------------------
-Clock_Init:
-	LDA.b #$0E : STA $002801
-	LDA.b #$04 : STA $002801
-	LDA.b #$0D : STA $002801
-	LDA.b #$0E : STA $002801
-	LDA.b #$00 : STA $002801
-	
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$01 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$01 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$00 : STA $002801
-	LDA.b #$0A : STA $002801
-	
-	LDA.b #$0D : STA $002801
-RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-; Clock_IsSupported
-;--------------------------------------------------------------------------------
-; Input: None (8-bit accumulator)
-;--------------------------------------------------------------------------------
-; Output:
-; Carry - unset if unsupported, set if supported
-; Zero - Undefined
-;--------------------------------------------------------------------------------
-; Side Effects:
-; S-RTC is ready for reading upon exit if supported
-;--------------------------------------------------------------------------------
-Clock_IsSupported:
-	PHA : PHX
-		LDX #$00;
-		-
-			LDA $002800 : AND.b #$0F : CMP #$0F : BEQ .done ; check for clock chip ready signal
-			CPX.b #$0E : BCC ++ : CLC : BRA .done ; if we've read 14 bytes with no success, unset carry and exit
-		++	INX
-		BRA -
-	.done
-	PLX : PLA
-RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-; Clock_QuickStamp
-;--------------------------------------------------------------------------------
-; Input: None
-;--------------------------------------------------------------------------------
-; Output:
-; $00.b - 24-bit timestamp (low)
-; $01.b - 24-bit timestamp (mid)
-; $02.b - 24-bit timestamp (high)
-; $03.b - zero
-; Carry - Unset if error, Set if success
-; Zero - Undefined
-;--------------------------------------------------------------------------------
-; Side Effects:
-; Requires Mode-7 Matrix Registers
-;--------------------------------------------------------------------------------
-Clock_QuickStamp:
-	PHA : PHX : PHP
-		SEP #$30 ; set 8-bit accumulator and index registers
-		LDX #$00;
-		-
-			LDA $002800 : AND.b #$0F : CMP #$0F : BEQ .ready ; check for clock chip ready signal
-			CPX.b #$0E : !BLT ++ : CLC : JMP .done : ++ ; if we've read 14 bytes with no success, unset carry and exit
-			INX
-		BRA -
-		SEC ; indicate success
-		
-		.ready
-		%Clock_ReadBCD() : STA $00 ; seconds
-		%Clock_ReadBCD() : STA $01 ; minutes
-		%Clock_ReadBCD() : STA $02 ; hours
-		%Clock_ReadBCD() : STA $03 ; days
-		
-		REP $20 ; set 16-bit accumulator
-		LDA $01 : AND #$00FF : %A_x60() ; convert minutes to seconds
-		STZ $01 : !ADD $00 : STA $00 ; store running total seconds to $00
-
-		LDA $03 : AND #$00FF : %A_x24() ; convert days to hours
-		STZ $03 : !ADD $02 ; get total hours
-		%A_x60() ; get total minutes
-		
-		LDY #$60
-		JSL.l Multiply_A16Y8
-		STY $02 : STZ $03
-		!ADD $00 : BCC + : INC $02 : +
-		
-	.done
-	PLP : PLX : PLA
-RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-; Multiply_A16Y8:
-;--------------------------------------------------------------------------------
-; Expects:
-; Accumulator - 16-bit
-; Index Registers - 8-bit
-;--------------------------------------------------------------------------------
-; Notes:
-; Found a (wrong) version of this on wikibooks. This is cleaned up and fixed.
-;--------------------------------------------------------------------------------
-Multiply_A16Y8:
-	SEP #$20 ; set 8-bit accumulator
-	STY $4202
-	STA $4203
-	NOP #4
-	LDA $4216
-	LDY $4217
-	XBA
-	STA $4203
-	NOP #2
-	TYA
-	CLC
-	ADC $4216
-	LDY $4217
-	BCC .carry_bit
-	INY
-.carry_bit:
-	XBA
-	REP #$20 ; set 16-bit accumulator
-RTL
-;--------------------------------------------------------------------------------
-
-;--------------------------------------------------------------------------------
-; Clock_GetTime
-;--------------------------------------------------------------------------------
-; Input: None
-;--------------------------------------------------------------------------------
-; Output:
-; $00.b - Seconds
-; $01.b - Minutes
-; $02.b - Hours
-; $03.b - Days
-; $04.b - Months
-; $05.w - Years
-; Carry - Unset if error, Set if success
-; Zero - Undefined
-;--------------------------------------------------------------------------------
-Clock_GetTime:
-	PHA : PHX : PHY : PHP
-		SEP #$30 ; set 8-bit accumulator and index registers
-		LDX #$00;
-		-
-			LDA $002800 : AND.b #$0F : CMP #$0F : BEQ .ready ; check for clock chip ready signal
-			CPX.b #$0E : !BLT ++ : CLC : JMP .done : ++ ; if we've read 14 bytes with no success, unset carry and exit
-			INX
-		BRA -
-		SEC ; indicate success
-		
-		.ready
-		%Clock_ReadBCD() : STA $00 ; seconds
-		%Clock_ReadBCD() : STA $01 ; minutes
-		%Clock_ReadBCD() : STA $02 ; hours
-		%Clock_ReadBCD() : STA $03 ; days
-		LDA $002800 : STA $04 ; months
-		%Clock_ReadBCD() : STA $05 ; years
-		LDA $002800 : STA $06 ; century
-		
-		REP $20 ; set 16-bit accumulator
-		STA $06 : AND #$00FF : %A_x10() : %A_x10() : !ADD #1000 ; multiply century digit by 100 and add 1000
-		STZ $06 : !ADD $05 : STA $05 ; add lower 2 digits of the year and store
-		
-	.done
-	PLP : PLY : PLX : PLA
-RTL
-;--------------------------------------------------------------------------------

compasses.asm

@@ -1,72 +0,0 @@
-;--------------------------------------------------------------------------------
-; $7F5010 - Scratch Space
-;--------------------------------------------------------------------------------
-
-DrawDungeonCompassCounts:
-        SEP #$10
-	LDX $1B : BNE + : RTL : + ; Skip if outdoors
-
-	; extra hard safeties for getting dungeon ID to prevent crashes
-	PHA
-	LDA.w $040C : AND.w #$00FE : TAX ; force dungeon ID to be multiple of 2
-	PLA
-
-	CPX.b #$1B : BCC + ; Skip if not in a valid dungeon ID
-		JMP .done
-	+
-	BIT.w #$0002 : BNE ++ ; if CompassMode==2, we don't check for the compass
-		TXY : TXA : LSR : TAX : LDA.l ExistsTransfer, X : TAX : LDA CompassExists, X : BEQ ++
-		TYX : LDA CompassField : AND.l DungeonItemMasks, X ; Load compass values to A, mask with dungeon item masks
-		BNE ++
-			JMP .done ; skip if we don't have compass
-	++
-
-	LDA $040C : LSR
-	BNE +
-		INC
-	+ TAX : LDA.l CompassTotalsWRAM, X : AND #$00FF
-	PHX
-		PHA
-			JSL HexToDec_fast
-		PLA : CMP.w #100 : !BLT .two_digit
-			LDX.b $05 : TXA : ORA #$2490 : STA $7EC79A
-			LDX.b $06 : TXA : ORA #$2490 : STA $7EC79C
-			LDX.b $07 : TXA : ORA #$2490 : STA $7EC79E
-			BRA .end_total
-		.two_digit
-		LDX.b $06 : TXA : ORA #$2490 : STA $7EC79A
-		LDX.b $07 : TXA : ORA #$2490 : STA $7EC79C
-	.end_total
-	PLX
-
-	LDA DungeonLocationsChecked, X : AND #$00FF
-	PHA
-		JSL HexToDec_fast
-	PLA : CMP.w #100 : !BLT +
-		LDX.b $05 : TXA : ORA #$2490 : STA $7EC792 ; Draw the 100's digit
-	+
-	LDX.b $06 : TXA : ORA #$2490 : STA $7EC794 ; Draw the item count
-	LDX.b $07 : TXA : ORA #$2490 : STA $7EC796
-	LDA.w #$2830 : STA $7EC798 ; draw the slash
-
-	.done
-RTL
-
-DungeonItemMasks: ; these are dungeon correlations to $7EF364 - $7EF369 so it knows where to store compasses, etc
-    dw $8000, $4000, $2000, $1000, $0800, $0400, $0200, $0100
-    dw $0080, $0040, $0020, $0010, $0008, $0004
-
-; maps from $040C to the odd order used in overworld map
-ExistsTransfer:
-db $0C, $0C, $00, $02, $0B, $09, $03, $07, $04, $08, $01, $06, $05, $0A
-
-;--------------------------------------------------------------------------------
-; $7EF4C0-7EF4CF - item locations checked indexed by $040C >> 1
-;--------------------------------------------------------------------------------
-InitCompassTotalsRAM:
-        LDX #$00
-        -
-                LDA CompassTotalsROM, X : STA CompassTotalsWRAM, X
-                INX
-                CPX #$0F : !BLT -
-RTL

compression.asm

@@ -1,29 +0,0 @@
-;--------------------------------------------------------------------------------
-ParadoxCaveGfxFix:
-    ; Always upload line unless you're moving into paradox cave (0x0FF) from above (0x0EF)
-    LDA $1B : BEQ .uploadLine
-    LDX $A0 : CPX #$00FF : BNE .uploadLine
-    LDX $A2 : CPX #$00EF : BNE .uploadLine
-
-    ;Ignore uploading four specific lines of tiles to VRAM
-    LDX $0118
-    ; Line 1
-    CPX #$1800 : BEQ .skipMostOfLine
-    ; Line 2
-    CPX #$1A00 : BEQ .skipMostOfLine
-    ; Line 3
-    CPX #$1C00 : BEQ .uploadLine
-    ; Line 4
-    CPX #$1E00 : BEQ .uploadLine
-
-.uploadLine
-    LDA.b #$01 : STA $420B
-
-.skipLine
-    RTL
-
-.skipMostOfLine
-    ; Set line length to 192 bytes (the first 6 8x8 tiles in the line)
-    LDX.w #$00C0 : STX $4305
-    BRA .uploadLine
-;--------------------------------------------------------------------------------

contrib.asm

@@ -1,185 +0,0 @@
-;================================================================
-; Contributor: Myramong
-;================================================================
-;Sprite_ShowMessageFromPlayerContact_Edit:
-;{
-;	STZ $1CE8
-;	JSL.l Sprite_CheckDamageToPlayerSameLayerLong : BCC .dont_show
-;
-;	LDA $4D : CMP.b #$02 : BEQ .dont_show
-;
-;	JSL.l Sprite_DirectionToFacePlayerLong : TYA : EOR.b #$03
-;	SEC
-;RTL
-;.dont_show
-;	LDA $0DE0, X
-;	CLC
-;RTL
-;}
-;================================================================
-;Sprite_ShowSolicitedMessageIfPlayerFacing_Edit:
-;{
-;	JSL.l Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
-;	JSL.l Sprite_CheckIfPlayerPreoccupied : BCS .alpha
-;	LDA $F6 : BPL .alpha
-;	LDA $0F10, X : BNE .alpha
-;
-;	LDA $4D : CMP.b #$02 : BEQ .alpha
-;
-;	STZ $1CE8 ; set text choice to 1st option (usually yes/confirm/etc)
-;	JSL.l Sprite_DirectionToFacePlayerLong : PHX : TYX
-;
-;	; Make sure that the sprite is facing towards the player, otherwise
-;	; talking can't happen. (What sprites actually use this???)
-;	LDA $05E1A3, X : PLX : CMP $2F : BNE .not_facing_each_other
-;	PHY
-;	LDA.b #$40 : STA $0F10, X
-;	PLA : EOR.b #$03
-;	SEC
-;RTL
-;.not_facing_each_other
-;.alpha
-;	LDA $0DE0, X
-;	CLC
-;RTL
-;}
-;================================================================
-;OldMountainMan_TransitionFromTagalong_Edit:
-;{
-;	PHA
-;
-;        LDA.b #$AD : JSL Sprite_SpawnDynamically
-;
-;        PLA : PHX : TAX
-;
-;        LDA $1A64, X : AND.b #$03 : STA $0EB0, Y
-;                                    STA $0DE0, Y
-;
-;        LDA $1A00, X : CLC : ADC.b #$02 : STA $0D00, Y
-;        LDA $1A14, X : ADC.b #$00 : STA $0D20, Y
-;
-;        LDA $1A28, X : CLC : ADC.b #$02 : STA $0D10, Y
-;        LDA $1A3C, X : ADC.b #$00 : STA $0D30, Y
-;
-;        LDA $EE : STA $0F20, Y
-;
-;        LDA.b #$01 : STA $0BA0, Y
-;                     STA $0E80, Y
-;
-;        LDA.b #$01 : STA $02E4 ; OldMountainMan_FreezePlayer
-;					 STA $037B ; ^
-;
-;        PLX
-;
-;        LDA.b #$00 : STA FollowerIndicator
-;
-;        STZ $5E
-;
-;        JML $09A6B6 ; <- 4A6B6 tagalong.asm:1194 (SEP #$30 : RTS)
-;}
-;================================================================
-Sprite_ShowSolicitedMessageIfPlayerFacing_Alt:
-{
-	STA $1CF0
-	STY $1CF1
-
-	JSL Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
-	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
-
-	LDA $F6 : BPL .alpha
-	LDA $0F10, X : BNE .alpha
-	LDA $4D : CMP.b #$02 : BEQ .alpha
-
-	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
-
-	; Make sure that the sprite is facing towards the player, otherwise
-	; talking can't happen. (What sprites actually use this???)
-	LDA $05E1A3, X : PLX : CMP $2F : BNE .not_facing_each_other
-
-	PHY
-
-	LDA $1CF0
-	LDY $1CF1
-
-	; Check what room we're in so we know which npc we're talking to
-	LDA.b $A0 :	CMP #$05 : BEQ .SahasrahlaDialogs
-				CMP #$1C : BEQ .BombShopGuyDialog
-						   BRA .SayNothing
-
-	.SahasrahlaDialogs
-		REP #$20 : LDA.l MapReveal_Sahasrahla : ORA MapOverlay : STA MapOverlay : SEP #$20
-		JSL DialogSahasrahla : BRA .SayNothing
-
-	.BombShopGuyDialog
-		REP #$20 : LDA.l MapReveal_BombShop : ORA MapOverlay : STA MapOverlay : SEP #$20
-		JSL DialogBombShopGuy
-
-	.SayNothing
-
-	LDA.b #$40 : STA $0F10, X
-
-	PLA : EOR.b #$03
-
-	SEC
-
-	RTL
-
-.not_facing_each_other
-.alpha
-
-	LDA $0DE0, X
-
-	CLC
-
-	RTL
-}
-;================================================================
-Sprite_ShowSolicitedMessageIfPlayerFacing_PreserveMessage:
-{
-	PHY
-	PHA
-
-	JSL Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
-	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
-
-	LDA $F6 : BPL .alpha
-	LDA $0F10, X : BNE .alpha
-	LDA $4D : CMP.b #$02 : BEQ .alpha
-
-	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
-
-	; Make sure that the sprite is facing towards the player, otherwise
-	; talking can't happen. (What sprites actually use this???)
-	LDA $05E1A3, X : PLX : CMP $2F : BNE .not_facing_each_other
-
-	PLA : XBA : PLA
-
-	PHY
-
-	TAY : XBA
-	
-	JSL Sprite_ShowMessageUnconditional
-
-	LDA.b #$40 : STA $0F10, X
-
-	PLA : EOR.b #$03
-
-	SEC
-
-	RTL
-
-.not_facing_each_other
-.alpha
-	PLY
-	PLA
-
-	LDA $0DE0, X
-
-	CLC
-
-	RTL
-}
-;================================================================
-
-incsrc menu/hudalpha.asm
-incsrc util/utils.asm

controllerjank.asm

@@ -4,29 +4,28 @@
 ;--------------------------------------------------------------------------------
 ; Filtered Joypad 1 Register: [AXLR | ????]
 ; Filtered Joypad 1 Register: [BYST | udlr] [AXLR | ????]
-!INVERT_DPAD = "$7F50CB"
 
 InvertDPad:
 	LDA.l OneMindPlayerCount : BEQ .crowd_control
 
-	LDA.l !ONEMIND_ID
+	LDA.l OneMindId
 	AND.b #$03
 	TAX
 	LDA.l .onemind_controller_offset, X
 	TAX
 
-	LDA.w $4218,X : STA.w $00
+	LDA.w JOY1L,X : STA.w Scrap00
-	LDA.w $4219,X : STA.w $01
+	LDA.w JOY1H,X : STA.w Scrap01
 
-	LDA #$80 : STA $4201 ; reset this so latch can read it, otherwise RNG breaks
+	LDA.b #$80 : STA.w WRIO ; reset this so latch can read it, otherwise RNG breaks
 
 	JML.l InvertDPadReturn
 
 .crowd_control
-	LDA !INVERT_DPAD : BNE +
+	LDA.l ControllerInverter : BNE +
 
-	LDA $4218 : STA $00
+	LDA.w JOY1L : STA.b Scrap00
-	LDA $4219 : STA $01
+	LDA.w JOY1H : STA.b Scrap01
 	JML.l InvertDPadReturn
 
 +	DEC : BEQ .dpadOnly
@@ -34,47 +33,47 @@ InvertDPad:
 	DEC : BEQ .invertBoth
 	.swapSides
 	REP #$20 ; set 16-bit accumulator
-	LDA $4218
+	LDA.w JOY1L
 		BIT.w #$0840 : BEQ + : EOR.w #$0840 : + ; swap X/up
 		BIT.w #$0180 : BEQ + : EOR.w #$0180 : + ; swap A/right
 		BIT.w #$4200 : BEQ + : EOR.w #$4200 : + ; swap Y/left
 		BIT.w #$8400 : BEQ + : EOR.w #$8400 : + ; swap B/down
-	STA $00
+	STA.b Scrap00
 	SEP #$20 ; set 8-bit accumulator
 JML.l InvertDPadReturn
 	.invertBoth
 	REP #$20 ; set 16-bit accumulator
-	LDA $4218
+	LDA.w JOY1L
 		BIT.w #$8040 : BEQ + : EOR.w #$8040 : + ; swap X/B
 		BIT.w #$4080 : BEQ + : EOR.w #$4080 : + ; swap Y/A
 		BIT.w #$0C00 : BEQ + : EOR.w #$0C00 : + ; swap up/down
 		BIT.w #$0300 : BEQ + : EOR.w #$0300 : + ; swap left/right
-	STA $00
+	STA.b Scrap00
 	SEP #$20 ; set 8-bit accumulator
 JML.l InvertDPadReturn
 	.buttonsOnly
 	REP #$20 ; set 16-bit accumulator
-	LDA $4218
+	LDA.w JOY1L
 		BIT.w #$8040 : BEQ + : EOR.w #$8040 : + ; swap X/B
 		BIT.w #$4080 : BEQ + : EOR.w #$4080 : + ; swap Y/A
-	STA $00
+	STA.b Scrap00
 	SEP #$20 ; set 8-bit accumulator
 JML.l InvertDPadReturn
 	.dpadOnly
-	LDA $4218 : STA $00
+	LDA.w JOY1L : STA.b Scrap00
-	LDA $4219 
+	LDA.w JOY1H 
 		BIT.b #$0C : BEQ + : EOR.b #$0C : + ; swap up/down
 		BIT.b #$03 : BEQ + : EOR.b #$03 : + ; swap left/right
-	STA $01
+	STA.b Scrap01
 JML.l InvertDPadReturn
 
 .onemind_controller_offset
-	db 0 ; player 0 - $4218 - joy1d1
+	db 0 ; player 0 - JOY1L - joy1d1
-	db 0 ; player 1 - $4218 - joy1d1
+	db 0 ; player 1 - JOY1L - joy1d1
-	db 2 ; player 2 - $421A - joy2d1
+	db 2 ; player 2 - JOY2L - joy2d1
-	db 6 ; player 3 - $421E - joy2d2
+	db 6 ; player 3 - JOY4L - joy2d2
-	db 2 ; player 4 - $421A - joy2d1
+	db 2 ; player 4 - JOY2L - joy2d1
-	db 6 ; player 5 - $421E - joy2d2
+	db 6 ; player 5 - JOY4L - joy2d2
 
 
 
@@ -86,12 +85,12 @@ HandleOneMindController:
 
 	REP #$20
 
-	LDA.l !ONEMIND_TIMER
+	LDA.l OneMindTimerRAM
 	DEC
 	BPL .no_switch
 
 	SEP #$20
-	LDA.l !ONEMIND_ID
+	LDA.l OneMindId
 	INC
 	CMP.l OneMindPlayerCount
 	BCC .no_wrap
@@ -99,29 +98,26 @@ HandleOneMindController:
 	LDA.b #$01 ; reset to player 1
 
 .no_wrap
-	STA.l !ONEMIND_ID
+	STA.l OneMindId
 
 	REP #$20
-	LDA.l OneMindTimer
+	LDA.l OneMindTimerInit
 
 .no_switch
-	STA.l !ONEMIND_TIMER
+	STA.l OneMindTimerRAM
 
 	SEP #$20
-	LDA.l !ONEMIND_ID
+	LDA.l OneMindId
 
 	CMP.b #$04 ; is it player 4 or 5?
 	BCC .no_multitap_switch
 
-	STZ.w $4201
+	STZ.w WRIO
 
 .no_multitap_switch
 
 .no_onemind
-	STZ.b $12
+	STZ.b NMIDoneFlag
-
-	JML $008034 ; reset frame loop
-
-
 
+	JML $808034 ; reset frame loop
 

creditscharmapbighi.txt

@@ -1,42 +0,0 @@
- =9F
-0=53
-1=54
-2=55
-3=56
-4=57
-5=58
-6=59
-7=5A
-8=5B
-9=5C
-A=5D
-B=5E
-C=5F
-D=60
-E=61
-F=62
-G=63
-H=64
-I=65
-J=66
-K=67
-L=68
-M=69
-N=6A
-O=6B
-P=6C
-Q=6D
-R=6E
-S=6F
-T=70
-U=71
-V=72
-W=73
-X=74
-Y=75
-Z=76
-'=77
-.=A0
-/=A2
-:=A3
-_=A6

creditscharmapbiglo.txt

@@ -1,42 +0,0 @@
- =9F
-0=79
-1=7A
-2=7B
-3=7C
-4=7D
-5=7E
-6=7F
-7=80
-8=81
-9=82
-A=83
-B=84
-C=85
-D=86
-E=87
-F=88
-G=89
-H=8A
-I=8B
-J=8C
-K=8D
-L=8E
-M=8F
-N=90
-O=91
-P=92
-Q=93
-R=94
-S=95
-T=96
-U=97
-V=98
-W=99
-X=9A
-Y=9B
-Z=9C
-'=9d
-.=C0
-/=C2
-:=C3
-_=C6

crypto.asm

@@ -1,21 +1,6 @@
-; $7F50D0 - $7F50FF - Block Cypher Parameters
+; Scrap04 used for n
-; $7F5100 - $7F51FF - Block Cypher Buffer
+; Scrap06 used for rounds
-!v = "$7F5100"
+; Scrap08 use for dpScratch/MXResult (lower 32 of dpScratch)
-!n = "$04"
-!MXResult = "$08" ; an alternate name for the lower 32 bits of dpScratch
-!dpScratch = "$08"
-!keyBase = "$7F50D0"
-
-
-!y = "$7F50E0"
-!z = "$7F50E4"
-!sum = "$7F50E8"
-
-!p = "$7F50EC"
-!rounds = "$06"
-!e = "$7F50F0"
-
-!upperScratch = "$7F50F2"
 
 CryptoDelta:
 dd #$9e3779b9
@@ -35,164 +20,144 @@ macro ASL32Single(value)
 	; ROL handles the carry from the lower byte for us
 endmacro
 
-;macro LSR32(value,k)
-;	LDX.b <k>
-;	?loop:
-;	%LSR32Single(<value>,<k>)
-;	DEX : CPX.b #$00 : BNE ?loop
-;endmacro
-
-;macro ASL32(value,k)
-;	LDX.b <k>
-;	?loop:
-;	%LSR32Single(<value>,<k>)
-;	DEX : CPX.b #$00 : BNE ?loop
-;endmacro
-
 CryptoMX:
 	PHX
 
 	; upperScratch = (z>>5 ^ y <<2)
-	LDA.w !z : STA.b !dpScratch
+	LDA.w z : STA.b Scrap08
-	LDA.w !z+2 : STA.b !dpScratch+2
+	LDA.w z+2 : STA.b Scrap08+2
-	%LSR32Single(!dpScratch)
+	%LSR32Single(Scrap08)
-	%LSR32Single(!dpScratch)
+	%LSR32Single(Scrap08)
-	%LSR32Single(!dpScratch)
+	%LSR32Single(Scrap08)
-	%LSR32Single(!dpScratch)
+	%LSR32Single(Scrap08)
-	%LSR32Single(!dpScratch)
+	%LSR32Single(Scrap08)
-	;%LSR32(!dpScratch,#$05)
+	;%LSR32(Scrap08,#$05)
 
-	LDA.w !y : STA.b !dpScratch+4
+	LDA.w y : STA.b Scrap08+4
-	LDA.w !y+2 : STA.b !dpScratch+6
+	LDA.w y+2 : STA.b Scrap08+6
-	%ASL32Single(!dpScratch+4)
+	%ASL32Single(Scrap08+4)
-	%ASL32Single(!dpScratch+4)
+	%ASL32Single(Scrap08+4)
-	;%ASL32(!dpScratch+4,#$02)
+	;%ASL32(Scrap08+4,#$02)
 
-	LDA.b !dpScratch : EOR.b !dpScratch+4 : STA.w !upperScratch
+	LDA.b Scrap08 : EOR.b Scrap08+4 : STA.w CryptoScratch
-	LDA.b !dpScratch+2 : EOR.b !dpScratch+6 : STA.w !upperScratch+2
+	LDA.b Scrap08+2 : EOR.b Scrap08+6 : STA.w CryptoScratch+2
 
 	;================================
 	; upperscratch2 = (y>>3^z<<4)
 
-	LDA.w !z : STA.b !dpScratch
+	LDA.w z : STA.b Scrap08
-	LDA.w !z+2 : STA.b !dpScratch+2
+	LDA.w z+2 : STA.b Scrap08+2
-	%ASL32Single(!dpScratch)
+	%ASL32Single(Scrap08)
-	%ASL32Single(!dpScratch)
+	%ASL32Single(Scrap08)
-	%ASL32Single(!dpScratch)
+	%ASL32Single(Scrap08)
-	%ASL32Single(!dpScratch)
+	%ASL32Single(Scrap08)
-	;%ASL32(!dpScratch,#$04)
+	;%ASL32(Scrap08,#$04)
 
-	LDA.w !y : STA.b !dpScratch+4
+	LDA.w y : STA.b Scrap08+4
-	LDA.w !y+2 : STA.b !dpScratch+6
+	LDA.w y+2 : STA.b Scrap08+6
-	%LSR32Single(!dpScratch+4)
+	%LSR32Single(Scrap08+4)
-	%LSR32Single(!dpScratch+4)
+	%LSR32Single(Scrap08+4)
-	%LSR32Single(!dpScratch+4)
+	%LSR32Single(Scrap08+4)
-	;%LSR32(!dpScratch+4,#$03)
+	;%LSR32(Scrap08+4,#$03)
 
-	LDA.b !dpScratch : EOR.b !dpScratch+4 : STA.w !upperScratch+4
+	LDA.b Scrap08 : EOR.b Scrap08+4 : STA.w CryptoScratch+4
-	LDA.b !dpScratch+2 : EOR.b !dpScratch+6 : STA.w !upperScratch+6
+	LDA.b Scrap08+2 : EOR.b Scrap08+6 : STA.w CryptoScratch+6
 
 	;================================
 	; upperscratch = upperscratch + upperscratch2 ( == (z>>5^y<<2) + (y>>3^z<<4) )
 
-	LDA.w !upperScratch : !ADD.w !upperScratch+4 : STA.w !upperScratch
+	LDA.w CryptoScratch : !ADD.w CryptoScratch+4 : STA.w CryptoScratch
-	LDA.w !upperScratch+2 : ADC.w !upperScratch+6 : STA.w !upperScratch+2
+	LDA.w CryptoScratch+2 : ADC.w CryptoScratch+6 : STA.w CryptoScratch+2
 
 	;================================
 	; dpscratch = sum^y
 
-	LDA.w !sum : EOR.w !y : STA.b !dpScratch
+	LDA.w Sum : EOR.w y : STA.b Scrap08
-	LDA.w !sum+2 : EOR.w !y+2 : STA.b !dpScratch+2
+	LDA.w Sum+2 : EOR.w y+2 : STA.b Scrap08+2
 
 	;================================
 	; dpscratch2 =  (k[p&3^e]^z)
 
-	LDA.w !p : AND.w #$0003 : EOR.w !e : ASL #2 : TAX ; put (p&3)^e into X
+	LDA.w p : AND.w #$0003 : EOR.w e : ASL #2 : TAX ; put (p&3)^e into X
-	LDA.w !keyBase, X : EOR.w !z : STA.b !dpScratch+4
+	LDA.w KeyBase, X : EOR.w z : STA.b Scrap08+4
-	LDA.w !keyBase+2, X : EOR.w !z+2 : STA.b !dpScratch+6
+	LDA.w KeyBase+2, X : EOR.w z+2 : STA.b Scrap08+6
 
 	;================================
 	; upperscratch2 =  dpscratch + dpscratch2 (== (sum^y) + (k[p&3^e]^z))
-	LDA.b !dpScratch : !ADD.b !dpScratch+4 : STA.w !upperScratch+4
+	LDA.b Scrap08 : !ADD.b Scrap08+4 : STA.w CryptoScratch+4
-	LDA.b !dpScratch+2 : ADC.b !dpScratch+6 : STA.w !upperScratch+6
+	LDA.b Scrap08+2 : ADC.b Scrap08+6 : STA.w CryptoScratch+6
 
 	;================================
 	; MXResult = uppserscratch ^ upperscratch2
 
-	LDA.w !upperScratch : EOR.w !upperScratch+4 : STA.b !MXResult
+	LDA.w CryptoScratch : EOR.w CryptoScratch+4 : STA.b Scrap08
-	LDA.w !upperScratch+2 : EOR.w !upperScratch+6 : STA.b !MXResult+2
+	LDA.w CryptoScratch+2 : EOR.w CryptoScratch+6 : STA.b Scrap08+2
 	PLX
 RTS
 
-;!DIVIDEND_LOW = $4204
-;!DIVIDEND_HIGH = $4205
-;!DIVISOR = $4206
-;!QUOTIENT_LOW = $4214
-;!QUOTIENT_HIGH = $4215
-
 XXTEA_Decode:
 	PHP : PHB
 		SEP #$30 ; set 8-bit accumulator and index
 
 		LDA.b #$7F : PHA : PLB
 
-		STZ.b !n+1 ; set upper byte of n to be zero, so it can safely be accessed in 16-bit mode
+		STZ.b Scrap04+1 ; set upper byte of n to be zero, so it can safely be accessed in 16-bit mode
 
 		; search for lookup table index to avoid division and multiplication
 		LDX.b #0
 		-
 			LDA.l .n_lookup, X
-			CMP.b !n : !BLT +
+			CMP.b Scrap04 : !BLT +
 			INX
 			BRA -
 		+
 		; rounds = 6 + 52/n;
-		LDA.l .round_counts, X : STA.b !rounds : STZ.b !rounds+1
+		LDA.l .round_counts, X : STA.b Scrap06 : STZ.b Scrap06+1
 
 		REP #$20 ; set 16-bit accumulator
 
 		; sum = rounds*DELTA;
 		TXA : ASL #2 : TAX
-		LDA.l .initial_sums, X : STA.w !sum
+		LDA.l .initial_sums, X : STA.w Sum
-		LDA.l .initial_sums+2, X : STA.w !sum+2
+		LDA.l .initial_sums+2, X : STA.w Sum+2
 
 		; y = v[0];
-		LDA.w !v : STA.w !y
+		LDA.w v : STA.w y
-		LDA.w !v+2 : STA.w !y+2
+		LDA.w v+2 : STA.w y+2
 		---
-			LDA.w !sum : LSR #2 : AND.w #$0003 : STA.w !e ; e = (sum >> 2) & 3;
+			LDA.w Sum : LSR #2 : AND.w #$0003 : STA.w e ; e = (sum >> 2) & 3;
 
-			LDA.b !n : DEC : STA.w !p
+			LDA.b Scrap04 : DEC : STA.w p
 			-- BEQ + ; for (p=n-1; p>0; p--) {
 				; z = v[p-1];
 				ASL #2 : TAX
-				LDA.w !v-4, X : STA.w !z
+				LDA.w v-4, X : STA.w z
-				LDA.w !v-4+2, X : STA.w !z+2
+				LDA.w v-4+2, X : STA.w z+2
 
 				; y = v[p] -= MX;
 				JSR CryptoMX
-				LDA.w !p : ASL #2 : TAX
+				LDA.w p : ASL #2 : TAX
-				LDA.w !v, X : !SUB.b !MXResult : STA.w !v, X : STA.w !y
+				LDA.w v, X : !SUB.b Scrap08 : STA.w v, X : STA.w y
-				LDA.w !v+2, X : SBC.b !MXResult+2 : STA.w !v+2, X : STA.w !y+2
+				LDA.w v+2, X : SBC.b Scrap08+2 : STA.w v+2, X : STA.w y+2
 
-			LDA.w !p : DEC : STA.w !p : BRA -- ; }
+			LDA.w p : DEC : STA.w p : BRA -- ; }
 			+
 
 			; z = v[n-1];
-			LDA.b !n : DEC : ASL #2 : TAX
+			LDA.b Scrap04 : DEC : ASL #2 : TAX
-			LDA.w !v, X : STA.w !z
+			LDA.w v, X : STA.w z
-			LDA.w !v+2, X : STA.w !z+2
+			LDA.w v+2, X : STA.w z+2
 
 			; y = v[0] -= MX;
 			JSR CryptoMX
-			LDA.w !v : !SUB.b !MXResult : STA.w !v : STA.w !y
+			LDA.w v : !SUB.b Scrap08 : STA.w v : STA.w y
-			LDA.w !v+2 : SBC.b !MXResult+2 : STA.w !v+2 : STA.w !y+2
+			LDA.w v+2 : SBC.b Scrap08+2 : STA.w v+2 : STA.w y+2
 
 			; sum -= DELTA;
-			LDA.w !sum : !SUB.l CryptoDelta : STA.w !sum
+			LDA.w Sum : !SUB.l CryptoDelta : STA.w Sum
-			LDA.w !sum+2 : SBC.l CryptoDelta+2 : STA.w !sum+2
+			LDA.w Sum+2 : SBC.l CryptoDelta+2 : STA.w Sum+2
 
-		DEC !rounds : BEQ + : JMP --- : + ; } while (--rounds);
+		DEC.b Scrap06 : BEQ + : JMP --- : + ; } while (--rounds);
 	PLB : PLP
 RTL
 
@@ -243,69 +208,3 @@ db 32 ; n is 2
 ;dd (23*$9e3779b9)&$ffffffff ; n is 3
 dd (32*$9e3779b9)&$ffffffff	; n is 2
 
-;void btea(uint32_t *v, int n, uint32_t const key[4]) {
-;  uint32_t y, z, sum;
-;  unsigned p, rounds, e;
-
-;  } else if (n < -1) {  /* Decoding Part */
-;    n = -n;
-;    rounds = 6 + 52/n;
-;    sum = rounds*DELTA;
-;    y = v[0];
-;    do {
-;      e = (sum >> 2) & 3;
-;      for (p=n-1; p>0; p--) {
-;        z = v[p-1];
-;        y = v[p] -= MX;
-;      }
-;      z = v[n-1];
-;      y = v[0] -= MX;
-;      sum -= DELTA;
-;    } while (--rounds);
-;  }
-
-;BTEA will encode or decode n words as a single block where n > 1
-;
-;v is the n word data vector
-;k is the 4 word key
-;n is negative for decoding
-;if n is zero result is 1 and no coding or decoding takes place, otherwise the result is zero
-;assumes 32 bit 'long' and same endian coding and decoding
-;#include <stdint.h>
-;#define DELTA 0x9e3779b9
-;#define MX ((((z>>5)^(y<<2)) + ((y>>3)^(z<<4))) ^ ((sum^y) + (key[(p&3)^e] ^ z)))
-;
-;void btea(uint32_t *v, int n, uint32_t const key[4]) {
-;  uint32_t y, z, sum;
-;  unsigned p, rounds, e;
-;  if (n > 1) {          /* Coding Part */
-;    rounds = 6 + 52/n;
-;    sum = 0;
-;    z = v[n-1];
-;    do {
-;      sum += DELTA;
-;      e = (sum >> 2) & 3;
-;      for (p=0; p<n-1; p++) {
-;        y = v[p+1];
-;        z = v[p] += MX;
-;      }
-;      y = v[0];
-;      z = v[n-1] += MX;
-;    } while (--rounds);
-;  } else if (n < -1) {  /* Decoding Part */
-;    n = -n;
-;    rounds = 6 + 52/n;
-;    sum = rounds*DELTA;
-;    y = v[0];
-;    do {
-;      e = (sum >> 2) & 3;
-;      for (p=n-1; p>0; p--) {
-;        z = v[p-1];
-;        y = v[p] -= MX;
-;      }
-;      z = v[n-1];
-;      y = v[0] -= MX;
-;      sum -= DELTA;
-;    } while (--rounds);
-;  }
-;}

cuccostorm.asm

@@ -1,29 +1,15 @@
 ;================================================================================
-!CUCCO_STORM = "$7F50C5"
+!CUCCO = $0B
-!IS_INDOORS = "$7E001B"
+!INERT = $00
-!ENEMY_STATE_TABLE = "$7E0DD0"
+!INIT = $08
-!ENEMY_TYPE_TABLE = "$7E0E20"
+!ALIVE = $09
-!ENEMY_AUX1_TABLE = "$7E0DA0"
+!CUCCO_ENRAGED = $23
-!ENEMY_AUX2_TABLE = "$7E0DB0"
+
-!ENEMY_DIRECTION_TABLE = "$7E0EB0"
-!CUCCO = "#$0B"
-!INERT = "#$00"
-!INIT = "#$08"
-!ALIVE = "#$09"
-!CUCCO_ENRAGED = "#$23"
-!LINK_POS_Y_LOW = "$20"
-!LINK_POS_Y_HIGH = "$21"
-!LINK_POS_X_LOW = "$22"
-!LINK_POS_X_HIGH = "$23"
-!ENEMY_POS_Y_LOW = "$7E0D00"
-!ENEMY_POS_X_LOW = "$7E0D10"
-!ENEMY_POS_Y_HIGH = "$7E0D20"
-!ENEMY_POS_X_HIGH = "$7E0D30"
 CuccoStorm:
 
 	SEP #$30 ; set 8-bit accumulator index registers
-	LDA.l !CUCCO_STORM : BEQ + ; only if storm is on
+	LDA.l CuccoStormer : BEQ + ; only if storm is on
-	LDA.b $10 : CMP.b #$09 : BNE + ; only if outdoors
+	LDA.b GameMode : CMP.b #$09 : BNE + ; only if outdoors
 	LDA.l LoopFrames : AND.b #$7F : BNE + ; check every 128 frames
 
 	-
@@ -32,18 +18,18 @@ CuccoStorm:
 		LDY.b #$FF : PHY ; push "cucco not found"
 
 		LDX.b #$00 : -- : CPX.b #$10 : !BGE .ldone
-			LDA.w !ENEMY_STATE_TABLE, X : CMP.b !ALIVE : BEQ +++
+			LDA.w SpriteAITable, X : CMP.b #!ALIVE : BEQ +++
 				; enemy not found
-				CMP.b !INERT : BNE ++
+				CMP.b #!INERT : BNE ++
 					; log inert enemy slot
 					PLA : PHX
 					BRA ++
 			+++
 			; found an enemy
-			LDA.l !ENEMY_TYPE_TABLE, X : CMP.b !CUCCO : BNE ++
+			LDA.l SpriteTypeTable, X : CMP.b #!CUCCO : BNE ++
 				; it's a cucco
 				TXY ; record where we found the living cucco in case we don't find any angry ones
-				LDA.w !ENEMY_AUX1_TABLE, X : CMP.b !CUCCO_ENRAGED : !BLT ++
+				LDA.w SpriteAuxTable, X : CMP.b #!CUCCO_ENRAGED : !BLT ++
 					PLA : BRA + ; we found an angry cucco, done
 		++ : INX : BRA -- : .ldone
 		
@@ -53,12 +39,12 @@ CuccoStorm:
 			; we didn't find a cucco, so try to create one
 			PLY
 			CPY.b #$FF : BEQ + ; fail if no slots found
-			LDA.b !CUCCO : STA.w !ENEMY_TYPE_TABLE, Y
+			LDA.b #!CUCCO : STA.w SpriteTypeTable, Y
-			LDA.b !INIT : STA.w !ENEMY_STATE_TABLE, Y
+			LDA.b #!INIT : STA.w SpriteAITable, Y
-			LDA.b !LINK_POS_Y_LOW : STA.w !ENEMY_POS_Y_LOW, Y
+			LDA.b LinkPosY : STA.w SpritePosYLow, Y
-			LDA.b !LINK_POS_Y_HIGH : STA.w !ENEMY_POS_Y_HIGH, Y
+			LDA.b LinkPosY+1 : STA.w SpritePosYHigh, Y
-			LDA.b !LINK_POS_X_LOW : STA.w !ENEMY_POS_X_LOW, Y
+			LDA.b LinkPosX : STA.w SpritePosXLow, Y
-			LDA.b !LINK_POS_X_HIGH : STA.w !ENEMY_POS_X_HIGH, Y
+			LDA.b LinkPosX+1 : STA.w SpritePosXHigh, Y
 			BRA +++
 		++
 			PLA
@@ -66,8 +52,8 @@ CuccoStorm:
 
 		;==== Enrage a Cucco
 
-		LDA.b !CUCCO_ENRAGED : STA.w !ENEMY_AUX1_TABLE, Y ; enrage the cucco
+		LDA.b #!CUCCO_ENRAGED : STA.w SpriteAuxTable, Y ; enrage the cucco
-		LDA.b #$00 : STA.w !ENEMY_AUX2_TABLE, Y : STA.w !ENEMY_DIRECTION_TABLE, Y
+		LDA.b #$00 : STA.w SpriteAuxTable+$10, Y : STA.w SpriteDirectionTable, Y
 
 		;====
 	+

custompalettes.asm

@@ -0,0 +1,17 @@
+PalettesCustom:
+.master_sword
+dw $0000, $7E4E, $6FF4, $1CF5, $7FFF, $1CE7, $7A10, $64A5
+.tempered_sword
+dw $0000, $7FFF, $1979, $14B6, $39DC, $14A5, $66F7, $45EF
+.golden_sword
+dw $0000, $033F, $7FFF, $2640, $7FFF, $1CE7, $7A10, $64A5
+.fighter_shield
+dw $0000, $7FFF, $27FF, $5E2D, $7FFF, $1CE7, $7A10, $64A5
+.red_shield
+dw $0000, $7FFF, $27FF, $5E2D, $4F5F, $1CE7, $2E9C, $14B6
+.mirror_shield
+dw $0000, $7FFF, $27FF, $5E2D, $7399, $1CE7, $02F9, $0233
+.crystal
+dw $7FFF, $7FFF, $0000, $5907, $6E0E, $0000, $7FBB, $7672
+.off_black
+dw $0000, $14A5, $14A5, $14A5, $14A5, $14A5, $14A5, $14A5

darkroomitems.asm

@@ -1,27 +0,0 @@
-CheckReceivedItemPropertiesBeforeLoad:
-    LDA $A0 : BEQ .normalCode
-    LDA $7EC005 : BNE .lightOff
-    .normalCode
-    LDA.l AddReceivedItemExpanded_properties, X ;Restore Rando Code
-    RTL
-
-.lightOff
-    PHX : PHY : PHB
-    LDA.l AddReceivedItemExpanded_properties, X ; get palette
-
-    REP #$30
-    AND #$0007 ; mask out palette
-    ASL #5 ; multiply by 32
-    ADC #$C610 ; offset to latter half
-
-    TAX ; give to destination
-    LDY #$C610 ; target palette SP0 colors 8-F
-
-    LDA #$000F ; 16 bytes
-    MVN $7E, $7E ; move palette
-
-    SEP #$30
-    PLB : PLY : PLX
-    INC $15
-    LDA #$00
-    RTL

darkworldspawn.asm

@@ -7,76 +7,77 @@ DarkWorldSaveFix:
 	JML.l StatSaveCounter
 ;--------------------------------------------------------------------------------
 DoWorldFix:
-	LDA InvertedMode : BEQ +
+	LDA.l InvertedMode : BEQ +
 		JMP DoWorldFix_Inverted
 	+
 	LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check
+                LDA.l FollowerIndicator : CMP.b #$04 : BEQ .setLightWorld ; check if old man is following
 		LDA MirrorEquipment : AND #$02 : BEQ .noMirror ; check if we have the mirror
 	.skip_mirror_check ; alt entrance point
-	LDA ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
+	LDA.l ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
-	.aga1Alive
+        .setLightWorld
-	LDA #$00
+	LDA.b #$00
 	.noMirror
-	STA CurrentWorld ; set flag to light world
+	STA.l CurrentWorld ; set flag to light world
-	LDA FollowerIndicator : CMP #$07 : BNE .done : INC : STA FollowerIndicator ; convert frog to dwarf
+	LDA.l FollowerIndicator : CMP.b #$07 : BNE .done : INC : STA.l FollowerIndicator ; convert frog to dwarf
 	.done
 RTL
 ;--------------------------------------------------------------------------------
 SetDeathWorldChecked:
-	LDA InvertedMode : BEQ +
+	LDA.l InvertedMode : BEQ +
 		JMP SetDeathWorldChecked_Inverted
 	+
-	LDA $1B : BEQ .outdoors
+	LDA.b IndoorsFlag : BEQ .outdoors
-		LDA $040C : CMP #$FF : BNE .dungeon
+		LDA.w DungeonID : CMP.b #$FF : BNE .dungeon
-		LDA $A0 : ORA $A1 : BNE ++
+		LDA.b RoomIndex : ORA.b RoomIndex+1 : BNE ++
-			LDA GanonPyramidRespawn : BNE .pyramid ; if flag is set, force respawn at pyramid on death to ganon
+			LDA.l GanonPyramidRespawn : BNE .pyramid ; if flag is set, force respawn at pyramid on death to ganon
 	    ++
 	.outdoors
 JMP DoWorldFix
 
 	.dungeon
-	LDA Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
+	LDA.l Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
 JMP DoWorldFix_skip_mirror_check
 
 	.pyramid
-	LDA #$40 : STA CurrentWorld ; set flag to dark world
+	LDA.b #$40 : STA.l CurrentWorld ; set flag to dark world
-	LDA FollowerIndicator : CMP #$08 : BNE .done : DEC : STA FollowerIndicator : + ; convert dwarf to frog
+	LDA.l FollowerIndicator : CMP.b #$08 : BNE .done : DEC : STA.l FollowerIndicator : + ; convert dwarf to frog
 	.done
 RTL
 ;================================================================================
 DoWorldFix_Inverted:
 	LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check
-            LDA.l MirrorEquipment : AND #$02 : BEQ .noMirror ; check if we have the mirror
+                LDA.l FollowerIndicator : CMP.b #$04 : BEQ .setDarkWorld ; check if old man is following
+		LDA.l MirrorEquipment : AND #$02 : BEQ .setDarkWorld ; check if we have the mirror
 	.skip_mirror_check ; alt entrance point
-	LDA ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
+	LDA.l ProgressIndicator : CMP.b #$03 : BCS .done ; check if agahnim 1 is alive
-	.noMirror
+        .setDarkWorld
-	.aga1Alive
+	LDA.b #$40 : STA.l CurrentWorld ; set flag to dark world
-	LDA #$40 : STA CurrentWorld ; set flag to dark world
+	LDA.l FollowerIndicator
-	LDA FollowerIndicator
+	CMP.b #$07 : BEQ .clear ; clear frog
-	CMP #$07 : BEQ .clear ; clear frog
+	CMP.b #$08 : BEQ .clear ; clear dwarf - consider flute implications
-	CMP #$08 : BEQ .clear ; clear dwarf - consider flute implications
 	BRA .done
 	.clear
-	LDA.b #$00 : STA FollowerIndicator ; clear follower
+	LDA.b #$00 : STA.l FollowerIndicator ; clear follower
 	.done
 RTL
 ;--------------------------------------------------------------------------------
 SetDeathWorldChecked_Inverted:
-	LDA $1B : BEQ .outdoors
+	LDA.b IndoorsFlag : BEQ .outdoors
-		LDA $040C : CMP #$FF : BNE .dungeon
+		LDA.w DungeonID : CMP.b #$FF : BNE .dungeon
-		LDA $A0 : ORA $A1 : BNE ++
+		LDA.b RoomIndex : ORA.b RoomIndex+1 : BNE ++
-			LDA GanonPyramidRespawn : BNE .castle ; if flag is set, force respawn at pyramid on death to ganon
+			LDA.l GanonPyramidRespawn : BNE .castle ; if flag is set, force respawn at pyramid on death to ganon
 		++
 	.outdoors
 JMP DoWorldFix
 
 	.dungeon
-	LDA Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
+	LDA.l Bugfix_PreAgaDWDungeonDeathToFakeDW : BNE .done ; if the bugfix is enabled, we do nothing on death in dungeon
 JMP DoWorldFix_Inverted_skip_mirror_check
 
 	.castle
-	LDA #$00 : STA CurrentWorld ; set flag to dark world
+	LDA.b #$00 : STA.l CurrentWorld ; set flag to dark world
-	LDA FollowerIndicator : CMP #$07 : BNE + : LDA.b #$08 : STA FollowerIndicator : + ; convert frog to dwarf
+	LDA.l FollowerIndicator : CMP.b #$07 : BNE + : LDA.b #$08 : STA.l FollowerIndicator : + ; convert frog to dwarf
 	.done
 RTL
 ;================================================================================
@@ -84,20 +85,20 @@ RTL
 
 ;--------------------------------------------------------------------------------
 FakeWorldFix:
-	LDA FixFakeWorld : BEQ +
+	LDA.l FixFakeWorld : BEQ +
-		LDA $8A : AND.b #$40 : STA CurrentWorld
+		LDA.b OverworldIndex : AND.b #$40 : STA.l CurrentWorld
 	+
 RTL
 ;--------------------------------------------------------------------------------
 MasterSwordFollowerClear:
-	LDA FollowerIndicator
+	LDA.l FollowerIndicator
-	CMP #$0E : BNE .exit ; clear master sword follower
+	CMP.b #$0E : BNE .exit ; clear master sword follower
-	LDA.b #$00 : STA FollowerIndicator ; clear follower
+	LDA.b #$00 : STA.l FollowerIndicator ; clear follower
 .exit
 	RTL
 ;--------------------------------------------------------------------------------
 FixAgahnimFollowers:
-	LDA.b #$00 : STA FollowerIndicator ; clear follower
+	LDA.b #$00 : STA.l FollowerIndicator ; clear follower
 	JML PrepDungeonExit ; thing we wrote over
 
 ;--------------------------------------------------------------------------------
@@ -107,10 +108,10 @@ macro SetMinimum(base,filler,compare)
 	?done:
 endmacro
 RefreshRainAmmo:
-	LDA ProgressIndicator : CMP.b #$01 : BEQ .rain ; check if we're in rain state
+	LDA.l ProgressIndicator : CMP.b #$01 : BEQ .rain ; check if we're in rain state
 	RTL
 	.rain
-		LDA StartingEntrance
+		LDA.l StartingEntrance
 		+ CMP.b #$03 : BNE + ; Uncle
 			%SetMinimum(CurrentMagic,MagicFiller,RainDeathRefillMagic_Uncle)
 			%SetMinimum(BombsEquipment,BombsFiller,RainDeathRefillBombs_Uncle)
@@ -135,28 +136,25 @@ RefreshRainAmmo:
 	.done
 RTL
 ;--------------------------------------------------------------------------------
-!INFINITE_ARROWS = "$7F50C8"
-!INFINITE_BOMBS = "$7F50C9"
-!INFINITE_MAGIC = "$7F50CA"
 SetEscapeAssist:
-	LDA ProgressIndicator : CMP.b #$01 : BNE .no_train ; check if we're in rain state
+	LDA.l ProgressIndicator : CMP.b #$01 : BNE .no_train ; check if we're in rain state
 	.rain
 		LDA.l EscapeAssist
-		BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
+		BIT.b #$04 : BEQ + : STA.l InfiniteArrows : +
-		BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : +
+		BIT.b #$02 : BEQ + : STA.l InfiniteBombs : +
-		BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
+		BIT.b #$01 : BEQ + : STA.l InfiniteArrows : +
 		BRA ++
 	.no_train ; choo choo
-		LDA.l EscapeAssist : BIT.b #$04 : BEQ + : LDA.b #$00 : STA !INFINITE_MAGIC : +
+		LDA.l EscapeAssist : BIT.b #$04 : BEQ + : LDA.b #$00 : STA.l InfiniteMagic : +
-		LDA.l EscapeAssist : BIT.b #$02 : BEQ + : LDA.b #$00 : STA !INFINITE_BOMBS : +
+		LDA.l EscapeAssist : BIT.b #$02 : BEQ + : LDA.b #$00 : STA.l InfiniteBombs : +
-		LDA.l EscapeAssist : BIT.b #$01 : BEQ + : LDA.b #$00 : STA !INFINITE_ARROWS : +
+		LDA.l EscapeAssist : BIT.b #$01 : BEQ + : LDA.b #$00 : STA.l InfiniteArrows : +
 	++
 RTL
 ;--------------------------------------------------------------------------------
 SetSilverBowMode:
-	LDA SilverArrowsUseRestriction : BEQ + ; fix bow type for restricted arrow mode
+	LDA.l SilverArrowsUseRestriction : BEQ + ; fix bow type for restricted arrow mode
-		LDA BowEquipment : CMP.b #$3 : BCC +
+		LDA.l BowEquipment : CMP.b #$3 : BCC +
-		SBC.b #$02 : STA BowEquipment
+		SBC.b #$02 : STA.l BowEquipment
 	+
 RTL
 ;================================================================================

data/creditscharmapbighi.txt

@@ -0,0 +1,79 @@
+ =9F
+0=53
+1=54
+2=55
+3=56
+4=57
+5=58
+6=59
+7=5A
+8=5B
+9=5C
+A=5D
+B=5E
+C=5F
+D=60
+E=61
+F=62
+G=63
+H=64
+I=65
+J=66
+K=67
+L=68
+M=69
+N=6A
+O=6B
+P=6C
+Q=6D
+R=6E
+S=6F
+T=70
+U=71
+V=72
+W=73
+X=74
+Y=75
+Z=76
+a=A0
+b=A1
+c=A2
+d=A3
+e=A4
+f=A5
+g=A6
+h=A7
+i=A8
+j=A9
+k=AA
+l=AB
+m=AC
+n=AD
+o=AE
+p=AF
+q=B0
+r=B1
+s=B2
+t=B3
+u=B4
+v=B5
+w=B6
+x=B7
+y=B8
+z=B9
+'=D9
+"=DA
+/=DB
+.=DC
+:=DD
+_=DE
+^=DF
+&=E0
+#=E1
+@=E2
+>=E3
+?=E4
+!=E5
+~=E6
+,=E7
+-=E8

data/creditscharmapbiglo.txt

@@ -0,0 +1,79 @@
+ =9F
+0=79
+1=7A
+2=7B
+3=7C
+4=7D
+5=7E
+6=7F
+7=80
+8=81
+9=82
+A=83
+B=84
+C=85
+D=86
+E=87
+F=88
+G=89
+H=8A
+I=8B
+J=8C
+K=8D
+L=8E
+M=8F
+N=90
+O=91
+P=92
+Q=93
+R=94
+S=95
+T=96
+U=97
+V=98
+W=99
+X=9A
+Y=9B
+Z=9C
+a=BB
+b=BC
+c=BD
+d=BE
+e=BF
+f=C0
+g=C1
+h=C2
+i=C3
+j=C4
+k=C5
+l=C6
+m=C7
+n=C8
+o=C9
+p=CA
+q=CB
+r=CC
+s=CD
+t=CE
+u=CF
+v=D0
+w=D1
+x=D2
+y=D3
+z=D4
+'=EC
+"=ED
+/=EE
+.=EF
+:=F0
+_=F1
+^=F2
+&=F3
+#=F4
+@=F5
+>=F6
+?=F7
+!=F8
+~=F9
+,=FA
+-=FB

data/creditscharmapsmall_green.txt

@@ -25,3 +25,4 @@ W=4E
 X=4F
 Y=50
 Z=51
+.=52

data/creditscharmapsmall_yellow.txt

@@ -25,3 +25,7 @@ W=30
 X=31
 Y=32
 Z=33
+,=34
+'=35
+-=36
+.=37

data/kanjireplacements.asm

@@ -0,0 +1,55 @@
+; Kanji replacement characters
+
+org $8E9AC9
+;.charDD ; 𓄿
+db $FB, $8C, $73, $CB, $30, $4B, $30, $54
+db $2B, $5B, $24, $2D, $12, $13, $61, $1E
+db $36, $09, $1B, $04, $14, $0B, $15, $0A
+db $15, $0A, $21, $1E, $1E, $48, $30, $38
+;.charDE ; ☥
+db $1E, $33, $0C, $2D, $12, $2D, $12, $2D
+db $12, $F3, $0C, $01, $01, $BF, $40, $C0
+db $3F, $BF, $40, $F2, $0C, $12, $0C, $12
+db $0C, $12, $0C, $1E, $50, $A0, $F0
+;.charDF ; ≈
+db $01, $3B, $6E, $11, $C4, $3B, $91, $6E
+db $BB, $44, $26, $18, $3C, $E7, $3B, $6E
+db $11, $C4, $3B, $91, $6E, $BB, $44, $EE
+db $98, $60, $F0
+;.charE0 ; 🡅
+db $0C, $12, $0C, $21, $1E, $40, $3F, $80
+db $7F, $02, $01, $01, $E1, $1E, $21, $1E
+db $21, $1E, $21, $1E, $21, $1E, $21, $1E
+db $21, $1E, $3F, $80, $80
+;.charE1 ; 🡇
+db $3F, $21, $1E, $21, $1E, $21, $1E, $21
+db $1E, $21, $1E, $21, $1E, $E1, $1E, $80
+db $7F, $40, $3F, $21, $1E, $12, $0C, $0C
+db $28, $10, $30
+;.charE2 ; 🡆
+db $18, $14, $08, $12, $0C, $F1, $0E, $80
+db $7F, $01, $80, $7F, $80, $7F, $80, $7F
+db $F1, $0E, $12, $0C, $14, $08, $18, $20
+db $C0, $C0
+;.charE3 ; 🡄
+db $06, $0A, $04, $12, $0C, $23, $1C, $40
+db $3F, $02, $01, $03, $80, $7F, $80, $7F
+db $40, $3F, $23, $1C, $12, $0C, $0A, $04
+db $06, $10, $E0, $F0
+
+
+org $8EBD94
+;.charDD ; 𓄿
+db $BF, $FE, $3F, $FF, $B8 ; 10111111 11111110 00111111 11111111 10111000
+;.charDE ; ☥
+db $BF, $FA, $3F, $FF, $B8 ; 10111111 11111010 00111111 11111111 10111000
+;.charDF ; ≈
+db $AF, $FE, $2B, $FE, $38 ; 10101111 11111110 00101011 11111110 00111000
+;.charE0 ; 🡅
+db $2F, $FE, $3F, $FF, $A8 ; 00101111 11111110 00111111 11111111 10101000
+;.charE1 ; 🡇
+db $2F, $F0, $3F, $FF, $B8 ; 00101111 11110000 00111111 11111111 10111000
+;.charE2 ; 🡆
+db $2F, $F8, $3F, $FE, $38 ; 00101111 11111000 00111111 11111110 00111000
+;.charE3 ; 🡄
+db $2F, $FE, $3F, $FE, $38 ; 00101111 11111110 00111111 11111110 00111000

data/playernamecharmap.asm

@@ -0,0 +1,59 @@
+db $00, $01, $02, $03, $04, $CC, $CC   ; あ い う え お ⎵ ⎵
+db $15, $16, $17, $1D, $1E, $CC        ; が ぎ ぐ げ ご ⎵
+db $50, $51, $52, $53, $54, $CC, $CC   ; ア イ ウ エ オ ⎵ ⎵
+db $D0, $D1, $D2, $D3, $D4, $CC        ; a b c d e ⎵
+db $AA, $AB, $AC, $AD, $CC, $CC        ; A B C D ⎵ ⎵
+
+db $08, $09, $0A, $0B, $0C, $CC, $CC   ; か き く け こ ⎵ ⎵
+db $1F, $25, $26, $27, $2D, $CC        ; ざ じ ず ぜ ぞ ⎵
+db $58, $59, $5A, $5B, $5C, $CC, $CC   ; カ キ ク ケ コ ⎵ ⎵
+db $D5, $D6, $D7, $D8, $D9, $CC        ; ザ ジ ズ ゼ ゾ ⎵
+db $AE, $AF, $B0, $B1, $CC, $CC        ; E F G H ⎵ ⎵
+
+db $10, $11, $12, $13, $14, $CC, $CC   ; さ し す せ そ ⎵ ⎵
+db $2E, $2F, $35, $36, $37, $CC        ; だ ぢ づ で ど ⎵
+db $60, $61, $62, $63, $64, $CC, $CC   ; サ シ ス セ ソ ⎵ ⎵
+db $DA, $DB, $DC, $DD, $DE, $CC        ; ダ ヂ ヅ デ ド ⎵
+db $B2, $B3, $B4, $B5, $CC, $CC        ; I J K L ⎵ ⎵
+
+db $18, $19, $1A, $1B, $1C, $CC, $CC   ; た ち つ て と ⎵ ⎵
+db $3D, $3E, $3F, $40, $41, $CC        ; ば び ぶ べ ぼ ⎵
+db $68, $69, $6A, $6B, $6C, $CC, $CC   ; タ チ ツ テ ト ⎵ ⎵
+db $DF, $E0, $E1, $E2, $E3, $CC        ; バ ビ ブ ベ ボ ⎵
+db $B6, $B7, $B8, $B9, $CC, $CC        ; M N O P ⎵ ⎵
+
+db $20, $21, $22, $23, $24, $CC, $CC   ; な に ぬ ね の ⎵ ⎵
+db $42, $43, $44, $45, $46, $CC        ; ぱ ぴ ぷ ぺ ぽ ⎵
+db $70, $71, $72, $73, $74, $CC, $CC   ; ナ ニ ヌ ネ ノ ⎵ ⎵
+db $E4, $E5, $E6, $E7, $E8, $CC        ; パ ピ プ ペ ポ ⎵
+db $BA, $BB, $BC, $BD, $CC, $CC        ; Q R S T ⎵ ⎵
+
+db $28, $29, $2A, $2B, $2C, $CC, $CC   ; は ひ ふ へ ほ ⎵ ⎵
+db $65, $66, $67, $6D, $6E, $CC
+db $78, $79, $7A, $7B, $7C, $CC, $CC   ; ハ ヒ フ ヘ ホ ⎵ ⎵
+db $E9, $EA, $EB, $EC, $C6, $CC        ; ァ ィ ゥ ェ ォ ⎵
+db $BE, $BF, $C0, $C1, $CC, $CC        ; U V W X ⎵ ⎵
+
+db $30, $31, $32, $33, $34, $CC, $CC   ; ま み む め も ⎵ ⎵
+db $6F, $75, $76, $77, $7D, $CC        ; ザ ジ ズ ゼ ゾ ⎵
+db $80, $81, $82, $83, $84, $CC, $CC   ; マ ミ ム メ モ ⎵ ⎵
+db $CC, $CC, $CC, $CC, $9A, $CC        ; ャ ュ ョ ⎵ ッ ⎵
+db $C2, $C3, $C9, $CE, $CC, $CC        ; Y Z － 〜 ⎵ ⎵
+
+db $05, $CC, $06, $CC, $07, $CC, $CC   ; や ⎵ ゆ ⎵ よ ⎵ ⎵
+db $7E, $7F, $85, $86, $87, $CC        ; ダ ヂ ヅ デ ド ⎵
+db $55, $CC, $56, $CC, $57, $CC, $CC   ; ヤ ⎵ ユ ⎵ ヨ ⎵ ⎵
+db $A0, $A1, $A2, $A3, $A4, $CC        ; ⎵ ⎵ ⎵ ⎵ ⎵ ⎵
+db $CC, $CC, $CC, $CC, $CC, $CC        ; ⎵ ⎵ ⎵ ⎵ ⎵ ⎵
+
+db $38, $39, $3A, $3B, $3C, $CC, $CC   ; ら り る れ ろ ⎵ ⎵
+db $8D, $8E, $8F, $90, $91, $CC        ; バ ビ ブ ベ ボ ⎵
+db $88, $89, $8A, $8B, $8C, $CC, $CC   ; ラ リ ル レ ロ ⎵ ⎵
+db $A5, $A6, $A7, $A8, $A9, $CC        ; ⎵ ⎵ ⎵ ⎵ ⎵ ⎵
+db $CA, $CB, $CD, $CD, $CC, $CC        ; 🡄 🡆 END ⎵ ⎵
+
+db $0D, $0E, $0F, $CC, $C9, $CC, $CC   ; わ を ん ⎵ － ⎵ ⎵
+db $92, $93, $94, $95, $96, $CC        ; パ ピ プ ペ ポ ⎵
+db $5D, $5E, $5F, $CC, $C9, $CC, $CC   ; ワ ヲ ン ⎵ － ⎵ ⎵
+db $CC, $CC, $CC, $CC, $CC, $CC        ; ⎵ ⎵ ⎵ ⎵ ⎵ ⎵
+db $CC, $CC, $CC, $CC, $CC, $CC        ; ⎵ ⎵ ⎵ ⎵ ⎵ ⎵

data/playernamestripes_2.asm

@@ -0,0 +1,72 @@
+dw $E164, $3900 ; VRAM $C9C2 | 58 bytes | Horizontal
+dw $1CA2, $0188, $1CA3, $0188, $1CA4, $0188, $0188, $0188
+dw $0188, $0188, $1DA0, $0188, $1DA1, $0188, $1DA2, $0188
+dw $1DA3, $0188, $1DA4, $0188, $0188, $0188, $1D4A, $0188
+dw $1D4B, $0188, $1D4C, $0188, $1D4D
+
+dw $0165, $3900 ; VRAM $CA02 | 58 bytes | Horizontal
+dw $1CB2, $0188, $1CB3, $0188, $1CB4, $0188, $0188, $0188
+dw $0188, $0188, $1DB0, $0188, $1DB1, $0188, $1DB2, $0188
+dw $1DB3, $0188, $1DB4, $0188, $0188, $0188, $1D5A, $0188
+dw $1D5B, $0188, $1D5C, $0188, $1D5D
+
+dw $2165, $3900 ; VRAM $CA42 | 58 bytes | Horizontal
+dw $1CAA, $0188, $1CAB, $0188, $1CAC, $0188, $0188, $0188
+dw $0188, $0188, $1DA5, $0188, $1DA6, $0188, $1DA7, $0188
+dw $1DA8, $0188, $1DA9, $0188, $0188, $0188, $1D4E, $0188
+dw $1D4F, $0188, $1D60, $0188, $1D61
+
+dw $4165, $3900 ; VRAM $CA82 | 58 bytes | Horizontal
+dw $1CBA, $0188, $1CBB, $0188, $1CBC, $0188, $0188, $0188
+dw $0188, $0188, $1DB5, $0188, $1DB6, $0188, $1DB7, $0188
+dw $1DB8, $0188, $1DB9, $0188, $0188, $0188, $1D5E, $0188
+dw $1D5F, $0188, $1D70, $0188, $1D71
+
+dw $6165, $3900 ; VRAM $CAC2 | 58 bytes | Horizontal
+dw $1CC2, $0188, $1CC3, $0188, $1CC4, $0188, $0188, $0188
+dw $0188, $0188, $1DAA, $0188, $1DAB, $0188, $1DAC, $0188
+dw $1DAD, $0188, $1DAE, $0188, $0188, $0188, $1D62, $0188
+dw $1D63, $0188, $1D64, $0188, $1D65
+
+dw $8165, $3900 ; VRAM $CB02 | 58 bytes | Horizontal
+dw $1CD2, $0188, $1CD3, $0188, $1CD4, $0188, $0188, $0188
+dw $0188, $0188, $1DBA, $0188, $1DBB, $0188, $1DBC, $0188
+dw $1DBD, $0188, $1DBE, $0188, $0188, $0188, $1D72, $0188
+dw $1D73, $0188, $1D74, $0188, $1D75
+
+dw $A165, $3900 ; VRAM $CB42 | 58 bytes | Horizontal
+dw $1CCA, $0188, $1CCB, $0188, $1CCC, $0188, $0188, $0188
+dw $0188, $0188, $1DAF, $0188, $1DC0, $0188, $1DC1, $0188
+dw $1DC2, $0188, $1DC3, $0188, $0188, $0188, $1D66, $0188
+dw $1D67, $0188, $1D68, $0188, $1D69
+
+dw $C165, $3900 ; VRAM $CB82 | 58 bytes | Horizontal
+dw $1CDA, $0188, $1CDB, $0188, $1CDC, $0188, $0188, $0188
+dw $0188, $0188, $1DBF, $0188, $1DD0, $0188, $1DD1, $0188
+dw $1DD2, $0188, $1DD3, $0188, $0188, $0188, $1D76, $0188
+dw $1D77, $0188, $1D78, $0188, $1D79
+
+dw $E165, $3900 ; VRAM $CBC2 | 58 bytes | Horizontal
+dw $1CE2, $0188, $1CE3, $0188, $1CE4, $0188, $0188, $0188
+dw $0188, $0188, $1DC4, $0188, $1DC5, $0188, $1DC6, $0188
+dw $1DC7, $0188, $1DC8, $0188, $0188, $0188, $1D6A, $0188
+dw $1D6B, $0188, $1D6C, $0188, $1D6D
+
+dw $0166, $3900 ; VRAM $CC02 | 58 bytes | Horizontal
+dw $1CF2, $0188, $1CF3, $0188, $1CF4, $0188, $0188, $0188
+dw $0188, $0188, $1DD4, $0188, $1DD5, $0188, $1DD6, $0188
+dw $1DD7, $0188, $1DD8, $0188, $0188, $0188, $1D7A, $0188
+dw $1D7B, $0188, $1D7C, $0188, $1D7D
+
+; dw $2166, $3900 ; VRAM $CC42 | 58 bytes | Horizontal
+; dw $1CEA, $0188, $1CEB, $0188, $1CEC, $0188, $0188, $0188
+; dw $0188, $0188, $1DC9, $0188, $1DCA, $0188, $1DCB, $0188
+; dw $1DCC, $0188, $1D86, $0188, $0188, $0188, $1D6E, $0188
+; dw $1D6F, $0188, $1D80, $0188, $1D81
+; 
+; dw $4166, $3900 ; VRAM $CC82 | 58 bytes | Horizontal
+; dw $1CFA, $0188, $1CFB, $0188, $1CFC, $0188, $0188, $0188
+; dw $0188, $0188, $1DD9, $0188, $1DDA, $0188, $1DDB, $0188
+; dw $1DDC, $0188, $1D96, $0188, $0188, $0188, $1D7E, $0188
+; dw $1D7F, $0188, $1D90, $0188, $1D91
+

data/playernamestripes_3.asm

@@ -0,0 +1,72 @@
+dw $E164, $3900 ; VRAM $C9C2 | 58 bytes | Horizontal
+dw $1CA2, $0188, $1CA3, $0188, $1CA4, $0188, $0188, $0188
+dw $0188, $0188, $1DA0, $0188, $1DA1, $0188, $1DA2, $0188
+dw $1DA3, $0188, $1DA4, $0188, $0188, $0188, $1D4A, $0188
+dw $1D4B, $0188, $1D4C, $0188, $1D4D
+
+dw $0165, $3900 ; VRAM $CA02 | 58 bytes | Horizontal
+dw $1CB2, $0188, $1CB3, $0188, $1CB4, $0188, $0188, $0188
+dw $0188, $0188, $1DB0, $0188, $1DB1, $0188, $1DB2, $0188
+dw $1DB3, $0188, $1DB4, $0188, $0188, $0188, $1D5A, $0188
+dw $1D5B, $0188, $1D5C, $0188, $1D5D
+
+dw $2165, $3900 ; VRAM $CA42 | 58 bytes | Horizontal
+dw $1CAA, $0188, $1CAB, $0188, $1CAC, $0188, $0188, $0188
+dw $0188, $0188, $1DA5, $0188, $1DA6, $0188, $1DA7, $0188
+dw $1DA8, $0188, $1DA9, $0188, $0188, $0188, $1D4E, $0188
+dw $1D4F, $0188, $1D60, $0188, $1D61
+
+dw $4165, $3900 ; VRAM $CA82 | 58 bytes | Horizontal
+dw $1CBA, $0188, $1CBB, $0188, $1CBC, $0188, $0188, $0188
+dw $0188, $0188, $1DB5, $0188, $1DB6, $0188, $1DB7, $0188
+dw $1DB8, $0188, $1DB9, $0188, $0188, $0188, $1D5E, $0188
+dw $1D5F, $0188, $1D70, $0188, $1D71
+
+dw $6165, $3900 ; VRAM $CAC2 | 58 bytes | Horizontal
+dw $1CC2, $0188, $1CC3, $0188, $1CC4, $0188, $0188, $0188
+dw $0188, $0188, $1DAA, $0188, $1DAB, $0188, $1DAC, $0188
+dw $1DAD, $0188, $1DAE, $0188, $0188, $0188, $1D62, $0188
+dw $1D63, $0188, $1D64, $0188, $1D65
+
+dw $8165, $3900 ; VRAM $CB02 | 58 bytes | Horizontal
+dw $1CD2, $0188, $1CD3, $0188, $1CD4, $0188, $0188, $0188
+dw $0188, $0188, $1DBA, $0188, $1DBB, $0188, $1DBC, $0188
+dw $1DBD, $0188, $1DBE, $0188, $0188, $0188, $1D72, $0188
+dw $1D73, $0188, $1D74, $0188, $1D75
+
+dw $A165, $3900 ; VRAM $CB42 | 58 bytes | Horizontal
+dw $1CCA, $0188, $1CCB, $0188, $1CCC, $0188, $0188, $0188
+dw $0188, $0188, $1DAF, $0188, $1DC0, $0188, $1DC1, $0188
+dw $1DC2, $0188, $1DC3, $0188, $0188, $0188, $1D66, $0188
+dw $1D67, $0188, $1D68, $0188, $1D69
+
+dw $C165, $3900 ; VRAM $CB82 | 58 bytes | Horizontal
+dw $1CDA, $0188, $1CDB, $0188, $1CDC, $0188, $0188, $0188
+dw $0188, $0188, $1DBF, $0188, $1DD0, $0188, $1DD1, $0188
+dw $1DD2, $0188, $1DD3, $0188, $0188, $0188, $1D76, $0188
+dw $1D77, $0188, $1D78, $0188, $1D79
+
+dw $E165, $3900 ; VRAM $CBC2 | 58 bytes | Horizontal
+dw $1CE2, $0188, $1CE3, $0188, $1CE4, $0188, $0188, $0188
+dw $0188, $0188, $1DC4, $0188, $1DC5, $0188, $1DC6, $0188
+dw $1DC7, $0188, $1DC8, $0188, $0188, $0188, $1D6A, $0188
+dw $1D6B, $0188, $1D6C, $0188, $1D6D
+
+dw $0166, $3900 ; VRAM $CC02 | 58 bytes | Horizontal
+dw $1CF2, $0188, $1CF3, $0188, $1CF4, $0188, $0188, $0188
+dw $0188, $0188, $1DD4, $0188, $1DD5, $0188, $1DD6, $0188
+dw $1DD7, $0188, $1DD8, $0188, $0188, $0188, $1D7A, $0188
+dw $1D7B, $0188, $1D7C, $0188, $1D7D
+
+dw $2166, $3900 ; VRAM $CC42 | 58 bytes | Horizontal
+dw $1CEA, $0188, $1CEB, $0188, $1CEC, $0188, $0188, $0188
+dw $0188, $0188, $1DC9, $0188, $1DCA, $0188, $1DCB, $0188
+dw $1DCC, $0188, $1D86, $0188, $0188, $0188, $1D6E, $0188
+dw $1D6F, $0188, $1D80, $0188, $1D81
+
+dw $4166, $3900 ; VRAM $CC82 | 58 bytes | Horizontal
+dw $1CFA, $0188, $1CFB, $0188, $1CFC, $0188, $0188, $0188
+dw $0188, $0188, $1DD9, $0188, $1DDA, $0188, $1DDB, $0188
+dw $1DDC, $0188, $1D96, $0188, $0188, $0188, $1D7E, $0188
+dw $1D7F, $0188, $1D90, $0188, $1D91
+

data/playernamestripes_4.asm

@@ -0,0 +1,25 @@
+dw $2362, $3900 ; VRAM $C446 | 58 bytes | Horizontal
+dw $1C48, $0188, $1C49, $0188, $1C4A, $0188, $1C4B, $0188
+dw $1C4C, $0188, $0188, $0188, $0188, $0188, $1CC5, $0188
+dw $1CC6, $0188, $1CC7, $0188, $1CCD, $0188, $1CCE, $0188
+dw $0188, $0188, $1CE8, $0188, $1CE9
+
+dw $4362, $3900 ; VRAM $C486 | 58 bytes | Horizontal
+dw $1C58, $0188, $1C59, $0188, $1C5A, $0188, $1C5B, $0188
+dw $1C5C, $0188, $0188, $0188, $0188, $0188, $1CD5, $0188
+dw $1CD6, $0188, $1CD7, $0188, $1CDD, $0188, $1CDE, $0188
+dw $0188, $0188, $1CF8, $0188, $1CF9
+
+dw $6362, $3900 ; VRAM $C4C6 | 58 bytes | Horizontal
+dw $1C60, $0188, $1C61, $0188, $1C62, $0188, $1C63, $0188
+dw $1C64, $0188, $0188, $0188, $0188, $0188, $1CCF, $0188
+dw $1CE5, $0188, $1CE6, $0188, $1CE7, $0188, $1CED, $0188
+dw $0188, $0188, $1D00, $0188, $1D01
+
+
+dw $8362, $3900 ; VRAM $C506 | 58 bytes | Horizontal
+dw $1C70, $0188, $1C71, $0188, $1C72, $0188, $1C73, $0188
+dw $1C74, $0188, $0188, $0188, $0188, $0188, $1CDF, $0188
+dw $1CF5, $0188, $1CF6, $0188, $1CF7, $0188, $1CFD, $0188
+dw $0188, $0188, $1D10, $0188, $1D11
+

decompresseditemgraphics.asm

@@ -0,0 +1,539 @@
+;===================================================================================================
+; Get the item's graphic from WRAM/ROM
+; Bit 7 set indicates an explicit WRAM address
+; Bit 7 reset indicates an offset into the ROM buffer
+;===================================================================================================
+;---------------------------------------------------------------------------------------------------
+; Enters with A for parameter
+;---------------------------------------------------------------------------------------------------
+TransferItemReceiptToBuffer_using_GraphicsID:
+	PHP
+	PHB
+
+	REP #$30
+	PHX
+	PHY
+
+	SEP #$30
+	LDX.b #$00
+
+.find_reverse
+	CMP.l ItemReceipts_graphics,X
+	BEQ .found
+
+	INX
+	BNE .find_reverse
+
+.found
+	TXA
+	REP #$30
+	BRA ++
+
+;===================================================================================================
+
+TransferRupeesProperly:
+	PHP
+	PHB
+
+	REP #$31
+	PHX
+	PHY
+
+	AND.w #$00FF
+	SBC.w #$0023
+
+	XBA
+	LSR
+	LSR
+	LSR
+	ADC.w #BigDecompressionBuffer+$800
+
+	BRA TransferItemReceiptToBuffer_using_ExplicitBufferAddress
+
+;===================================================================================================
+
+TransferItemReceiptToBuffer_using_ReceiptID:
+	PHP : PHB
+
+	REP #$30
+	PHX : PHY
+
+++	AND.w #$00FF
+	ASL : TAX
+
+        LDA.l BusyItem : BNE +
+        LDA.l StandingItemGraphicsOffsets,X
+        BRA .have_address
++
+	LDA.l ItemReceiptGraphicsOffsets,X
+.have_address
+	BMI TransferItemReceiptToBuffer_using_ExplicitBufferAddress
+
+.rom_address
+	ADC.w #ItemReceiptGraphicsROM
+	PHK
+	BRA .continue
+
+#TransferItemReceiptToBuffer_using_ExplicitBufferAddress:
+	PEA.w $7F7F
+	PLB
+
+.continue
+	PLB
+	TAY
+	LDX.w #62
+
+.next_write
+	LDA.w $003E,Y
+	STA.l ItemGetGFX+$00,X
+
+	LDA.w $023E,Y
+	STA.l ItemGetGFX+$40,X
+
+	DEY
+	DEY
+	DEX
+	DEX
+	BPL .next_write
+
+
+	REP #$30
+	PLY
+	PLX
+	PLB
+	PLP
+	RTL
+
+;===================================================================================================
+
+TransferItemToVRAM:
+	REP #$21
+	SEP #$10
+
+	LDA.w ItemGFXPtr
+	BEQ .exit
+	BMI .wram_address
+
+.rom_address
+	ADC.w #ItemReceiptGraphicsROM
+
+	LDX.b #ItemReceiptGraphicsROM>>16
+
+.set_address
+	STA.w $4302
+	ADC.w #$0200
+	STA.w $4312
+
+	STX.w $4304
+	STX.w $4314
+
+	LDX.b #$80
+	STX.w $2115
+
+	LDA.w #$1801
+	STA.w $4300
+	STA.w $4310
+
+	LDA.w #$0040
+	STA.w $4305
+	STA.w $4315
+
+	LDA.w ItemGFXTarget
+	STA.w $2116
+
+	LDX.b #$01
+	STX.w $420B
+
+	ADC.w #$0100
+	STA.w $2116
+
+	INX
+	STX.w $420B
+
+	STZ.w ItemGFXPtr
+	STZ.w ItemGFXTarget
+
+.exit
+	RTL
+
+.wram_address
+	LDX.b #$7F
+	BRA .set_address
+
+;===================================================================================================
+; Decompress everything at the start of the game
+;===================================================================================================
+DecompBufferOffset = $18
+DecompTestByte = $04
+DecompCommand = $02
+DecompSize = $00
+DecompTileCount = $1A
+DecompSaveY = $1A
+Decomp3BPPScratch = $20
+
+;===================================================================================================
+
+DecompressAllItemGraphics:
+	PHP
+	PHB
+	PHD
+
+	REP #$38
+
+	; Stack change for safety
+	TSX
+
+	LDA.w #$1400
+	TCS
+
+	PHX
+
+	; direct page change for speed
+	LDA.w #$1200
+	TCD
+
+	STZ.b DecompBufferOffset
+
+	SEP #$34
+
+	STA.l $4200 ; already 0 from the LDA above
+
+	LDX.b #$5D+$73 : JSR FastSpriteDecomp
+	LDX.b #$5C+$73 : JSR FastSpriteDecomp
+	LDX.b #$5B+$73 : JSR FastSpriteDecomp
+	LDX.b #$5A+$73 : JSR FastSpriteDecomp
+
+	REP #$30
+	PLX
+	TXS
+
+	SEP #$20
+
+	LDA.b #$81
+	STA.l $4200
+
+
+	PLD
+	PLB
+	PLP
+
+	RTL
+
+;===================================================================================================
+; I normally hate macros like this... but I don't feel like constantly rewriting this
+;===================================================================================================
+macro GetNextByte()
+	LDA.w $0000,Y
+	INY
+	BNE ?++
+
+	; Y pulls more than it needs, but that's fine
+	; the high byte should only be affected if we somehow have FF as our bank
+	; and if that happens, we have other problems
+	PHB
+	PLY
+	INY
+	PHY
+	PLB
+
+	LDY.w #$8000
+
+?++
+endmacro
+
+;===================================================================================================
+; There's no long vanilla routine, and we're going to make heavy use of this
+; so might as well rewrite it to be fast
+;===================================================================================================
+FastSpriteDecomp:
+	SEP #$30
+
+	LDA.l $80CFC0,X : PHA : PLB ; bank
+	LDA.l $80D09F,X : XBA ; high
+	LDA.l $80D17E,X ; low
+
+	REP #$10
+
+	TAY
+
+	LDX.w #$0000
+
+.next_command
+	%GetNextByte()
+
+	CMP.b #$FF
+	BNE .continue
+
+;---------------------------------------------------------------------------------------------------
+
+	JMP Unrolled3BPPConvert
+
+;---------------------------------------------------------------------------------------------------
+
+.continue
+	CMP.b #$E0
+	BCS .expanded
+
+	STA.b DecompTestByte
+
+	REP #$20
+
+	AND.w #$001F
+
+	BRA .normal
+
+;---------------------------------------------------------------------------------------------------
+; Putting some commands up here for branch distance
+;---------------------------------------------------------------------------------------------------
+.nonrepeating
+	REP #$21
+	TYA
+	ADC.b DecompSize
+	ORA.w #$8000
+	STA.b DecompSize
+
+	SEP #$20
+
+.next_nonrepeating
+	%GetNextByte()
+
+	STA.l DecompBuffer2,X
+
+	INX
+
+	CPY.b DecompSize
+	BNE .next_nonrepeating
+
+	BRA .next_command
+
+;---------------------------------------------------------------------------------------------------
+
+.repeating
+	%GetNextByte()
+
+	STY.b DecompSaveY
+
+	LDY.b DecompSize
+
+.next_repeating
+	STA.l DecompBuffer2,X
+
+	INX
+	DEY
+	BNE .next_repeating
+
+	LDY.b DecompSaveY
+	BRA .next_command
+
+;---------------------------------------------------------------------------------------------------
+; Rest of command handling
+;---------------------------------------------------------------------------------------------------
+.expanded
+	STA.b DecompCommand
+
+	ASL
+	ASL
+	ASL
+	STA.b DecompTestByte
+
+	LDA.b DecompCommand
+	AND.b #$03
+	XBA
+
+	%GetNextByte()
+
+	REP #$20
+
+;---------------------------------------------------------------------------------------------------
+
+.normal
+	INC
+	STA.b DecompSize
+
+	SEP #$20
+
+	LDA.b DecompTestByte
+
+	AND.b #$E0
+	BEQ .nonrepeating
+	BMI .copy
+
+	ASL
+	BPL .repeating
+
+	ASL
+	BPL .repeating_word
+
+;---------------------------------------------------------------------------------------------------
+
+.incremental
+	%GetNextByte()
+
+	STY.b DecompSaveY
+
+	LDY.b DecompSize
+
+.next_incremental
+	STA.l DecompBuffer2,X
+
+	INC
+	INX
+
+	DEY
+	BNE .next_incremental
+
+	LDY.b DecompSaveY
+	JMP .next_command
+
+;---------------------------------------------------------------------------------------------------
+
+.repeating_word
+	JSR .get_next_word
+	REP #$20
+
+	STY.b DecompSaveY
+
+	LDY.b DecompSize
+	DEY
+
+.next_word
+	STA.l DecompBuffer2,X
+
+	INX
+	INX
+
+	DEY
+	DEY
+	BPL .next_word
+
+	INY
+	BEQ .not_too_far
+
+	DEX
+
+.not_too_far
+	SEP #$20
+
+	LDY.b DecompSaveY
+
+	JMP .next_command
+
+;---------------------------------------------------------------------------------------------------
+
+.copy
+	JSR .get_next_word
+
+	STY.b DecompSaveY
+
+	TAY
+
+	LDA.b DecompSize
+	BNE ++
+
+	DEC.b DecompSize+1
+
+++	PHB
+	LDA.b #$7F
+	PHA
+	PLB
+
+.next_copy
+	LDA.w DecompBuffer2,Y
+	STA.w DecompBuffer2,X
+
+	INX
+	INY
+
+	DEC.b DecompSize+0
+	BNE .next_copy
+
+	DEC.b DecompSize+1
+	BPL .next_copy
+
+	PLB
+
+	LDY.b DecompSaveY
+
+	JMP .next_command
+
+;---------------------------------------------------------------------------------------------------
+; These are only used once per command, so I'm fine with letting them be a JSR I guess
+;---------------------------------------------------------------------------------------------------
+.get_next_word
+	%GetNextByte()
+	XBA
+
+	%GetNextByte()
+	XBA
+
+	RTS
+
+;===================================================================================================
+; More macros, because lazy
+;===================================================================================================
+
+macro DoPlanesA(offset)
+	LDA.w DecompBuffer2+<offset>+<offset>,Y
+	STA.w BigDecompressionBuffer+<offset>+<offset>,X
+
+	ORA.w DecompBuffer2+<offset>+<offset>-1,Y
+	AND.w #$FF00
+	STA.b Decomp3BPPScratch
+
+	LDA.w DecompBuffer2+$10+<offset>,Y
+	AND.w #$00FF
+	TSB.b Decomp3BPPScratch
+
+	XBA
+	ORA.b Decomp3BPPScratch
+	STA.w BigDecompressionBuffer+$10+<offset>+<offset>,X
+
+endmacro
+
+;===================================================================================================
+
+Unrolled3BPPConvert:
+	LDA.b #$7F
+	PHA
+	PLB
+
+	REP #$21
+
+	LDY.w #$0000
+	LDX.b DecompBufferOffset
+
+.next_3bpp_tile
+	%DoPlanesA(0) ; 8 times
+	%DoPlanesA(1)
+	%DoPlanesA(2)
+	%DoPlanesA(3)
+	%DoPlanesA(4)
+	%DoPlanesA(5)
+	%DoPlanesA(6)
+	%DoPlanesA(7)
+
+	; carry will always be clear
+	; don't worry
+	TXA
+	ADC.w #32
+	TAX
+
+	; just trust me
+	TYA
+	ADC.w #24
+	TAY
+
+	CMP.w #24*64
+	BCS .done
+
+	JMP .next_3bpp_tile
+
+.done
+	STX.b DecompBufferOffset
+	SEP #$30
+
+	RTS
+
+;===================================================================================================
+
+

decryption.asm

@@ -1,13 +1,10 @@
 
-!CryptoBuffer = "$7F5100"
-;!keyBase = "$7F50D0"
-
 ;--------------------------------------------------------------------------------
 LoadStaticDecryptionKey:
 	PHB : PHA : PHX : PHY : PHP
 	REP #$30 ; set 16-bit accumulator & index registers
 	LDX.w #StaticDecryptionKey  ; Source
-	LDY.w #!keyBase             ; Target
+	LDY.w #KeyBase             ; Target
 	LDA.w #$000F                ; Length
 	MVN $307F
 
@@ -23,65 +20,63 @@ RetrieveValueFromEncryptedTable:
 ;Returns result in A
 	PHX : PHY
 		PHA
-			LDY $04 : PHY : LDY $06 : PHY : LDY $08 : PHY
+			LDY.b Scrap04 : PHY : LDY.b Scrap06 : PHY : LDY.b Scrap08 : PHY
-			LDY $0A : PHY : LDY $0C : PHY : LDY $0E : PHY
+			LDY.b Scrap0A : PHY : LDY.b Scrap0C : PHY : LDY.b Scrap0E : PHY
 
 				AND.w #$FFF8 : TAY
-				LDA [$00], Y : STA.l !CryptoBuffer : INY #2
+				LDA.b [$00], Y : STA.l CryptoBuffer : INY #2
-				LDA [$00], Y : STA.l !CryptoBuffer+2 : INY #2
+				LDA.b [$00], Y : STA.l CryptoBuffer+2 : INY #2
-				LDA [$00], Y : STA.l !CryptoBuffer+4 : INY #2
+				LDA.b [$00], Y : STA.l CryptoBuffer+4 : INY #2
-				LDA [$00], Y : STA.l !CryptoBuffer+6
+				LDA.b [$00], Y : STA.l CryptoBuffer+6
 
-				LDA.w #$0002 : STA $04 ;set block size
+				LDA.w #$0002 : STA.b Scrap04 ;set block size
 
 				JSL.l XXTEA_Decode
 
-			PLA : STA $0E : PLA : STA $0C : PLA : STA $0A
+			PLA : STA.b Scrap0E : PLA : STA.b Scrap0C : PLA : STA.b Scrap0A
-			PLA : STA $08 : PLA : STA $06 : PLA : STA $04
+			PLA : STA.b Scrap08 : PLA : STA.b Scrap06 : PLA : STA.b Scrap04
 		PLA : AND.w #$0007 : TAX
-		LDA.l !CryptoBuffer, X
+		LDA.l CryptoBuffer, X
 		PHA
 			LDA.w #$0000
-			STA.l !CryptoBuffer
+			STA.l CryptoBuffer
-			STA.l !CryptoBuffer+2
+			STA.l CryptoBuffer+2
-			STA.l !CryptoBuffer+4
+			STA.l CryptoBuffer+4
-			STA.l !CryptoBuffer+6
+			STA.l CryptoBuffer+6
 		PLA
 	PLY : PLX
 RTL
 ;--------------------------------------------------------------------------------
-
+ChestData = $01E96C
-!ChestData = "$01E96C"
+ChestDataPayload = $01EABC ; ChestData+$0150
-!ChestData_Payload = "$1EABC" ; !ChestData+$0150
-
 ;--------------------------------------------------------------------------------
 GetChestData:
 	LDA.l IsEncrypted : BNE .encrypted
-		INC $0E : LDX.w #$FFFD ; what we wrote over
+		INC.b Scrap0E : LDX.w #$FFFD ; what we wrote over
 JML.l Dungeon_OpenKeyedObject_nextChest
 
 .encrypted
-		INC $0E : LDX.w #$FFFE
+		INC.b Scrap0E : LDX.w #$FFFE
 
 	.nextChest
 
 	INX #2 : CPX.w #$0150 : BEQ .couldntFindChest
-	LDA !ChestData, X : AND.w #$7FFF : CMP $A0 : BNE .nextChest
+	LDA.l ChestData, X : AND.w #$7FFF : CMP.b RoomIndex : BNE .nextChest
 
-	DEC $0E : BNE .nextChest
+	DEC.b Scrap0E : BNE .nextChest
 
-	LDA $00 : PHA : LDA $02 : PHA
+	LDA.b Scrap00 : PHA : LDA.b Scrap02 : PHA
 
-		LDA.w #!ChestData_Payload : STA $00
+		LDA.w #ChestDataPayload : STA.b Scrap00
-		LDA.w #!ChestData_Payload>>16 : STA $02
+		LDA.w #ChestDataPayload>>16 : STA.b Scrap02
 
 		TXA : LSR
 		JSL RetrieveValueFromEncryptedTable
-		STA $0C
+		STA.b Scrap0C
 
-	PLA : STA $02 : PLA : STA $00
+	PLA : STA.b Scrap02 : PLA : STA.b Scrap00
 
-	LDA !ChestData, X : ASL A : BCC .smallChest
+	LDA.l ChestData, X : ASL A : BCC .smallChest
 
 JML.l Dungeon_OpenKeyedObject_bigChest ;(bank01.asm line #13783)
 

dialog.asm

@@ -2,200 +2,157 @@
 ; Dialog Pointer Override
 ;--------------------------------------------------------------------------------
 DialogOverride:
-	LDA $7F5035 : BEQ .skip
+	LDA.l AltTextFlag : BEQ .skip
-	LDA $7F5700, X ; use alternate buffer
+	LDA.l DialogBuffer, X ; use alternate buffer
 RTL
 	.skip
-    LDA $7F1200, X
+    LDA.l DecompressionBuffer+$1200, X
 RTL
-;--------------------------------------------------------------------------------
+
-; $7F5035 - Alternate Text Pointer Flag ; 0=Disable
-; $7F5036 - Padding Byte (Must be Zero)
-; $7F5700 - $7F57FF - Dialog Buffer
-;--------------------------------------------------------------------------------
 ResetDialogPointer:
-	STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
+	STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
-	LDA.b #$00 : STA $7F5035 ; zero out the alternate flag
+	LDA.b #$00 : STA.l AltTextFlag ; zero out the alternate flag
-	LDA.b #$1C : STA $1CE9 ; thing we wrote over
+	LDA.b #$1C : STA.w DelayTimer ; thing we wrote over
 RTL
-;--------------------------------------------------------------------------------
+
-;macro LoadDialog(index,table)
-;	PHA : PHX : PHY
-;	PHB : PHK : PLB
-;	LDA $00 : PHA
-;	LDA $01 : PHA
-;	LDA $02 : PHA
-;		LDA.b #$01 : STA $7F5035 ; set flag
-;
-;		LDA <index> : ASL : !ADD.l <index> : TAX ; get quote offset *3, move to X
-;		LDA <table>, X : STA $00 ; write pointer to direct page
-;		LDA <table>+1, X : STA $01
-;		LDA <table>+2, X : STA $02
-;
-;		LDX.b #$00 : LDY.b #$00
-;		-
-;			LDA [$00], Y ; load the next character from the pointer
-;			STA $7F5700, X ; write to the buffer
-;			INX : INY
-;		CMP.b #$7F : BNE -
-;	PLA : STA $02
-;	PLA : STA $01
-;	PLA : STA $00
-;	PLB
-;	PLY : PLX : PLA
-;endmacro
-;--------------------------------------------------------------------------------
-;macro LoadDialogAddress(address)
-;	PHA : PHX : PHY
-;	PHP
-;	PHB : PHK : PLB
-;		SEP #$30 ; set 8-bit accumulator and index registers
-;		LDA $00 : PHA
-;		LDA $01 : PHA
-;		LDA $02 : PHA
-;			LDA.b #$01 : STA $7F5035 ; set flag
-;
-;			LDA.b #<address> : STA $00 ; write pointer to direct page
-;			LDA.b #<address>>>8 : STA $01
-;			LDA.b #<address>>>16 : STA $02
-;
-;			LDX.b #$00 : LDY.b #$00
-;			-
-;				LDA [$00], Y ; load the next character from the pointer
-;				STA $7F5700, X ; write to the buffer
-;				INX : INY
-;			CMP.b #$7F : BNE -
-;		PLA : STA $02
-;		PLA : STA $01
-;		PLA : STA $00
-;	PLB
-;	PLP
-;	PLY : PLX : PLA
-;endmacro
-;--------------------------------------------------------------------------------
-!OFFSET_POINTER = "$7F5094"
-!OFFSET_RETURN = "$7F5096"
-!DIALOG_BUFFER = "$7F5700"
 macro LoadDialogAddress(address)
 	PHA : PHX : PHY
 	PHP
 	PHB : PHK : PLB
 		SEP #$20 ; set 8-bit accumulator
 		REP #$10 ; set 16-bit index registers
-		PEI ($00)
+		PEI.b ($00)
-		LDA $02 : PHA
+		LDA.b Scrap02 : PHA
-			STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
+			STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
-			LDA.b #$01 : STA $7F5035 ; set flag
+			LDA.b #$01 : STA.l AltTextFlag ; set flag
 			%CopyDialog(<address>)
-		PLA : STA $02
+		PLA : STA.b Scrap02
 		REP #$20
-		PLA : STA $00
+		PLA : STA.b Scrap00
 	PLB
 	PLP
 	PLY : PLX : PLA
 endmacro
 ;--------------------------------------------------------------------------------
 macro CopyDialog(address)
-	LDA.b #<address> : STA $00 ; write pointer to direct page
+	LDA.b #<address> : STA.b Scrap00 ; write pointer to direct page
-	LDA.b #<address>>>8 : STA $01
+	LDA.b #<address>>>8 : STA.b Scrap01
-	LDA.b #<address>>>16 : STA $02
+	LDA.b #<address>>>16 : STA.b Scrap02
 	%CopyDialogIndirect()
 endmacro
 ;--------------------------------------------------------------------------------
 macro CopyDialogIndirect()
-	REP #$20 : LDA !OFFSET_POINTER : TAX : LDY.w #$0000 : SEP #$20 ; copy 2-byte offset pointer to X and set Y to 0
+	REP #$20 : LDA.l DialogOffsetPointer : TAX : LDY.w #$0000 : SEP #$20 ; copy 2-byte offset pointer to X and set Y to 0
 	?loop:
-		LDA [$00], Y ; load the next character from the pointer
+		LDA.b [$00], Y ; load the next character from the pointer
-		STA !DIALOG_BUFFER, X ; write to the buffer
+		STA.l DialogBuffer, X ; write to the buffer
 		INX : INY
 	CMP.b #$7F : BNE ?loop
 	REP #$20 ; set 16-bit accumulator
-	TXA : INC : STA !OFFSET_RETURN ; copy out X into
+	TXA : INC : STA.l DialogReturnPointer ; copy out X into
-	LDA.w #$0000 : STA !OFFSET_POINTER
+	LDA.w #$0000 : STA.l DialogOffsetPointer
 	SEP #$20 ; set 8-bit accumulator
 endmacro
 ;--------------------------------------------------------------------------------
 LoadDialogAddressIndirect:
-	STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
+	STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
-	LDA.b #$01 : STA $7F5035 ; set flag
+	LDA.b #$01 : STA.l AltTextFlag ; set flag
 	%CopyDialogIndirect()
-	;%LoadDialogAddress(UncleText)
 RTL
 ;--------------------------------------------------------------------------------
-!ITEM_TEMPORARY = "$7F5040"
 FreeDungeonItemNotice:
-	STA !ITEM_TEMPORARY
+        STA.w ScratchBufferV
 
         PHA : PHX : PHY
         PHP
         PHB : PHK : PLB
         SEP #$20 ; set 8-bit accumulator
         REP #$10 ; set 16-bit index registers
-		PEI ($00)
+        PEI.b (Scrap00)
-		LDA $02 : PHA
+        LDA.b Scrap02 : PHA
+        LDA.w ScratchBufferNV : PHA
+        LDA.w ScratchBufferNV+1 : PHA
 	;--------------------------------
 
 	LDA.l FreeItemText : BNE + : JMP .skip : +
 
-	LDA #$00 : STA $7F5010 ; initialize scratch
+	LDA.b #$00 : STA.w ScratchBufferNV ; initialize scratch
 	LDA.l FreeItemText : AND.b #$01 : BEQ + ; show message for general small key
-	LDA !ITEM_TEMPORARY : CMP.b #$24 : BNE + ; general small key
+	LDA.w ScratchBufferV : CMP.b #$24 : BNE + ; general small key
 		%CopyDialog(Notice_SmallKeyOf)
-		LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
+		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
 	+ : LDA.l FreeItemText : AND.b #$02 : BEQ + ; show message for general compass
-	LDA !ITEM_TEMPORARY : CMP.b #$25 : BNE + ; general compass
+	LDA.w ScratchBufferV : CMP.b #$25 : BNE + ; general compass
 		%CopyDialog(Notice_CompassOf)
-		LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
+		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
 	+ : LDA.l FreeItemText : AND.b #$04 : BEQ + ; show message for general map
-	LDA !ITEM_TEMPORARY : CMP.b #$33 : BNE + ; general map
+	LDA.w ScratchBufferV : CMP.b #$33 : BNE + ; general map
 		%CopyDialog(Notice_MapOf)
-		LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
+		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
 	+ : LDA.l FreeItemText : AND.b #$08 : BEQ + ; show message for general big key
-	LDA !ITEM_TEMPORARY : CMP.b #$32 : BNE + ; general big key
+	LDA.w ScratchBufferV : CMP.b #$32 : BNE + ; general big key
 		%CopyDialog(Notice_BigKeyOf)
-		LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
+		LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
 		%CopyDialog(Notice_Self)
 		JMP .done
 	+
 	LDA.l FreeItemText : AND.b #$04 : BEQ + ; show message for dungeon map
-	LDA !ITEM_TEMPORARY : AND.b #$F0 ; looking at high bits only
+	LDA.w ScratchBufferV : AND.b #$F0 ; looking at high bits only
 	CMP.b #$70 : BNE + ; map of...
 		%CopyDialog(Notice_MapOf)
 		JMP .dungeon
 	+ : LDA.l FreeItemText : AND.b #$02 : BEQ + ; show message for dungeon compass
-	LDA !ITEM_TEMPORARY : AND.b #$F0 : CMP.b #$80 : BNE + ; compass of...
+	LDA.w ScratchBufferV : AND.b #$F0 : CMP.b #$80 : BNE + ; compass of...
 		%CopyDialog(Notice_CompassOf)
 		JMP .dungeon
 	+ : LDA.l FreeItemText : AND.b #$08 : BEQ + ; show message for dungeon big key
-	LDA !ITEM_TEMPORARY : AND.b #$F0 : CMP.b #$90 : BNE + ; big key of...
+	LDA.w ScratchBufferV : AND.b #$F0 : CMP.b #$90 : BNE + ; big key of...
 		%CopyDialog(Notice_BigKeyOf)
-		BRA .dungeon
+		JMP .dungeon
 	+ : LDA.l FreeItemText : AND.b #$01 : BEQ + ; show message for dungeon small key
-	LDA !ITEM_TEMPORARY : AND.b #$F0 : CMP.b #$A0 : BNE + ; small key of...
+	LDA.w ScratchBufferV : AND.b #$F0 : CMP.b #$A0 : BNE + ; small key of...
-		LDA !ITEM_TEMPORARY : CMP.b #$AF : BNE ++ : JMP .skip : ++
+		LDA.w ScratchBufferV : CMP.b #$AF : BNE ++ : JMP .skip : ++
 		%CopyDialog(Notice_SmallKeyOf)
-		PLA : AND.b #$0F : STA $7F5020 : LDA.b #$0F : !SUB $7F5020 : PHA
+		LDA.b #$01 : STA.w ScratchBufferNV ; set up a flip for small keys
-		LDA #$01 : STA $7F5010 ; set up a flip for small keys
 		BRA .dungeon
+	+ : LDA.l FreeItemText : AND.b #$20 : BEQ + ; show message for crystal
+	LDA.w ScratchBufferV : CMP.b #$B0 : !BLT + ;  crystal #
+                               CMP.b #$B7 : !BGE +
+		%CopyDialog(Notice_Crystal)
+		JMP .crystal
         +
 	JMP .skip ; it's not something we are going to give a notice for
 
 	.dungeon
-	LDA !OFFSET_RETURN : DEC #2 : STA !OFFSET_POINTER
+	LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
-	LDA !ITEM_TEMPORARY
+	LDA.w ScratchBufferV
-	AND.b #$0F ; looking at low bits only
+	AND.b #$0F
-	STA $7F5011
+	STA.w ScratchBufferNV+1
-	LDA $7F5010 : BEQ +
+	LDA.w ScratchBufferNV : BEQ +
-		LDA $7F5010
+		LDA.w ScratchBufferNV
-		LDA #$0F : !SUB $7F5011 : STA $7F5011 ; flip the values for small keys
+		LDA.b #$0F : !SUB.w ScratchBufferNV+1 : STA.w ScratchBufferNV+1 ; flip the values for small keys
 	+
-	LDA $7F5011
+	LDA.w ScratchBufferNV+1
+        ASL : TAX
+        REP #$20
+        LDA.l DungeonItemIDMap,X : CMP.w #$0003 : BCC .hc_sewers
+                                   CMP.w DungeonID : BNE +
+                BRA .self_notice
+                .hc_sewers
+                LDA.w DungeonID : CMP.w #$0003 : BCS +
+                        .self_notice
+                        SEP #$20
+		        %CopyDialog(Notice_Self)
+                        JMP.w .done
+        +
+        SEP #$20
+	LDA.w ScratchBufferNV+1
 	CMP.b #$00 : BNE + ; ...light world
 		%CopyDialog(Notice_LightWorld) : JMP .done
 	+ : CMP.b #$01 : BNE + ; ...dark world
@@ -223,38 +180,61 @@ FreeDungeonItemNotice:
 	+ : CMP.b #$0C : BNE + ; ...desert palace
 		%CopyDialog(Notice_Desert) : JMP .done
 	+ : CMP.b #$0D : BNE + ; ...eastern palace
-		%CopyDialog(Notice_Eastern) : BRA .done
+		%CopyDialog(Notice_Eastern) : JMP .done
 	+ : CMP.b #$0E : BNE + ; ...hyrule castle
-		%CopyDialog(Notice_Castle) : BRA .done
+		%CopyDialog(Notice_Castle) : JMP .done
 	+ : CMP.b #$0F : BNE + ; ...sewers
 		%CopyDialog(Notice_Sewers)
 	+
+        JMP .done
+
+        .crystal
+	LDA.l DialogReturnPointer : DEC #2 : STA.l DialogOffsetPointer
+	LDA.w ScratchBufferV
+	AND.b #$0F ; looking at low bits only
+	CMP.b #$00 : BNE +
+		%CopyDialog(Notice_Six) : JMP .done
+	+ : CMP.b #$01 : BNE +
+		%CopyDialog(Notice_One) : JMP .done
+	+ : CMP.b #$02 : BNE +
+		%CopyDialog(Notice_Five) : JMP .done
+	+ : CMP.b #$03 : BNE +
+		%CopyDialog(Notice_Seven) : JMP .done
+	+ : CMP.b #$04 : BNE +
+		%CopyDialog(Notice_Two) : JMP .done
+	+ : CMP.b #$05 : BNE +
+		%CopyDialog(Notice_Four) : JMP .done
+	+ : CMP.b #$06 : BNE +
+		%CopyDialog(Notice_Three) : JMP .done
+        +
+
 	.done
 
-	STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
+	STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
-	LDA.b #$01 : STA $7F5035 ; set alternate dialog flag
+	LDA.b #$01 : STA.l AltTextFlag ; set alternate dialog flag
-	STA $7F509F
+	STA.l TextBoxDefer
 
 	;--------------------------------
 	.skip
-		PLA : STA $02
+        PLA : STA.w ScratchBufferNV+1
+        PLA : STA.w ScratchBufferNV
+        PLA : STA.b Scrap02
         REP #$20
-		PLA : STA $00
+        PLA : STA.b Scrap00
         PLB
         PLP
         PLY : PLX : PLA
-	;JSL.l Main_ShowTextMessage_Alt ; .skip can be here so long as this line remains commented out
 RTL
 
 ;--------------------------------------------------------------------------------
 DialogResetSelectionIndex:
     JSL.l Attract_DecompressStoryGfx ; what we wrote over
-    STZ $1CE8
+    STZ.w MessageCursor
 RTL
 ;--------------------------------------------------------------------------------
 DialogItemReceive:
 	BCS .nomessage ; if doubling the item value overflowed it must be a rando item
-	CPY #$98 : BCC ++ ;if the item is $4C or greater it must be a rando item
+	CPY.b #$98 : BCC ++ ;if the item is $4C or greater it must be a rando item
 .nomessage
 	LDA.w #$FFFF
 
@@ -267,11 +247,11 @@ RTL
 ;--------------------------------------------------------------------------------
 DialogFairyThrow:
 	LDA.l Restrict_Ponds : BEQ .normal
-	LDA BottleContentsOne
+	LDA.l BottleContentsOne
-        ORA BottleContentsTwo : ORA BottleContentsThree : ORA BottleContentsFour : BNE .normal
+        ORA.l BottleContentsTwo : ORA.l BottleContentsThree : ORA.l BottleContentsFour : BNE .normal
 	
 	.noInventory
-	LDA $0D80, X : !ADD #$08 : STA $0D80, X
+	LDA.w SpriteActivity, X : !ADD #$08 : STA.w SpriteActivity, X
 	LDA.b #$51
 	LDY.b #$01
 RTL
@@ -286,7 +266,7 @@ DialogGanon1:
 	LDA.w #$018C
 	BCC +
 	LDA.w #$016D
-+	STA $1CF0
++	STA.w TextID
 	SEP #$20
 	JSL.l Sprite_ShowMessageMinimal_Alt
 RTL
@@ -322,22 +302,22 @@ DialogGanon2:
     +
         LDA.w #$016E
     ++
-	STA $1CF0
+	STA.w TextID
 	SEP #$20
     JSL.l Sprite_ShowMessageMinimal_Alt
 RTL
 ;--------------------------------------------------------------------------------
 DialogEtherTablet:
 	PHA
-	LDA $0202 : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
+	LDA.w ItemCursor : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
 	-
 	PLA : JML Sprite_ShowMessageUnconditional ; Wacky Hylian Text
 	+
-	BIT $F4 : BVC - ; Show normal text if Y is not pressed
+	BIT.b Joy1A_New : BVC - ; Show normal text if Y is not pressed
 	LDA.l AllowHammerTablets : BEQ ++
-		LDA HammerEquipment : BEQ .yesText : BRA .noText
+		LDA.l HammerEquipment : BEQ .yesText : BRA .noText
 	++
-		LDA SwordEquipment : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : BCS .noText
+		LDA.l SwordEquipment : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : BCS .noText
 	;++
 	.yesText
 	PLA
@@ -351,15 +331,15 @@ RTL
 ;--------------------------------------------------------------------------------
 DialogBombosTablet:
 	PHA
-	LDA $0202 : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
+	LDA.w ItemCursor : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
 	-
 	PLA : JML Sprite_ShowMessageUnconditional ; Wacky Hylian Text
 	+
-	BIT $F4 : BVC - ; Show normal text if Y is not pressed
+	BIT.b Joy1A_New : BVC - ; Show normal text if Y is not pressed
 	LDA.l AllowHammerTablets : BEQ ++
-		LDA HammerEquipment : BEQ .yesText : BRA .noText
+		LDA.l HammerEquipment : BEQ .yesText : BRA .noText
 	++
-		LDA SwordEquipment : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : !BGE .noText
+		LDA.l SwordEquipment : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : !BGE .noText
 	;++
 	.yesText
 	PLA 
@@ -372,7 +352,7 @@ DialogBombosTablet:
 RTL
 ;--------------------------------------------------------------------------------
 DialogSahasrahla:
-	LDA.l PendantsField : AND #$04 : BEQ + ;Check if player has green pendant
+	LDA.l PendantsField : AND.b #$04 : BEQ + ;Check if player has green pendant
 		LDA.b #$2F
         LDY.b #$00
 		JML Sprite_ShowMessageUnconditional
@@ -381,7 +361,7 @@ RTL
 ;--------------------------------------------------------------------------------
 DialogBombShopGuy:
 	LDY.b #$15
-	LDA.l CrystalsField : AND #$05 : CMP #$05 : BNE + ;Check if player has crystals 5 & 6
+	LDA.l CrystalsField : AND.b #$05 : CMP.b #$05 : BNE + ;Check if player has crystals 5 & 6
 		INY ; from 15 to 16
 	+
 	TYA
@@ -399,54 +379,54 @@ AgahnimAsksAboutPed:
 	BNE .vanilla
 
 	LDA.b #$8C ; message 018C for no ped
-	STA.w $1CF0
+	STA.w TextID
 
 .vanilla
-	JML $05FA8E ; Sprite_ShowMessageMinimal
+	JML $85FA8E ; Sprite_ShowMessageMinimal
 ;--------------------------------------------------------------------------------
 Main_ShowTextMessage_Alt:
 	; Are we in text mode? If so then end the routine.
-	LDA $10 : CMP.b #$0E : BEQ .already_in_text_mode
+	LDA.b GameMode : CMP.b #$0E : BEQ .already_in_text_mode
 Sprite_ShowMessageMinimal_Alt:
-	STZ $11
+	STZ.b GameSubMode
 
 	PHX : PHY
-	PEI ($00)
+	PEI.b (Scrap00)
-	LDA.b $02 : PHA
+	LDA.b Scrap02 : PHA
 
-	LDA.b #$1C : STA.b $02
+	LDA.b #$1C : STA.b Scrap02
 	REP #$30
-		LDA.w $1CF0 : ASL : TAX
+		LDA.w TextID : ASL : TAX
 		LDA.l $7F71C0, X
-		STA.b $00
+		STA.b Scrap00
 	SEP #$30
 
 	LDY.b #$00
-	      LDA [$00], Y : CMP.b #$FE : BNE +
+	      LDA.b [Scrap00], Y : CMP.b #$FE : BNE +
-	INY : LDA [$00], Y : CMP.b #$6E : BNE +
+	INY : LDA.b [Scrap00], Y : CMP.b #$6E : BNE +
-	INY : LDA [$00], Y :            : BNE +
+	INY : LDA.b [Scrap00], Y :            : BNE +
-	INY : LDA [$00], Y : CMP.b #$FE : BNE +
+	INY : LDA.b [Scrap00], Y : CMP.b #$FE : BNE +
-	INY : LDA [$00], Y : CMP.b #$6B : BNE +
+	INY : LDA.b [Scrap00], Y : CMP.b #$6B : BNE +
-	INY : LDA [$00], Y : CMP.b #$04 : BNE +
+	INY : LDA.b [Scrap00], Y : CMP.b #$04 : BNE +
-		STZ $1CE8
+		STZ.w MessageCursor
 		JMP .end
 	+
 
-	STZ $0223   ; Otherwise set it so we are in text mode.
+	STZ.w MessageJunk   ; Otherwise set it so we are in text mode.
-	STZ $1CD8   ; Initialize the step in the submodule
+	STZ.w MessageSubModule
 
 	; Go to text display mode (as opposed to maps, etc)
-	LDA.b #$02 : STA $11
+	LDA.b #$02 : STA.b GameSubMode
 
 	; Store the current module in the temporary location.
-	LDA $10 : STA $010C
+	LDA.b GameMode : STA.w GameModeCache
 
 	; Switch the main module ($10) to text mode.
-	LDA.b #$0E : STA $10
+	LDA.b #$0E : STA.b GameMode
 	.end
-	PLA : STA.b $02
+	PLA : STA.b Scrap02
-	PLA : STA.b $01
+	PLA : STA.b Scrap01
-	PLA : STA.b $00
+	PLA : STA.b Scrap00
 	PLY : PLX
 
 Main_ShowTextMessage_Alt_already_in_text_mode:
@@ -458,15 +438,15 @@ CalculateSignIndex:
   ; And we do this in a way that will likely give the right value even 
   ; with major glitches.
 
-  LDA $8A : ASL A : TAY ;what we wrote over
+  LDA.b OverworldIndex : ASL A : TAY ;what we wrote over
 
-  LDA $0712 : BEQ .done ; If a small map, we can skip these calculations.
+  LDA.w OWScreenSize : BEQ .done ; If a small map, we can skip these calculations.
 
-  LDA $21 : AND.w #$0002 : ASL #2 : EOR $8A : AND.w #$0008 : BEQ +
+  LDA.b LinkPosY+1 : AND.w #$0002 : ASL #2 : EOR.b OverworldIndex : AND.w #$0008 : BEQ +
   	TYA : !ADD.w #$0010 : TAY  ;add 16 if we are in lower half of big screen.
   + 
 
-  LDA $23 : AND.w #$0002 : LSR : EOR $8A : AND.w #$0001 : BEQ +
+  LDA.b LinkPosX+1 : AND.w #$0002 : LSR : EOR.b OverworldIndex : AND.w #$0001 : BEQ +
   TYA : INC #2 : TAY  ;add 16 if we are in lower half of big screen.
   +
   ; ensure even if things go horribly wrong, we don't read the sign out of bounds and crash:
@@ -475,6 +455,112 @@ CalculateSignIndex:
 .done
 RTL
 
+;================================================================
+; Contributor: Myramong
+;================================================================
+Sprite_ShowSolicitedMessageIfPlayerFacing_Alt:
+{
+	STA.w TextID
+	STY.w TextID+1
+
+	JSL Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
+	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
+
+	LDA.b Joy1B_New : BPL .alpha
+	LDA.w SpriteTimerE, X : BNE .alpha
+	LDA.b LinkJumping : CMP.b #$02 : BEQ .alpha
+
+	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
+
+	; Make sure that the sprite is facing towards the player, otherwise
+	; talking can't happen. (What sprites actually use this???)
+	LDA.l $85E1A3, X : PLX : CMP.b LinkDirection : BNE .not_facing_each_other
+
+	PHY
+
+	LDA.w TextID
+	LDY.w TextID+1
+
+	; Check what room we're in so we know which npc we're talking to
+        LDA.b RoomIndex
+        CMP.b #$05 : BEQ .SahasrahlaDialogs
+        CMP.b #$1C : BEQ .BombShopGuyDialog
+        BRA .SayNothing
+
+	.SahasrahlaDialogs
+		REP #$20 : LDA.l MapReveal_Sahasrahla : ORA.l MapOverlay : STA.l MapOverlay : SEP #$20
+		JSL DialogSahasrahla : BRA .SayNothing
+
+	.BombShopGuyDialog
+		REP #$20 : LDA.l MapReveal_BombShop : ORA.l MapOverlay : STA.l MapOverlay : SEP #$20
+		JSL DialogBombShopGuy
+
+	.SayNothing
+
+	LDA.b #$40 : STA.w SpriteTimerE, X
+
+	PLA : EOR.b #$03
+
+	SEC
+
+	RTL
+
+.not_facing_each_other
+.alpha
+
+	LDA.w SpriteMoveDirection, X
+
+	CLC
+
+	RTL
+}
+;================================================================
+Sprite_ShowSolicitedMessageIfPlayerFacing_PreserveMessage:
+{
+	PHY
+	PHA
+
+	JSL Sprite_CheckDamageToPlayerSameLayerLong : BCC .alpha
+	JSL Sprite_CheckIfPlayerPreoccupied : BCS .alpha
+
+	LDA.b Joy1B_New : BPL .alpha
+	LDA.w SpriteTimerE, X : BNE .alpha
+	LDA.b LinkJumping : CMP.b #$02 : BEQ .alpha
+
+	JSL Sprite_DirectionToFacePlayerLong : PHX : TYX
+
+	; Make sure that the sprite is facing towards the player, otherwise
+	; talking can't happen. (What sprites actually use this???)
+	LDA.l $85E1A3, X : PLX : CMP.b LinkDirection : BNE .not_facing_each_other
+
+	PLA : XBA : PLA
+
+	PHY
+
+	TAY : XBA
+	
+	JSL Sprite_ShowMessageUnconditional
+
+	LDA.b #$40 : STA.w SpriteTimerE, X
+
+	PLA : EOR.b #$03
+
+	SEC
+
+	RTL
+
+.not_facing_each_other
+.alpha
+	PLY
+	PLA
+
+	LDA.w SpriteMoveDirection, X
+
+	CLC
+
+	RTL
+}
+
 ;--------------------------------------------------------------------------------
 ; A0 - A9 - 0 - 9
 ; AA - C3 - A - Z

doorframefixes.asm

@@ -7,8 +7,8 @@
 ;--------------------------------------------------------------------------------
 StoreLastOverworldDoorID:
 	TXA : INC
-	STA $7F5099
+	STA.l PreviousOverworldDoor
-	LDA $1BBB73, X : STA $010E
+	LDA.l $9BBB73, X : STA.w EntranceIndex
 RTL
 ;--------------------------------------------------------------------------------
 
@@ -16,14 +16,14 @@ RTL
 ; CacheDoorFrameData
 ;--------------------------------------------------------------------------------
 CacheDoorFrameData:
-	LDA $7F5099 : BEQ .originalBehaviour
+	LDA.l PreviousOverworldDoor : BEQ .originalBehaviour
 	DEC : ASL : TAX
-	LDA EntranceDoorFrameTable, X : STA $0696
+	LDA.l EntranceDoorFrameTable, X : STA.w TileMapEntranceDoors
-	LDA EntranceAltDoorFrameTable, X : STA $0698
+	LDA.l EntranceAltDoorFrameTable, X : STA.w TileMapTile32
 	BRA .done
 	.originalBehaviour
-		LDA $D724, X : STA $0696
+		LDA.w $D724, X : STA.w TileMapEntranceDoors
-		STZ $0698
+		STZ.w TileMapTile32
 	.done
 RTL
 ;--------------------------------------------------------------------------------
@@ -32,9 +32,9 @@ RTL
 ; WalkDownIntoTavern
 ;--------------------------------------------------------------------------------
 WalkDownIntoTavern:
-	LDA $7F5099
+	LDA.l PreviousOverworldDoor
 	; tavern door has index 0x42 (saved off value is incremented by one)
-	CMP #$43
+	CMP.b #$43
 RTL
 ;--------------------------------------------------------------------------------
 

doorrando/doortables.asm

@@ -593,8 +593,8 @@ CompassBossIndicator:
 dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
 TotalKeys: ;27f020
 db $04, $04, $02, $04, $04, $06, $06, $06, $05, $06, $01, $03, $06, $08, $00, $00
-ChestKeys: ;27f030
+;ChestKeys: ;27f030 - moved to B0F010
-db $01, $01, $00, $01, $02, $01, $06, $03, $03, $02, $01, $01, $04, $04, $00, $00
+;db $01, $01, $00, $01, $02, $01, $06, $03, $03, $02, $01, $01, $04, $04, $00, $00
 BigKeyStatus: ;27f040 (status 2 indicate BnC guard)
 dw $0002, $0002, $0001, $0001, $0000, $0001, $0001, $0001, $0001, $0001, $0001, $0001, $0001, $0001, $0000, $0000
 DungeonReminderTable: ;27f060

doorrando/hudadditions.asm

@@ -23,51 +23,14 @@ DrHudOverride:
 	PLB
 
 DRHUD_DrawItemCounter:
-    LDA.l DRFlags : AND #$08 : BNE .draw
+	; hides total for mystery seeds
-    JMP DRHUD_DrawIndicators
+	LDA.l DRFlags+1 : LSR : BCC DRHUD_DrawIndicators
-
-.draw
 	REP #$30
-	LDY.w #!SlashTile : STY.w !GOAL_DRAW_ADDRESS+8
+	LDY.w #!HyphenTile : STA.w HUDGoalIndicator+$0A : STA.w HUDGoalIndicator+$0C
-	LDA.l TotalItemCounter : PHA
+                       STA.w HUDGoalIndicator+$0E : STA.w HUDGoalIndicator+$10
-	JSR DRHUDHex4Digit
+    SEP #$30
-
-	LDY.w #!BlankTile ; copy these from newhud
-	LDA.b $04 : TAX : STX.w !GOAL_DRAW_ADDRESS+0
-    LDA.b $05 : TAX : STX.w !GOAL_DRAW_ADDRESS+2
-    LDA.b $06 : TAX : STX.w !GOAL_DRAW_ADDRESS+4
-    LDA.b $07 : TAX : STX.w !GOAL_DRAW_ADDRESS+6
-    PLX
-    CPX.w #1000 : BCS .leave_remaining_digits
-    STY.w !GOAL_DRAW_ADDRESS
-    CPX.w #100 : BCS .leave_remaining_digits
-	STY.w !GOAL_DRAW_ADDRESS+2
-	CPX.w #10 : BCS .leave_remaining_digits
-    STY.w !GOAL_DRAW_ADDRESS+4
-.leave_remaining_digits
-	LDA.l DRFlags+1 : LSR : BCC .real_goal
-	LDY.w #!HyphenTile : STA.w !GOAL_DRAW_ADDRESS+10 : STA.w !GOAL_DRAW_ADDRESS+12
-                       STA.w !GOAL_DRAW_ADDRESS+14 : STA.w !GOAL_DRAW_ADDRESS+16
-    BRA DRHUD_DrawIndicators
-
-.real_goal
-    REP #$30
-	LDA.l MultiClientFlagsWRAM+1 : CMP.w #1000 : BCS .four_digits
-	JSR DRHUDHex3Digit
-	LDA.b $05 : TAX : STX.w !GOAL_DRAW_ADDRESS+10
-	LDA.b $06 : TAX : STX.w !GOAL_DRAW_ADDRESS+12
-	LDA.b $07 : TAX : STX.w !GOAL_DRAW_ADDRESS+14
-	BRA DRHUD_DrawIndicators
-
-.four_digits
-	JSR DRHUDHex4Digit ; carry will be preserved
-	LDA.b $04 : TAX : STX.w !GOAL_DRAW_ADDRESS+10
-	LDA.b $05 : TAX : STX.w !GOAL_DRAW_ADDRESS+12
-	LDA.b $06 : TAX : STX.w !GOAL_DRAW_ADDRESS+14
-	LDA.b $07 : TAX : STX.w !GOAL_DRAW_ADDRESS+16
 
 DRHUD_DrawIndicators:
-	SEP #$30
 	LDA.b $1B : BNE .continue
 	JMP DRHUD_Finished
 .continue
@@ -122,36 +85,11 @@ DRHUD_DrawKeyCounter:
 .total_only
 	LDA.l ChestKeys, x : JSR ConvertToDisplay : STA.w !KeysTotal
 
-;===================================================================================================
-
 DRHUD_Finished:
     PLB : RTL
 
 ;===================================================================================================
 
-DRHUDHex3Digit:
-	JSL HexToDec_fast
-	JMP DRHUDHex4Digit_shared
-
-DRHUDHex4Digit:
-	JSL HexToDec4Digit_fast
-.shared
-	REP #$30
-	LDA.l $04
-	ORA.w #$9090
-	STA.b $04
-
-	LDA.l $06
-	ORA.w #$9090
-	STA.b $06
-	LDA.w #$2400  ; 2490
-
-	SEP #$20
-	RTS
-
-;===================================================================================================
-
-
 ;column distance for BK/Smalls
 HudOffsets:
 ;   none  hc     east   desert aga    swamp  pod    mire   skull  ice    hera   tt     tr     gt
@@ -318,39 +256,6 @@ CountAbsorbedKeys:
         lda DungeonAbsorbedKeys, x : inc : sta DungeonAbsorbedKeys, x
     + plx : rtl
 
-;================================================================================
-; 16-bit A, 8-bit X
-; in:	A(b) - Byte to Convert
-; out:	$04 - $07 (high - low)
-;================================================================================
-HudHexToDec4DigitCopy:
-    LDY.b #$90
-    -
-        CMP.w #1000 : !BLT +
-        INY
-        SBC.w #1000 : BRA -
-    +
-    STY $04 : LDY #$90 ; Store 1000s digit & reset Y
-    -
-        CMP.w #100 : !BLT +
-        INY
-        SBC.w #100 : BRA -
-    +
-    STY $05 : LDY #$90 ; Store 100s digit & reset Y
-    -
-        CMP.w #10 : !BLT +
-        INY
-        SBC.w #10 : BRA -
-    +
-    STY $06 : LDY #$90 ; Store 10s digit & reset Y
-    CMP.w #1 : !BLT +
-    -
-        INY
-        DEC : BNE -
-    +
-    STY $07 ; Store 1s digit
-RTS
-
 ;================================================================================
 ; 8-bit registers
 ; in:	A(b) - Byte to Convert

dungeondrops.asm

@@ -1,9 +1,328 @@
 ;================================================================================
 ; Dungeon & Boss Drop Fixes
 ;--------------------------------------------------------------------------------
-DropSafeDungeon:
+SpawnDungeonPrize:
-	LDA $040C : CMP #$08 : BEQ +
+        PHX : PHB
-		LDA $01C6FC, X : JML Sprite_SpawnFallingItem
+        JSL.l ResolveLootIDLong
-	+
+        STA.w ItemReceiptID
+        TAX
+        LDA.b #$29 : LDY.b #$06
+
+        JSL.l AddAncillaLong
+        BCS .failed_spawn
+                LDA.w ItemReceiptID
+                STA.w AncillaGet,X : STA.w SpriteID,X
+                JSR.w AddDungeonPrizeAncilla
+        .failed_spawn
+        PLB : PLX
+RTL
+
+AddDungeonPrizeAncilla:
+        LDY.w ItemReceiptID
+        STZ.w AncillaVelocityY,X
+        STZ.w AncillaVelocityX,X
+        STZ.w AncillaGeneral,X
+        STZ.w $0385,X
+        STZ.w $0C54,X
+
+        LDA.b #$D0 : STA.w AncillaVelocityZ,X
+        LDA.b #$80 : STA.w AncillaZCoord,X
+        LDA.b #$09 : STA.w AncillaTimer,X
+        LDA.b #$00 : STA.w $0394,X
+        LDA.w AncillaGet,X : STA.w ItemReceiptID
+        LDA.w DungeonID : CMP.b #$14 : BNE .not_hera
+                LDA.b LinkAbsoluteY+1 : AND.b #$FE
+                INC A
+                STA.b Scrap01
+                STZ.b Scrap00
+                LDA.b LinkAbsoluteX+1 : AND.b #$FE
+                INC A
+                STA.b Scrap03
+                STZ.b Scrap02
+                BRA .set_coords_exit
+        .not_hera
+        TYA : ASL : TAY
+        REP #$20
+        LDA.w #$0078
+        CLC : ADC.b BG2V
+        STA.b Scrap00
+        LDA.w #$0078
+        CLC : ADC.b BG2H
+        STA.b Scrap02
+        SEP #$20
+
+        .set_coords_exit
+        LDA.b Scrap00 : STA.w AncillaCoordYLow,X
+        LDA.b Scrap01 : STA.w AncillaCoordYHigh,X
+        LDA.b Scrap02 : STA.w AncillaCoordXLow,X
+        LDA.b Scrap03 : STA.w AncillaCoordXHigh,X
+RTS
+
+PrepPrizeTile:
+        PHA : PHX : PHY
+        LDA.w AncillaGet, X
+        JSL.l ResolveLootIDLong
+        STA.w SpriteID,X
+        JSL.l TransferItemReceiptToBuffer_using_ReceiptID
+        PLY : PLX : PLA
+RTL
+
+SetItemPose:
+        PHA
+        LDA.w RoomItemsTaken : BIT.b #$80 : BNE +
+                .one_handed
+                PLA
+                JML $8799F2
+        +
+        JSR.w CrystalOrPendantBehavior : BCC .one_handed
+        .two_handed
+        PLA
+JML $8799EE ; cool pose
+
+SetPrizeCoords:
+        PHX : PHY
+        STZ.b Scrap03
+        LDA.w ItemReceiptMethod : CMP.b #$03 : BEQ +
+                .regular_coords
+                PLY : PLX
+                LDY.w AncillaGet,X
+                RTL
+        +
+        JSR.w CrystalOrPendantBehavior : BCC .regular_coords
+        PLY : PLX
+        LDY.b #$20 ; Treat as crystal
+RTL
+
+SetCutsceneFlag:
+; Out: c - Cutscene flag $02 if set, $01 if unset.
+        PHX
+        LDY.b #$01 ; wrote over
+        LDA.w RoomItemsTaken : BIT #$80 : BNE .dungeon_prize
+                .no_cutscene
+                PLX
+                CLC
+                RTL
+        .dungeon_prize
+        JSR.w SetDungeonCompletion
+        LDA.w ItemReceiptID : TAX
+        LDA.l InventoryTable_properties,X : BPL .no_cutscene
+                PLX
+                SEC
+RTL
+
+AnimatePrizeCutscene:
+        LDA.w ItemReceiptMethod : CMP.b #$03 : BNE +
+                JSR.w CrystalOrPendantBehavior : BCC +
+                        LDA.w RoomItemsTaken : BIT #$80 : BEQ +
+                                SEC
+                                RTL
+        +
+        CLC
+RTL
+
+PrizeDropSparkle:
+        LDA.w AncillaID,X : CMP.b #$29 : BNE .no_sparkle
+                JSR.w CrystalOrPendantBehavior : BCC .no_sparkle
+                        SEC
+                        RTL
+        .no_sparkle
+        CLC
+RTL
+
+HandleDropSFX:
+        LDA.w RoomItemsTaken : BIT #$80 : BEQ .no_sound
+                JSR.w CrystalOrPendantBehavior : BCC .no_sound
+                        SEC
+                        RTL
+        .no_sound
+        CLC
+RTL
+
+HandleCrystalsField:
+        TAX
+        LDA.w ItemReceiptID : CMP.b #$20 : BNE .not_crystal
+                TXA
+                STA.l CrystalsField
+                RTL
+        .not_crystal
+RTL
+
+MaybeKeepLootID:
+        PHA
+        LDA.w RoomItemsTaken : BIT #$80 : BNE .prize
+                STZ.w ItemReceiptID
+                STZ.w ItemReceiptPose
+                PLA
+                RTL
+        .prize
+        STZ.w ItemReceiptPose
+        PLA
+RTL
+
+CheckSpawnPrize:
+; In: A - DungeonID
+; Out: c - Spawn prize if set
+        REP #$20
+        LDX.w DungeonID
+        LDA.l DungeonItemMasks,X : AND.l DungeonsCompleted : BEQ .spawn
+                SEP #$20
+                CLC
+                RTL
+        .spawn
+        SEP #$21
+RTL
+
+SetDungeonCompletion:
+        LDX.w DungeonID : BMI +
+                REP #$20
+                LDA.l DungeonItemMasks, X : ORA.l DungeonsCompleted : STA.l DungeonsCompleted
+                SEP #$20
+        +
+RTS
+
+CheckDungeonCompletion:
+        LDX.w DungeonID
+        REP #$20
+        LDA.l DungeonItemMasks,X : AND.l DungeonsCompleted
+        SEP #$20
+RTL
+
+MaybeOpenDoor:
+        ;LDA.w ItemReceiptID : TAX
+        LDA.w DungeonID : LSR : TAX
+        LDA.l DungeonPrizeReceiptID,X : TAX
+        LDA.l InventoryTable_properties,X : BMI .no_open
+                REP #$20
+                LDX.w DungeonID
+                LDA.l DungeonMask,X : AND.l DungeonsCompleted
+                SEP #$20
+                SEC
+                RTL
+        .no_open
+        REP #$20
+        LDX.w DungeonID
+        LDA.l DungeonMask,X : AND.l DungeonsCompleted
+        SEP #$20
+        CLC
+RTL
+
+PendantMusicCheck:
+; In: A - Item receipt ID
+        PHX
+        TAY
+        LDA.w ItemReceiptMethod : CMP.b #$03 : BNE .dont_wait
+                TYX
+                LDA.l InventoryTable_properties,X : BMI .dont_wait
+                        PLX
+                        SEC
+                        RTL
+        .dont_wait
+        PLX
+        CLC
+RTL
+
+PrepPrizeOAMCoordinates:
+        PHX : PHY
+        LDY.w AncillaLayer,X
+
+        LDA.w $F67F,Y : STA.b $65
+        STZ.b $64
+
+        LDA.w AncillaCoordYLow,X : STA.b Scrap00
+        LDA.w AncillaCoordYHigh,X : STA.b Scrap01
+        LDA.w AncillaCoordXLow,X : STA.b Scrap02
+        LDA.w AncillaCoordXHigh,X : STA.b Scrap03
+
+        REP #$20
+        LDA.b Scrap00
+        SEC : SBC.w $0122
+        STA.b Scrap00
+
+        LDA.b Scrap02
+        SEC : SBC.w $011E
+        STA.b Scrap02
+        STA.b Scrap04
+
+        REP #$20
+        LDA.w $029E,X
+        AND.w #$00FF
+        STA.b $72
+
+        LDA.b $00
+        STA.b $06
+        SEC
+        SBC.b $72
+        STA.b $00
+
+        SEP #$20
+        TXY
+        LDA.w AncillaGet,X : TAX
+        LDA.l SpriteProperties_chest_width,X : BNE .wide
+                TYX
+                LDA.w AncillaID,X : CMP.b #$3E : BEQ .rising_crystal
+                        REP #$20
+                        LDA.b Scrap00
+                        CLC : ADC.w #$0008
+                        STA.b Scrap08
+                        LDA.b Scrap02
+                        CLC : ADC.w #$0004
+                        STA.b Scrap02 : STA.b Scrap0A
+                        BRA .wide
+                .rising_crystal
+                REP #$20
+                LDA.b Scrap00
+                CLC : ADC.w #$0008 : STA.b Scrap08
+                LDA.b Scrap02 : STA.b Scrap0A
+        .wide
+        PLY : PLX
+        SEP #$20
+RTL
+
+PrepPrizeShadow:
+        PHX
+        LDA.w ItemReceiptID : TAX
+        LDA.l SpriteProperties_standing_width,X : BNE .wide
+                LDA.b Scrap02
+                SEC : SBC.b #$04
+                STA.b Scrap02
+        .wide
+        LDA.b #$20 : STA.b Scrap04 ; What we wrote over
+        PLX
+RTL
+
+CheckPoseItemCoordinates:
+        PHX
+        LDA.w ItemReceiptPose : BEQ .done
+                   BIT.b #$02 : BEQ .done
+                LDA.w AncillaGet,X : TAX
+                LDA.l SpriteProperties_chest_width,X : BNE .done
+                        LDA.b Scrap02
+                        CLC : ADC.b #$04
+                        STA.b Scrap02
+        .done
+        PLX
+        LDA.w AncillaGet,X
+        TAX
+RTL
+
+CrystalOrPendantBehavior:
+; Out: c - Crystal Behavior if set, pendant if unset
+        PHA : PHX
+        LDA.w AncillaGet,X : TAX
+        LDA.l InventoryTable_properties,X : BMI .crystal_behavior
+                PLX : PLA
+                CLC
+                RTS
+        .crystal_behavior
+        PLX : PLA
+        SEC
+RTS
+
+CheckDungeonWorld:
+; Maintain vanilla door opening behavior with dungeon prizes
+        TXA : CMP.b #$05 : BCS .dark_world
+                REP #$02
+                RTL
+        .dark_world
+        SEP #$02
 RTL
-;--------------------------------------------------------------------------------

dungeonmap.asm

@@ -1,24 +1,16 @@
 DoDungeonMapBossIcon:
-	LDA.b $14
+	LDA.b NMISTRIPES
 	CMP.b #$09
 	BEQ .dungeonmap
 
 .cave
-	CMP.b #$01
 	RTL
 
 .dungeonmap
 
-	LDX.w $040C
+	LDX.w DungeonID
 	BMI .cave
 
-;	LDA.l DungeonMapIcons
-;	AND.b #$01
-;	BNE ++
-;
-;	INC ; so it's not equal to $01
-;	BRA .cave
-
 	; get dungeon boss room
 ++	REP #$30
 	LDA.l DungeonMapBossRooms, X
@@ -59,7 +51,7 @@ DoDungeonMapBossIcon:
 
 .match
 	LDA.b #$80
-	STA.w $2121
+	STA.w CGADD
 
 	REP #$30
 
@@ -76,14 +68,14 @@ DoDungeonMapBossIcon:
 	ASL ; x128 for graphics
 	ASL
 	ADC.w #BossMapIconGFX
-	STA.w $4312
+	STA.w A1T1L
 
 	PHY
 	LDY.w #32
 
 	SEP #$20
 --	LDA.l .boss_palettes,X
-	STA.w $2122
+	STA.w CGDATA
 	INX
 	DEY
 	BNE --
@@ -96,24 +88,24 @@ DoDungeonMapBossIcon:
 	SEP #$10
 
 	LDA.w #$1801
-	STA.w $4310
+	STA.w DMAP1
 
 	LDX.b #BossMapIconGFX>>16
-	STX.w $4314
+	STX.w A1B1
 
 	LDA.w #$A060>>1
-	STA.w $2116
+	STA.w VMADDL
 	LDA.w #$0040
-	STA.w $4315
+	STA.w DAS1L
 
 	LDX.b #$02
-	STX.w $420B
+	STX.w MDMAEN
 
-	STA.w $4315
+	STA.w DAS1L
 	LDA.w #$A260>>1
-	STA.w $2116
+	STA.w VMADDL
 
-	STX.w $420B
+	STX.w MDMAEN
 
 	; done
 	SEP #$30

elder.asm

@@ -1,11 +1,11 @@
 NewElderCode:
 {
-LDA $8A : CMP #$1B : BEQ .newCodeContinue
+LDA.b OverworldIndex : CMP.b #$1B : BEQ .newCodeContinue
 ;Restore Jump we can keep the RTL so JML
-JML $05F0CD
+JML $85F0CD
 .newCodeContinue
 PHB : PHK : PLB
-LDA.b #$07 : STA $0F50, X ;Palette 
+LDA.b #$07 : STA.w SpriteOAMProp, X ; Palette 
 JSR Elder_Draw
 JSL Sprite_PlayerCantPassThrough
 JSR Elder_Code
@@ -17,12 +17,12 @@ RTL
     Elder_Draw:
     {
 
-        LDA.b #$02 : STA $06 : STZ $07 ;Number of Tiles
+        LDA.b #$02 : STA.b Scrap06 : STZ.b Scrap07 ;Number of Tiles
         
-        LDA $0DC0, X : ASL #04
+        LDA.w SpriteGFXControl, X : ASL #04
         
-        ADC.b #.animation_states : STA $08
+        ADC.b #.animation_states : STA.b Scrap08
-        LDA.b #.animation_states>>8 : ADC.b #$00 : STA $09
+        LDA.b #.animation_states>>8 : ADC.b #$00 : STA.b Scrap09
         
         JSL Sprite_DrawMultiple_player_deferred
         JSL Sprite_DrawShadowLong
@@ -46,10 +46,12 @@ RTL
         LDA.l TurnInGoalItems : AND.w #$00FF : BNE +
             .despawn
             SEP #$20
-            STZ $0DD0, X ; despawn self
+            STZ.w SpriteAITable, X ; despawn self
             RTS
         +
         SEP #$20
+        LDA.b GameSubMode
+        BNE .done
         LDA.b #$96
         LDY.b #$01
         
@@ -64,6 +66,6 @@ RTL
         
         .done
         SEP #$20
-        LDA.b $1A : LSR #5 : AND.b #$01 : STA.w $0DC0, X
+        LDA.b FrameCounter : LSR #5 : AND.b #$01 : STA.w SpriteGFXControl, X
         RTS
     }

endingsequence.asm

@@ -1,22 +0,0 @@
-;================================================================================
-; Dialog Pointer Override
-;--------------------------------------------------------------------------------
-EndingSequenceTableOverride:
-	PHY
-	PHX
-	TYX
-	LDA.l EndingSequenceText, X
-	PLX
-	STA $1008, X
-	PLY
-RTL
-;--------------------------------------------------------------------------------
-EndingSequenceTableLookupOverride:
-	PHY
-	PHX
-	TYX
-	LDA.l EndingSequenceText, X : AND #$00FF
-	PLX
-	PLY
-RTL
-;--------------------------------------------------------------------------------

enemy_adjustments.asm

@@ -3,21 +3,25 @@
 ; make sure bats always load LW stats
 ;--------------------------------------------------------------------------------
 NewBatInit:
-	CPY #$00 : BEQ .light_world
+	CPY.b #$00 : BEQ .light_world
 	;check if map id == 240 or 241
-	LDA $A0 : CMP #$F0 : BEQ .light_world ;oldman cave1
+	LDA.b RoomIndex : CMP.b #$F0 : BEQ .light_world ;oldman cave1
-	CMP #$F1 : BEQ .light_world ;oldman cave2
+	CMP.b #$F1 : BEQ .light_world ;oldman cave2
-	CMP #$B0 : BEQ .light_world ;agahnim statue keese
+	CMP.b #$B0 : BEQ .light_world ;agahnim statue keese
-	CMP #$D0 : BEQ .light_world ;agahnim darkmaze
+	CMP.b #$D0 : BEQ .light_world ;agahnim darkmaze
 
 	
-	LDA.b #$85 : STA $0CD2, X
+	LDA.b #$85 : STA.w SpriteBump, X
-	LDA.b #$04 : STA $0E50, X
+	LDA.b #$04 : STA.w SpriteHitPoints, X
 RTL
-
 	.light_world
-		LDA.b #$80 : STA $0CD2, X
+		LDA.b #$80 : STA.w SpriteBump, X
-		LDA.b #$01 : STA $0E50, X
+		LDA.b #$01 : STA.w SpriteHitPoints, X
 RTL
 ;--------------------------------------------------------------------------------
-
+NewFireBarDamage:
+        LDA.b LinkLayer : CMP.w SpriteLayer, X : BNE .NotSameLayer
+                JSL Sprite_AttemptDamageToPlayerPlusRecoilLong
+                RTL
+.NotSameLayer
+RTL

entrances.asm

@@ -8,7 +8,7 @@ LockAgahnimDoors:
 		;#$0 = Never Locked
 		LDA.w #$0000 : RTL
 	+ : CMP.w #$0001 : BNE +
-		LDA ProgressIndicator : AND.w #$000F : CMP.w #$0002 : !BGE .unlock ; if we rescued zelda, skip
+		LDA.l ProgressIndicator : AND.w #$000F : CMP.w #$0002 : !BGE .unlock ; if we rescued zelda, skip
 			JSR.w LockAgahnimDoorsCore : RTL
 	+ : CMP.w #$0002 : BNE +
 		JSR.w LockAgahnimDoorsCore : BEQ .unlock
@@ -18,20 +18,20 @@ LockAgahnimDoors:
 		REP #$30
 		PLY : PLX
 		!BGE .crystalOrUnlock
-		LDA #$0001 : RTL
+		LDA.w #$0001 : RTL
 		.crystalOrUnlock
-		LDA InvertedMode : AND.w #$00FF : BEQ .unlock
+		LDA.l InvertedMode : AND.w #$00FF : BEQ .unlock
 
-		LDA OverworldEventDataWRAM+$43 : AND.w #$0020 : BNE .unlock ; Check if GT overlay is already on or not
+		LDA.l OverworldEventDataWRAM+$43 : AND.w #$0020 : BNE .unlock ; Check if GT overlay is already on or not
-		LDA $0308 : AND.w #$0080 : BEQ ++ ;If we are holding an item
+		LDA.w AButtonAct : AND.w #$0080 : BEQ ++ ;If we are holding an item
 
 	.locked
-			LDA #$0001 : RTL ;Keep the door locked
+			LDA.w #$0001 : RTL ;Keep the door locked
 		++
 		SEP #$30
-		JSL $099B6F ;Add tower break seal
+		JSL $899B6F ;Add tower break seal
 		REP #$30
-		LDA #$0001 ;Prevent door from opening that frame otherwise it glitchy
+		LDA.w #$0001 ;Prevent door from opening that frame otherwise it glitchy
 		RTL
 
 	+
@@ -44,18 +44,18 @@ RTL
 FlagAgahnimDoor:
 	LDA.l InvertedMode : BEQ .vanilla
 
-	LDA OverworldEventDataWRAM+$43 : ORA #$20 : STA OverworldEventDataWRAM+$43 ; activate GT overlay
+	LDA.l OverworldEventDataWRAM+$43 : ORA.b #$20 : STA.l OverworldEventDataWRAM+$43 ; activate GT overlay
 
 .vanilla
-	LDA.b #$28 : STA.b $72
+	LDA.b #$28 : STA.b ScrapBuffer72
 	RTL
 
 
 ;--------------------------------------------------------------------------------
 LockAgahnimDoorsCore:
-	LDA $22 : CMP.w #1992 : !BLT + ; door too far left, skip
+	LDA.b LinkPosX : CMP.w #1992 : !BLT + ; door too far left, skip
 			  CMP.w #2088 : !BGE + ; door too rat right, skip
-	LDA $20 : CMP.w #1720 : !BGE + ; door too low, skip
+	LDA.b LinkPosY : CMP.w #1720 : !BGE + ; door too low, skip
 		LDA.w #$0001
 RTS
 	+
@@ -77,7 +77,7 @@ JML.l Overworld_Entrance_BRANCH_RHO
 AllowStartFromSingleEntranceCave:
 ; 16 Bit A, 16 bit XY
 ; do not need to preserve A or X or Y
-	LDA StartingEntrance : AND.w #$00FF ; What we wrote over
+	LDA.l StartingEntrance : AND.w #$00FF ; What we wrote over
 	PHA
 		TAX
 		LDA.l StartingAreaExitOffset, X
@@ -86,46 +86,45 @@ AllowStartFromSingleEntranceCave:
 		BNE +
 			JMP .done
 		+
-
 		DEC
-		STA $00
+		STA.b Scrap00
-		ASL #2 : !ADD $00 : ASL #2 ; mult by 20
+		ASL #2 : !ADD Scrap00 : ASL #2 ; mult by 20
 		TAX
 
-		LDA #$0016 : STA $7EC142 ; Cache the main screen designation
+		LDA.w #$0016 : STA.l EN_MAINDESQ ; Cache the main screen designation
-		LDA.l StartingAreaExitTable+$05, X : STA $7EC144 ; Cache BG1 V scroll
+		LDA.l StartingAreaExitTable+$05, X : STA.l EN_BG2VERT ; Cache BG1 V scroll
-		LDA.l StartingAreaExitTable+$07, X : STA $7EC146 ; Cache BG1 H scroll
+		LDA.l StartingAreaExitTable+$07, X : STA.l EN_BG2HORZ ; Cache BG1 H scroll
-		LDA.l StartingAreaExitTable+$09, X : !ADD.w #$0010 : STA $7EC148 ; Cache Link's Y coordinate
+		LDA.l StartingAreaExitTable+$09, X : !ADD.w #$0010 : STA.l EN_POSY ; Cache Link's Y coordinate
-		LDA.l StartingAreaExitTable+$0B, X : STA $7EC14A ; Cache Link's X coordinate
+		LDA.l StartingAreaExitTable+$0B, X : STA.l EN_POSX ; Cache Link's X coordinate
-		LDA.l StartingAreaExitTable+$0D, X : STA $7EC150 ; Cache Camera Y coord lower bound.
+		LDA.l StartingAreaExitTable+$0D, X : STA.l EN_SCROLLATN ; Cache Camera Y coord lower bound.
-		LDA.l StartingAreaExitTable+$0F, X : STA $7EC152 ; Cache Camera X coord lower bound.
+		LDA.l StartingAreaExitTable+$0F, X : STA.l EN_SCROLLATW ; Cache Camera X coord lower bound.
-		LDA.l StartingAreaExitTable+$03, X : STA $7EC14E ; Cache Link VRAM Location
+		LDA.l StartingAreaExitTable+$03, X : STA.l EN_OWTMAPI ; Cache Link VRAM Location
 
 		; Handle the 2 "unknown" bytes, which control what area of the backgound
 		; relative to the camera? gets loaded with new tile data as the player moves around
 		; (because some overworld areas like Kak are too big for a single VRAM tilemap)
 
 		LDA.l StartingAreaExitTable+$11, X : AND.w #$00FF
-		BIT.w #$0080 : BEQ + : ORA #$FF00 : + ; Sign extend
+		BIT.w #$0080 : BEQ + : ORA.w #$FF00 : + ; Sign extend
-		STA.l $7EC16A
+		STA.l EN_SCRMODYA
 
 		LDA.l StartingAreaExitTable+$12, X  : AND.w #$00FF
-		BIT.w #$0080 : BEQ + : ORA #$FF00 : + ; Sign extend
+		BIT.w #$0080 : BEQ + : ORA.w #$FF00 : + ; Sign extend
-		STA.l $7EC16E
+		STA.l EN_SCRMODXA
 
-		LDA.w #$0000 : !SUB.l $7EC16A : STA $7EC16C
+		LDA.w #$0000 : !SUB.l EN_SCRMODYA : STA.l EN_SCRMODYB
-		LDA.w #$0000 : !SUB.l $7EC16E : STA $7EC170
+		LDA.w #$0000 : !SUB.l EN_SCRMODXA : STA.l EN_SCRMODXB
 
 		LDA.l StartingAreaExitTable+$02, X : AND.w #$00FF
-		STA $7EC14C ; Cache the overworld area number
+		STA.l EN_OWSCR ; Cache the overworld area number
-		STA $7EC140 ; Cache the aux overworld area number
+		STA.l EN_OWSCR2 ; Cache the aux overworld area number
 
-		STZ $0698 ;zero out door overlays in case starting overworld door is not set
+		STZ.w TileMapTile32 ;zero out door overlays in case starting overworld door is not set
-		STZ $0699 ;zero out door overlays in case starting overworld door is not set
+		STZ.w TileMapTile32+1 ;zero out door overlays in case starting overworld door is not set
 
 		SEP #$20 ; set 8-bit accumulator
-		LDA StartingEntrance : TAX
+		LDA.l StartingEntrance : TAX
-		LDA.l StartingAreaOverworldDoor, X : STA.l $7F5099 ;Load overworld door
+		LDA.l StartingAreaOverworldDoor, X : STA.l PreviousOverworldDoor ;Load overworld door
 		REP #$20 ; reset 16-bit accumulator
                 JSL.l CacheDoorFrameData
 
@@ -135,7 +134,7 @@ RTL
 ;--------------------------------------------------------------------------------
 AllowStartFromExit:
 
-	LDX $1CE8
+	LDX.w MessageCursor
 	LDA.l ShouldStartatExit, X : BNE .doStart
 
 	LDA.l StartingEntrance ; what we wrote over
@@ -143,42 +142,42 @@ JML.l AllowStartFromExitReturn
 
 	.doStart
 
-	LDA.l $028481, X ;Module_LocationMenu_starting_points
+	LDA.l $828481, X ;Module_LocationMenu_starting_points
 	ASL : TAX
 
-	LDA.l $02D8D2, X : STA $A0
+	LDA.l $82D8D2, X : STA.b RoomIndex
-	LDA.l $02D8D3, X : STA $A1
+	LDA.l $82D8D3, X : STA.b RoomIndex+1
 
 	; Go to pre-overworld mode
-	LDA.b #$08 : STA $10
+	LDA.b #$08 : STA.b GameMode
 
-	STZ $11
+	STZ.b GameSubMode
-	STZ $B0
+	STZ.b SubSubModule
+	STZ.w DeathReloadFlag
+	STZ.w RespawnFlag
+        INC.w UpdateHUD
 
-	STZ $010A
-
-	STZ $04AA
 	JSL Equipment_SearchForEquippedItemLong
 	JSL HUD_RebuildLong2
-	JSL $0DDD32 ; Equipment_UpdateEquippedItemLong
+	JSL Equipment_UpdateEquippedItemLong
 RTL
 
 ;--------------------------------------------------------------------------------
 CheckHole:
 	LDX.w #$0024
 	.nextHoleClassic
-		LDA.b $00   : CMP.l $1BB800, X
+		LDA.b Scrap00   : CMP.l $9BB800, X
 		BNE .wrongMap16Classic
-		LDA.w $040A : CMP.l $1BB826, X
+		LDA.b OverworldIndex : CMP.l $9BB826, X
 		BEQ .matchedHoleClassic
 	.wrongMap16Classic
 		DEX #2 : BPL .nextHoleClassic
 
 	LDX.w #$001E
 	.nextHoleExtra
-		LDA.b $00   : CMP.l ExtraHole_Map16, X
+		LDA.b Scrap00   : CMP.l ExtraHole_Map16, X
 		BNE .wrongMap16Extra
-		LDA.w $040A : CMP.l ExtraHole_Area, X
+		LDA.b OverworldIndex : CMP.l ExtraHole_Area, X
 		BEQ .matchedHoleExtra
 	.wrongMap16Extra
 		DEX #2 : BPL .nextHoleExtra
@@ -189,14 +188,14 @@ CheckHole:
 	.matchedHoleExtra
 		SEP #$30
 		TXA : LSR A : TAX
-		LDA.l ExtraHole_Entrance, X : STA.w $010E : STZ.w $010F
+		LDA.l ExtraHole_Entrance, X : STA.w EntranceIndex : STZ.w EntranceIndex+1
 JML Overworld_Hole_End
 ;--------------------------------------------------------------------------------
 PreventEnterOnBonk:
-	STA $00 ; part of what we wrote over
+	STA.b Scrap00 ; part of what we wrote over
 	LDA.l InvertedMode : AND.w #$00FF : BEQ .done
-	LDA.l $5D : AND.w #$00FF : CMP.w #$0014 : BNE .done ;in mirror mode?
+	LDA.b LinkState : AND.w #$00FF : CMP.w #$0014 : BNE .done ;in mirror mode?
-	LDA.b $8A : AND.w #$0040 : CMP $7B : BEQ .done ; Are we bonking, or doing the superbunny glitch?
+	LDA.b OverworldIndex : AND.w #$0040 : CMP.b WorldCache : BEQ .done ; Are we bonking, or doing the superbunny glitch?
 
 		; If in inverted, are in mirror mode, and are bonking then do not enter
 		JML.l PreventEnterOnBonk_BRANCH_IX
@@ -206,8 +205,8 @@ PreventEnterOnBonk:
 JML.l PreventEnterOnBonk_return
 ;--------------------------------------------------------------------------------
 TurtleRockEntranceFix:
-	LDA TurtleRockAutoOpenFix : BEQ .done
+	LDA.l TurtleRockAutoOpenFix : BEQ .done
-	LDA $8A : CMP.b #$47 : BNE .done
+	LDA.b OverworldIndex : CMP.b #$47 : BNE .done
 		;If exiting to turtle rock ensure the entrance is open
 		LDA.l OverworldEventDataWRAM+$47 : ORA.b #$20 : STA.l OverworldEventDataWRAM+$47
 .done
@@ -216,14 +215,14 @@ RTL
 AnimatedEntranceFix: ;when an entrance animation tries to start
 	PHA
 	LDA.l InvertedMode : BEQ + ;If we are in inverted mode
-	LDA $8A : AND.b #$40 : BNE + ;and in the light world
+	LDA.b OverworldIndex : AND.b #$40 : BNE + ;and in the light world
 		PLA
-		STZ $04C6 ; skip it.
+		STZ.w OWEntranceCutscene ; skip it.
-		LDA #$00
+		LDA.b #$00
 		RTL
 	+
 	PLA
-	STA $02E4 ;what we wrote over
+	STA.w CutsceneFlag ;what we wrote over
-	STA $0FC1 ;what we wrote over
+	STA.w FreezeSprites ;what we wrote over
-	STA $0710 ;what we wrote over
+	STA.w SkipOAM ;what we wrote over
 RTL

events.asm

@@ -1,17 +1,15 @@
-;--------------------------------------------------------------------------------
-; OnLoadOW
-;--------------------------------------------------------------------------------
-;OnLoadMap:
-;	LDA OverworldEventDataWRAM+$5B ; thing we wrote over
-;RTL
-;--------------------------------------------------------------------------------
 OnPrepFileSelect:
-	LDA $11 : CMP.b #$03 : BNE +
+        LDA.b GameSubMode : CMP.b #$03 : BNE +
-		LDA.b #$06 : STA $14 ; thing we wrote over
+                LDA.b #$06 : STA.b NMISTRIPES ; thing we wrote over
                 RTL
         +
+        PHA : PHX
+        REP #$10
         JSL.l LoadAlphabetTilemap
-	JML.l LoadFullItemTiles
+        JSL.l LoadFullItemTiles
+        SEP #$10
+        PLX : PLA
+RTL
 ;--------------------------------------------------------------------------------
 OnDrawHud:
 	JSL.l DrawChallengeTimer ; this has to come before NewDrawHud because the timer overwrites the compass counter
@@ -23,8 +21,13 @@ OnDrawHud:
 JML.l ReturnFromOnDrawHud
 ;--------------------------------------------------------------------------------
 OnDungeonEntrance:
-	STA $7EC172 ; thing we wrote over
+	STA.l PegColor ; thing we wrote over
-        JSL MaybeFlagCompassTotalEntrance
+        JSL MaybeFlagDungeonTotalsEntrance
+        INC.w UpdateHUD
+RTL
+;--------------------------------------------------------------------------------
+OnDungeonBossExit:
+        JSL.l StatTransitionCounter
 RTL
 ;--------------------------------------------------------------------------------
 OnPlayerDead:
@@ -41,9 +44,10 @@ OnDungeonExit:
         JSL.l SQEGFix
         PLP : PLA
 
-	STA $040C : STZ $04AC ; thing we wrote over
+        STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over
 
         PHA : PHP
+        INC.w UpdateHUD
         JSL.l HUD_RebuildLong
         JSL.l FloodGateResetInner
         JSL.l SetSilverBowMode
@@ -52,16 +56,17 @@ RTL
 ;--------------------------------------------------------------------------------
 OnQuit:
 	JSL.l SQEGFix
-	LDA.b #$00 : STA $7F5035 ; bandaid patch bug with mirroring away from text
+	LDA.b #$00 : STA.l AltTextFlag ; bandaid patch bug with mirroring away from text
-	LDA.b #$10 : STA $1C ; thing we wrote over
+	LDA.b #$10 : STA.b MAINDESQ ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 OnUncleItemGet:
 	PHA
+
 	LDA.l EscapeAssist
-		BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
+	BIT.b #$04 : BEQ + : STA.l InfiniteMagic : +
-		BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : +
+	BIT.b #$02 : BEQ + : STA.l InfiniteBombs : +
-		BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
+	BIT.b #$01 : BEQ + : STA.l InfiniteArrows : +
 
 	LDA UncleItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID
 	PLA
@@ -85,24 +90,24 @@ RTL
 ;--------------------------------------------------------------------------------
 OnAga2Defeated:
         JSL.l Dungeon_SaveRoomData_justKeys ; thing we wrote over, make sure this is first
+        LDA.b #$FF : STA.w DungeonID
         LDA.b #$01 : STA.l Aga2Duck
         JML.l IncrementAgahnim2Sword
 ;--------------------------------------------------------------------------------
 OnFileCreation:
-        ; Copy initial SRAM state from ROM to cart SRAM
         PHB
-        LDA.w #$03D7 ; \
+        LDA.w #$03D7
-        LDX.w #$B000 ;  | Copies from beginning of inital sram table up to file name
+        LDX.w #$B000
-        LDY.w #$0000 ;  | (exclusively)
+        LDY.w #$0000
-        MVN $70, $30 ; /
+        MVN CartridgeSRAM>>16, InitSRAMTable>>16
         ; Skip file name and validity value
-        LDA.w #$010C ; \
+        LDA.w #$010C
-        LDX.w #$B3E3 ;  | Rando-Specific Assignments & Game Stats block
+        LDX.w #$B3E3
-        LDY.w #$03E3 ;  |
+        LDY.w #$03E3
-        MVN $70, $30 ; /
+        MVN CartridgeSRAM>>16, InitSRAMTable>>16
         PLB
 
-        ; resolve instant post-aga if standard
+        ; Resolve instant post-aga if standard
         SEP #$20
         LDA.l InitProgressIndicator : BIT #$80 : BEQ +
                 LDA.b #$00 : STA.l ProgressIndicatorSRAM  ; set post-aga after zelda rescue
@@ -110,36 +115,32 @@ OnFileCreation:
         +
         REP #$20
 
-        ; Set validity value and do some cleanup. Jump to checksum.
+        ; Set validity value and do some cleanup. Jump to checksum done.
-        LDA.w #$55AA : STA.l $7003E1
+        LDA.w #$55AA : STA.l FileValiditySRAM
-        STZ $00
+        JSL.l WriteSaveChecksumAndBackup
-        STZ $01
+        STZ.b Scrap00
-        LDX.b $00
+        STZ.b Scrap01
-        LDY.w #$0000
-        TYA
 
-JML.l InitializeSaveFile_build_checksum
+JML.l InitializeSaveFile_checksum_done
 ;--------------------------------------------------------------------------------
-!RNG_ITEM_LOCK_IN = "$7F5090"
 OnFileLoad:
 	REP #$10 ; set 16 bit index registers
 	JSL.l EnableForceBlank ; what we wrote over
 	REP #$20 : LDA.l $30F010 : STA.l MultiClientFlagsWRAM+1 : SEP #$20
 	LDA MultiClientFlagsROM : STA.l MultiClientFlagsWRAM
 
-	LDA.b #$07 : STA $210C ; Restore screen 3 to normal tile area
+	LDA.b #$07 : STA.w BG34NBA ; Restore screen 3 to normal tile area
 
 	LDA.l FileMarker : BNE +
 		JSL.l OnNewFile
 		LDA.b #$FF : STA.l FileMarker
 	+
-	LDA.w $010A : BNE + ; don't adjust the worlds for "continue" or "save-continue"
+	LDA.w DeathReloadFlag : BNE + ; don't adjust the worlds for "continue" or "save-continue"
-	LDA.l $7EC011 : BNE + ; don't adjust worlds if mosiac is enabled (Read: mirroring in dungeon)
+	LDA.l MosaicLevel : BNE + ; don't adjust worlds if mosiac is enabled (Read: mirroring in dungeon)
 		JSL.l DoWorldFix
 	+
 	JSL.l MasterSwordFollowerClear
-	LDA.b #$FF : STA !RNG_ITEM_LOCK_IN ; reset rng item lock-in
+	LDA.b #$FF : STA.l RNGLockIn ; reset rng item lock-in
-	LDA.b #$00 : STA $7F5001 ; mark fake flipper softlock as impossible
 	LDA.l GenericKeys : BEQ +
 		LDA.l CurrentGenericKeys : STA.l CurrentSmallKeys ; copy generic keys to key counter
 	+
@@ -154,86 +155,79 @@ OnFileLoad:
 	SEP #$10 ; restore 8 bit index registers
 RTL
 ;--------------------------------------------------------------------------------
-!RNG_ITEM_LOCK_IN = "$7F5090"
 OnNewFile:
 	PHX : PHP
 		; reset some values on new file that are otherwise only reset on hard reset
 		SEP #$20 ; set 8-bit accumulator
-		STZ $03C4 ; ancilla slot index
+		STZ.w AncillaSearch
-		STZ $047A ; EG
+		STZ.w LayerAdjustment ; EG
-		STZ $0B08 : STZ $0B09 ; arc variable
+		STZ.w ArcVariable : STZ.w ArcVariable+1
-		STZ $0CFB ; enemies killed (pull trees)
+		STZ.w TreePullKills
-		STZ $0CFC ; times taken damage (pull trees)
+		STZ.w TreePullHits
-		STZ $0FC7 : STZ $0FC8 : STZ $0FC9 : STZ $0FCA : STZ $0FCB : STZ $0FCC : STZ $0FCD ; prize packs
+		STZ.w PrizePackIndexes
-		LDA #$00 : STA $7EC011 ; mosaic
+                STZ.w PrizePackIndexes+1
-		JSL InitRNGPointerTable ; boss RNG
+                STZ.w PrizePackIndexes+2
+                STZ.w PrizePackIndexes+3
+                STZ.w PrizePackIndexes+4
+                STZ.w PrizePackIndexes+5
+                STZ.w PrizePackIndexes+6
+		LDA.b #$00 : STA.l MosaicLevel
+		JSL InitRNGPointerTable
 	PLP : PLX
 RTL
 ;--------------------------------------------------------------------------------
 OnInitFileSelect:
-	; LDA.b #$10 : STA $BC ; init sprite pointer - does nothing unless spriteswap.asm is included
+	LDA.b #$51 : STA.w $0AA2 ;<-- Line missing from JP1.0, needed to ensure "extra" copy of naming screen graphics are loaded.
-	; JSL.l SpriteSwap_SetSprite
-	LDA.b #$51 : STA $0AA2 ;<-- Line missing from JP1.0, needed to ensure "extra" copy of naming screen graphics are loaded.
 	JSL.l EnableForceBlank
 RTL
 ;--------------------------------------------------------------------------------
 OnLinkDamaged:
 	JSL.l IncrementDamageTakenCounter_Arb
-	;JSL.l FlipperKill
 	JML.l OHKOTimer
-
 ;--------------------------------------------------------------------------------
-OnEnterWater:
+;OnEnterWater:
-	JSL.l RegisterWaterEntryScreen
+;       JSL.l UnequipCapeQuiet ; what we wrote over
-
+;RTL
-	JSL.l MysteryWaterFunction
-	LDX.b #$04
-RTL
 ;--------------------------------------------------------------------------------
 OnLinkDamagedFromPit:
 	JSL.l OHKOTimer
 
 	LDA.l AllowAccidentalMajorGlitch
 	BEQ ++
---	LDA.b #$14 : STA $11 ; thing we wrote over
+--	LDA.b #$14 : STA.b GameSubMode ; thing we wrote over
 
 	RTL
 
-++	LDA.b $10 : CMP.b #$12 : BNE --
+++	LDA.b GameMode : CMP.b #$12 : BNE --
 
-	STZ.b $11
+	STZ.b GameSubMode
 	RTL
 ;--------------------------------------------------------------------------------
 OnLinkDamagedFromPitOutdoors:
 	JML.l OHKOTimer ; make sure this is last
-
 ;--------------------------------------------------------------------------------
-!RNG_ITEM_LOCK_IN = "$7F5090"
 OnOWTransition:
         JSL.l FloodGateReset
-	JSL.l FlipperFlag
         JSL.l StatTransitionCounter
         PHP
         SEP #$20 ; set 8-bit accumulator
-	LDA.b #$FF : STA !RNG_ITEM_LOCK_IN ; clear lock-in
+        LDA.b #$FF : STA.l RNGLockIn ; clear lock-in
+        INC.w UpdateHUD
         PLP
 RTL
 ;--------------------------------------------------------------------------------
-!DARK_DUCK_TEMP = "$7F509C"
 OnLoadDuckMap:
-	LDA !DARK_DUCK_TEMP
+	LDA.l DuckMapFlag
 	BNE +
-		INC : STA !DARK_DUCK_TEMP
+		INC : STA.l DuckMapFlag
-		JSL OverworldMap_InitGfx : DEC $0200
+		JSL OverworldMap_InitGfx : DEC.w SubModuleInterface
-
 		RTL
 	+
-	LDA.b #$00 : STA !DARK_DUCK_TEMP
+	LDA.b #$00 : STA.l DuckMapFlag
 	JML OverworldMap_DarkWorldTilemap
-
 ;--------------------------------------------------------------------------------
 PreItemGet:
-	LDA.b #$01 : STA !ITEM_BUSY ; mark item as busy
+	LDA.b #$01 : STA.l BusyItem ; mark item as busy
 RTL
 ;--------------------------------------------------------------------------------
 PostItemGet:
@@ -241,12 +235,11 @@ PostItemGet:
 RTL
 ;--------------------------------------------------------------------------------
 PostItemAnimation:
-	LDA.b #$00 : STA !ITEM_BUSY ; mark item as finished
+        LDA.b #$00 : STA.l BusyItem ; mark item as finished
-
+        LDA.l TextBoxDefer : BEQ +
-	LDA $7F509F : BEQ +
+                STZ.w TextID : STZ.w TextID+1 ; reset decompression buffer
-		STZ $1CF0 : STZ $1CF1 ; reset decompression buffer
                 JSL.l Main_ShowTextMessage_Alt
-		LDA.b #$00 : STA $7F509F
+                LDA.b #$00 : STA.l TextBoxDefer
         +
 
         LDA $1B : BEQ +
@@ -260,11 +253,34 @@ PostItemAnimation:
         		JML.l Ancilla_ReceiveItem_objectFinished
 		+
 
-	LDA.w $02E9 : CMP.b #$01 : BNE +
+        LDA.w ItemReceiptMethod : CMP.b #$01 : BNE +
-		LDA.b $2F : BEQ +
+                LDA.b LinkDirection : BEQ +
                         JSL.l IncrementChestTurnCounter
         +
+        REP #$20
+        LDA.w TransparencyFlag : BNE .SP05
+                LDA.l PalettesCustom_off_black+$00 : STA.l PaletteBuffer+$0170
+                LDA.l PalettesCustom_off_black+$02 : STA.l PaletteBuffer+$0172
+                LDA.l PalettesCustom_off_black+$04 : STA.l PaletteBuffer+$0174
+                LDA.l PalettesCustom_off_black+$06 : STA.l PaletteBuffer+$0176
+                LDA.l PalettesCustom_off_black+$08 : STA.l PaletteBuffer+$0178
+                LDA.l PalettesCustom_off_black+$0A : STA.l PaletteBuffer+$017A
+                LDA.l PalettesCustom_off_black+$0C : STA.l PaletteBuffer+$017C
+                LDA.l PalettesCustom_off_black+$0E : STA.l PaletteBuffer+$017E
+                BRA .done
+        .SP05
+        LDA.l PalettesCustom_off_black+$00 : STA.l PaletteBuffer+$01B0
+        LDA.l PalettesCustom_off_black+$02 : STA.l PaletteBuffer+$01B2
+        LDA.l PalettesCustom_off_black+$04 : STA.l PaletteBuffer+$01B4
+        LDA.l PalettesCustom_off_black+$06 : STA.l PaletteBuffer+$01B6
+        LDA.l PalettesCustom_off_black+$08 : STA.l PaletteBuffer+$01B8
+        LDA.l PalettesCustom_off_black+$0A : STA.l PaletteBuffer+$01BA
+        LDA.l PalettesCustom_off_black+$0C : STA.l PaletteBuffer+$01BC
+        LDA.l PalettesCustom_off_black+$0E : STA.l PaletteBuffer+$01BE
+        .done
+        INC.b NMICGRAM
+        SEP #$20
 
-    STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here
+        STZ.w ItemReceiptMethod : LDA.w AncillaGet, X ; thing we wrote over to get here
-	JML.l Ancilla_ReceiveItem_optimus+6
+RTL
 ;--------------------------------------------------------------------------------

externalhooks.asm

@@ -1,4 +1,4 @@
-org $298000 ; 0x148000
+org $A98000 ; 0x148000
 Ext_OnFileCreate: ;x
 RTL : RTL : RTL : RTL : RTL
 Ext_OnFileLoad: ;x immediately after load

failure.asm

@@ -1,9 +1,24 @@
+CheckZSNES:
+	SEP #$28
+	LDA.b #$FF
+	CLC
+	ADC.b #$FF
+	CMP.b #$64
+	REP #$28
+	BEQ .zsnes
+	LDA.w #$01FF : TCS ; thing we wrote over - initialize stack
+	JML ReturnCheckZSNES
+.zsnes
+	JML DontUseZSNES
+
+;===================================================================================================
+
 pushtable
 
-table "bsodencode.txt"
+table "data/bsodencode.txt"
 
 ; Uncomment this to force a crash to test message
-;pushpc : org $008132 : db 0 : pullpc
+; pushpc : org $008132 : db 0 : pullpc
 
 ;===================================================================================================
 
@@ -11,29 +26,29 @@ DontUseZSNES:
 	SEP #$35 ; sets carry and I flag too
 
 	LDA.b #$00
-	STA.l $4200 ; disable NMI and IRQ
+	STA.l NMITIMEN ; disable NMI and IRQ
-	STA.l $420C ; disable HDMA
+	STA.l HDMAEN ; disable HDMA
 
 	ROR ; A = 0x80 from carry
-	STA.l $2100
+	STA.l INIDISP
-	STA.l $2115
+	STA.l VMAIN
 
 	; Empty VRAM
-	LDA.b #AllZeros>>16 : STA.l $4304
+	LDA.b #AllZeros>>16 : STA.l A1B0
 
 	REP #$20
 
 	LDA.w #AllZeros
-	STA.l $4302
+	STA.l A1T0L
 
 	LDA.w #$1809
-	STA.l $4300
+	STA.l DMAP0
 
 	LDA.w #$0000
-	STA.l $4305
+	STA.l DAS0L
 
 	LDA.w #$0001
-	STA.l $420B
+	STA.l MDMAEN
 
 	JSR ConfigurePPUForFailureReport
 	JSR ConfigureBSODVWF
@@ -43,7 +58,7 @@ DontUseZSNES:
 	JSR DrawVWFMessage
 
 	LDA.w #$0F0F
-	STA.w $2100
+	STA.w INIDISP
 
 --	BRA --
 
@@ -77,29 +92,29 @@ Crashed:
 	SEP #$35 ; sets carry and I flag too
 
 	LDA.b #$00
-	STA.l $4200 ; disable NMI and IRQ
+	STA.l NMITIMEN ; disable NMI and IRQ
-	STA.l $420C ; disable HDMA
+	STA.l HDMAEN ; disable HDMA
 
 	ROR ; A = 0x80 from carry
-	STA.l $2100
+	STA.l INIDISP
-	STA.l $2115
+	STA.l VMAIN
 
 	; Empty VRAM
-	LDA.b #AllZeros>>16 : STA.l $4304
+	LDA.b #AllZeros>>16 : STA.l A1B0
 
 	REP #$38
 
 	LDA.w #AllZeros
-	STA.l $4302
+	STA.l A1T0L
 
 	LDA.w #$1809
-	STA.l $4300
+	STA.l DMAP0
 
 	LDA.w #$0000
-	STA.l $4305
+	STA.l DAS0L
 
 	LDA.w #$0001
-	STA.l $420B
+	STA.l MDMAEN
 
 ;===================================================================================================
 
@@ -113,32 +128,32 @@ Crashed:
 
 	; stack pointer
 	LDA.w #$0C38>>1
-	STA.b $2116
+	STA.b VMADDL
 
 	TSC
 	XBA
 	AND.w #$00FF
 	ORA.w #$0100
-	STA.b $2118
+	STA.b VMDATAL
 
 	TSC
 	AND.w #$00FF
 	ORA.w #$0100
-	STA.l $2118
+	STA.l VMDATAL
 
 	; game module
 	LDA.w #$0C78>>1
-	STA.b $2116
+	STA.b VMADDL
 
-	LDA.l $10
+	LDA.l GameMode
 	AND.w #$00FF
 	ORA.w #$0100
-	STA.b $2118
+	STA.b VMDATAL
 
-	LDA.l $11
+	LDA.l GameSubMode
 	AND.w #$00FF
 	ORA.w #$0100
-	STA.b $2118
+	STA.b VMDATAL
 
 ;---------------------------------------------------------------------------------------------------
 
@@ -176,7 +191,7 @@ Crashed:
 
 .next_row
 	STA.l $7F0004
-	STA.b $2116
+	STA.b VMADDL
 
 	LDY.w #20
 
@@ -194,7 +209,7 @@ Crashed:
 	AND.w #$01FF
 
 .in_stack
-	STA.b $2118
+	STA.b VMDATAL
 
 	DEX
 	TXA
@@ -235,16 +250,10 @@ Crashed:
 	JSR DrawVWFMessage
 
 	LDA.w #$0F0F
-	STA.w $2100
+	STA.w INIDISP
 
 --	BRA --
 
-;	LDA.w #$0000
-;	TCD
-;
-;	TSC
-
-
 BSODMessage:
 	db "A fatal error has occurred and resulted in an", $80
 	db "unrecoverable crash. ?", $80
@@ -260,11 +269,11 @@ BSODMessage:
 ;===================================================================================================
 
 DrawVWFMessage:
-	STA.b $06
+	STA.b Scrap06
 
 .next
-	LDA.b ($06)
+	LDA.b (Scrap06)
-	INC.b $06
+	INC.b Scrap06
 	AND.w #$00FF
 	CMP.w #$0080
 	BEQ .done_row
@@ -284,26 +293,26 @@ DrawVWFMessage:
 	ASL
 	TAX
 	LDA.w .row_offset,X
-	STA.w $2116
+	STA.w VMADDL
 
 	INC.b VWFR
 
 	LDA.w #$1800
-	STA.w $4300
+	STA.w DMAP0
 	
 	LDA.w #20*16
-	STA.w $4305
+	STA.w DAS0L
 
 	LDA.w #$1000
-	STA.w $4302
+	STA.w A1T0L
 
 	SEP #$20
 
-	STZ.w $2115
+	STZ.w VMAIN
-	STZ.w $4304
+	STZ.w A1B0
 
 	LDA.b #$01
-	STA.w $420B
+	STA.w MDMAEN
 
 	REP #$20
 
@@ -347,7 +356,7 @@ DrawFailureVWFChar:
 	ASL
 	ASL
 	ADC.w #BSODFontGFX
-	STA.b $08
+	STA.b Scrap08
 
 	LDA.b VWFP
 	AND.w #$FFF8
@@ -402,23 +411,23 @@ LoadBSODHexFont:
 	REP #$20
 
 	LDA.w #BSODHex
-	STA.w $4302
+	STA.w A1T0L
 
 	LDA.w #$1801
-	STA.w $4300
+	STA.w DMAP0
 
 	LDA.w #$1000
-	STA.w $4305
+	STA.w DAS0L
 
 	LDA.w #$2800
-	STA.w $2116
+	STA.w VMADDL
 
 	SEP #$20
 	LDA.b #BSODHex>>16
-	STA.w $4304
+	STA.w A1B0
 
 	LDA.b #$01
-	STA.w $420B
+	STA.w MDMAEN
 
 	REP #$30
 
@@ -437,21 +446,21 @@ ConfigureBSODVWF:
 	LDX.b #$FF
 	LDY.b #$7F
 
-	STZ.b $2121
+	STZ.b CGADD
-	STZ.b $2122 : STZ.b $2122
+	STZ.b CGDATA : STZ.b CGDATA
 
-	STX.b $2122 : STY.b $2122
+	STX.b CGDATA : STY.b CGDATA
 
 	LDA.b #$05
-	STA.b $2121
+	STA.b CGADD
 
-	LDA.b #$11 : STA.b $2122 : STY.b $2122
+	LDA.b #$11 : STA.b CGDATA : STY.b CGDATA
 
-	LDA.b #$21 : STA.b $2121
+	LDA.b #$21 : STA.b CGADD
-	STX.b $2122 : STY.b $2122
+	STX.b CGDATA : STY.b CGDATA
 
-	LDA.b #$25 : STA.b $2121
+	LDA.b #$25 : STA.b CGADD
-	LDA.b #$11 : STA.b $2122 : STY.b $2122
+	LDA.b #$11 : STA.b CGDATA : STY.b CGDATA
 
 	REP #$30
 
@@ -473,14 +482,14 @@ ConfigureBSODVWF:
 
 .start
 	STA.w $20
-	STA.b $2116
+	STA.b VMADDL
 
 	PLA
 
 	LDY.w #30
 
 .next_char
-	STA.b $2118
+	STA.b VMDATAL
 	INC
 	DEY
 	BNE .next_char
@@ -516,39 +525,39 @@ ConfigurePPUForFailureReport:
 	PHK
 	PLB
 
-	STZ.w $2105 ; BG mode 0
+	STZ.w BGMODE ; BG mode 0
-	STZ.w $2106 ; no mosaic
+	STZ.w MOSAIC ; no mosaic
-	STZ.w $2107 ; BG1 tilemap to $0000
+	STZ.w BG1SC ; BG1 tilemap to $0000
-	STZ.w $212D
+	STZ.w TS
 
-	STZ.w $210D : STZ.w $210D
+	STZ.w BG1HOFS : STZ.w BG1HOFS
-	STZ.w $210E : STZ.w $210E
+	STZ.w BG1VOFS : STZ.w BG1VOFS
-	STZ.w $210F : STZ.w $210F
+	STZ.w BG2HOFS : STZ.w BG2HOFS
-	STZ.w $2110 : STZ.w $2110
+	STZ.w BG2VOFS : STZ.w BG2VOFS
 
 
-	STZ.w $2123
+	STZ.w W12SEL
-	STZ.w $2131
+	STZ.w CGADSUB
-	STZ.w $2133
+	STZ.w SETINI
 
 	LDA.b #$04
-	STA.w $2108 ; BG1 tilemap to $0800
+	STA.w BG2SC ; BG1 tilemap to $0800
 
 	LDA.b #$21
-	STA.w $210B
+	STA.w BG12NBA
 
 	LDA.b #$03
-	STA.w $212C
+	STA.w TM
 
 	RTS
 
 ;===================================================================================================
 
 BSODHex:
-incbin "bsodhex.2bpp"
+incbin "data/bsodhex.2bpp"
 
 BSODFontGFX:
-incbin "bsodfont.1bpp"
+incbin "data/bsodfont.1bpp"
 
 BSODCharWidths:
 	; [space]

fairyfixes.asm

@@ -2,20 +2,20 @@
 ; Fairy Changes & Fixes
 ;--------------------------------------------------------------------------------
 RefillHealthPlusMagic:
-    LDA BigFairyHealth : STA HeartsFiller
+    LDA.l BigFairyHealth : STA.l HeartsFiller
 RTL
 ;--------------------------------------------------------------------------------
 RefillHealthPlusMagic8bit:
-    LDA BigFairyHealth : STA HeartsFiller
+    LDA.l BigFairyHealth : STA.l HeartsFiller
-    LDA BigFairyMagic : STA MagicFiller
+    LDA.l BigFairyMagic : STA.l MagicFiller
 RTL
 ;--------------------------------------------------------------------------------
 CheckFullHealth:
-    LDA BigFairyHealth : BEQ +
+    LDA.l BigFairyHealth : BEQ +
-        LDA CurrentHealth : CMP MaximumHealth : BNE .player_hp_not_full_yet
+        LDA.l CurrentHealth : CMP.l MaximumHealth : BNE .player_hp_not_full_yet
     +
-    LDA BigFairyMagic : BEQ +
+    LDA.l BigFairyMagic : BEQ +
-        LDA CurrentMagic : CMP.b #$80 : BNE .player_mp_not_full_yet
+        LDA.l CurrentMagic : CMP.b #$80 : BNE .player_mp_not_full_yet
     +
     LDA.b #$00
 RTL
@@ -30,57 +30,56 @@ FairyPond_Init:
 		JML.l Sprite_ShowMessageFromPlayerContact
 	+
 	PHY : JSL.l Sprite_CheckDamageToPlayerSameLayerLong : BCC +
-		LDA BottleContentsOne : CMP.b #$02 : BNE ++ : LDA.b #$1C : PHA : BRA .emptyBottle : ++
+		LDA.l BottleContentsOne : CMP.b #$02 : BNE ++ : LDA.b #$1C : PHA : BRA .emptyBottle : ++
-		LDA BottleContentsTwo : CMP.b #$02 : BNE ++ : LDA.b #$1D : PHA : BRA .emptyBottle : ++
+		LDA.l BottleContentsTwo : CMP.b #$02 : BNE ++ : LDA.b #$1D : PHA : BRA .emptyBottle : ++
-		LDA BottleContentsThree : CMP.b #$02 : BNE ++ : LDA.b #$1E : PHA : BRA .emptyBottle : ++
+		LDA.l BottleContentsThree : CMP.b #$02 : BNE ++ : LDA.b #$1E : PHA : BRA .emptyBottle : ++
-		LDA BottleContentsFour : CMP.b #$02 : BNE ++ : LDA.b #$1F : PHA : BRA .emptyBottle : ++
+		LDA.l BottleContentsFour : CMP.b #$02 : BNE ++ : LDA.b #$1F : PHA : BRA .emptyBottle : ++
 			.noInventory
-			LDA.b #$0A : STA $0D80, X
+			LDA.b #$0A : STA.w SpriteActivity, X
 			LDA.b #$51
 			LDY.b #$01
 			JSL.l Sprite_ShowMessageFromPlayerContact
 			JMP .cleanup
 		
 			.emptyBottle
-			LDA.b #$02 : STA $0D80, X
+			LDA.b #$02 : STA.w SpriteActivity, X
-			;JSL Player_ResetState ; If we continue to have issues, add this in too. (After determining the address for it)
+			STZ.b LinkDirection
-			STZ $2F
+			LDA.b #$01 : STA.w CutsceneFlag
-			LDA.b #$01 : STA $02E4
+			PLA : STA.w MessageCursor
-			PLA : STA $1CE8
 		.cleanup
-		STZ $0EB0, X ; Clear the sprite's item-given variable
+		STZ.w SpriteDirectionTable, X ; Clear the sprite's item-given variable
 		CLC ; skip rest of original function
 	+ :	PLY
 RTL
 ;--------------------------------------------------------------------------------
 HappinessPond_Check:
-	LDA $A0 : CMP.b #$15 ;what we wrote over
+	LDA.b RoomIndex : CMP.b #$15 ;what we wrote over
 	BNE .done
 	PHP
 
 	LDA.b #$72
 	JSL Sprite_SpawnDynamically
 
-	LDA $0FD8 : STA $0D10, Y
+	LDA.w SpriteCoordCacheX : STA.w SpritePosXLow, Y
-	LDA $0FD9 : STA $0D30, Y
+	LDA.w SpriteCoordCacheX+1 : STA.w SpritePosXHigh, Y
 
-	LDA $0FDA : !SUB.b #$40 : STA $0D00, Y
+	LDA.w SpriteCoordCacheY : !SUB.b #$40 : STA.w SpritePosYLow, Y
-	LDA $0FDB : SBC.b #$00 : STA $0D20, Y
+	LDA.w SpriteCoordCacheY+1 : SBC.b #$00 : STA.w SpritePosYHigh, Y
 
-	LDA.b #$01 : STA $0DA0, Y
+	LDA.b #$01 : STA.w SpriteAuxTable, Y
 
 	LDA.b #$BB
 	JSL Sprite_SpawnDynamically
 
-	LDA.b #$08 : STA $0DD0, Y ; ensure we run prep for the shopkeeper
+	LDA.b #$08 : STA.w SpriteAITable, Y ; ensure we run prep for the shopkeeper
 
-	LDA $0FD8 : STA $0D10, Y
+	LDA.w SpriteCoordCacheX : STA.w SpritePosXLow, Y
-	LDA $0FD9 : STA $0D30, Y
+	LDA.w SpriteCoordCacheX+1 : STA.w SpritePosXHigh, Y
 
-	LDA $0FDA : !SUB.b #$20 : STA $0D00, Y
+	LDA.w SpriteCoordCacheY : !SUB.b #$20 : STA.w SpritePosYLow, Y
-	LDA $0FDB : SBC.b #$00 : STA $0D20, Y
+	LDA.w SpriteCoordCacheY+1 : SBC.b #$00 : STA.w SpritePosYHigh, Y
 
-	STZ $0DD0, X ; self terminate
+	STZ.w SpriteAITable, X ; self terminate
 
 	PLP
 	.done

fastcredits.asm

@@ -1,21 +1,51 @@
+FastCreditsActive = $50
+
+;===================================================================================================
+
+
+FlagFastCredits:
+	LDA.b #$40
+	TRB.b FastCreditsActive
+
+	AND.b Joy1B_All
+	TSB.b FastCreditsActive
+
+	LDA.b #$20
+	AND.b Joy1A_New
+	EOR.b FastCreditsActive
+	STA.b FastCreditsActive
+
+	LDA.b FastCreditsActive
+	AND.b #$60
+	BEQ .slow
+
+	LDA.b #$01
+	TSB.b FastCreditsActive
+
+.slow
+	LDA.b $11
+	ASL
+	TAX
+
+	RTL
+
 ;===================================================================================================
 
 FastCreditsCutsceneTimer:
-	BIT.b $F2-1 : BVC .slow
+	LDA.b ScrapBufferBD+$0B
+	INC
 
-	LDA.w #$0001 : STA.b $50
+	JSR IsFastCredits
+	BCC .slow
+
+	INC
+	INC
+	INC
 
-	LDA.b $C8
-	CLC
-	ADC.w #$0004
 	AND.w #$FFFE
-	STA.b $C8
-	SEP #$20
-	RTL
-	
 
 .slow
-	INC.b $C8
+	STA.b ScrapBufferBD+$0B
 
 	SEP #$20
 	RTL
@@ -49,18 +79,20 @@ FastCreditsCutsceneScrollY:
 
 FastCreditsCutsceneScroll:
 	LDA.w $00E2,Y
-	CMP.l $0EC308,X ; compare to target
+	CMP.l $8EC308,X ; compare to target
 
-	ROL.b $00 ; put carry in here
+	ROL.b Scrap00 ; put carry in here
-	LDA.l $0EC348,X ; get movement
+	LDA.l $8EC348,X ; get movement
 	BPL ++ ; if positive, leave saved carry alone
-	INC.b $00 ; otherwise, flip it
+	INC.b Scrap00 ; otherwise, flip it
-++	ROR.b $00 ; recover carry
+++	ROR.b Scrap00 ; recover carry
 
 	BCC ++ ; scroll if carry not set
+
 	LDA.w #$0000
 
-++	BIT.b $F2-1 : BVC .slow ; check for X held
+++	JSR IsFastCredits
+	BCC .slow
 
 	AND.w #$FFFF ; get sign of A
 	BPL .positive
@@ -77,21 +109,14 @@ FastCreditsCutsceneScroll:
 	ASL
 	ASL
 
-
-
 .slow
 	RTS
 
-
-
-
-
-
 FastCreditsCutsceneUnderworldX:
 	JSR FastCreditsCutsceneScrollX
 	CLC
-	ADC.b $E2
+	ADC.b BG2H
-	STA.b $E2
+	STA.b BG2H
 
 	RTL
 
@@ -99,26 +124,34 @@ FastCreditsCutsceneUnderworldX:
 FastCreditsCutsceneUnderworldY:
 	JSR FastCreditsCutsceneScrollY
 	CLC
-	ADC.b $E8
+	ADC.b BG2V
-	STA.b $E8
+	STA.b BG2V
 
 	RTL
 
 
 FastTextScroll:
-	LDA.b $1A
+        LDA.b FrameCounter
-	BIT.b $F2-1 : BVC .slow
+        SEP #$10
+	JSR IsFastCredits
+	BCC .slow
 
 	AND.w #$0000
+        REP #$10
 	RTL
 
 .slow
 	AND.w #$0003
+        REP #$10
 	RTL
 
 DumbFlagForMSU:
 	STA.l CurrentWorld
-	STZ.b $50
+	STZ.b FastCreditsActive
 	RTL
 
+IsFastCredits:
+	LDY.b FastCreditsActive
+        CPY.b #$20
+	RTS
 

fileselect.asm

@@ -1,18 +1,15 @@
-!ValidKeyLoaded = "$7F509E"
-
 ;FS prefix means file_select, since these defines and macros are specific to this screen
+!FS_COLOR_BROWN = $0000 ;(only used for: Shovel, hammer, powder)
+!FS_COLOR_RED = $0400
+!FS_COLOR_YELLOW = $0800
+!FS_COLOR_BLUE = $0C00
+!FS_COLOR_GRAY = $1000 ;(Used to gray out items)
+!FS_COLOR_BOOTS = $1400
+!FS_COLOR_GREEN = $1800
+!FS_COLOR_BW = $1C00
 
-!FS_COLOR_BROWN = "$0000" ;(only used for: Shovel, hammer, powder)
+!FS_HFLIP = $4000
-!FS_COLOR_RED = "$0400"
+!FS_VFLIP = $8000
-!FS_COLOR_YELLOW = "$0800"
-!FS_COLOR_BLUE = "$0C00"
-!FS_COLOR_GRAY = "$1000" ;(Used to gray out items)
-!FS_COLOR_BOOTS = "$1400"
-!FS_COLOR_GREEN = "$1800"
-!FS_COLOR_BW = "$1C00"
-
-!FS_HFLIP = "$4000"
-!FS_VFLIP = "$8000"
 
 macro fs_draw8x8(screenrow,screencol)
 	;Note due to XKAS's screwy math this formula is misleading.
@@ -83,45 +80,88 @@ JMP DrawItemGray
 
 DrawBottle:
 	AND.w #$00FF : BNE +
-		LDX #FileSelectItems_empty_bottle
+		LDX.w #FileSelectItems_empty_bottle
 		JMP DrawItemGray
 	+ : DEC #2 : BNE +
-		LDX #FileSelectItems_empty_bottle
+		LDX.w #FileSelectItems_empty_bottle
 		JMP DrawItem
 	+ : DEC : BNE +
-		LDX #FileSelectItems_red_potion
+		LDX.w #FileSelectItems_red_potion
 		JMP DrawItem
 	+ : DEC : BNE +
-		LDX #FileSelectItems_green_potion
+		LDX.w #FileSelectItems_green_potion
 		JMP DrawItem
 	+ : DEC : BNE +
-		LDX #FileSelectItems_blue_potion
+		LDX.w #FileSelectItems_blue_potion
 		JMP DrawItem
 	+ : DEC : BNE +
-		LDX #FileSelectItems_fairy_bottle
+		LDX.w #FileSelectItems_fairy_bottle
 		JMP DrawItem
 	+ : DEC : BNE +
-		LDX #FileSelectItems_bee_bottle
+		LDX.w #FileSelectItems_bee_bottle
 		JMP DrawItem
 	+
-	LDX #FileSelectItems_good_bee_bottle
+	LDX.w #FileSelectItems_good_bee_bottle
 JMP DrawItem
 
 
 DrawPlayerFile:
-	LDA $1A : AND.w #$0001 : BNE .normal
+	LDA.b FrameCounter : AND.w #$0001 : BNE .normal
 		JSR DrawPlayerFileShared
-		INC $0710 ; Suppress animated tile updates for this frame
+
+		INC.w SkipOAM ; Suppress animated tile updates for this frame
 
 		; re-enable  Stripe Image format upload on this frame
 		; Value loaded must match what gets set by AltBufferTable
-		LDA.w #$0161 : STA $1002
+		LDA.w #$0161 : STA.w GFXStripes+2
+
+		LDA.w #$C000>>1
+		XBA
+		STA.w GFXStripes+$0402
+
+		LDA.w #$C03E>>1
+		XBA
+		STA.w GFXStripes+$0408
+
+		LDA.w #$C000|57
+		XBA
+		STA.w GFXStripes+$0404
+		STA.w GFXStripes+$040A
+	
+		LDA.w #$0188 ; change back to 12BF to restore the border
+		STA.w GFXStripes+$0406
+		ORA.w #$4000
+		STA.w GFXStripes+$040C
+	
+		LDA.w #$C0C6>>1
+		XBA
+		STA.w GFXStripes+$040E
+
+		LDA.w #$4001
+		XBA
+		STA.w GFXStripes+$0410
+
+		LDA.l DisableFlashing
+		AND.w #$00FF
+		BEQ .flashing
+
+		LDA.w #$26FE
+		BRA .draw_access_icon
+
+.flashing
+		LDA.w #$0188
+		NOP ; 2 cycles wasted to be equal
+
+.draw_access_icon
+		STA.w GFXStripes+$0412
+		LDA.w #$FFFF
+		STA.w GFXStripes+$0414
 		BRA .done
 	.normal
-	STZ $0710 ; ensure core animated tile updates are not suppressed
+	STZ.w SkipOAM ; ensure core animated tile updates are not suppressed
-	LDA #$FFFF : STA.w $1002 ; Suppress Stripe Image format upload on this frame
+	LDA.w #$FFFF : STA.w GFXStripes+2 ; Suppress Stripe Image format upload on this frame
 .done
-	LDA.w #$0004 : STA $02 ; thing we wrote over
+	LDA.w #$0004 : STA.b Scrap02 ; thing we wrote over
 RTL
 
 
@@ -132,29 +172,29 @@ DrawPlayerFileShared:
 	LDA.b #FileSelectItems>>16 : PHA : PLB
 	REP #$20 ; restore 16 bit accumulator
 
-	LDA ExtendedFileNameSRAM+$08 : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$08 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(6,5)
-	LDA ExtendedFileNameSRAM+$0A : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$0A : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(6,6)
-	LDA ExtendedFileNameSRAM+$0C : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$0C : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(6,7)
-	LDA ExtendedFileNameSRAM+$0E : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$0E : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(6,8)
 
-	LDA ExtendedFileNameSRAM+$10 : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$10 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(9,5)
-	LDA ExtendedFileNameSRAM+$12 : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$12 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(9,6)
-	LDA ExtendedFileNameSRAM+$14 : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$14 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(9,7)
-	LDA ExtendedFileNameSRAM+$16 : ORA.w #!FS_COLOR_BW
+	LDA.l ExtendedFileNameSRAM+$16 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(9,8)
 
 	JSR FileSelectDrawHudBar
 
 	; Bow
 	LDA.l BowTrackingSRAM : AND.w #$0040 : BEQ +
-		LDA EquipmentSRAM+$00 : AND.w #$00FF : BEQ ++
+		LDA.l EquipmentSRAM+$00 : AND.w #$00FF : BEQ ++
 			%fs_drawItem(3,12,FileSelectItems_silver_bow)
 			BRA .bow_end
 		++
@@ -199,7 +239,7 @@ DrawPlayerFileShared:
 	++
 
 	; Mushroom
-	LDA.l InventoryTrackingSRAM : AND.w #$0008 : BEQ +
+	LDA.l InventoryTrackingSRAM : AND.w #$0028 : BEQ +
 		%fs_drawItem(3,18,FileSelectItems_mushroom)
 		BRA ++
 	+
@@ -314,23 +354,40 @@ DrawPlayerFileShared:
 	++
 
 	; Heart Pieces
+        LDA.l HUDHeartColors_index : ASL : TAX
 	LDA.l EquipmentSRAM+$2B : AND.w #$00FF : BNE +
-		%fs_drawItem(9,26,FileSelectItems_heart_piece_0_of_4)
+	        LDY.w #9*$20+26*2+$1004
-		BRA ++
+                LDA.w #$02C0 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0000, Y
+                LDA.w #$42C0 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0002, Y
+                LDA.w #$02D0 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0040, Y
+                LDA.w #$42D0 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0042, Y
+		JMP ++
 	+ : DEC : BNE +
-		%fs_drawItem(9,26,FileSelectItems_heart_piece_1_of_4)
+	        LDY.w #9*$20+26*2+$1004
-		BRA ++
+                LDA.w #$02C1 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0000, Y
+                LDA.w #$42C0 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0002, Y
+                LDA.w #$02D0 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0040, Y
+                LDA.w #$42D0 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0042, Y
+		JMP ++
 	+ : DEC : BNE +
-		%fs_drawItem(9,26,FileSelectItems_heart_piece_2_of_4)
+	        LDY.w #9*$20+26*2+$1004
-		BRA ++
+                LDA.w #$02C1 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0000, Y
+                LDA.w #$42C0 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0002, Y
+                LDA.w #$02D1 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0040, Y
+                LDA.w #$42D0 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0042, Y
+		JMP ++
 	+
-		%fs_drawItem(9,26,FileSelectItems_heart_piece_3_of_4)
+	        LDY.w #9*$20+26*2+$1004
+                LDA.w #$02C1 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0000, Y
+                LDA.w #$42C1 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0002, Y
+                LDA.w #$02D1 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0040, Y
+                LDA.w #$42D0 : ORA.l HUDHeartColors_masks_file_select,X : STA.w $0042, Y
 	++
 
-	LDA EquipmentSRAM+$0108 : AND.w #$00FF
+	LDA.l EquipmentSRAM+$0130 : AND.w #$00FF
 	JSL.l HexToDec
-	LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,26)
+	LDA.l HexToDecDigit4 : AND.w #$00FF : ORA.w #!FS_COLOR_BW|$02E0 : %fs_draw8x8(11,26)
-	LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,27)
+	LDA.l HexToDecDigit5 : AND.w #$00FF : ORA.w #!FS_COLOR_BW|$02E0 : %fs_draw8x8(11,27)
 
 	; Boots
 	%fs_drawItemBasic(EquipmentSRAM+$15,3,28,FileSelectItems_boots)
@@ -353,21 +410,21 @@ DrawPlayerFileShared:
 	%fs_drawItemBasic(EquipmentSRAM+$17,9,28,FileSelectItems_pearl)
 
 	; Pendants
-	LDA EquipmentSRAM+$34 : AND.w #$0004 : BEQ +
+	LDA.l EquipmentSRAM+$34 : AND.w #$0004 : BEQ +
 		%fs_drawItem(12,12,FileSelectItems_green_pendant)
 		BRA ++
 	+
 		%fs_drawItem(12,12,FileSelectItems_no_pendant)
 	++
 
-	LDA EquipmentSRAM+$34 : AND.w #$0002 : BEQ +
+	LDA.l EquipmentSRAM+$34 : AND.w #$0002 : BEQ +
 		%fs_drawItem(12,14,FileSelectItems_blue_pendant)
 		BRA ++
 	+
 		%fs_drawItem(12,14,FileSelectItems_no_pendant)
 	++
 
-	LDA EquipmentSRAM+$34 : AND.w #$0001 : BEQ +
+	LDA.l EquipmentSRAM+$34 : AND.w #$0001 : BEQ +
 		%fs_drawItem(12,16,FileSelectItems_red_pendant)
 		BRA ++
 	+
@@ -375,53 +432,53 @@ DrawPlayerFileShared:
 	++
 
 	; Crystals
-	LDA EquipmentSRAM+$3A : AND.w #$0002 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0002 : BEQ +
-		LDA.w #$0297|!FS_COLOR_BLUE
+		LDA.w #$02D7|!FS_COLOR_BLUE
 		BRA ++
 	+
-		LDA.w #$0287|!FS_COLOR_GRAY
+		LDA.w #$02C7|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(13,18)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0010 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0010 : BEQ +
-		LDA.w #$0297|!FS_COLOR_BLUE
+		LDA.w #$02D7|!FS_COLOR_BLUE
 		BRA ++
 	+
-		LDA.w #$0287|!FS_COLOR_GRAY
+		LDA.w #$02C7|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(12,19)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0040 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0040 : BEQ +
-		LDA.w #$0297|!FS_COLOR_BLUE
+		LDA.w #$02D7|!FS_COLOR_BLUE
 		BRA ++
 	+
-		LDA.w #$0287|!FS_COLOR_GRAY
+		LDA.w #$02C7|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(13,20)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0020 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0020 : BEQ +
-		LDA.w #$0297|!FS_COLOR_BLUE
+		LDA.w #$02D7|!FS_COLOR_BLUE
 		BRA ++
 	+
-		LDA.w #$0287|!FS_COLOR_GRAY
+		LDA.w #$02C7|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(12,21)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0004 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0004 : BEQ +
-		LDA.w #$0297|!FS_COLOR_RED
+		LDA.w #$02D7|!FS_COLOR_RED
 		BRA ++
 	+
-		LDA.w #$0287|!FS_COLOR_GRAY
+		LDA.w #$02C7|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(13,22)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0001 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0001 : BEQ +
-		LDA.w #$0297|!FS_COLOR_RED
+		LDA.w #$02D7|!FS_COLOR_RED
 		BRA ++
 	+
-		LDA.w #$0287|!FS_COLOR_GRAY
+		LDA.w #$02C7|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(12,23)
 
-	LDA EquipmentSRAM+$3A : AND.w #$0008 : BEQ +
+	LDA.l EquipmentSRAM+$3A : AND.w #$0008 : BEQ +
-		LDA.w #$0297|!FS_COLOR_BLUE
+		LDA.w #$02D7|!FS_COLOR_BLUE
 		BRA ++
 	+
-		LDA.w #$0287|!FS_COLOR_GRAY
+		LDA.w #$02C7|!FS_COLOR_GRAY
 	++ : %fs_draw16x8(13,24)
 
 
@@ -431,219 +488,210 @@ RTS
 
 FileSelectItems:
 	.empty_bow ;for an eventual update for retro mode
-	dw #$0201|!FS_COLOR_YELLOW, #$02B8|!FS_COLOR_YELLOW, #$02B7|!FS_COLOR_YELLOW, #$0212|!FS_COLOR_YELLOW
+	dw #$0241|!FS_COLOR_YELLOW, #$02F8|!FS_COLOR_YELLOW, #$02F7|!FS_COLOR_YELLOW, #$0252|!FS_COLOR_YELLOW
 	.bow
-	dw #$0201|!FS_COLOR_YELLOW, #$0202|!FS_COLOR_YELLOW, #$0211|!FS_COLOR_YELLOW, #$0212|!FS_COLOR_YELLOW
+	dw #$0241|!FS_COLOR_YELLOW, #$0242|!FS_COLOR_YELLOW, #$0251|!FS_COLOR_YELLOW, #$0252|!FS_COLOR_YELLOW
 	.silver_bow
-	dw #$0201|!FS_COLOR_YELLOW, #$0204|!FS_COLOR_YELLOW, #$0203|!FS_COLOR_RED, #$0212|!FS_COLOR_YELLOW
+	dw #$0241|!FS_COLOR_YELLOW, #$0244|!FS_COLOR_YELLOW, #$0243|!FS_COLOR_RED, #$0252|!FS_COLOR_YELLOW
 	.regular_arrow ;for an eventual update for retro mode
-	dw #$0200|!FS_COLOR_YELLOW, #$02BA|!FS_COLOR_YELLOW, #$02B9|!FS_COLOR_RED, #$0200|!FS_COLOR_YELLOW
+	dw #$0240|!FS_COLOR_YELLOW, #$02FA|!FS_COLOR_YELLOW, #$02F9|!FS_COLOR_RED, #$0240|!FS_COLOR_YELLOW
 	.silver_arrow
-	dw #$0200|!FS_COLOR_YELLOW, #$0214|!FS_COLOR_YELLOW, #$0213|!FS_COLOR_RED, #$0200|!FS_COLOR_YELLOW
+	dw #$0240|!FS_COLOR_YELLOW, #$0254|!FS_COLOR_YELLOW, #$0253|!FS_COLOR_RED, #$0240|!FS_COLOR_YELLOW
 	.blue_boomerang
-	dw #$0205|!FS_COLOR_BLUE, #$0206|!FS_COLOR_BLUE, #$0200|!FS_COLOR_BW, #$0216|!FS_COLOR_BLUE
+	dw #$0245|!FS_COLOR_BLUE, #$0246|!FS_COLOR_BLUE, #$0240|!FS_COLOR_BW, #$0256|!FS_COLOR_BLUE
 	.red_boomerang
-	dw #$0205|!FS_COLOR_RED, #$0206|!FS_COLOR_RED, #$0200|!FS_COLOR_BW, #$0216|!FS_COLOR_RED
+	dw #$0245|!FS_COLOR_RED, #$0246|!FS_COLOR_RED, #$0240|!FS_COLOR_BW, #$0256|!FS_COLOR_RED
 	.both_boomerang
-	dw #$02B6|!FS_COLOR_BLUE, #$02B6|!FS_COLOR_RED, #$02B6|!FS_COLOR_BLUE|!FS_VFLIP, #$02B6|!FS_COLOR_RED|!FS_VFLIP
+	dw #$02F6|!FS_COLOR_BLUE, #$02F6|!FS_COLOR_RED, #$02F6|!FS_COLOR_BLUE|!FS_VFLIP, #$02F6|!FS_COLOR_RED|!FS_VFLIP
 	.hookshot
-	dw #$0200|!FS_COLOR_RED, #$0215|!FS_COLOR_RED, #$0230|!FS_COLOR_RED, #$0200|!FS_COLOR_BW
+	dw #$0240|!FS_COLOR_RED, #$0255|!FS_COLOR_RED, #$0270|!FS_COLOR_RED, #$0240|!FS_COLOR_BW
 	.bombs
-	dw #$020C|!FS_COLOR_BLUE, #$020D|!FS_COLOR_BLUE, #$021C|!FS_COLOR_BLUE, #$021C|!FS_COLOR_BLUE|!FS_HFLIP
+	dw #$024C|!FS_COLOR_BLUE, #$024D|!FS_COLOR_BLUE, #$025C|!FS_COLOR_BLUE, #$025C|!FS_COLOR_BLUE|!FS_HFLIP
 	.fire_rod
-	dw #$0220|!FS_COLOR_RED, #$0210|!FS_COLOR_RED, #$0230|!FS_COLOR_RED, #$0231|!FS_COLOR_RED
+	dw #$0260|!FS_COLOR_RED, #$0250|!FS_COLOR_RED, #$0270|!FS_COLOR_RED, #$0271|!FS_COLOR_RED
 	.ice_rod
-	dw #$0220|!FS_COLOR_BLUE, #$0221|!FS_COLOR_BLUE, #$0230|!FS_COLOR_BLUE, #$0231|!FS_COLOR_BLUE
+	dw #$0260|!FS_COLOR_BLUE, #$0261|!FS_COLOR_BLUE, #$0270|!FS_COLOR_BLUE, #$0271|!FS_COLOR_BLUE
 	.bombos
-	dw #$0207|!FS_COLOR_YELLOW, #$0217|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP, #$0217|!FS_COLOR_YELLOW, #$0207|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP
+	dw #$0247|!FS_COLOR_YELLOW, #$0257|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP, #$0257|!FS_COLOR_YELLOW, #$0247|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP
 	.ether
-	dw #$0208|!FS_COLOR_YELLOW, #$0218|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP, #$0218|!FS_COLOR_YELLOW, #$0208|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP
+	dw #$0248|!FS_COLOR_YELLOW, #$0258|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP, #$0258|!FS_COLOR_YELLOW, #$0248|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP
 	.quake
-	dw #$0209|!FS_COLOR_YELLOW, #$0219|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP, #$0219|!FS_COLOR_YELLOW, #$0209|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP
+	dw #$0249|!FS_COLOR_YELLOW, #$0259|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP, #$0259|!FS_COLOR_YELLOW, #$0249|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP
 	.lamp
-	dw #$022C|!FS_COLOR_RED, #$022C|!FS_COLOR_RED|!FS_HFLIP, #$023C|!FS_COLOR_RED, #$023D|!FS_COLOR_RED
+	dw #$026C|!FS_COLOR_RED, #$026C|!FS_COLOR_RED|!FS_HFLIP, #$027C|!FS_COLOR_RED, #$027D|!FS_COLOR_RED
 	.hammer
-	dw #$0222|!FS_COLOR_BROWN, #$0223|!FS_COLOR_BROWN, #$0232|!FS_COLOR_BROWN, #$0233|!FS_COLOR_BROWN
+	dw #$0262|!FS_COLOR_BROWN, #$0263|!FS_COLOR_BROWN, #$0272|!FS_COLOR_BROWN, #$0273|!FS_COLOR_BROWN
 	.bugnet
-	dw #$0228|!FS_COLOR_YELLOW, #$0229|!FS_COLOR_YELLOW, #$0238|!FS_COLOR_YELLOW, #$0239|!FS_COLOR_YELLOW
+	dw #$0268|!FS_COLOR_YELLOW, #$0269|!FS_COLOR_YELLOW, #$0278|!FS_COLOR_YELLOW, #$0279|!FS_COLOR_YELLOW
 	.shovel
-	dw #$0224|!FS_COLOR_BROWN, #$0225|!FS_COLOR_BROWN, #$0234|!FS_COLOR_BROWN, #$0235|!FS_COLOR_BROWN
+	dw #$0264|!FS_COLOR_BROWN, #$0265|!FS_COLOR_BROWN, #$0274|!FS_COLOR_BROWN, #$0275|!FS_COLOR_BROWN
 	.flute
-	dw #$0226|!FS_COLOR_BLUE, #$0227|!FS_COLOR_BLUE, #$0236|!FS_COLOR_BLUE, #$0237|!FS_COLOR_BLUE
+	dw #$0266|!FS_COLOR_BLUE, #$0267|!FS_COLOR_BLUE, #$0276|!FS_COLOR_BLUE, #$0277|!FS_COLOR_BLUE
 	.book
-	dw #$022A|!FS_COLOR_GREEN, #$022B|!FS_COLOR_GREEN, #$023A|!FS_COLOR_GREEN, #$023B|!FS_COLOR_GREEN
+	dw #$026A|!FS_COLOR_GREEN, #$026B|!FS_COLOR_GREEN, #$027A|!FS_COLOR_GREEN, #$027B|!FS_COLOR_GREEN
 	.redcane
-	dw #$021D|!FS_COLOR_RED, #$021E|!FS_COLOR_RED, #$022D|!FS_COLOR_RED, #$022E|!FS_COLOR_RED
+	dw #$025D|!FS_COLOR_RED, #$025E|!FS_COLOR_RED, #$026D|!FS_COLOR_RED, #$026E|!FS_COLOR_RED
 	.bluecane
-	dw #$021D|!FS_COLOR_BLUE, #$021E|!FS_COLOR_BLUE, #$022D|!FS_COLOR_BLUE, #$022E|!FS_COLOR_BLUE
+	dw #$025D|!FS_COLOR_BLUE, #$025E|!FS_COLOR_BLUE, #$026D|!FS_COLOR_BLUE, #$026E|!FS_COLOR_BLUE
 	.cape
-	dw #$0248|!FS_COLOR_RED, #$0249|!FS_COLOR_RED, #$0258|!FS_COLOR_RED, #$0259|!FS_COLOR_RED
+	dw #$0288|!FS_COLOR_RED, #$0289|!FS_COLOR_RED, #$0298|!FS_COLOR_RED, #$0299|!FS_COLOR_RED
 	.mirror
-	dw #$024A|!FS_COLOR_BLUE, #$024B|!FS_COLOR_BLUE, #$025A|!FS_COLOR_BLUE, #$025B|!FS_COLOR_BLUE
+	dw #$028A|!FS_COLOR_BLUE, #$028B|!FS_COLOR_BLUE, #$029A|!FS_COLOR_BLUE, #$029B|!FS_COLOR_BLUE
 
 	.flippers
-	dw #$020E|!FS_COLOR_BLUE, #$020F|!FS_COLOR_BLUE, #$021F|!FS_COLOR_BLUE|!FS_HFLIP, #$021F|!FS_COLOR_BLUE
+	dw #$024E|!FS_COLOR_BLUE, #$024F|!FS_COLOR_BLUE, #$025F|!FS_COLOR_BLUE|!FS_HFLIP, #$025F|!FS_COLOR_BLUE
 
 	.boots
-	dw #$024C|!FS_COLOR_BOOTS, #$024D|!FS_COLOR_BOOTS, #$025C|!FS_COLOR_BOOTS, #$025D|!FS_COLOR_BOOTS
+	dw #$028C|!FS_COLOR_BOOTS, #$028D|!FS_COLOR_BOOTS, #$029C|!FS_COLOR_BOOTS, #$029D|!FS_COLOR_BOOTS
 
 	.pearl
-	dw #$0264|!FS_COLOR_RED, #$0265|!FS_COLOR_RED, #$0274|!FS_COLOR_RED, #$0275|!FS_COLOR_RED
+	dw #$02A4|!FS_COLOR_RED, #$02A5|!FS_COLOR_RED, #$02B4|!FS_COLOR_RED, #$02B5|!FS_COLOR_RED
 
 	.no_pendant
-	dw #$0285|!FS_COLOR_GRAY, #$0286|!FS_COLOR_GRAY, #$02B2|!FS_COLOR_GRAY, #$0296|!FS_COLOR_GRAY
+	dw #$02C5|!FS_COLOR_GRAY, #$02C6|!FS_COLOR_GRAY, #$02F2|!FS_COLOR_GRAY, #$02D6|!FS_COLOR_GRAY
 	.green_pendant
-	dw #$0285|!FS_COLOR_GREEN, #$0286|!FS_COLOR_GREEN, #$0295|!FS_COLOR_GREEN, #$0296|!FS_COLOR_GREEN
+	dw #$02C5|!FS_COLOR_GREEN, #$02C6|!FS_COLOR_GREEN, #$02D5|!FS_COLOR_GREEN, #$02D6|!FS_COLOR_GREEN
 	.blue_pendant
-	dw #$0285|!FS_COLOR_BLUE, #$0286|!FS_COLOR_BLUE, #$0295|!FS_COLOR_BLUE, #$0296|!FS_COLOR_BLUE
+	dw #$02C5|!FS_COLOR_BLUE, #$02C6|!FS_COLOR_BLUE, #$02D5|!FS_COLOR_BLUE, #$02D6|!FS_COLOR_BLUE
 	.red_pendant
-	dw #$0285|!FS_COLOR_RED, #$0286|!FS_COLOR_RED, #$0295|!FS_COLOR_RED, #$0296|!FS_COLOR_RED
+	dw #$02C5|!FS_COLOR_RED, #$02C6|!FS_COLOR_RED, #$02D5|!FS_COLOR_RED, #$02D6|!FS_COLOR_RED
 
 	.gloves
-	dw #$024E|!FS_COLOR_BROWN, #$024F|!FS_COLOR_BROWN, #$025E|!FS_COLOR_BROWN, #$025F|!FS_COLOR_BROWN
+	dw #$028E|!FS_COLOR_BROWN, #$028F|!FS_COLOR_BROWN, #$029E|!FS_COLOR_BROWN, #$029F|!FS_COLOR_BROWN
 	.mitts
-	dw #$0260|!FS_COLOR_YELLOW, #$0261|!FS_COLOR_YELLOW, #$0270|!FS_COLOR_YELLOW, #$0271|!FS_COLOR_YELLOW
+	dw #$02A0|!FS_COLOR_YELLOW, #$02A1|!FS_COLOR_YELLOW, #$02B0|!FS_COLOR_YELLOW, #$02B1|!FS_COLOR_YELLOW
 
 	.mushroom
-	dw #$0262|!FS_COLOR_RED, #$0263|!FS_COLOR_RED, #$0272|!FS_COLOR_RED, #$0273|!FS_COLOR_RED
+	dw #$02A2|!FS_COLOR_RED, #$02A3|!FS_COLOR_RED, #$02B2|!FS_COLOR_RED, #$02B3|!FS_COLOR_RED
 	.powder
-	dw #$020A|!FS_COLOR_BROWN, #$020B|!FS_COLOR_BROWN, #$021A|!FS_COLOR_BROWN, #$021B|!FS_COLOR_BROWN
+	dw #$024A|!FS_COLOR_BROWN, #$024B|!FS_COLOR_BROWN, #$025A|!FS_COLOR_BROWN, #$025B|!FS_COLOR_BROWN
 
 	.fighters_sword
-	dw #$0266|!FS_COLOR_BLUE, #$0267|!FS_COLOR_BLUE, #$0276|!FS_COLOR_BLUE, #$0277|!FS_COLOR_BLUE
+	dw #$02A6|!FS_COLOR_BLUE, #$02A7|!FS_COLOR_BLUE, #$02B6|!FS_COLOR_BLUE, #$02B7|!FS_COLOR_BLUE
 	.master_sword
-	dw #$0268|!FS_COLOR_BLUE, #$0269|!FS_COLOR_BLUE, #$0278|!FS_COLOR_RED, #$0279|!FS_COLOR_BLUE
+	dw #$02A8|!FS_COLOR_BLUE, #$02A9|!FS_COLOR_BLUE, #$02B8|!FS_COLOR_RED, #$02B9|!FS_COLOR_BLUE
 	.tempered_sword
-	dw #$0268|!FS_COLOR_RED, #$0269|!FS_COLOR_RED, #$0278|!FS_COLOR_GREEN, #$026A|!FS_COLOR_RED
+	dw #$02A8|!FS_COLOR_RED, #$02A9|!FS_COLOR_RED, #$02B8|!FS_COLOR_GREEN, #$02AA|!FS_COLOR_RED
 	.gold_sword
-	dw #$0268|!FS_COLOR_YELLOW, #$0269|!FS_COLOR_YELLOW, #$0278|!FS_COLOR_BLUE, #$027A|!FS_COLOR_YELLOW
+	dw #$02A8|!FS_COLOR_YELLOW, #$02A9|!FS_COLOR_YELLOW, #$02B8|!FS_COLOR_BLUE, #$02BA|!FS_COLOR_YELLOW
 
 	.fighters_shield
-	dw #$026B|!FS_COLOR_BLUE, #$026B|!FS_COLOR_BLUE|!FS_HFLIP, #$027B|!FS_COLOR_BLUE, #$027B|!FS_COLOR_BLUE|!FS_HFLIP
+	dw #$02AB|!FS_COLOR_BLUE, #$02AB|!FS_COLOR_BLUE|!FS_HFLIP, #$02BB|!FS_COLOR_BLUE, #$02BB|!FS_COLOR_BLUE|!FS_HFLIP
 	.fire_shield
-	dw #$026C|!FS_COLOR_BOOTS, #$026C|!FS_COLOR_BOOTS|!FS_HFLIP, #$027C|!FS_COLOR_BOOTS, #$027C|!FS_COLOR_BOOTS|!FS_HFLIP
+	dw #$02AC|!FS_COLOR_BOOTS, #$02AC|!FS_COLOR_BOOTS|!FS_HFLIP, #$02BC|!FS_COLOR_BOOTS, #$02BC|!FS_COLOR_BOOTS|!FS_HFLIP
 	.mirror_shield
-	dw #$026D|!FS_COLOR_YELLOW, #$026E|!FS_COLOR_YELLOW, #$027D|!FS_COLOR_YELLOW, #$027E|!FS_COLOR_YELLOW
+	dw #$02AD|!FS_COLOR_YELLOW, #$02AE|!FS_COLOR_YELLOW, #$02BD|!FS_COLOR_YELLOW, #$02BE|!FS_COLOR_YELLOW
 
 	.green_mail
-	dw #$026F|!FS_COLOR_GREEN, #$026F|!FS_COLOR_GREEN|!FS_HFLIP, #$027F|!FS_COLOR_GREEN, #$02B3|!FS_COLOR_GREEN
+	dw #$02AF|!FS_COLOR_GREEN, #$02AF|!FS_COLOR_GREEN|!FS_HFLIP, #$02BF|!FS_COLOR_GREEN, #$02F3|!FS_COLOR_GREEN
 	.blue_mail
-	dw #$026F|!FS_COLOR_BLUE, #$026F|!FS_COLOR_BLUE|!FS_HFLIP, #$027F|!FS_COLOR_BLUE, #$02B4|!FS_COLOR_BLUE
+	dw #$02AF|!FS_COLOR_BLUE, #$02AF|!FS_COLOR_BLUE|!FS_HFLIP, #$02BF|!FS_COLOR_BLUE, #$02F4|!FS_COLOR_BLUE
 	.red_mail
-	dw #$026F|!FS_COLOR_RED, #$026F|!FS_COLOR_RED|!FS_HFLIP, #$027F|!FS_COLOR_RED, #$02B5|!FS_COLOR_RED
+	dw #$02AF|!FS_COLOR_RED, #$02AF|!FS_COLOR_RED|!FS_HFLIP, #$02BF|!FS_COLOR_RED, #$02F5|!FS_COLOR_RED
-
-	.heart_piece_0_of_4
-	dw #$0280|!FS_COLOR_RED, #$0280|!FS_COLOR_RED|!FS_HFLIP, #$0290|!FS_COLOR_RED, #$0290|!FS_COLOR_RED|!FS_HFLIP
-	.heart_piece_1_of_4
-	dw #$0281|!FS_COLOR_RED, #$0280|!FS_COLOR_RED|!FS_HFLIP, #$0290|!FS_COLOR_RED, #$0290|!FS_COLOR_RED|!FS_HFLIP
-	.heart_piece_2_of_4
-	dw #$0281|!FS_COLOR_RED, #$0280|!FS_COLOR_RED|!FS_HFLIP, #$0291|!FS_COLOR_RED, #$0290|!FS_COLOR_RED|!FS_HFLIP
-	.heart_piece_3_of_4
-	dw #$0281|!FS_COLOR_RED, #$0281|!FS_COLOR_RED|!FS_HFLIP, #$0291|!FS_COLOR_RED, #$0290|!FS_COLOR_RED|!FS_HFLIP
 
 	.empty_bottle
-	dw #$0240|!FS_COLOR_BW, #$0241|!FS_COLOR_BW, #$0250|!FS_COLOR_BW, #$0251|!FS_COLOR_BW
+	dw #$0280|!FS_COLOR_BW, #$0281|!FS_COLOR_BW, #$0290|!FS_COLOR_BW, #$0291|!FS_COLOR_BW
 	.red_potion
-	dw #$0242|!FS_COLOR_RED, #$0242|!FS_COLOR_RED|!FS_HFLIP, #$0252|!FS_COLOR_RED, #$0243|!FS_COLOR_RED
+	dw #$0282|!FS_COLOR_RED, #$0282|!FS_COLOR_RED|!FS_HFLIP, #$0292|!FS_COLOR_RED, #$0283|!FS_COLOR_RED
 	.green_potion
-	dw #$0242|!FS_COLOR_GREEN, #$0242|!FS_COLOR_GREEN|!FS_HFLIP, #$0252|!FS_COLOR_GREEN, #$0244|!FS_COLOR_GREEN
+	dw #$0282|!FS_COLOR_GREEN, #$0282|!FS_COLOR_GREEN|!FS_HFLIP, #$0292|!FS_COLOR_GREEN, #$0284|!FS_COLOR_GREEN
 	.blue_potion
-	dw #$0242|!FS_COLOR_BLUE, #$0242|!FS_COLOR_BLUE|!FS_HFLIP, #$0252|!FS_COLOR_BLUE, #$0245|!FS_COLOR_BLUE
+	dw #$0282|!FS_COLOR_BLUE, #$0282|!FS_COLOR_BLUE|!FS_HFLIP, #$0292|!FS_COLOR_BLUE, #$0285|!FS_COLOR_BLUE
 	.fairy_bottle
-	dw #$0247|!FS_COLOR_YELLOW|!FS_HFLIP, #$0247|!FS_COLOR_YELLOW, #$0256|!FS_COLOR_BLUE, #$0257|!FS_COLOR_BLUE
+	dw #$0287|!FS_COLOR_YELLOW|!FS_HFLIP, #$0287|!FS_COLOR_YELLOW, #$0296|!FS_COLOR_BLUE, #$0297|!FS_COLOR_BLUE
 	.bee_bottle
-	dw #$0240|!FS_COLOR_BW, #$0241|!FS_COLOR_BW, #$0254|!FS_COLOR_YELLOW, #$0255|!FS_COLOR_YELLOW
+	dw #$0280|!FS_COLOR_BW, #$0281|!FS_COLOR_BW, #$0294|!FS_COLOR_YELLOW, #$0295|!FS_COLOR_YELLOW
 	.good_bee_bottle
-	dw #$0240|!FS_COLOR_BW, #$0241|!FS_COLOR_BW, #$0254|!FS_COLOR_YELLOW, #$0246|!FS_COLOR_YELLOW
+	dw #$0280|!FS_COLOR_BW, #$0281|!FS_COLOR_BW, #$0294|!FS_COLOR_YELLOW, #$0286|!FS_COLOR_YELLOW
 
 ;--------------------------------------------------------------------------------
 FileSelectDrawHudBar:
-	LDA #$029B|!FS_COLOR_GREEN : %fs_draw16x8(0,10)
+        LDA.w #$02DB|!FS_COLOR_GREEN : %fs_draw16x8(0,10)
-	LDA EquipmentSRAM+$22
+        LDA.l DisplayRupeesSRAM
-	JSL.l HexToDec
+        JSL.l HUDHex4Digit_Long
-	LDA $7F5004 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,9)
+        LDA.b Scrap04 : AND.w #$00FF : !ADD.w #$0250+!FS_COLOR_BW : %fs_draw8x8(1,9)
-	LDA $7F5005 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,10)
+        LDA.b Scrap05 : AND.w #$00FF : !ADD.w #$0250+!FS_COLOR_BW : %fs_draw8x8(1,10)
-	LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,11)
+        LDA.b Scrap06 : AND.w #$00FF : !ADD.w #$0250+!FS_COLOR_BW : %fs_draw8x8(1,11)
-	LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,12)
+        LDA.b Scrap07 : AND.w #$00FF : !ADD.w #$0250+!FS_COLOR_BW : %fs_draw8x8(1,12)
 
-	LDA #$028B|!FS_COLOR_BLUE : %fs_draw16x8(0,14)
+        LDA.w #$02CB|!FS_COLOR_BLUE : %fs_draw16x8(0,14)
-	LDA EquipmentSRAM+$03 : AND.w #$00FF
+        LDA.l BombsEquipmentSRAM : AND.w #$00FF
-	JSL.l HexToDec
+        JSL.l HUDHex2Digit_Long
-	LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,14)
+        TYA : AND.w #$00FF : !ADD.w #$0250+!FS_COLOR_BW : %fs_draw8x8(1,14)
-	LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,15)
+        TXA : AND.w #$00FF : !ADD.w #$0250+!FS_COLOR_BW : %fs_draw8x8(1,15)
 
         LDA.l BowTrackingSRAM : AND.w #$0040 : BEQ +
-		LDA #$0299|!FS_COLOR_RED : %fs_draw16x8(0,17)
+                LDA.w #$02D9|!FS_COLOR_RED : %fs_draw16x8(0,17)
                 BRA ++
         +
-	LDA #$0289|!FS_COLOR_BROWN : %fs_draw16x8(0,17)
+        LDA.w #$02C9|!FS_COLOR_BROWN : %fs_draw16x8(0,17)
         ++
-	LDA EquipmentSRAM+$37 : AND.w #$00FF
+        LDA.l CurrentArrowsSRAM : AND.w #$00FF
-	JSL.l HexToDec
+        JSL.l HUDHex2Digit_Long
-	LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,17)
+        TYA : AND.w #$00FF : !ADD.w #$0250+!FS_COLOR_BW : %fs_draw8x8(1,17)
-	LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(1,18)
+        TXA : AND.w #$00FF : !ADD.w #$0250+!FS_COLOR_BW : %fs_draw8x8(1,18)
 RTS
 ;--------------------------------------------------------------------------------
 AltBufferTable:
-    LDA.b #$02 : STA $210c ; Have Screen 3 use same tile area as screens 1
+    LDA.b #$02 : STA.w BG34NBA ; Have Screen 3 use same tile area as screens 1
 .noScreen3Change
     REP #$20
     LDX.w #$0400 ; 14 rows with 64 bytes (30 tiles * 2 + 4 byte header)
     ;fill with the blank character
     LDA.w #$0188
     -
-        STA $1000, X
+        STA.w GFXStripes, X
         DEX : DEX : BNE -
 
     ; set vram offsets
-    LDA.w #$0161 : STA $1002 ;file 1 top row
+    LDA.w #$0161 : STA.w GFXStripes+$02 ;file 1 top row
-    LDA.w #$2161 : STA $1042 ;file 1 bottom row
+    LDA.w #$2161 : STA.w GFXStripes+$42 ;file 1 bottom row
 
-    LDA.w #$4161 : STA $1082 ;gap row top
+    LDA.w #$4161 : STA.w GFXStripes+$82 ;gap row top
-    LDA.w #$6161 : STA $10C2 ;gap row bottom
+    LDA.w #$6161 : STA.w GFXStripes+$C2 ;gap row bottom
 
-    LDA.w #$8161 : STA $1102 ;file 2 top row
+    LDA.w #$8161 : STA.w GFXStripes+$0102 ;file 2 top row
-    LDA.w #$A161 : STA $1142 ;file 2 bottom row
+    LDA.w #$A161 : STA.w GFXStripes+$0142 ;file 2 bottom row
 
-    LDA.w #$C161 : STA $1182 ;gap row top
+    LDA.w #$C161 : STA.w GFXStripes+$0182 ;gap row top
-    LDA.w #$E161 : STA $11c2 ;gap row bottom
+    LDA.w #$E161 : STA.w GFXStripes+$01C2 ;gap row bottom
 
-    LDA.w #$0162 : STA $1202 ;file 3 top row
+    LDA.w #$0162 : STA.w GFXStripes+$0202 ;file 3 top row
-    LDA.w #$2162 : STA $1242 ;file 3 bottom row
+    LDA.w #$2162 : STA.w GFXStripes+$0242 ;file 3 bottom row
 
-    LDA.w #$4162 : STA $1282 ;extra gap row top
+    LDA.w #$4162 : STA.w GFXStripes+$0282 ;extra gap row top
-    LDA.w #$6162 : STA $12c2 ;extra gap row bottom
+    LDA.w #$6162 : STA.w GFXStripes+$02C2 ;extra gap row bottom
 
-	LDA.w #$8162 : STA $1302 ;extra gap row top
+    LDA.w #$8162 : STA.w GFXStripes+$0302 ;extra gap row top
-    LDA.w #$A162 : STA $1342 ;extra gap row bottom
+    LDA.w #$A162 : STA.w GFXStripes+$0342 ;extra gap row bottom
 
-	LDA.w #$C162 : STA $1382 ;extra gap row top
+    LDA.w #$C162 : STA.w GFXStripes+$0382 ;extra gap row top
-    LDA.w #$E162 : STA $13C2 ;extra gap row bottom
+    LDA.w #$E162 : STA.w GFXStripes+$03C2 ;extra gap row bottom
 
     ; set lengths
     LDA.w #$3B00
-    STA $1004 ;file 1 top row
+    STA.w GFXStripes+$04 ;file 1 top row
-    STA $1044 ;file 1 bottom row
+    STA.w GFXStripes+$44 ;file 1 bottom row
-    STA $1084 ;gap row top
+    STA.w GFXStripes+$84 ;gap row top
-    STA $10C4 ;gap row bottom
+    STA.w GFXStripes+$C4 ;gap row bottom
-    STA $1104 ;file 2 top row
+    STA.w GFXStripes+$0104 ;file 2 top row
-    STA $1144 ;file 2 bottom row
+    STA.w GFXStripes+$0144 ;file 2 bottom row
-    STA $1184 ;gap row top
+    STA.w GFXStripes+$0184 ;gap row top
-    STA $11C4 ;gap row bottom
+    STA.w GFXStripes+$01C4 ;gap row bottom
-    STA $1204 ;file 3 top row
+    STA.w GFXStripes+$0204 ;file 3 top row
-    STA $1244 ;file 3 bottom row
+    STA.w GFXStripes+$0244 ;file 3 bottom row
-    STA $1284 ;extra gap row top
+    STA.w GFXStripes+$0284 ;extra gap row top
-    STA $12C4 ;extra gap row bottom
+    STA.w GFXStripes+$02C4 ;extra gap row bottom
-	STA $1304 ;extra gap row top
+    STA.w GFXStripes+$0304 ;extra gap row top
-    STA $1344 ;extra gap row bottom
+    STA.w GFXStripes+$0344 ;extra gap row bottom
-	STA $1384 ;extra gap row top
+    STA.w GFXStripes+$0384 ;extra gap row top
-    STA $13C4 ;extra gap row bottom
+    STA.w GFXStripes+$03C4 ;extra gap row bottom
 
     ; Set last packet marker
-    LDA.w #$00FF : STA $1402
+    LDA.w #$00FF : STA.w GFXStripes+$0402
 
     ; Draw Unlock option if applicable
-	LDA $10 : AND.w #$00FF : CMP.w #$0001 : BNE +
+    LDA.b GameMode : AND.w #$00FF : CMP.w #$0001 : BNE +
     LDA.l IsEncrypted : AND.w #$00FF : CMP.w #$0002 : BNE +
     PHP : SEP #$30 : PHX : PHY : JSL ValidatePassword : PLY : PLX : PLP
     AND.w #$00FF : BNE +
@@ -654,7 +702,6 @@ AltBufferTable:
 	    LDA.w #!FSTILE_C_TOP : %fs_draw8x16(14,9)
 	    LDA.w #!FSTILE_K_TOP : %fs_draw8x16(14,10)
     +
-
     SEP #$20
 
 RTL
@@ -663,36 +710,36 @@ AltBufferTable_credits:
 	JSL AltBufferTable_noScreen3Change
 
 	REP #$20
-    LDA.w #$6168 : STA $1002 ;file 1 top row
+    LDA.w #$6168 : STA.w GFXStripes+$02 ;file 1 top row
-    LDA.w #$8168 : STA $1042 ;file 1 bottom row
+    LDA.w #$8168 : STA.w GFXStripes+$42 ;file 1 bottom row
 
-    LDA.w #$A168 : STA $1082 ;gap row top
+    LDA.w #$A168 : STA.w GFXStripes+$82 ;gap row top
-    LDA.w #$C168 : STA $10C2 ;gap row bottom
+    LDA.w #$C168 : STA.w GFXStripes+$C2 ;gap row bottom
 
-    LDA.w #$E168 : STA $1102 ;file 2 top row
+    LDA.w #$E168 : STA.w GFXStripes+$0102 ;file 2 top row
-    LDA.w #$0169 : STA $1142 ;file 2 bottom row
+    LDA.w #$0169 : STA.w GFXStripes+$0142 ;file 2 bottom row
 
-    LDA.w #$2169 : STA $1182 ;gap row top
+    LDA.w #$2169 : STA.w GFXStripes+$0182 ;gap row top
-    LDA.w #$4169 : STA $11c2 ;gap row bottom
+    LDA.w #$4169 : STA.w GFXStripes+$01c2 ;gap row bottom
 
-    LDA.w #$6169 : STA $1202 ;file 3 top row
+    LDA.w #$6169 : STA.w GFXStripes+$0202 ;file 3 top row
-    LDA.w #$8169 : STA $1242 ;file 3 bottom row
+    LDA.w #$8169 : STA.w GFXStripes+$0242 ;file 3 bottom row
 
-    LDA.w #$A169 : STA $1282 ;extra gap row top
+    LDA.w #$A169 : STA.w GFXStripes+$0282 ;extra gap row top
-    LDA.w #$C169 : STA $12c2 ;extra gap row bottom
+    LDA.w #$C169 : STA.w GFXStripes+$02C2 ;extra gap row bottom
 
-	LDA.w #$E169 : STA $1302 ;extra gap row top
+    LDA.w #$E169 : STA.w GFXStripes+$0302 ;extra gap row top
-    LDA.w #$016A : STA $1342 ;extra gap row bottom
+    LDA.w #$016A : STA.w GFXStripes+$0342 ;extra gap row bottom
 
-	LDA.w #$216A : STA $1382 ;extra gap row top
+    LDA.w #$216A : STA.w GFXStripes+$0382 ;extra gap row top
-    LDA.w #$416A : STA $13C2 ;extra gap row bottom
+    LDA.w #$416A : STA.w GFXStripes+$03C2 ;extra gap row bottom
 
     SEP #$20
 RTL
 ;--------------------------------------------------------------------------------
 macro LayoutPriority(address)
 LDX.w #$003C
-- : LDA.w <address>, X : ORA #$2000 : STA.w <address>, X
+- : LDA.w <address>, X : ORA.w #$2000 : STA.w <address>, X
 DEX : DEX : BNE -
 endmacro
 
@@ -717,48 +764,65 @@ RTL
 
 ;--------------------------------------------------------------------------------
 LoadFullItemTiles:
-	PHA : PHX
+        LDA.b #$80 : STA.w VMAIN
-		LDA $4300 : PHA ; preserve DMA parameters
+        LDA.b #$01 : STA.w DMAP0
-		LDA $4301 : PHA ; preserve DMA parameters
+        LDA.b #$18 : STA.w BBAD0
-		LDA $4302 : PHA ; preserve DMA parameters
+        LDX.w #$3200 : STX.w VMADDL
-		LDA $4303 : PHA ; preserve DMA parameters
+        LDA.b #FileSelectNewGraphics>>16 : STA.w A1B0
-		LDA $4304 : PHA ; preserve DMA parameters
+        LDX.w #FileSelectNewGraphics : STX.w A1T0L
-		LDA $4305 : PHA ; preserve DMA parameters
+        LDX.w #$0C00 : STX.w DAS0L
-		LDA $4306 : PHA ; preserve DMA parameters
+        LDA.b #$01 : STA.w MDMAEN
-		;--------------------------------------------------------------------------------
-		LDA.b #$80 : STA $2115 ; write read increment on $2119
-		LDA.b #$01 : STA $4300 ; set DMA transfer direction A -> B, bus A auto increment, double-byte mode
-		LDA.b #$18 : STA $4301 ; set bus B destination to VRAM register
-
-		LDA.b #$00 : STA $2116 ; write VRAM destination address
-		LDA.b #$30 : STA $2117 ; write VRAM destination address
-
-		LDA.b #$31 : STA $4304 ; set bus A source bank
-		LDA.b #FileSelectNewGraphics : STA $4302 ; set bus A source address to ROM
-		LDA.b #FileSelectNewGraphics>>8 : STA $4303 ; set bus A source address to ROM
-
-		LDA $2100 : PHA : LDA.b #$80 : STA $2100 ; save screen state & turn screen off
-
-		STZ $4305 : LDA.b #$10 : STA $4306 ; set transfer size to 0x1000
-		LDA #$01 : STA $420B ; begin DMA transfer
-
-		PLA : STA $2100 ; put screen back however it was before
-		;--------------------------------------------------------------------------------
-		PLA : STA $4306 ; restore DMA parameters
-		PLA : STA $4305 ; restore DMA parameters
-		PLA : STA $4304 ; restore DMA parameters
-		PLA : STA $4303 ; restore DMA parameters
-		PLA : STA $4302 ; restore DMA parameters
-		PLA : STA $4301 ; restore DMA parameters
-		PLA : STA $4300 ; restore DMA parameters
-	PLX : PLA
 RTL
 ;--------------------------------------------------------------------------------
+; z colon @
+; length $340
+; target vram $6C00
+; NewFont+$400
+LoadLowerCaseLettersSymbols:
+        LDA.b #$80 : STA.w VMAIN
+        LDA.b #$01 : STA.w DMAP0
+        LDA.b #$18 : STA.w BBAD0
 
+        ; Lower case letters
+        LDA.b #NewFont>>16 : STA.w A1B0
+        LDX.w #NewFont+$400 : STX.w A1T0L
+        LDX.w #$0400 : STX.w DAS0L
+        LDX.w #$2D00 : STX.w VMADDL
+        LDA.b #$01 : STA.w MDMAEN
+
+        ; : @ #
+        LDA.b #NewFont>>16 : STA.w A1B0
+        LDX.w #NewFont+$A80 : STX.w A1T0L
+        LDA.b #NewFont>>16 : STA.w A1B1
+        LDX.w #NewFont+$B80 : STX.w A1T1L
+        LDX.w #$0030 : STX.w DAS0L : STX.w DAS1L
+
+        LDX.w #$2E50 : STX.w VMADDL
+        LDA.b #$01 : STA.w MDMAEN
+        LDX.w #$2ED0 : STX.w VMADDL
+        LDA.b #$02 : STA.w MDMAEN
+RTL
+;--------------------------------------------------------------------------------
+LoadFileSelectVanillaItems:
+        REP #$10
+        LDA.b #$80 : STA.w VMAIN
+        LDA.b #$01 : STA.w DMAP0
+        LDA.b #$18 : STA.w BBAD0
+
+        ; Lower case letters
+        LDA.b #DecompBuffer2>>16 : STA.w A1B0
+        LDX.w #DecompBuffer2 : STX.w A1T0L
+        LDX.w #$0600 : STX.w DAS0L
+        LDX.w #$2F00 : STX.w VMADDL
+        LDA.b #$01 : STA.w MDMAEN
+
+        SEP #$10
+RTL
+;--------------------------------------------------------------------------------
 SetFileSelectPalette:
-	LDA $10 : CMP.b #$04 : BNE +
+	LDA.b GameMode : CMP.b #$04 : BNE +
 		; load the vanilla file select screen BG3 palette for naming screen
-		LDA.b #$01 : STA $0AB2
+		LDA.b #$01 : STA.w $0AB2
 		JSL.l Palette_Hud
 		BRA .done
 	+
@@ -774,12 +838,12 @@ LoadCustomHudPalette:
 		LDX.b #$40
 		-
 		LDA.l GFX_HUD_Palette, X
-			STA.l $7EC500, X
+			STA.l PaletteBuffer, X
 			DEX : DEX
 		BPL -
 		SEP #$20
 
-		INC $15 ; ensure CGRAM gets updated
+		INC.b NMICGRAM ; ensure CGRAM gets updated
 	PLX : PLA
 RTL
 ;--------------------------------------------------------------------------------
@@ -787,18 +851,18 @@ DrawPlayerFile_credits:
 	; see $6563C for drawing first file name and hearts
 	REP #$20 ; set 16 bit accumulator
 
-	LDA EquipmentSRAM+$99 : ORA.w #!FS_COLOR_BW
+	LDA.l EquipmentSRAM+$99 : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(3,5)
-	LDA EquipmentSRAM+$9B : ORA.w #!FS_COLOR_BW
+	LDA.l EquipmentSRAM+$9B : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(3,6)
-	LDA EquipmentSRAM+$9D : ORA.w #!FS_COLOR_BW
+	LDA.l EquipmentSRAM+$9D : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(3,7)
-	LDA EquipmentSRAM+$9F : ORA.w #!FS_COLOR_BW
+	LDA.l EquipmentSRAM+$9F : ORA.w #!FS_COLOR_BW
 	%fs_draw8x16(3,8)
  
-	LDA EquipmentSRAM+$2C : AND.w #$00FF : LSR #3 : STA $02
+	LDA.l EquipmentSRAM+$2C : AND.w #$00FF : LSR #3 : STA.b Scrap02
 	%fs_LDY_screenpos(0,20)
-	LDA.w #$028F|!FS_COLOR_RED
+	LDA.w #$02CF|!FS_COLOR_RED
 	LDX.w #$000A
 
 	.nextHeart
@@ -810,60 +874,61 @@ DrawPlayerFile_credits:
 		TYA : !ADD.w #$40-$14 : TAY
 		PLA
 	+
-	DEC $02 : BNE .nextHeart
+	DEC.b Scrap02 : BNE .nextHeart
 
 	JSR DrawPlayerFileShared
 RTL
 ;--------------------------------------------------------------------------------
 FSCursorUp:
-	LDA $C8 : BNE +
+	LDA.b FileSelectPosition : BNE +
-		LDA #$04 ; up from file becomes delete
+		LDA.b #$04 ; up from file becomes delete
 		BRA .done
-	+ : CMP #$03 : BNE +
+	+ : CMP.b #$03 : BNE +
-		LDA #$00 ; up from unlock is the file
+		LDA.b #$00 ; up from unlock is the file
 		BRA .done
 	+
 	LDA.l IsEncrypted : CMP.b #$02 : BNE +
-	LDA.l !ValidKeyLoaded : BNE +
+	LDA.l ValidKeyLoaded : BNE +
-		LDA #$03 ; up from delete is unlock for password protected seeds
+		LDA.b #$03 ; up from delete is unlock for password protected seeds
 		BRA .done
 	+
-	LDA #$00 ;otherwise up from delete is file
+	LDA.b #$00 ;otherwise up from delete is file
 	.done
-	STA $C8
+	STA.b FileSelectPosition
 RTL
+
 FSCursorDown:
-	LDA $C8 : BNE +
+	LDA.b FileSelectPosition : BNE +
 		LDA.l IsEncrypted : CMP.b #$02 : BNE ++
-		LDA.l !ValidKeyLoaded : BNE ++
+		LDA.l ValidKeyLoaded : BNE ++
-			LDA #$03 ; down from file is unlock for password protected seeds
+			LDA.b #$03 ; down from file is unlock for password protected seeds
 			BRA .done
 		++
-		LDA #$04  ;otherwise down from file is delete
+		LDA.b #$04  ;otherwise down from file is delete
 		BRA .done
-	+ : CMP #$03 : BNE +
+	+ : CMP.b #$03 : BNE +
-		LDA #$04 ; down from unlock is delete
+		LDA.b #$04 ; down from unlock is delete
 		BRA .done
 	+
-	LDA #$00 ; down from delete is file
+	LDA.b #$00 ; down from delete is file
 	.done
-	STA $C8
+	STA.b FileSelectPosition
 RTL
 ;--------------------------------------------------------------------------------
 FSSelectFile:
 	LDA.l IsEncrypted : CMP.b #$02 : BNE .normal
-		STZ $012E ; temporarily cancel file screen selection sound
+		STZ.w SFX2 ; temporarily cancel file screen selection sound
 		PHX : PHY
 			JSL ValidatePassword : BEQ .must_unlock
 		PLY : PLX
-		LDA.b #$2C : STA $012E ;file screen selection sound
+		LDA.b #$2C : STA.w SFX2 ;file screen selection sound
 	.normal
-	LDA.b #$F1 : STA $012C
+	LDA.b #$F1 : STA.w MusicControlRequest
 JML FSSelectFile_continue
 	.must_unlock
 	PLY : PLX
-	LDA #$03 : STA $C8 ;set cursor to unlock
+	LDA.b #$03 : STA.b FileSelectPosition ;set cursor to unlock
-	LDA.b #$3C : STA $012E ; play error sound
+	LDA.b #$3C : STA.w SFX2 ; play error sound
 JML FSSelectFile_return
 ;--------------------------------------------------------------------------------
 MaybeForceFileName:
@@ -873,8 +938,8 @@ MaybeForceFileName:
                 -
                 INX : INX
                 LDA.l StaticFileName, X : STA.l ExtendedFileNameSRAM, X
-                CPX #$16 : BEQ .done
+                CPX.b #$16 : BEQ .done
-                CPX #$08 : BCS -
+                CPX.b #$08 : BCS -
                 STA.l FileNameVanillaSRAM, X
                 BRA -
         .done

firebarlayer.asm

@@ -1,8 +0,0 @@
-NewFireBarDamage:
-{
-    LDA $00EE : CMP $0F20, X : BNE .NotSameLayer
-        JSL Sprite_AttemptDamageToPlayerPlusRecoilLong
-        RTL
-    .NotSameLayer
-    RTL
-}