Big enemizer updates

Fix sheets
Health + damage rando
Logical kill rooms
This commit is contained in:
aerinon
2023-03-30 16:12:46 -06:00
parent d85a63ece1
commit a0b781521f
22 changed files with 2224 additions and 947 deletions

View File

@@ -2,10 +2,14 @@ from source.dungeon.EnemyList import Sprite, EnemySprite
vanilla_sprites_ow = {}
def create_sprite(area_id, kind, tile_x, tile_y, region=None, address=None):
def create_sprite(area_id, kind, tile_x, tile_y, region=None, address=None, fix=True, water=False):
if area_id not in vanilla_sprites_ow:
vanilla_sprites_ow[area_id] = []
sprite = Sprite(area_id, kind, 0, 0, tile_x, tile_y, region, False, None)
if water:
sprite.water = True
if fix:
sprite.static = True
sprite.original_address = address
vanilla_sprites_ow[area_id].append(sprite)
@@ -76,7 +80,7 @@ def init_vanilla_sprites_ow():
create_sprite(0x4a, EnemySprite.Ropa, 0x0E, 0x18, '', 0x09CBEE)
create_sprite(0x4a, EnemySprite.Stal, 0x14, 0x1A, '', 0x09CBF1)
# Screen4F:
create_sprite(0x4f, EnemySprite.FireballZora, 0x19, 0x08, '', 0x09CBF5)
create_sprite(0x4f, EnemySprite.FireballZora, 0x19, 0x08, '', 0x09CBF5, water=True)
create_sprite(0x4f, EnemySprite.Catfish, 0x04, 0x0B, '', 0x09CBF8)
create_sprite(0x4f, EnemySprite.Stal, 0x18, 0x0D, '', 0x09CBFB)
create_sprite(0x4f, EnemySprite.Ropa, 0x1A, 0x11, '', 0x09CBFE)
@@ -123,13 +127,13 @@ def init_vanilla_sprites_ow():
create_sprite(0x55, EnemySprite.Bee, 0x0A, 0x1A, '', 0x09CC6D)
create_sprite(0x55, EnemySprite.Ropa, 0x1A, 0x1B, '', 0x09CC70)
# Screen56:
create_sprite(0x56, EnemySprite.FireballZora, 0x0A, 0x06, '', 0x09CC74)
create_sprite(0x56, EnemySprite.FireballZora, 0x13, 0x0A, '', 0x09CC77)
create_sprite(0x56, EnemySprite.FireballZora, 0x0A, 0x06, '', 0x09CC74, water=True)
create_sprite(0x56, EnemySprite.FireballZora, 0x13, 0x0A, '', 0x09CC77, water=True)
create_sprite(0x56, EnemySprite.Bee, 0x04, 0x0E, '', 0x09CC7A)
create_sprite(0x56, EnemySprite.Ropa, 0x11, 0x17, '', 0x09CC7D)
create_sprite(0x56, EnemySprite.Ropa, 0x05, 0x1A, '', 0x09CC80)
# Screen57:
create_sprite(0x57, EnemySprite.FireballZora, 0x0C, 0x04, '', 0x09CC84)
create_sprite(0x57, EnemySprite.FireballZora, 0x0C, 0x04, '', 0x09CC84, water=True)
create_sprite(0x57, EnemySprite.Octorok, 0x16, 0x08, '', 0x09CC87)
create_sprite(0x57, EnemySprite.Octorok, 0x18, 0x0A, '', 0x09CC8A)
create_sprite(0x57, EnemySprite.Octorok, 0x0E, 0x0E, '', 0x09CC8D)
@@ -257,17 +261,17 @@ def init_vanilla_sprites_ow():
create_sprite(0x6f, EnemySprite.Stal, 0x09, 0x17, '', 0x09CDDD)
# Screen70:
create_sprite(0x70, EnemySprite.Raven, 0x21, 0x1B, '', 0x09CDE1)
create_sprite(0x70, EnemySprite.FireballZora, 0x2B, 0x1C, '', 0x09CDE4)
create_sprite(0x70, EnemySprite.FireballZora, 0x12, 0x21, '', 0x09CDE7)
create_sprite(0x70, EnemySprite.Swamola, 0x1B, 0x24, '', 0x09CDEA)
create_sprite(0x70, EnemySprite.Swamola, 0x10, 0x27, '', 0x09CDED)
create_sprite(0x70, EnemySprite.FireballZora, 0x2B, 0x1C, '', 0x09CDE4, water=True)
create_sprite(0x70, EnemySprite.FireballZora, 0x12, 0x21, '', 0x09CDE7, water=True)
create_sprite(0x70, EnemySprite.Swamola, 0x1B, 0x24, '', 0x09CDEA, water=True)
create_sprite(0x70, EnemySprite.Swamola, 0x10, 0x27, '', 0x09CDED, water=True)
create_sprite(0x70, EnemySprite.Raven, 0x07, 0x28, '', 0x09CDF0)
create_sprite(0x70, EnemySprite.FireballZora, 0x16, 0x2B, '', 0x09CDF3)
create_sprite(0x70, EnemySprite.FireballZora, 0x1E, 0x2E, '', 0x09CDF6)
create_sprite(0x70, EnemySprite.Swamola, 0x17, 0x33, '', 0x09CDF9)
create_sprite(0x70, EnemySprite.FireballZora, 0x11, 0x38, '', 0x09CDFC)
create_sprite(0x70, EnemySprite.FireballZora, 0x23, 0x2B, '', 0x09CDFF)
create_sprite(0x70, EnemySprite.Swamola, 0x27, 0x2C, '', 0x09CE02)
create_sprite(0x70, EnemySprite.FireballZora, 0x16, 0x2B, '', 0x09CDF3, water=True)
create_sprite(0x70, EnemySprite.FireballZora, 0x1E, 0x2E, '', 0x09CDF6, water=True)
create_sprite(0x70, EnemySprite.Swamola, 0x17, 0x33, '', 0x09CDF9, water=True)
create_sprite(0x70, EnemySprite.FireballZora, 0x11, 0x38, '', 0x09CDFC, water=True)
create_sprite(0x70, EnemySprite.FireballZora, 0x23, 0x2B, '', 0x09CDFF, water=True)
create_sprite(0x70, EnemySprite.Swamola, 0x27, 0x2C, '', 0x09CE02, water=True)
# Screen72:
create_sprite(0x72, EnemySprite.TalkingTree, 0x1B, 0x0B, '', 0x09CE06)
create_sprite(0x72, EnemySprite.BlueGuard, 0x10, 0x0D, '', 0x09CE09)
@@ -293,31 +297,31 @@ def init_vanilla_sprites_ow():
create_sprite(0x75, EnemySprite.BlueGuard, 0x09, 0x07, '', 0x09CE3F)
create_sprite(0x75, EnemySprite.BlueGuard, 0x0B, 0x09, '', 0x09CE42)
create_sprite(0x75, EnemySprite.Octorok, 0x07, 0x13, '', 0x09CE45)
create_sprite(0x75, EnemySprite.GreenZirro, 0x18, 0x16, '', 0x09CE48)
create_sprite(0x75, EnemySprite.GreenZirro, 0x18, 0x16, '', 0x09CE48, water=True)
create_sprite(0x75, EnemySprite.Pikit, 0x09, 0x17, '', 0x09CE4B)
create_sprite(0x75, EnemySprite.FireballZora, 0x30, 0x0C, '', 0x09CE4E)
create_sprite(0x75, EnemySprite.FireballZora, 0x30, 0x0C, '', 0x09CE4E, water=True)
create_sprite(0x75, EnemySprite.BlueZirro, 0x29, 0x11, '', 0x09CE51)
create_sprite(0x75, EnemySprite.GreenZirro, 0x36, 0x15, '', 0x09CE54)
create_sprite(0x75, EnemySprite.Pikit, 0x31, 0x1F, '', 0x09CE57)
create_sprite(0x75, EnemySprite.FireballZora, 0x1B, 0x22, '', 0x09CE5A)
create_sprite(0x75, EnemySprite.GreenZirro, 0x14, 0x28, '', 0x09CE5D)
create_sprite(0x75, EnemySprite.FireballZora, 0x1B, 0x22, '', 0x09CE5A, water=True)
create_sprite(0x75, EnemySprite.GreenZirro, 0x14, 0x28, '', 0x09CE5D, water=True)
create_sprite(0x75, EnemySprite.Pikit, 0x16, 0x2E, '', 0x09CE60)
create_sprite(0x75, EnemySprite.GreenZirro, 0x19, 0x32, '', 0x09CE63)
create_sprite(0x75, EnemySprite.BlueZirro, 0x0A, 0x35, '', 0x09CE66)
create_sprite(0x75, EnemySprite.Ropa, 0x08, 0x39, '', 0x09CE69)
create_sprite(0x75, EnemySprite.FireballZora, 0x1B, 0x39, '', 0x09CE6C)
create_sprite(0x75, EnemySprite.FireballZora, 0x1B, 0x39, '', 0x09CE6C, water=True)
create_sprite(0x75, EnemySprite.Pikit, 0x2A, 0x26, '', 0x09CE6F)
create_sprite(0x75, EnemySprite.GreenZirro, 0x32, 0x28, '', 0x09CE72)
create_sprite(0x75, EnemySprite.FireballZora, 0x2A, 0x2C, '', 0x09CE75)
create_sprite(0x75, EnemySprite.FireballZora, 0x32, 0x35, '', 0x09CE78)
create_sprite(0x75, EnemySprite.FireballZora, 0x2A, 0x2C, '', 0x09CE75, water=True)
create_sprite(0x75, EnemySprite.FireballZora, 0x32, 0x35, '', 0x09CE78, water=True)
create_sprite(0x75, EnemySprite.Octorok, 0x37, 0x39, '', 0x09CE7B)
# Screen77:
create_sprite(0x77, EnemySprite.Octorok, 0x11, 0x08, '', 0x09CE7F)
create_sprite(0x77, EnemySprite.Stal, 0x09, 0x0A, '', 0x09CE82)
create_sprite(0x77, EnemySprite.BlueZirro, 0x0D, 0x0B, '', 0x09CE85)
create_sprite(0x77, EnemySprite.Octorok, 0x18, 0x11, '', 0x09CE88)
create_sprite(0x77, EnemySprite.FireballZora, 0x07, 0x12, '', 0x09CE8B)
create_sprite(0x77, EnemySprite.FireballZora, 0x12, 0x19, '', 0x09CE8E)
create_sprite(0x77, EnemySprite.FireballZora, 0x07, 0x12, '', 0x09CE8B, water=True)
create_sprite(0x77, EnemySprite.FireballZora, 0x12, 0x19, '', 0x09CE8E, water=True)
# Screen7A:
create_sprite(0x7a, EnemySprite.Hinox, 0x06, 0x07, '', 0x09CE92)
create_sprite(0x7a, EnemySprite.Ropa, 0x16, 0x09, '', 0x09CE95)
@@ -341,7 +345,7 @@ def init_vanilla_sprites_ow():
create_sprite(0x7f, EnemySprite.GreenZirro, 0x10, 0x06, '', 0x09CEC5)
create_sprite(0x7f, EnemySprite.Octorok, 0x16, 0x06, '', 0x09CEC8)
create_sprite(0x7f, EnemySprite.Whirlpool, 0x07, 0x0C, '', 0x09CECB)
create_sprite(0x7f, EnemySprite.FireballZora, 0x07, 0x0E, '', 0x09CECE)
create_sprite(0x7f, EnemySprite.FireballZora, 0x07, 0x0E, '', 0x09CECE, water=True)
create_sprite(0x7f, EnemySprite.GreenZirro, 0x0D, 0x13, '', 0x09CED1)
create_sprite(0x7f, EnemySprite.Pikit, 0x16, 0x14, '', 0x09CED4)
create_sprite(0x7f, EnemySprite.Octorok, 0x0F, 0x17, '', 0x09CED7)
@@ -356,34 +360,34 @@ def init_vanilla_sprites_ow():
create_sprite(0x80, EnemySprite.Hobo, 0x16, 0x04, '', 0x09CEF0)
# Screen81:
create_sprite(0x81, EnemySprite.HeartPiece, 0x1B, 0x26, '', 0x09CEF4)
create_sprite(0x81, EnemySprite.Zora, 0x0A, 0x06, '', 0x09CEF7)
create_sprite(0x81, EnemySprite.Zora, 0x1C, 0x06, '', 0x09CEFA)
create_sprite(0x81, EnemySprite.FireballZora, 0x11, 0x07, '', 0x09CEFD)
create_sprite(0x81, EnemySprite.Zora, 0x16, 0x0A, '', 0x09CF00)
create_sprite(0x81, EnemySprite.FireballZora, 0x1A, 0x0A, '', 0x09CF03)
create_sprite(0x81, EnemySprite.FireballZora, 0x09, 0x0C, '', 0x09CF06)
create_sprite(0x81, EnemySprite.FireballZora, 0x12, 0x0D, '', 0x09CF09)
create_sprite(0x81, EnemySprite.Zora, 0x1A, 0x12, '', 0x09CF0C)
create_sprite(0x81, EnemySprite.Zora, 0x07, 0x13, '', 0x09CF0F)
create_sprite(0x81, EnemySprite.Zora, 0x14, 0x13, '', 0x09CF12)
create_sprite(0x81, EnemySprite.Zora, 0x08, 0x18, '', 0x09CF15)
create_sprite(0x81, EnemySprite.Zora, 0x04, 0x1C, '', 0x09CF18)
create_sprite(0x81, EnemySprite.Zora, 0x0A, 0x06, '', 0x09CEF7, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x1C, 0x06, '', 0x09CEFA, water=True)
create_sprite(0x81, EnemySprite.FireballZora, 0x11, 0x07, '', 0x09CEFD, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x16, 0x0A, '', 0x09CF00, water=True)
create_sprite(0x81, EnemySprite.FireballZora, 0x1A, 0x0A, '', 0x09CF03, water=True)
create_sprite(0x81, EnemySprite.FireballZora, 0x09, 0x0C, '', 0x09CF06, water=True)
create_sprite(0x81, EnemySprite.FireballZora, 0x12, 0x0D, '', 0x09CF09, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x1A, 0x12, '', 0x09CF0C, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x07, 0x13, '', 0x09CF0F, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x14, 0x13, '', 0x09CF12, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x08, 0x18, '', 0x09CF15, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x04, 0x1C, '', 0x09CF18, water=True)
create_sprite(0x81, EnemySprite.KingZora, 0x3B, 0x04, '', 0x09CF1B)
create_sprite(0x81, EnemySprite.FireballZora, 0x27, 0x08, '', 0x09CF1E)
create_sprite(0x81, EnemySprite.FireballZora, 0x2D, 0x08, '', 0x09CF21)
create_sprite(0x81, EnemySprite.Zora, 0x22, 0x0E, '', 0x09CF24)
create_sprite(0x81, EnemySprite.FireballZora, 0x2D, 0x0E, '', 0x09CF27)
create_sprite(0x81, EnemySprite.FireballZora, 0x21, 0x14, '', 0x09CF2A)
create_sprite(0x81, EnemySprite.Zora, 0x0D, 0x20, '', 0x09CF2D)
create_sprite(0x81, EnemySprite.Zora, 0x08, 0x31, '', 0x09CF30)
create_sprite(0x81, EnemySprite.FireballZora, 0x14, 0x31, '', 0x09CF33)
create_sprite(0x81, EnemySprite.Zora, 0x0C, 0x33, '', 0x09CF36)
create_sprite(0x81, EnemySprite.FireballZora, 0x0E, 0x35, '', 0x09CF39)
create_sprite(0x81, EnemySprite.Zora, 0x08, 0x38, '', 0x09CF3C)
create_sprite(0x81, EnemySprite.Zora, 0x3B, 0x28, '', 0x09CF3F)
create_sprite(0x81, EnemySprite.Zora, 0x3A, 0x2B, '', 0x09CF42)
create_sprite(0x81, EnemySprite.Zora, 0x2D, 0x35, '', 0x09CF45)
create_sprite(0x81, EnemySprite.Zora, 0x37, 0x36, '', 0x09CF48)
create_sprite(0x81, EnemySprite.FireballZora, 0x27, 0x08, '', 0x09CF1E, water=True)
create_sprite(0x81, EnemySprite.FireballZora, 0x2D, 0x08, '', 0x09CF21, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x22, 0x0E, '', 0x09CF24, water=True)
create_sprite(0x81, EnemySprite.FireballZora, 0x2D, 0x0E, '', 0x09CF27, water=True)
create_sprite(0x81, EnemySprite.FireballZora, 0x21, 0x14, '', 0x09CF2A, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x0D, 0x20, '', 0x09CF2D, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x08, 0x31, '', 0x09CF30, water=True)
create_sprite(0x81, EnemySprite.FireballZora, 0x14, 0x31, '', 0x09CF33, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x0C, 0x33, '', 0x09CF36, water=True)
create_sprite(0x81, EnemySprite.FireballZora, 0x0E, 0x35, '', 0x09CF39, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x08, 0x38, '', 0x09CF3C, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x3B, 0x28, '', 0x09CF3F, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x3A, 0x2B, '', 0x09CF42, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x2D, 0x35, '', 0x09CF45, water=True)
create_sprite(0x81, EnemySprite.Zora, 0x37, 0x36, '', 0x09CF48, water=True)
# Screen00_1:
create_sprite(0x0, EnemySprite.FakeMasterSword, 0x07, 0x12, '', 0x09CF4C)
create_sprite(0x0, EnemySprite.Raven, 0x12, 0x0B, '', 0x09CF4F)
@@ -450,7 +454,7 @@ def init_vanilla_sprites_ow():
# Screen0F_1:
create_sprite(0xf, EnemySprite.Waterfall, 0x06, 0x02, '', 0x09CFFD)
create_sprite(0xf, EnemySprite.Crab, 0x0D, 0x0D, '', 0x09D000)
create_sprite(0xf, EnemySprite.FireballZora, 0x05, 0x10, '', 0x09D003)
create_sprite(0xf, EnemySprite.FireballZora, 0x05, 0x10, '', 0x09D003, water=True)
create_sprite(0xf, EnemySprite.Crab, 0x11, 0x12, '', 0x09D006)
create_sprite(0xf, EnemySprite.Whirlpool, 0x08, 0x13, '', 0x09D009)
create_sprite(0xf, EnemySprite.Raven, 0x1C, 0x15, '', 0x09D00C)
@@ -513,9 +517,10 @@ def init_vanilla_sprites_ow():
create_sprite(0x1a, EnemySprite.GreenGuard, 0x0C, 0x0E, '', 0x09D0A3)
create_sprite(0x1a, EnemySprite.Faerie, 0x0D, 0x11, '', 0x09D0A6)
create_sprite(0x1a, EnemySprite.BlueRupee, 0x17, 0x17, '', 0x09D0A9)
create_sprite(0x1a, EnemySprite.SmallHeart, 0x0A, 0x18, '', 0x09D0AC)
create_sprite(0x1a, EnemySprite.RedSpearGuard, 0x0F, 0x18, '', 0x09D0AF)
# create_sprite(0x1a, EnemySprite.SmallHeart, 0x0A, 0x18, '', 0x09D0AC)
create_sprite(0x1a, EnemySprite.RedSpearGuard, 0x0F, 0x18, '', 0x09D0AC) # was 0x09D0AF
# Screen1B_1:
create_sprite(0x1b, EnemySprite.Wiseman, 0x19, 0x12, '', 0x09D0B0)
create_sprite(0x1b, EnemySprite.LightningGate, 0x1F, 0x06, '', 0x09D0B3)
create_sprite(0x1b, EnemySprite.RedBushGuard, 0x09, 0x11, '', 0x09D0B6)
create_sprite(0x1b, EnemySprite.RedBushGuard, 0x0A, 0x13, '', 0x09D0B9)
@@ -556,7 +561,7 @@ def init_vanilla_sprites_ow():
create_sprite(0x1e, EnemySprite.ArmosStatue, 0x3D, 0x29, '', 0x09D11E)
create_sprite(0x1e, EnemySprite.Octorok, 0x2E, 0x3B, '', 0x09D121)
# Screen22_1:
create_sprite(0x22, EnemySprite.BunnyBeam, 0x0C, 0x04, '', 0x09D125)
create_sprite(0x22, EnemySprite.BunnyBeam, 0x0C, 0x04, '', 0x09D125, fix=True) # smithy smoke
create_sprite(0x22, EnemySprite.GreenGuard, 0x17, 0x12, '', 0x09D128)
create_sprite(0x22, EnemySprite.Cucco, 0x12, 0x14, '', 0x09D12B)
# Screen25_1:
@@ -595,7 +600,7 @@ def init_vanilla_sprites_ow():
# Screen2E_1:
create_sprite(0x2e, EnemySprite.BlueGuard, 0x0E, 0x0C, '', 0x09D186)
create_sprite(0x2e, EnemySprite.BlueGuard, 0x17, 0x0E, '', 0x09D189)
create_sprite(0x2e, EnemySprite.FireballZora, 0x05, 0x12, '', 0x09D18C)
create_sprite(0x2e, EnemySprite.FireballZora, 0x05, 0x12, '', 0x09D18C, water=True)
create_sprite(0x2e, EnemySprite.Octorok, 0x19, 0x17, '', 0x09D18F)
# Screen2F_1:
create_sprite(0x2f, EnemySprite.BlueGuard, 0x0F, 0x0C, '', 0x09D193)
@@ -650,30 +655,30 @@ def init_vanilla_sprites_ow():
create_sprite(0x35, EnemySprite.HeartPiece, 0x19, 0x13, '', 0x09D21C)
create_sprite(0x35, EnemySprite.Buzzblob, 0x19, 0x14, '', 0x09D21F)
create_sprite(0x35, EnemySprite.Crab, 0x07, 0x17, '', 0x09D222)
create_sprite(0x35, EnemySprite.FireballZora, 0x11, 0x17, '', 0x09D225)
create_sprite(0x35, EnemySprite.FireballZora, 0x25, 0x0D, '', 0x09D228)
create_sprite(0x35, EnemySprite.FireballZora, 0x11, 0x17, '', 0x09D225, water=True)
create_sprite(0x35, EnemySprite.FireballZora, 0x25, 0x0D, '', 0x09D228, water=True)
create_sprite(0x35, EnemySprite.Buzzblob, 0x27, 0x1F, '', 0x09D22B)
create_sprite(0x35, EnemySprite.Buzzblob, 0x2F, 0x1F, '', 0x09D22E)
create_sprite(0x35, EnemySprite.Octorok, 0x0A, 0x35, '', 0x09D231)
create_sprite(0x35, EnemySprite.FireballZora, 0x14, 0x35, '', 0x09D234)
create_sprite(0x35, EnemySprite.FireballZora, 0x14, 0x35, '', 0x09D234, water=True)
create_sprite(0x35, EnemySprite.Raven, 0x0F, 0x35, '', 0x09D237)
create_sprite(0x35, EnemySprite.Octorok, 0x0B, 0x39, '', 0x09D23A)
create_sprite(0x35, EnemySprite.Buzzblob, 0x19, 0x3A, '', 0x09D23D)
create_sprite(0x35, EnemySprite.Crab, 0x11, 0x3B, '', 0x09D240)
create_sprite(0x35, EnemySprite.FireballZora, 0x24, 0x2B, '', 0x09D243)
create_sprite(0x35, EnemySprite.FireballZora, 0x24, 0x2B, '', 0x09D243, water=True)
create_sprite(0x35, EnemySprite.Whirlpool, 0x29, 0x2B, '', 0x09D246)
create_sprite(0x35, EnemySprite.FireballZora, 0x39, 0x31, '', 0x09D249)
create_sprite(0x35, EnemySprite.FireballZora, 0x21, 0x36, '', 0x09D24C)
create_sprite(0x35, EnemySprite.FireballZora, 0x39, 0x31, '', 0x09D249, water=True)
create_sprite(0x35, EnemySprite.FireballZora, 0x21, 0x36, '', 0x09D24C, water=True)
create_sprite(0x35, EnemySprite.Buzzblob, 0x32, 0x37, '', 0x09D24F)
create_sprite(0x35, EnemySprite.Buzzblob, 0x34, 0x39, '', 0x09D252)
create_sprite(0x35, EnemySprite.Crab, 0x2E, 0x3A, '', 0x09D255)
# Screen37_1:
create_sprite(0x35, EnemySprite.Crab, 0x08, 0x08, '', 0x09D259)
create_sprite(0x35, EnemySprite.Crab, 0x10, 0x08, '', 0x09D25C)
create_sprite(0x37, EnemySprite.Crab, 0x08, 0x08, '', 0x09D259)
create_sprite(0x37, EnemySprite.Crab, 0x10, 0x08, '', 0x09D25C)
create_sprite(0x37, EnemySprite.Crab, 0x0F, 0x0B, '', 0x09D25F)
create_sprite(0x37, EnemySprite.Crab, 0x16, 0x11, '', 0x09D262)
create_sprite(0x37, EnemySprite.Raven, 0x0C, 0x15, '', 0x09D265)
create_sprite(0x37, EnemySprite.FireballZora, 0x12, 0x19, '', 0x09D268)
create_sprite(0x37, EnemySprite.FireballZora, 0x12, 0x19, '', 0x09D268, water=True)
# Screen3A_1:
create_sprite(0x3a, EnemySprite.Locksmith, 0x17, 0x05, '', 0x09D26C)
create_sprite(0x3a, EnemySprite.Raven, 0x0E, 0x09, '', 0x09D26F)
@@ -682,10 +687,10 @@ def init_vanilla_sprites_ow():
# Screen3B_1:
create_sprite(0x3b, EnemySprite.GreenBushGuard, 0x13, 0x06, '', 0x09D279)
create_sprite(0x3b, EnemySprite.BlueArcher, 0x0C, 0x0A, '', 0x09D27C)
create_sprite(0x3b, EnemySprite.FloppingFish, 0x13, 0x0D, '', 0x09D27F)
create_sprite(0x3b, EnemySprite.FloppingFish, 0x13, 0x0D, '', 0x09D27F, water=True)
create_sprite(0x3b, EnemySprite.Raven, 0x08, 0x0B, '', 0x09D282)
create_sprite(0x3b, EnemySprite.HeartPiece, 0x14, 0x0E, '', 0x09D285)
create_sprite(0x3b, EnemySprite.FloppingFish, 0x1B, 0x10, '', 0x09D288)
create_sprite(0x3b, EnemySprite.FloppingFish, 0x1B, 0x10, '', 0x09D288, water=True)
create_sprite(0x3b, EnemySprite.Toppo, 0x0F, 0x14, '', 0x09D28B)
create_sprite(0x3b, EnemySprite.Raven, 0x14, 0x1B, '', 0x09D28E)
# Screen3C_1:
@@ -699,7 +704,7 @@ def init_vanilla_sprites_ow():
# Screen3F_1:
create_sprite(0x3f, EnemySprite.Octorok, 0x11, 0x04, '', 0x09D2A8)
create_sprite(0x3f, EnemySprite.Octorok, 0x16, 0x05, '', 0x09D2AB)
create_sprite(0x3f, EnemySprite.FireballZora, 0x08, 0x0B, '', 0x09D2AE)
create_sprite(0x3f, EnemySprite.FireballZora, 0x08, 0x0B, '', 0x09D2AE, water=True)
create_sprite(0x3f, EnemySprite.Whirlpool, 0x07, 0x0C, '', 0x09D2B1)
create_sprite(0x3f, EnemySprite.Octoballoon, 0x10, 0x16, '', 0x09D2B4)
# Screen00_2:
@@ -768,8 +773,8 @@ def init_vanilla_sprites_ow():
# Screen0F_2:
create_sprite(0x9f, EnemySprite.Waterfall, 0x06, 0x02, '', 0x09D369)
create_sprite(0x9f, EnemySprite.Crab, 0x0D, 0x0D, '', 0x09D36C)
create_sprite(0x9f, EnemySprite.FireballZora, 0x05, 0x10, '', 0x09D36F)
create_sprite(0x9f, EnemySprite.FireballZora, 0x0A, 0x11, '', 0x09D372)
create_sprite(0x9f, EnemySprite.FireballZora, 0x05, 0x10, '', 0x09D36F, water=True)
create_sprite(0x9f, EnemySprite.FireballZora, 0x0A, 0x11, '', 0x09D372, water=True)
create_sprite(0x9f, EnemySprite.Crab, 0x11, 0x12, '', 0x09D375)
create_sprite(0x9f, EnemySprite.Whirlpool, 0x08, 0x13, '', 0x09D378)
create_sprite(0x9f, EnemySprite.Octorok4Way, 0x0E, 0x17, '', 0x09D37B)
@@ -834,9 +839,10 @@ def init_vanilla_sprites_ow():
create_sprite(0xaa, EnemySprite.BlueGuard, 0x0F, 0x08, '', 0x09D418)
create_sprite(0xaa, EnemySprite.BlueGuard, 0x0C, 0x0E, '', 0x09D41B)
create_sprite(0xaa, EnemySprite.Faerie, 0x0D, 0x11, '', 0x09D41E)
create_sprite(0xaa, EnemySprite.SmallHeart, 0x0A, 0x18, '', 0x09D421)
create_sprite(0xaa, EnemySprite.UsainBolt, 0x0F, 0x18, '', 0x09D424)
# create_sprite(0xaa, EnemySprite.SmallHeart, 0x0A, 0x18, '', 0x09D421)
create_sprite(0xaa, EnemySprite.UsainBolt, 0x0F, 0x18, '', 0x09D421) # was 0x09D424
# Screen1B_2:
create_sprite(0x1b, EnemySprite.Wiseman, 0x19, 0x12, '', 0x09D425)
create_sprite(0xab, EnemySprite.UsainBolt, 0x06, 0x0D, '', 0x09D428)
create_sprite(0xab, EnemySprite.Apple, 0x16, 0x14, '', 0x09D42B)
create_sprite(0xab, EnemySprite.UsainBolt, 0x1F, 0x1A, '', 0x09D42E)
@@ -874,7 +880,7 @@ def init_vanilla_sprites_ow():
create_sprite(0xae, EnemySprite.Faerie, 0x22, 0x37, '', 0x09D48A)
create_sprite(0xae, EnemySprite.UsainBolt, 0x2D, 0x3A, '', 0x09D48D)
# Screen22_2:
create_sprite(0xb2, EnemySprite.BunnyBeam, 0x0C, 0x04, '', 0x09D491)
create_sprite(0xb2, EnemySprite.BunnyBeam, 0x0C, 0x04, '', 0x09D491, fix=True) # smithy smoke
create_sprite(0xb2, EnemySprite.Cucco, 0x0C, 0x14, '', 0x09D494)
create_sprite(0xb2, EnemySprite.Cucco, 0x12, 0x14, '', 0x09D497)
# Screen25_2:
@@ -915,13 +921,13 @@ def init_vanilla_sprites_ow():
create_sprite(0xbd, EnemySprite.Octorok4Way, 0x0F, 0x08, '', 0x09D4F5)
create_sprite(0xbd, EnemySprite.BlueGuard, 0x12, 0x0B, '', 0x09D4F8)
create_sprite(0xbd, EnemySprite.UsainBolt, 0x12, 0x16, '', 0x09D4FB)
create_sprite(0xbd, EnemySprite.FireballZora, 0x1C, 0x17, '', 0x09D4FE)
create_sprite(0xbd, EnemySprite.FireballZora, 0x1C, 0x17, '', 0x09D4FE, water=True)
# Screen2E_2:
create_sprite(0xbe, EnemySprite.Faerie, 0x0C, 0x09, '', 0x09D502)
create_sprite(0xbe, EnemySprite.Bee, 0x14, 0x0B, '', 0x09D505)
create_sprite(0xbe, EnemySprite.UsainBolt, 0x0E, 0x0C, '', 0x09D508)
create_sprite(0xbe, EnemySprite.BlueGuard, 0x17, 0x0E, '', 0x09D50B)
create_sprite(0xbe, EnemySprite.FireballZora, 0x05, 0x12, '', 0x09D50E)
create_sprite(0xbe, EnemySprite.FireballZora, 0x05, 0x12, '', 0x09D50E, water=True)
create_sprite(0xbe, EnemySprite.Octorok, 0x19, 0x17, '', 0x09D511)
# Screen2F_2:
create_sprite(0xbf, EnemySprite.UsainBolt, 0x0F, 0x0C, '', 0x09D515)
@@ -973,22 +979,22 @@ def init_vanilla_sprites_ow():
create_sprite(0xc5, EnemySprite.UsainBolt, 0x0A, 0x0C, '', 0x09D595)
create_sprite(0xc5, EnemySprite.HeartPiece, 0x19, 0x13, '', 0x09D598)
create_sprite(0xc5, EnemySprite.Buzzblob, 0x19, 0x14, '', 0x09D59B)
create_sprite(0xc5, EnemySprite.FireballZora, 0x11, 0x17, '', 0x09D59E)
create_sprite(0xc5, EnemySprite.FireballZora, 0x11, 0x17, '', 0x09D59E, water=True)
create_sprite(0xc5, EnemySprite.Octorok4Way, 0x38, 0x0A, '', 0x09D5A1)
create_sprite(0xc5, EnemySprite.FireballZora, 0x25, 0x0D, '', 0x09D5A4)
create_sprite(0xc5, EnemySprite.FireballZora, 0x37, 0x19, '', 0x09D5A7)
create_sprite(0xc5, EnemySprite.FireballZora, 0x25, 0x0D, '', 0x09D5A4, water=True)
create_sprite(0xc5, EnemySprite.FireballZora, 0x37, 0x19, '', 0x09D5A7, water=True)
create_sprite(0xc5, EnemySprite.Buzzblob, 0x27, 0x1F, '', 0x09D5AA)
create_sprite(0xc5, EnemySprite.Buzzblob, 0x2F, 0x1F, '', 0x09D5AD)
create_sprite(0xc5, EnemySprite.FireballZora, 0x1B, 0x26, '', 0x09D5B0)
create_sprite(0xc5, EnemySprite.FireballZora, 0x1B, 0x26, '', 0x09D5B0, water=True)
create_sprite(0xc5, EnemySprite.Raven, 0x0D, 0x2F, '', 0x09D5B3)
create_sprite(0xc5, EnemySprite.Octorok, 0x06, 0x34, '', 0x09D5B6)
create_sprite(0xc5, EnemySprite.Octorok, 0x0A, 0x35, '', 0x09D5B9)
create_sprite(0xc5, EnemySprite.FireballZora, 0x14, 0x35, '', 0x09D5BC)
create_sprite(0xc5, EnemySprite.FireballZora, 0x14, 0x35, '', 0x09D5BC, water=True)
create_sprite(0xc5, EnemySprite.Octorok, 0x0B, 0x39, '', 0x09D5BF)
create_sprite(0xc5, EnemySprite.Buzzblob, 0x19, 0x3A, '', 0x09D5C2)
create_sprite(0xc5, EnemySprite.Whirlpool, 0x29, 0x2B, '', 0x09D5C5)
create_sprite(0xc5, EnemySprite.FireballZora, 0x39, 0x31, '', 0x09D5C8)
create_sprite(0xc5, EnemySprite.FireballZora, 0x21, 0x36, '', 0x09D5CB)
create_sprite(0xc5, EnemySprite.FireballZora, 0x39, 0x31, '', 0x09D5C8, water=True)
create_sprite(0xc5, EnemySprite.FireballZora, 0x21, 0x36, '', 0x09D5CB, water=True)
create_sprite(0xc5, EnemySprite.Buzzblob, 0x32, 0x37, '', 0x09D5CE)
create_sprite(0xc5, EnemySprite.Buzzblob, 0x34, 0x39, '', 0x09D5D1)
# Screen37_2:
@@ -996,7 +1002,7 @@ def init_vanilla_sprites_ow():
create_sprite(0xc7, EnemySprite.Crab, 0x10, 0x08, '', 0x09D5D8)
create_sprite(0xc7, EnemySprite.Crab, 0x0F, 0x0B, '', 0x09D5DB)
create_sprite(0xc7, EnemySprite.Crab, 0x16, 0x11, '', 0x09D5DE)
create_sprite(0xc7, EnemySprite.FireballZora, 0x12, 0x19, '', 0x09D5E1)
create_sprite(0xc7, EnemySprite.FireballZora, 0x12, 0x19, '', 0x09D5E1, water=True)
# Screen3A_2:
create_sprite(0xca, EnemySprite.Locksmith, 0x17, 0x05, '', 0x09D5E5)
create_sprite(0xca, EnemySprite.Hoarder2, 0x0B, 0x0A, '', 0x09D5E8)
@@ -1007,7 +1013,7 @@ def init_vanilla_sprites_ow():
create_sprite(0xca, EnemySprite.UsainBolt, 0x11, 0x0F, '', 0x09D5F7)
create_sprite(0xca, EnemySprite.Hoarder2, 0x17, 0x17, '', 0x09D5FA)
# Screen3B_2:
create_sprite(0xcb, EnemySprite.FloppingFish, 0x13, 0x0D, '', 0x09D5FE)
create_sprite(0xcb, EnemySprite.FloppingFish, 0x13, 0x0D, '', 0x09D5FE, water=True)
create_sprite(0xcb, EnemySprite.Octorok, 0x0C, 0x0F, '', 0x09D601)
create_sprite(0xcb, EnemySprite.HeartPiece, 0x14, 0x0E, '', 0x09D604)
create_sprite(0xcb, EnemySprite.Octorok4Way, 0x0F, 0x14, '', 0x09D607)
@@ -1022,5 +1028,5 @@ def init_vanilla_sprites_ow():
# Screen3F_2:
create_sprite(0xcf, EnemySprite.Octorok4Way, 0x16, 0x05, '', 0x09D621)
create_sprite(0xcf, EnemySprite.Whirlpool, 0x07, 0x0C, '', 0x09D624)
create_sprite(0xcf, EnemySprite.FireballZora, 0x06, 0x13, '', 0x09D627)
create_sprite(0xcf, EnemySprite.FireballZora, 0x06, 0x13, '', 0x09D627, water=True)
create_sprite(0xcf, EnemySprite.Octoballoon, 0x11, 0x16, '', 0x09D62A)