Improve some signpost labels.
This commit is contained in:
IIMarckus
135
maps/OaksLab.asm
135
maps/OaksLab.asm
@@ -10,51 +10,46 @@ UnknownScript_0x19b3c7: ; 0x19b3c7
|
||||
end
|
||||
; 0x19b3c8
|
||||
|
||||
OakScript_0x19b3c8: ; 0x19b3c8
|
||||
Oak:
|
||||
faceplayer
|
||||
loadfont
|
||||
checkevent EVENT_OPENED_MT_SILVER
|
||||
iftrue UnknownScript_0x19b3ea
|
||||
checkevent $00e1
|
||||
iftrue UnknownScript_0x19b3dd
|
||||
writetext UnknownText_0x19b427
|
||||
iftrue .CheckPokedex
|
||||
checkevent EVENT_TALKED_TO_OAK_IN_KANTO
|
||||
iftrue .CheckBadges
|
||||
writetext OakWelcomeKantoText
|
||||
keeptextopen
|
||||
setevent $00e1
|
||||
UnknownScript_0x19b3dd: ; 0x19b3dd
|
||||
setevent EVENT_TALKED_TO_OAK_IN_KANTO
|
||||
.CheckBadges
|
||||
checkcode $7
|
||||
if_equal $10, UnknownScript_0x19b3f7
|
||||
if_equal $8, UnknownScript_0x19b401
|
||||
jump UnknownScript_0x19b408
|
||||
; 0x19b3ea
|
||||
if_equal 16, .OpenMtSilver
|
||||
if_equal 8, .Complain
|
||||
jump .AhGood
|
||||
|
||||
UnknownScript_0x19b3ea: ; 0x19b3ea
|
||||
writetext UnknownText_0x19b4a2
|
||||
.CheckPokedex
|
||||
writetext OakLabDexCheckText
|
||||
closetext
|
||||
special ProfOaksPCBoot
|
||||
writetext UnknownText_0x19b4c8
|
||||
writetext OakLabGoodbyeText
|
||||
closetext
|
||||
loadmovesprites
|
||||
end
|
||||
; 0x19b3f7
|
||||
|
||||
UnknownScript_0x19b3f7: ; 0x19b3f7
|
||||
writetext UnknownText_0x19b4fc
|
||||
.OpenMtSilver
|
||||
writetext OakOpenMtSilverText
|
||||
keeptextopen
|
||||
setevent EVENT_OPENED_MT_SILVER
|
||||
jump UnknownScript_0x19b3ea
|
||||
; 0x19b401
|
||||
jump .CheckPokedex
|
||||
|
||||
UnknownScript_0x19b401: ; 0x19b401
|
||||
writetext UnknownText_0x19b6a2
|
||||
.Complain
|
||||
writetext OakNoKantoBadgesText
|
||||
keeptextopen
|
||||
jump UnknownScript_0x19b3ea
|
||||
; 0x19b408
|
||||
jump .CheckPokedex
|
||||
|
||||
UnknownScript_0x19b408: ; 0x19b408
|
||||
writetext UnknownText_0x19b73c
|
||||
.AhGood
|
||||
writetext OakYesKantoBadgesText
|
||||
keeptextopen
|
||||
jump UnknownScript_0x19b3ea
|
||||
; 0x19b40f
|
||||
jump .CheckPokedex
|
||||
|
||||
ScientistScript_0x19b40f: ; 0x19b40f
|
||||
jumptextfaceplayer UnknownText_0x19b7fb
|
||||
@@ -68,27 +63,22 @@ ScientistScript_0x19b415: ; 0x19b415
|
||||
jumptextfaceplayer UnknownText_0x19b8a7
|
||||
; 0x19b418
|
||||
|
||||
MapOaksLabSignpost11Script: ; 0x19b418
|
||||
OaksLabBookshelf:
|
||||
jumpstd difficultbookshelf
|
||||
; 0x19b41b
|
||||
|
||||
MapOaksLabSignpost12Script: ; 0x19b41b
|
||||
jumptext UnknownText_0x19b8ea
|
||||
; 0x19b41e
|
||||
OaksLabPoster1:
|
||||
jumptext OaksLabPoster1Text
|
||||
|
||||
MapOaksLabSignpost13Script: ; 0x19b41e
|
||||
jumptext UnknownText_0x19b909
|
||||
; 0x19b421
|
||||
OaksLabPoster2:
|
||||
jumptext OaksLabPoster2Text
|
||||
|
||||
MapOaksLabSignpost14Script: ; 0x19b421
|
||||
jumptext UnknownText_0x19b945
|
||||
; 0x19b424
|
||||
OaksLabTrashcan:
|
||||
jumptext OaksLabTrashcanText
|
||||
|
||||
MapOaksLabSignpost15Script: ; 0x19b424
|
||||
jumptext UnknownText_0x19b95e
|
||||
; 0x19b427
|
||||
OaksLabPC:
|
||||
jumptext OaksLabPCText
|
||||
|
||||
UnknownText_0x19b427: ; 0x19b427
|
||||
OakWelcomeKantoText:
|
||||
text "OAK: Ah, ", $14, "!"
|
||||
line "It's good of you"
|
||||
|
||||
@@ -101,24 +91,21 @@ UnknownText_0x19b427: ; 0x19b427
|
||||
para "out here?"
|
||||
line "Pretty tough, huh?"
|
||||
done
|
||||
; 0x19b4a2
|
||||
|
||||
UnknownText_0x19b4a2: ; 0x19b4a2
|
||||
OakLabDexCheckText:
|
||||
text "How is your #-"
|
||||
line "DEX coming?"
|
||||
|
||||
para "Let's see…"
|
||||
done
|
||||
; 0x19b4c8
|
||||
|
||||
UnknownText_0x19b4c8: ; 0x19b4c8
|
||||
OakLabGoodbyeText:
|
||||
text "If you're in the"
|
||||
line "area, I hope you"
|
||||
cont "come visit again."
|
||||
done
|
||||
; 0x19b4fc
|
||||
|
||||
UnknownText_0x19b4fc: ; 0x19b4fc
|
||||
OakOpenMtSilverText:
|
||||
text "OAK: Wow! That's"
|
||||
line "excellent!"
|
||||
|
||||
@@ -158,9 +145,8 @@ UnknownText_0x19b4fc: ; 0x19b4fc
|
||||
para "reach MT.SILVER"
|
||||
line "from there."
|
||||
done
|
||||
; 0x19b6a2
|
||||
|
||||
UnknownText_0x19b6a2: ; 0x19b6a2
|
||||
OakNoKantoBadgesText:
|
||||
text "OAK: Hmm? You're"
|
||||
line "not collecting"
|
||||
cont "KANTO GYM BADGES?"
|
||||
@@ -175,9 +161,8 @@ UnknownText_0x19b6a2: ; 0x19b6a2
|
||||
line "you challenge"
|
||||
cont "them."
|
||||
done
|
||||
; 0x19b73c
|
||||
|
||||
UnknownText_0x19b73c: ; 0x19b73c
|
||||
OakYesKantoBadgesText:
|
||||
text "OAK: Ah, you're"
|
||||
line "collecting KANTO"
|
||||
cont "GYM BADGES."
|
||||
@@ -197,7 +182,6 @@ UnknownText_0x19b73c: ; 0x19b73c
|
||||
para "Keep trying hard,"
|
||||
line $14, "!"
|
||||
done
|
||||
; 0x19b7fb
|
||||
|
||||
UnknownText_0x19b7fb: ; 0x19b7fb
|
||||
text "The PROF's #MON"
|
||||
@@ -230,28 +214,25 @@ UnknownText_0x19b8a7: ; 0x19b8a7
|
||||
done
|
||||
; 0x19b8ea
|
||||
|
||||
UnknownText_0x19b8ea: ; 0x19b8ea
|
||||
OaksLabPoster1Text:
|
||||
text "Press START to"
|
||||
line "open the MENU."
|
||||
done
|
||||
; 0x19b909
|
||||
|
||||
UnknownText_0x19b909: ; 0x19b909
|
||||
OaksLabPoster2Text:
|
||||
text "The SAVE option is"
|
||||
line "on the MENU."
|
||||
|
||||
para "Use it in a timely"
|
||||
line "manner."
|
||||
done
|
||||
; 0x19b945
|
||||
|
||||
UnknownText_0x19b945: ; 0x19b945
|
||||
OaksLabTrashcanText
|
||||
text "There's nothing in"
|
||||
line "here…"
|
||||
done
|
||||
; 0x19b95e
|
||||
|
||||
UnknownText_0x19b95e: ; 0x19b95e
|
||||
OaksLabPCText:
|
||||
text "There's an e-mail"
|
||||
line "message on the PC."
|
||||
|
||||
@@ -292,26 +273,26 @@ OaksLab_MapEventHeader: ; 0x19ba33
|
||||
|
||||
; signposts
|
||||
db 16
|
||||
signpost 1, 6, $0, MapOaksLabSignpost11Script
|
||||
signpost 1, 7, $0, MapOaksLabSignpost11Script
|
||||
signpost 1, 8, $0, MapOaksLabSignpost11Script
|
||||
signpost 1, 9, $0, MapOaksLabSignpost11Script
|
||||
signpost 7, 0, $0, MapOaksLabSignpost11Script
|
||||
signpost 7, 1, $0, MapOaksLabSignpost11Script
|
||||
signpost 7, 2, $0, MapOaksLabSignpost11Script
|
||||
signpost 7, 3, $0, MapOaksLabSignpost11Script
|
||||
signpost 7, 6, $0, MapOaksLabSignpost11Script
|
||||
signpost 7, 7, $0, MapOaksLabSignpost11Script
|
||||
signpost 7, 8, $0, MapOaksLabSignpost11Script
|
||||
signpost 7, 9, $0, MapOaksLabSignpost11Script
|
||||
signpost 0, 4, $0, MapOaksLabSignpost12Script
|
||||
signpost 0, 5, $0, MapOaksLabSignpost13Script
|
||||
signpost 3, 9, $0, MapOaksLabSignpost14Script
|
||||
signpost 1, 0, $0, MapOaksLabSignpost15Script
|
||||
signpost 1, 6, $0, OaksLabBookshelf
|
||||
signpost 1, 7, $0, OaksLabBookshelf
|
||||
signpost 1, 8, $0, OaksLabBookshelf
|
||||
signpost 1, 9, $0, OaksLabBookshelf
|
||||
signpost 7, 0, $0, OaksLabBookshelf
|
||||
signpost 7, 1, $0, OaksLabBookshelf
|
||||
signpost 7, 2, $0, OaksLabBookshelf
|
||||
signpost 7, 3, $0, OaksLabBookshelf
|
||||
signpost 7, 6, $0, OaksLabBookshelf
|
||||
signpost 7, 7, $0, OaksLabBookshelf
|
||||
signpost 7, 8, $0, OaksLabBookshelf
|
||||
signpost 7, 9, $0, OaksLabBookshelf
|
||||
signpost 0, 4, $0, OaksLabPoster1
|
||||
signpost 0, 5, $0, OaksLabPoster2
|
||||
signpost 3, 9, $0, OaksLabTrashcan
|
||||
signpost 1, 0, $0, OaksLabPC
|
||||
|
||||
; people-events
|
||||
db 4
|
||||
person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, OakScript_0x19b3c8, $ffff
|
||||
person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, $ffff
|
||||
person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, $ffff
|
||||
person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, $ffff
|
||||
person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, $ffff
|
||||
|
||||
Reference in New Issue
Block a user