diff options
Diffstat (limited to 'maps/MrPokemonsHouse.asm')
| -rw-r--r-- | maps/MrPokemonsHouse.asm | 83 |
1 files changed, 38 insertions, 45 deletions
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 8ac7d0a09..53358e632 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const MRPOKEMONSHOUSE_GENTLEMAN const MRPOKEMONSHOUSE_OAK MrPokemonsHouse_MapScripts: -.SceneScripts: - db 2 - scene_script .MeetMrPokemon - scene_script .DummyScene + db 2 ; scene scripts + scene_script .MeetMrPokemon ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 0 + db 0 ; callbacks .MeetMrPokemon: priorityjump .MrPokemonEvent @@ -20,7 +18,7 @@ MrPokemonsHouse_MapScripts: .MrPokemonEvent: showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15 - spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN + objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN opentext writetext MrPokemonIntroText1 waitbutton @@ -39,11 +37,11 @@ MrPokemonsHouse_MapScripts: blackoutmod CHERRYGROVE_CITY writetext MrPokemonIntroText3 buttonsound - spriteface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT + objectface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT writetext MrPokemonIntroText4 buttonsound - spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN - spriteface MRPOKEMONSHOUSE_OAK, LEFT + objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN + objectface MRPOKEMONSHOUSE_OAK, LEFT writetext MrPokemonIntroText5 waitbutton closetext @@ -86,7 +84,7 @@ MrPokemonsHouse_MrPokemonScript: MrPokemonsHouse_OakScript: playmusic MUSIC_PROF_OAK applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakWalksToPlayer - spriteface PLAYER, RIGHT + objectface PLAYER, RIGHT opentext writetext MrPokemonsHouse_OakText1 buttonsound @@ -98,36 +96,36 @@ MrPokemonsHouse_OakScript: writetext MrPokemonsHouse_OakText2 waitbutton closetext - spriteface PLAYER, DOWN + objectface PLAYER, DOWN applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakExits playsound SFX_EXIT_BUILDING disappear MRPOKEMONSHOUSE_OAK waitsfx special RestartMapMusic pause 15 - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext MrPokemonsHouse_MrPokemonHealText waitbutton closetext - special Special_FadeBlackQuickly + special FadeBlackQuickly special ReloadSpritesNoPalettes playmusic MUSIC_HEAL - special Special_StubbedTrainerRankings_Healings + special StubbedTrainerRankings_Healings special HealParty pause 60 - special Special_FadeInQuickly + special FadeInQuickly special RestartMapMusic opentext writetext MrPokemonText_ImDependingOnYou waitbutton closetext setevent EVENT_RIVAL_NEW_BARK_TOWN - setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR - clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR - setscene 1 - setmapscene CHERRYGROVE_CITY, 1 - setmapscene ELMS_LAB, 3 + setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR + clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR + setscene SCENE_FINISHED + setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_MEET_RIVAL + setmapscene ELMS_LAB, SCENE_ELMSLAB_MEET_OFFICER specialphonecall SPECIALCALL_ROBBED clearevent EVENT_COP_IN_ELMS_LAB checkevent EVENT_GOT_TOTODILE_FROM_ELM @@ -373,26 +371,21 @@ MrPokemonsHouse_StrangeCoinsText: done MrPokemonsHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 2, ROUTE_30 - warp_def 3, 7, 2, ROUTE_30 - -.CoordEvents: - db 0 - -.BGEvents: - db 5 - bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script - bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script - bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script - bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script - bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script - -.ObjectEvents: - db 2 - object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 - object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, ROUTE_30, 2 + warp_event 3, 7, ROUTE_30, 2 + + db 0 ; coord events + + db 5 ; bg events + bg_event 0, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script + bg_event 1, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost1Script + bg_event 6, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script + bg_event 7, 1, BGEVENT_READ, MapMrPokemonsHouseSignpost3Script + bg_event 6, 4, BGEVENT_READ, MapMrPokemonsHouseSignpost4Script + + db 2 ; object events + object_event 3, 5, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrPokemonsHouse_MrPokemonScript, -1 + object_event 6, 5, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK |