summaryrefslogtreecommitdiff
path: root/maps/TrainerHouseB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/TrainerHouseB1F.asm')
-rw-r--r--maps/TrainerHouseB1F.asm80
1 files changed, 31 insertions, 49 deletions
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index bc01b8ca6..1be37c9aa 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -1,22 +1,20 @@
-TrainerHouseB1F_MapScriptHeader: ; 0x9b384
- ; trigger count
+TrainerHouseB1F_MapScriptHeader:
+.MapTriggers:
db 1
; triggers
dw UnknownScript_0x9b38a, $0000
- ; callback count
+.MapCallbacks:
db 0
-; 0x9b38a
-UnknownScript_0x9b38a: ; 0x9b38a
+UnknownScript_0x9b38a:
end
-; 0x9b38b
-UnknownScript_0x9b38b: ; 0x9b38b
+UnknownScript_0x9b38b:
spriteface $0, UP
loadfont
- checkflag $0057
+ checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
iftrue UnknownScript_0x9b3f7
writetext UnknownText_0x9b420
keeptextopen
@@ -24,17 +22,16 @@ UnknownScript_0x9b38b: ; 0x9b38b
iffalse UnknownScript_0x9b3a6
trainertotext CAL, CAL2, $0
jump UnknownScript_0x9b3aa
-; 0x9b3a6
-UnknownScript_0x9b3a6: ; 0x9b3a6
+UnknownScript_0x9b3a6:
trainertotext CAL, CAL3, $0
-UnknownScript_0x9b3aa: ; 0x9b3aa
+UnknownScript_0x9b3aa:
writetext UnknownText_0x9b46a
keeptextopen
writetext UnknownText_0x9b487
yesorno
iffalse UnknownScript_0x9b3ed
- setflag $0057
+ setflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
writetext UnknownText_0x9b4a2
closetext
loadmovesprites
@@ -51,34 +48,31 @@ UnknownScript_0x9b3aa: ; 0x9b3aa
startbattle
returnafterbattle
iffalse UnknownScript_0x9b3e8
-UnknownScript_0x9b3dc: ; 0x9b3dc
+UnknownScript_0x9b3dc:
winlosstext UnknownText_0x9b578, $0000
setlasttalked $3
loadtrainer CAL, CAL3
startbattle
returnafterbattle
-UnknownScript_0x9b3e8: ; 0x9b3e8
+UnknownScript_0x9b3e8:
applymovement $0, MovementData_0x9b40f
end
-; 0x9b3ed
-UnknownScript_0x9b3ed: ; 0x9b3ed
+UnknownScript_0x9b3ed:
writetext UnknownText_0x9b4d6
closetext
loadmovesprites
applymovement $0, MovementData_0x9b41d
end
-; 0x9b3f7
-UnknownScript_0x9b3f7: ; 0x9b3f7
+UnknownScript_0x9b3f7:
writetext UnknownText_0x9b51d
closetext
loadmovesprites
applymovement $0, MovementData_0x9b41d
end
-; 0x9b401
-MovementData_0x9b401: ; 0x9b401
+MovementData_0x9b401:
step_left
step_left
step_left
@@ -93,9 +87,8 @@ MovementData_0x9b401: ; 0x9b401
step_left
turn_head_right
step_end
-; 0x9b40f
-MovementData_0x9b40f: ; 0x9b40f
+MovementData_0x9b40f:
step_up
step_up
step_up
@@ -110,15 +103,13 @@ MovementData_0x9b40f: ; 0x9b40f
step_right
step_right
step_end
-; 0x9b41d
-MovementData_0x9b41d: ; 0x9b41d
+MovementData_0x9b41d:
step_right
turn_head_left
step_end
-; 0x9b420
-UnknownText_0x9b420: ; 0x9b420
+UnknownText_0x9b420:
text "Hi. Welcome to our"
line "TRAINING HALL."
@@ -126,40 +117,35 @@ UnknownText_0x9b420: ; 0x9b420
line "trainer once per"
cont "day."
done
-; 0x9b46a
-UnknownText_0x9b46a: ; 0x9b46a
+UnknownText_0x9b46a:
text_from_ram StringBuffer3
text " is your"
line "opponent today."
done
-; 0x9b487
-UnknownText_0x9b487: ; 0x9b487
+UnknownText_0x9b487:
text "Would you like to"
line "battle?"
done
-; 0x9b4a2
-UnknownText_0x9b4a2: ; 0x9b4a2
+UnknownText_0x9b4a2:
text "Please go right"
line "through."
para "You may begin"
line "right away."
done
-; 0x9b4d6
-UnknownText_0x9b4d6: ; 0x9b4d6
+UnknownText_0x9b4d6:
text "Sorry. Only those"
line "trainers who will"
para "be battling are"
line "allowed to go in."
done
-; 0x9b51d
-UnknownText_0x9b51d: ; 0x9b51d
+UnknownText_0x9b51d:
text "I'm sorry."
line "This would be your"
@@ -169,38 +155,34 @@ UnknownText_0x9b51d: ; 0x9b51d
para "to enter just once"
line "a day."
done
-; 0x9b578
-UnknownText_0x9b578: ; 0x9b578
+UnknownText_0x9b578:
text "I lost…"
line "Darn…"
done
-; 0x9b587
-UnknownText_0x9b587: ; 0x9b587
+UnknownText_0x9b587:
text "I traveled out"
line "here just so I"
cont "could battle you."
done
-; 0x9b5b8
-TrainerHouseB1F_MapEventHeader: ; 0x9b5b8
+TrainerHouseB1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 1
warp_def $4, $9, 3, GROUP_TRAINER_HOUSE_1F, MAP_TRAINER_HOUSE_1F
- ; xy triggers
+.XYTriggers:
db 1
xy_trigger 0, $3, $7, $0, UnknownScript_0x9b38b, $0, $0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, $ffff
- person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, $ffff
-; 0x9b5e5
+ person_event SPRITE_RECEPTIONIST, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1
+ person_event SPRITE_CHRIS, 15, 10, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, -1