summaryrefslogtreecommitdiff
path: root/maps/GoldenrodHappinessRater.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodHappinessRater.asm')
-rw-r--r--maps/GoldenrodHappinessRater.asm86
1 files changed, 33 insertions, 53 deletions
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 0a121da5f..74bcf5b51 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -1,15 +1,14 @@
-GoldenrodHappinessRater_MapScriptHeader: ; 0x54951
- ; trigger count
+GoldenrodHappinessRater_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x54953
-TeacherScript_0x54953: ; 0x54953
+TeacherScript_0x54953:
faceplayer
loadfont
- special Function718d
+ special GetFirstPokemonHappiness
writetext UnknownText_0x549a3
keeptextopen
if_greater_than $f9, UnknownScript_0x54973
@@ -18,57 +17,48 @@ TeacherScript_0x54953: ; 0x54953
if_greater_than $63, UnknownScript_0x54985
if_greater_than $31, UnknownScript_0x5498b
jump UnknownScript_0x54991
-; 0x54973
-UnknownScript_0x54973: ; 0x54973
+UnknownScript_0x54973:
writetext UnknownText_0x549fc
closetext
loadmovesprites
end
-; 0x54979
-UnknownScript_0x54979: ; 0x54979
+UnknownScript_0x54979:
writetext UnknownText_0x54a2c
closetext
loadmovesprites
end
-; 0x5497f
-UnknownScript_0x5497f: ; 0x5497f
+UnknownScript_0x5497f:
writetext UnknownText_0x54a5a
closetext
loadmovesprites
end
-; 0x54985
-UnknownScript_0x54985: ; 0x54985
+UnknownScript_0x54985:
writetext UnknownText_0x54a8e
closetext
loadmovesprites
end
-; 0x5498b
-UnknownScript_0x5498b: ; 0x5498b
+UnknownScript_0x5498b:
writetext UnknownText_0x54a9f
closetext
loadmovesprites
end
-; 0x54991
-UnknownScript_0x54991: ; 0x54991
+UnknownScript_0x54991:
writetext UnknownText_0x54ad1
closetext
loadmovesprites
end
-; 0x54997
-PokefanMScript_0x54997: ; 0x54997
+PokefanMScript_0x54997:
jumptextfaceplayer UnknownText_0x54b04
-; 0x5499a
-TwinScript_0x5499a: ; 0x5499a
+TwinScript_0x5499a:
jumptextfaceplayer UnknownText_0x54b67
-; 0x5499d
HappinessRatersHouseBookshelf:
jumpstd difficultbookshelf
@@ -76,7 +66,7 @@ HappinessRatersHouseBookshelf:
HappinessRatersHouseRadio:
jumpstd radio2
-UnknownText_0x549a3: ; 0x549a3
+UnknownText_0x549a3:
text "If you treat your"
line "#MON nicely,"
@@ -88,49 +78,42 @@ UnknownText_0x549a3: ; 0x549a3
text_from_ram StringBuffer3
text "…"
done
-; 0x549fc
-UnknownText_0x549fc: ; 0x549fc
+UnknownText_0x549fc:
text "It looks really"
line "happy! It must"
cont "love you a lot."
done
-; 0x54a2c
-UnknownText_0x54a2c: ; 0x54a2c
+UnknownText_0x54a2c:
text "I get the feeling"
line "that it really"
cont "trusts you."
done
-; 0x54a5a
-UnknownText_0x54a5a: ; 0x54a5a
+UnknownText_0x54a5a:
text "It's friendly to-"
line "ward you. It looks"
cont "sort of happy."
done
-; 0x54a8e
-UnknownText_0x54a8e: ; 0x54a8e
+UnknownText_0x54a8e:
text "It's quite cute."
done
-; 0x54a9f
-UnknownText_0x54a9f: ; 0x54a9f
+UnknownText_0x54a9f:
text "You should treat"
line "it better. It's"
cont "not used to you."
done
-; 0x54ad1
-UnknownText_0x54ad1: ; 0x54ad1
+UnknownText_0x54ad1:
text "It doesn't seem to"
line "like you at all."
cont "It looks mean."
done
-; 0x54b04
-UnknownText_0x54b04: ; 0x54b04
+UnknownText_0x54b04:
text "I keep losing in"
line "battles, and my"
@@ -141,36 +124,33 @@ UnknownText_0x54b04: ; 0x54b04
line "my #MON don't"
cont "like me much…"
done
-; 0x54b67
-UnknownText_0x54b67: ; 0x54b67
+UnknownText_0x54b67:
text "When I use an item"
line "on my #MON, it"
cont "acts really glad!"
done
-; 0x54b9c
-GoldenrodHappinessRater_MapEventHeader: ; 0x54b9c
+GoldenrodHappinessRater_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 3, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY
warp_def $7, $3, 3, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 3
- signpost 1, 0, $0, HappinessRatersHouseBookshelf
- signpost 1, 1, $0, HappinessRatersHouseBookshelf
- signpost 1, 7, $0, HappinessRatersHouseRadio
+ signpost 1, 0, SIGNPOST_READ, HappinessRatersHouseBookshelf
+ signpost 1, 1, SIGNPOST_READ, HappinessRatersHouseBookshelf
+ signpost 1, 7, SIGNPOST_READ, HappinessRatersHouseRadio
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, $ffff
- person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, $ffff
- person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, $ffff
-; 0x54be2
+ person_event SPRITE_TEACHER, 8, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x54953, -1
+ person_event SPRITE_POKEFAN_M, 7, 9, OW_LEFT | $0, $0, -1, -1, $0, 0, PokefanMScript_0x54997, -1
+ person_event SPRITE_TWIN, 10, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x5499a, -1