Reserve space for randomizer version

LTTP_RND_GeneralBugfixes.asm

@@ -74,8 +74,6 @@ function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<
 !FLAG_OW_MIXED = $04
 !FLAG_OW_CROSSED = $02
 !FLAG_OW_BONKDROP = $02
-!FLAG_OW_CUSTOM_MAP = $02
-!FLAG_OW_ADJUST_DYNAMIC_MAP_SPRITE_POSITION = $04
 
 incsrc hooks.asm
 incsrc spriteswap.asm
@@ -213,7 +211,6 @@ incsrc gk/variable_ganon_vulnerability.asm
 incsrc gk/pseudoflute.asm
 incsrc gk/fast_junk.asm
 incsrc gk/dungeon_maps.asm
-incsrc pikit.asm
 print "End of B9: ", pc
 
 warnpc $B9EE00
@@ -335,8 +332,6 @@ DungeonMapDoorConnectors:
 incbin "menu/door_connectors.3bppc"
 MapSheetD4:
 incbin "menu/map_sheet_d4.3bppc"
-DRSheet14:
-incbin "menu/dr_sheet_14.3bppc"
 
 org $8CD7DF
 incsrc data/playernamecharmap.asm

boots.asm

@@ -28,19 +28,16 @@ AddBonkTremors:
     JSL AddDashTremor : JSL Player_ApplyRumbleToSprites ; things we wrote over
 RTL
 ;--------------------------------------------------------------------------------
-ValidDashCheck:
-    PHP
-        SEP #$20
+BonkBreakableWall:
+    PHX : PHP
+        SEP #$30 ; set 8-bit accumulator and index registers
         LDA.l BootsModifier : CMP.b #$01 : BEQ +
-            LDA.l BootsEquipment : BEQ .exit
-        + LDA.w LinkDashing
-.exit
-    BEQ +
-        PLP : REP #$02
-        RTL
-    +
-    PLP : SEP #$02
-    RTL
+        LDA.l BootsEquipment : BNE + ; Check for Boots
+            PLP : PLX : LDA.w #$0000 : RTL
+        +
+    PLP : PLX
+    LDA.w LinkDashing : AND.w #$00FF ; things we wrote over
+RTL
 ;--------------------------------------------------------------------------------
 BonkRockPile:
     LDA.l BootsModifier : CMP.b #$01 : BEQ +
@@ -51,7 +48,10 @@ BonkRockPile:
 RTL
 ;--------------------------------------------------------------------------------
 GravestoneHook:
-    JSL ValidDashCheck : BEQ .done ; things we wrote over
+    LDA.l BootsModifier : CMP.b #$01 : BEQ +
+    LDA.l BootsEquipment : BEQ .done ; Check for Boots
+    +
+    LDA.w LinkDashing : BEQ .done ; things we wrote over
         JML moveGravestone
     .done
     JML GravestoneHook_continue

bossicons.asm

@@ -17,14 +17,15 @@ DoDungeonMapBossIcon:
 	ASL
 	TAX
 
-	; get sprite pointer table
-	LDA.l $89C298 : STA.b Scrap00
-	LDA.w #$0089 : STA.b Scrap02
-	TXY
 	; get sprite pointer for room
-	LDA.b [Scrap00], Y
+	LDA.l UWSpritesPointers,X
 	STA.b Scrap00                ; pointer in $00
-	LDA.w #bank(UWSpritesData) : STA.b Scrap02
+	if !FEATURE_FIX_BASEROM
+		LDA.w #$0089
+	else
+		LDA.w #$0028 ; set the bank to 28 for now
+	endif
+	STA.b Scrap02
 	LDY.w #$0001 ; to skip the "sort"
 
 	; get first byte to make sure it isn't an empty room

bugfixes.asm

@@ -238,18 +238,6 @@ FixJingleGlitch:
 .exit
 	RTL
 ;--------------------------------------------------------------------------------
-FixSwimBump:
-	LDA.b LinkIncapacitatedTimer : BEQ .normal
-	LDA.b LinkJumping : BNE .normal
-	INC.b LinkJumping
-	BRA .not_diving
-.normal
-	LDA.b LinkJumping : BNE .continue ; what we wrote over
-.not_diving
-	PLA : PLA : PEA.w $87964E ; skip ahead, not diving
-.continue
-	RTL
-;--------------------------------------------------------------------------------
 ; Fix spawning with more hearts than capacity when less than 3 heart containers
 pushpc
         org $09F4AC ; <- module_death.asm:331

decryption.asm

@@ -72,20 +72,16 @@ JML Dungeon_OpenKeyedObject_nextChest
 
 		TXA : LSR
 		JSL RetrieveValueFromEncryptedTable
-		JSL ShieldCheck
 		STA.b Scrap0C
 
 	PLA : STA.b Scrap02 : PLA : STA.b Scrap00
 
 	LDA.l ChestData, X : ASL A : BCC .smallChest
 
-	JSL ShieldCheck : BCC .couldntFindChest
-	JML Dungeon_OpenKeyedObject_bigChest ;(bank01.asm line #13783)
+JML Dungeon_OpenKeyedObject_bigChest ;(bank01.asm line #13783)
 
 .smallChest
-	JSL ShieldCheck : BCC .couldntFindChest
-	JML Dungeon_OpenKeyedObject_smallChest
-
+JML Dungeon_OpenKeyedObject_smallChest
 .couldntFindChest
-	JML Dungeon_OpenKeyedObject_couldntFindChest
+JML Dungeon_OpenKeyedObject_couldntFindChest
 ;--------------------------------------------------------------------------------

doorrando/hudadditions.asm

@@ -167,7 +167,9 @@ DrHudDungeonItemsAdditions:
 					jsr ConvertToDisplay2 : sta.w $1644, y
 				+ iny #2 : lda.w #$24f5 : sta.w $1644, y
 				phx : ldx.b Scrap00
-					LDA.l MapField : ORA.l MapCountDisplay : AND.l DungeonMask, x : BEQ .key_info_done ; must have map
+						LDA.l CompassMode : BIT.w #$0002 : BNE .skip_map_check
+					 	LDA.l MapField : AND.l DungeonMask, x : BEQ .key_info_done ; must have map
+					.skip_map_check
 						plx : sep #$30 : lda.l ChestKeys, x : sta.b Scrap02
 				lda.l GenericKeys : bne +++
 					lda.b Scrap02 : !SUB.l DungeonCollectedKeys, x : sta.b Scrap02

follower.asm

@@ -23,7 +23,7 @@ JSL SpritePrep_OldManFollower : NOP #2 : db $F0 ; BEQ
 org $9DFF18
 JSL SpriteDraw_OldManFollower
 org $9EE9BC
-JSL OldMan_WaitForCollision
+JSL Follower_CheckMessageCollision
 org $9EE9CC
 JSL OldMan_BecomeFollower : NOP #2
 
@@ -631,15 +631,6 @@ SpriteDraw_OldManFollower:
 dw 0,  0 : db $AC, $00, $00, $02
 dw 0,  8 : db $AE, $00, $00, $02
 
-OldMan_WaitForCollision:
-    PHA
-    LDA.w LinkIFrames : BEQ +
-        PLA : CLC
-        RTL
-    +
-    PLA
-    JML Follower_CheckMessageCollision
-
 OldMan_BecomeFollower:
     LDA.l FollowerTravelAllowed : CMP.b #$02 : BCC .set_follower_and_despawn
         PLA : PLA

gk/check_loot.asm

@@ -368,13 +368,7 @@ CheckEnemies:
 	ASL A
 	TAX
 
-
-	; get sprite pointer table
-	LDA.l $89C298 : STA.b $04
-	LDA.w #$0089 : STA.b $06
-	TXY
-	; get sprite pointer for room
-	LDA.b [$04], Y
+	LDA.l UWSpritesPointers, X
 	INC A ; skip the layered/unlayered indicator
 	STA.b $04
 	LDA.w #bank(UWSpritesData)

gk/data/analyze.rb

@@ -0,0 +1,39 @@
+File.open("supertile_shapes.asm", "r") do |file|
+  bytes = []
+  while line = file.gets
+    m = line.match(/dw \$(\h+), \$(\h+), \$(\h+), \$(\h+)/)
+    bytes += m.captures if m
+    break if bytes.length >= 4 * 0xE0
+  end
+
+  counts = []
+  for byte in bytes do
+    value = byte.to_i(16)
+    next if value == 0xFFFF
+    value = (value & 0x03FF) - 0x340
+    if not counts[value]
+      counts[value] = 0
+    end
+    counts[value] += 1
+  end
+
+  print("  ")
+  for col in 0...16
+    printf("  x%X", col)
+  end
+  puts
+
+  for row in 0...0xC
+    printf("%Xx", row + 4)
+    for col in 0...16
+      printf("%4d", counts[row * 16 + col] || 0)
+    end
+    puts
+  end
+
+  printf("Unused:")
+  for i in 0...0x80
+    printf(" %2X", i) unless counts[i]
+  end
+  puts
+end

gk/doors_dungeon_map.asm

@@ -1453,8 +1453,8 @@ MoveDoorsMapCursor:
 	BRA .done
 
 .no_move
-;	LDA.b #$3C
-;	STA.w $012E
+	LDA.b #$3C
+	STA.w $012E
 
 .done
 	PLP

gk/dungeon_maps.asm

@@ -24,8 +24,6 @@ endmacro
 %WriteGFXSheetPointer($62, DungeonMapIcons5)
 %WriteGFXSheetPointer($63, DungeonMapIcons6)
 
-%WriteGFXSheetPointer($14, DRSheet14)
-
 pullpc
 
 incsrc doors_dungeon_map.asm

gk_meta.asm

@@ -12,8 +12,7 @@ db $01
 GKRomVersion:
 ; $01 = Dungeon Maps
 ;  .., $01 = Dark rooms don't show on map from visition
-;  .., $02 = OW Fog and Grid modes
-db $01, $02, $00
+db $01, $01, $00
 ;--------------------------------------------------------------------------------
 
 ;================================================================================

hooks.asm

@@ -120,7 +120,7 @@ JSL AddBonkTremors : NOP #4
 ; Bonk Breakable Walls
 ;--------------------------------------------------------------------------------
 org $81CF8E ; CF8E <- Bank01.asm : 11641 (LDA $0372 : AND.w #$00FF)
-JSL ValidDashCheck : NOP #2
+JSL BonkBreakableWall : NOP #2
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
@@ -139,11 +139,6 @@ GravestoneHook_continue:
 org $87C106
 moveGravestone:
 ;--------------------------------------------------------------------------------
-org $899A30
-JSL ValidDashCheck : NOP #2
-org $899A3A
-JSL ValidDashCheck : NOP #2
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Jump Down Ledge
@@ -2107,11 +2102,6 @@ JSL FlipperScrollWarp
 ;--------------------------------------------------------------------------------
 ;org $878F51 ; <- 38F51 - Bank07.asm:2444 (JSR $AE54 ; $3AE54 IN ROM)
 ;JSL OnEnterWater : NOP
-;--------------------------------------------------------------------------------
-; Fixes getting bumped while swimming, unable to screen transition
-org $879632
-LinkState_Swimming:
-JSL FixSwimBump
 ;================================================================================
 ; Floodgate Softlock Fix
 ;--------------------------------------------------------------------------------
@@ -2828,33 +2818,3 @@ org $8DFB63 ; bank_0D.asm@18092 (LDA.l $7EF33F, X : AND.w #$00FF)
 JSL CheckFluteInHUD
 NOP #3
 ;--------------------------------------------------------------------------------
-
-
-;================================================================================
-; Pikit Nonsense
-;--------------------------------------------------------------------------------
-org $81EC39
-JSL SmallChest_ShieldCheck
-BCC Dungeon_OpenKeyedObject_couldntFindChest+1
-
-org $81EC17
-JSL BigChest_ShieldCheck
-BCC Dungeon_OpenKeyedObject_couldntFindChest
-NOP #2
-
-org $9E8D6F
-JML PikitSteal
-
-org $9E8CF2
-JSL PikitDigest
-NOP #2
-
-org $879A52
-JSL LinkSnoring
-
-org $879AAD
-JSL LinkAwaken
-
-org $879A31
-JSL TuckLink
-NOP #2

initsramtable.asm

@@ -114,15 +114,14 @@ StartingGenericKeys: skip 1             ; PC 0x18338B
 InitInventoryTracking: skip 2           ; PC 0x18338C \ Need to set bits here for silver arrows,
 InitBowTracking: skip 2                 ; PC 0x18338E / boomerangs, powder/mushroom, etc 
 InitItemLimitCounts: skip 16            ; PC 0x183390
-skip 32                                 ;
-InitPikitItem: dw $0004                 ;
+skip 34                                 ;
 InitFluteBitfield: db $00               ;
 InitSpecialWeaponLevel: db $00          ;
 InitItemOnB: db $00                     ;
-InitProgressIndicator: db $00           ; PC 0x1833C5 - Set to $80 for instant post-aga with standard
-InitProgressFlags: db $04               ; PC 0x1833C6 - Set to $00 for standard
+InitProgressIndicator: db $02           ; PC 0x1833C5 - Set to $80 for instant post-aga with standard
+InitProgressFlags: db $14               ; PC 0x1833C6 - Set to $00 for standard
 InitMapIcons: skip 1                    ; PC 0x1833C7
-InitStartingEntrance: db $00            ; PC 0x1833C8 - Set to $00 for standard
+InitStartingEntrance: db $01            ; PC 0x1833C8 - Set to $00 for standard
 InitNpcFlagsVanilla: skip 1             ; PC 0x1833C9
 InitCurrentWorld: skip 1                ; PC 0x1833CA
 skip 1                                  ; PC 0x1833CB

itemdatatables.asm

@@ -423,33 +423,33 @@ endmacro
 %SpriteProps($04, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 04 - Fighter shield
 %SpriteProps($05, 2, 2, $05, $80, PalettesCustom_red_shield)            ; 05 - Fire shield
 %SpriteProps($06, 2, 2, $05, $80, PalettesCustom_mirror_shield)         ; 06 - Mirror shield
-%SpriteProps($07, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 07 - Fire rod
-%SpriteProps($08, 0, 0, $02, $80, PalettesCustom_fighter_shield)        ; 08 - Ice rod
-%SpriteProps($09, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 09 - Hammer
-%SpriteProps($0A, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 0A - Hookshot
-%SpriteProps($0B, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 0B - Bow
-%SpriteProps($0C, 0, 0, $02, $80, PalettesCustom_fighter_shield)        ; 0C - Blue Boomerang
-%SpriteProps($0D, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 0D - Powder
+%SpriteProps($07, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 07 - Fire rod
+%SpriteProps($08, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 08 - Ice rod
+%SpriteProps($09, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 09 - Hammer
+%SpriteProps($0A, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 0A - Hookshot
+%SpriteProps($0B, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 0B - Bow
+%SpriteProps($0C, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 0C - Blue Boomerang
+%SpriteProps($0D, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 0D - Powder
 %SpriteProps($0E, 2, 0, $02, $03, PalettesVanilla_blue_ice+$0E)         ; 0E - Bottle refill (bee)
-%SpriteProps($0F, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 0F - Bombos
-%SpriteProps($10, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 10 - Ether
-%SpriteProps($11, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 11 - Quake
-%SpriteProps($12, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 12 - Lamp
-%SpriteProps($13, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 13 - Shovel
-%SpriteProps($14, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 14 - Flute
-%SpriteProps($15, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 15 - Somaria
-%SpriteProps($16, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 16 - Bottle
+%SpriteProps($0F, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 0F - Bombos
+%SpriteProps($10, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 10 - Ether
+%SpriteProps($11, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 11 - Quake
+%SpriteProps($12, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 12 - Lamp
+%SpriteProps($13, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 13 - Shovel
+%SpriteProps($14, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 14 - Flute
+%SpriteProps($15, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 15 - Somaria
+%SpriteProps($16, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 16 - Bottle
 %SpriteProps($17, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 17 - Heart piece
-%SpriteProps($18, 0, 0, $02, $80, PalettesCustom_fighter_shield)        ; 18 - Byrna
-%SpriteProps($19, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 19 - Cape
-%SpriteProps($1A, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 1A - Mirror
-%SpriteProps($1B, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 1B - Glove
-%SpriteProps($1C, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 1C - Mitts
-%SpriteProps($1D, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 1D - Book
-%SpriteProps($1E, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 1E - Flippers
-%SpriteProps($1F, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 1F - Pearl
+%SpriteProps($18, 0, 0, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 18 - Byrna
+%SpriteProps($19, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 19 - Cape
+%SpriteProps($1A, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 1A - Mirror
+%SpriteProps($1B, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 1B - Glove
+%SpriteProps($1C, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 1C - Mitts
+%SpriteProps($1D, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 1D - Book
+%SpriteProps($1E, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 1E - Flippers
+%SpriteProps($1F, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 1F - Pearl
 %SpriteProps($20, 2, 2, $86, $86, PalettesCustom_crystal)               ; 20 - Crystal
-%SpriteProps($21, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 21 - Net
+%SpriteProps($21, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 21 - Net
 %SpriteProps($22, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 22 - Blue mail
 %SpriteProps($23, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 23 - Red mail
 %SpriteProps($24, 0, 0, $02, $04, PalettesVanilla_blue_ice+$0E)         ; 24 - Small key
@@ -457,11 +457,11 @@ endmacro
 %SpriteProps($26, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 26 - Heart container from 4/4
 %SpriteProps($27, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 27 - Bomb
 %SpriteProps($28, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 28 - 3 bombs
-%SpriteProps($29, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 29 - Mushroom
-%SpriteProps($2A, 0, 0, $01, $80, PalettesCustom_fighter_shield)        ; 2A - Red boomerang
-%SpriteProps($2B, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 2B - Full bottle (red)
-%SpriteProps($2C, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 2C - Full bottle (green)
-%SpriteProps($2D, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 2D - Full bottle (blue)
+%SpriteProps($29, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 29 - Mushroom
+%SpriteProps($2A, 0, 0, $01, $01, PalettesVanilla_red_melon+$0E)        ; 2A - Red boomerang
+%SpriteProps($2B, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 2B - Full bottle (red)
+%SpriteProps($2C, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 2C - Full bottle (green)
+%SpriteProps($2D, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 2D - Full bottle (blue)
 %SpriteProps($2E, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 2E - Potion refill (red)
 %SpriteProps($2F, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 2F - Potion refill (green)
 %SpriteProps($30, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 30 - Potion refill (blue)
@@ -474,10 +474,10 @@ endmacro
 %SpriteProps($37, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 37 - Green pendant
 %SpriteProps($38, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 38 - Red pendant
 %SpriteProps($39, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 39 - Blue pendant
-%SpriteProps($3A, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 3A - Bow And Arrows
-%SpriteProps($3B, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 3B - Silver Bow
-%SpriteProps($3C, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 3C - Full bottle (bee)
-%SpriteProps($3D, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 3D - Full bottle (fairy)
+%SpriteProps($3A, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 3A - Bow And Arrows
+%SpriteProps($3B, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 3B - Silver Bow
+%SpriteProps($3C, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 3C - Full bottle (bee)
+%SpriteProps($3D, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 3D - Full bottle (fairy)
 %SpriteProps($3E, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 3E - Boss heart
 %SpriteProps($3F, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 3F - Sanc heart
 %SpriteProps($40, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 40 - 100 rupees
@@ -488,23 +488,23 @@ endmacro
 %SpriteProps($45, 0, 0, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 45 - Small magic
 %SpriteProps($46, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 46 - 300 rupees
 %SpriteProps($47, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 47 - 20 rupees green
-%SpriteProps($48, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 48 - Full bottle (good bee)
+%SpriteProps($48, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 48 - Full bottle (good bee)
 %SpriteProps($49, 0, 2, $05, $02, PalettesCustom_fighter_shield)        ; 49 - Tossed fighter sword
-%SpriteProps($4A, 2, 0, $02, $80, PalettesCustom_fighter_shield)        ; 4A - Active Flute
-%SpriteProps($4B, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 4B - Boots
+%SpriteProps($4A, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 4A - Active Flute
+%SpriteProps($4B, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 4B - Boots
 %SpriteProps($4C, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 4C - Bomb capacity (50)
 %SpriteProps($4D, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 4D - Arrow capacity (70)
-%SpriteProps($4E, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 4E - 1/2 magic
-%SpriteProps($4F, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 4F - 1/4 magic
-%SpriteProps($50, 0, 0, $05, $80, PalettesCustom_fighter_shield)        ; 50 - Safe master sword
+%SpriteProps($4E, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 4E - 1/2 magic
+%SpriteProps($4F, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 4F - 1/4 magic
+%SpriteProps($50, 0, 2, $05, $02, PalettesCustom_master_sword)          ; 50 - Safe master sword
 %SpriteProps($51, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 51 - Bomb capacity (+5)
-%SpriteProps($52, 2, 0, $04, $80, PalettesCustom_fighter_shield)        ; 52 - Bomb capacity (+10)
+%SpriteProps($52, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 52 - Bomb capacity (+10)
 %SpriteProps($53, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 53 - Arrow capacity (+5)
 %SpriteProps($54, 2, 2, $04, $04, PalettesVanilla_green_blue_guard+$0E) ; 54 - Arrow capacity (+10)
 %SpriteProps($55, 2, 2, $04, $04, $0000)                                ; 55 - Programmable item 1
 %SpriteProps($56, 2, 2, $04, $04, $0000)                                ; 56 - Programmable item 2
 %SpriteProps($57, 2, 2, $04, $04, $0000)                                ; 57 - Programmable item 3
-%SpriteProps($58, 2, 0, $01, $80, PalettesCustom_fighter_shield)        ; 58 - Upgrade-only Silver Arrows
+%SpriteProps($58, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 58 - Upgrade-only Silver Arrows
 %SpriteProps($59, 0, 0, $03, $03, PalettesCustom_off_black)             ; 59 - Rupoor
 %SpriteProps($5A, 2, 2, $01, $01, $0000)                                ; 5A - Nothing
 %SpriteProps($5B, 2, 2, $01, $01, PalettesVanilla_red_melon+$0E)        ; 5B - Red clock
@@ -1227,33 +1227,33 @@ StandingItemGraphicsOffsets:
 	dw BigDecompressionBuffer+$09E0        ; 04 - Fighter Shield
 	dw BigDecompressionBuffer+$1940        ; 05 - Fire Shield
 	dw BigDecompressionBuffer+$0C80        ; 06 - Mirror Shield
-	dw BigDecompressionBuffer+$09E0        ; 07 - Fire Rod
-	dw BigDecompressionBuffer+$09E0        ; 08 - Ice Rod
-	dw BigDecompressionBuffer+$09E0        ; 09 - Hammer
-	dw BigDecompressionBuffer+$09E0        ; 0A - Hookshot
-	dw BigDecompressionBuffer+$09E0        ; 0B - Bow
-	dw BigDecompressionBuffer+$09E0        ; 0C - Boomerang
-	dw BigDecompressionBuffer+$09E0        ; 0D - Powder
+	dw BigDecompressionBuffer+$1C80        ; 07 - Fire Rod
+	dw BigDecompressionBuffer+$1C80        ; 08 - Ice Rod
+	dw BigDecompressionBuffer+$1CA0        ; 09 - Hammer
+	dw BigDecompressionBuffer+$1C60        ; 0A - Hookshot
+	dw BigDecompressionBuffer+$1C00        ; 0B - Bow
+	dw BigDecompressionBuffer+$1DE0        ; 0C - Boomerang
+	dw BigDecompressionBuffer+$1CC0        ; 0D - Powder
 	dw 0                                   ; 0E - Bottle Refill (bee)
-	dw BigDecompressionBuffer+$09E0        ; 0F - Bombos
-	dw BigDecompressionBuffer+$09E0        ; 10 - Ether
-	dw BigDecompressionBuffer+$09E0        ; 11 - Quake
-	dw BigDecompressionBuffer+$09E0        ; 12 - Lamp
-	dw BigDecompressionBuffer+$09E0        ; 13 - Shovel
-	dw BigDecompressionBuffer+$09E0        ; 14 - Flute
-	dw BigDecompressionBuffer+$09E0        ; 15 - Somaria
-	dw BigDecompressionBuffer+$09E0        ; 16 - Bottle
+	dw BigDecompressionBuffer+$1440        ; 0F - Bombos
+	dw BigDecompressionBuffer+$1400        ; 10 - Ether
+	dw BigDecompressionBuffer+$1480        ; 11 - Quake
+	dw BigDecompressionBuffer+$10C0        ; 12 - Lamp
+	dw BigDecompressionBuffer+$11E0        ; 13 - Shovel
+	dw BigDecompressionBuffer+$0C40        ; 14 - Flute
+	dw BigDecompressionBuffer+$1C40        ; 15 - Somaria
+	dw BigDecompressionBuffer+$14C0        ; 16 - Bottle
 	dw BigDecompressionBuffer+$0C00        ; 17 - Heartpiece
-	dw BigDecompressionBuffer+$09E0        ; 18 - Byrna
-	dw BigDecompressionBuffer+$09E0        ; 19 - Cape
-	dw BigDecompressionBuffer+$09E0        ; 1A - Mirror
-	dw BigDecompressionBuffer+$09E0        ; 1B - Glove
-	dw BigDecompressionBuffer+$09E0        ; 1C - Mitts
-	dw BigDecompressionBuffer+$09E0        ; 1D - Book
-	dw BigDecompressionBuffer+$09E0        ; 1E - Flippers
-	dw BigDecompressionBuffer+$09E0        ; 1F - Pearl
+	dw BigDecompressionBuffer+$1C40        ; 18 - Byrna
+	dw BigDecompressionBuffer+$1100        ; 19 - Cape
+	dw BigDecompressionBuffer+$1040        ; 1A - Mirror
+	dw BigDecompressionBuffer+$1D40        ; 1B - Glove
+	dw BigDecompressionBuffer+$1D40        ; 1C - Mitts
+	dw BigDecompressionBuffer+$1D80        ; 1D - Book
+	dw BigDecompressionBuffer+$1000        ; 1E - Flippers
+	dw BigDecompressionBuffer+$1180        ; 1F - Pearl
 	dw BigDecompressionBuffer+$08A0        ; 20 - Crystal
-	dw BigDecompressionBuffer+$09E0        ; 21 - Net
+	dw BigDecompressionBuffer+$0860        ; 21 - Net
 	dw BigDecompressionBuffer+$1900        ; 22 - Blue Mail
 	dw BigDecompressionBuffer+$1900        ; 23 - Red Mail
 	dw BigDecompressionBuffer+$1DC0        ; 24 - Small Key
@@ -1261,11 +1261,11 @@ StandingItemGraphicsOffsets:
 	dw BigDecompressionBuffer+$18C0        ; 26 - Heart Container from 4/4
 	dw BigDecompressionBuffer+$1080        ; 27 - Bomb
 	dw BigDecompressionBuffer+$1840        ; 28 - 3 bombs
-	dw BigDecompressionBuffer+$09E0        ; 29 - Mushroom
-	dw BigDecompressionBuffer+$09E0        ; 2A - Red boomerang
-	dw BigDecompressionBuffer+$09E0        ; 2B - Full bottle (red)
-	dw BigDecompressionBuffer+$09E0        ; 2C - Full bottle (green)
-	dw BigDecompressionBuffer+$09E0        ; 2D - Full bottle (blue)
+	dw BigDecompressionBuffer+$1540        ; 29 - Mushroom
+	dw BigDecompressionBuffer+$1DE0        ; 2A - Red boomerang
+	dw BigDecompressionBuffer+$1500        ; 2B - Full bottle (red)
+	dw BigDecompressionBuffer+$1500        ; 2C - Full bottle (green)
+	dw BigDecompressionBuffer+$1500        ; 2D - Full bottle (blue)
 	dw $0920                               ; 2E - Potion refill (red)
 	dw $08A0                               ; 2F - Potion refill (green)
 	dw $08E0                               ; 30 - Potion refill (blue)
@@ -1278,10 +1278,10 @@ StandingItemGraphicsOffsets:
 	dw $0820                               ; 37 - Green pendant
 	dw BigDecompressionBuffer+$0080        ; 38 - Blue pendant
 	dw BigDecompressionBuffer+$0080        ; 39 - Red pendant
-	dw BigDecompressionBuffer+$09E0        ; 3A - Tossed bow
-	dw BigDecompressionBuffer+$09E0        ; 3B - Silvers
-	dw BigDecompressionBuffer+$09E0        ; 3C - Full bottle (bee)
-	dw BigDecompressionBuffer+$09E0        ; 3D - Full bottle (fairy)
+	dw BigDecompressionBuffer+$0920        ; 3A - Tossed bow
+	dw BigDecompressionBuffer+$08E0        ; 3B - Silvers
+	dw BigDecompressionBuffer+$09A0        ; 3C - Full bottle (bee)
+	dw BigDecompressionBuffer+$0960        ; 3D - Full bottle (fairy)
 	dw BigDecompressionBuffer+$18C0        ; 3E - Boss heart
 	dw BigDecompressionBuffer+$18C0        ; 3F - Sanc heart
 	dw BigDecompressionBuffer+$0D20        ; 40 - 100 rupees
@@ -1292,25 +1292,25 @@ StandingItemGraphicsOffsets:
 	dw BigDecompressionBuffer+$0CE0        ; 45 - Small magic
 	dw BigDecompressionBuffer+$0DA0        ; 46 - 300 rupees
 	dw BigDecompressionBuffer+$0000        ; 47 - 20 rupees green
-	dw BigDecompressionBuffer+$09E0        ; 48 - Full bottle (good bee)
+	dw BigDecompressionBuffer+$09A0        ; 48 - Full bottle (good bee)
 	dw $00A0                               ; 49 - Tossed fighter sword
-	dw BigDecompressionBuffer+$09E0        ; 4A - Active Flute
-	dw BigDecompressionBuffer+$09E0        ; 4B - Boots
+	dw BigDecompressionBuffer+$0C40        ; 4A - Active Flute
+	dw BigDecompressionBuffer+$0040        ; 4B - Boots
 
 	; Rando items
 	dw $04A0                               ; 4C - Bomb capacity (50)
 	dw $05A0                               ; 4D - Arrow capacity (70)
-	dw BigDecompressionBuffer+$09E0        ; 4E - 1/2 magic
-	dw BigDecompressionBuffer+$09E0        ; 4F - 1/4 magic
-	dw BigDecompressionBuffer+$09E0        ; 50 - Safe master sword
+	dw $01A0                               ; 4E - 1/2 magic
+	dw $01E0                               ; 4F - 1/4 magic
+	dw $00E0                               ; 50 - Safe master sword
 	dw $0420                               ; 51 - Bomb capacity (+5)
-	dw BigDecompressionBuffer+$09E0        ; 52 - Bomb capacity (+10)
+	dw $0460                               ; 52 - Bomb capacity (+10)
 	dw $0520                               ; 53 - Arrow capacity (+5)
 	dw $0560                               ; 54 - Arrow capacity (+10)
 	dw $0                                  ; 55 - Programmable item 1
 	dw $0                                  ; 56 - Programmable item 2
 	dw $0                                  ; 57 - Programmable item 3
-	dw BigDecompressionBuffer+$09E0        ; 58 - Upgrade-only silver arrows
+	dw $05E0                               ; 58 - Upgrade-only silver arrows
 	dw $0                                  ; 59 - Rupoor
 	dw $0020                               ; 5A - Nothing
 	dw $0DE0                               ; 5B - Red clock

keydrop/standing_items.asm

@@ -89,8 +89,7 @@ org $80FDEE
 InitializeMirrorHDMA:
 
 org $89D62E
-;commenting out since this address can move
-;UWSpritesPointers: ; 0x250 bytes for 0x128 rooms' 16-bit pointers
+UWSpritesPointers: ; 0x250 bytes for 0x128 rooms' 16-bit pointers
 
 if !FEATURE_FIX_BASEROM
 	org $81DB67

menu/overworldmap.asm

@@ -40,7 +40,7 @@ dw $0000
 
 warnpc $8ABE2E
 org $8ABE2E
-; located posx/posy, dislocated posx/posy, prize posx/posy
+; located posx/posy, dislocated posx/posy, prize pox/posy
 ; located = proper location of icon (default: if you have map)
 ; dislocated = location of icon if proper location is hidden from player
 ; highest bit on first posx indicates which world it should show in
@@ -49,27 +49,27 @@ WorldMapIcon_pos:
 .hc
 dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00
 .ep
-dw $0F40, $0660, $FF00, $FF00, $0F40, $0660
+dw $0F31, $0620, $FF00, $FF00, $0F31, $0620
 .dp
-dw $0140, $0D00, $FF00, $FF00, $0140, $0D00
+dw $0108, $0D70, $FF00, $FF00, $0108, $0D70
 .at
 dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00
 .sp
-dw $8778, $0F50, $FF00, $FF00, $8778, $0F50
+dw $8759, $0ED0, $FF00, $FF00, $8759, $0ED0
 .pod
-dw $8F40, $0660, $FF00, $FF00, $8F40, $0660
+dw $8F40, $0620, $FF00, $FF00, $8F40, $0620
 .mm
-dw $8148, $0D00, $FF00, $FF00, $8148, $0D00
+dw $8100, $0CA0, $FF00, $FF00, $8100, $0CA0
 .sw
-dw $80B0, $00C0, $FF00, $FF00, $80B0, $00C0
+dw $8082, $00B0, $FF00, $FF00, $8082, $00B0
 .ip
-dw $8CA0, $0E00, $FF00, $FF00, $8CA0, $0E00
+dw $8CA0, $0DA0, $FF00, $FF00, $8CA0, $0DA0
 .toh
-dw $0900, $0100, $FF00, $FF00, $0900, $0100
+dw $08D0, $0080, $FF00, $FF00, $08D0, $0080
 .tt
-dw $81F8, $0800, $FF00, $FF00, $81F8, $0800
+dw $81D0, $0780, $FF00, $FF00, $81D0, $0780
 .tr
-dw $8F20, $0100, $FF00, $FF00, $8F20, $0100
+dw $8F11, $0103, $FF00, $FF00, $8F11, $0103
 .gt
 dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00
 
@@ -262,8 +262,8 @@ DrawPrizesOverride:
 
 			; determine if draw and/or continue
 			JSR WorldMap_ValidateCoords : BCS .advance
-			JSR WorldMap_DrawTile
 			JSR WorldMap_DrawTileOverlay
+			JSR WorldMap_DrawTile
 		.advance
 		LDY.b Scrap05 : DEY #2 : BMI + : JMP .next_dungeon : +
 	PLB
@@ -321,35 +321,24 @@ RTS
 
 WorldMap_DrawTile:
 	LDA.b Scrap00 : PHA
-	LDA.l $7EC10A : BIT.w #$4000 : SEP #$20 : BNE .raw_coords ; use raw OAM coordinates
-	JSR WorldMap_CalculateOAMCoordinates
-	BCS .apply_offsets
-	REP #$20
-	BRA .exit
-.raw_coords
-	STA.b Scrap0E
-	LDA.l $7EC108 : STA.b Scrap0F
-.apply_offsets
-	LDX.b Scrap0A : BNE .aligned ; prize number/overlay: no offset
-	LDX.b Scrap0B : BEQ +
-		; 16x16 sprite: -8 pixels
-		LDA.b Scrap0E : SEC : SBC.b #$08 : STA.b Scrap0E
-		LDA.b Scrap0F : SBC.b #$08 : STA.b Scrap0F
-		BRA .aligned
-	+
-	; 8x8 sprite: -4 pixels
-	LDA.b Scrap0E : SEC : SBC.b #$04 : STA.b Scrap0E
-	LDA.b Scrap0F : SBC.b #$04 : STA.b Scrap0F
-.aligned
+	SEP #$20
 	LDX.b Scrap0B : TXA : STA.b (OAMPtr+2)
 	INC.b OAMPtr+2
+	JSR WorldMap_CalculateOAMCoordinates
+	LDX.b Scrap0A : BEQ +
+		LDA.b Scrap0E : CLC : ADC.b #$04 : STA.b Scrap0E
+		LDA.b Scrap0F : CLC : ADC.b #$04 : STA.b Scrap0F
+	+
+	LDX.b Scrap0B : BEQ +
+		LDA.b Scrap0E : SEC : SBC.b #$04 : STA.b Scrap0E
+		LDA.b Scrap0F : SEC : SBC.b #$04 : STA.b Scrap0F
+    +
 	REP #$20
+	PLA : STA.b Scrap00
 	LDA.b Scrap0E : STA.b (OAMPtr)
 	INC.b OAMPtr : INC.b OAMPtr
 	LDA.b Scrap0C : STA.b (OAMPtr)
 	INC.b OAMPtr : INC.b OAMPtr
-.exit
-	PLA : STA.b Scrap00
 RTS
 
 ; Y - dungeon index
@@ -434,117 +423,6 @@ WorldMap_CheckPrizeCollected:
 RTS
 
 warnpc $8AC3B1
-
-org $8AC3B6
-; ---------------------------------------------------------------------------------------------------
-; Y coordinate calculation: Quadratic approximation
-; Formula: Y_oam = 0x16 + (Y * 118 >> 12) + ((Y>>4)^2 * 49 >> 8)
-; Accurate to within ±1.5 pixels across entire range
-; ---------------------------------------------------------------------------------------------------
-	REP #$20
-	LDA.l $7EC108 : ASL #4 ; world Y coordinate
-	PHA
-		; calculate linear term: (Y * 118) >> 12
-		SEP #$20
-		LDA.b #$76
-		JSR WorldMap_MultiplyAxB ; (Y>>4) * 118
-		REP #$20
-		STA.b Scrap00 ; linear term stored at high byte (Scrap01)
-
-		; calculate quadratic term: ((Y>>4)^2 * 49) >> 8
-		LDA.b 1,S
-		SEP #$20
-		XBA : TAX : XBA : TXA
-		JSR WorldMap_MultiplyAxB ; (Y>>4) ^ 2
-		LDA.b #$31
-		JSR WorldMap_MultiplyAxB ; multiply by 49
-		XBA ; quadratic term
-
-		; combine: 0x16 + linear_term + quadratic_term
-		CLC : ADC.b Scrap01 ; add linear term
-		ADC.b #$16 ; add fixed offset
-		STA.b Scrap0F
-		REP #$20
-	PLA ; world Y coordinate
-
-; ---------------------------------------------------------------------------------------------------
-; Calculate half_width for perspective: 91 + (Y_shifted * 28 / 256)
-; The world map appears wider at the bottom than at the top, simulating perspective
-; Top (Y=0): X range 0x26-0xDC (half-width: 91), Bottom (Y=FFF): X range 0x08-0xF6 (half-width: 119)
-; ---------------------------------------------------------------------------------------------------
-	SEP #$20
-	LDA.b #$1C ; width increase factor
-	JSR WorldMap_MultiplyAxB
-	XBA : CLC : ADC.b #$5B ; add fixed half-width
-	STA.b Scrap00
-
-; ---------------------------------------------------------------------------------------------------
-; Calculate X offset: X_offset = (X_from_center * half_width * 2) / 256
-; where X_from_center = (world_X >> 4) - 128
-; The center X is at 129 (0x81)
-; ---------------------------------------------------------------------------------------------------
-	REP #$20
-	LDA.l $7EC10A : LSR #4 ; world X coordinate
-	SEP #$20
-	SEC : SBC.b #$80 ; subtract 128 (center point)
-	PHP ; preserve carry
-		BPL + : EOR.b #$FF : INC : + ; absolute value
-		PHA
-			LDA.b Scrap00 : ASL : XBA ; half-width x 2
-		PLA
-		JSR WorldMap_MultiplyAxB
-		XBA
-	PLP : BCS +
-		STA.b Scrap00
-		LDA.b #$81 : SEC : SBC.b Scrap00 ; center X position - offset
-		BRA .store_and_exit
-	+ CLC : ADC.b #$81 ; center X position + offset
-
-.store_and_exit
-	STA.b Scrap0E
-	SEP #$30
-	JMP WorldMap_CalculateOAMCoordinates_exit_successfully
-
-warnpc $8AC433
-
-; most of this function is copied from the original, but rearranged
-org $8AB7F3
-FluteMenu_HandleSprites:
-	LDA.l $7EC108 : PHA
-	LDA.l $7EC109 : PHA
-	LDA.l $7EC10A : PHA
-	LDA.l $7EC10B : PHA
-	JSL FluteMenu_MoveLinkSprite ; override vanilla (LDA.b $1A : AND.b #$10)
-	BEQ .continue
-	JSR WorldMap_CalculateOAMCoordinates : BCC .continue
-		LDA.b Scrap0E : SEC : SBC.b #$04 : STA.b Scrap0E
-		LDA.b Scrap0F : SEC : SBC.b #$04 : STA.b Scrap0F
-		LDA.b #$00 : STA.b Scrap0D
-		LDA.b #$3E : STA.b Scrap0C
-		JSL OWMapFluteCancelIcon ; override vanilla (LDA.b #$02 : STA.b Scrap0B)
-		LDX.b #$10 : JSR WorldMap_HandleSpriteBlink
-.continue
-warnpc $8AB831
-
-; most of this function is copied from the original, but rearranged
-org $8ABF78
-WorldMap_HandleSprites:
-	LDA.l $7EC108 : PHA
-	LDA.l $7EC109 : PHA
-	LDA.l $7EC10A : PHA
-	LDA.l $7EC10B : PHA
-	JSL WorldMap_SkipHandleSprites ; override vanilla (LDA.b $1A : AND.b #$10)
-	BEQ .continue
-	JSR WorldMap_CalculateOAMCoordinates : BCC .continue
-		LDA.b Scrap0E : SEC : SBC.b #$04 : STA.b Scrap0E
-		LDA.b Scrap0F : SEC : SBC.b #$04 : STA.b Scrap0F
-		LDA.b #$00 : STA.b Scrap0D
-		LDA.b #$3E : STA.b Scrap0C
-		LDA.b #$02 : STA.b Scrap0B
-		LDX.b #$00 : JSR WorldMap_HandleSpriteBlink
-.continue
-warnpc $8ABFB6
-
 pullpc
 
 WorldMap_LoadChrHalfSlot:

newitems.asm

@@ -1159,12 +1159,12 @@ JML StatsFinalPrep
 ;--------------------------------------------------------------------------------
 ChestPrep:
 	LDA.b #$01 : STA.w ItemReceiptMethod
-	JSL IncrementChestCounter
+        JSL IncrementChestCounter
 	LDA.l ServerRequestMode : BEQ +
 		JSL ChestItemServiceRequest
 		RTL
 	+
-	LDY.b Scrap0C ; get item value
+    LDY.b Scrap0C ; get item value
 	SEC
 RTL
 
@@ -1190,7 +1190,7 @@ MaybeFlagCompassTotalPickup:
 RTL
 
 MaybeFlagMapTotalPickup:
-        LDA.l MapHUDMode : AND.b #$0F : BEQ .done
+;        LDA.l MapHUDMode : AND.b #$0F : BEQ .done
         LDA.w DungeonID : BMI .done
                 LDA.w ItemReceiptID : CMP.b #$33 : BEQ .set_flag
                         REP #$20
@@ -1212,7 +1212,7 @@ MaybeFlagDungeonTotalsEntrance:
                 LDA.l CompassMode : AND.w #$000F : BEQ .maps ; Skip if we're not showing compass counts
                         JSR FlagCompassCount
                 .maps
-                LDA.l MapHUDMode : AND.w #$000F : BEQ .done
+                LDA.l MapHUDMode : AND.w #$000F
                         LDX.w DungeonID
                         JSR FlagMapCount
         .done

npcitems.asm

@@ -98,19 +98,9 @@ ItemSet_MagicBat:
 RTL
 
 ItemSet_OldMan:
-	PHA
-	TYA : STA.b $0C
-	JSL ShieldCheck
-	BCC .skip
-	LDA.b $0C : TAY
-
-	LDA.l OldManItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
-	PLA
+	PHA : LDA.l OldManItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	PHA
-	LDA.l NpcFlags : ORA.b #$01 : STA.l NpcFlags
-.skip
-	PLA
+	PHA : LDA.l NpcFlags : ORA.b #$01 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_ZoraKing:
@@ -118,51 +108,21 @@ ItemSet_ZoraKing:
 RTL
 
 ItemSet_SickKid:
-	PHA
-	TYA : STA.b $0C
-	JSL ShieldCheck
-	BCC .skip
-	LDA.b $0C : TAY
-
-	LDA.l SickKidItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
-	PLA
+	PHA : LDA.l SickKidItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	PHA
-	LDA.l NpcFlags : ORA.b #$04 : STA.l NpcFlags
-.skip
-	PLA
+	PHA : LDA.l NpcFlags : ORA.b #$04 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_TreeKid:
-	PHA
-	TYA : STA.b $0C
-	JSL ShieldCheck
-	BCC .skip
-	LDA.b $0C : TAY
-
-	LDA.l TreeKidItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
-	PLA
+	PHA : LDA.l TreeKidItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	PHA
-	LDA.l NpcFlags : ORA.b #$08 : STA.l NpcFlags
-.skip
-	PLA
+	PHA : LDA.l NpcFlags : ORA.b #$08 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_Sahasrala:
-	PHA
-	TYA : STA.b $0C
-	JSL ShieldCheck
-	BCC .skip
-	LDA.b $0C : TAY
-
-	LDA.l SahasralaItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
-	PLA
+	PHA : LDA.l SahasralaItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	PHA
-	LDA.l NpcFlags : ORA.b #$10 : STA.l NpcFlags
-.skip
-	PLA
+	PHA : LDA.l NpcFlags : ORA.b #$10 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_Catfish:
@@ -170,19 +130,9 @@ ItemSet_Catfish:
 RTL
 
 ItemSet_Library:
-	PHA
-	TYA : STA.b $0C
-	JSL ShieldCheck
-	BCC .skip
-	LDA.b $0C : TAY
-
-	LDA.l LibraryItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
-	PLA
+	PHA : LDA.l LibraryItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID : PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	PHA
-	LDA.l NpcFlags : ORA.b #$80 : STA.l NpcFlags
-.skip
-	PLA
+	PHA : LDA.l NpcFlags : ORA.b #$80 : STA.l NpcFlags : PLA
 RTL
 
 ItemSet_Mushroom:
@@ -273,30 +223,16 @@ MarkThrownItem:
 	LDA.b OverworldIndex : CMP.b #$81 : BNE .catfish
 
 	.zora
-	TYA : STA.b $0C
-	JSL ShieldCheck
-	BCC .skip
-	LDA.b $0C : TAY
-
-	JSL ItemSet_ZoraKing
+    JSL ItemSet_ZoraKing
 	LDA.l ZoraItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 	BRA .done
 
 	.catfish
-	TYA : STA.b $0C
-	JSL ShieldCheck
-	BCC .skip
-	LDA.b $0C : TAY
-	JSL ItemSet_Catfish
-
+    JSL ItemSet_Catfish
 	LDA.l CatfishItem_Player : STA.l !MULTIWORLD_ITEM_PLAYER_ID
 
 	.done
 	PLA
 	JSL Link_ReceiveItem ; thing we wrote over
-	RTL
-
-	.skip
-	PLA
-	RTL
+RTL
 ;--------------------------------------------------------------------------------

owrando.asm

@@ -6,18 +6,18 @@ OWFlags:
 dw 0
 OWReserved:
 dw 0
-OWFog:
-db 0 ; 0: disabled - 1: fog clears after visiting either world version of a screen - 2: fog clears after visiting the current world version of a screen
 org $aa8010
 OWVersionInfo:
 dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
 
 ;Hooks
-org $82a92C
-JSL OWDetectEdgeTransition ; JSL Link_CheckForEdgeScreenTransition
+org $82a929
+OWDetectTransitionReturn:
 
-org $82a936
-OverworldHandleTransitions_PerformEdgeTransition:
+org $82a939
+OverworldHandleTransitions_SpecialTrigger:
+JSL OWDetectEdgeTransition
+BCS OWDetectTransitionReturn
 
 org $82a999
 jsl OWEdgeTransition : nop #4 ;LDA $02A4E3,X : ORA $7EF3CA
@@ -78,6 +78,8 @@ org $8ab7af ;LDA $F2 : ORA $F0 : AND #$C0
 jml OWFluteCancel2 : nop
 org $8ab90d ;JSL $02E99D
 jsl OWFluteCancel
+org $8ab816
+JSL OWMapFluteCancelIcon
 
 ; allows Frog sprite to spawn in LW and also allows his friend to spawn in their house
 org $868a76 ; < 30a76 - sprite_prep.asm:785 (LDA $7EF3CA : AND.w #$40)
@@ -104,36 +106,20 @@ jsl OWOldManSpeed
 org $8aba6c  ; < ? - Bank0a.asm:474 ()
 jsl OWMapWorldCheck16 : nop
 
-; Custom Overworld Map
-org $8ABA52
-JSL OverworldMap_InitGfx_InitScrap
-
+; Mixed Overworld Map
 org $8ABA99
 WorldMap_LoadDarkWorldMap:
 LDA.b GameMode : CMP.b #$14 ; attract module
 BEQ .vanilla_light
-    LDA.l OWFlags : AND.b #!FLAG_OW_CUSTOM_MAP : BNE .custom
+    LDA.l OWMode+1 : AND.b #!FLAG_OW_MIXED : BNE .mixed
         LDA.b OverworldIndex : AND.b #$40
         BEQ .vanilla_light
-    .custom
-    STZ.b ScrapBuffer72 ; clear tile swap flag
-    JSL LoadMapDarkOrCustom_long
-    NOP #2
-warnpc $8ABAB5
+    .mixed
+    PHB : PHK : PLB
+        JSL LoadMapDarkOrMixed
+    PLB
 .vanilla_light ; $0ABAB5
 
-org $8ABD12
-JSL MoveZoomedInPositionY
-org $8ABD2F
-JSL MoveZoomedInPositionX
-
-org $8ABB32
-JSL LoadMapOppositeWorld
-
-org $8ABFF0
-JSL MoveMirrorPortalMapSprite
-; Could insert similar hooks at $8AB860 and $8AB8AC for flute spots
-
 ;(replacing -> LDA $8A : AND.b #$40)
 org $80d8c4  ; < ? - Bank00.asm:4068 ()
 jsl OWWorldCheck
@@ -241,7 +227,6 @@ OWMapWorldCheck16:
 {
     lda.b GameMode : cmp.w #$0014 : beq .return ; attract module, return with Z flag cleared
         jsl OWWorldCheck16
-        eor.b ScrapBuffer72 ; apply tile swap flag
     .return
     rtl
 }
@@ -356,7 +341,7 @@ OWFluteCancel2:
 }
 OWMapFluteCancelIcon:
 {
-    LDA.b #$02 : STA.b Scrap0B ; what we wrote over
+    STA.b Scrap0B : LDX.b #$10 ; what we wrote over
     LDA.l OWFlags+1 : AND.b #$01 : BEQ .return
 	LDA.b GameSubMode : CMP.b #$0A : BNE .return
     LDA.b FrameCounter : AND.b #$10 : BNE .return
@@ -402,110 +387,51 @@ OWMarkVisited:
     RTL
 }
 
-LoadMapDarkOrCustom:
+LoadMapDarkOrMixed:
 {
-    CMP.b #!FLAG_OW_CUSTOM_MAP : REP #$30 : BEQ .custom
+    CMP.b #!FLAG_OW_MIXED : REP #$30 : BEQ .mixed
         LDX.w #$03FE ; draw vanilla Dark World (what we wrote over)
         .copy_next
             LDA.w WorldMap_DarkWorldTilemap,X : STA.w GFXStripes,X
             DEX : DEX : BPL .copy_next
         BRL .end
-    .custom
+    .mixed
         LDX.b OverworldIndex
         LDA.l OWTileWorldAssoc,X
-            AND.w #$0040
-        EOR.b ScrapBuffer72 ; apply tile swap flag
-        BEQ .draw_lw
-            LDA.w #OWMapGridDark
-            BRA .draw_dw
-        .draw_lw
-            LDA.w #OWMapGridLight
-        .draw_dw
         STA.b Scrap00
-        LDA.w #OWMapGridLight>>16 ; current program bank
-        STA.b Scrap02
-        LDX.w #$139C
-        LDY.w #$003F
-        .next_cell
-            PHY
-            JSR GetOWMapTilemapOffsetToCopy
-            .copy_cell ; more efficient to have X on the right side
-            TAY
-            LDA.w WorldMap_LightWorldTilemap+$00,Y : STA.b $00,X
-            LDA.w WorldMap_LightWorldTilemap+$02,Y : STA.b $02,X
-            LDA.w WorldMap_LightWorldTilemap+$20,Y : STA.b $20,X
-            LDA.w WorldMap_LightWorldTilemap+$22,Y : STA.b $22,X
-            LDA.w WorldMap_LightWorldTilemap+$40,Y : STA.b $40,X
-            LDA.w WorldMap_LightWorldTilemap+$42,Y : STA.b $42,X
-            LDA.w WorldMap_LightWorldTilemap+$60,Y : STA.b $60,X
-            LDA.w WorldMap_LightWorldTilemap+$62,Y : STA.b $62,X
-            PLY
-            DEX : DEX : DEX : DEX ; move one screen left
-            TYA : AND.w #$0007 : BNE .same_row
-                TXA : SEC : SBC.w #$0060 : TAX ; move one screen row up
+        LDY.w #$139C
+        LDX.w #$003F
+        .next_screen
+            PHX
+            LDA.l OWTileWorldAssoc,X
+            EOR.b Scrap00
+            AND.w #$0040
+            BEQ .light
+                TYX : BRA .copy_screen
+            .light
+                TXA : AND.w #$0024 : LSR : TAX
+                TYA : SEC : SBC.l LWQuadrantOffsets,X
+                TYX : TAY
+            .copy_screen ; more efficient to have X on the right side
+            LDA.w $C739+$00,Y : STA.b $00,X
+            LDA.w $C739+$02,Y : STA.b $02,X
+            LDA.w $C739+$20,Y : STA.b $20,X
+            LDA.w $C739+$22,Y : STA.b $22,X
+            LDA.w $C739+$40,Y : STA.b $40,X
+            LDA.w $C739+$42,Y : STA.b $42,X
+            LDA.w $C739+$60,Y : STA.b $60,X
+            LDA.w $C739+$62,Y : STA.b $62,X
+            TXY : PLX
+            DEY : DEY : DEY : DEY ; move one screen left
+            TXA : AND.w #$0007 : BNE .same_row
+                TYA : SEC : SBC.w #$0060 : TAY ; move one screen row up
             .same_row
-            DEY
-        BPL .next_cell
+            DEX
+        BPL .next_screen
     .end
     SEP #$30
     LDA.b #$15 : STA.b NMIINCR ; what we wrote over
-    RTS
-}
-
-GetOWMapTilemapOffsetToCopy:
-{
-    LDA.l OWFog : AND.w #$00FF
-    CMP.w #$0001 : BEQ .parallel_fog
-    CMP.w #$0002 : BNE .no_fog
-
-    LDA.b [Scrap00],Y : AND.w #$00FF
-    PHX
-    TAX
-    BIT.w #$0040
-    BEQ .light_fog
-        LDA.l Overworld_ActualScreenID-$40,X : ORA.w #$0040
-        BRA .dark_fog
-    .light_fog
-        LDA.l Overworld_ActualScreenID,X
-    .dark_fog
-    AND.w #$00FF
-    TAX
-    LDA.l OverworldEventDataWRAM,X
-    .check_visited_flag
-    PLX
-    AND.w #$0080 : BNE .no_fog
-    LDA.w #($D350-$C739)
-    RTS
-
-    .parallel_fog
-    LDA.b [Scrap00],Y : AND.w #$003F
-    PHX
-    TAX
-    LDA.l Overworld_ActualScreenID,X
-    AND.w #$00FF
-    TAX
-    LDA.l OverworldEventDataWRAM,X
-    ORA.l OverworldEventDataWRAM+$40,X
-    BRA .check_visited_flag
-
-    .no_fog
-    LDA.b [Scrap00],Y : AND.w #$0038 : ASL : ASL : ASL : ASL
-    STA.b Scrap03
-    LDA.b [Scrap00],Y
-    BIT.w #$0040
-    BEQ .light
-        AND.w #$0007
-        ASL : ASL : ADC.w #$1000 : ADC.b Scrap03
-        RTS
-    .light
-    PHX
-    AND.w #$0024 : LSR : TAX
-    LDA.b [Scrap00],Y
-    AND.w #$0007
-    ASL : ASL : ADC.w #$1000 : ADC.b Scrap03
-    SEC : SBC.l LWQuadrantOffsets,X
-    PLX
-    RTS
+    RTL
 
     LWQuadrantOffsets:
     dw $1000-$0210 ; top left
@@ -515,143 +441,6 @@ GetOWMapTilemapOffsetToCopy:
     dw $0400+$0210 ; bottom right
 }
 
-OverworldMap_InitGfx_InitScrap:
-{
-    STZ.b ScrapBuffer72 ; clear tile swap flag
-    LDA.b #$11 : STA.b MAINDESQ ; what we wrote over
-    RTL
-}
-LoadMapDarkOrCustom_long:
-{
-    PHB : LDA.b #WorldMap_DarkWorldTilemap>>16 : PHA : PLB
-        LDA.l OWFlags : AND.b #!FLAG_OW_CUSTOM_MAP
-        JSR LoadMapDarkOrCustom
-    PLB
-    RTL
-}
-LoadMapOppositeWorld:
-{
-    LDA.l OWFlags : AND.b #!FLAG_OW_ADJUST_DYNAMIC_MAP_SPRITE_POSITION : BEQ .vanilla
-    LDA.b ScrapBuffer72 : BEQ +
-        LDA.b Joy1B_All : AND.b #$30 : BNE .vanilla
-            STZ.b ScrapBuffer72 ; clear tile swap flag
-            BRA .new_tiles
-    + LDA.b Joy1B_New : AND.b #$30 : BEQ .vanilla
-        LDA.b #$40 : STA.b ScrapBuffer72 ; set tile swap flag
-.new_tiles
-    JSL OverworldMap_InitGfx+$10 ; load palette
-        DEC.w SubModuleInterface
-        LDA.b #$0F : STA.b INIDISPQ
-    JSL LoadMapDarkOrCustom_long
-    LDA.b #$24 : STA.w SFX3
-    PLA : PLA : PEA.w $BBAF ; skip everything upon return
-.vanilla
-    LDA.b Joy1B_New : AND.b #$70 ; what we wrote over
-    RTL
-}
-FluteMenu_MoveLinkSprite:
-{
-    JSR MoveMapSprite
-    BRA WorldMap_SkipHandleSprites_vanilla
-}
-WorldMap_SkipHandleSprites:
-{
-    JSR MoveMapSprite : BEQ .vanilla
-    LDA.b ScrapBuffer72 : BEQ .vanilla ; skip draw if no tile swap
-        PLA : PLA : PEA.w $C39B ; exit without drawing sprites
-    RTL 
-.vanilla
-    LDA.b FrameCounter : AND.b #$10 ; what we wrote over
-    RTL
-}
-
-MoveMirrorPortalMapSprite:
-{
-    STA.l $7EC109 ; what we overwrote
-    JSR MoveMapSprite
-    RTL
-}
-
-MoveZoomedInPositionY:
-{
-    LDA.l OWFlags : AND.w #!FLAG_OW_ADJUST_DYNAMIC_MAP_SPRITE_POSITION : BEQ .vanilla
-        SEP #$20
-        JSR MoveMapSprite_Setup
-        JSR MoveMapSprite_GetYCoordHighByte
-        PHA
-            REP #$20
-            LDA.l $7EC108 : XBA
-            SEP #$20
-        PLA : XBA
-        REP #$20
-        RTL
-.vanilla
-    LDA.l $7EC108 ; what we overwrote
-    RTL
-}
-MoveZoomedInPositionX:
-{
-    LDA.l OWFlags : AND.w #!FLAG_OW_ADJUST_DYNAMIC_MAP_SPRITE_POSITION : BEQ .vanilla
-        SEP #$20
-        JSR MoveMapSprite_Setup
-        JSR MoveMapSprite_GetXCoordHighByte
-        PHA
-            REP #$20
-            LDA.l $7EC10A : XBA
-            SEP #$20
-        PLA : XBA
-        REP #$20
-        RTL
-.vanilla
-    LDA.l $7EC10A ; what we overwrote
-    RTL
-}
-
-MoveMapSprite:
-{
-    LDA.l OWFlags : AND.b #!FLAG_OW_ADJUST_DYNAMIC_MAP_SPRITE_POSITION : BEQ .return
-    PHP
-        JSR MoveMapSprite_Setup
-        JSR MoveMapSprite_GetXCoordHighByte : STA.l $7EC10B
-        JSR MoveMapSprite_GetYCoordHighByte : STA.l $7EC109
-    PLP
-    .return
-    RTS
-}
-MoveMapSprite_Setup:
-{
-    LDA.l $7EC10B : AND.b #$0E : LSR
-    STA.b Scrap00
-    LDA.l $7EC109 : AND.b #$0E : ASL : ASL
-    ADC.b Scrap00
-    STA.b Scrap00
-    LDX.b OverworldIndex
-    LDA.l OWTileWorldAssoc,X
-    LDX.b Scrap00
-    AND.b #$40
-    BEQ .light
-        LDA.l OWMapGridDarkPositionByAbsolutePosition,X
-        BRA .dark
-    .light
-        LDA.l OWMapGridLightPositionByAbsolutePosition,X
-    .dark
-    TAX
-    AND.b #$07 : ASL
-    STA.b Scrap00
-    RTS
-}
-MoveMapSprite_GetXCoordHighByte:
-{
-    LDA.l $7EC10B : AND.b #$01 : ORA.b Scrap00
-    RTS
-}
-MoveMapSprite_GetYCoordHighByte:
-{
-    TXA : AND.b #$38 : LSR : LSR : STA.b Scrap00
-    LDA.l $7EC109 : AND.b #$01 : ORA.b Scrap00
-    RTS
-}
-
 OWBonkDropPrepSprite:
 {
     LDA.b IndoorsFlag : BEQ +
@@ -820,26 +609,27 @@ OWBonkDrops:
     JSL OWBonkSpritePrep
 
     .mark_collected ; S = Collected, FlagBitmask, X (row + 2)
-    PLA : BEQ + : - : JMP .return : + ; S = FlagBitmask, X (row + 2)
-    TYX : JSL Sprite_IsOnscreen : BCC -
-        LDA.b IndoorsFlag : BEQ +
+    PLA : BNE + ; S = FlagBitmask, X (row + 2)
+    TYX : JSL Sprite_IsOnscreen : BCC +
+        LDA.b IndoorsFlag : BEQ ++
             LDA.l RoomDataWRAM[$0120].high : ORA.b 1,S : STA.l RoomDataWRAM[$0120].high
             LDA.w $0400 : ORA.b 1,S : STA.w $0400
             BRA .increment_collection
-        +
+        ++
         LDA.b OverworldIndex
         BIT.b #$40 : BEQ + 
                 LDA.l ProgressIndicator : CMP.b #$02
-            LDA.b OverworldIndex : BCS + : AND.b #$BF
+                LDA.b OverworldIndex : BCS ++ : AND.b #$BF
+            ++
         +
         TAX : LDA.l OverworldEventDataWRAM,X : ORA.b 1,S : STA.l OverworldEventDataWRAM,X
         
         .increment_collection
         REP #$20
             LDA.l TotalItemCounter : INC : STA.l TotalItemCounter
+            INC.w UpdateHUDFlag
         SEP #$20
-        LDA.b #$01 : STA.l UpdateHUDFlag
-        BRA .return
+    + BRA .return
 
     ; spawn itemget item
     .spawn_item ; A = item id ; Y = bonk sprite slot ; S = Collected, FlagBitmask, X (row + 2)
@@ -948,29 +738,20 @@ OWBonkSpritePrep:
 org $aa9000
 OWDetectEdgeTransition:
 {
-    JSL Link_CheckForEdgeScreenTransition ; what we wrote over
-    BCS .return
+    JSL OWDestroyItemSprites
     STZ.w RandoOverworldWalkDist
     LDA.l OWMode : ORA.l OWMode+1 : BEQ .vanilla
-        PHY
         JSR OWShuffle
-        PLY
-        LDA.w RandoOverworldTargetEdge : BMI .specialOrDisabled
+        LDA.w RandoOverworldTargetEdge : BMI .special
     .vanilla
-    CLC ; allow transition
+    REP #$31 : LDX.b Scrap02 : LDA.b OverworldMap16Buffer ; what we wrote over
     RTL
-    .specialOrDisabled
-    CMP.b #$FF : BNE .special
-    STZ.w RandoOverworldTargetEdge
-    PHB
-    JML Link_CheckForEdgeScreenTransition_prevent_transition
     .special
     REP #$30
     AND.w #$0003 : TAY : ASL : TAX
     LDA.w #$007F : STA.w RandoOverworldTargetEdge
     JSR OWLoadSpecialArea
     SEC
-    .return
     RTL
 }
 OWDetectSpecialTransition:
@@ -980,23 +761,17 @@ OWDetectSpecialTransition:
     TXA : AND.w #$0002 : LSR
     STA.w RandoOverworldTerrain
     LDA.l OWSpecialDestIndex,X : BIT.w #$0080 : BEQ .switch_to_edge
-    AND.w #$00FF : CMP.w #$00FF : BEQ .disabled
     AND.w #$0003 : TAY : ASL : TAX
     .normal
     JSR OWLoadSpecialArea
     .return
     RTL
 
-    .disabled
-    SEP #$30
-    STZ.w RandoOverworldTargetEdge
-    RTL
-
     .switch_to_edge
     STA.w RandoOverworldTargetEdge
     LDA.l OWEdgeDataOffset,X : STA.w RandoOverworldEdgeAddr
     PLA : SEP #$30 : PLA ; delete 3 bytes from stack
-    JSL Link_CheckForEdgeScreenTransition : BCS .return
+    JSL Link_CheckForEdgeScreenTransition : BCS .return ; Link_CheckForEdgeScreenTransition
     LDA.l Overworld_CheckForSpecialOverworldTrigger_Direction,X : STA.b Scrap00 : CMP.b #$08 : BNE .hobo
         LSR : STA.b LinkPosY : STZ.b BG2V ; move Link and camera to edge
         LDA.b #$06 : STA.b Scrap02
@@ -1015,15 +790,16 @@ OWDetectSpecialTransition:
         LDA.b #$FF : STA.b LinkRecoilZ : STA.b $C7
         STZ.b $3D : STZ.b LinkSpeed : STZ.w $032B : STZ.w LinkDashing : STZ.b LinkState
     .not_dashing
-    PLA : PLA : PLA ; delete 3 bytes from stack
-    JML OverworldHandleTransitions_PerformEdgeTransition
+    PLA : REP #$31 : PLA ; delete 3 bytes from stack
+    LDX.b Scrap02
+    LDA.b OverworldMap16Buffer
+    JML OverworldHandleTransitions_SpecialTrigger+6
 }
 OWEdgeTransition:
 {
     LDA.l OWMode : ORA.l OWMode+1 : BEQ .unshuffled
     LDY.w RandoOverworldTargetEdge : STZ.w RandoOverworldTargetEdge
     CPY.b #$7F : BEQ .unshuffled
-        JSL OWDestroyItemSprites
         REP #$10
         LDX.w RandoOverworldEdgeAddr
         PHB : PHK : PLB
@@ -1341,7 +1117,6 @@ OWWorldTerrainUpdate: ; x = owid of destination screen, y = 1 for land to water,
         STZ.w RandoOverworldForceTrans
         CMP.b #$02 : BNE +
             DEC : STA.w LinkDeepWater : STZ.w LinkSwimDirection
-            LDA.b FlagBY : AND.b #$7F : STA.b FlagBY
             LDA.b #$04 : BRA .set_state
         +
         CMP.b #$03 : BNE ++
@@ -1362,7 +1137,6 @@ OWWorldTerrainUpdate: ; x = owid of destination screen, y = 1 for land to water,
         LDA.b #$01 : STA.w LinkDeepWater
         LDA.l FlippersEquipment : BEQ .no_flippers ; check if flippers obtained
         LDA.b LinkState : CMP.b #$17 : BEQ .no_flippers ; check if bunny
-            LDA.b FlagBY : AND.b #$7F : STA.b FlagBY
             LDA.b #$04 : STA.b LinkState : STZ.w LinkSwimDirection : RTS
         .no_flippers
             PHX
@@ -1714,7 +1488,7 @@ dw $0b28, $0b38, $0010, $0b30, $1515, $1018, $0001, $000e
 dw $0b70, $0ba0, $0030, $0b88, $1515, $1020, $0000, $000f
 dw $0a40, $0b10, $00d0, $0aa8, $1d1d, $1006, $0000, $0010
 dw $0350, $0390, $0040, $0370, $1821, $2060, $0000, $0011
-dw $0670, $06a8, $0038, $068c, $1b23, $2004, $0000, $0012
+dw $0670, $06a8, $0038, $068c, $1b23, $2002, $0000, $0012
 dw $0898, $09b0, $0118, $0924, $1b24, $2054, $0000, $0013
 dw $0a40, $0ba0, $0160, $0af0, $2525, $100e, $0000, $0014
 dw $0c70, $0c90, $0020, $0c80, $1e26, $2002, $0000, $0015
@@ -1746,7 +1520,7 @@ dw $0b28, $0b38, $0010, $0b30, $5555, $1018, $0001, $002e
 dw $0b70, $0ba0, $0030, $0b88, $5555, $1020, $0000, $002f
 dw $0a40, $0b10, $00d0, $0aa8, $5d5d, $1006, $0000, $0030
 dw $0350, $0390, $0040, $0370, $5861, $2060, $0000, $0031
-dw $0670, $06a8, $0038, $068c, $5b63, $2004, $0000, $0032
+dw $0670, $06a8, $0038, $068c, $5b63, $2002, $0000, $0032
 dw $0898, $09b0, $0118, $0924, $5b64, $2054, $0000, $0033
 dw $0a40, $0ba0, $0160, $0af0, $6565, $100e, $0000, $0034
 dw $0c70, $0c90, $0020, $0c80, $5e66, $2002, $0000, $0035
@@ -2053,42 +1827,16 @@ db $74, $4e, $10, $b1, $00, $1c
 UWBonkPrizeData:
 db $ff, $00, $02, $b5, $00, $08
 
-org $AABC80 ;PC 153C80
-OWMapGridLight:
-db $00, $01, $02, $03, $04, $05, $06, $07
-db $08, $09, $0A, $0B, $0C, $0D, $0E, $0F
-db $10, $11, $12, $13, $14, $15, $16, $17
-db $18, $19, $1A, $1B, $1C, $1D, $1E, $1F
-db $20, $21, $22, $23, $24, $25, $26, $27
-db $28, $29, $2A, $2B, $2C, $2D, $2E, $2F
-db $30, $31, $32, $33, $34, $35, $36, $37
-db $38, $39, $3A, $3B, $3C, $3D, $3E, $3F
-OWMapGridDark:
-db $40, $41, $42, $43, $44, $45, $46, $47
-db $48, $49, $4A, $4B, $4C, $4D, $4E, $4F
-db $50, $51, $52, $53, $54, $55, $56, $57
-db $58, $59, $5A, $5B, $5C, $5D, $5E, $5F
-db $60, $61, $62, $63, $64, $65, $66, $67
-db $68, $69, $6A, $6B, $6C, $6D, $6E, $6F
-db $70, $71, $72, $73, $74, $75, $76, $77
-db $78, $79, $7A, $7B, $7C, $7D, $7E, $7F
-
-org $AABD00 ;PC 153D00
-OWMapGridLightPositionByAbsolutePosition:
-db $00, $01, $02, $03, $04, $05, $06, $07
-db $08, $09, $0A, $0B, $0C, $0D, $0E, $0F
-db $10, $11, $12, $13, $14, $15, $16, $17
-db $18, $19, $1A, $1B, $1C, $1D, $1E, $1F
-db $20, $21, $22, $23, $24, $25, $26, $27
-db $28, $29, $2A, $2B, $2C, $2D, $2E, $2F
-db $30, $31, $32, $33, $34, $35, $36, $37
-db $38, $39, $3A, $3B, $3C, $3D, $3E, $3F
-OWMapGridDarkPositionByAbsolutePosition:
-db $00, $01, $02, $03, $04, $05, $06, $07
-db $08, $09, $0A, $0B, $0C, $0D, $0E, $0F
-db $10, $11, $12, $13, $14, $15, $16, $17
-db $18, $19, $1A, $1B, $1C, $1D, $1E, $1F
-db $20, $21, $22, $23, $24, $25, $26, $27
-db $28, $29, $2A, $2B, $2C, $2D, $2E, $2F
-db $30, $31, $32, $33, $34, $35, $36, $37
-db $38, $39, $3A, $3B, $3C, $3D, $3E, $3F
+; temporary fix - murahdahla replaces one of the bonk tree prizes
+;    so we copy the sprite table here and update the pointer
+;    longterm solution should be to spawn in murahdahla separately
+org $89AE2A
+Overworld_Sprites_Screen1A_2:
+db $08, $0F, $41 ; yx:{ 0x080, 0x0F0 }
+db $0E, $0C, $41 ; yx:{ 0x0E0, 0x0C0 }
+db $11, $0D, $E3 ; yx:{ 0x110, 0x0D0 }
+db $18, $0A, $D8 ; yx:{ 0x180, 0x0A0 }
+db $18, $0F, $45 ; yx:{ 0x180, 0x0F0 }
+db $FF ; END
+org $89CA55
+dw Overworld_Sprites_Screen1A_2&$FFFF

pikit.asm

@@ -1,441 +0,0 @@
-pushpc
-org $89EB78
-db $18, $1A, $AA ; replace uncle with pikit
-
-org $80DCCE
-db $1B ; load sprite sheet for pikit in link's house
-
-org $80FC74
-NOP #2 ; do not load rain-state sprites
-
-org $8A8029
-; move table slightly to center under pikit
-db $C9, $C0, $DD
-db $D0, $B8, $3C
-pullpc
-
-TuckLink:
-	; what we wrote over
-	STZ.w $037C
-	STZ.w $037D
-
-	LDA.b #$40 : STA.w $0FC2
-	LDA.b #$09 : STA.w $0FC3
-
-	LDA.b #$5A : STA.w $0FC4
-	LDA.b #$21 : STA.w $0FC5
-
-	RTL
-
-LinkSnoring:
-	LDA.l ProgressIndicator
-	BNE +
-
-	LDA.b #$02
-	STA.l ProgressIndicator
-	LDA.b #$1D
-	LDY.b #$00
-	JSL Sprite_ShowMessageUnconditional
-	BRA ++
-
-+
-	LDA.b FrameCounter
-	AND.b #$03
-	BNE ++
-
-	LDA.b $9C
-	CMP.b #$20
-	BEQ .lightened
-
-	DEC.b $9C
-	DEC.b $9D
-
-++
-	; what we wrote over
-	LDA.b FrameCounter
-	AND.b #$1F
-	RTL
-
-.lightened
-	INC.w $037C
-	INC.w $037D
-	RTL
-
-LinkAwaken:
-	; what we wrote over
-	LDA.b #$06
-	STA.b LinkState
-
-	LDA.l ProgressFlags
-	ORA.b #$10
-	STA.l ProgressFlags
-	LDA.b #$01
-	STA.l StartingEntrance
-	RTL
-
-BigChest_ShieldCheck:
-	JSL ShieldCheck
-	BCC .no_open
-	LDA.l BigKeyField
-	AND.l BitMasks, X
-.no_open
-	RTL
-
-SmallChest_ShieldCheck:
-	JSL ShieldCheck
-	BCC .no_open
-	LDA.w DungeonID
-	ORA.w RoomFlagMask, Y
-.no_open
-	RTL
-
-ShieldCheck:
-	PHP
-	REP #$30
-	PHX
-	LDA.b $0C
-	AND.w #$00FF
-	TAX
-	LDA.l PikitItemList, X
-	AND.w #$00FF
-	BNE .replace
-	PLX
-	PLP
-	SEC
-	RTL
-
-.replace
-	LDA.l ShieldEquipment
-	AND.w #$00FF
-	BNE .already_have_shield
-	TXA
-	STA.l PikitItem
-	LDA.w #$0004
-	STA.b $0C
-	PLX
-	PLP
-	SEC
-	RTL
-
-.already_have_shield
-	SEP #$30
-	LDA.b #$3C
-	STA.w $012E
-
-	PHY
-	LDA.b #$98
-	LDY.b #$01
-	JSL Sprite_ShowMessageUnconditional
-	PLY
-
-	REP #$30
-
-	PLX
-	PLP
-	CLC
-	RTL
-
-PikitSteal:
-	LDA.l ShieldEquipment
-	BNE .has_shield
-	JSL GetRandomInt
-	JML $9E8D73
-
-.has_shield
-	LDA.b #$04
-	STA.w $0ED0, X
-	STA.w $0E90, X
-	LDA.b #$01
-	STA.w $0E30, X
-
-	STZ.w $012E
-
-	JML $9E8DC3
-
-PikitDigest:
-	LDA.w $0ED0, X
-	CMP.b #$04
-	BNE +
-
-	STZ.w $0E90, X
-
-	LDA.l PikitItem
-	CMP.b #$04
-	BEQ +
-
-	TAY
-	STZ.w ItemReceiptMethod
-	JSL Link_ReceiveItem
-
-	LDA.b #$04
-	STA.l PikitItem
-+
-
-	; what we wrote over
-	STZ.w $0DA0, X
-	STZ.w $0ED0, X
-
-	RTL
-
-PikitItemList:
-db $01 ; 00 - Fighter Sword and Shield
-db $01 ; 01 - Master Sword
-db $01 ; 02 - Tempered Sword
-db $01 ; 03 - Butter Sword
-db $00 ; 04 - Fighter Shield
-db $00 ; 05 - Fire Shield
-db $00 ; 06 - Mirror Shield
-db $01 ; 07 - Fire Rod
-db $01 ; 08 - Ice Rod
-db $01 ; 09 - Hammer
-db $01 ; 0A - Hookshot
-db $01 ; 0B - Bow
-db $01 ; 0C - Boomerang
-db $01 ; 0D - Powder
-db $00 ; 0E - Bottle Refill (bee)
-db $01 ; 0F - Bombos
-db $01 ; 10 - Ether
-db $01 ; 11 - Quake
-db $01 ; 12 - Lamp
-db $01 ; 13 - Shovel
-db $01 ; 14 - Flute
-db $01 ; 15 - Somaria
-db $01 ; 16 - Bottle
-db $00 ; 17 - Heartpiece
-db $01 ; 18 - Byrna
-db $01 ; 19 - Cape
-db $01 ; 1A - Mirror
-db $01 ; 1B - Glove
-db $01 ; 1C - Mitts
-db $01 ; 1D - Book
-db $01 ; 1E - Flippers
-db $01 ; 1F - Pearl
-db $00 ; 20 - Crystal
-db $01 ; 21 - Net
-db $00 ; 22 - Blue Mail
-db $00 ; 23 - Red Mail
-db $00 ; 24 - Small Key
-db $00 ; 25 - Compass
-db $00 ; 26 - Heart Container from 4/4
-db $00 ; 27 - Bomb
-db $00 ; 28 - 3 bombs
-db $01 ; 29 - Mushroom
-db $01 ; 2A - Red boomerang
-db $01 ; 2B - Full bottle (red)
-db $01 ; 2C - Full bottle (green)
-db $01 ; 2D - Full bottle (blue)
-db $00 ; 2E - Potion refill (red)
-db $00 ; 2F - Potion refill (green)
-db $00 ; 30 - Potion refill (blue)
-db $00 ; 31 - 10 bombs
-db $00 ; 32 - Big key
-db $00 ; 33 - Map
-db $00 ; 34 - 1 rupee
-db $00 ; 35 - 5 rupees
-db $00 ; 36 - 20 rupees
-db $00 ; 37 - Green pendant
-db $00 ; 38 - Blue pendant
-db $00 ; 39 - Red pendant
-db $01 ; 3A - Tossed bow
-db $01 ; 3B - Silvers
-db $01 ; 3C - Full bottle (bee)
-db $01 ; 3D - Full bottle (fairy)
-db $00 ; 3E - Boss heart
-db $00 ; 3F - Sanc heart
-db $00 ; 40 - 100 rupees
-db $00 ; 41 - 50 rupees
-db $00 ; 42 - Heart
-db $00 ; 43 - Arrow
-db $00 ; 44 - 10 arrows
-db $00 ; 45 - Small magic
-db $00 ; 46 - 300 rupees
-db $00 ; 47 - 20 rupees green
-db $01 ; 48 - Full bottle (good bee)
-db $01 ; 49 - Tossed fighter sword
-db $01 ; 4A - Active Flute
-db $01 ; 4B - Boots
-
-db $00 ; 4C - Bomb capacity (50)
-db $00 ; 4D - Arrow capacity (70)
-db $01 ; 4E - 1/2 magic
-db $01 ; 4F - 1/4 magic
-db $01 ; 50 - Safe master sword
-db $00 ; 51 - Bomb capacity (+5)
-db $01 ; 52 - Bomb capacity (+10)
-db $00 ; 53 - Arrow capacity (+5)
-db $00 ; 54 - Arrow capacity (+10)
-db $00 ; 55 - Programmable item 1
-db $00 ; 56 - Programmable item 2
-db $00 ; 57 - Programmable item 3
-db $01 ; 58 - Upgrade-only silver arrows
-db $00 ; 59 - Rupoor
-db $00 ; 5A - Nothing
-db $00 ; 5B - Red clock
-db $00 ; 5C - Blue clock
-db $00 ; 5D - Green clock
-db $01 ; 5E - Progressive sword
-db $00 ; 5F - Progressive shield
-db $00 ; 60 - Progressive armor
-db $01 ; 61 - Progressive glove
-db $00 ; 62 - RNG pool item (single)
-db $00 ; 63 - RNG pool item (multi)
-db $01 ; 64 - Progressive bow
-db $01 ; 65 - Progressive bow
-db $00 ; 66 -
-db $00 ; 67 -
-db $00 ; 68 -
-db $00 ; 69 -
-db $00 ; 6A - Triforce
-db $00 ; 6B - Power star
-db $00 ; 6C - Triforce Piece
-db $00 ; 6D - Server request item
-db $00 ; 6E - Server request item (dungeon drop)
-db $00 ; 6F -
-
-db $00 ; 70 - Map of Light World
-db $00 ; 71 - Map of Dark World
-db $00 ; 72 - Map of Ganon's Tower
-db $00 ; 73 - Map of Turtle Rock
-db $00 ; 74 - Map of Thieves' Town
-db $00 ; 75 - Map of Tower of Hera
-db $00 ; 76 - Map of Ice Palace
-db $00 ; 77 - Map of Skull Woods
-db $00 ; 78 - Map of Misery Mire
-db $00 ; 79 - Map of Dark Palace
-db $00 ; 7A - Map of Swamp Palace
-db $00 ; 7B - Map of Agahnim's Tower
-db $00 ; 7C - Map of Desert Palace
-db $00 ; 7D - Map of Eastern Palace
-db $00 ; 7E - Map of Hyrule Castle
-db $00 ; 7F - Map of Sewers
-
-db $00 ; 80 - Compass of Light World
-db $00 ; 81 - Compass of Dark World
-db $00 ; 82 - Compass of Ganon's Tower
-db $00 ; 83 - Compass of Turtle Rock
-db $00 ; 84 - Compass of Thieves' Town
-db $00 ; 85 - Compass of Tower of Hera
-db $00 ; 86 - Compass of Ice Palace
-db $00 ; 87 - Compass of Skull Woods
-db $00 ; 88 - Compass of Misery Mire
-db $00 ; 89 - Compass of Dark Palace
-db $00 ; 8A - Compass of Swamp Palace
-db $00 ; 8B - Compass of Agahnim's Tower
-db $00 ; 8C - Compass of Desert Palace
-db $00 ; 8D - Compass of Eastern Palace
-db $00 ; 8E - Compass of Hyrule Castle
-db $00 ; 8F - Compass of Sewers
-
-db $00 ; 90 - Skull key
-db $00 ; 91 - Reserved
-db $00 ; 92 - Big key of Ganon's Tower
-db $00 ; 93 - Big key of Turtle Rock
-db $00 ; 94 - Big key of Thieves' Town
-db $00 ; 95 - Big key of Tower of Hera
-db $00 ; 96 - Big key of Ice Palace
-db $00 ; 97 - Big key of Skull Woods
-db $00 ; 98 - Big key of Misery Mire
-db $00 ; 99 - Big key of Dark Palace
-db $00 ; 9A - Big key of Swamp Palace
-db $00 ; 9B - Big key of Agahnim's Tower
-db $00 ; 9C - Big key of Desert Palace
-db $00 ; 9D - Big key of Eastern Palace
-db $00 ; 9E - Big key of Hyrule Castle
-db $00 ; 9F - Big key of Sewers
-
-db $00 ; A0 - Small key of Sewers
-db $00 ; A1 - Small key of Hyrule Castle
-db $00 ; A2 - Small key of Eastern Palace
-db $00 ; A3 - Small key of Desert Palace
-db $00 ; A4 - Small key of Agahnim's Tower
-db $00 ; A5 - Small key of Swamp Palace
-db $00 ; A6 - Small key of Dark Palace
-db $00 ; A7 - Small key of Misery Mire
-db $00 ; A8 - Small key of Skull Woods
-db $00 ; A9 - Small key of Ice Palace
-db $00 ; AA - Small key of Tower of Hera
-db $00 ; AB - Small key of Thieves' Town
-db $00 ; AC - Small key of Turtle Rock
-db $00 ; AD - Small key of Ganon's Tower
-db $00 ; AE - Reserved
-db $00 ; AF - Generic small key
-db $00 ; B0 - Crystal 6
-db $00 ; B1 - Crystal 1
-db $00 ; B2 - Crystal 5
-db $00 ; B3 - Crystal 7
-db $00 ; B4 - Crystal 2
-db $00 ; B5 - Crystal 4
-db $00 ; B6 - Crystal 3
-db $00 ; B7 - Reserved
-db $00 ; B8 -
-db $00 ; B9 -
-db $00 ; BA -
-db $00 ; BB -
-db $00 ; BC -
-db $00 ; BD -
-db $00 ; BE -
-db $00 ; BF -
-db $00 ; C0 -
-db $00 ; C1 -
-db $00 ; C2 -
-db $00 ; C3 -
-db $00 ; C4 -
-db $00 ; C5 -
-db $00 ; C6 -
-db $00 ; C7 -
-db $00 ; C8 -
-db $00 ; C9 -
-db $00 ; CA -
-db $00 ; CB -
-db $00 ; CC -
-db $00 ; CD -
-db $00 ; CE -
-db $00 ; CF -
-db $00 ; D0 - Bee trap
-db $00 ; D1 - Apples
-db $00 ; D2 - Fairy
-db $00 ; D3 - Chicken
-db $00 ; D4 - Big Magic
-db $00 ; D5 - 5 Arrows
-db $00 ; D6 - Good Bee
-db $00 ; D7 -
-db $00 ; D8 -
-db $00 ; D9 -
-db $00 ; DA -
-db $00 ; DB -
-db $00 ; DC -
-db $00 ; DD -
-db $00 ; DE -
-db $00 ; DF -
-db $00 ; E0 -
-db $00 ; E1 -
-db $00 ; E2 -
-db $00 ; E3 -
-db $00 ; E4 -
-db $00 ; E5 -
-db $00 ; E6 -
-db $00 ; E7 -
-db $00 ; E8 -
-db $00 ; E9 -
-db $00 ; EA -
-db $00 ; EB -
-db $00 ; EC -
-db $00 ; ED -
-db $00 ; EE -
-db $00 ; EF -
-db $00 ; F0 -
-db $00 ; F1 -
-db $00 ; F2 -
-db $00 ; F3 -
-db $00 ; F4 -
-db $00 ; F5 -
-db $00 ; F6 -
-db $00 ; F7 -
-db $00 ; F8 -
-db $00 ; F9 -
-db $00 ; FA -
-db $00 ; FB -
-db $00 ; FC -
-db $00 ; FD -
-db $00 ; FE - Server request (async)
-db $00 ; FF -

ram.asm

@@ -65,8 +65,6 @@ LinkSubPixelVelocty = $7E002A     ; Word length
 LinkAnimationStep = $7E002E       ;
 LinkDirection = $7E002F           ; $00 = Up | $02 = Down | $04 = Left | $06 = Right
                                   ;
-FlagBY = $7E003A                  ; Bitfield for B and Y buttons.
-                                  ;
 OAMOffsetY = $7E0044              ;
 OAMOffsetX = $7E0045              ;
 LinkIncapacitatedTimer = $7E0046  ; Countdown when Link takes damage, not same as I-frames
@@ -237,8 +235,6 @@ CurrentYItem = $7E0303            ;
 AButtonAct = $7E0308              ; Bitfield for A-actions. $80 = Carry/toss | $02 Prayer | $01 = Tree pull
 CarryAct = $7E0309                ; Bitfield for carrying. $02 = Tossing | $01 = Lifting
                                   ;
-LinkIFrames = $7E031F             ; Countdown for Link's invincibility frames after taking damage.
-                                  ;
 LinkSwimDirection = $7E0340       ; Bitfield for swim direction. (.... udlr)
                                   ;
 LinkDeepWater = $7E0345           ; Set when Link is in deep water.
@@ -781,7 +777,6 @@ endmacro
 %assertRAM(LinkRecoilZ, $7E0029)
 %assertRAM(LinkAnimationStep, $7E002E)
 %assertRAM(LinkDirection, $7E002F)
-%assertRAM(FlagBY, $7E003A)
 %assertRAM(OAMOffsetY, $7E0044)
 %assertRAM(OAMOffsetX, $7E0045)
 %assertRAM(LinkIncapacitatedTimer, $7E0046)
@@ -879,8 +874,6 @@ endmacro
 %assertRAM(UseY1, $7E0301)
 %assertRAM(CurrentYItem, $7E0303)
 %assertRAM(AButtonAct, $7E0308)
-%assertRAM(CarryAct, $7E0309)
-%assertRAM(LinkIFrames, $7E031F)
 %assertRAM(LinkSwimDirection, $7E0340)
 %assertRAM(LinkDeepWater, $7E0345)
 %assertRAM(TileActIce, $7E0348)

sram.asm

@@ -190,8 +190,7 @@ ItemLimitCounts: skip 16        ; Keeps track of limited non-progressive items s
                                 ; See: ItemSubstitutionRules in tables.asm
                                 ; Right now this is only used for three items but extra space is
                                 ; reserved
-skip 32                         ; Unused
-PikitItem: skip 2               ; Item stored in shield player is carrying
+skip 34                         ; Unused
 FluteBitfield: skip 1           ; 
 SpecialWeaponLevel: skip 1      ; keeps track of level in special weapon modes
 ItemOnB: skip 1                 ; NYI

vanillalabels.asm

@@ -99,7 +99,6 @@ HandleFollowersAfterMirroring                              = $87AA8B
 LinkHop_FindArbitraryLandingSpot                           = $87E359
 Link_HandleMovingAnimation_FullLongEntry                   = $87E68F
 Link_CheckForEdgeScreenTransition                          = $87F413
-Link_CheckForEdgeScreenTransition_prevent_transition       = $87F42C
 Sprite_CheckIfPlayerPreoccupied                            = $87F4AA
 FlashGanonTowerPalette_next_thunder                        = $87FA81
 FlashGanonTowerPalette_bright_white                        = $87FAAC
@@ -222,8 +221,6 @@ Ancilla29_MilestoneItemReceipt_skip_crystal_sfx            = $88CAE5
 Ancilla29_MilestoneItemReceipt_no_sparkle                  = $88CB2E
 Ancilla_SetOAM_XY                                          = $88F6F3
 Ancilla_AddAncilla                                         = $899CCE
-WorldMap_CalculateOAMCoordinates_exit_successfully         = $8AC51F
-WorldMap_MultiplyAxB                                       = $8AC57F
 UpdateHUD                                                  = $8DDFA9
 UpdateEquippedItem                                         = $8DDFAF
 DrawProgressIcons                                          = $8DE9C8
@@ -273,7 +270,6 @@ PalettesVanilla_spraux09                                   = $9BD47E
 ; Misc. Data
 ;===================================================================================================
 DungeonMask                                                = $8098C0
-RoomFlagMask                                               = $809900
 GFXSheetPointers_background_bank                           = $80CFC0
 GFXSheetPointers_background_high                           = $80D09F
 GFXSheetPointers_background_low                            = $80D17E
@@ -299,7 +295,6 @@ WorldMap_RedXChars                                         = $8ABF70
 WorldMap_CalculateOAMCoordinates                           = $8AC3B1
 WorldMap_HandleSpriteBlink                                 = $8AC52E
 WorldMapIcon_AdjustCoordinate                              = $8AC59B
-WorldMap_LightWorldTilemap                                 = $8AC739
 WorldMap_DarkWorldTilemap                                  = $8AD739
 DungeonMapRoomMarkerYBase                                  = $8AE803
 DungeonMapBossRooms                                        = $8AE817