diff options
Diffstat (limited to 'maps/ViridianNicknameSpeechHouse.asm')
| -rw-r--r-- | maps/ViridianNicknameSpeechHouse.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 10d2c52e5..8fd12eb25 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M const VIRIDIANNICKNAMESPEECHHOUSE_LASS const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY ViridianNicknameSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks ViridianNicknameSpeechHousePokefanMScript: jumptextfaceplayer ViridianNicknameSpeechHousePokefanMText @@ -62,23 +60,18 @@ RatteyText: done ViridianNicknameSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 2, VIRIDIAN_CITY - warp_def 3, 7, 2, VIRIDIAN_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 - object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 - object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1 - object_event 6, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, VIRIDIAN_CITY, 2 + warp_event 3, 7, VIRIDIAN_CITY, 2 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 2, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHousePokefanMScript, -1 + object_event 5, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ViridianNicknameSpeechHouseLassScript, -1 + object_event 5, 2, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Speary, -1 + object_event 6, 3, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Rattey, -1 |