summaryrefslogtreecommitdiff
path: root/maps/CeladonCafe.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonCafe.asm')
-rw-r--r--maps/CeladonCafe.asm82
1 files changed, 32 insertions, 50 deletions
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 08dd25c4c..63e8a4f92 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -1,21 +1,19 @@
-CeladonCafe_MapScriptHeader: ; 0x73047
- ; trigger count
+CeladonCafe_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x73049
-SuperNerdScript_0x73049: ; 0x73049
+SuperNerdScript_0x73049:
faceplayer
loadfont
writetext UnknownText_0x730de
closetext
loadmovesprites
end
-; 0x73051
-FisherScript_0x73051: ; 0x73051
+FisherScript_0x73051:
loadfont
writetext UnknownText_0x73129
closetext
@@ -27,9 +25,8 @@ FisherScript_0x73051: ; 0x73051
loadmovesprites
spriteface $3, LEFT
end
-; 0x73062
-FisherScript_0x73062: ; 0x73062
+FisherScript_0x73062:
loadfont
writetext UnknownText_0x7316a
closetext
@@ -41,9 +38,8 @@ FisherScript_0x73062: ; 0x73062
loadmovesprites
spriteface $4, RIGHT
end
-; 0x73073
-FisherScript_0x73073: ; 0x73073
+FisherScript_0x73073:
loadfont
writetext UnknownText_0x731ae
closetext
@@ -55,9 +51,8 @@ FisherScript_0x73073: ; 0x73073
loadmovesprites
spriteface $5, RIGHT
end
-; 0x73084
-TeacherScript_0x73084: ; 0x73084
+TeacherScript_0x73084:
checkitem COIN_CASE
iftrue UnknownScript_0x7309a
loadfont
@@ -71,9 +66,8 @@ TeacherScript_0x73084: ; 0x73084
loadmovesprites
spriteface $6, LEFT
end
-; 0x7309a
-UnknownScript_0x7309a: ; 0x7309a
+UnknownScript_0x7309a:
loadfont
writetext UnknownText_0x73254
closetext
@@ -85,7 +79,6 @@ UnknownScript_0x7309a: ; 0x7309a
loadmovesprites
spriteface $6, LEFT
end
-; 0x730ad
EatathonContestPoster:
jumptext EatathonContestPosterText
@@ -118,7 +111,7 @@ CeladonCafeTrashcan:
.TrashEmpty
jumpstd trashcan
-UnknownText_0x730de: ; 0x730de
+UnknownText_0x730de:
text "Hi!"
para "We're holding an"
@@ -127,73 +120,62 @@ UnknownText_0x730de: ; 0x730de
para "We can't serve you"
line "right now. Sorry."
done
-; 0x73129
-UnknownText_0x73129: ; 0x73129
+UnknownText_0x73129:
text "…Snarfle, chew…"
done
-; 0x7313a
-UnknownText_0x7313a: ; 0x7313a
+UnknownText_0x7313a:
text "Don't talk to me!"
para "You'll break my"
line "concentration!"
done
-; 0x7316a
-UnknownText_0x7316a: ; 0x7316a
+UnknownText_0x7316a:
text "…Gulp… Chew…"
done
-; 0x73178
-UnknownText_0x73178: ; 0x73178
+UnknownText_0x73178:
text "I take quantity"
line "over quality!"
para "I'm happy when I'm"
line "full!"
done
-; 0x731ae
-UnknownText_0x731ae: ; 0x731ae
+UnknownText_0x731ae:
text "Munch, munch…"
done
-; 0x731bd
-UnknownText_0x731bd: ; 0x731bd
+UnknownText_0x731bd:
text "The food is good"
line "here, but GOLDEN-"
cont "ROD has the best"
cont "food anywhere."
done
-; 0x73201
-UnknownText_0x73201: ; 0x73201
+UnknownText_0x73201:
text "Crunch… Crunch…"
done
-; 0x73212
-UnknownText_0x73212: ; 0x73212
+UnknownText_0x73212:
text "Nobody here will"
line "give you a COIN"
para "CASE. You should"
line "look in JOHTO."
done
-; 0x73254
-UnknownText_0x73254: ; 0x73254
+UnknownText_0x73254:
text "Crunch… Crunch…"
para "I can keep eating!"
done
-; 0x73278
-UnknownText_0x73278: ; 0x73278
+UnknownText_0x73278:
text "More, CHEF!"
done
-; 0x73285
EatathonContestPosterText:
text "Eatathon Contest!"
@@ -218,27 +200,27 @@ NoRoomForLeftoversText:
line "hold another item…"
done
-CeladonCafe_MapEventHeader: ; 0x73316
+CeladonCafe_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $6, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY
warp_def $7, $7, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 0, 5, $0, EatathonContestPoster
- signpost 1, 7, $0, CeladonCafeTrashcan
+ signpost 0, 5, SIGNPOST_READ, EatathonContestPoster
+ signpost 1, 7, SIGNPOST_READ, CeladonCafeTrashcan
- ; people-events
+.PersonEvents:
db 5
- person_event SPRITE_SUPER_NERD, 7, 13, $8, $0, 255, 255, $b0, 0, SuperNerdScript_0x73049, $ffff
- person_event SPRITE_FISHER, 10, 8, $8, $0, 255, 255, $0, 0, FisherScript_0x73051, $ffff
- person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, $ffff
- person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, $ffff
- person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, $ffff
+ person_event SPRITE_SUPER_NERD, 7, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, SuperNerdScript_0x73049, -1
+ person_event SPRITE_FISHER, 10, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, FisherScript_0x73051, -1
+ person_event SPRITE_FISHER, 11, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x73062, -1
+ person_event SPRITE_FISHER, 6, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, FisherScript_0x73073, -1
+ person_event SPRITE_TEACHER, 7, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, TeacherScript_0x73084, -1