pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Clean up labels for gym statues.

Browse Source
This commit is contained in:
IIMarckus 2015-06-24 21:51:36 -06:00
parent f16d60e3f9
commit bd022e179e
17 changed files with 107 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants/event_flags.asm
View File

@ -575,6 +575,7 @@ EVENT_BOULDER_IN_ICE_PATH_4 EQU $710
EVENT_OPENED_MT_SILVER EQU $74f
EVENT_FOUGHT_SNORLAX EQU $750
EVENT_RED_IN_MT_SILVER EQU $762
EVENT_TRAINERS_IN_CERULEAN_GYM EQU $76f
EVENT_TELEPORT_GUY EQU $77c
EVENT_PICKED_UP_FOCUS_BAND EQU $77d
EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM EQU $794

15
maps/AzaleaGym.asm
View File

@ -229,16 +229,13 @@ AzaleaGymGuyScript: ; 0x18ece6
end
; 0x18ecfb
MapAzaleaGymSignpost1Script: ; 0x18ecfb
checkflag $001c
iftrue UnknownScript_0x18ed04
AzaleaGymStatue:
checkflag ENGINE_HIVEBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x18ed04
UnknownScript_0x18ed04: ; 0x18ed04
.Beaten
trainertotext BUGSY, 1, $1
jumpstd gymstatue2
; 0x18ed0b
UnknownText_0x18ed0b: ; 0x18ed0b
text "I'm BUGSY!"
@ -489,8 +486,8 @@ AzaleaGym_MapEventHeader: ; 0x18f3cc
; signposts
db 2
signpost 13, 3, $0, MapAzaleaGymSignpost1Script
signpost 13, 6, $0, MapAzaleaGymSignpost1Script
signpost 13, 3, $0, AzaleaGymStatue
signpost 13, 6, $0, AzaleaGymStatue
; people-events
db 7

15
maps/BlackthornGym1F.asm
View File

@ -199,16 +199,13 @@ BlackthornGymGuyScript: ; 0x194ed6
end
; 0x194eea
MapBlackthornGym1FSignpost1Script: ; 0x194eea
checkflag $0022
iftrue UnknownScript_0x194ef3
BlackthornGymStatue:
checkflag ENGINE_RISINGBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x194ef3
UnknownScript_0x194ef3: ; 0x194ef3
.Beaten
trainertotext CLAIR, 1, $1
jumpstd gymstatue2
; 0x194efa
UnknownText_0x194efa: ; 0x194efa
text "I am CLAIR."
@ -486,8 +483,8 @@ BlackthornGym1F_MapEventHeader: ; 0x1956ae
; signposts
db 2
signpost 15, 3, $0, MapBlackthornGym1FSignpost1Script
signpost 15, 6, $0, MapBlackthornGym1FSignpost1Script
signpost 15, 3, $0, BlackthornGymStatue
signpost 15, 6, $0, BlackthornGymStatue
; people-events
db 5

15
maps/CeladonGym.asm
View File

@ -188,16 +188,13 @@ TwinsJoandzoe2Script: ; 0x72b10
end
; 0x72b18
MapCeladonGymSignpost1Script: ; 0x72b18
checkflag $0026
iftrue UnknownScript_0x72b21
CeladonGymStatue:
checkflag ENGINE_RAINBOWBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x72b21
UnknownScript_0x72b21: ; 0x72b21
.Beaten
trainertotext ERIKA, 1, $1
jumpstd gymstatue2
; 0x72b28
UnknownText_0x72b28: ; 0x72b28
text "ERIKA: Hello…"
@ -388,8 +385,8 @@ CeladonGym_MapEventHeader: ; 0x72fdf
; signposts
db 2
signpost 15, 3, $0, MapCeladonGymSignpost1Script
signpost 15, 6, $0, MapCeladonGymSignpost1Script
signpost 15, 3, $0, CeladonGymStatue
signpost 15, 6, $0, CeladonGymStatue
; people-events
db 6

50
maps/CeruleanGym.asm
View File

@ -194,36 +194,31 @@ MapCeruleanGymSignpostItem0: ; 0x1884b6
; 0x1884b9
MapCeruleanGymSignpost1Script: ; 0x1884b9
checkevent $076f
iffalse UnknownScript_0x1884d3
CeruleanGymStatue1:
checkevent EVENT_TRAINERS_IN_CERULEAN_GYM
iffalse CeruleanGymStatue
loadfont
writetext UnknownText_0x188610
writetext CeruleanGymNote1
closetext
loadmovesprites
end
; 0x1884c6
MapCeruleanGymSignpost2Script: ; 0x1884c6
checkevent $076f
iffalse UnknownScript_0x1884d3
CeruleanGymStatue2:
checkevent EVENT_TRAINERS_IN_CERULEAN_GYM
iffalse CeruleanGymStatue
loadfont
writetext UnknownText_0x188642
writetext CeruleanGymNote2
closetext
loadmovesprites
end
; 0x1884d3
UnknownScript_0x1884d3: ; 0x1884d3
checkflag $0024
iftrue UnknownScript_0x1884dc
CeruleanGymStatue:
checkflag ENGINE_CASCADEBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x1884dc
UnknownScript_0x1884dc: ; 0x1884dc
.Beaten
trainertotext MISTY, 1, $1
jumpstd gymstatue2
; 0x1884e3
MovementData_0x1884e3: ; 0x1884e3
big_step_down
@ -298,19 +293,17 @@ UnknownText_0x1885a5: ; 0x1885a5
done
; 0x188610
UnknownText_0x188610: ; 0x188610
CeruleanGymNote1:
text "Sorry, I'll be out"
line "for a while."
cont "MISTY, GYM LEADER"
done
; 0x188642
UnknownText_0x188642: ; 0x188642
CeruleanGymNote2:
text "Since MISTY's out,"
line "we'll be away too."
cont "GYM TRAINERS"
done
; 0x188674
UnknownText_0x188674: ; 0x188674
text "MISTY: I was ex-"
@ -464,15 +457,14 @@ CeruleanGym_MapEventHeader: ; 0x188a51
; signposts
db 3
signpost 8, 3, $7, MapCeruleanGymSignpostItem0
signpost 13, 2, $0, MapCeruleanGymSignpost1Script
signpost 13, 6, $0, MapCeruleanGymSignpost2Script
signpost 13, 2, $0, CeruleanGymStatue1
signpost 13, 6, $0, CeruleanGymStatue2
; people-events
db 6
person_event SPRITE_ROCKET, 14, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $076d
person_event SPRITE_MISTY, 7, 9, $6, $0, 255, 255, $80, 0, MistyScript_0x188432, $076f
person_event SPRITE_SWIMMER_GIRL, 10, 8, $9, $0, 255, 255, $a2, 3, TrainerSwimmerfDiana, $076f
person_event SPRITE_SWIMMER_GIRL, 13, 5, $9, $0, 255, 255, $a2, 1, TrainerSwimmerfBriana, $076f
person_event SPRITE_SWIMMER_GUY, 13, 12, $8, $0, 255, 255, $82, 3, TrainerSwimmermParker, $076f
person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, CeruleanGymGuyScript, $076f
; 0x188abe
person_event SPRITE_MISTY, 7, 9, $6, $0, 255, 255, $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 10, 8, $9, $0, 255, 255, $a2, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GIRL, 13, 5, $9, $0, 255, 255, $a2, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_SWIMMER_GUY, 13, 12, $8, $0, 255, 255, $82, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM

15
maps/CianwoodGym.asm
View File

@ -201,16 +201,13 @@ BoulderScript_0x9d6e0: ; 0x9d6e0
jumpstd strengthboulder
; 0x9d6e3
MapCianwoodGymSignpost1Script: ; 0x9d6e3
checkflag $0020
iftrue UnknownScript_0x9d6ec
CianwoodGymStatue:
checkflag ENGINE_STORMBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x9d6ec
UnknownScript_0x9d6ec: ; 0x9d6ec
.Beaten
trainertotext CHUCK, 1, $1
jumpstd gymstatue2
; 0x9d6f3
MovementData_0x9d6f3: ; 0x9d6f3
db $39 ; movement
@ -411,8 +408,8 @@ CianwoodGym_MapEventHeader: ; 0x9db3e
; signposts
db 2
signpost 15, 3, $0, MapCianwoodGymSignpost1Script
signpost 15, 6, $0, MapCianwoodGymSignpost1Script
signpost 15, 3, $0, CianwoodGymStatue
signpost 15, 6, $0, CianwoodGymStatue
; people-events
db 9

15
maps/EcruteakGym.asm
View File

@ -232,16 +232,13 @@ EcruteakGymGuyScript: ; 0x99e39
end
; 0x99e4d
MapEcruteakGymSignpost1Script: ; 0x99e4d
checkflag $001e
iftrue UnknownScript_0x99e56
EcruteakGymStatue:
checkflag ENGINE_FOGBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x99e56
UnknownScript_0x99e56: ; 0x99e56
.Beaten
trainertotext MORTY, 1, $1
jumpstd gymstatue2
; 0x99e5d
MovementData_0x99e5d: ; 0x99e5d
step_up
@ -533,8 +530,8 @@ EcruteakGym_MapEventHeader: ; 0x9a4e9
; signposts
db 2
signpost 15, 3, $0, MapEcruteakGymSignpost1Script
signpost 15, 6, $0, MapEcruteakGymSignpost1Script
signpost 15, 3, $0, EcruteakGymStatue
signpost 15, 6, $0, EcruteakGymStatue
; people-events
db 7

15
maps/FuchsiaGym.asm
View File

@ -220,16 +220,13 @@ FuchsiaGymGuyScript: ; 0x195f03
end
; 0x195f17
MapFuchsiaGymSignpost1Script: ; 0x195f17
checkflag $0027
iftrue UnknownScript_0x195f20
FuchsiaGymStatue:
checkflag ENGINE_SOULBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x195f20
UnknownScript_0x195f20: ; 0x195f20
.Beaten
trainertotext JANINE, 1, $1
jumpstd gymstatue2
; 0x195f27
MovementData_0x195f27: ; 0x195f27
turn_head_down
@ -426,8 +423,8 @@ FuchsiaGym_MapEventHeader: ; 0x196353
; signposts
db 2
signpost 15, 3, $0, MapFuchsiaGymSignpost1Script
signpost 15, 6, $0, MapFuchsiaGymSignpost1Script
signpost 15, 3, $0, FuchsiaGymStatue
signpost 15, 6, $0, FuchsiaGymStatue
; people-events
db 6

15
maps/GoldenrodGym.asm
View File

@ -243,16 +243,13 @@ GoldenrodGymGuyScript: ; 0x540f7
end
; 0x5410c
MapGoldenrodGymSignpost1Script: ; 0x5410c
checkflag $001d
iftrue UnknownScript_0x54115
GoldenrodGymStatue:
checkflag ENGINE_PLAINBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x54115
UnknownScript_0x54115: ; 0x54115
.Beaten
trainertotext WHITNEY, 1, $1
jumpstd gymstatue2
; 0x5411c
BridgetWalksUpMovement: ; 0x5411c
step_left
@ -499,8 +496,8 @@ GoldenrodGym_MapEventHeader: ; 0x546dd
; signposts
db 2
signpost 15, 1, $0, MapGoldenrodGymSignpost1Script
signpost 15, 4, $0, MapGoldenrodGymSignpost1Script
signpost 15, 1, $0, GoldenrodGymStatue
signpost 15, 4, $0, GoldenrodGymStatue
; people-events
db 6

15
maps/MahoganyGym.asm
View File

@ -229,16 +229,13 @@ MahoganyGymGuyScript: ; 0x199b69
end
; 0x199b7d
MapMahoganyGymSignpost1Script: ; 0x199b7d
checkflag $0021
iftrue UnknownScript_0x199b86
MahoganyGymStatue:
checkflag ENGINE_GLACIERBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x199b86
UnknownScript_0x199b86: ; 0x199b86
.Beaten
trainertotext PRYCE, 1, $1
jumpstd gymstatue2
; 0x199b8d
UnknownText_0x199b8d: ; 0x199b8d
text "#MON have many"
@ -500,8 +497,8 @@ MahoganyGym_MapEventHeader: ; 0x19a2df
; signposts
db 2
signpost 15, 3, $0, MapMahoganyGymSignpost1Script
signpost 15, 6, $0, MapMahoganyGymSignpost1Script
signpost 15, 3, $0, MahoganyGymStatue
signpost 15, 6, $0, MahoganyGymStatue
; people-events
db 7

15
maps/OlivineGym.asm
View File

@ -91,16 +91,13 @@ OlivineGymGuyScript: ; 0x9c187
end
; 0x9c1a9
MapOlivineGymSignpost1Script: ; 0x9c1a9
checkflag $001f
iftrue UnknownScript_0x9c1b2
OlivineGymStatue:
checkflag ENGINE_MINERALBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x9c1b2
UnknownScript_0x9c1b2: ; 0x9c1b2
.Beaten
trainertotext JASMINE, 1, $1
jumpstd gymstatue2
; 0x9c1b9
UnknownText_0x9c1b9: ; 0x9c1b9
text "…Thank you for"
@ -229,8 +226,8 @@ OlivineGym_MapEventHeader: ; 0x9c526
; signposts
db 2
signpost 13, 3, $0, MapOlivineGymSignpost1Script
signpost 13, 6, $0, MapOlivineGymSignpost1Script
signpost 13, 3, $0, OlivineGymStatue
signpost 13, 6, $0, OlivineGymStatue
; people-events
db 2

15
maps/PewterGym.asm
View File

@ -84,16 +84,13 @@ PewterGymGuyScript: ; 0x1a28ac
end
; 0x1a28c0
MapPewterGymSignpost1Script: ; 0x1a28c0
checkflag $0023
iftrue UnknownScript_0x1a28c9
PewterGymStatue:
checkflag ENGINE_BOULDERBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x1a28c9
UnknownScript_0x1a28c9: ; 0x1a28c9
.Beaten
trainertotext BROCK, 1, $1
jumpstd gymstatue2
; 0x1a28d0
UnknownText_0x1a28d0: ; 0x1a28d0
text "BROCK: Wow, it's"
@ -252,8 +249,8 @@ PewterGym_MapEventHeader: ; 0x1a2d88
; signposts
db 2
signpost 11, 2, $0, MapPewterGymSignpost1Script
signpost 11, 7, $0, MapPewterGymSignpost1Script
signpost 11, 2, $0, PewterGymStatue
signpost 11, 7, $0, PewterGymStatue
; people-events
db 3

4
maps/Route25.asm
View File

@ -39,7 +39,7 @@ UnknownScript_0x19eea0: ; 0x19eea0
spriteface $0, $2
applymovement $2, MovementData_0x19f000
disappear $2
clearevent $076f
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
dotrigger $0
special RestartMapMusic
end
@ -66,7 +66,7 @@ UnknownScript_0x19eee0: ; 0x19eee0
spriteface $0, $2
applymovement $2, MovementData_0x19f000
disappear $2
clearevent $076f
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
dotrigger $0
special RestartMapMusic
end

13
maps/SaffronGym.asm
View File

@ -174,16 +174,13 @@ SaffronGymGuyScript: ; 0x189cbb
end
; 0x189ccf
MapSaffronGymSignpost0Script: ; 0x189ccf
checkflag $0028
iftrue UnknownScript_0x189cd8
SaffronGymStatue:
checkflag ENGINE_MARSHBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x189cd8
UnknownScript_0x189cd8: ; 0x189cd8
.Beaten
trainertotext SABRINA, 1, $1
jumpstd gymstatue2
; 0x189cdf
UnknownText_0x189cdf: ; 0x189cdf
text "SABRINA: I knew"
@ -424,7 +421,7 @@ SaffronGym_MapEventHeader: ; 0x18a2c4
; signposts
db 1
signpost 15, 8, $0, MapSaffronGymSignpost0Script
signpost 15, 8, $0, SaffronGymStatue
; people-events
db 6

15
maps/VermilionGym.asm
View File

@ -148,16 +148,13 @@ MapVermilionGymSignpost14Script: ; 0x19212f
jumptext UnknownText_0x19261e
; 0x192132
MapVermilionGymSignpost16Script: ; 0x192132
checkflag $0025
iftrue UnknownScript_0x19213b
VermilionGymStatue:
checkflag ENGINE_THUNDERBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x19213b
UnknownScript_0x19213b: ; 0x19213b
.Beaten
trainertotext LT_SURGE, 1, $1
jumpstd gymstatue2
; 0x192142
UnknownText_0x192142: ; 0x192142
text "SURGE: Hey, you"
@ -361,8 +358,8 @@ VermilionGym_MapEventHeader: ; 0x19263d
signpost 11, 5, $0, MapVermilionGymSignpost14Script
signpost 11, 7, $0, MapVermilionGymSignpost14Script
signpost 11, 9, $0, MapVermilionGymSignpost14Script
signpost 15, 3, $0, MapVermilionGymSignpost16Script
signpost 15, 6, $0, MapVermilionGymSignpost16Script
signpost 15, 3, $0, VermilionGymStatue
signpost 15, 6, $0, VermilionGymStatue
; people-events
db 5

15
maps/VioletGym.asm
View File

@ -141,16 +141,13 @@ VioletGymGuyScript: ; 0x6844f
end
; 0x68463
MapVioletGymSignpost1Script: ; 0x68463
checkflag $001b
iftrue UnknownScript_0x6846c
VioletGymStatue:
checkflag ENGINE_ZEPHYRBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x6846c
UnknownScript_0x6846c: ; 0x6846c
.Beaten
trainertotext FALKNER, 1, $1
jumpstd gymstatue2
; 0x68473
UnknownText_0x68473: ; 0x68473
text "I'm FALKNER, the"
@ -349,8 +346,8 @@ VioletGym_MapEventHeader: ; 0x68a0c
; signposts
db 2
signpost 13, 3, $0, MapVioletGymSignpost1Script
signpost 13, 6, $0, MapVioletGymSignpost1Script
signpost 13, 3, $0, VioletGymStatue
signpost 13, 6, $0, VioletGymStatue
; people-events
db 4

15
maps/ViridianGym.asm
View File

@ -54,16 +54,13 @@ ViridianGymGuyScript: ; 0x9aa57
end
; 0x9aa6b
MapViridianGymSignpost1Script: ; 0x9aa6b
checkflag $002a
iftrue UnknownScript_0x9aa74
ViridianGymStatue:
checkflag ENGINE_EARTHBADGE
iftrue .Beaten
jumpstd gymstatue1
; 0x9aa74
UnknownScript_0x9aa74: ; 0x9aa74
.Beaten
trainertotext BLUE, 1, $1
jumpstd gymstatue2
; 0x9aa7b
UnknownText_0x9aa7b: ; 0x9aa7b
text "BLUE: Yo! Finally"
@ -192,8 +189,8 @@ ViridianGym_MapEventHeader: ; 0x9ae04
; signposts
db 2
signpost 13, 3, $0, MapViridianGymSignpost1Script
signpost 13, 6, $0, MapViridianGymSignpost1Script
signpost 13, 3, $0, ViridianGymStatue
signpost 13, 6, $0, ViridianGymStatue
; people-events
db 2