diff --git a/HME.project.gmx b/HME.project.gmx index 3620f36e..9ea770fb 100644 --- a/HME.project.gmx +++ b/HME.project.gmx @@ -1741,6 +1741,13 @@ objects\obj_propellershroom objects\obj_boomerangflower objects\obj_walljumpshroom + objects\obj_acorn + objects\obj_cloudflower + objects\obj_rockshroom + objects\obj_pyreflower + objects\obj_swoopersuit + objects\obj_karatesuit + objects\obj_supercrown objects\obj_star diff --git a/objects/obj_acorn.object.gmx b/objects/obj_acorn.object.gmx new file mode 100644 index 00000000..d3b4c4c8 --- /dev/null +++ b/objects/obj_acorn.object.gmx @@ -0,0 +1,54 @@ + + + spr_acorn + 0 + -1 + 2 + 0 + obj_powerupparent + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///Squirrels can fly! + +//Go towards Mario +if not instance_exists(obj_mario) +or obj_mario.x < x+8 + hspeed = -1 +else + hspeed = 1 + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/obj_block.object.gmx b/objects/obj_block.object.gmx index 8343d41c..c7c8ef0d 100644 --- a/objects/obj_block.object.gmx +++ b/objects/obj_block.object.gmx @@ -48,6 +48,13 @@ ** cs_propeller ** cs_boomerang ** cs_walljump +** cs_squirrel +** cs_cloud +** cs_rock +** cs_pyre +** cs_swooper +** cs_karate +** cs_crown ** cs_greenyoshi ** cs_redyoshi ** cs_yellowyoshi diff --git a/objects/obj_block_hidden.object.gmx b/objects/obj_block_hidden.object.gmx index 80b7695b..adc0e993 100644 --- a/objects/obj_block_hidden.object.gmx +++ b/objects/obj_block_hidden.object.gmx @@ -48,6 +48,13 @@ ** cs_propeller ** cs_boomerang ** cs_walljump +** cs_squirrel +** cs_cloud +** cs_rock +** cs_pyre +** cs_swooper +** cs_karate +** cs_crown ** cs_greenyoshi ** cs_redyoshi ** cs_yellowyoshi diff --git a/objects/obj_block_spiked.object.gmx b/objects/obj_block_spiked.object.gmx index ca2eb865..24856c4d 100644 --- a/objects/obj_block_spiked.object.gmx +++ b/objects/obj_block_spiked.object.gmx @@ -48,6 +48,13 @@ ** cs_propeller ** cs_boomerang ** cs_walljump +** cs_squirrel +** cs_cloud +** cs_rock +** cs_pyre +** cs_swooper +** cs_karate +** cs_crown ** cs_greenyoshi ** cs_redyoshi ** cs_yellowyoshi diff --git a/objects/obj_block_triple.object.gmx b/objects/obj_block_triple.object.gmx index 7715c18c..60ce2aa7 100644 --- a/objects/obj_block_triple.object.gmx +++ b/objects/obj_block_triple.object.gmx @@ -50,6 +50,13 @@ ** cs_propeller ** cs_boomerang ** cs_walljump +** cs_squirrel +** cs_cloud +** cs_rock +** cs_pyre +** cs_swooper +** cs_karate +** cs_crown ** cs_greenyoshi ** cs_redyoshi ** cs_yellowyoshi diff --git a/objects/obj_block_triple_hidden.object.gmx b/objects/obj_block_triple_hidden.object.gmx index ab633a32..4c828ca8 100644 --- a/objects/obj_block_triple_hidden.object.gmx +++ b/objects/obj_block_triple_hidden.object.gmx @@ -50,6 +50,13 @@ ** cs_propeller ** cs_boomerang ** cs_walljump +** cs_squirrel +** cs_cloud +** cs_rock +** cs_pyre +** cs_swooper +** cs_karate +** cs_crown ** cs_greenyoshi ** cs_redyoshi ** cs_yellowyoshi diff --git a/objects/obj_block_winged.object.gmx b/objects/obj_block_winged.object.gmx index 9816a2bd..589d6cf7 100644 --- a/objects/obj_block_winged.object.gmx +++ b/objects/obj_block_winged.object.gmx @@ -48,6 +48,13 @@ ** cs_propeller ** cs_boomerang ** cs_walljump +** cs_squirrel +** cs_cloud +** cs_rock +** cs_pyre +** cs_swooper +** cs_karate +** cs_crown ** cs_greenyoshi ** cs_redyoshi ** cs_yellowyoshi diff --git a/objects/obj_bubble_item.object.gmx b/objects/obj_bubble_item.object.gmx index 2c1502b2..6d613e13 100644 --- a/objects/obj_bubble_item.object.gmx +++ b/objects/obj_bubble_item.object.gmx @@ -48,6 +48,13 @@ ** cs_propeller ** cs_boomerang ** cs_walljump +** cs_squirrel +** cs_cloud +** cs_rock +** cs_pyre +** cs_swooper +** cs_karate +** cs_crown ** cs_greenyoshi ** cs_redyoshi ** cs_yellowyoshi diff --git a/objects/obj_cloudflower.object.gmx b/objects/obj_cloudflower.object.gmx new file mode 100644 index 00000000..eed95f1d --- /dev/null +++ b/objects/obj_cloudflower.object.gmx @@ -0,0 +1,23 @@ + + + spr_cloudflower + 0 + -1 + 2 + 0 + obj_powerupparent + <undefined> + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/obj_karatesuit.object.gmx b/objects/obj_karatesuit.object.gmx new file mode 100644 index 00000000..70fff885 --- /dev/null +++ b/objects/obj_karatesuit.object.gmx @@ -0,0 +1,23 @@ + + + spr_karatesuit + 0 + -1 + 2 + 0 + obj_powerupparent + <undefined> + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/obj_mapbro.object.gmx b/objects/obj_mapbro.object.gmx index 34b1bddf..998f0263 100644 --- a/objects/obj_mapbro.object.gmx +++ b/objects/obj_mapbro.object.gmx @@ -54,6 +54,13 @@ ** cs_propeller ** cs_boomerang ** cs_walljump +** cs_squirrel +** cs_cloud +** cs_rock +** cs_pyre +** cs_swooper +** cs_karate +** cs_crown ** cs_1up ** cs_3up ** diff --git a/objects/obj_mushhouse.object.gmx b/objects/obj_mushhouse.object.gmx index 61bfde5d..e93007b6 100644 --- a/objects/obj_mushhouse.object.gmx +++ b/objects/obj_mushhouse.object.gmx @@ -50,6 +50,13 @@ ** cs_propeller ** cs_boomerang ** cs_walljump +** cs_squirrel +** cs_cloud +** cs_rock +** cs_pyre +** cs_swooper +** cs_karate +** cs_crown ** cs_1up ** cs_3up ** diff --git a/objects/obj_noteblock.object.gmx b/objects/obj_noteblock.object.gmx index 5642b4d7..f2888712 100644 --- a/objects/obj_noteblock.object.gmx +++ b/objects/obj_noteblock.object.gmx @@ -48,6 +48,13 @@ ** cs_propeller ** cs_boomerang ** cs_walljump +** cs_squirrel +** cs_cloud +** cs_rock +** cs_pyre +** cs_swooper +** cs_karate +** cs_crown ** cs_greenyoshi ** cs_redyoshi ** cs_yellowyoshi diff --git a/objects/obj_pyreflower.object.gmx b/objects/obj_pyreflower.object.gmx new file mode 100644 index 00000000..35d5aaf3 --- /dev/null +++ b/objects/obj_pyreflower.object.gmx @@ -0,0 +1,23 @@ + + + spr_pyreflower + 0 + -1 + 2 + 0 + obj_powerupparent + <undefined> + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/obj_rockshroom.object.gmx b/objects/obj_rockshroom.object.gmx new file mode 100644 index 00000000..8de5f98d --- /dev/null +++ b/objects/obj_rockshroom.object.gmx @@ -0,0 +1,54 @@ + + + spr_rockshroom + 0 + -1 + 2 + 0 + obj_powerupparent + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///It's time to rock and roll! + +//Go towards Mario +if not instance_exists(obj_mario) +or obj_mario.x < x+8 + hspeed = -1 +else + hspeed = 1 + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/obj_supercrown.object.gmx b/objects/obj_supercrown.object.gmx new file mode 100644 index 00000000..9c23db3c --- /dev/null +++ b/objects/obj_supercrown.object.gmx @@ -0,0 +1,23 @@ + + + spr_supercrown + 0 + -1 + 2 + 0 + obj_powerupparent + <undefined> + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/obj_swoopersuit.object.gmx b/objects/obj_swoopersuit.object.gmx new file mode 100644 index 00000000..3d684e99 --- /dev/null +++ b/objects/obj_swoopersuit.object.gmx @@ -0,0 +1,23 @@ + + + spr_swoopersuit + 0 + -1 + 2 + 0 + obj_powerupparent + <undefined> + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/obj_veggie_sprout.object.gmx b/objects/obj_veggie_sprout.object.gmx index 5700aa39..66a860ce 100644 --- a/objects/obj_veggie_sprout.object.gmx +++ b/objects/obj_veggie_sprout.object.gmx @@ -35,6 +35,8 @@ ** cs_bomb ** cs_bee ** cs_walljump +** cs_squirrel +** cs_rock ** cs_1up ** cs_poison ** cs_star diff --git a/scripts/scr_constant_get_sprite.gml b/scripts/scr_constant_get_sprite.gml index f7403344..3816c101 100644 --- a/scripts/scr_constant_get_sprite.gml +++ b/scripts/scr_constant_get_sprite.gml @@ -29,6 +29,13 @@ switch argument0 case cs_propeller: return spr_propellershroom case cs_boomerang: return spr_boomerangflower case cs_walljump: return spr_walljumpshroom + case cs_squirrel: return spr_acorn + case cs_cloud: return spr_cloudflower + case cs_rock: return spr_rockshroom + case cs_pyre: return spr_pyreflower + case cs_swooper: return spr_swoopersuit + case cs_karate: return spr_karatesuit + case cs_crown: return spr_supercrown case cs_greenyoshi: return spr_hatch case cs_redyoshi: return spr_hatch_r case cs_yellowyoshi: return spr_hatch_y diff --git a/scripts/scr_mariocarry.gml b/scripts/scr_mariocarry.gml index c41dde3c..5c061e6b 100644 --- a/scripts/scr_mariocarry.gml +++ b/scripts/scr_mariocarry.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_carry case cs_boomerang: return spr_mario_boomerang_carry case cs_walljump: return spr_mario_walljump_carry + case cs_squirrel: return spr_mario_squirrel_carry + case cs_cloud: return spr_mario_cloud_carry + case cs_rock: return spr_mario_rock_carry + case cs_pyre: return spr_mario_pyre_carry + case cs_swooper: return spr_mario_swooper_carry + case cs_karate: return spr_mario_karate_carry + case cs_crown: return spr_mario_crown_carry } diff --git a/scripts/scr_marioclimb.gml b/scripts/scr_marioclimb.gml index 56c1b6dc..689e425a 100644 --- a/scripts/scr_marioclimb.gml +++ b/scripts/scr_marioclimb.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_climb case cs_boomerang: return spr_mario_boomerang_climb case cs_walljump: return spr_mario_walljump_climb + case cs_squirrel: return spr_mario_squirrel_climb + case cs_cloud: return spr_mario_cloud_climb + case cs_rock: return spr_mario_rock_climb + case cs_pyre: return spr_mario_pyre_climb + case cs_swooper: return spr_mario_swooper_climb + case cs_karate: return spr_mario_karate_climb + case cs_crown: return spr_mario_crown_climb } diff --git a/scripts/scr_marioduck.gml b/scripts/scr_marioduck.gml index 5ae48cf0..d1ec9013 100644 --- a/scripts/scr_marioduck.gml +++ b/scripts/scr_marioduck.gml @@ -25,4 +25,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_duck case cs_boomerang: return spr_mario_boomerang_duck case cs_walljump: return spr_mario_walljump_duck + case cs_squirrel: return spr_mario_squirrel_duck + case cs_cloud: return spr_mario_cloud_duck + case cs_rock: return spr_mario_rock_duck + case cs_pyre: return spr_mario_pyre_duck + case cs_swooper: return spr_mario_swooper_duck + case cs_karate: return spr_mario_karate_duck + case cs_crown: return spr_mario_crown_duck } diff --git a/scripts/scr_mariogoal.gml b/scripts/scr_mariogoal.gml index 544218f2..17c77c0a 100644 --- a/scripts/scr_mariogoal.gml +++ b/scripts/scr_mariogoal.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_goal case cs_boomerang: return spr_mario_boomerang_goal case cs_walljump: return spr_mario_walljump_goal + case cs_squirrel: return spr_mario_squirrel_goal + case cs_cloud: return spr_mario_cloud_goal + case cs_rock: return spr_mario_rock_goal + case cs_pyre: return spr_mario_pyre_goal + case cs_swooper: return spr_mario_swooper_goal + case cs_karate: return spr_mario_karate_goal + case cs_crown: return spr_mario_crown_goal } diff --git a/scripts/scr_mariohold.gml b/scripts/scr_mariohold.gml index 97a81595..52880e2e 100644 --- a/scripts/scr_mariohold.gml +++ b/scripts/scr_mariohold.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_hold case cs_boomerang: return spr_mario_boomerang_hold case cs_walljump: return spr_mario_walljump_hold + case cs_squirrel: return spr_mario_squirrel_hold + case cs_cloud: return spr_mario_cloud_hold + case cs_rock: return spr_mario_rock_hold + case cs_pyre: return spr_mario_pyre_hold + case cs_swooper: return spr_mario_swooper_hold + case cs_karate: return spr_mario_karate_hold + case cs_crown: return spr_mario_crown_hold } diff --git a/scripts/scr_mariojump.gml b/scripts/scr_mariojump.gml index d8961647..4356254f 100644 --- a/scripts/scr_mariojump.gml +++ b/scripts/scr_mariojump.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_jump case cs_boomerang: return spr_mario_boomerang_jump case cs_walljump: return spr_mario_walljump_jump + case cs_squirrel: return spr_mario_squirrel_jump + case cs_cloud: return spr_mario_cloud_jump + case cs_rock: return spr_mario_rock_jump + case cs_pyre: return spr_mario_pyre_jump + case cs_swooper: return spr_mario_swooper_jump + case cs_karate: return spr_mario_karate_jump + case cs_crown: return spr_mario_crown_jump } diff --git a/scripts/scr_mariokick.gml b/scripts/scr_mariokick.gml index 1823caa6..a5b7fb2f 100644 --- a/scripts/scr_mariokick.gml +++ b/scripts/scr_mariokick.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_kick case cs_boomerang: return spr_mario_boomerang_kick case cs_walljump: return spr_mario_walljump_kick + case cs_squirrel: return spr_mario_squirrel_kick + case cs_cloud: return spr_mario_cloud_kick + case cs_rock: return spr_mario_rock_kick + case cs_pyre: return spr_mario_pyre_kick + case cs_swooper: return spr_mario_swooper_kick + case cs_karate: return spr_mario_karate_kick + case cs_crown: return spr_mario_crown_kick } diff --git a/scripts/scr_mariomap.gml b/scripts/scr_mariomap.gml index c3795629..ef53cde6 100644 --- a/scripts/scr_mariomap.gml +++ b/scripts/scr_mariomap.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mapmario_propeller case cs_boomerang: return spr_mapmario_boomerang case cs_walljump: return spr_mapmario_walljump + case cs_squirrel: return spr_mapmario_squirrel + case cs_cloud: return spr_mapmario_cloud + case cs_rock: return spr_mapmario_rock + case cs_pyre: return spr_mapmario_pyre + case cs_swooper: return spr_mapmario_swooper + case cs_karate: return spr_mapmario_karate + case cs_crown: return spr_mapmario_crown } diff --git a/scripts/scr_marioride.gml b/scripts/scr_marioride.gml index 5f865e0f..1ce064d0 100644 --- a/scripts/scr_marioride.gml +++ b/scripts/scr_marioride.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_ride case cs_boomerang: return spr_mario_boomerang_ride case cs_walljump: return spr_mario_walljump_ride + case cs_squirrel: return spr_mario_squirrel_ride + case cs_cloud: return spr_mario_cloud_ride + case cs_rock: return spr_mario_rock_ride + case cs_pyre: return spr_mario_pyre_ride + case cs_swooper: return spr_mario_swooper_ride + case cs_karate: return spr_mario_karate_ride + case cs_crown: return spr_mario_crown_ride } diff --git a/scripts/scr_mariorun.gml b/scripts/scr_mariorun.gml index e8867bd1..bcc41aca 100644 --- a/scripts/scr_mariorun.gml +++ b/scripts/scr_mariorun.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_run case cs_boomerang: return spr_mario_boomerang_run case cs_walljump: return spr_mario_walljump_run + case cs_squirrel: return spr_mario_squirrel_run + case cs_cloud: return spr_mario_cloud_run + case cs_rock: return spr_mario_rock_run + case cs_pyre: return spr_mario_pyre_run + case cs_swooper: return spr_mario_swooper_run + case cs_karate: return spr_mario_karate_run + case cs_crown: return spr_mario_crown_run } diff --git a/scripts/scr_mariorunjump.gml b/scripts/scr_mariorunjump.gml index b80a4992..b016a159 100644 --- a/scripts/scr_mariorunjump.gml +++ b/scripts/scr_mariorunjump.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_runjump case cs_boomerang: return spr_mario_boomerang_runjump case cs_walljump: return spr_mario_walljump_runjump + case cs_squirrel: return spr_mario_squirrel_runjump + case cs_cloud: return spr_mario_cloud_runjump + case cs_rock: return spr_mario_rock_runjump + case cs_pyre: return spr_mario_pyre_runjump + case cs_swooper: return spr_mario_swooper_runjump + case cs_karate: return spr_mario_karate_runjump + case cs_crown: return spr_mario_crown_runjump } diff --git a/scripts/scr_marioshoot.gml b/scripts/scr_marioshoot.gml index c78b8573..b92d2275 100644 --- a/scripts/scr_marioshoot.gml +++ b/scripts/scr_marioshoot.gml @@ -17,4 +17,5 @@ switch global.powerup case cs_ninja: return spr_mario_ninja_shoot case cs_penguin: return spr_mario_penguin_shoot case cs_boomerang: return spr_mario_boomerang_shoot + case cs_pyre: return spr_mario_pyre_shoot } diff --git a/scripts/scr_marioskid.gml b/scripts/scr_marioskid.gml index 7281ff43..d62e6fbe 100644 --- a/scripts/scr_marioskid.gml +++ b/scripts/scr_marioskid.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_skid case cs_boomerang: return spr_mario_boomerang_skid case cs_walljump: return spr_mario_walljump_skid + case cs_squirrel: return spr_mario_squirrel_skid + case cs_cloud: return spr_mario_cloud_skid + case cs_rock: return spr_mario_rock_skid + case cs_pyre: return spr_mario_pyre_skid + case cs_swooper: return spr_mario_swooper_skid + case cs_karate: return spr_mario_karate_skid + case cs_crown: return spr_mario_crown_skid } diff --git a/scripts/scr_marioslide.gml b/scripts/scr_marioslide.gml index 72d04a07..b468080d 100644 --- a/scripts/scr_marioslide.gml +++ b/scripts/scr_marioslide.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_slide case cs_boomerang: return spr_mario_boomerang_slide case cs_walljump: return spr_mario_walljump_slide + case cs_squirrel: return spr_mario_squirrel_slide + case cs_cloud: return spr_mario_cloud_slide + case cs_rock: return spr_mario_rock_slide + case cs_pyre: return spr_mario_pyre_slide + case cs_swooper: return spr_mario_swooper_slide + case cs_karate: return spr_mario_karate_slide + case cs_crown: return spr_mario_crown_slide } diff --git a/scripts/scr_marioswim.gml b/scripts/scr_marioswim.gml index 9ec8bb46..54b2dda6 100644 --- a/scripts/scr_marioswim.gml +++ b/scripts/scr_marioswim.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_swim case cs_boomerang: return spr_mario_boomerang_swim case cs_walljump: return spr_mario_walljump_swim + case cs_squirrel: return spr_mario_squirrel_swim + case cs_cloud: return spr_mario_cloud_swim + case cs_rock: return spr_mario_rock_swim + case cs_pyre: return spr_mario_pyre_swim + case cs_swooper: return spr_mario_swooper_swim + case cs_karate: return spr_mario_karate_swim + case cs_crown: return spr_mario_crown_swim } diff --git a/scripts/scr_mariowalk.gml b/scripts/scr_mariowalk.gml index 7b4ec39d..957b2687 100644 --- a/scripts/scr_mariowalk.gml +++ b/scripts/scr_mariowalk.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_walk case cs_boomerang: return spr_mario_boomerang_walk case cs_walljump: return spr_mario_walljump_walk + case cs_squirrel: return spr_mario_squirrel_walk + case cs_cloud: return spr_mario_cloud_walk + case cs_rock: return spr_mario_rock_walk + case cs_pyre: return spr_mario_pyre_walk + case cs_swooper: return spr_mario_swooper_walk + case cs_karate: return spr_mario_karate_walk + case cs_crown: return spr_mario_crown_walk } diff --git a/scripts/scr_mariowarp.gml b/scripts/scr_mariowarp.gml index 32677eeb..bacc199b 100644 --- a/scripts/scr_mariowarp.gml +++ b/scripts/scr_mariowarp.gml @@ -27,4 +27,11 @@ switch global.powerup case cs_propeller: return spr_mario_propeller_warp case cs_boomerang: return spr_mario_boomerang_warp case cs_walljump: return spr_mario_walljump_warp + case cs_squirrel: return spr_mario_squirrel_warp + case cs_cloud: return spr_mario_cloud_warp + case cs_rock: return spr_mario_rock_warp + case cs_pyre: return spr_mario_pyre_warp + case cs_swooper: return spr_mario_swooper_warp + case cs_karate: return spr_mario_karate_warp + case cs_crown: return spr_mario_crown_warp } diff --git a/scripts/scr_sprite_get_constant.gml b/scripts/scr_sprite_get_constant.gml index 88ea46e0..6296db09 100644 --- a/scripts/scr_sprite_get_constant.gml +++ b/scripts/scr_sprite_get_constant.gml @@ -29,6 +29,13 @@ switch argument0 case spr_propellershroom: return cs_propeller case spr_boomerangflower: return cs_boomerang case spr_walljumpshroom: return cs_walljump + case spr_acorn: return cs_squirrel + case spr_cloudflower: return cs_cloud + case spr_rockshroom: return cs_rock + case spr_pyreflower: return cs_pyre + case spr_swoopersuit: return cs_swooper + case spr_karatesuit: return cs_karate + case spr_supercrown: return cs_crown case spr_hatch: return cs_greenyoshi case spr_hatch_r: return cs_redyoshi case spr_hatch_y: return cs_yellowyoshi diff --git a/scripts/scr_sprite_make_object.gml b/scripts/scr_sprite_make_object.gml index bf94699b..a6e46bc6 100644 --- a/scripts/scr_sprite_make_object.gml +++ b/scripts/scr_sprite_make_object.gml @@ -46,6 +46,20 @@ switch argument2 return instance_create(argument0,argument1,obj_boomerangflower) case spr_walljumpshroom: return instance_create(argument0,argument1,obj_walljumpshroom) + case spr_acorn: + return instance_create(argument0,argument1,obj_acorn) + case spr_cloudflower: + return instance_create(argument0,argument1,obj_cloudflower) + case spr_rockshroom: + return instance_create(argument0,argument1,obj_rockshroom) + case spr_pyreflower: + return instance_create(argument0,argument1,obj_pyreflower) + case spr_swoopersuit: + return instance_create(argument0,argument1,obj_swoopersuit) + case spr_karatesuit: + return instance_create(argument0,argument1,obj_karatesuit) + case spr_supercrown: + return instance_create(argument0,argument1,obj_supercrown) case spr_hatch: return instance_create(argument0,argument1,obj_hatch) case spr_hatch_r: