diff --git a/src/constants/object_constants.asm b/src/constants/object_constants.asm index 44f8e2f..b7e8aac 100644 --- a/src/constants/object_constants.asm +++ b/src/constants/object_constants.asm @@ -79,95 +79,95 @@ DEF INTERACTION_DOWN EQU (1 << INTERACTION_DOWN_F) ; $80 ; object interaction types const_def - const OBJ_INTERACTION_00 ; $00 - const OBJ_INTERACTION_01 ; $01 - const OBJ_INTERACTION_FRONT_STING ; $02 - const OBJ_INTERACTION_BACK_STING ; $03 - const OBJ_INTERACTION_TOP_STING ; $04 - const OBJ_INTERACTION_FULL_STING ; $05 - const OBJ_INTERACTION_06 ; $06 - const OBJ_INTERACTION_07 ; $07 - const OBJ_INTERACTION_08 ; $08 - const OBJ_INTERACTION_09 ; $09 - const OBJ_INTERACTION_0A ; $0a - const OBJ_INTERACTION_0B ; $0b - const OBJ_INTERACTION_WALKABLE ; $0c - const OBJ_INTERACTION_MUSICAL_COIN ; $0d - const OBJ_INTERACTION_FIRE ; $0e - const OBJ_INTERACTION_RICHTERTOFFEN ; $0f - const OBJ_INTERACTION_GREY_KEY ; $10 - const OBJ_INTERACTION_RED_KEY ; $11 - const OBJ_INTERACTION_GREEN_KEY ; $12 - const OBJ_INTERACTION_BLUE_KEY ; $13 - const OBJ_INTERACTION_GREY_TREASURE ; $14 - const OBJ_INTERACTION_RED_TREASURE ; $15 - const OBJ_INTERACTION_GREEN_TREASURE ; $16 - const OBJ_INTERACTION_BLUE_TREASURE ; $17 - const OBJ_INTERACTION_18 ; $18 - const OBJ_INTERACTION_19 ; $19 - const OBJ_INTERACTION_1A ; $1a - const OBJ_INTERACTION_REGULAR_COIN ; $1b - const OBJ_INTERACTION_ELECTRIC ; $1c - const OBJ_INTERACTION_1D ; $1d - const OBJ_INTERACTION_1E ; $1e - const OBJ_INTERACTION_1F ; $1f - const OBJ_INTERACTION_BOUNCY ; $20 - const OBJ_INTERACTION_21 ; $21 - const OBJ_INTERACTION_SOLID ; $22 - const OBJ_INTERACTION_23 ; $23 - const OBJ_INTERACTION_24 ; $24 - const OBJ_INTERACTION_VAMPIRE ; $25 - const OBJ_INTERACTION_BUBBLE ; $26 - const OBJ_INTERACTION_ICE ; $27 - const OBJ_INTERACTION_OWL ; $28 - const OBJ_INTERACTION_RAIL ; $29 - const OBJ_INTERACTION_2A ; $2a - const OBJ_INTERACTION_2B ; $2b - const OBJ_INTERACTION_2C ; $2c - const OBJ_INTERACTION_2D ; $2d - const OBJ_INTERACTION_UNLIT_TORCH ; $2e - const OBJ_INTERACTION_STOVE ; $2f - const OBJ_INTERACTION_30 ; $30 - const OBJ_INTERACTION_31 ; $31 - const OBJ_INTERACTION_32 ; $32 - const OBJ_INTERACTION_33 ; $33 - const OBJ_INTERACTION_WORMWOULD ; $34 - const OBJ_INTERACTION_35 ; $35 - const OBJ_INTERACTION_36 ; $36 - const OBJ_INTERACTION_37 ; $37 - const OBJ_INTERACTION_38 ; $38 - const OBJ_INTERACTION_WATER_DROP ; $39 - const OBJ_INTERACTION_3A ; $3a - const OBJ_INTERACTION_3B ; $3b - const OBJ_INTERACTION_3C ; $3c - const OBJ_INTERACTION_3D ; $3d - const OBJ_INTERACTION_PRINCE_FROGGY ; $3e - const OBJ_INTERACTION_3F ; $3f - const OBJ_INTERACTION_WATER_TELEPORTING ; $40 - const OBJ_INTERACTION_41 ; $41 - const OBJ_INTERACTION_42 ; $42 - const OBJ_INTERACTION_43 ; $43 - const OBJ_INTERACTION_44 ; $44 - const OBJ_INTERACTION_45 ; $45 - const OBJ_INTERACTION_46 ; $46 - const OBJ_INTERACTION_47 ; $47 - const OBJ_INTERACTION_48 ; $48 - const OBJ_INTERACTION_49 ; $49 - const OBJ_INTERACTION_COLOUR_COIN ; $4a - const OBJ_INTERACTION_4B ; $4b - const OBJ_INTERACTION_BOTTOM_STING ; $4c - const OBJ_INTERACTION_4D ; $4d - const OBJ_INTERACTION_4E ; $4e - const OBJ_INTERACTION_4F ; $4f - const OBJ_INTERACTION_50 ; $50 - const OBJ_INTERACTION_51 ; $51 - const OBJ_INTERACTION_52 ; $52 - const OBJ_INTERACTION_UNUSED_1 ; $53 - const OBJ_INTERACTION_UNUSED_2 ; $54 - const OBJ_INTERACTION_UNUSED_3 ; $55 - const OBJ_INTERACTION_UNUSED_4 ; $56 - const OBJ_INTERACTION_UNUSED_5 ; $57 - const OBJ_INTERACTION_UNUSED_6 ; $58 + const OBJ_INTERACTION_00 ; $00 + const OBJ_INTERACTION_01 ; $01 + const OBJ_INTERACTION_FRONT_STING ; $02 + const OBJ_INTERACTION_BACK_STING ; $03 + const OBJ_INTERACTION_TOP_STING ; $04 + const OBJ_INTERACTION_FULL_STING ; $05 + const OBJ_INTERACTION_06 ; $06 + const OBJ_INTERACTION_07 ; $07 + const OBJ_INTERACTION_08 ; $08 + const OBJ_INTERACTION_09 ; $09 + const OBJ_INTERACTION_0A ; $0a + const OBJ_INTERACTION_0B ; $0b + const OBJ_INTERACTION_WALKABLE ; $0c + const OBJ_INTERACTION_MUSICAL_COIN ; $0d + const OBJ_INTERACTION_FIRE ; $0e + const OBJ_INTERACTION_RICHTERTOFFEN ; $0f + const OBJ_INTERACTION_GREY_KEY ; $10 + const OBJ_INTERACTION_RED_KEY ; $11 + const OBJ_INTERACTION_GREEN_KEY ; $12 + const OBJ_INTERACTION_BLUE_KEY ; $13 + const OBJ_INTERACTION_GREY_TREASURE ; $14 + const OBJ_INTERACTION_RED_TREASURE ; $15 + const OBJ_INTERACTION_GREEN_TREASURE ; $16 + const OBJ_INTERACTION_BLUE_TREASURE ; $17 + const OBJ_INTERACTION_OMODONMEKA ; $18 + const OBJ_INTERACTION_SILKY ; $19 + const OBJ_INTERACTION_FOOD ; $1a + const OBJ_INTERACTION_REGULAR_COIN ; $1b + const OBJ_INTERACTION_ELECTRIC ; $1c + const OBJ_INTERACTION_INVISIBILITY_POTION ; $1d + const OBJ_INTERACTION_PNEUMO ; $1e + const OBJ_INTERACTION_ZOMBIE_HEAD ; $1f + const OBJ_INTERACTION_BOUNCY ; $20 + const OBJ_INTERACTION_FIRE_BOT ; $21 + const OBJ_INTERACTION_SOLID ; $22 + const OBJ_INTERACTION_OMODON ; $23 + const OBJ_INTERACTION_ORANGE_BIRD ; $24 + const OBJ_INTERACTION_VAMPIRE ; $25 + const OBJ_INTERACTION_BUBBLE ; $26 + const OBJ_INTERACTION_ICE ; $27 + const OBJ_INTERACTION_OWL ; $28 + const OBJ_INTERACTION_RAIL ; $29 + const OBJ_INTERACTION_HARIDAMA ; $2a + const OBJ_INTERACTION_ANONSTER_WAVE ; $2b + const OBJ_INTERACTION_ANONSTER_SILK ; $2c + const OBJ_INTERACTION_SNOW ; $2d + const OBJ_INTERACTION_UNLIT_TORCH ; $2e + const OBJ_INTERACTION_STOVE ; $2f + const OBJ_INTERACTION_ROBO_MOUSE ; $30 + const OBJ_INTERACTION_31 ; $31 + const OBJ_INTERACTION_DOLL_BOY_HAMMER ; $32 + const OBJ_INTERACTION_ROLLING_ROCK ; $33 + const OBJ_INTERACTION_WORMWOULD ; $34 + const OBJ_INTERACTION_BEAM ; $35 + const OBJ_INTERACTION_36 ; $36 + const OBJ_INTERACTION_YELLOW_BELLY_ARROW ; $37 + const OBJ_INTERACTION_TERUTERU ; $38 + const OBJ_INTERACTION_WATER_DROP ; $39 + const OBJ_INTERACTION_PESCE ; $3a + const OBJ_INTERACTION_3B ; $3b + const OBJ_INTERACTION_TADPOLE ; $3c + const OBJ_INTERACTION_HEBARII ; $3d + const OBJ_INTERACTION_PRINCE_FROGGY ; $3e + const OBJ_INTERACTION_HAND ; $3f + const OBJ_INTERACTION_WATER_TELEPORTING ; $40 + const OBJ_INTERACTION_41 ; $41 + const OBJ_INTERACTION_INK ; $42 + const OBJ_INTERACTION_43 ; $43 + const OBJ_INTERACTION_JAMANO ; $44 + const OBJ_INTERACTION_TURTLE ; $45 + const OBJ_INTERACTION_46 ; $46 + const OBJ_INTERACTION_47 ; $47 + const OBJ_INTERACTION_48 ; $48 + const OBJ_INTERACTION_49 ; $49 + const OBJ_INTERACTION_COLOUR_COIN ; $4a + const OBJ_INTERACTION_MAGICAL_SPIRAL ; $4b + const OBJ_INTERACTION_BOTTOM_STING ; $4c + const OBJ_INTERACTION_4D ; $4d + const OBJ_INTERACTION_4E ; $4e + const OBJ_INTERACTION_4F ; $4f + const OBJ_INTERACTION_50 ; $50 + const OBJ_INTERACTION_51 ; $51 + const OBJ_INTERACTION_52 ; $52 + const OBJ_INTERACTION_UNUSED_1 ; $53 + const OBJ_INTERACTION_UNUSED_2 ; $54 + const OBJ_INTERACTION_UNUSED_3 ; $55 + const OBJ_INTERACTION_UNUSED_4 ; $56 + const OBJ_INTERACTION_UNUSED_5 ; $57 + const OBJ_INTERACTION_UNUSED_6 ; $58 DEF NUM_OBJ_INTERACTIONS EQU const_value ; enemies with InteractionType with diff --git a/src/engine/bank19.asm b/src/engine/bank19.asm index 6d69e8e..4693f3a 100644 --- a/src/engine/bank19.asm +++ b/src/engine/bank19.asm @@ -514,7 +514,7 @@ FlameBlockData: object_data OAM_1895ec, $b, OBJ_INTERACTION_SOLID, StoveData: object_data OAM_1896e1, $c, OBJ_INTERACTION_STOVE | HEAVY_OBJ, -32, StoveFunc, $0 UnusedFlowerData: object_data OAM_180916, $6, OBJ_INTERACTION_01, 0, UnusedFlowerFunc, $0 CountRichtertoffenData: object_data OAM_1809ff, $7, OBJ_INTERACTION_RICHTERTOFFEN | HEAVY_OBJ, -18, CountRichtertoffenFunc, OBJFLAG_PRIORITY -HebariiData: object_data OAM_18a703, $0, OBJ_INTERACTION_3D, -15, HebariiFunc, $0 +HebariiData: object_data OAM_18a703, $0, OBJ_INTERACTION_HEBARII, -15, HebariiFunc, $0 ParaGoomData: object_data OAM_180b43, $9, OBJ_INTERACTION_01, -12, ParaGoomFunc, OBJFLAG_PRIORITY DoughnuteerData: object_data OAM_180ea7, $a, OBJ_INTERACTION_0B, -14, DoughnuteerFunc, OBJFLAG_PRIORITY OmodonmekaData: object_data OAM_18136c, $b, OBJ_INTERACTION_01, -25, OmodonmekaFunc, OBJFLAG_PRIORITY @@ -526,7 +526,7 @@ MizuuoData: object_data OAM_188395, $4, OBJ_INTERACTION_0A, BigLeafSpawnerData: object_data OAM_180000, $b, OBJ_INTERACTION_0B, 0, BigLeafSpawnerFunc, $0 SmallLeafData: object_data OAM_181be4, $8, OBJ_INTERACTION_WALKABLE, -17, SmallLeafFunc, $0 SilkyData: object_data OAM_18181e, $c, OBJ_INTERACTION_01, -8, SilkyFunc, OBJFLAG_PRIORITY -OrangeBirdData: object_data OAM_1819e3, $f, OBJ_INTERACTION_24, -13, BirdFunc, OBJFLAG_PRIORITY +OrangeBirdData: object_data OAM_1819e3, $f, OBJ_INTERACTION_ORANGE_BIRD, -13, BirdFunc, OBJFLAG_PRIORITY BlueBirdData: object_data OAM_1819e3, $d, OBJ_INTERACTION_FRONT_STING, -13, BirdFunc, OBJFLAG_PRIORITY SnakeData: object_data OAM_189783, $d, OBJ_INTERACTION_WALKABLE | HEAVY_OBJ, -31, SnakeFunc, $0 ApplebyData: object_data OAM_185a1c, $d, OBJ_INTERACTION_01, -6, ApplebyFunc, $0 @@ -539,7 +539,7 @@ HammerBotData: object_data OAM_18422f, $2, OBJ_INTERACTION_01 TeruteruData: object_data OAM_18496f, $0, OBJ_INTERACTION_01, -20, TeruteruFunc, OBJFLAG_PRIORITY MadSciensteinData: object_data OAM_184ab2, $5, OBJ_INTERACTION_01 | HEAVY_OBJ, -18, MadSciensteinFunc, OBJFLAG_PRIORITY SeeingEyeDoorData: object_data OAM_184ab2, $3, OBJ_INTERACTION_SOLID | HEAVY_OBJ, -24, SeeingEyeDoorFunc, OBJFLAG_PRIORITY -PneumoData: object_data OAM_184db9, $6, OBJ_INTERACTION_1E, -16, PneumoFunc, OBJFLAG_PRIORITY +PneumoData: object_data OAM_184db9, $6, OBJ_INTERACTION_PNEUMO, -16, PneumoFunc, OBJFLAG_PRIORITY ElectricLampData: object_data OAM_184eeb, $7, OBJ_INTERACTION_0B, 0, ElectricLampFunc, $0 ZombieData: object_data OAM_184ffa, $9, OBJ_INTERACTION_0B | HEAVY_OBJ, -6, ZombieFunc, OBJFLAG_PRIORITY FireBotData: object_data OAM_184755, $c, OBJ_INTERACTION_0B, -14, FireBotFunc, OBJFLAG_PRIORITY @@ -548,14 +548,14 @@ BeamBotData: object_data OAM_1845aa, $4, OBJ_INTERACTION_01, SunData: object_data OAM_1851df, $a, OBJ_INTERACTION_FIRE, -20, SunFunc, $0 MoonData: object_data OAM_1854a2, $a, OBJ_INTERACTION_ELECTRIC, -20, MoonFunc, $0 KobattoData: object_data OAM_185788, $0, OBJ_INTERACTION_VAMPIRE, -12, KobattoFunc, OBJFLAG_PRIORITY -HandData: object_data OAM_185893, $6, OBJ_INTERACTION_3F, -20, HandFunc, OBJFLAG_PRIORITY +HandData: object_data OAM_185893, $6, OBJ_INTERACTION_HAND, -20, HandFunc, OBJFLAG_PRIORITY BubbleHoleData: object_data OAM_185b98, $e, OBJ_INTERACTION_0B, 0, BubbleHoleFunc, $0 BrrrBearData: object_data OAM_188000, $0, OBJ_INTERACTION_ICE | HEAVY_OBJ, -18, BrrrBearFunc, OBJFLAG_PRIORITY CartLeftData: object_data OAM_188279, $2, OBJ_INTERACTION_SOLID, -16, CartFunc, OBJFLAG_PRIORITY CartRightData: object_data OAM_188279, $3, OBJ_INTERACTION_SOLID, -16, CartFunc, OBJFLAG_PRIORITY CartVariableLeftData: object_data OAM_188279, $2, OBJ_INTERACTION_SOLID, -16, CartVariableFunc, OBJFLAG_PRIORITY CartVariableRightData: object_data OAM_188279, $3, OBJ_INTERACTION_SOLID, -16, CartVariableFunc, OBJFLAG_PRIORITY -RoboMouseData: object_data OAM_188555, $6, OBJ_INTERACTION_30, -20, RoboMouseFunc, OBJFLAG_PRIORITY +RoboMouseData: object_data OAM_188555, $6, OBJ_INTERACTION_ROBO_MOUSE, -20, RoboMouseFunc, OBJFLAG_PRIORITY TogebaData: object_data OAM_188b56, $7, OBJ_INTERACTION_FULL_STING, -6, TogebaFunc, OBJFLAG_PRIORITY HaridamaData: object_data OAM_188c7a, $8, OBJ_INTERACTION_06, -13, HaridamaFunc, OBJFLAG_PRIORITY OwlData: object_data OAM_188e16, $9, OBJ_INTERACTION_0A, -20, OwlFunc, OBJFLAG_PRIORITY @@ -585,13 +585,13 @@ NobiiruRightData: object_data OAM_181cd3, $b, OBJ_INTERACTION_0B, ClearGate1Data: object_data OAM_181c47, $e, OBJ_INTERACTION_SOLID, -31, ClearGate1Func, $0 ClearGate2Data: object_data OAM_181c47, $e, OBJ_INTERACTION_SOLID, -31, ClearGate2Func, $0 ClearGate3Data: object_data OAM_181c47, $e, OBJ_INTERACTION_SOLID, -31, ClearGate3Func, $0 -PesceData: object_data OAM_1927d5, $5, OBJ_INTERACTION_3A | HEAVY_OBJ, -14, PesceFunc, OBJFLAG_PRIORITY +PesceData: object_data OAM_1927d5, $5, OBJ_INTERACTION_PESCE | HEAVY_OBJ, -14, PesceFunc, OBJFLAG_PRIORITY DragonflySpawnerData: object_data OAM_190000, $6, OBJ_INTERACTION_0B, 0, DragonflySpawnerFunc, $0 FlySpawnerData: object_data OAM_190000, $7, OBJ_INTERACTION_0B, 0, FlySpawnerFunc, $0 StrongWaterCurrentData: object_data OAM_1927d5, $0, OBJ_INTERACTION_51 | HEAVY_OBJ, -26, StrongWaterCurrentFunc, OBJFLAG_PRIORITY Dragonfly2Data: object_data OAM_1927d5, $1, OBJ_INTERACTION_WALKABLE, -9, Dragonfly2Func, OBJFLAG_PRIORITY TadpoleSpawnerData: object_data OAM_188000, $2, OBJ_INTERACTION_0B, 0, TadpoleSpawnerFunc, $0 -WaterSparkData: object_data OAM_18a7fd, $d, OBJ_INTERACTION_37, -13, WaterSparkFunc, $0 +WaterSparkData: object_data OAM_18a7fd, $d, OBJ_INTERACTION_YELLOW_BELLY_ARROW, -13, WaterSparkFunc, $0 SmallOctohonData: object_data OAM_18a895, $0, OBJ_INTERACTION_06, 0, SmallOctohonFunc, OBJFLAG_PRIORITY BigOctohonData: object_data OAM_18a895, $1, OBJ_INTERACTION_06, -9, BigOctohonFunc, $0 SparkHorizontalData: object_data OAM_18ab04, $2, OBJ_INTERACTION_FULL_STING, -11, SparkFunc, OBJFLAG_PRIORITY @@ -599,12 +599,12 @@ SparkVerticalData: object_data OAM_18ab04, $0, OBJ_INTERACTION_FULL_STIN ScowlerData: object_data OAM_194895, $0, OBJ_INTERACTION_41 | HEAVY_OBJ, -32, ScowlerFunc, $0 FloatingRingSpawnerData: object_data OAM_194895, $4, OBJ_INTERACTION_0B, 0, FloatingRingSpawnerFunc, $0 FireData: object_data OAM_18aba0, $4, OBJ_INTERACTION_FIRE, -24, FireFunc, $0 -JamanoData: object_data OAM_19501c, $6, OBJ_INTERACTION_44, -10, JamanoFunc, $0 +JamanoData: object_data OAM_19501c, $6, OBJ_INTERACTION_JAMANO, -10, JamanoFunc, $0 SkullSpawnerData: object_data OAM_19501c, $7, OBJ_INTERACTION_0B, -10, SkullSpawnerFunc, $0 HatPlatformData: object_data OAM_19501c, $9, OBJ_INTERACTION_31, -4, HatPlatformFunc, OBJFLAG_PRIORITY MuddeeData: object_data OAM_195699, $a, OBJ_INTERACTION_0B, -8, MuddeeFunc, $0 -Turtle1Data: object_data OAM_195699, $b, OBJ_INTERACTION_45, -2, Turtle1Func, OBJFLAG_PRIORITY -Turtle2Data: object_data OAM_195699, $c, OBJ_INTERACTION_45, -2, Turtle2Func, OBJFLAG_PRIORITY +Turtle1Data: object_data OAM_195699, $b, OBJ_INTERACTION_TURTLE, -2, Turtle1Func, OBJFLAG_PRIORITY +Turtle2Data: object_data OAM_195699, $c, OBJ_INTERACTION_TURTLE, -2, Turtle2Func, OBJFLAG_PRIORITY WolfenbossData: object_data OAM_195e06, $d, OBJ_INTERACTION_0B | HEAVY_OBJ, 0, WolfenbossFunc, $0 WolfenbossPlatformData: object_data OAM_195e06, $a, OBJ_INTERACTION_SOLID, -1, WolfenbossPlatformFunc, $0 ShootData: object_data OAM_196583, $0, OBJ_INTERACTION_0B | HEAVY_OBJ, -32, ShootFunc, $0 @@ -739,7 +739,7 @@ ObjParams_DoughnutLeft: db -18 ; y db -9 ; x dn $0, $b ; unk7 - db OBJ_INTERACTION_1A ; interaction type + db OBJ_INTERACTION_FOOD ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_180ea7 ; OAM dw Frameset_685ea ; frameset @@ -756,7 +756,7 @@ ObjParams_DoughnutRight: db -18 ; y db 8 ; x dn $0, $b ; unk7 - db OBJ_INTERACTION_1A ; interaction type + db OBJ_INTERACTION_FOOD ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_180ea7 ; OAM dw Frameset_685ed ; frameset @@ -773,7 +773,7 @@ ObjParams_DoughnutUpLeft: db -16 ; y db -8 ; x dn $0, $b ; unk7 - db OBJ_INTERACTION_1A ; interaction type + db OBJ_INTERACTION_FOOD ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_180ea7 ; OAM dw Frameset_685ea ; frameset @@ -790,7 +790,7 @@ ObjParams_DoughnutUpRight: db -16 ; y db 7 ; x dn $0, $b ; unk7 - db OBJ_INTERACTION_1A ; interaction type + db OBJ_INTERACTION_FOOD ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_180ea7 ; OAM dw Frameset_685ed ; frameset @@ -807,7 +807,7 @@ ObjParams_InvisibilityPotionLeft: db -8 ; y db -16 ; x dn $1, $6 ; unk7 - db OBJ_INTERACTION_1D ; interaction type + db OBJ_INTERACTION_INVISIBILITY_POTION ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_184ab2 ; OAM dw Frameset_68c33 ; frameset @@ -824,7 +824,7 @@ ObjParams_InvisibilityPotionRight: db -8 ; y db 15 ; x dn $1, $6 ; unk7 - db OBJ_INTERACTION_1D ; interaction type + db OBJ_INTERACTION_INVISIBILITY_POTION ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_184ab2 ; OAM dw Frameset_68c33 ; frameset @@ -841,7 +841,7 @@ ObjParams_InvisibilityPotionDropLeft: db -8 ; y db -16 ; x dn $1, $6 ; unk7 - db OBJ_INTERACTION_1D ; interaction type + db OBJ_INTERACTION_INVISIBILITY_POTION ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_184ab2 ; OAM dw Frameset_68c33 ; frameset @@ -858,7 +858,7 @@ ObjParams_InvisibilityPotionDropRight: db -8 ; y db 15 ; x dn $1, $6 ; unk7 - db OBJ_INTERACTION_1D ; interaction type + db OBJ_INTERACTION_INVISIBILITY_POTION ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_184ab2 ; OAM dw Frameset_68c33 ; frameset @@ -875,7 +875,7 @@ ObjParams_ZombieHeadLeft: db -16 ; y db 0 ; x dn $1, $a ; unk7 - db OBJ_INTERACTION_1F ; interaction type + db OBJ_INTERACTION_ZOMBIE_HEAD ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_184ffa ; OAM dw Frameset_68db3 ; frameset @@ -892,7 +892,7 @@ ObjParams_ZombieHeadRight: db -16 ; y db 0 ; x dn $1, $a ; unk7 - db OBJ_INTERACTION_1F ; interaction type + db OBJ_INTERACTION_ZOMBIE_HEAD ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_184ffa ; OAM dw Frameset_68dc4 ; frameset @@ -943,7 +943,7 @@ ObjParams_BeamLeft: db 0 ; y db -8 ; x dn $1, $1 ; unk7 - db OBJ_INTERACTION_35 ; interaction type + db OBJ_INTERACTION_BEAM ; interaction type db -14, -3, -2, 1 ; collision box dw OAM_1845aa ; OAM dw Frameset_68ee1 ; frameset @@ -960,7 +960,7 @@ ObjParams_BeamRight: db 0 ; y db 8 ; x dn $1, $1 ; unk7 - db OBJ_INTERACTION_35 ; interaction type + db OBJ_INTERACTION_BEAM ; interaction type db -14, -3, -2, 1 ; collision box dw OAM_1845aa ; OAM dw Frameset_68eea ; frameset @@ -977,7 +977,7 @@ ObjParams_AppleLeft: db -14 ; y db 7 ; x dn $1, $1 ; unk7 - db OBJ_INTERACTION_1A ; interaction type + db OBJ_INTERACTION_FOOD ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_185a1c ; OAM dw Frameset_68a60 ; frameset @@ -994,7 +994,7 @@ ObjParams_AppleRight: db -14 ; y db -8 ; x dn $1, $1 ; unk7 - db OBJ_INTERACTION_1A ; interaction type + db OBJ_INTERACTION_FOOD ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_185a1c ; OAM dw Frameset_68a60 ; frameset @@ -1249,7 +1249,7 @@ ObjParams_AnonsterSilk1Left: db 1 ; y db -4 ; x dn $4, $1 ; unk7 - db OBJ_INTERACTION_2C ; interaction type + db OBJ_INTERACTION_ANONSTER_SILK ; interaction type db -8, -4, -5, 4 ; collision box dw OAM_190000 ; OAM dw Frameset_694ee ; frameset @@ -1266,7 +1266,7 @@ ObjParams_AnonsterSilk1Right: db 1 ; y db 3 ; x dn $4, $1 ; unk7 - db OBJ_INTERACTION_2C ; interaction type + db OBJ_INTERACTION_ANONSTER_SILK ; interaction type db -8, -4, -5, 4 ; collision box dw OAM_190000 ; OAM dw Frameset_694ee ; frameset @@ -1283,7 +1283,7 @@ ObjParams_AnonsterSilk2Left: db 1 ; y db -4 ; x dn $4, $1 ; unk7 - db OBJ_INTERACTION_2C ; interaction type + db OBJ_INTERACTION_ANONSTER_SILK ; interaction type db -8, -4, -5, 4 ; collision box dw OAM_190000 ; OAM dw Frameset_694ee ; frameset @@ -1300,7 +1300,7 @@ ObjParams_AnonsterSilk2Right: db 1 ; y db 3 ; x dn $4, $1 ; unk7 - db OBJ_INTERACTION_2C ; interaction type + db OBJ_INTERACTION_ANONSTER_SILK ; interaction type db -8, -4, -5, 4 ; collision box dw OAM_190000 ; OAM dw Frameset_694ee ; frameset @@ -1313,11 +1313,11 @@ ObjParams_AnonsterSilk2Right: dw AnonsterSilkFunc.FloatRight db OBJFLAG_PRIORITY ; obj flags -ObjParams_AnonsterSilk3Left: ; 64aae8(19:4aae8) +ObjParams_AnonsterSilk3Left: db 1 ; y db -4 ; x dn $4, $1 ; unk7 - db OBJ_INTERACTION_2C ; interaction type + db OBJ_INTERACTION_ANONSTER_SILK ; interaction type db -8, -4, -5, 4 ; collision box dw OAM_190000 ; OAM dw Frameset_694ee ; frameset @@ -1334,7 +1334,7 @@ ObjParams_AnonsterSilk3Right: db 1 ; y db 3 ; x dn $4, $1 ; unk7 - db OBJ_INTERACTION_2C ; interaction type + db OBJ_INTERACTION_ANONSTER_SILK ; interaction type db -8, -4, -5, 4 ; collision box dw OAM_190000 ; OAM dw Frameset_694ee ; frameset @@ -1347,11 +1347,11 @@ ObjParams_AnonsterSilk3Right: dw AnonsterSilkFunc.FloatRight db OBJFLAG_PRIORITY ; obj flags -ObjParams_AnonsteWaveLeft: ; 64b12(19:4ab12) +ObjParams_AnonsterWaveLeft: db 4 ; y db -5 ; x dn $4, $1 ; unk7 - db OBJ_INTERACTION_2B ; interaction type + db OBJ_INTERACTION_ANONSTER_WAVE ; interaction type db -8, -4, -5, 4 ; collision box dw OAM_190000 ; OAM dw Frameset_694f8 ; frameset @@ -1368,7 +1368,7 @@ ObjParams_AnonsterWaveRight: db 4 ; y db 4 ; x dn $4, $1 ; unk7 - db OBJ_INTERACTION_2B ; interaction type + db OBJ_INTERACTION_ANONSTER_WAVE ; interaction type db -8, -4, -5, 4 ; collision box dw OAM_190000 ; OAM dw Frameset_69505 ; frameset @@ -1470,7 +1470,7 @@ ObjParams_DollBoyHammer: db -18 ; y db -10 ; x dn $4, $9 ; unk7 - db OBJ_INTERACTION_32 ; interaction type + db OBJ_INTERACTION_DOLL_BOY_HAMMER ; interaction type db -12, -4, -4, 3 ; collision box dw OAM_19105c ; OAM dw Frameset_69684 ; frameset @@ -1504,7 +1504,7 @@ ObjParams_HighRollingRockLeft: db 4 ; y db -13 ; x dn $5, $8 ; unk7 - db OBJ_INTERACTION_33 ; interaction type + db OBJ_INTERACTION_ROLLING_ROCK ; interaction type db -10, -4, -4, 3 ; collision box dw OAM_194000 ; OAM dw Frameset_6973d ; frameset @@ -1521,7 +1521,7 @@ ObjParams_HighRollingRockRight: db 4 ; y db 12 ; x dn $5, $8 ; unk7 - db OBJ_INTERACTION_33 ; interaction type + db OBJ_INTERACTION_ROLLING_ROCK ; interaction type db -10, -4, -4, 3 ; collision box dw OAM_194000 ; OAM dw Frameset_696f8 ; frameset @@ -1538,7 +1538,7 @@ ObjParams_LowRollingRockLeft: db 4 ; y db -13 ; x dn $5, $8 ; unk7 - db OBJ_INTERACTION_33 ; interaction type + db OBJ_INTERACTION_ROLLING_ROCK ; interaction type db -10, -4, -4, 3 ; collision box dw OAM_194000 ; OAM dw Frameset_6973d ; frameset @@ -1555,7 +1555,7 @@ ObjParams_LowRollingRockRight: db 4 ; y db 12 ; x dn $5, $8 ; unk7 - db OBJ_INTERACTION_33 ; interaction type + db OBJ_INTERACTION_ROLLING_ROCK ; interaction type db -10, -4, -4, 3 ; collision box dw OAM_194000 ; OAM dw Frameset_696f8 ; frameset @@ -1624,7 +1624,7 @@ ObjParams_YellowBellyArrowLeft: db 16 ; y db -16 ; x dn $4, $d ; unk7 - db OBJ_INTERACTION_37 ; interaction type + db OBJ_INTERACTION_YELLOW_BELLY_ARROW ; interaction type db -10, -4, -3, 2 ; collision box dw OAM_1926dc ; OAM dw Frameset_69870 ; frameset @@ -1641,7 +1641,7 @@ ObjParams_YellowBellyArrowRight: db 16 ; y db 15 ; x dn $4, $d ; unk7 - db OBJ_INTERACTION_37 ; interaction type + db OBJ_INTERACTION_YELLOW_BELLY_ARROW ; interaction type db -10, -4, -3, 2 ; collision box dw OAM_1926dc ; OAM dw Frameset_69875 ; frameset @@ -1692,7 +1692,7 @@ ObjParams_Tadpole: db -3 ; y db 0 ; x dn $2, $f ; unk7 - db OBJ_INTERACTION_3C ; interaction type + db OBJ_INTERACTION_TADPOLE ; interaction type db -12, -4, -5, 4 ; collision box dw OAM_18a642 ; OAM dw Frameset_69a33 ; frameset @@ -1709,7 +1709,7 @@ ObjParams_InkLeft: db -12 ; y db -4 ; x dn $5, $3 ; unk7 - db OBJ_INTERACTION_42 ; interaction type + db OBJ_INTERACTION_INK ; interaction type db -13, -3, -3, 2 ; collision box dw OAM_194895 ; OAM dw Frameset_69ae3 ; frameset @@ -1726,7 +1726,7 @@ ObjParams_InkRight: db -12 ; y db 3 ; x dn $5, $3 ; unk7 - db OBJ_INTERACTION_42 ; interaction type + db OBJ_INTERACTION_INK ; interaction type db -13, -3, -3, 2 ; collision box dw OAM_194895 ; OAM dw Frameset_69ae3 ; frameset @@ -1845,7 +1845,7 @@ ObjParams_MagicSpiralLeft: db 12 ; y db -12 ; x dn $5, $e ; unk7 - db OBJ_INTERACTION_4B ; interaction type + db OBJ_INTERACTION_MAGICAL_SPIRAL ; interaction type db -4, 3, -4, 3 ; collision box dw OAM_195e06 ; OAM dw Frameset_69e30 ; frameset @@ -1862,7 +1862,7 @@ ObjParams_MagicSpiralRight: db 12 ; y db 11 ; x dn $5, $e ; unk7 - db OBJ_INTERACTION_4B ; interaction type + db OBJ_INTERACTION_MAGICAL_SPIRAL ; interaction type db -4, 3, -4, 3 ; collision box dw OAM_195e06 ; OAM dw Frameset_69e30 ; frameset @@ -1879,7 +1879,7 @@ ObjParams_IgaguriLeft: db 21 ; y db -12 ; x dn $5, $f ; unk7 - db OBJ_INTERACTION_37 ; interaction type + db OBJ_INTERACTION_YELLOW_BELLY_ARROW ; interaction type db -16, -4, -5, 4 ; collision box dw OAM_195e06 ; OAM dw Frameset_69e7b ; frameset @@ -1896,7 +1896,7 @@ ObjParams_IgaguriRight: db 21 ; y db 11 ; x dn $5, $f ; unk7 - db OBJ_INTERACTION_37 ; interaction type + db OBJ_INTERACTION_YELLOW_BELLY_ARROW ; interaction type db -16, -4, -5, 4 ; collision box dw OAM_195e06 ; OAM dw Frameset_69e7b ; frameset @@ -2150,7 +2150,7 @@ ObjParams_Bubble: ObjParams_FallingSnow: dn $2, $a ; unk7 - db OBJ_INTERACTION_2D ; interaction type + db OBJ_INTERACTION_SNOW ; interaction type db -15, -8, -5, 4 ; collision box dw OAM_1893fe ; OAM dw Frameset_6957e ; frameset @@ -2180,7 +2180,7 @@ ObjParams_StarsAbove: ObjParams_YellowBellyHead: dn $4, $c ; unk7 - db OBJ_INTERACTION_37 ; interaction type + db OBJ_INTERACTION_YELLOW_BELLY_ARROW ; interaction type db -10, -6, -4, 3 ; collision box dw OAM_1926dc ; OAM dw Frameset_6987a ; frameset diff --git a/src/engine/bank8.asm b/src/engine/bank8.asm index c5a58c4..4343f9f 100644 --- a/src/engine/bank8.asm +++ b/src/engine/bank8.asm @@ -211,95 +211,95 @@ ProcessInteractions: .table table_width 2, ProcessInteractions.table - dw Func_20b6b ; OBJ_INTERACTION_00 - dw Func_20d1d ; OBJ_INTERACTION_01 - dw ObjInteraction_FrontSting ; OBJ_INTERACTION_FRONT_STING - dw ObjInteraction_BackSting ; OBJ_INTERACTION_BACK_STING - dw ObjInteraction_TopSting ; OBJ_INTERACTION_TOP_STING - dw ObjInteraction_FullSting ; OBJ_INTERACTION_FULL_STING - dw Func_20d81 ; OBJ_INTERACTION_06 - dw Func_20d8c ; OBJ_INTERACTION_07 - dw Func_20deb ; OBJ_INTERACTION_08 - dw Func_20e39 ; OBJ_INTERACTION_09 - dw Func_20e60 ; OBJ_INTERACTION_0A - dw Func_20e6a ; OBJ_INTERACTION_0B - dw ObjInteraction_Walkable ; OBJ_INTERACTION_WALKABLE - dw ObjInteraction_MusicalCoin ; OBJ_INTERACTION_MUSICAL_COIN - dw ObjInteraction_Fire ; OBJ_INTERACTION_FIRE - dw ObjInteraction_Richtertoffen ; OBJ_INTERACTION_RICHTERTOFFEN - dw ObjInteraction_GreyKey ; OBJ_INTERACTION_GREY_KEY - dw ObjInteraction_RedKey ; OBJ_INTERACTION_RED_KEY - dw ObjInteraction_GreenKey ; OBJ_INTERACTION_GREEN_KEY - dw ObjInteraction_BlueKey ; OBJ_INTERACTION_BLUE_KEY - dw ObjInteraction_GreyTreasure ; OBJ_INTERACTION_GREY_TREASURE - dw ObjInteraction_RedTreasure ; OBJ_INTERACTION_RED_TREASURE - dw ObjInteraction_GreenTreasure ; OBJ_INTERACTION_GREEN_TREASURE - dw ObjInteraction_BlueTreasure ; OBJ_INTERACTION_BLUE_TREASURE - dw Func_21156 ; OBJ_INTERACTION_18 - dw Func_21245 ; OBJ_INTERACTION_19 - dw Func_21358 ; OBJ_INTERACTION_1A - dw ObjInteraction_RegularCoin ; OBJ_INTERACTION_REGULAR_COIN - dw ObjInteraction_Electric ; OBJ_INTERACTION_ELECTRIC - dw Func_21548 ; OBJ_INTERACTION_1D - dw Func_21569 ; OBJ_INTERACTION_1E - dw Func_215a2 ; OBJ_INTERACTION_1F - dw ObjInteraction_Bouncy ; OBJ_INTERACTION_BOUNCY - dw Func_2164f ; OBJ_INTERACTION_21 - dw ObjInteraction_Solid ; OBJ_INTERACTION_SOLID - dw Func_21774 ; OBJ_INTERACTION_23 - dw Func_217b9 ; OBJ_INTERACTION_24 - dw ObjInteraction_Vampire ; OBJ_INTERACTION_VAMPIRE - dw ObjInteraction_Bubble ; OBJ_INTERACTION_BUBBLE - dw ObjInteraction_Ice ; OBJ_INTERACTION_ICE - dw ObjInteraction_Owl ; OBJ_INTERACTION_OWL - dw ObjInteraction_Rail ; OBJ_INTERACTION_RAIL - dw Func_20e0f ; OBJ_INTERACTION_2A - dw Func_21a4f ; OBJ_INTERACTION_2B - dw Func_21a47 ; OBJ_INTERACTION_2C - dw Func_21a52 ; OBJ_INTERACTION_2D - dw ObjInteraction_UnlitTorch ; OBJ_INTERACTION_UNLIT_TORCH - dw ObjInteraction_Stove ; OBJ_INTERACTION_STOVE - dw Func_21ac3 ; OBJ_INTERACTION_30 - dw Func_21af1 ; OBJ_INTERACTION_31 - dw Func_21b08 ; OBJ_INTERACTION_32 - dw Func_21b0b ; OBJ_INTERACTION_33 - dw ObjInteraction_Wormwould ; OBJ_INTERACTION_WORMWOULD - dw Func_21b42 ; OBJ_INTERACTION_35 - dw Func_21b78 ; OBJ_INTERACTION_36 - dw Func_21573 ; OBJ_INTERACTION_37 - dw Func_21b89 ; OBJ_INTERACTION_38 - dw ObjInteraction_WaterDrop ; OBJ_INTERACTION_WATER_DROP - dw Func_21c26 ; OBJ_INTERACTION_3A - dw Func_21c56 ; OBJ_INTERACTION_3B - dw Func_21c61 ; OBJ_INTERACTION_3C - dw Func_21c86 ; OBJ_INTERACTION_3D - dw ObjInteraction_PrinceFroggy ; OBJ_INTERACTION_PRINCE_FROGGY - dw Func_21ca8 ; OBJ_INTERACTION_3F - dw ObjInteraction_WaterTeleporting ; OBJ_INTERACTION_WATER_TELEPORTING - dw Func_21ce9 ; OBJ_INTERACTION_41 - dw Func_21cf8 ; OBJ_INTERACTION_42 - dw Func_207ed ; OBJ_INTERACTION_43 - dw Func_21cfd ; OBJ_INTERACTION_44 - dw Func_21d17 ; OBJ_INTERACTION_45 - dw Func_21d3b ; OBJ_INTERACTION_46 - dw Func_21d64 ; OBJ_INTERACTION_47 - dw Func_21d6f ; OBJ_INTERACTION_48 - dw Func_21d88 ; OBJ_INTERACTION_49 - dw ObjInteraction_ColourCoin ; OBJ_INTERACTION_COLOUR_COIN - dw Func_21df8 ; OBJ_INTERACTION_4B - dw ObjInteraction_BottomSting ; OBJ_INTERACTION_BOTTOM_STING - dw Func_21e3e ; OBJ_INTERACTION_4D - dw Func_21e9c ; OBJ_INTERACTION_4E - dw Func_21ea6 ; OBJ_INTERACTION_4F - dw Func_21ecd ; OBJ_INTERACTION_50 - dw Func_21f01 ; OBJ_INTERACTION_51 - dw Func_21f28 ; OBJ_INTERACTION_52 - dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_1 - dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_2 - dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_3 - dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_4 - dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_5 - dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_6 + dw Func_20b6b ; OBJ_INTERACTION_00 + dw Func_20d1d ; OBJ_INTERACTION_01 + dw ObjInteraction_FrontSting ; OBJ_INTERACTION_FRONT_STING + dw ObjInteraction_BackSting ; OBJ_INTERACTION_BACK_STING + dw ObjInteraction_TopSting ; OBJ_INTERACTION_TOP_STING + dw ObjInteraction_FullSting ; OBJ_INTERACTION_FULL_STING + dw Func_20d81 ; OBJ_INTERACTION_06 + dw Func_20d8c ; OBJ_INTERACTION_07 + dw Func_20deb ; OBJ_INTERACTION_08 + dw Func_20e39 ; OBJ_INTERACTION_09 + dw Func_20e60 ; OBJ_INTERACTION_0A + dw Func_20e6a ; OBJ_INTERACTION_0B + dw ObjInteraction_Walkable ; OBJ_INTERACTION_WALKABLE + dw ObjInteraction_MusicalCoin ; OBJ_INTERACTION_MUSICAL_COIN + dw ObjInteraction_Fire ; OBJ_INTERACTION_FIRE + dw ObjInteraction_Richtertoffen ; OBJ_INTERACTION_RICHTERTOFFEN + dw ObjInteraction_GreyKey ; OBJ_INTERACTION_GREY_KEY + dw ObjInteraction_RedKey ; OBJ_INTERACTION_RED_KEY + dw ObjInteraction_GreenKey ; OBJ_INTERACTION_GREEN_KEY + dw ObjInteraction_BlueKey ; OBJ_INTERACTION_BLUE_KEY + dw ObjInteraction_GreyTreasure ; OBJ_INTERACTION_GREY_TREASURE + dw ObjInteraction_RedTreasure ; OBJ_INTERACTION_RED_TREASURE + dw ObjInteraction_GreenTreasure ; OBJ_INTERACTION_GREEN_TREASURE + dw ObjInteraction_BlueTreasure ; OBJ_INTERACTION_BLUE_TREASURE + dw ObjInteraction_Omodonmeka ; OBJ_INTERACTION_OMODONMEKA + dw ObjInteraction_Silky ; OBJ_INTERACTION_SILKY + dw ObjInteraction_Food ; OBJ_INTERACTION_FOOD + dw ObjInteraction_RegularCoin ; OBJ_INTERACTION_REGULAR_COIN + dw ObjInteraction_Electric ; OBJ_INTERACTION_ELECTRIC + dw ObjInteraction_InvisibilityPotion ; OBJ_INTERACTION_INVISIBILITY_POTION + dw ObjInteraction_Pneumo ; OBJ_INTERACTION_PNEUMO + dw ObjInteraction_ZombieHead ; OBJ_INTERACTION_ZOMBIE_HEAD + dw ObjInteraction_Bouncy ; OBJ_INTERACTION_BOUNCY + dw ObjInteraction_FireBot ; OBJ_INTERACTION_FIRE_BOT + dw ObjInteraction_Solid ; OBJ_INTERACTION_SOLID + dw ObjInteraction_Omodon ; OBJ_INTERACTION_OMODON + dw ObjInteraction_OrangeBird ; OBJ_INTERACTION_ORANGE_BIRD + dw ObjInteraction_Vampire ; OBJ_INTERACTION_VAMPIRE + dw ObjInteraction_Bubble ; OBJ_INTERACTION_BUBBLE + dw ObjInteraction_Ice ; OBJ_INTERACTION_ICE + dw ObjInteraction_Owl ; OBJ_INTERACTION_OWL + dw ObjInteraction_Rail ; OBJ_INTERACTION_RAIL + dw ObjInteraction_Haridama ; OBJ_INTERACTION_HARIDAMA + dw ObjInteraction_AnonsterWave ; OBJ_INTERACTION_ANONSTER_WAVE + dw ObjInteraction_AnonsterSilk ; OBJ_INTERACTION_ANONSTER_SILK + dw ObjInteraction_Snow ; OBJ_INTERACTION_SNOW + dw ObjInteraction_UnlitTorch ; OBJ_INTERACTION_UNLIT_TORCH + dw ObjInteraction_Stove ; OBJ_INTERACTION_STOVE + dw ObjInteraction_RoboMouse ; OBJ_INTERACTION_ROBO_MOUSE + dw Func_21af1 ; OBJ_INTERACTION_31 + dw ObjInteraction_DollBoyHammer ; OBJ_INTERACTION_DOLL_BOY_HAMMER + dw ObjInteraction_RollingRock ; OBJ_INTERACTION_ROLLING_ROCK + dw ObjInteraction_Wormwould ; OBJ_INTERACTION_WORMWOULD + dw ObjInteraction_Beam ; OBJ_INTERACTION_BEAM + dw Func_21b78 ; OBJ_INTERACTION_36 + dw ObjInteraction_YellowBellyArrow ; OBJ_INTERACTION_YELLOW_BELLY_ARROW + dw ObjInteraction_Teruteru ; OBJ_INTERACTION_TERUTERU + dw ObjInteraction_WaterDrop ; OBJ_INTERACTION_WATER_DROP + dw ObjInteraction_Pesce ; OBJ_INTERACTION_PESCE + dw Func_21c56 ; OBJ_INTERACTION_3B + dw ObjInteraction_Tadpole ; OBJ_INTERACTION_TADPOLE + dw ObjInteraction_Hebarii ; OBJ_INTERACTION_HEBARII + dw ObjInteraction_PrinceFroggy ; OBJ_INTERACTION_PRINCE_FROGGY + dw ObjInteraction_Hand ; OBJ_INTERACTION_HAND + dw ObjInteraction_WaterTeleporting ; OBJ_INTERACTION_WATER_TELEPORTING + dw Func_21ce9 ; OBJ_INTERACTION_41 + dw ObjInteraction_Ink ; OBJ_INTERACTION_INK + dw Func_207ed ; OBJ_INTERACTION_43 + dw ObjInteraction_Jamano ; OBJ_INTERACTION_JAMANO + dw ObjInteraction_Turtle ; OBJ_INTERACTION_TURTLE + dw Func_21d3b ; OBJ_INTERACTION_46 + dw Func_21d64 ; OBJ_INTERACTION_47 + dw Func_21d6f ; OBJ_INTERACTION_48 + dw Func_21d88 ; OBJ_INTERACTION_49 + dw ObjInteraction_ColourCoin ; OBJ_INTERACTION_COLOUR_COIN + dw ObjInteraction_MagicalSpiral ; OBJ_INTERACTION_MAGICAL_SPIRAL + dw ObjInteraction_BottomSting ; OBJ_INTERACTION_BOTTOM_STING + dw Func_21e3e ; OBJ_INTERACTION_4D + dw Func_21e9c ; OBJ_INTERACTION_4E + dw Func_21ea6 ; OBJ_INTERACTION_4F + dw Func_21ecd ; OBJ_INTERACTION_50 + dw Func_21f01 ; OBJ_INTERACTION_51 + dw Func_21f28 ; OBJ_INTERACTION_52 + dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_1 + dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_2 + dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_3 + dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_4 + dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_5 + dw ObjInteraction_None ; OBJ_INTERACTION_UNUSED_6 assert_table_length NUM_OBJ_INTERACTIONS ObjInteraction_None: @@ -1420,7 +1420,7 @@ Func_20b6b: jp z, Func_205e7 cp TOUCH_PASS_THROUGH jp z, ProcessInteractions.next_obj - jp .asm_20c41 + jp .step_on_obj .check_water ld a, [wWarioState] @@ -1440,19 +1440,20 @@ Func_20b6b: ld b, a ld a, [wGrabState] or b - jp nz, .asm_20c41 + jp nz, .step_on_obj ld a, [wPowerUpLevel] cp GRAB_GLOVE - jp c, .asm_20c41 + jp c, .step_on_obj ld a, [wWarioState] cp WST_LADDER_SCRATCHING - jp z, .asm_20c41 + jp z, .step_on_obj cp WST_LADDER_CLIMBING - jr c, .asm_20bc6 + jr c, .not_on_ladder cp WST_LADDER_SLIDING + 1 - jp c, .asm_20c41 -.asm_20bc6 + jp c, .step_on_obj + +.not_on_ladder ld a, [wWarioScreenXPos] ld b, a ld a, [wObjScreenXPos] @@ -1463,13 +1464,13 @@ Func_20b6b: ld a, [wDirection] and a jr nz, .check_invincible_counter - jr .asm_20c41 + jr .step_on_obj .asm_20bdd ld a, INTERACTION_LEFT ld [wInteractionSide], a ld a, [wDirection] and a - jr nz, .asm_20c41 + jr nz, .step_on_obj .check_invincible_counter ld a, [wInvincibleCounter] cp 1 @@ -1499,7 +1500,7 @@ Func_20b6b: .heavy_obj ld a, [wPowerUpLevel] cp SUPER_GRAB_GLOVES - jr c, .asm_20c41 + jr c, .step_on_obj ld a, GRAB_PICK_UP | (1 << GRAB_HEAVY_F) ld [wGrabState], a @@ -1513,14 +1514,15 @@ Func_20b6b: ld a, [wObjInteractionType] bit HEAVY_OBJ_F, a jr z, .asm_20c31 - jr .asm_20c41 + jr .step_on_obj .asm_20c31 farcall Func_1edd3 ret -.asm_20c41 +.step_on_obj jp StepOnObject +; unreachable ld a, [wWarioScreenXPos] ld b, a ld a, [wObjScreenXPos] @@ -1685,7 +1687,7 @@ Func_20d8c: ret nz ld a, [wInteractionSide] bit INTERACTION_DOWN_F, a - jr nz, .asm_20ddb + jr nz, .dive ld a, [wWarioScreenXPos] ld b, a ld a, [wObjScreenXPos] @@ -1696,7 +1698,7 @@ Func_20d8c: ld [wInteractionSide], a ld a, DIRECTION_LEFT ld [wDirection], a - jr .asm_20dcb + jr .knock_back .asm_20dbe ld a, [wInteractionSide] or INTERACTION_LEFT @@ -1704,11 +1706,11 @@ Func_20d8c: ld a, DIRECTION_RIGHT ld [wDirection], a -.asm_20dcb +.knock_back farcall SetState_SwimKnockBack ret -.asm_20ddb +.dive farcall StartDive ret @@ -1729,7 +1731,7 @@ Func_20deb: jp nz, Func_207ed jp Func_208f2 -Func_20e0f: +ObjInteraction_Haridama: ld a, [wInteractionSide] bit INTERACTION_DOWN_F, a jp nz, Func_20899 @@ -2128,18 +2130,21 @@ GetTreasure: hcall UpdateAnimation ret -Func_21156: +ObjInteraction_Omodonmeka: ld a, [wJumpVelTable] and a jp nz, Func_2022c + ld b, OBJACTION_0C call SetObjAction + ld a, [wTransformation] cp TRANSFORMATION_FLAT_WARIO jp z, SetState_FlatStretching and a jp nz, Func_2022c + ; pick Wario up ld a, $01 ld [wAutoMoveState], a ld a, WST_PICKED_UP @@ -2162,9 +2167,9 @@ Func_21156: ld [wWarioStateCycles], a ld [wFrameDuration], a ld [wAnimationFrame], a - inc a ld [wJumpVelTable], a + ld a, NUM_WIGGLES_TO_ESCAPE ld [wPickedUpWiggleCounter], a @@ -2232,7 +2237,7 @@ SetState_FlatStretching: hcall UpdateAnimation ret -Func_21245: +ObjInteraction_Silky: ld a, [wInteractionSide] and INTERACTION_UP | INTERACTION_DOWN jr nz, .asm_21267 @@ -2285,11 +2290,12 @@ Func_2126a: ld a, DIRECTION_LEFT ld [wDirection], a - jr .asm_212b8 + jr .set_ball_o_string .asm_212b3 ld a, DIRECTION_RIGHT ld [wDirection], a -.asm_212b8 + +.set_ball_o_string play_sfx SFX_039 ld a, TRANSFORMATION_BALL_O_STRING_WARIO @@ -2356,7 +2362,7 @@ Func_2126a: hcall UpdateAnimation ret -Func_21358: +ObjInteraction_Food: ld a, [wIsCrouching] and a jp nz, Func_20a69 @@ -2367,10 +2373,10 @@ Func_21358: bit TRANSFORMATIONF_PERSISTENT_F, a jp nz, Func_20a69 cp TRANSFORMATION_FAT_WARIO - jr nz, .asm_21373 + jr nz, .set_fat_wario jp Func_20a69 -.asm_21373 +.set_fat_wario call Func_20a63 ld a, TRANSFORMATION_FAT_WARIO ld [wTransformation], a @@ -2589,7 +2595,7 @@ ObjInteraction_Electric: hcall UpdateAnimation ret -Func_21548: +ObjInteraction_InvisibilityPotion: call Func_20a63 ld a, [wInvincibleCounter] and a @@ -2602,13 +2608,13 @@ Func_21548: farcall SetState_TurningInvisible ret -Func_21569: +ObjInteraction_Pneumo: ld a, [wInteractionSide] bit INTERACTION_DOWN_F, a - jr nz, Func_21573 + jr nz, ObjInteraction_YellowBellyArrow jp Func_2022c -Func_21573: +ObjInteraction_YellowBellyArrow: ld a, [wInvincibleCounter] and a ret nz @@ -2625,7 +2631,7 @@ Func_21573: farcall SetState_PuffyInflating ret -Func_215a2: +ObjInteraction_ZombieHead: ld a, [wInvincibleCounter] and a jp nz, Func_20a69 @@ -2696,7 +2702,7 @@ Func_2160a: farcall SetState_BouncyStart ret -Func_2164f: +ObjInteraction_FireBot: ld a, [wInteractionSide] and INTERACTION_UP | INTERACTION_DOWN jp nz, StepOnObject @@ -2805,7 +2811,7 @@ Func_2168b: farcall SetState_FlatIdling ret -Func_21774: +ObjInteraction_Omodon: ld a, [wInteractionSide] bit INTERACTION_UP_F, a jp nz, Func_209ca @@ -2831,7 +2837,7 @@ Func_217a9: farcall DoJumpingBump ret -Func_217b9: +ObjInteraction_OrangeBird: ld a, [wInteractionSide] and INTERACTION_UP | INTERACTION_DOWN jr nz, .asm_217db @@ -3107,16 +3113,16 @@ ObjInteraction_Rail: hcall UpdateAnimation ret -Func_21a47: +ObjInteraction_AnonsterSilk: ld a, [wInteractionSide] bit INTERACTION_UP_F, a jp nz, StepOnObject ; fallthrough -Func_21a4f: +ObjInteraction_AnonsterWave: jp Func_2126a -Func_21a52: +ObjInteraction_Snow: ld a, [wInvincibleCounter] and a jp nz, Func_20a69 @@ -3172,7 +3178,7 @@ Func_21abb: call SetObjAction jp Func_20a6f -Func_21ac3: +ObjInteraction_RoboMouse: ld a, [wInteractionSide] bit INTERACTION_UP_F, a jr nz, .asm_21ae4 @@ -3196,7 +3202,7 @@ Func_21ac3: jp nz, Func_20602 jp Func_20e6a .asm_21aee - jp Func_21cfd + jp ObjInteraction_Jamano Func_21af1: ld a, [wInteractionSide] @@ -3209,10 +3215,10 @@ Func_21af1: jp nz, Func_217a9 jp Func_20a6f -Func_21b08: +ObjInteraction_DollBoyHammer: jp Func_2160a -Func_21b0b: +ObjInteraction_RollingRock: ld b, OBJACTION_06 call SetObjAction ld a, [wIsRolling] @@ -3237,7 +3243,7 @@ Func_21b3a: ld b, OBJACTION_NONE jp SetObjAction -Func_21b42: +ObjInteraction_Beam: ld a, [wInvincibleCounter] and a ret nz @@ -3270,7 +3276,7 @@ Func_21b78: .asm_21b86 jp Func_20939 -Func_21b89: +ObjInteraction_Teruteru: ld a, [wInteractionSide] bit INTERACTION_DOWN_F, a jp z, Func_2022c @@ -3345,7 +3351,7 @@ ObjInteraction_WaterDrop: jp z, ProcessInteractions.next_obj jp RecoverFromTransformation -Func_21c26: +ObjInteraction_Pesce: ld a, [wEnemyDirection] cp DIRECTION_RIGHT jr z, .asm_21c37 @@ -3370,7 +3376,7 @@ Func_21c56: jp nz, Func_21aac jp Func_20b6b -Func_21c61: +ObjInteraction_Tadpole: ld a, [wInteractionSide] and INTERACTION_UP | INTERACTION_DOWN jp nz, StepOnObject @@ -3379,17 +3385,17 @@ Func_21c61: jr nz, .asm_21c7a ld a, [wInteractionSide] bit INTERACTION_RIGHT_F, a - jp nz, Func_21b0b + jp nz, ObjInteraction_RollingRock jp Func_20e6a .asm_21c7a ld a, [wInteractionSide] bit INTERACTION_LEFT_F, a - jp nz, Func_21b0b + jp nz, ObjInteraction_RollingRock jp Func_20e6a ret ; stray ret -Func_21c86: +ObjInteraction_Hebarii: ld a, [wInteractionSide] and INTERACTION_UP | INTERACTION_DOWN jp nz, Func_20e6a @@ -3406,7 +3412,7 @@ ObjInteraction_PrinceFroggy: jp nz, Func_2168b jp Func_20b41 -Func_21ca8: +ObjInteraction_Hand: ld a, [wInvincibleCounter] and a ret nz @@ -3441,11 +3447,11 @@ Func_21ce9: jr nz, ObjInteraction_WaterTeleporting jp Func_208f2 -Func_21cf8: +ObjInteraction_Ink: ld b, OBJACTION_06 jp SetObjAction -Func_21cfd: +ObjInteraction_Jamano: ld a, ROOMTRANSITION_TELEPORT | ROOMTRANSITIONF_1 | ROOMTRANSITIONF_2 | ROOMTRANSITIONF_3 ld [wRoomTransitionParam], a call Func_206eb @@ -3455,7 +3461,7 @@ Func_21cfd: ld b, OBJACTION_TELEPORT jp SetObjAction -Func_21d17: +ObjInteraction_Turtle: ld a, [wInteractionSide] bit INTERACTION_UP_F, a jp nz, Func_209ca @@ -3561,7 +3567,7 @@ CollectMusicalCoin: call Func_20a63 jp ProcessInteractions.next_obj -Func_21df8: +ObjInteraction_MagicalSpiral: ld a, [wInvincibleCounter] and a ret nz diff --git a/src/engine/level/objects/anonster.asm b/src/engine/level/objects/anonster.asm index 3ffb891..bce4cb7 100644 --- a/src/engine/level/objects/anonster.asm +++ b/src/engine/level/objects/anonster.asm @@ -572,7 +572,7 @@ AnonsterFunc: ld a, [wCurObjSubState] rlca jr c, .asm_503fd - ld bc, ObjParams_AnonsteWaveLeft + ld bc, ObjParams_AnonsterWaveLeft jp CreateObjectAtRelativePos .asm_503fd ld bc, ObjParams_AnonsterWaveRight diff --git a/src/engine/level/objects/fire_bot.asm b/src/engine/level/objects/fire_bot.asm index 9325fea..f03902a 100644 --- a/src/engine/level/objects/fire_bot.asm +++ b/src/engine/level/objects/fire_bot.asm @@ -263,7 +263,7 @@ FireBotFunc: ld l, OBJ_INTERACTION_TYPE ld a, [hl] and HEAVY_OBJ - or OBJ_INTERACTION_21 + or OBJ_INTERACTION_FIRE_BOT ld [hld], a ld l, OBJ_FLAGS bit OBJFLAG_ON_SCREEN_F, [hl] diff --git a/src/engine/level/objects/haridama.asm b/src/engine/level/objects/haridama.asm index e4e0d97..7b12364 100644 --- a/src/engine/level/objects/haridama.asm +++ b/src/engine/level/objects/haridama.asm @@ -124,7 +124,7 @@ HaridamaFunc: ld l, OBJ_INTERACTION_TYPE ld a, [hl] and HEAVY_OBJ - or OBJ_INTERACTION_2A + or OBJ_INTERACTION_HARIDAMA ld [hld], a ld l, OBJ_STATE ld a, $32 diff --git a/src/engine/level/objects/omodonmeka.asm b/src/engine/level/objects/omodonmeka.asm index 03fa7c8..d0e4071 100644 --- a/src/engine/level/objects/omodonmeka.asm +++ b/src/engine/level/objects/omodonmeka.asm @@ -423,7 +423,7 @@ OmodonmekaFunc: ld l, OBJ_INTERACTION_TYPE ld a, [hl] and HEAVY_OBJ - or OBJ_INTERACTION_18 + or OBJ_INTERACTION_OMODONMEKA ld [hld], a ret @@ -980,7 +980,7 @@ Func_42767: ld l, OBJ_INTERACTION_TYPE ld a, [hl] and HEAVY_OBJ - or OBJ_INTERACTION_23 + or OBJ_INTERACTION_OMODON ld [hld], a ld l, OBJ_COLLBOX_LEFT inc [hl] diff --git a/src/engine/level/objects/robo_mouse.asm b/src/engine/level/objects/robo_mouse.asm index 68e49d8..3159be4 100644 --- a/src/engine/level/objects/robo_mouse.asm +++ b/src/engine/level/objects/robo_mouse.asm @@ -532,7 +532,7 @@ RoboMouseFunc: ld l, OBJ_INTERACTION_TYPE ld a, [hl] and HEAVY_OBJ - or OBJ_INTERACTION_30 + or OBJ_INTERACTION_ROBO_MOUSE ld [hld], a ret diff --git a/src/engine/level/objects/silky.asm b/src/engine/level/objects/silky.asm index 4a23d86..0287c08 100644 --- a/src/engine/level/objects/silky.asm +++ b/src/engine/level/objects/silky.asm @@ -229,7 +229,7 @@ SilkyFunc: ld l, OBJ_INTERACTION_TYPE ld a, [hl] and HEAVY_OBJ - or OBJ_INTERACTION_19 + or OBJ_INTERACTION_SILKY ld [hld], a ld a, [wCurObjSubState] rlca diff --git a/src/engine/level/objects/teruteru.asm b/src/engine/level/objects/teruteru.asm index 64cbedd..797fe4d 100644 --- a/src/engine/level/objects/teruteru.asm +++ b/src/engine/level/objects/teruteru.asm @@ -178,7 +178,7 @@ TeruteruFunc: ld l, OBJ_INTERACTION_TYPE ld a, [hl] and HEAVY_OBJ - or OBJ_INTERACTION_38 + or OBJ_INTERACTION_TERUTERU ld [hli], a ret