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

Update some event flags.

Browse Source
This commit is contained in:
IIMarckus 2015-06-24 21:20:04 -06:00
parent fdfbeb7e5f
commit f16d60e3f9
31 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
constants/event_flags.asm
View File

@ -42,6 +42,7 @@ EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST EQU $040
EVENT_DUDE_TALKED_TO_YOU EQU $041
EVENT_LEARNED_TO_CATCH_POKEMON EQU $042
EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON EQU $043
EVENT_BEAT_ELITE_FOUR EQU $044
EVENT_GOT_SHUCKIE EQU $045
EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM EQU $046
EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER EQU $047
@ -563,6 +564,7 @@ EVENT_BEAT_POKEFANM_ALLAN EQU $5c8
EVENT_BEAT_SAGE_GAKU EQU $5c9
EVENT_BEAT_SAGE_MASA EQU $5ca
EVENT_BEAT_SAGE_KOJI EQU $5cb
EVENT_RIVAL_SPROUT_TOWER EQU $6c4
EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE EQU $6ff
EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER EQU $700
EVENT_ELMS_AIDE_IN_LAB EQU $701
@ -570,7 +572,10 @@ 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_OPENED_MT_SILVER EQU $74f
EVENT_FOUGHT_SNORLAX EQU $750
EVENT_RED_IN_MT_SILVER EQU $762
EVENT_TELEPORT_GUY EQU $77c
EVENT_PICKED_UP_FOCUS_BAND EQU $77d
EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM EQU $794
EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM EQU $795

2
engine/buena_phone_scripts.asm
View File

@ -66,7 +66,7 @@ UnknownScript_0xa0b73:
end
UnknownScript_0xa0b77:
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0xa0b82
random $b
jump UnknownScript_0xa0b84

4
engine/more_phone_scripts.asm
View File

@ -1219,7 +1219,7 @@ UnknownScript_0xa0840:
jump UnknownScript_0xa0484
UnknownScript_0xa0848:
checkevent $074f
checkevent EVENT_OPENED_MT_SILVER
iftrue UnknownScript_0xa08e0
checkevent EVENT_FOUGHT_SNORLAX
iftrue UnknownScript_0xa08d8
@ -1229,7 +1229,7 @@ UnknownScript_0xa0848:
iftrue UnknownScript_0xa08f0
checkflag ENGINE_FLYPOINT_VERMILION
iftrue UnknownScript_0xa08c8
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0xa08c0
checkflag ENGINE_RISINGBADGE
iftrue UnknownScript_0xa08b8

4
engine/std_scripts.asm
View File

@ -617,8 +617,8 @@ InitializeEventsScript:
setevent $07af
setevent $07ae
setevent $07cf
setflag $000e
setflag $0017
setflag ENGINE_ROCKET_SIGNAL_ON_CH20
setflag ENGINE_ROCKETS_IN_MAHOGANY
variablesprite $4, $52
variablesprite $5, $4
variablesprite $6, $35

2
maps/ElmsLab.asm
View File

@ -100,7 +100,7 @@ ProfElmScript: ; 0x78be0
loadfont
checkevent EVENT_GOT_SS_TICKET_FROM_ELM
iftrue UnknownScript_0x78bee
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue ElmGiveTicketScript
UnknownScript_0x78bee: ; 0x78bee
checkevent EVENT_GOT_MASTER_BALL_FROM_ELM

2
maps/GoldenrodCity.asm
View File

@ -23,7 +23,7 @@ UnknownScript_0x1988e7: ; 0x1988e7
; 0x1988e8
UnknownScript_0x1988e8: ; 0x1988e8
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iffalse UnknownScript_0x198908
checkitem COIN_CASE
iffalse UnknownScript_0x1988fd

2
maps/GoldenrodGameCorner.asm
View File

@ -11,7 +11,7 @@ GoldenrodGameCorner_MapScriptHeader: ; 0x56bf4
; 0x56bf9
UnknownScript_0x56bf9: ; 0x56bf9
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iffalse UnknownScript_0x56c19
checkitem COIN_CASE
iffalse UnknownScript_0x56c0e

8
maps/HallOfFame.asm
View File

@ -34,10 +34,10 @@ UnknownScript_0x181454: ; 0x181454
pause 15
writebyte $2
special Function12324
setevent $0044
setevent $077c
setevent $06c4
clearevent $0762
setevent EVENT_BEAT_ELITE_FOUR
setevent EVENT_TELEPORT_GUY
setevent EVENT_RIVAL_SPROUT_TOWER
clearevent EVENT_RED_IN_MT_SILVER
setevent $0737
clearevent $0738
domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1

34
maps/IndigoPlateauPokeCenter1F.asm
View File

@ -155,13 +155,13 @@ CooltrainerMScript_0x180136: ; 0x180136
jumptextfaceplayer UnknownText_0x180178
; 0x180139
GrampsScript_0x180139: ; 0x180139
TeleportGuyScript:
faceplayer
loadfont
writetext UnknownText_0x180335
writetext TeleportGuyText1
yesorno
iffalse UnknownScript_0x180154
writetext UnknownText_0x1803e7
iffalse .No
writetext TeleportGuyYesText
closetext
loadmovesprites
playsound SFX_WARP_TO
@ -169,23 +169,20 @@ GrampsScript_0x180139: ; 0x180139
waitbutton
warp GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $d, $6
end
; 0x180154
UnknownScript_0x180154: ; 0x180154
writetext UnknownText_0x180411
.No
writetext TeleportGuyNoText
closetext
loadmovesprites
end
; 0x18015a
JynxScript_0x18015a: ; 0x18015a
AbraScript:
loadfont
writetext UnknownText_0x180433
writetext AbraText
cry ABRA
closetext
loadmovesprites
end
; 0x180164
MovementData_0x180164: ; 0x180164
step_up
@ -285,7 +282,7 @@ UnknownText_0x1802fd: ; 0x1802fd
done
; 0x180335
UnknownText_0x180335: ; 0x180335
TeleportGuyText1:
text "Ah! You're chal-"
line "lenging the ELITE"
@ -304,25 +301,22 @@ UnknownText_0x180335: ; 0x180335
para "Would you like to"
line "go home now?"
done
; 0x1803e7
UnknownText_0x1803e7: ; 0x1803e7
TeleportGuyYesText:
text "OK, OK. Picture"
line "your house in your"
cont "mind…"
done
; 0x180411
UnknownText_0x180411: ; 0x180411
TeleportGuyNoText:
text "OK, OK. The best"
line "of luck to you!"
done
; 0x180433
UnknownText_0x180433: ; 0x180433
AbraText:
text "ABRA: Aabra…"
done
; 0x180441
IndigoPlateauPokeCenter1F_MapEventHeader: ; 0x180441
; filler
@ -349,6 +343,6 @@ IndigoPlateauPokeCenter1F_MapEventHeader: ; 0x180441
person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, $ffff
person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, $ffff
person_event SPRITE_SILVER, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, $077b
person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, GrampsScript_0x180139, $077c
person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, JynxScript_0x18015a, $077c
person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, AbraScript, EVENT_TELEPORT_GUY
; 0x1804b9

2
maps/NationalPark.asm
View File

@ -125,7 +125,7 @@ UnknownScript_0x5c0a7: ; 0x5c0a7
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x5c0f3
UnknownScript_0x5c0ad: ; 0x5c0ad
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x5c0e6
UnknownScript_0x5c0b3: ; 0x5c0b3
checkevent EVENT_CLEARED_RADIO_TOWER

4
maps/OaksLab.asm
View File

@ -13,7 +13,7 @@ UnknownScript_0x19b3c7: ; 0x19b3c7
OakScript_0x19b3c8: ; 0x19b3c8
faceplayer
loadfont
checkevent $074f
checkevent EVENT_OPENED_MT_SILVER
iftrue UnknownScript_0x19b3ea
checkevent $00e1
iftrue UnknownScript_0x19b3dd
@ -40,7 +40,7 @@ UnknownScript_0x19b3ea: ; 0x19b3ea
UnknownScript_0x19b3f7: ; 0x19b3f7
writetext UnknownText_0x19b4fc
keeptextopen
setevent $074f
setevent EVENT_OPENED_MT_SILVER
jump UnknownScript_0x19b3ea
; 0x19b401

2
maps/OlivineLighthouse2F.asm
View File

@ -93,7 +93,7 @@ UnknownScript_0x5afe2: ; 0x5afe2
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x5b01b
UnknownScript_0x5afe8: ; 0x5afe8
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x5b00e
UnknownScript_0x5afee: ; 0x5afee
checkevent EVENT_CLEARED_RADIO_TOWER

4
maps/Route26.asm
View File

@ -94,7 +94,7 @@ UnknownScript_0x1a4d90: ; 0x1a4d90
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a4db6
UnknownScript_0x1a4d96: ; 0x1a4d96
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a4da9
UnknownScript_0x1a4d9c: ; 0x1a4d9c
loadtrainer COOLTRAINERM, GAVEN3
@ -245,7 +245,7 @@ UnknownScript_0x1a4e4c: ; 0x1a4e4c
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a4e72
UnknownScript_0x1a4e52: ; 0x1a4e52
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a4e65
UnknownScript_0x1a4e58: ; 0x1a4e58
loadtrainer COOLTRAINERF, BETH1

4
maps/Route27.asm
View File

@ -135,7 +135,7 @@ UnknownScript_0x1a0916: ; 0x1a0916
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a093c
UnknownScript_0x1a091c: ; 0x1a091c
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a092f
UnknownScript_0x1a0922: ; 0x1a0922
loadtrainer BIRD_KEEPER, JOSE2
@ -337,7 +337,7 @@ UnknownScript_0x1a0a00: ; 0x1a0a00
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1a0a26
UnknownScript_0x1a0a06: ; 0x1a0a06
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a0a19
UnknownScript_0x1a0a0c: ; 0x1a0a0c
loadtrainer COOLTRAINERF, REENA1

2
maps/Route30.asm
View File

@ -85,7 +85,7 @@ UnknownScript_0x1a16e0: ; 0x1a16e0
if_equal $1, UnknownScript_0x1a1711
if_equal $0, UnknownScript_0x1a1717
UnknownScript_0x1a16ff: ; 0x1a16ff
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a174b
UnknownScript_0x1a1705: ; 0x1a1705
checkevent EVENT_CLEARED_RADIO_TOWER

2
maps/Route31.asm
View File

@ -81,7 +81,7 @@ UnknownScript_0x1a5493: ; 0x1a5493
if_equal $1, UnknownScript_0x1a54c4
if_equal $0, UnknownScript_0x1a54ca
UnknownScript_0x1a54b2: ; 0x1a54b2
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1a54fe
UnknownScript_0x1a54b8: ; 0x1a54b8
checkevent EVENT_CLEARED_RADIO_TOWER

4
maps/Route32.asm
View File

@ -266,7 +266,7 @@ UnknownScript_0x19059c: ; 0x19059c
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1905e8
UnknownScript_0x1905a2: ; 0x1905a2
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1905db
UnknownScript_0x1905a8: ; 0x1905a8
checkflag $004a
@ -447,7 +447,7 @@ UnknownScript_0x19066d: ; 0x19066d
if_equal $1, UnknownScript_0x19069e
if_equal $0, UnknownScript_0x1906a4
UnknownScript_0x19068c: ; 0x19068c
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1906d8
UnknownScript_0x190692: ; 0x190692
checkevent EVENT_CLEARED_RADIO_TOWER

2
maps/Route33.asm
View File

@ -73,7 +73,7 @@ UnknownScript_0x1ac070: ; 0x1ac070
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x1ac0bc
UnknownScript_0x1ac076: ; 0x1ac076
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x1ac0af
UnknownScript_0x1ac07c: ; 0x1ac07c
checkevent EVENT_CLEARED_RADIO_TOWER

4
maps/Route34.asm
View File

@ -149,7 +149,7 @@ UnknownScript_0x780dc: ; 0x780dc
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x78128
UnknownScript_0x780e2: ; 0x780e2
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x7811b
UnknownScript_0x780e8: ; 0x780e8
checkflag $004b
@ -306,7 +306,7 @@ UnknownScript_0x781be: ; 0x781be
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x7820a
UnknownScript_0x781c4: ; 0x781c4
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x781fd
UnknownScript_0x781ca: ; 0x781ca
checkevent EVENT_CLEARED_RADIO_TOWER

2
maps/Route35.asm
View File

@ -295,7 +295,7 @@ UnknownScript_0x19c9da: ; 0x19c9da
checkevent EVENT_RESTORED_POWER_TO_KANTO
iftrue UnknownScript_0x19ca26
UnknownScript_0x19c9e0: ; 0x19c9e0
checkevent $0044
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0x19ca19
UnknownScript_0x19c9e6: ; 0x19c9e6
checkflag $004b

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