diff options
Diffstat (limited to 'maps/SaffronPokecenter1F.asm')
| -rw-r--r-- | maps/SaffronPokecenter1F.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 91f2f9ba1..960f9f9be 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -9,10 +9,10 @@ SaffronPokecenter1F_MapScripts: db 0 ; callbacks -NurseScript_0x18a47d: +SaffronPokecenter1FNurseScript: jumpstd pokecenternurse -TeacherScript_0x18a480: +SaffronPokecenter1FTeacherScript: special Mobile_DummyReturnFalse iftrue .mobile jumptextfaceplayer UnknownText_0x18a4a3 @@ -20,7 +20,7 @@ TeacherScript_0x18a480: .mobile jumptextfaceplayer UnknownText_0x18a532 -FisherScript_0x18a48c: +SaffronPokecenter1FFisherScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART @@ -122,7 +122,7 @@ SaffronPokecenter1F_MapEvents: db 0 ; bg events db 4 ; object events - object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NurseScript_0x18a47d, -1 - object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TeacherScript_0x18a480, -1 - object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FisherScript_0x18a48c, -1 + object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FNurseScript, -1 + object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FTeacherScript, -1 + object_event 8, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FFisherScript, -1 object_event 1, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronPokecenter1FYoungsterScript, -1 |