pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #394 from surskitty/master

Browse Source 
Adjusting Indigo League map labels
This commit is contained in:
yenatch 2017-10-21 21:45:59 -04:00 committed by GitHub
commit 7c59c3577d
4 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
maps/BrunosRoom.asm
View File

@ -17,7 +17,7 @@ BrunosRoom_MapScriptHeader:
dbw MAPCALLBACK_TILES, .BrunosRoomDoors dbw MAPCALLBACK_TILES, .BrunosRoomDoors
.Trigger0: .Trigger0:
priorityjump UnknownScript_0x1809ad priorityjump .BrunosDoorLocksBehindYou
end end
.Trigger1: .Trigger1:
@ -34,7 +34,7 @@ BrunosRoom_MapScriptHeader:
.OpenDoor: .OpenDoor:
return return
UnknownScript_0x1809ad: .BrunosDoorLocksBehindYou:
applymovement PLAYER, MovementData_0x1809f9 applymovement PLAYER, MovementData_0x1809f9
refreshscreen $86 refreshscreen $86
playsound SFX_STRENGTH playsound SFX_STRENGTH
@ -47,21 +47,21 @@ UnknownScript_0x1809ad:
waitsfx waitsfx
end end
BrunoScript_0x1809c5: BrunoScript_Battle:
faceplayer faceplayer
opentext opentext
checkevent EVENT_BEAT_ELITE_4_BRUNO checkevent EVENT_BEAT_ELITE_4_BRUNO
iftrue UnknownScript_0x1809f3 iftrue UnknownScript_0x1809f3
writetext UnknownText_0x1809fe writetext BrunoScript_BrunoBeforeText
waitbutton waitbutton
closetext closetext
winlosstext UnknownText_0x180b23, 0 winlosstext BrunoScript_BrunoBeatenText, 0
loadtrainer BRUNO, 1 loadtrainer BRUNO, 1
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
setevent EVENT_BEAT_ELITE_4_BRUNO setevent EVENT_BEAT_ELITE_4_BRUNO
opentext opentext
writetext UnknownText_0x180b3c writetext BrunoScript_BrunoDefeatText
waitbutton waitbutton
closetext closetext
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
@ -73,7 +73,7 @@ BrunoScript_0x1809c5:
end end
UnknownScript_0x1809f3: UnknownScript_0x1809f3:
writetext UnknownText_0x180b3c writetext BrunoScript_BrunoDefeatText
waitbutton waitbutton
closetext closetext
end end
@ -85,7 +85,7 @@ MovementData_0x1809f9:
step UP step UP
step_end step_end
UnknownText_0x1809fe: BrunoScript_BrunoBeforeText:
text "I am BRUNO of the" text "I am BRUNO of the"
line "ELITE FOUR." line "ELITE FOUR."
@ -115,12 +115,12 @@ UnknownText_0x1809fe:
para "Hoo hah!" para "Hoo hah!"
done done
UnknownText_0x180b23: BrunoScript_BrunoBeatenText:
text "Why? How could we" text "Why? How could we"
line "lose?" line "lose?"
done done
UnknownText_0x180b3c: BrunoScript_BrunoDefeatText:
text "Having lost, I" text "Having lost, I"
line "have no right to" line "have no right to"
cont "say anything…" cont "say anything…"
@ -148,4 +148,4 @@ BrunosRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_0x1809c5, -1 person_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BrunoScript_Battle, -1

42
maps/KarensRoom.asm
View File

@ -6,35 +6,35 @@ KarensRoom_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x180bbc, 0 dw .Trigger0, 0
dw UnknownScript_0x180bc0, 0 dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks ; callbacks
dbw MAPCALLBACK_TILES, UnknownScript_0x180bc1 dbw MAPCALLBACK_TILES, .KarensRoomDoors
UnknownScript_0x180bbc: .Trigger0:
priorityjump UnknownScript_0x180bd6 priorityjump .KarensDoorLocksBehindYou
end end
UnknownScript_0x180bc0: .Trigger1:
end end
UnknownScript_0x180bc1: .KarensRoomDoors:
checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x180bcb iffalse .KeepDoorsClosed
changeblock $4, $e, $2a changeblock $4, $e, $2a
UnknownScript_0x180bcb: .KeepDoorsClosed:
checkevent EVENT_KARENS_ROOM_EXIT_OPEN checkevent EVENT_KARENS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x180bd5 iffalse .OpenDoors
changeblock $4, $2, $16 changeblock $4, $2, $16
UnknownScript_0x180bd5: .OpenDoors:
return return
UnknownScript_0x180bd6: .KarensDoorLocksBehindYou:
applymovement PLAYER, MovementData_0x180c22 applymovement PLAYER, MovementData_0x180c22
refreshscreen $86 refreshscreen $86
playsound SFX_STRENGTH playsound SFX_STRENGTH
@ -47,21 +47,21 @@ UnknownScript_0x180bd6:
waitsfx waitsfx
end end
KarenScript_0x180bee: KarenScript_Battle:
faceplayer faceplayer
opentext opentext
checkevent EVENT_BEAT_ELITE_4_KAREN checkevent EVENT_BEAT_ELITE_4_KAREN
iftrue UnknownScript_0x180c1c iftrue UnknownScript_0x180c1c
writetext UnknownText_0x180c27 writetext KarenScript_KarenBeforeText
waitbutton waitbutton
closetext closetext
winlosstext UnknownText_0x180cf8, 0 winlosstext KarenScript_KarenBeatenText, 0
loadtrainer KAREN, 1 loadtrainer KAREN, 1
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
setevent EVENT_BEAT_ELITE_4_KAREN setevent EVENT_BEAT_ELITE_4_KAREN
opentext opentext
writetext UnknownText_0x180d29 writetext KarenScript_KarenDefeatText
waitbutton waitbutton
closetext closetext
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
@ -73,7 +73,7 @@ KarenScript_0x180bee:
end end
UnknownScript_0x180c1c: UnknownScript_0x180c1c:
writetext UnknownText_0x180d29 writetext KarenScript_KarenDefeatText
waitbutton waitbutton
closetext closetext
end end
@ -85,7 +85,7 @@ MovementData_0x180c22:
step UP step UP
step_end step_end
UnknownText_0x180c27: KarenScript_KarenBeforeText:
text "I am KAREN of the" text "I am KAREN of the"
line "ELITE FOUR." line "ELITE FOUR."
@ -108,13 +108,13 @@ UnknownText_0x180c27:
para "Let's go." para "Let's go."
done done
UnknownText_0x180cf8: KarenScript_KarenBeatenText:
text "Well, aren't you" text "Well, aren't you"
line "good. I like that" line "good. I like that"
cont "in a trainer." cont "in a trainer."
done done
UnknownText_0x180d29: KarenScript_KarenDefeatText:
text "Strong #MON." text "Strong #MON."
para "Weak #MON." para "Weak #MON."
@ -156,4 +156,4 @@ KarensRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, KarenScript_0x180bee, -1 person_event SPRITE_KAREN, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, KarenScript_Battle, -1

42
maps/KogasRoom.asm
View File

@ -6,35 +6,35 @@ KogasRoom_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x180728, 0 dw .Trigger0, 0
dw UnknownScript_0x18072c, 0 dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks ; callbacks
dbw MAPCALLBACK_TILES, UnknownScript_0x18072d dbw MAPCALLBACK_TILES, .KogasRoomDoors
UnknownScript_0x180728: .Trigger0:
priorityjump UnknownScript_0x180742 priorityjump .KogasDoorLocksBehindYou
end end
UnknownScript_0x18072c: .Trigger1:
end end
UnknownScript_0x18072d: .KogasRoomDoors:
checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x180737 iffalse .KeepDoorsClosed
changeblock $4, $e, $2a changeblock $4, $e, $2a
UnknownScript_0x180737: .KeepDoorsClosed:
checkevent EVENT_KOGAS_ROOM_EXIT_OPEN checkevent EVENT_KOGAS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x180741 iffalse .OpenDoors
changeblock $4, $2, $16 changeblock $4, $2, $16
UnknownScript_0x180741: .OpenDoors:
return return
UnknownScript_0x180742: .KogasDoorLocksBehindYou:
applymovement PLAYER, MovementData_0x18078e applymovement PLAYER, MovementData_0x18078e
refreshscreen $86 refreshscreen $86
playsound SFX_STRENGTH playsound SFX_STRENGTH
@ -47,21 +47,21 @@ UnknownScript_0x180742:
waitsfx waitsfx
end end
KogaScript_0x18075a: KogaScript_Battle:
faceplayer faceplayer
opentext opentext
checkevent EVENT_BEAT_ELITE_4_KOGA checkevent EVENT_BEAT_ELITE_4_KOGA
iftrue UnknownScript_0x180788 iftrue UnknownScript_0x180788
writetext UnknownText_0x180793 writetext KogaScript_KogaBeforeText
waitbutton waitbutton
closetext closetext
winlosstext UnknownText_0x1808a9, 0 winlosstext KogaScript_KogaBeatenText, 0
loadtrainer KOGA, 1 loadtrainer KOGA, 1
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
setevent EVENT_BEAT_ELITE_4_KOGA setevent EVENT_BEAT_ELITE_4_KOGA
opentext opentext
writetext UnknownText_0x1808ca writetext KogaScript_KogaDefeatText
waitbutton waitbutton
closetext closetext
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
@ -73,7 +73,7 @@ KogaScript_0x18075a:
end end
UnknownScript_0x180788: UnknownScript_0x180788:
writetext UnknownText_0x1808ca writetext KogaScript_KogaDefeatText
waitbutton waitbutton
closetext closetext
end end
@ -85,7 +85,7 @@ MovementData_0x18078e:
step UP step UP
step_end step_end
UnknownText_0x180793: KogaScript_KogaBeforeText:
text "Fwahahahaha!" text "Fwahahahaha!"
para "I am KOGA of the" para "I am KOGA of the"
@ -114,13 +114,13 @@ UnknownText_0x180793:
line "see soon enough!" line "see soon enough!"
done done
UnknownText_0x1808a9: KogaScript_KogaBeatenText:
text "Ah!" text "Ah!"
line "You have proven" line "You have proven"
cont "your worth!" cont "your worth!"
done done
UnknownText_0x1808ca: KogaScript_KogaDefeatText:
text "I subjected you to" text "I subjected you to"
line "everything I could" line "everything I could"
cont "muster." cont "muster."
@ -153,4 +153,4 @@ KogasRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, KogaScript_0x18075a, -1 person_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, KogaScript_Battle, -1

46
maps/WillsRoom.asm
View File

@ -6,35 +6,35 @@ WillsRoom_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw UnknownScript_0x1804c6, 0 dw .Trigger0, 0
dw UnknownScript_0x1804ca, 0 dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks ; callbacks
dbw MAPCALLBACK_TILES, UnknownScript_0x1804cb dbw MAPCALLBACK_TILES, .WillsRoomDoors
UnknownScript_0x1804c6: .Trigger0:
priorityjump UnknownScript_0x1804e0 priorityjump .WillsDoorLocksBehindYou
end end
UnknownScript_0x1804ca: .Trigger1:
end end
UnknownScript_0x1804cb: .WillsRoomDoors:
checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
iffalse UnknownScript_0x1804d5 iffalse .KeepDoorClosed
changeblock $4, $e, $2a changeblock $4, $e, $2a
UnknownScript_0x1804d5: .KeepDoorClosed:
checkevent EVENT_WILLS_ROOM_EXIT_OPEN checkevent EVENT_WILLS_ROOM_EXIT_OPEN
iffalse UnknownScript_0x1804df iffalse .OpenDoor
changeblock $4, $2, $16 changeblock $4, $2, $16
UnknownScript_0x1804df: .OpenDoor:
return return
UnknownScript_0x1804e0: .WillsDoorLocksBehindYou:
applymovement PLAYER, MovementData_0x18052c applymovement PLAYER, MovementData_0x18052c
refreshscreen $86 refreshscreen $86
playsound SFX_STRENGTH playsound SFX_STRENGTH
@ -47,21 +47,21 @@ UnknownScript_0x1804e0:
waitsfx waitsfx
end end
WillScript_0x1804f8: WillScript_Battle:
faceplayer faceplayer
opentext opentext
checkevent EVENT_BEAT_ELITE_4_WILL checkevent EVENT_BEAT_ELITE_4_WILL
iftrue UnknownScript_0x180526 iftrue WillScript_0x180526
writetext UnknownText_0x180531 writetext WillScript_WillBeforeText
waitbutton waitbutton
closetext closetext
winlosstext UnknownText_0x18062c, 0 winlosstext WillScript_WillBeatenText, 0
loadtrainer WILL, 1 loadtrainer WILL, 1
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
setevent EVENT_BEAT_ELITE_4_WILL setevent EVENT_BEAT_ELITE_4_WILL
opentext opentext
writetext UnknownText_0x180644 writetext WillScript_WillDefeatText
waitbutton waitbutton
closetext closetext
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
@ -72,8 +72,8 @@ WillScript_0x1804f8:
waitsfx waitsfx
end end
UnknownScript_0x180526: WillScript_0x180526:
writetext UnknownText_0x180644 writetext WillScript_WillDefeatText
waitbutton waitbutton
closetext closetext
end end
@ -85,7 +85,7 @@ MovementData_0x18052c:
step UP step UP
step_end step_end
UnknownText_0x180531: WillScript_WillBeforeText:
text "Welcome to #MON" text "Welcome to #MON"
line "LEAGUE, <PLAYER>." line "LEAGUE, <PLAYER>."
@ -110,12 +110,12 @@ UnknownText_0x180531:
line "option!" line "option!"
done done
UnknownText_0x18062c: WillScript_WillBeatenText:
text "I… I can't…" text "I… I can't…"
line "believe it…" line "believe it…"
done done
UnknownText_0x180644: WillScript_WillDefeatText:
text "Even though I was" text "Even though I was"
line "defeated, I won't" line "defeated, I won't"
cont "change my course." cont "change my course."
@ -151,4 +151,4 @@ WillsRoom_MapEventHeader:
.PersonEvents: .PersonEvents:
db 1 db 1
person_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, WillScript_0x1804f8, -1 person_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, WillScript_Battle, -1