summaryrefslogtreecommitdiff
path: root/maps/MahoganyGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/MahoganyGym.asm')
-rw-r--r--maps/MahoganyGym.asm261
1 files changed, 70 insertions, 191 deletions
diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
index 8c1449f84..4ceb6f660 100644
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -1,16 +1,15 @@
-MahoganyGym_MapScriptHeader: ; 0x199a9c
- ; trigger count
+MahoganyGym_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x199a9e
-PryceScript_0x199a9e: ; 0x199a9e
+PryceScript_0x199a9e:
faceplayer
loadfont
checkevent EVENT_BEAT_PRYCE
- iftrue UnknownScript_0x199ac8
+ iftrue .FightDone
writetext UnknownText_0x199b8d
closetext
loadmovesprites
@@ -23,10 +22,10 @@ PryceScript_0x199a9e: ; 0x199a9e
writetext UnknownText_0x199d3b
playsound SFX_GET_BADGE
waitbutton
- setflag $0021
- checkcode $7
- scall UnknownScript_0x199af6
-UnknownScript_0x199ac8: ; 0x199ac8
+ setflag ENGINE_GLACIERBADGE
+ checkcode VAR_BADGES
+ scall MahoganyGymTriggerRockets
+.FightDone
checkevent EVENT_GOT_TM16_ICY_WIND
iftrue UnknownScript_0x199af0
setevent EVENT_BEAT_SKIER_ROXANNE
@@ -36,183 +35,88 @@ UnknownScript_0x199ac8: ; 0x199ac8
setevent EVENT_BEAT_BOARDER_DOUGLAS
writetext UnknownText_0x199d55
keeptextopen
- verbosegiveitem TM_16, 1
+ verbosegiveitem TM_ICY_WIND, 1
iffalse UnknownScript_0x199af4
setevent EVENT_GOT_TM16_ICY_WIND
writetext UnknownText_0x199def
closetext
loadmovesprites
end
-; 0x199af0
-UnknownScript_0x199af0: ; 0x199af0
+UnknownScript_0x199af0:
writetext UnknownText_0x199e59
closetext
-UnknownScript_0x199af4: ; 0x199af4
+UnknownScript_0x199af4:
loadmovesprites
end
-; 0x199af6
-UnknownScript_0x199af6: ; 0x199af6
- if_equal $7, UnknownScript_0x199b02
- if_equal $6, UnknownScript_0x199aff
+MahoganyGymTriggerRockets:
+ if_equal 7, .RadioTowerRockets
+ if_equal 6, .GoldenrodRockets
end
-; 0x199aff
-UnknownScript_0x199aff: ; 0x199aff
+.GoldenrodRockets
jumpstd goldenrodrockets
-; 0x199b02
-UnknownScript_0x199b02: ; 0x199b02
+.RadioTowerRockets
jumpstd radiotowerrockets
-; 0x199b05
-TrainerSkierRoxanne: ; 0x199b05
- ; bit/flag number
- dw $592
+TrainerSkierRoxanne:
+ trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, $0000, SkierRoxanneScript
- ; trainer group && trainer id
- db SKIER, ROXANNE
-
- ; text when seen
- dw SkierRoxanneSeenText
-
- ; text when trainer beaten
- dw SkierRoxanneBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw SkierRoxanneScript
-; 0x199b11
-
-SkierRoxanneScript: ; 0x199b11
+SkierRoxanneScript:
talkaftercancel
loadfont
writetext UnknownText_0x19a116
closetext
loadmovesprites
end
-; 0x199b19
-
-TrainerSkierClarissa: ; 0x199b19
- ; bit/flag number
- dw $593
-
- ; trainer group && trainer id
- db SKIER, CLARISSA
- ; text when seen
- dw SkierClarissaSeenText
+TrainerSkierClarissa:
+ trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, $0000, SkierClarissaScript
- ; text when trainer beaten
- dw SkierClarissaBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw SkierClarissaScript
-; 0x199b25
-
-SkierClarissaScript: ; 0x199b25
+SkierClarissaScript:
talkaftercancel
loadfont
writetext UnknownText_0x19a18f
closetext
loadmovesprites
end
-; 0x199b2d
-
-TrainerBoarderRonald: ; 0x199b2d
- ; bit/flag number
- dw $40e
-
- ; trainer group && trainer id
- db BOARDER, RONALD
-
- ; text when seen
- dw BoarderRonaldSeenText
- ; text when trainer beaten
- dw BoarderRonaldBeatenText
+TrainerBoarderRonald:
+ trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, $0000, BoarderRonaldScript
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw BoarderRonaldScript
-; 0x199b39
-
-BoarderRonaldScript: ; 0x199b39
+BoarderRonaldScript:
talkaftercancel
loadfont
writetext UnknownText_0x199f2d
closetext
loadmovesprites
end
-; 0x199b41
-
-TrainerBoarderBrad: ; 0x199b41
- ; bit/flag number
- dw $40f
-
- ; trainer group && trainer id
- db BOARDER, BRAD
-
- ; text when seen
- dw BoarderBradSeenText
-
- ; text when trainer beaten
- dw BoarderBradBeatenText
- ; script when lost
- dw $0000
+TrainerBoarderBrad:
+ trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, $0000, BoarderBradScript
- ; script when talk again
- dw BoarderBradScript
-; 0x199b4d
-
-BoarderBradScript: ; 0x199b4d
+BoarderBradScript:
talkaftercancel
loadfont
writetext UnknownText_0x199fdd
closetext
loadmovesprites
end
-; 0x199b55
-
-TrainerBoarderDouglas: ; 0x199b55
- ; bit/flag number
- dw $410
-
- ; trainer group && trainer id
- db BOARDER, DOUGLAS
-
- ; text when seen
- dw BoarderDouglasSeenText
-
- ; text when trainer beaten
- dw BoarderDouglasBeatenText
-
- ; script when lost
- dw $0000
- ; script when talk again
- dw BoarderDouglasScript
-; 0x199b61
+TrainerBoarderDouglas:
+ trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, $0000, BoarderDouglasScript
-BoarderDouglasScript: ; 0x199b61
+BoarderDouglasScript:
talkaftercancel
loadfont
writetext UnknownText_0x19a047
closetext
loadmovesprites
end
-; 0x199b69
-MahoganyGymGuyScript: ; 0x199b69
+MahoganyGymGuyScript:
faceplayer
loadfont
checkevent EVENT_BEAT_PRYCE
@@ -227,7 +131,6 @@ MahoganyGymGuyScript: ; 0x199b69
closetext
loadmovesprites
end
-; 0x199b7d
MahoganyGymStatue:
checkflag ENGINE_GLACIERBADGE
@@ -237,7 +140,7 @@ MahoganyGymStatue:
trainertotext PRYCE, 1, $1
jumpstd gymstatue2
-UnknownText_0x199b8d: ; 0x199b8d
+UnknownText_0x199b8d:
text "#MON have many"
line "experiences in"
@@ -267,9 +170,8 @@ UnknownText_0x199b8d: ; 0x199b8d
para "shall demonstrate"
line "my power!"
done
-; 0x199cb3
-UnknownText_0x199cb3: ; 0x199cb3
+UnknownText_0x199cb3:
text "Ah, I am impressed"
line "by your prowess."
@@ -282,15 +184,13 @@ UnknownText_0x199cb3: ; 0x199cb3
para "You are worthy of"
line "this BADGE!"
done
-; 0x199d3b
-UnknownText_0x199d3b: ; 0x199d3b
+UnknownText_0x199d3b:
text "<PLAYER> received"
line "GLACIERBADGE."
done
-; 0x199d55
-UnknownText_0x199d55: ; 0x199d55
+UnknownText_0x199d55:
text "That BADGE will"
line "raise the SPECIAL"
cont "stats of #MON."
@@ -303,9 +203,8 @@ UnknownText_0x199d55: ; 0x199d55
para "And this… This is"
line "a gift from me!"
done
-; 0x199def
-UnknownText_0x199def: ; 0x199def
+UnknownText_0x199def:
text "That TM contains"
line "ICY WIND."
@@ -316,9 +215,8 @@ UnknownText_0x199def: ; 0x199def
line "the harshness of"
cont "winter."
done
-; 0x199e59
-UnknownText_0x199e59: ; 0x199e59
+UnknownText_0x199e59:
text "When the ice and"
line "snow melt, spring"
cont "arrives."
@@ -332,31 +230,27 @@ UnknownText_0x199e59: ; 0x199e59
para "Cherish your time"
line "together!"
done
-; 0x199ee1
-BoarderRonaldSeenText: ; 0x199ee1
+BoarderRonaldSeenText:
text "I'll freeze your"
line "#MON, so you"
cont "can't do a thing!"
done
-; 0x199f10
-BoarderRonaldBeatenText: ; 0x199f10
+BoarderRonaldBeatenText:
text "Darn. I couldn't"
line "do a thing."
done
-; 0x199f2d
-UnknownText_0x199f2d: ; 0x199f2d
+UnknownText_0x199f2d:
text "I think there's a"
line "move a #MON"
para "can use while it's"
line "frozen."
done
-; 0x199f65
-BoarderBradSeenText: ; 0x199f65
+BoarderBradSeenText:
text "This GYM has a"
line "slippery floor."
@@ -367,34 +261,29 @@ BoarderBradSeenText: ; 0x199f65
line "not playing games"
cont "here!"
done
-; 0x199fbd
-BoarderBradBeatenText: ; 0x199fbd
+BoarderBradBeatenText:
text "Do you see how"
line "serious we are?"
done
-; 0x199fdd
-UnknownText_0x199fdd: ; 0x199fdd
+UnknownText_0x199fdd:
text "This GYM is great."
line "I love boarding"
cont "with my #MON!"
done
-; 0x19a00f
-BoarderDouglasSeenText: ; 0x19a00f
+BoarderDouglasSeenText:
text "I know PRYCE's"
line "secret."
done
-; 0x19a026
-BoarderDouglasBeatenText: ; 0x19a026
+BoarderDouglasBeatenText:
text "OK. I'll tell you"
line "PRYCE's secret."
done
-; 0x19a047
-UnknownText_0x19a047: ; 0x19a047
+UnknownText_0x19a047:
text "The secret behind"
line "PRYCE's power…"
@@ -404,52 +293,45 @@ UnknownText_0x19a047: ; 0x19a047
para "to strengthen his"
line "mind and body."
done
-; 0x19a0ae
-SkierRoxanneSeenText: ; 0x19a0ae
+SkierRoxanneSeenText:
text "To get to PRYCE,"
line "our GYM LEADER,"
para "you need to think"
line "before you skate."
done
-; 0x19a0f4
-SkierRoxanneBeatenText: ; 0x19a0f4
+SkierRoxanneBeatenText:
text "I wouldn't lose to"
line "you in skiing!"
done
-; 0x19a116
-UnknownText_0x19a116: ; 0x19a116
+UnknownText_0x19a116:
text "If you don't skate"
line "with precision,"
para "you won't get far"
line "in this GYM."
done
-; 0x19a157
-SkierClarissaSeenText: ; 0x19a157
+SkierClarissaSeenText:
text "Check out my"
line "parallel turn!"
done
-; 0x19a174
-SkierClarissaBeatenText: ; 0x19a174
+SkierClarissaBeatenText:
text "No! You made me"
line "wipe out!"
done
-; 0x19a18f
-UnknownText_0x19a18f: ; 0x19a18f
+UnknownText_0x19a18f:
text "I shouldn't have"
line "been bragging"
cont "about my skiing…"
done
-; 0x19a1bf
-MahoganyGymGuyText: ; 0x19a1bf
+MahoganyGymGuyText:
text "PRYCE is a veteran"
line "who has trained"
@@ -468,9 +350,8 @@ MahoganyGymGuyText: ; 0x19a1bf
para "with your burning"
line "ambition!"
done
-; 0x19a275
-MahoganyGymGuyWinText: ; 0x19a275
+MahoganyGymGuyWinText:
text "PRYCE is some-"
line "thing, but you're"
cont "something else!"
@@ -481,32 +362,30 @@ MahoganyGymGuyWinText: ; 0x19a275
para "bridged the gen-"
line "eration gap!"
done
-; 0x19a2df
-MahoganyGym_MapEventHeader: ; 0x19a2df
+MahoganyGym_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $11, $4, 3, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN
warp_def $11, $5, 3, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 15, 3, $0, MahoganyGymStatue
- signpost 15, 6, $0, MahoganyGymStatue
+ signpost 15, 3, SIGNPOST_READ, MahoganyGymStatue
+ signpost 15, 6, SIGNPOST_READ, MahoganyGymStatue
- ; people-events
+.PersonEvents:
db 7
- person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, $ffff
- person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, $ffff
- person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, $ffff
- person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, $ffff
- person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, $ffff
- person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, $ffff
- person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, $ffff
-; 0x19a354
+ person_event SPRITE_PRYCE, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PryceScript_0x199a9e, -1
+ person_event SPRITE_BUENA, 10, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerSkierRoxanne, -1
+ person_event SPRITE_ROCKER, 21, 4, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBoarderRonald, -1
+ person_event SPRITE_BUENA, 21, 13, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerSkierClarissa, -1
+ person_event SPRITE_ROCKER, 13, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBoarderBrad, -1
+ person_event SPRITE_ROCKER, 8, 6, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBoarderDouglas, -1
+ person_event SPRITE_GYM_GUY, 19, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MahoganyGymGuyScript, -1