diff options
Diffstat (limited to 'maps/FuchsiaPokecenter1F.asm')
| -rw-r--r-- | maps/FuchsiaPokecenter1F.asm | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index 9bc8775a6..3e05aa719 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const FUCHSIAPOKECENTER1F_NURSE const FUCHSIAPOKECENTER1F_COOLTRAINER_M const FUCHSIAPOKECENTER1F_COOLTRAINER_F const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR FuchsiaPokecenter1F_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -33,7 +31,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX opentext writetext UnknownText_0x19654e waitbutton @@ -41,7 +39,7 @@ JanineImpersonatorScript_0x196462: applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS - special Special_LoadUsedSpritesGFX + special LoadUsedSpritesGFX end MovementData_0x196486: @@ -89,24 +87,19 @@ UnknownText_0x19654e: done FuchsiaPokecenter1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 3 - warp_def 3, 7, 5, FUCHSIA_CITY - warp_def 4, 7, 5, FUCHSIA_CITY - warp_def 0, 7, 1, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 0 - -.ObjectEvents: - db 4 - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1 - object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 - object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 - object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 + db 0, 0 ; filler + + db 3 ; warp events + warp_event 3, 7, FUCHSIA_CITY, 5 + warp_event 4, 7, FUCHSIA_CITY, 5 + warp_event 0, 7, POKECENTER_2F, 1 + + db 0 ; coord events + + db 0 ; bg events + + db 4 ; object events + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NurseScript_0x196459, -1 + object_event 8, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerMScript, -1 + object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaPokecenter1FCooltrainerFScript, -1 + object_event 5, 3, SPRITE_JANINE_IMPERSONATOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, JanineImpersonatorScript_0x196462, -1 |