diff options
Diffstat (limited to 'data/maps/CeladonCity/scripts.inc')
| -rw-r--r-- | data/maps/CeladonCity/scripts.inc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index b5e32115f..b27d12178 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -1,13 +1,13 @@ CeladonCity_MapScripts:: @ 8166C8F - map_script 3, CeladonCity_MapScript1_166C95 + map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition .byte 0 -CeladonCity_MapScript1_166C95:: @ 8166C95 +CeladonCity_OnTransition:: @ 8166C95 setworldmapflag FLAG_WORLD_MAP_CELADON_CITY end CeladonCity_EventScript_166C99:: @ 8166C99 - msgbox gUnknown_817FEC3, 2 + msgbox gUnknown_817FEC3, MSGBOX_NPC end CeladonCity_EventScript_166CA2:: @ 8166CA2 @@ -17,15 +17,15 @@ CeladonCity_EventScript_166CA2:: @ 8166CA2 end CeladonCity_EventScript_166CAD:: @ 8166CAD - msgbox gUnknown_817FF4A, 2 + msgbox gUnknown_817FF4A, MSGBOX_NPC end CeladonCity_EventScript_166CB6:: @ 8166CB6 - msgbox gUnknown_817FFC5, 2 + msgbox gUnknown_817FFC5, MSGBOX_NPC end -CeladonCity_EventScript_166CBF:: @ 8166CBF - goto EventScript_1C4A86 +CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF + goto EventScript_SoftboiledTutor end CeladonCity_EventScript_166CC5:: @ 8166CC5 @@ -33,7 +33,7 @@ CeladonCity_EventScript_166CC5:: @ 8166CC5 faceplayer msgbox gUnknown_818001B closemessage - applymovement 2, Movement_1A75E5 + applymovement 2, Movement_FaceOriginalDirection waitmovement 0 release end @@ -46,33 +46,33 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC msgbox gUnknown_8180075 closemessage waitmoncry - applymovement 3, Movement_1A75E5 + applymovement 3, Movement_FaceOriginalDirection waitmovement 0 release end CeladonCity_EventScript_166CFA:: @ 8166CFA - msgbox gUnknown_81800C2, 2 + msgbox gUnknown_81800C2, MSGBOX_NPC end CeladonCity_EventScript_166D03:: @ 8166D03 - msgbox gUnknown_818008C, 2 + msgbox gUnknown_818008C, MSGBOX_NPC end CeladonCity_EventScript_166D0C:: @ 8166D0C - msgbox gUnknown_8180300, 2 + msgbox gUnknown_8180300, MSGBOX_NPC end CeladonCity_EventScript_166D15:: @ 8166D15 - msgbox gUnknown_81804E1, 2 + msgbox gUnknown_81804E1, MSGBOX_NPC end CeladonCity_EventScript_166D1E:: @ 8166D1E - msgbox gUnknown_81800E1, 3 + msgbox gUnknown_81800E1, MSGBOX_SIGN end CeladonCity_EventScript_166D27:: @ 8166D27 - msgbox gUnknown_818017A, 3 + msgbox gUnknown_818017A, MSGBOX_SIGN end CeladonCity_EventScript_166D30:: @ 8166D30 @@ -83,21 +83,21 @@ CeladonCity_EventScript_166D30:: @ 8166D30 end CeladonCity_EventScript_166D48:: @ 8166D48 - msgbox gUnknown_81801E5, 3 + msgbox gUnknown_81801E5, MSGBOX_SIGN end CeladonCity_EventScript_166D51:: @ 8166D51 - msgbox gUnknown_81801F5, 3 + msgbox gUnknown_81801F5, MSGBOX_SIGN end CeladonCity_EventScript_166D5A:: @ 8166D5A - msgbox gUnknown_8180224, 3 + msgbox gUnknown_8180224, MSGBOX_SIGN end CeladonCity_EventScript_166D63:: @ 8166D63 - msgbox gUnknown_81802A4, 3 + msgbox gUnknown_81802A4, MSGBOX_SIGN end CeladonCity_EventScript_166D6C:: @ 8166D6C - msgbox gUnknown_81802CF, 3 + msgbox gUnknown_81802CF, MSGBOX_SIGN end |