summaryrefslogtreecommitdiff
path: root/maps/GoldenrodPokeComCenter2FMobile.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodPokeComCenter2FMobile.asm')
-rw-r--r--maps/GoldenrodPokeComCenter2FMobile.asm46
1 files changed, 23 insertions, 23 deletions
diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm
index 56ae85b30..535ee02f8 100644
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -4,20 +4,20 @@ const_value set 2
const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3
GoldenrodPokeComCenter2FMobile_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
db 0
-ScientistScript_0x625d1:
- jumptextfaceplayer UnknownText_0x62674
+GoldenrodPokeComCenter2FMobileScientist1Script:
+ jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist1Text
-ScientistScript_0x625d4:
- jumptextfaceplayer UnknownText_0x626f9
+GoldenrodPokeComCenter2FMobileScientist2Script:
+ jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist2Text
-ScientistScript_0x625d7:
- jumptextfaceplayer UnknownText_0x62795
+GoldenrodPokeComCenter2FMobileScientist3Script:
+ jumptextfaceplayer GoldenrodPokeComCenter2FMobileScientist3Text
MapGoldenrodPokeComCenter2FMobileSignpost0Script:
opentext
@@ -53,10 +53,10 @@ MenuDataHeader_0x62602:
db $40 ; flags
db 00, 00 ; start coords
db 08, 15 ; end coords
- dw MenuData2_0x6260a
+ dw .MenuData2
db 1 ; default option
-MenuData2_0x6260a:
+.MenuData2:
db $80 ; flags
db 3 ; items
db "# つうしん クラブ@" ; # COM CLUB
@@ -98,10 +98,10 @@ MenuDataHeader_0x6264c:
db $40 ; flags
db 00, 00 ; start coords
db 08, 15 ; end coords
- dw MenuData2_0x62654
+ dw .MenuData2
db 1 ; default option
-MenuData2_0x62654:
+.MenuData2:
db $80 ; flags
db 3 ; items
db "でんわ", $1f,"つかうとき@" ; Use phone
@@ -112,7 +112,7 @@ MenuData2_0x62654:
MapGoldenrodPokeComCenter2FMobileSignpost2Script:
jumptext UnknownText_0x62b26
-UnknownText_0x62674:
+GoldenrodPokeComCenter2FMobileScientist1Text:
text "#COM CENTER and"
line "MOBILE CENTER were"
@@ -126,7 +126,7 @@ UnknownText_0x62674:
line "strangers."
done
-UnknownText_0x626f9:
+GoldenrodPokeComCenter2FMobileScientist2Text:
text "When you linked"
line "with someone by"
@@ -143,7 +143,7 @@ UnknownText_0x626f9:
line "got the shakes!"
done
-UnknownText_0x62795:
+GoldenrodPokeComCenter2FMobileScientist3Text:
text "They were able to"
line "build this huge"
@@ -277,17 +277,17 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader:
warp_def $1f, $0, 3, GOLDENROD_POKECENTER_1F
warp_def $1f, $1, 3, GOLDENROD_POKECENTER_1F
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 3
- signpost 26, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script
- signpost 28, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script
- signpost 26, 3, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script
+ bg_event 26, 6, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script
+ bg_event 28, 6, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script
+ bg_event 26, 3, BGEVENT_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script
-.PersonEvents:
+.ObjectEvents:
db 3
- person_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d1, -1
- person_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d4, -1
- person_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ScientistScript_0x625d7, -1
+ object_event SPRITE_SCIENTIST, 28, 4, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist1Script, -1
+ object_event SPRITE_SCIENTIST, 27, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist2Script, -1
+ object_event SPRITE_SCIENTIST, 29, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPokeComCenter2FMobileScientist3Script, -1