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

Add more event flags.

Browse Source
This commit is contained in:
IIMarckus
2015-07-10 06:08:03 -06:00
parent 86c13acf84
commit 07a12b37b6
68 changed files with 304 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
constants/event_flags.asm
View File

@@ -30,11 +30,14 @@ EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER EQU $025
EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE EQU $026
EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE EQU $027
EVENT_MADE_WHITNEY_CRY EQU $028
EVENT_HERDED_FARFETCHD EQU $029
EVENT_FOUGHT_SUDOWOODO EQU $02a
EVENT_CLEARED_SLOWPOKE_WELL EQU $02b
EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE EQU $02c
EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE EQU $02d
EVENT_MADE_UNOWN_APPEAR_IN_RUINS EQU $02e
EVENT_FAST_SHIP_DESTINATION_OLIVINE EQU $02f
EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS EQU $037
EVENT_HEALED_MOOMOO EQU $03d
EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM EQU $03e
EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO EQU $03f
@@ -98,7 +101,14 @@ EVENT_RELEASED_THE_BEASTS EQU $07b
EVENT_GOT_MASTER_BALL_FROM_ELM EQU $07c
EVENT_FOUND_REVIVE_IN_ROCKET_BASE_B1F EQU $086
EVENT_MET_FLORIA EQU $0b9
EVENT_BUGGING_KURT_TOO_MUCH EQU $0bb
EVENT_TALKED_TO_RUINS_COWARD EQU $0bc
EVENT_GOT_DRATINI EQU $0bd
EVENT_CAN_GIVE_GS_BALL_TO_KURT EQU $0be
EVENT_GAVE_GS_BALL_TO_KURT EQU $0bf
EVENT_FOREST_IS_RESTLESS EQU $0c0
EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG EQU $0c1
EVENT_GOT_NUGGET_FROM_GUY EQU $0c8
EVENT_RETURNED_MACHINE_PART EQU $0c9
EVENT_MET_MANAGER_AT_POWER_PLANT EQU $0ca
EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM EQU $0cb
@@ -113,6 +123,7 @@ EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL EQU $0d3
EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT EQU $0d4
EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE EQU $0d5
EVENT_ENABLE_DIPLOMA_PRINTING EQU $0d6
EVENT_CINNABAR_ROCKS_CLEARED EQU $0d7
EVENT_CLEARED_NUGGET_BRIDGE EQU $0d8
EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER EQU $0d9
EVENT_GOT_TM03_CURSE EQU $0da
@@ -126,9 +137,10 @@ EVENT_TALKED_TO_OAK_IN_KANTO EQU $0e1
EVENT_GOT_HP_UP_FROM_VERMILION_GUY EQU $0e2
EVENT_GOT_TM29_PSYCHIC EQU $0e3
EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE EQU $0f9
EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY EQU $0fa
EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM EQU $0fb
EVENT_JACK_ASKED_FOR_PHONE_NUMBER EQU $25f
EVENT_SHOWED_BEVERLY_MARILL EQU $261
EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER EQU $261
EVENT_HUEY_ASKED_FOR_PHONE_NUMBER EQU $263
EVENT_GOT_PROTEIN_FROM_HUEY EQU $265
EVENT_GOT_HP_UP_FROM_JOEY EQU $266
@@ -207,6 +219,13 @@ EVENT_EXPLODING_TRAP_21 EQU $2fd
EVENT_EXPLODING_TRAP_22 EQU $2fe
EVENT_LEARNED_HAIL_GIOVANNI EQU $2ff
EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER EQU $300
EVENT_LEARNED_SLOWPOKETAIL EQU $301
EVENT_LEARNED_RATICATE_TAIL EQU $302
EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE EQU $303
EVENT_WAREHOUSE_LAYOUT_1 EQU $304
EVENT_WAREHOUSE_LAYOUT_2 EQU $305
EVENT_WAREHOUSE_LAYOUT_3 EQU $306
EVENT_WAREHOUSE_BLOCKED_OFF EQU $307
EVENT_WILLS_ROOM_EXIT_OPEN EQU $30a
EVENT_WILLS_ROOM_ENTRANCE_CLOSED EQU $30b
EVENT_KOGAS_ROOM_EXIT_OPEN EQU $30c
@@ -242,6 +261,8 @@ EVENT_WADE_HAS_BITTER_BERRY EQU $32e
EVENT_WILTON_HAS_ULTRA_BALL EQU $32f
EVENT_WILTON_HAS_GREAT_BALL EQU $330
EVENT_WILTON_HAS_POKE_BALL EQU $331
EVENT_HOLE_IN_BURNED_TOWER EQU $332
EVENT_FOUGHT_EUSINE EQU $333
EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER EQU $334
EVENT_FOUGHT_SUICUNE EQU $335
EVENT_GOT_RAINBOW_WING EQU $336
@@ -630,9 +651,11 @@ EVENT_BOULDER_IN_ICE_PATH_1 EQU $70d
EVENT_BOULDER_IN_ICE_PATH_2 EQU $70e
EVENT_BOULDER_IN_ICE_PATH_3 EQU $70f
EVENT_BOULDER_IN_ICE_PATH_4 EQU $710
EVENT_MET_BILL EQU $712
EVENT_OPENED_MT_SILVER EQU $74f
EVENT_FOUGHT_SNORLAX EQU $750
EVENT_RED_IN_MT_SILVER EQU $762
EVENT_RANG_CLEAR_BELL EQU $767
EVENT_FLORIA_AT_SUDOWOODO EQU $769
EVENT_TRAINERS_IN_CERULEAN_GYM EQU $76f
EVENT_BLUE_IN_CINNABAR EQU $775
@@ -654,6 +677,7 @@ EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM EQU $7a0
EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM EQU $7a1
EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM EQU $7a2
EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM EQU $7a3
EVENT_EUSINE_IN_BURNED_TOWER EQU $7aa
EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY EQU $7ae
EVENT_SAW_SUICUNE_ON_ROUTE_42 EQU $7af
EVENT_SAW_SUICUNE_ON_ROUTE_36 EQU $7b0

6
engine/std_scripts.asm
View File

@@ -291,7 +291,7 @@ GoldenrodRocketsScript:
end
RadioTowerRocketsScript:
setflag $0013
setflag ENGINE_BIKE_SHOP_CALL_ENABLED
setevent $06cf
setevent $06d1
clearevent $06ce
@@ -377,7 +377,7 @@ UnknownScript_0xbc2d4:
setevent $0727
setevent $0728
setevent $0729
setflag $0051
setflag ENGINE_51
special PlayMapMusic
end
; 0xbc31e
@@ -583,7 +583,7 @@ InitializeEventsScript:
setevent $06ed
setevent $06f0
setevent $07a9
setevent $07aa
setevent EVENT_EUSINE_IN_BURNED_TOWER
setevent $06c8
setevent $07ac
setevent $07ad

8
main.asm
View File

@@ -12384,9 +12384,9 @@ String_1224f: ; 1224f
; 122c1
UnknownScript_0x122c1: ; 0x122c1
checkflag $0011
checkflag ENGINE_BUG_CONTEST_TIMER
iffalse .script_122cd
setflag $0051
setflag ENGINE_51
special Function13a31
.script_122cd
end
@@ -12721,7 +12721,7 @@ UnknownScript_0x124ce: ; 0x124ce
special Function8c084
pause 40
special HealParty
checkflag $0011
checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .script_64f2
callasm HalveMoney
callasm Function12527
@@ -49267,7 +49267,7 @@ UnknownScript_0x506c8: ; 0x506c8
closetext
callasm Function506ef
iffalse UnknownScript_0x506e9
checkflag $0011
checkflag ENGINE_BUG_CONTEST_TIMER
iftrue UnknownScript_0x506e5
battlecheck
startbattle

2
maps/AzaleaTown.asm
View File

@@ -157,7 +157,7 @@ UnknownScript_0x1980e5:
closetext
verbosegiveitem GS_BALL, 1
spriteface $d, LEFT
setflag $0064
setflag ENGINE_HAVE_EXAMINED_GS_BALL
clearevent $06ed
setevent $06eb
dotrigger $0

8
maps/BluesHouse.asm
View File

@@ -16,7 +16,7 @@ DaisyScript_0x19b0d0:
end
UnknownScript_0x19b0de:
checkflag $005c
checkflag ENGINE_TEA_IN_BLUES_HOUSE
iftrue UnknownScript_0x19b11e
writetext UnknownText_0x19b1b6
yesorno
@@ -24,9 +24,9 @@ UnknownScript_0x19b0de:
writetext UnknownText_0x19b244
closetext
special Function741d
if_equal $0, UnknownScript_0x19b124
if_equal $1, UnknownScript_0x19b12a
setflag $005c
if_equal 0, UnknownScript_0x19b124
if_equal 1, UnknownScript_0x19b12a
setflag ENGINE_TEA_IN_BLUES_HOUSE
writetext UnknownText_0x19b266
closetext
loadmovesprites

16
maps/BurnedTower1F.asm
View File

@@ -25,14 +25,14 @@ UnknownScript_0x185bf7:
end
UnknownScript_0x185bf8:
checkevent $0332
iftrue UnknownScript_0x185c02
changeblock $a, $8, $32
UnknownScript_0x185c02:
checkevent EVENT_HOLE_IN_BURNED_TOWER
iftrue .Next
changeblock $a, $8, $32 ; hole
.Next
checkevent EVENT_RELEASED_THE_BEASTS
iftrue UnknownScript_0x185c0c
changeblock $6, $e, $9
UnknownScript_0x185c0c:
iftrue .Done
changeblock $6, $e, $9 ; ladder
.Done
return
UnknownScript_0x185c0d:
@@ -114,7 +114,7 @@ UnknownScript_0x185c80:
writetext UnknownText_0x185e75
closetext
loadmovesprites
setevent $0332
setevent EVENT_HOLE_IN_BURNED_TOWER
pause 15
warpcheck
end

2
maps/BurnedTowerB1F.asm
View File

@@ -259,4 +259,4 @@ BurnedTowerB1F_MapEventHeader:
person_event SPRITE_ENTEI, 7, 16, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b
person_event SPRITE_SUICUNE, 8, 14, $6, $0, 255, 255, $d0, 0, ObjectEvent, $074b
person_event SPRITE_POKE_BALL, 8, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x186231, $0657
person_event SPRITE_SUPER_NERD, 16, 14, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x186212, $07aa
person_event SPRITE_SUPER_NERD, 16, 14, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER

4
maps/CeruleanCity.asm
View File

@@ -86,7 +86,7 @@ YoungsterScript_0x184064:
writetext UnknownText_0x1842a9
closetext
loadmovesprites
checkevent $00fa
checkevent EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY
iffalse UnknownScript_0x184072
end
@@ -141,7 +141,7 @@ CeruleanCityMartSign:
jumpstd martsign
MapCeruleanCitySignpostItem8:
dw $00fa
dw EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY
db BERSERK_GENE
UnknownText_0x1840bc:

6
maps/CherrygroveCity.asm
View File

@@ -68,7 +68,7 @@ CherrygroveCityGuideGent:
keeptextopen
stringtotext .mapcardname, $1
scall .UnknownScript_0x19c097
setflag $0001
setflag ENGINE_MAP_CARD
writetext GotMapCardText
keeptextopen
writetext GuideGentPokegearText
@@ -177,7 +177,7 @@ UnknownScript_0x19c12f:
TeacherScript_0x19c146:
faceplayer
loadfont
checkflag $0001
checkflag ENGINE_MAP_CARD
iftrue UnknownScript_0x19c154
writetext UnknownText_0x19c650
closetext
@@ -193,7 +193,7 @@ UnknownScript_0x19c154:
YoungsterScript_0x19c15a:
faceplayer
loadfont
checkflag $000b
checkflag ENGINE_POKEDEX
iftrue UnknownScript_0x19c168
writetext UnknownText_0x19c6d6
closetext

12
maps/CianwoodCity.asm
View File

@@ -20,8 +20,8 @@ CianwoodCity_MapScriptHeader:
.FlyPointAndSuicune
setflag ENGINE_FLYPOINT_CIANWOOD
setevent $07aa
checkevent $0333
setevent EVENT_EUSINE_IN_BURNED_TOWER
checkevent EVENT_FOUGHT_EUSINE
iffalse UnknownScript_0x1a001d
disappear $c
UnknownScript_0x1a001d:
@@ -42,9 +42,9 @@ UnknownScript_0x1a001e:
dotrigger $0
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
domaptrigger GROUP_ROUTE_42, MAP_ROUTE_42, $1
checkevent $0333
iftrue UnknownScript_0x1a0083
setevent $0333
checkevent EVENT_FOUGHT_EUSINE
iftrue .Done
setevent EVENT_FOUGHT_EUSINE
playmusic MUSIC_MYSTICALMAN_ENCOUNTER
appear $c
applymovement $c, MovementData_0x1a00e7
@@ -69,7 +69,7 @@ UnknownScript_0x1a001e:
special Functionc48f
playmapmusic
pause 10
UnknownScript_0x1a0083:
.Done
end
PokefanFScript_0x1a0084:

4
maps/CianwoodPharmacy.asm
View File

@@ -16,11 +16,11 @@ CianwoodPharmacist:
loadfont
checkevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY
iftrue .Mart
checkevent $0037
checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
iffalse .Mart
writetext PharmacistGiveSecretpotionText
keeptextopen
giveitem SECRETPOTION, $1
giveitem SECRETPOTION, 1
writetext ReceivedSecretpotionText
playsound SFX_KEY_ITEM
waitbutton

18
maps/CopycatsHouse2F.asm
View File

@@ -10,7 +10,7 @@ CopycatsHouse2F_MapScriptHeader:
dbw 2, CopycatsHouse2FCallback
CopycatsHouse2FCallback:
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Part1
disappear $7
appear $2
@@ -29,7 +29,7 @@ Copycat:
iftrue .Part13
checkitem LOST_ITEM
iftrue .Part12
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Part1
applymovement $2, MovementData_0x18afd0
faceplayer
@@ -45,7 +45,7 @@ Copycat:
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .Part7
loadfont
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Part3
writetext UnknownText_0x18afda
jump .Part4
@@ -55,7 +55,7 @@ Copycat:
.Part4
closetext
loadmovesprites
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Part5
applymovement $2, MovementData_0x18afd0
jump .Part6
@@ -74,7 +74,7 @@ Copycat:
.Part7
loadfont
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Part8
writetext UnknownText_0x18b064
jump .Part9
@@ -84,7 +84,7 @@ Copycat:
.Part9
closetext
loadmovesprites
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Part10
applymovement $2, MovementData_0x18afd0
jump .Part11
@@ -125,7 +125,7 @@ Copycat:
end
.Part15
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Part16
applymovement $2, MovementData_0x18afd0
faceplayer
@@ -139,7 +139,7 @@ Copycat:
.Part17
special Function14209
loadfont
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Part18
writetext UnknownText_0x18b298
jump .Part19
@@ -149,7 +149,7 @@ Copycat:
.Part19
closetext
loadmovesprites
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Part20
applymovement $2, MovementData_0x18afd0
jump .Part21

2
maps/DanceTheatre.asm
View File

@@ -160,7 +160,7 @@ GentlemanScript_0x994c6:
jump UnknownScript_0x99505
UnknownScript_0x994f3:
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue UnknownScript_0x994ff
writetext UnknownText_0x99891
closetext

4
maps/DayCare.asm
View File

@@ -10,7 +10,7 @@ DayCare_MapScriptHeader:
dbw 2, UnknownScript_0x62f7b
UnknownScript_0x62f7b:
checkflag $0005
checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE
iftrue UnknownScript_0x62f88
clearevent $06e5
setevent $06e6
@@ -58,7 +58,7 @@ UnknownScript_0x62fbd:
GrannyScript_0x62fc3:
faceplayer
loadfont
checkflag $0005
checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE
iftrue UnknownScript_0x62fd1
special Function1672a
closetext

10
maps/DragonShrine.asm
View File

@@ -99,7 +99,7 @@ UnknownScript_0x18d0cb:
writetext UnknownText_0x18d816
closetext
loadmovesprites
setevent $00c1
setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
loadfont
checkevent $0005
iftrue UnknownScript_0x18d091
@@ -156,7 +156,7 @@ UnknownScript_0x18d100:
loadfont
writetext UnknownText_0x18d9bf
closetext
setflag $0022
setflag ENGINE_RISINGBADGE
playsound SFX_GET_BADGE
waitbutton
special RestartMapMusic
@@ -194,7 +194,7 @@ ElderScript_0x18d1a5:
iftrue UnknownScript_0x18d1f9
checkevent $0006
iftrue UnknownScript_0x18d1ff
checkevent $00bd
checkevent EVENT_GOT_DRATINI
iffalse UnknownScript_0x18d1c5
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iftrue UnknownScript_0x18d1f3
@@ -212,9 +212,9 @@ UnknownScript_0x18d1c5:
playsound SFX_CAUGHT_MON
waitbutton
givepoke DRATINI, 15, 0, 0
checkevent $00c1
checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
special SpecialDratini
setevent $00bd
setevent EVENT_GOT_DRATINI
setevent $0006
writetext UnknownText_0x18d6ca
closetext

10
maps/EcruteakHouse.asm
View File

@@ -30,7 +30,7 @@ UnknownScript_0x9800f:
UnknownScript_0x98022:
clearevent $0766
setevent $0767
setevent EVENT_RANG_CLEAR_BELL
setevent $07b1
checkitem CLEAR_BELL
iftrue UnknownScript_0x98032
@@ -43,7 +43,7 @@ UnknownScript_0x98033:
return
UnknownScript_0x98037:
checkevent $0767
checkevent EVENT_RANG_CLEAR_BELL
iftrue UnknownScript_0x98061
applymovement $3, MovementData_0x980c7
moveperson $2, $4, $6
@@ -70,7 +70,7 @@ SageScript_0x98062:
loadfont
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue UnknownScript_0x9807c
checkflag $001e
checkflag ENGINE_FOGBADGE
iftrue UnknownScript_0x98076
writetext UnknownText_0x980d1
closetext
@@ -100,7 +100,7 @@ UnknownScript_0x98093:
closetext
loadmovesprites
dotrigger $1
setevent $0767
setevent EVENT_RANG_CLEAR_BELL
clearevent $0766
setevent $0000
end
@@ -299,6 +299,6 @@ EcruteakHouse_MapEventHeader:
; people-events
db 4
person_event SPRITE_SAGE, 10, 8, $6, $0, 255, 255, $0, 0, SageScript_0x98062, $0766
person_event SPRITE_SAGE, 10, 9, $6, $0, 255, 255, $0, 0, SageScript_0x98062, $0767
person_event SPRITE_SAGE, 10, 9, $6, $0, 255, 255, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL
person_event SPRITE_SAGE, 13, 10, $2, $11, 255, 255, $0, 0, SageScript_0x980b0, $07b1
person_event SPRITE_GRAMPS, 15, 7, $2, $11, 255, 255, $0, 0, GrampsScript_0x980c4, $07b1

4
maps/EcruteakPokeCenter1F.asm
View File

@@ -46,8 +46,8 @@ UnknownScript_0x98e95:
applymovement $6, MovementData_0x98ece
playsound SFX_EXIT_BUILDING
disappear $6
clearevent $0712
setflag $0053
clearevent EVENT_MET_BILL
setflag ENGINE_TIME_CAPSULE
dotrigger $1
waitbutton
end

8
maps/ElmsLab.asm
View File

@@ -95,7 +95,7 @@ ProfElmScript:
UnknownScript_0x78bee:
checkevent EVENT_GOT_MASTER_BALL_FROM_ELM
iftrue UnknownScript_0x78bfa
checkflag $0022
checkflag ENGINE_RISINGBADGE
iftrue ElmGiveMasterBallScript
UnknownScript_0x78bfa:
checkevent EVENT_GOT_EVERSTONE_FROM_ELM
@@ -132,7 +132,7 @@ UnknownScript_0x78c35:
UnknownScript_0x78c41:
checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again?
iftrue ElmWaitingEggHatchScript
checkflag $001b
checkflag ENGINE_ZEPHYRBADGE
iftrue ElmAideHasEggScript
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue ElmStudyingEggScript
@@ -337,7 +337,7 @@ ElmAfterTheftScript:
writetext ElmAfterTheftText5
keeptextopen
setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
setflag $0010
setflag ENGINE_BUG_CONTEST_ON
domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1
clearevent $0715
setevent $0714
@@ -564,7 +564,7 @@ CopScript:
ElmsLabWindow:
loadfont
checkflag $0043
checkflag ENGINE_FLYPOINT_VIOLET
iftrue .Normal
checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
iftrue .BreakIn

12
maps/FastShip1F.asm
View File

@@ -43,22 +43,22 @@ SailorScript_0x75160:
loadfont
checkevent $0031
iftrue UnknownScript_0x7517a
checkevent $002f
iftrue UnknownScript_0x75174
checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
iftrue .Olivine
writetext UnknownText_0x7523b
closetext
loadmovesprites
end
UnknownScript_0x75174:
.Olivine
writetext UnknownText_0x7529b
closetext
loadmovesprites
end
UnknownScript_0x7517a:
checkevent $002f
iftrue UnknownScript_0x7519c
checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
iftrue .Olivine
writetext UnknownText_0x754be
closetext
loadmovesprites
@@ -71,7 +71,7 @@ UnknownScript_0x7517a:
warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11
end
UnknownScript_0x7519c:
.Olivine
writetext UnknownText_0x7548d
closetext
loadmovesprites

2
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@@ -48,7 +48,7 @@ TwinScript_0x75ebb:
showemote $0, $3, 15
applymovement $4, MovementData_0x7600c
spriteface $3, RIGHT
checkflag $0063
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue UnknownScript_0x75f03
loadfont
writetext UnknownText_0x76284

Some files were not shown because too many files have changed in this diff Show More