diff options
Diffstat (limited to 'maps/VioletPokecenter1F.asm')
| -rw-r--r-- | maps/VioletPokecenter1F.asm | 57 |
1 files changed, 25 insertions, 32 deletions
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 9413849b8..ca11063d6 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const VIOLETPOKECENTER1F_NURSE const VIOLETPOKECENTER1F_GAMEBOY_KID const VIOLETPOKECENTER1F_GENTLEMAN @@ -6,11 +6,9 @@ const_value set 2 const VIOLETPOKECENTER1F_SCIENTIST VioletPokecenter1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks VioletPokecenterNurse: jumpstd pokecenternurse @@ -25,20 +23,20 @@ VioletPokecenter1F_ElmsAideScript: yesorno iffalse .RefusedEgg checkcode VAR_PARTYCOUNT - if_equal PARTY_LENGTH, .PartyFull + ifequal PARTY_LENGTH, .PartyFull giveegg TOGEPI, 5 stringtotext .eggname, MEM_BUFFER_1 scall .AideGivesEgg setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED - setmapscene ROUTE_32, 1 + setmapscene ROUTE_32, SCENE_ROUTE32_OFFER_SLOWPOKETAIL writetext UnknownText_0x695c5 waitbutton closetext checkcode VAR_FACING - if_equal UP, .AideWalksAroundPlayer - spriteface PLAYER, DOWN + ifequal UP, .AideWalksAroundPlayer + turnobject PLAYER, DOWN applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter playsound SFX_EXIT_BUILDING disappear VIOLETPOKECENTER1F_SCIENTIST @@ -47,7 +45,7 @@ VioletPokecenter1F_ElmsAideScript: .AideWalksAroundPlayer: applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter - spriteface PLAYER, DOWN + turnobject PLAYER, DOWN applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter playsound SFX_EXIT_BUILDING disappear VIOLETPOKECENTER1F_SCIENTIST @@ -216,25 +214,20 @@ VioletPokecenter1FYoungsterText: done VioletPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 5, VIOLET_CITY - warp_def 4, 7, 5, VIOLET_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 5 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 - object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 - object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 - object_event 8, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 - object_event 4, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, VIOLET_CITY, 5 + warp_event 4, 7, VIOLET_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 5 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenterNurse, -1 + object_event 7, 6, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGameboyKidScript, -1 + object_event 1, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FGentlemanScript, -1 + object_event 8, 1, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1FYoungsterScript, -1 + object_event 4, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletPokecenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER |