mistook sprout tower pillar for minecart graphics

This commit is contained in:
yenatch
2013-05-22 17:07:18 -04:00
parent 103ac439ed
commit 122e243624
11 changed files with 52 additions and 52 deletions

104
main.asm
View File

@@ -17579,16 +17579,16 @@ Tileset29Anim: ; 0xfc233
Tileset23Anim: ; 0xfc27f Tileset23Anim: ; 0xfc27f
; param, function ; param, function
dw MinecartTilePointer9, AnimateMinecartTile dw SproutPillarTilePointer9, AnimateSproutPillarTile
dw MinecartTilePointer10, AnimateMinecartTile dw SproutPillarTilePointer10, AnimateSproutPillarTile
dw MinecartTilePointer7, AnimateMinecartTile dw SproutPillarTilePointer7, AnimateSproutPillarTile
dw MinecartTilePointer8, AnimateMinecartTile dw SproutPillarTilePointer8, AnimateSproutPillarTile
dw MinecartTilePointer5, AnimateMinecartTile dw SproutPillarTilePointer5, AnimateSproutPillarTile
dw MinecartTilePointer6, AnimateMinecartTile dw SproutPillarTilePointer6, AnimateSproutPillarTile
dw MinecartTilePointer3, AnimateMinecartTile dw SproutPillarTilePointer3, AnimateSproutPillarTile
dw MinecartTilePointer4, AnimateMinecartTile dw SproutPillarTilePointer4, AnimateSproutPillarTile
dw MinecartTilePointer1, AnimateMinecartTile dw SproutPillarTilePointer1, AnimateSproutPillarTile
dw MinecartTilePointer2, AnimateMinecartTile dw SproutPillarTilePointer2, AnimateSproutPillarTile
dw $0000, NextTileFrame dw $0000, NextTileFrame
dw $0000, WaitTileAnimation dw $0000, WaitTileAnimation
dw $0000, WaitTileAnimation dw $0000, WaitTileAnimation
@@ -18106,7 +18106,7 @@ SafariFountainFrames: ; fc605
; fc645 ; fc645
AnimateMinecartTile: ; fc645 AnimateSproutPillarTile: ; fc645
; Read from struct at de: ; Read from struct at de:
; Destination (VRAM) ; Destination (VRAM)
; Address of the first tile in the frame array ; Address of the first tile in the frame array
@@ -18338,48 +18338,48 @@ TileAnimationPalette: ; fc6d7
INCBIN "baserom.gbc", $fc71e, $fc750 - $fc71e INCBIN "baserom.gbc", $fc71e, $fc750 - $fc71e
MinecartTilePointers: ; fc750 SproutPillarTilePointers: ; fc750
MinecartTilePointer1: SproutPillarTilePointer1:
dw $92d0, MinecartTile1 dw $92d0, SproutPillarTile1
MinecartTilePointer2: SproutPillarTilePointer2:
dw $92f0, MinecartTile2 dw $92f0, SproutPillarTile2
MinecartTilePointer3: SproutPillarTilePointer3:
dw $93d0, MinecartTile3 dw $93d0, SproutPillarTile3
MinecartTilePointer4: SproutPillarTilePointer4:
dw $93f0, MinecartTile4 dw $93f0, SproutPillarTile4
MinecartTilePointer5: SproutPillarTilePointer5:
dw $93c0, MinecartTile5 dw $93c0, SproutPillarTile5
MinecartTilePointer6: SproutPillarTilePointer6:
dw $92c0, MinecartTile6 dw $92c0, SproutPillarTile6
MinecartTilePointer7: SproutPillarTilePointer7:
dw $94d0, MinecartTile7 dw $94d0, SproutPillarTile7
MinecartTilePointer8: SproutPillarTilePointer8:
dw $94f0, MinecartTile8 dw $94f0, SproutPillarTile8
MinecartTilePointer9: SproutPillarTilePointer9:
dw $95d0, MinecartTile9 dw $95d0, SproutPillarTile9
MinecartTilePointer10: SproutPillarTilePointer10:
dw $95f0, MinecartTile10 dw $95f0, SproutPillarTile10
MinecartTile1: SproutPillarTile1:
INCBIN "gfx/tilesets/minecart/1.2bpp" INCBIN "gfx/tilesets/sprout-pillar/1.2bpp"
MinecartTile2: SproutPillarTile2:
INCBIN "gfx/tilesets/minecart/2.2bpp" INCBIN "gfx/tilesets/sprout-pillar/2.2bpp"
MinecartTile3: SproutPillarTile3:
INCBIN "gfx/tilesets/minecart/3.2bpp" INCBIN "gfx/tilesets/sprout-pillar/3.2bpp"
MinecartTile4: SproutPillarTile4:
INCBIN "gfx/tilesets/minecart/4.2bpp" INCBIN "gfx/tilesets/sprout-pillar/4.2bpp"
MinecartTile5: SproutPillarTile5:
INCBIN "gfx/tilesets/minecart/5.2bpp" INCBIN "gfx/tilesets/sprout-pillar/5.2bpp"
MinecartTile6: SproutPillarTile6:
INCBIN "gfx/tilesets/minecart/6.2bpp" INCBIN "gfx/tilesets/sprout-pillar/6.2bpp"
MinecartTile7: SproutPillarTile7:
INCBIN "gfx/tilesets/minecart/7.2bpp" INCBIN "gfx/tilesets/sprout-pillar/7.2bpp"
MinecartTile8: SproutPillarTile8:
INCBIN "gfx/tilesets/minecart/8.2bpp" INCBIN "gfx/tilesets/sprout-pillar/8.2bpp"
MinecartTile9: SproutPillarTile9:
INCBIN "gfx/tilesets/minecart/9.2bpp" INCBIN "gfx/tilesets/sprout-pillar/9.2bpp"
MinecartTile10: SproutPillarTile10:
INCBIN "gfx/tilesets/minecart/10.2bpp" INCBIN "gfx/tilesets/sprout-pillar/10.2bpp"
; fca98 ; fca98