Better labels in Charcoal Kiln.

This commit is contained in:
IIMarckus 2015-06-23 13:59:07 -06:00
parent 0ba261a3fd
commit 205000fa9a
1 changed files with 18 additions and 28 deletions

View File

@ -4,36 +4,32 @@ CharcoalKiln_MapScriptHeader: ; 0x18dd18
; callback count ; callback count
db 0 db 0
; 0x18dd1a
BlackBeltScript_0x18dd1a: ; 0x18dd1a BossScript:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_GOT_HM01_CUT checkevent EVENT_GOT_HM01_CUT
iftrue UnknownScript_0x18dd34 iftrue .GotCut
checkevent EVENT_CLEARED_SLOWPOKE_WELL checkevent EVENT_CLEARED_SLOWPOKE_WELL
iftrue UnknownScript_0x18dd2e iftrue .SavedSlowpoke
writetext UnknownText_0x18dd74 writetext BossSlowpokeText
closetext closetext
loadmovesprites loadmovesprites
end end
; 0x18dd2e
UnknownScript_0x18dd2e: ; 0x18dd2e .SavedSlowpoke
writetext UnknownText_0x18ddfd writetext BossForestText
closetext closetext
loadmovesprites loadmovesprites
end end
; 0x18dd34
UnknownScript_0x18dd34: ; 0x18dd34 .GotCut
writetext UnknownText_0x18de73 writetext BossText
closetext closetext
loadmovesprites loadmovesprites
end end
; 0x18dd3a
YoungsterScript_0x18dd3a: ; 0x18dd3a ApprenticeScript:
faceplayer faceplayer
loadfont loadfont
checkevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN checkevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
@ -44,7 +40,6 @@ YoungsterScript_0x18dd3a: ; 0x18dd3a
closetext closetext
loadmovesprites loadmovesprites
end end
; 0x18dd4e
UnknownScript_0x18dd4e: ; 0x18dd4e UnknownScript_0x18dd4e: ; 0x18dd4e
writetext UnknownText_0x18df25 writetext UnknownText_0x18df25
@ -64,15 +59,14 @@ UnknownScript_0x18dd61: ; 0x18dd61
end end
; 0x18dd63 ; 0x18dd63
MoltresScript_0x18dd63: ; 0x18dd63 FarfetchdScript:
faceplayer faceplayer
loadfont loadfont
writetext UnknownText_0x18dfe5 writetext FarfetchdText
cry FARFETCH_D cry FARFETCH_D
closetext closetext
loadmovesprites loadmovesprites
end end
; 0x18dd6e
MapCharcoalKilnSignpost1Script: ; 0x18dd6e MapCharcoalKilnSignpost1Script: ; 0x18dd6e
jumpstd $0003 jumpstd $0003
@ -82,7 +76,7 @@ MapCharcoalKilnSignpost2Script: ; 0x18dd71
jumpstd $000c jumpstd $000c
; 0x18dd74 ; 0x18dd74
UnknownText_0x18dd74: ; 0x18dd74 BossSlowpokeText:
text "All the SLOWPOKE" text "All the SLOWPOKE"
line "have disappeared" line "have disappeared"
cont "from the town." cont "from the town."
@ -95,9 +89,8 @@ UnknownText_0x18dd74: ; 0x18dd74
line "omen. We should" line "omen. We should"
cont "stay in." cont "stay in."
done done
; 0x18ddfd
UnknownText_0x18ddfd: ; 0x18ddfd BossForestText:
text "The SLOWPOKE have" text "The SLOWPOKE have"
line "returned…" line "returned…"
@ -108,9 +101,8 @@ UnknownText_0x18ddfd: ; 0x18ddfd
para "Where in the world" para "Where in the world"
line "is that lazy guy?" line "is that lazy guy?"
done done
; 0x18de73
UnknownText_0x18de73: ; 0x18de73 BossText:
text "You chased off" text "You chased off"
line "TEAM ROCKET and" line "TEAM ROCKET and"
@ -155,10 +147,9 @@ UnknownText_0x18df93: ; 0x18df93
done done
; 0x18dfe5 ; 0x18dfe5
UnknownText_0x18dfe5: ; 0x18dfe5 FarfetchdText:
text "FARFETCH'D: Kwaa!" text "FARFETCH'D: Kwaa!"
done done
; 0x18dff8
CharcoalKiln_MapEventHeader: ; 0x18dff8 CharcoalKiln_MapEventHeader: ; 0x18dff8
; filler ; filler
@ -180,7 +171,6 @@ CharcoalKiln_MapEventHeader: ; 0x18dff8
; people-events ; people-events
db 3 db 3
person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, BlackBeltScript_0x18dd1a, $06f7 person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, BossScript, $06f7
person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, YoungsterScript_0x18dd3a, $06f6 person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, ApprenticeScript, $06f6
person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, MoltresScript_0x18dd63, $06f5 person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, FarfetchdScript, $06f5
; 0x18e03e