Clean up gym leader scripts.
This commit is contained in:
IIMarckus
@@ -1,16 +1,15 @@
|
||||
SaffronGym_MapScriptHeader: ; 0x189c2c
|
||||
SaffronGym_MapScriptHeader:
|
||||
; trigger count
|
||||
db 0
|
||||
|
||||
; callback count
|
||||
db 0
|
||||
; 0x189c2e
|
||||
|
||||
SabrinaScript_0x189c2e: ; 0x189c2e
|
||||
SabrinaScript_0x189c2e:
|
||||
faceplayer
|
||||
loadfont
|
||||
checkflag $0028
|
||||
iftrue UnknownScript_0x189c65
|
||||
checkflag ENGINE_MARSHBADGE
|
||||
iftrue .FightDone
|
||||
writetext UnknownText_0x189cdf
|
||||
closetext
|
||||
loadmovesprites
|
||||
@@ -27,21 +26,19 @@ SabrinaScript_0x189c2e: ; 0x189c2e
|
||||
writetext UnknownText_0x189e95
|
||||
playsound SFX_GET_BADGE
|
||||
waitbutton
|
||||
setflag $0028
|
||||
setflag ENGINE_MARSHBADGE
|
||||
writetext UnknownText_0x189ead
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x189c65
|
||||
|
||||
UnknownScript_0x189c65: ; 0x189c65
|
||||
.FightDone
|
||||
writetext UnknownText_0x189f6c
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x189c6b
|
||||
|
||||
TrainerMediumRebecca: ; 0x189c6b
|
||||
TrainerMediumRebecca:
|
||||
; bit/flag number
|
||||
dw $590
|
||||
|
||||
@@ -59,18 +56,16 @@ TrainerMediumRebecca: ; 0x189c6b
|
||||
|
||||
; script when talk again
|
||||
dw MediumRebeccaScript
|
||||
; 0x189c77
|
||||
|
||||
MediumRebeccaScript: ; 0x189c77
|
||||
MediumRebeccaScript:
|
||||
talkaftercancel
|
||||
loadfont
|
||||
writetext UnknownText_0x18a034
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x189c7f
|
||||
|
||||
TrainerPsychicFranklin: ; 0x189c7f
|
||||
TrainerPsychicFranklin:
|
||||
; bit/flag number
|
||||
dw $43b
|
||||
|
||||
@@ -88,18 +83,16 @@ TrainerPsychicFranklin: ; 0x189c7f
|
||||
|
||||
; script when talk again
|
||||
dw PsychicFranklinScript
|
||||
; 0x189c8b
|
||||
|
||||
PsychicFranklinScript: ; 0x189c8b
|
||||
PsychicFranklinScript:
|
||||
talkaftercancel
|
||||
loadfont
|
||||
writetext UnknownText_0x18a0a6
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x189c93
|
||||
|
||||
TrainerMediumDoris: ; 0x189c93
|
||||
TrainerMediumDoris:
|
||||
; bit/flag number
|
||||
dw $591
|
||||
|
||||
@@ -117,18 +110,16 @@ TrainerMediumDoris: ; 0x189c93
|
||||
|
||||
; script when talk again
|
||||
dw MediumDorisScript
|
||||
; 0x189c9f
|
||||
|
||||
MediumDorisScript: ; 0x189c9f
|
||||
MediumDorisScript:
|
||||
talkaftercancel
|
||||
loadfont
|
||||
writetext UnknownText_0x18a136
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x189ca7
|
||||
|
||||
TrainerPsychicJared: ; 0x189ca7
|
||||
TrainerPsychicJared:
|
||||
; bit/flag number
|
||||
dw $444
|
||||
|
||||
@@ -146,18 +137,16 @@ TrainerPsychicJared: ; 0x189ca7
|
||||
|
||||
; script when talk again
|
||||
dw PsychicJaredScript
|
||||
; 0x189cb3
|
||||
|
||||
PsychicJaredScript: ; 0x189cb3
|
||||
PsychicJaredScript:
|
||||
talkaftercancel
|
||||
loadfont
|
||||
writetext UnknownText_0x18a1b3
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x189cbb
|
||||
|
||||
SaffronGymGuyScript: ; 0x189cbb
|
||||
SaffronGymGuyScript:
|
||||
faceplayer
|
||||
loadfont
|
||||
checkevent EVENT_BEAT_SABRINA
|
||||
@@ -172,7 +161,6 @@ SaffronGymGuyScript: ; 0x189cbb
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x189ccf
|
||||
|
||||
SaffronGymStatue:
|
||||
checkflag ENGINE_MARSHBADGE
|
||||
@@ -182,7 +170,7 @@ SaffronGymStatue:
|
||||
trainertotext SABRINA, 1, $1
|
||||
jumpstd gymstatue2
|
||||
|
||||
UnknownText_0x189cdf: ; 0x189cdf
|
||||
UnknownText_0x189cdf:
|
||||
text "SABRINA: I knew"
|
||||
line "you were coming…"
|
||||
|
||||
@@ -207,9 +195,8 @@ UnknownText_0x189cdf: ; 0x189cdf
|
||||
line "I will show you my"
|
||||
cont "psychic powers!"
|
||||
done
|
||||
; 0x189df4
|
||||
|
||||
UnknownText_0x189df4: ; 0x189df4
|
||||
UnknownText_0x189df4:
|
||||
text "SABRINA: Your"
|
||||
line "power…"
|
||||
|
||||
@@ -226,15 +213,13 @@ UnknownText_0x189df4: ; 0x189df4
|
||||
line "earned yourself"
|
||||
cont "MARSHBADGE."
|
||||
done
|
||||
; 0x189e95
|
||||
|
||||
UnknownText_0x189e95: ; 0x189e95
|
||||
UnknownText_0x189e95:
|
||||
text "<PLAYER> received"
|
||||
line "MARSHBADGE."
|
||||
done
|
||||
; 0x189ead
|
||||
|
||||
UnknownText_0x189ead: ; 0x189ead
|
||||
UnknownText_0x189ead:
|
||||
text "SABRINA: MARSH-"
|
||||
line "BADGE draws out"
|
||||
|
||||
@@ -251,9 +236,8 @@ UnknownText_0x189ead: ; 0x189ead
|
||||
line "celebrated and"
|
||||
cont "beloved CHAMPION!"
|
||||
done
|
||||
; 0x189f6c
|
||||
|
||||
UnknownText_0x189f6c: ; 0x189f6c
|
||||
UnknownText_0x189f6c:
|
||||
text "SABRINA: Your love"
|
||||
line "for your #MON"
|
||||
|
||||
@@ -266,82 +250,70 @@ UnknownText_0x189f6c: ; 0x189f6c
|
||||
para "kind of psychic"
|
||||
line "power…"
|
||||
done
|
||||
; 0x189fe9
|
||||
|
||||
MediumRebeccaSeenText: ; 0x189fe9
|
||||
MediumRebeccaSeenText:
|
||||
text "The power of all"
|
||||
line "those you defeated"
|
||||
cont "comes to me!"
|
||||
done
|
||||
; 0x18a01b
|
||||
|
||||
MediumRebeccaBeatenText: ; 0x18a01b
|
||||
MediumRebeccaBeatenText:
|
||||
text "Strong…"
|
||||
line "Far too strong…"
|
||||
done
|
||||
; 0x18a034
|
||||
|
||||
UnknownText_0x18a034: ; 0x18a034
|
||||
UnknownText_0x18a034:
|
||||
text "What is the source"
|
||||
line "of your power?"
|
||||
done
|
||||
; 0x18a057
|
||||
|
||||
PsychicFranklinSeenText: ; 0x18a057
|
||||
PsychicFranklinSeenText:
|
||||
text "Psychic power is"
|
||||
line "the power of your"
|
||||
cont "soul."
|
||||
done
|
||||
; 0x18a081
|
||||
|
||||
PsychicFranklinBeatenText: ; 0x18a081
|
||||
PsychicFranklinBeatenText:
|
||||
text "Your soul has more"
|
||||
line "power than mine!"
|
||||
done
|
||||
; 0x18a0a6
|
||||
|
||||
UnknownText_0x18a0a6: ; 0x18a0a6
|
||||
UnknownText_0x18a0a6:
|
||||
text "You made your soul"
|
||||
line "stronger, not just"
|
||||
cont "your abilities."
|
||||
done
|
||||
; 0x18a0dd
|
||||
|
||||
MediumDorisSeenText: ; 0x18a0dd
|
||||
MediumDorisSeenText:
|
||||
text "Fufufufu…"
|
||||
line "I see it clearly."
|
||||
|
||||
para "I can see into"
|
||||
line "your soul!"
|
||||
done
|
||||
; 0x18a114
|
||||
|
||||
MediumDorisBeatenText: ; 0x18a114
|
||||
MediumDorisBeatenText:
|
||||
text "Though I read you,"
|
||||
line "I still lost…"
|
||||
done
|
||||
; 0x18a136
|
||||
|
||||
UnknownText_0x18a136: ; 0x18a136
|
||||
UnknownText_0x18a136:
|
||||
text "Darn! I forgot"
|
||||
line "that I predicted I"
|
||||
cont "would lose to you."
|
||||
done
|
||||
; 0x18a16c
|
||||
|
||||
PsychicJaredSeenText: ; 0x18a16c
|
||||
PsychicJaredSeenText:
|
||||
text "The FIGHTING DOJO"
|
||||
line "next door was once"
|
||||
cont "this city's GYM."
|
||||
done
|
||||
; 0x18a1a2
|
||||
|
||||
PsychicJaredBeatenText: ; 0x18a1a2
|
||||
PsychicJaredBeatenText:
|
||||
text "I was no match…"
|
||||
done
|
||||
; 0x18a1b3
|
||||
|
||||
UnknownText_0x18a1b3: ; 0x18a1b3
|
||||
UnknownText_0x18a1b3:
|
||||
text "KARATE KING, the"
|
||||
line "master of the"
|
||||
|
||||
@@ -349,9 +321,8 @@ UnknownText_0x18a1b3: ; 0x18a1b3
|
||||
line "just destroyed by"
|
||||
cont "SABRINA."
|
||||
done
|
||||
; 0x18a201
|
||||
|
||||
SaffronGymGuyText: ; 0x18a201
|
||||
SaffronGymGuyText:
|
||||
text "Yo, CHAMP in"
|
||||
line "making!"
|
||||
|
||||
@@ -369,15 +340,13 @@ SaffronGymGuyText: ; 0x18a201
|
||||
|
||||
para "Good luck!"
|
||||
done
|
||||
; 0x18a2a0
|
||||
|
||||
SaffronGymGuyWinText: ; 0x18a2a0
|
||||
SaffronGymGuyWinText:
|
||||
text "That was another"
|
||||
line "fantastic battle!"
|
||||
done
|
||||
; 0x18a2c4
|
||||
|
||||
SaffronGym_MapEventHeader: ; 0x18a2c4
|
||||
SaffronGym_MapEventHeader:
|
||||
; filler
|
||||
db 0, 0
|
||||
|
||||
@@ -431,4 +400,3 @@ SaffronGym_MapEventHeader: ; 0x18a2c4
|
||||
person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, $ffff
|
||||
person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, $ffff
|
||||
person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, $ffff
|
||||
; 0x18a3bd
|
||||
|
||||
Reference in New Issue
Block a user