summaryrefslogtreecommitdiff
path: root/maps/GoldenrodPokeComCenter2FMobile.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodPokeComCenter2FMobile.asm')
-rw-r--r--maps/GoldenrodPokeComCenter2FMobile.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm
index 2179dab30..44da9ca7b 100644
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -1,8 +1,8 @@
GoldenrodPokeComCenter2FMobile_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
ScientistScript_0x625d1:
@@ -99,8 +99,8 @@ MenuDataHeader_0x6264c:
MenuData2_0x62654:
db $80 ; flags
db 3 ; items
- db "でんわ",$1f,"つかうとき@" ; Use phone
- db "でんわ",$4a,"つながらないとき@" ; Don't use phone
+ db "でんわ", $1f,"つかうとき@" ; Use phone
+ db "でんわ", $4a,"つながらないとき@" ; Don't use phone
db "やめる@" ; QUIT
@@ -267,22 +267,22 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $1f, $0, 3, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F
warp_def $1f, $1, 3, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 3
- signpost 26, 6, $1, MapGoldenrodPokeComCenter2FMobileSignpost0Script
- signpost 28, 6, $1, MapGoldenrodPokeComCenter2FMobileSignpost1Script
- signpost 26, 3, $1, MapGoldenrodPokeComCenter2FMobileSignpost2Script
+ signpost 26, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script
+ signpost 28, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script
+ signpost 26, 3, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, -1
- person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, -1
- person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, -1
+ person_event SPRITE_SCIENTIST, 32, 8, OW_UP | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, ScientistScript_0x625d1, -1
+ person_event SPRITE_SCIENTIST, 31, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x625d4, -1
+ person_event SPRITE_SCIENTIST, 33, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ScientistScript_0x625d7, -1