Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481)

This commit is contained in:
Rangi 2018-01-24 10:46:49 -05:00
parent 09ff04dbfc
commit 505a6595bc
19 changed files with 119 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
constants/event_flags.asm
View File

@ -1,14 +1,14 @@
; EventFlags bit flags
const_def
; The first eight flags are reset upon reloading the map
const EVENT_GAVE_KURT_APRICORNS ; 000
const EVENT_RECEIVED_BALLS_FROM_KURT
const EVENT_DRAGON_SHRINE_QUESTION_2
const EVENT_DRAGON_SHRINE_QUESTION_3
const EVENT_DRAGON_SHRINE_QUESTION_4
const EVENT_DRAGON_SHRINE_QUESTION_5
const EVENT_JUST_RECEIVED_DRATINI
const EVENT_IN_YOUR_ROOM
const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 ; 000
const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7
const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
; Johto Gym Leader TM gifts
const EVENT_GOT_TM31_MUD_SLAP
const EVENT_GOT_TM49_FURY_CUTTER

16
data/decorations/attributes.asm
View File

@ -7,36 +7,36 @@ ENDM
DecorationAttributes: ; 26a4f
; entries correspond to deco constants
decoration DECO_PLANT, $00, $0, EVENT_GAVE_KURT_APRICORNS, $00
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_GAVE_KURT_APRICORNS, $00
decoration DECO_PLANT, $00, $0, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00
decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b
decoration DECO_BED, PINK_BED, SET_UP_BED, EVENT_DECO_BED_2, $1c
decoration DECO_BED, POLKADOT_BED, SET_UP_BED, EVENT_DECO_BED_3, $1d
decoration DECO_BED, PIKACHU_BED, SET_UP_BED, EVENT_DECO_BED_4, $1e
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_GAVE_KURT_APRICORNS, $00
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00
decoration DECO_CARPET, RED_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_1, $08
decoration DECO_CARPET, BLUE_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_2, $0b
decoration DECO_CARPET, YELLOW_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_3, $0e
decoration DECO_CARPET, GREEN_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_4, $11
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_GAVE_KURT_APRICORNS, $00
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00
decoration DECO_PLANT, MAGNAPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_1, $20
decoration DECO_PLANT, TROPICPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_2, $21
decoration DECO_PLANT, JUMBOPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_3, $22
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_GAVE_KURT_APRICORNS, $00
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00
decoration DECO_PLANT, TOWN_MAP_D, SET_UP_POSTER, EVENT_DECO_PLANT_4, $1f
decoration DECO_POSTER, PIKACHU, SET_UP_POSTER, EVENT_DECO_POSTER_1, $23
decoration DECO_POSTER, CLEFAIRY, SET_UP_POSTER, EVENT_DECO_POSTER_2, $24
decoration DECO_POSTER, JIGGLYPUFF, SET_UP_POSTER, EVENT_DECO_POSTER_3, $25
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_GAVE_KURT_APRICORNS, $00
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00
decoration DECO_PLANT, FAMICOM, SET_UP_CONSOLE, EVENT_DECO_FAMICOM, SPRITE_FAMICOM
decoration DECO_PLANT, SUPER_NES, SET_UP_CONSOLE, EVENT_DECO_SNES, SPRITE_SNES
decoration DECO_PLANT, NINTENDO_64, SET_UP_CONSOLE, EVENT_DECO_N64, SPRITE_N64
decoration DECO_PLANT, VIRTUAL_BOY, SET_UP_CONSOLE, EVENT_DECO_VIRTUAL_BOY, SPRITE_VIRTUAL_BOY
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_GAVE_KURT_APRICORNS, $00
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00
decoration DECO_BIGDOLL, SNORLAX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_SNORLAX_DOLL, SPRITE_BIG_SNORLAX
decoration DECO_BIGDOLL, ONIX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_ONIX_DOLL, SPRITE_BIG_ONIX
decoration DECO_BIGDOLL, LAPRAS, SET_UP_BIG_DOLL, EVENT_DECO_BIG_LAPRAS_DOLL, SPRITE_BIG_LAPRAS
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_GAVE_KURT_APRICORNS, $00
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00
decoration DECO_DOLL, PIKACHU, SET_UP_DOLL, EVENT_DECO_PIKACHU_DOLL, SPRITE_PIKACHU
decoration DECO_PLANT, SURF_PIKA_DOLL, SET_UP_DOLL, EVENT_DECO_SURFING_PIKACHU_DOLL, SPRITE_SURFING_PIKACHU
decoration DECO_DOLL, CLEFAIRY, SET_UP_DOLL, EVENT_DECO_CLEFAIRY_DOLL, SPRITE_CLEFAIRY

2
engine/events/std_scripts.asm
View File

@ -384,7 +384,7 @@ BugContestResults_CleanUp
; 0xbc31e
BugContestResults_FirstPlace ; 0xbc31e
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
itemtotext SUN_STONE, MEM_BUFFER_1
farwritetext ContestResults_PlayerWonAPrizeText
waitbutton

2
engine/phone/phone_scripts.asm
View File

@ -16,7 +16,7 @@ MomPhoneScript: ; 0xbceaa
jump MomPhoneNoPokemonScript
.bcec5 ; 0xbcec5
checkevent EVENT_IN_YOUR_ROOM
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
iftrue MomPhoneHangUpScript
farwritetext MomPhoneGreetingText
buttonsound

10
maps/BillsHouse.asm
View File

@ -11,7 +11,7 @@ BillsHouse_MapScripts:
BillsGrandpa:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue .JustShowedSomething
checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
iftrue .GotThunderstone
@ -123,7 +123,7 @@ BillsGrandpa:
verbosegiveitem EVERSTONE
iffalse .BagFull
setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
closetext
end
@ -134,7 +134,7 @@ BillsGrandpa:
verbosegiveitem LEAF_STONE
iffalse .BagFull
setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
closetext
end
@ -145,7 +145,7 @@ BillsGrandpa:
verbosegiveitem WATER_STONE
iffalse .BagFull
setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
closetext
end
@ -156,7 +156,7 @@ BillsGrandpa:
verbosegiveitem FIRE_STONE
iffalse .BagFull
setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
closetext
end

4
maps/Colosseum.asm
View File

@ -81,5 +81,5 @@ Colosseum_MapEvents:
.ObjectEvents:
db 2
object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2

44
maps/DragonShrine.asm
View File

@ -27,7 +27,7 @@ DragonShrine_MapScripts:
writetext DragonShrineElderGreetingText
buttonsound
.Question1:
setevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
writetext DragonShrineQuestion1Text
buttonsound
loadmenuheader DragonShrineQuestion1_MenuHeader
@ -39,7 +39,7 @@ DragonShrine_MapScripts:
end
.Question2:
setevent EVENT_DRAGON_SHRINE_QUESTION_2
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
writetext DragonShrineQuestion2Text
buttonsound
loadmenuheader DragonShrineQuestion2_MenuHeader
@ -49,7 +49,7 @@ DragonShrine_MapScripts:
if_equal 2, .RightAnswer
if_equal 3, .WrongAnswer
.Question3:
setevent EVENT_DRAGON_SHRINE_QUESTION_3
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
writetext DragonShrineQuestion3Text
buttonsound
loadmenuheader DragonShrineQuestion3_MenuHeader
@ -59,7 +59,7 @@ DragonShrine_MapScripts:
if_equal 2, .RightAnswer
if_equal 3, .RightAnswer
.Question4:
setevent EVENT_DRAGON_SHRINE_QUESTION_4
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
writetext DragonShrineQuestion4Text
buttonsound
loadmenuheader DragonShrineQuestion4_MenuHeader
@ -69,7 +69,7 @@ DragonShrine_MapScripts:
if_equal 2, .WrongAnswer
if_equal 3, .RightAnswer
.Question5:
setevent EVENT_DRAGON_SHRINE_QUESTION_5
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
writetext DragonShrineQuestion5Text
buttonsound
loadmenuheader DragonShrineQuestion5_MenuHeader
@ -79,17 +79,17 @@ DragonShrine_MapScripts:
if_equal 2, .RightAnswer
if_equal 3, .WrongAnswer
.RightAnswer:
checkevent EVENT_DRAGON_SHRINE_QUESTION_5
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
iftrue .PassedTheTest
writetext DragonShrineRightAnswerText
buttonsound
checkevent EVENT_DRAGON_SHRINE_QUESTION_4
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
iftrue .Question5
checkevent EVENT_DRAGON_SHRINE_QUESTION_3
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
iftrue .Question4
checkevent EVENT_DRAGON_SHRINE_QUESTION_2
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
iftrue .Question3
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue .Question2
.WrongAnswer:
closetext
@ -105,15 +105,15 @@ DragonShrine_MapScripts:
closetext
setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
opentext
checkevent EVENT_DRAGON_SHRINE_QUESTION_5
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
iftrue .Question5
checkevent EVENT_DRAGON_SHRINE_QUESTION_4
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
iftrue .Question4
checkevent EVENT_DRAGON_SHRINE_QUESTION_3
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
iftrue .Question3
checkevent EVENT_DRAGON_SHRINE_QUESTION_2
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
iftrue .Question2
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue .Question1
.PassedTheTest:
writetext DragonShrinePassedTestText
@ -188,15 +188,15 @@ DragonShrine_MapScripts:
playsound SFX_ENTER_DOOR
disappear DRAGONSHRINE_CLAIR
waitsfx
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
end
DragonShrineElder1Script:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue .DontGiveDratiniYet
checkevent EVENT_JUST_RECEIVED_DRATINI
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7
iftrue .ReceivedDratini
checkevent EVENT_GOT_DRATINI
iffalse .GiveDratini
@ -219,7 +219,7 @@ DragonShrineElder1Script:
checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
special Special_Dratini
setevent EVENT_GOT_DRATINI
setevent EVENT_JUST_RECEIVED_DRATINI
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_7
writetext DragonShrineSymbolicDragonText
waitbutton
closetext
@ -674,7 +674,7 @@ DragonShrine_MapEvents:
.ObjectEvents:
db 4
object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_GAVE_KURT_APRICORNS
object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_GAVE_KURT_APRICORNS
object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_GAVE_KURT_APRICORNS
object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder1Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder2Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonShrineElder3Script, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR

4
maps/DragonsDenB1F.asm
View File

@ -157,12 +157,12 @@ SilverScript_0x18c97e:
playmusic MUSIC_RIVAL_ENCOUNTER
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue .SilverTalkAgain
writetext SilverText_Training1
waitbutton
closetext
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
special RestartMapMusic
end

4
maps/EcruteakTinTowerEntrance.asm
View File

@ -87,7 +87,7 @@ SageScript_0x98062:
.CheckForClearBell:
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue .AllowedThrough
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue .Event000
checkitem CLEAR_BELL
iftrue .RingClearBell
@ -103,7 +103,7 @@ SageScript_0x98062:
setscene 1
setevent EVENT_RANG_CLEAR_BELL_2
clearevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
end
.AllowedThrough:

44
maps/GoldenrodUnderground.asm
View File

@ -209,21 +209,21 @@ OlderHaircutBrotherScript:
jump .else
.two
setevent EVENT_GAVE_KURT_APRICORNS
clearevent EVENT_RECEIVED_BALLS_FROM_KURT
clearevent EVENT_DRAGON_SHRINE_QUESTION_2
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then
.three
clearevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_RECEIVED_BALLS_FROM_KURT
clearevent EVENT_DRAGON_SHRINE_QUESTION_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then
.else
clearevent EVENT_GAVE_KURT_APRICORNS
clearevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_DRAGON_SHRINE_QUESTION_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then
.then
@ -240,9 +240,9 @@ OlderHaircutBrotherScript:
opentext
writetext UnknownText_0x7c6d8
waitbutton
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x7c2bb
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue UnknownScript_0x7c2c4
jump UnknownScript_0x7c2cd
@ -292,21 +292,21 @@ YoungerHaircutBrotherScript:
jump .else
.two
setevent EVENT_GAVE_KURT_APRICORNS
clearevent EVENT_RECEIVED_BALLS_FROM_KURT
clearevent EVENT_DRAGON_SHRINE_QUESTION_2
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then
.three
clearevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_RECEIVED_BALLS_FROM_KURT
clearevent EVENT_DRAGON_SHRINE_QUESTION_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then
.else
clearevent EVENT_GAVE_KURT_APRICORNS
clearevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_DRAGON_SHRINE_QUESTION_2
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
jump .then
.then
@ -323,9 +323,9 @@ YoungerHaircutBrotherScript:
opentext
writetext UnknownText_0x7c82a
waitbutton
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x7c2bb
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue UnknownScript_0x7c2c4
jump UnknownScript_0x7c2cd

20
maps/KurtsHouse.asm
View File

@ -74,7 +74,7 @@ KurtScript_0x18e178:
iffalse .NoRoomForBall
setevent EVENT_KURT_GAVE_YOU_LURE_BALL
.GotLureBall:
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue .WaitForApricorns
checkevent EVENT_GAVE_KURT_RED_APRICORN
iftrue .GiveLevelBall
@ -93,9 +93,9 @@ KurtScript_0x18e178:
checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
iftrue .CanGiveGSBallToKurt
.NoGSBall:
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue .CheckApricorns
checkevent EVENT_DRAGON_SHRINE_QUESTION_2
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
iftrue .CheckApricorns
writetext UnknownText_0x18e6c9
waitbutton
@ -114,9 +114,9 @@ KurtScript_0x18e178:
iftrue .AskApricorn
checkitem PNK_APRICORN
iftrue .AskApricorn
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue .ThatTurnedOutGreat
checkevent EVENT_DRAGON_SHRINE_QUESTION_2
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
iftrue .IMakeBallsFromApricorns
closetext
end
@ -130,7 +130,7 @@ KurtScript_0x18e178:
.AskApricorn:
writetext UnknownText_0x18e736
buttonsound
setevent EVENT_DRAGON_SHRINE_QUESTION_2
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
special Special_SelectApricornForKurt
if_equal FALSE, .Cancel
if_equal BLU_APRICORN, .Blu
@ -168,7 +168,7 @@ KurtScript_0x18e178:
jump .GaveKurtApricorns
.GaveKurtApricorns:
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
setflag ENGINE_KURT_MAKING_BALLS
.WaitForApricorns:
writetext UnknownText_0x18e779
@ -183,7 +183,7 @@ KurtScript_0x18e178:
end
._ThatTurnedOutGreat:
setevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
.ThatTurnedOutGreat:
writetext UnknownText_0x18e82a
waitbutton
@ -347,9 +347,9 @@ KurtScript_ImCheckingItNow:
KurtsGranddaughter1:
faceplayer
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue KurtsGranddaughter2Subscript
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue KurtsGranddaughterFunScript
checkevent EVENT_FOREST_IS_RESTLESS
iftrue .Lonely

14
maps/OlivinePort.asm
View File

@ -27,14 +27,14 @@ OlivinePort_MapScripts:
applymovement PLAYER, MovementData_0x74a32
appear OLIVINEPORT_SAILOR1
setscene 0
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
blackoutmod OLIVINE_CITY
end
SailorScript_0x748c0:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x74919
writetext UnknownText_0x74a55
waitbutton
@ -76,9 +76,9 @@ UnknownScript_0x74919:
UnknownScript_0x7491f:
spriteface OLIVINEPORT_SAILOR3, RIGHT
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x7498b
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue UnknownScript_0x7498b
spriteface PLAYER, LEFT
opentext
@ -101,7 +101,7 @@ UnknownScript_0x7494e:
writetext UnknownText_0x74b11
waitbutton
closetext
setevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
applymovement PLAYER, MovementData_0x74a37
jump SailorScript_0x748c0
@ -145,7 +145,7 @@ UnknownScript_0x74992:
SailorScript_0x7499c:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x74919
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x749c0
@ -166,7 +166,7 @@ UnknownScript_0x749c0:
writetext UnknownText_0x74b11
waitbutton
closetext
setevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
checkcode VAR_FACING
if_equal RIGHT, UnknownScript_0x749e5
applymovement PLAYER, MovementData_0x74a3f

10
maps/PlayersHouse1F.asm
View File

@ -21,13 +21,13 @@ PlayersHouse1F_MapScripts:
end
UnknownScript_0x7a4d8:
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
UnknownScript_0x7a4db:
playmusic MUSIC_MOM
showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15
spriteface PLAYER, LEFT
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x7a4f2
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc
jump UnknownScript_0x7a4f6
@ -82,9 +82,9 @@ UnknownScript_0x7a549:
writetext UnknownText_0x7a850
waitbutton
closetext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x7a55d
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iffalse UnknownScript_0x7a564
jump UnknownScript_0x7a56b
@ -114,7 +114,7 @@ UnknownScript_0x7a57e:
MomScript_0x7a582:
faceplayer
setevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
checkscene
iffalse UnknownScript_0x7a572
opentext

2
maps/PlayersHouse2F.asm
View File

@ -19,7 +19,7 @@ PlayersHouse2F_MapScripts:
.InitializeRoom:
special Special_ToggleDecorationsVisibility
setevent EVENT_IN_YOUR_ROOM
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
checkevent EVENT_INITIALIZED_EVENTS
iftrue .SkipInitialization
jumpstd initializeevents

4
maps/Pokecenter2F.asm
View File

@ -21,7 +21,7 @@ Pokecenter2F_MapScripts:
special Special_CheckMysteryGift
if_equal $0, .Scene0Done
clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue .Scene0Done
priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy
@ -50,7 +50,7 @@ Pokecenter2F_MapScripts:
Pokecenter2F_AppearMysteryGiftDeliveryGuy:
appear POKECENTER2F_OFFICER
setevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
end
Script_TradeCenterClosed:

20
maps/Route36NationalParkGate.asm
View File

@ -308,7 +308,7 @@ Route36ParkGate_DayToText:
YoungsterScript_0x6ad06:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x6ad14
writetext UnknownText_0x6b399
waitbutton
@ -324,7 +324,7 @@ UnknownScript_0x6ad14:
YoungsterScript_0x6ad1a:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x6ad28
writetext UnknownText_0x6b40f
waitbutton
@ -340,7 +340,7 @@ UnknownScript_0x6ad28:
RockerScript_0x6ad2e:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x6ad3c
writetext UnknownText_0x6b462
waitbutton
@ -356,7 +356,7 @@ UnknownScript_0x6ad3c:
PokefanMScript_0x6ad42:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x6ad50
writetext UnknownText_0x6b4da
waitbutton
@ -372,7 +372,7 @@ UnknownScript_0x6ad50:
YoungsterScript_0x6ad56:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x6ad64
writetext UnknownText_0x6b54e
waitbutton
@ -388,7 +388,7 @@ UnknownScript_0x6ad64:
YoungsterScript_0x6ad6a:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x6ad78
writetext UnknownText_0x6b5b0
waitbutton
@ -404,7 +404,7 @@ UnknownScript_0x6ad78:
LassScript_0x6ad7e:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x6ad8c
writetext UnknownText_0x6b64b
waitbutton
@ -420,7 +420,7 @@ UnknownScript_0x6ad8c:
YoungsterScript_0x6ad92:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x6ada0
writetext UnknownText_0x6b6b8
waitbutton
@ -436,7 +436,7 @@ UnknownScript_0x6ada0:
YoungsterScript_0x6ada6:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x6adb4
writetext UnknownText_0x6b71b
waitbutton
@ -452,7 +452,7 @@ UnknownScript_0x6adb4:
YoungsterScript_0x6adba:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x6adc8
writetext UnknownText_0x6b76f
waitbutton

4
maps/TimeCapsule.asm
View File

@ -72,5 +72,5 @@ TimeCapsule_MapEvents:
.ObjectEvents:
db 2
object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS
object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT
object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x19351a, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2

4
maps/TradeCenter.asm
View File

@ -72,5 +72,5 @@ TradeCenter_MapEvents:
.ObjectEvents:
db 2
object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT
object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2

14
maps/VermilionPort.asm
View File

@ -33,14 +33,14 @@ VermilionPort_MapScripts:
setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
setevent EVENT_FAST_SHIP_FIRST_TIME
setevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
blackoutmod VERMILION_CITY
end
SailorScript_0x74dc4:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x74e1a
writetext UnknownText_0x74f06
waitbutton
@ -80,9 +80,9 @@ UnknownScript_0x74e1a:
UnknownScript_0x74e20:
spriteface VERMILIONPORT_SAILOR2, RIGHT
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x74e86
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue UnknownScript_0x74e86
spriteface PLAYER, LEFT
opentext
@ -102,7 +102,7 @@ UnknownScript_0x74e20:
writetext UnknownText_0x74fc2
waitbutton
closetext
setevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
applymovement PLAYER, MovementData_0x74ef8
jump SailorScript_0x74dc4
@ -146,7 +146,7 @@ UnknownScript_0x74e8d:
SailorScript_0x74e97:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x74e1a
checkcode VAR_WEEKDAY
if_equal MONDAY, UnknownScript_0x74eda
@ -164,7 +164,7 @@ SailorScript_0x74e97:
writetext UnknownText_0x74fc2
waitbutton
closetext
setevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
applymovement PLAYER, MovementData_0x74efe
jump SailorScript_0x74dc4