summaryrefslogtreecommitdiff
path: root/maps/CeladonCafe.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonCafe.asm')
-rw-r--r--maps/CeladonCafe.asm47
1 files changed, 27 insertions, 20 deletions
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index 35ca2971f..4ede9fb73 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -1,3 +1,10 @@
+const_value set 2
+ const CELADONCAFE_SUPER_NERD
+ const CELADONCAFE_FISHER1
+ const CELADONCAFE_FISHER2
+ const CELADONCAFE_FISHER3
+ const CELADONCAFE_TEACHER
+
CeladonCafe_MapScriptHeader:
.MapTriggers:
db 0
@@ -9,47 +16,47 @@ SuperNerdScript_0x73049:
faceplayer
loadfont
writetext UnknownText_0x730de
+ waitbutton
closetext
- loadmovesprites
end
FisherScript_0x73051:
loadfont
writetext UnknownText_0x73129
+ waitbutton
closetext
- loadmovesprites
faceplayer
loadfont
writetext UnknownText_0x7313a
+ waitbutton
closetext
- loadmovesprites
- spriteface $3, LEFT
+ spriteface CELADONCAFE_FISHER1, LEFT
end
FisherScript_0x73062:
loadfont
writetext UnknownText_0x7316a
+ waitbutton
closetext
- loadmovesprites
faceplayer
loadfont
writetext UnknownText_0x73178
+ waitbutton
closetext
- loadmovesprites
- spriteface $4, RIGHT
+ spriteface CELADONCAFE_FISHER2, RIGHT
end
FisherScript_0x73073:
loadfont
writetext UnknownText_0x731ae
+ waitbutton
closetext
- loadmovesprites
faceplayer
loadfont
writetext UnknownText_0x731bd
+ waitbutton
closetext
- loadmovesprites
- spriteface $5, RIGHT
+ spriteface CELADONCAFE_FISHER3, RIGHT
end
TeacherScript_0x73084:
@@ -57,27 +64,27 @@ TeacherScript_0x73084:
iftrue UnknownScript_0x7309a
loadfont
writetext UnknownText_0x73201
+ waitbutton
closetext
- loadmovesprites
faceplayer
loadfont
writetext UnknownText_0x73212
+ waitbutton
closetext
- loadmovesprites
- spriteface $6, LEFT
+ spriteface CELADONCAFE_TEACHER, LEFT
end
UnknownScript_0x7309a:
loadfont
writetext UnknownText_0x73254
+ waitbutton
closetext
- loadmovesprites
- spriteface $6, RIGHT
+ spriteface CELADONCAFE_TEACHER, RIGHT
loadfont
writetext UnknownText_0x73278
+ waitbutton
closetext
- loadmovesprites
- spriteface $6, LEFT
+ spriteface CELADONCAFE_TEACHER, LEFT
end
EatathonContestPoster:
@@ -92,9 +99,9 @@ CeladonCafeTrashcan:
itemtotext LEFTOVERS, $0
writetext FoundLeftoversText
playsound SFX_ITEM
- waitbutton
+ waitsfx
itemnotify
- loadmovesprites
+ closetext
setevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE
end
@@ -104,8 +111,8 @@ CeladonCafeTrashcan:
writetext FoundLeftoversText
keeptextopen
writetext NoRoomForLeftoversText
+ waitbutton
closetext
- loadmovesprites
end
.TrashEmpty