summaryrefslogtreecommitdiff
path: root/maps/TrainerHouse1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/TrainerHouse1F.asm')
-rw-r--r--maps/TrainerHouse1F.asm82
1 files changed, 32 insertions, 50 deletions
diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm
index 96c86ead4..e18ed7b90 100644
--- a/maps/TrainerHouse1F.asm
+++ b/maps/TrainerHouse1F.asm
@@ -1,44 +1,35 @@
-TrainerHouse1F_MapScriptHeader: ; 0x9af65
- ; trigger count
+TrainerHouse1F_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x9af67
-ReceptionistScript_0x9af67: ; 0x9af67
+ReceptionistScript_0x9af67:
jumptextfaceplayer UnknownText_0x9af7f
-; 0x9af6a
-CooltrainerMScript_0x9af6a: ; 0x9af6a
+CooltrainerMScript_0x9af6a:
jumptextfaceplayer UnknownText_0x9b025
-; 0x9af6d
-CooltrainerFScript_0x9af6d: ; 0x9af6d
+CooltrainerFScript_0x9af6d:
jumptextfaceplayer UnknownText_0x9b0b5
-; 0x9af70
-YoungsterScript_0x9af70: ; 0x9af70
+YoungsterScript_0x9af70:
jumptextfaceplayer UnknownText_0x9b11d
-; 0x9af73
-GentlemanScript_0x9af73: ; 0x9af73
+GentlemanScript_0x9af73:
jumptextfaceplayer UnknownText_0x9b1c9
-; 0x9af76
-MapTrainerHouse1FSignpost0Script: ; 0x9af76
+MapTrainerHouse1FSignpost0Script:
jumptext UnknownText_0x9b1f4
-; 0x9af79
-MapTrainerHouse1FSignpost1Script: ; 0x9af79
+MapTrainerHouse1FSignpost1Script:
jumptext UnknownText_0x9b25d
-; 0x9af7c
-MapTrainerHouse1FSignpost2Script: ; 0x9af7c
+MapTrainerHouse1FSignpost2Script:
jumptext UnknownText_0x9b2c1
-; 0x9af7f
-UnknownText_0x9af7f: ; 0x9af7f
+UnknownText_0x9af7f:
text "Welcome to TRAINER"
line "HOUSE, the newest"
@@ -54,9 +45,8 @@ UnknownText_0x9af7f: ; 0x9af7f
para "of the best right"
line "downstairs."
done
-; 0x9b025
-UnknownText_0x9b025: ; 0x9b025
+UnknownText_0x9b025:
text "VIRIDIAN is the"
line "town closest to"
cont "INDIGO PLATEAU."
@@ -70,9 +60,8 @@ UnknownText_0x9b025: ; 0x9b025
para "way up to INDIGO"
line "PLATEAU."
done
-; 0x9b0b5
-UnknownText_0x9b0b5: ; 0x9b0b5
+UnknownText_0x9b0b5:
text "They hold practice"
line "battles downstairs"
cont "here."
@@ -83,9 +72,8 @@ UnknownText_0x9b0b5: ; 0x9b0b5
para "trainer from JOHTO"
line "battles."
done
-; 0x9b11d
-UnknownText_0x9b11d: ; 0x9b11d
+UnknownText_0x9b11d:
text "I guess you can't"
line "become the CHAMP"
@@ -101,16 +89,14 @@ UnknownText_0x9b11d: ; 0x9b11d
para "all the cities and"
line "towns in KANTO."
done
-; 0x9b1c9
-UnknownText_0x9b1c9: ; 0x9b1c9
+UnknownText_0x9b1c9:
text "Whew… I'm taking a"
line "rest from #MON"
cont "battles."
done
-; 0x9b1f4
-UnknownText_0x9b1f4: ; 0x9b1f4
+UnknownText_0x9b1f4:
text "Practice battles"
line "are held in the"
@@ -121,9 +107,8 @@ UnknownText_0x9b1f4: ; 0x9b1f4
line "are invited to"
cont "participate."
done
-; 0x9b25d
-UnknownText_0x9b25d: ; 0x9b25d
+UnknownText_0x9b25d:
text "There are no rules"
line "or regulations for"
@@ -133,9 +118,8 @@ UnknownText_0x9b25d: ; 0x9b25d
para "battles, anything"
line "goes!"
done
-; 0x9b2c1
-UnknownText_0x9b2c1: ; 0x9b2c1
+UnknownText_0x9b2c1:
text "…What's this?"
line "A strategy memo?"
@@ -145,32 +129,30 @@ UnknownText_0x9b2c1: ; 0x9b2c1
para "It's completely"
line "illegible…"
done
-; 0x9b31f
-TrainerHouse1F_MapEventHeader: ; 0x9b31f
+TrainerHouse1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 3
warp_def $d, $2, 3, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY
warp_def $d, $3, 3, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY
warp_def $2, $8, 1, GROUP_TRAINER_HOUSE_B1F, MAP_TRAINER_HOUSE_B1F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 3
- signpost 0, 5, $0, MapTrainerHouse1FSignpost0Script
- signpost 0, 7, $0, MapTrainerHouse1FSignpost1Script
- signpost 10, 7, $0, MapTrainerHouse1FSignpost2Script
+ signpost 0, 5, SIGNPOST_READ, MapTrainerHouse1FSignpost0Script
+ signpost 0, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost1Script
+ signpost 10, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost2Script
- ; people-events
+.PersonEvents:
db 5
- person_event SPRITE_RECEPTIONIST, 15, 4, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x9af67, $ffff
- person_event SPRITE_COOLTRAINER_M, 15, 11, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9af6a, $ffff
- person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, $ffff
- person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, $ffff
- person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, $ffff
-; 0x9b384
+ person_event SPRITE_RECEPTIONIST, 15, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x9af67, -1
+ person_event SPRITE_COOLTRAINER_M, 15, 11, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x9af6a, -1
+ person_event SPRITE_COOLTRAINER_F, 6, 10, OW_UP | $2, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x9af6d, -1
+ person_event SPRITE_YOUNGSTER, 12, 8, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x9af70, -1
+ person_event SPRITE_GENTLEMAN, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, GentlemanScript_0x9af73, -1