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

More label updates, moved predefs to new file

Browse Source 
Also named most of the engine and event flag constants.
This commit is contained in:
PikalaxALT
2015-07-20 03:51:52 -04:00
parent 94129b6b45
commit bef792f2d2
90 changed files with 1926 additions and 1899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
maps/BattleTowerBattleRoom.asm
View File

@@ -31,7 +31,7 @@ UnknownScript_0x9f425:
keeptextopen
loadmovesprites
special Function170215
special Function8c084
special FadeBlackBGMap
reloadmap
if_not_equal $0, UnknownScript_0x9f4c2
copybytetovar wcf64
@@ -46,10 +46,10 @@ UnknownScript_0x9f425:
closetext
loadmovesprites
playmusic MUSIC_HEAL
special Function8c084
special Function1047eb
special FadeBlackBGMap
special LoadMapPalettes
pause 60
special Function8c079
special FadeInBGMap
special RestartMapMusic
loadfont
writetext UnknownText_0x9eebc
@@ -73,7 +73,7 @@ UnknownScript_0x9f483:
special Function170687
playsound SFX_SAVE
waitbutton
special Function8c084
special FadeBlackBGMap
special Reset
UnknownScript_0x9f4a3:
writetext UnknownText_0x9efbf
@@ -84,7 +84,7 @@ UnknownScript_0x9f4a3:
writebyte $6
special Function170687
loadmovesprites
special Function8c084
special FadeBlackBGMap
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
loadfont
jump UnknownScript_0x9e4b0

10
maps/BillsHouse.asm
View File

@@ -8,7 +8,7 @@ BillsHouse_MapScriptHeader:
GrampsScript_0x189538:
faceplayer
loadfont
checkevent EVENT_000
checkevent EVENT_GAVE_KURT_APRICORNS
iftrue UnknownScript_0x1896ba
checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
iftrue UnknownScript_0x1896c0
@@ -120,7 +120,7 @@ UnknownScript_0x18963b:
verbosegiveitem EVERSTONE, 1
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
setevent EVENT_000
setevent EVENT_GAVE_KURT_APRICORNS
loadmovesprites
end
@@ -131,7 +131,7 @@ UnknownScript_0x189652:
verbosegiveitem LEAF_STONE, 1
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
setevent EVENT_000
setevent EVENT_GAVE_KURT_APRICORNS
loadmovesprites
end
@@ -142,7 +142,7 @@ UnknownScript_0x189669:
verbosegiveitem WATER_STONE, 1
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
setevent EVENT_000
setevent EVENT_GAVE_KURT_APRICORNS
loadmovesprites
end
@@ -153,7 +153,7 @@ UnknownScript_0x189680:
verbosegiveitem FIRE_STONE, 1
iffalse UnknownScript_0x1896cc
setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
setevent EVENT_000
setevent EVENT_GAVE_KURT_APRICORNS
loadmovesprites
end

4
maps/BluesHouse.asm
View File

@@ -30,10 +30,10 @@ UnknownScript_0x19b0de:
writetext UnknownText_0x19b266
closetext
loadmovesprites
special Function8c084
special FadeBlackBGMap
playmusic MUSIC_HEAL
pause 60
special Function8c079
special FadeInBGMap
special RestartMapMusic
loadfont
writetext UnknownText_0x19b296

6
maps/CharcoalKiln.asm
View File

@@ -163,6 +163,6 @@ CharcoalKiln_MapEventHeader:
; people-events
db 3
person_event SPRITE_BLACK_BELT, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_6F7
person_event SPRITE_YOUNGSTER, 7, 9, OW_DOWN | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_6F6
person_event SPRITE_MOLTRES, 10, 9, OW_UP | $12, $22, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CharcoalKilnFarfetchd, EVENT_6F5
person_event SPRITE_BLACK_BELT, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
person_event SPRITE_YOUNGSTER, 7, 9, OW_DOWN | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
person_event SPRITE_MOLTRES, 10, 9, OW_UP | $12, $22, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D

4
maps/Colosseum.asm
View File

@@ -83,5 +83,5 @@ Colosseum_MapEventHeader:
; people-events
db 2
person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000
person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001
person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT

10
maps/CopycatsHouse2F.asm
View File

@@ -41,7 +41,7 @@ Copycat:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
.Part2
special Function14209
special RunCallback_04
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .Part7
loadfont
@@ -65,7 +65,7 @@ Copycat:
.Part6
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
special Function14209
special RunCallback_04
loadfont
writetext UnknownText_0x18b028
closetext
@@ -94,7 +94,7 @@ Copycat:
.Part11
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
special Function14209
special RunCallback_04
loadfont
writetext UnknownText_0x18b116
closetext
@@ -137,7 +137,7 @@ Copycat:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
.Part17
special Function14209
special RunCallback_04
loadfont
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Part18
@@ -159,7 +159,7 @@ Copycat:
.Part21
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
special Function14209
special RunCallback_04
loadfont
writetext UnknownText_0x18b2f5
closetext

44
maps/DragonShrine.asm
View File

@@ -23,7 +23,7 @@ DragonShrineTestScript:
writetext UnknownText_0x18d2ea
keeptextopen
.Question1:
setevent EVENT_001
setevent EVENT_RECEIVED_BALLS_FROM_KURT
writetext UnknownText_0x18d3bc
keeptextopen
loadmenudata MenuDataHeader_0x18d215
@@ -35,7 +35,7 @@ DragonShrineTestScript:
end
.Question2:
setevent EVENT_002
setevent EVENT_DRAGON_SHRINE_QUESTION_2
writetext UnknownText_0x18d3d3
keeptextopen
loadmenudata MenuDataHeader_0x18d234
@@ -45,7 +45,7 @@ DragonShrineTestScript:
if_equal $2, .RightAnswer
if_equal $3, .WrongAnswer
.Question3:
setevent EVENT_003
setevent EVENT_DRAGON_SHRINE_QUESTION_3
writetext UnknownText_0x18d3f3
keeptextopen
loadmenudata MenuDataHeader_0x18d258
@@ -55,7 +55,7 @@ DragonShrineTestScript:
if_equal $2, .RightAnswer
if_equal $3, .RightAnswer
.Question4:
setevent EVENT_004
setevent EVENT_DRAGON_SHRINE_QUESTION_4
writetext UnknownText_0x18d420
keeptextopen
loadmenudata MenuDataHeader_0x18d283
@@ -65,7 +65,7 @@ DragonShrineTestScript:
if_equal $2, .WrongAnswer
if_equal $3, .RightAnswer
.Question5:
setevent EVENT_005
setevent EVENT_DRAGON_SHRINE_QUESTION_5
writetext UnknownText_0x18d44a
keeptextopen
loadmenudata MenuDataHeader_0x18d2a5
@@ -75,17 +75,17 @@ DragonShrineTestScript:
if_equal $2, .RightAnswer
if_equal $3, .WrongAnswer
.RightAnswer:
checkevent EVENT_005
checkevent EVENT_DRAGON_SHRINE_QUESTION_5
iftrue .PassedTheTest
writetext UnknownText_0x18d82d
keeptextopen
checkevent EVENT_004
checkevent EVENT_DRAGON_SHRINE_QUESTION_4
iftrue .Question5
checkevent EVENT_003
checkevent EVENT_DRAGON_SHRINE_QUESTION_3
iftrue .Question4
checkevent EVENT_002
checkevent EVENT_DRAGON_SHRINE_QUESTION_2
iftrue .Question3
checkevent EVENT_001
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
iftrue .Question2
.WrongAnswer:
loadmovesprites
@@ -101,15 +101,15 @@ DragonShrineTestScript:
loadmovesprites
setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
loadfont
checkevent EVENT_005
checkevent EVENT_DRAGON_SHRINE_QUESTION_5
iftrue .Question5
checkevent EVENT_004
checkevent EVENT_DRAGON_SHRINE_QUESTION_4
iftrue .Question4
checkevent EVENT_003
checkevent EVENT_DRAGON_SHRINE_QUESTION_3
iftrue .Question3
checkevent EVENT_002
checkevent EVENT_DRAGON_SHRINE_QUESTION_2
iftrue .Question2
checkevent EVENT_001
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
iftrue .Question1
.PassedTheTest:
writetext UnknownText_0x18d47c
@@ -184,15 +184,15 @@ DragonShrineTestScript:
playsound SFX_ENTER_DOOR
disappear $5
waitbutton
setevent EVENT_000
setevent EVENT_GAVE_KURT_APRICORNS
end
ElderScript_0x18d1a5:
faceplayer
loadfont
checkevent EVENT_000
checkevent EVENT_GAVE_KURT_APRICORNS
iftrue .DontGiveDratiniYet
checkevent EVENT_006
checkevent EVENT_JUST_RECEIVED_DRATINI
iftrue .ReceivedDratini
checkevent EVENT_GOT_DRATINI
iffalse .GiveDratini
@@ -215,7 +215,7 @@ ElderScript_0x18d1a5:
checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
special SpecialDratini
setevent EVENT_GOT_DRATINI
setevent EVENT_006
setevent EVENT_JUST_RECEIVED_DRATINI
writetext UnknownText_0x18d6ca
closetext
loadmovesprites
@@ -681,7 +681,7 @@ DragonShrine_MapEventHeader:
; people-events
db 4
person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000
person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000
person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000
person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS
person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS
person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS
person_event SPRITE_CLAIR, 12, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR

4
maps/DragonsDenB1F.asm
View File

@@ -148,12 +148,12 @@ SilverScript_0x18c97e:
playmusic MUSIC_RIVAL_ENCOUNTER
faceplayer
loadfont
checkevent EVENT_000
checkevent EVENT_GAVE_KURT_APRICORNS
iftrue UnknownScript_0x18c995
writetext UnknownText_0x18cc83
closetext
loadmovesprites
setevent EVENT_000
setevent EVENT_GAVE_KURT_APRICORNS
special RestartMapMusic
end

2
maps/EcruteakGym.asm
View File

@@ -84,7 +84,7 @@ UnknownScript_0x99dc6:
follow $0, $8
applymovement $0, MovementData_0x99e5f
stopfollow
special Function8c084
special FadeBlackBGMap
playsound SFX_ENTER_DOOR
waitbutton
warp GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY, $6, $1b

4
maps/EcruteakHouse.asm
View File

@@ -86,7 +86,7 @@ SageScript_0x98062:
.CheckForClearBell:
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue .AllowedThrough
checkevent EVENT_000
checkevent EVENT_GAVE_KURT_APRICORNS
iftrue .Event000
checkitem CLEAR_BELL
iftrue .RingClearBell
@@ -102,7 +102,7 @@ SageScript_0x98062:
dotrigger $1
setevent EVENT_RANG_CLEAR_BELL_2
clearevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_000
setevent EVENT_GAVE_KURT_APRICORNS
end
.AllowedThrough:

54
maps/FastShip1F.asm
View File

@@ -3,24 +3,24 @@ FastShip1F_MapScriptHeader:
db 3
; triggers
dw UnknownScript_0x75135, $0000
dw UnknownScript_0x75136, $0000
dw UnknownScript_0x7513a, $0000
dw .Trigger1, $0000
dw .Trigger2, $0000
dw .Trigger3, $0000
; callback count
db 0
UnknownScript_0x75135:
.Trigger1:
end
UnknownScript_0x75136:
priorityjump UnknownScript_0x7513b
.Trigger2:
priorityjump .PriorityJump2
end
UnknownScript_0x7513a:
.Trigger3:
end
UnknownScript_0x7513b:
.PriorityJump2:
applymovement $2, MovementData_0x7520e
applymovement $0, MovementData_0x75217
applymovement $2, MovementData_0x75211
@@ -28,21 +28,21 @@ UnknownScript_0x7513b:
playsound SFX_BOAT
earthquake 30
blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
clearevent EVENT_031
checkevent EVENT_030
iftrue UnknownScript_0x7515d
clearevent EVENT_FAST_SHIP_HAS_ARRIVED
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue .Vermilion
dotrigger $2
end
UnknownScript_0x7515d:
.Vermilion:
dotrigger $0
end
SailorScript_0x75160:
faceplayer
loadfont
checkevent EVENT_031
iftrue UnknownScript_0x7517a
checkevent EVENT_FAST_SHIP_HAS_ARRIVED
iftrue .Arrived
checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
iftrue .Olivine
writetext UnknownText_0x7523b
@@ -56,42 +56,42 @@ SailorScript_0x75160:
loadmovesprites
end
UnknownScript_0x7517a:
.Arrived:
checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
iftrue .Olivine
iftrue ._Olivine
writetext UnknownText_0x754be
closetext
loadmovesprites
scall UnknownScript_0x751b8
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
special Function8c084
special FadeBlackBGMap
waitbutton
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1
warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11
end
.Olivine
._Olivine
writetext UnknownText_0x7548d
closetext
loadmovesprites
scall UnknownScript_0x751b8
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
special Function8c084
special FadeBlackBGMap
waitbutton
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1
warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17
end
UnknownScript_0x751b8:
.LetThePlayerOut:
checkcode VAR_FACING
if_equal $3, UnknownScript_0x751c7
if_equal RIGHT, .YouAreFacingRight
applymovement $2, MovementData_0x7520e
applymovement $0, MovementData_0x75235
end
UnknownScript_0x751c7:
.YouAreFacingRight:
applymovement $2, MovementData_0x75214
applymovement $0, MovementData_0x75238
end
@@ -99,14 +99,14 @@ UnknownScript_0x751c7:
SailorScript_0x751d0:
faceplayer
loadfont
checkevent EVENT_030
iftrue UnknownScript_0x751de
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue .Vermilion
writetext UnknownText_0x752f9
closetext
loadmovesprites
end
UnknownScript_0x751de:
.Vermilion:
writetext UnknownText_0x7534f
closetext
loadmovesprites

10
maps/FastShipB1F.asm
View File

@@ -41,16 +41,16 @@ UnknownScript_0x76766:
SailorScript_0x76767:
faceplayer
loadfont
checkevent EVENT_030
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue UnknownScript_0x767a0
checkevent EVENT_033
checkevent EVENT_FAST_SHIP_LAZY_SAILOR
iftrue UnknownScript_0x7678d
checkevent EVENT_034
checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
iftrue UnknownScript_0x76787
writetext UnknownText_0x7687b
closetext
loadmovesprites
setevent EVENT_034
setevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
end
@@ -62,7 +62,7 @@ UnknownScript_0x76787:
UnknownScript_0x7678d:
writetext UnknownText_0x7692e
checkevent EVENT_032
checkevent EVENT_FAST_SHIP_FOUND_GIRL
iffalse UnknownScript_0x76799
closetext
loadmovesprites

2
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@@ -88,7 +88,7 @@ SailorScript_0x755f1:
writetext UnknownText_0x758b1
closetext
loadmovesprites
setevent EVENT_033
setevent EVENT_FAST_SHIP_LAZY_SAILOR
domaptrigger GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $1
checkcode VAR_FACING
if_equal $3, UnknownScript_0x75629

6
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@@ -11,7 +11,7 @@ UnknownScript_0x75ea6:
CaptainScript_0x75ea7:
faceplayer
loadfont
checkevent EVENT_030
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue UnknownScript_0x75eb5
writetext UnknownText_0x76012
closetext
@@ -98,8 +98,8 @@ UnknownScript_0x75f44:
loadfont
writetext UnknownText_0x76645
closetext
setevent EVENT_031
setevent EVENT_032
setevent EVENT_FAST_SHIP_HAS_ARRIVED
setevent EVENT_FAST_SHIP_FOUND_GIRL
loadmovesprites
end

10
maps/FastShipCabins_SW_SSW_NW.asm
View File

@@ -75,11 +75,11 @@ FastShipBed:
writetext FastShipBedText2
closetext
loadmovesprites
checkevent EVENT_031
checkevent EVENT_FAST_SHIP_HAS_ARRIVED
iftrue UnknownScript_0x75ae1
checkevent EVENT_032
checkevent EVENT_FAST_SHIP_FOUND_GIRL
iftrue UnknownScript_0x75ae2
checkevent EVENT_030
checkevent EVENT_FAST_SHIP_FIRST_TIME
iftrue UnknownScript_0x75ae2
UnknownScript_0x75ae1:
end
@@ -93,7 +93,7 @@ UnknownScript_0x75ae2:
writetext FastShipArrivedVermilionText
closetext
loadmovesprites
setevent EVENT_031
setevent EVENT_FAST_SHIP_HAS_ARRIVED
end
UnknownScript_0x75af7:
@@ -101,7 +101,7 @@ UnknownScript_0x75af7:
writetext FastShipArrivedOlivineText
closetext
loadmovesprites
setevent EVENT_031
setevent EVENT_FAST_SHIP_HAS_ARRIVED
end
FastShipCabinsNorthwestCabinTrashcan:

10
maps/FuchsiaGym.asm
View File

@@ -27,7 +27,7 @@ JanineScript_0x195db9:
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
special Function14209
special RunCallback_04
loadfont
writetext UnknownText_0x195feb
playsound SFX_GET_BADGE
@@ -57,7 +57,7 @@ FuschiaGym1Script_0x195e1b:
applymovement $3, MovementData_0x195f27
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
special Function14209
special RunCallback_04
UnknownScript_0x195e2c:
faceplayer
loadfont
@@ -91,7 +91,7 @@ FuschiaGym2Script_0x195e55:
applymovement $4, MovementData_0x195f27
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
special Function14209
special RunCallback_04
UnknownScript_0x195e66:
faceplayer
loadfont
@@ -125,7 +125,7 @@ FuschiaGym3Script_0x195e8f:
applymovement $5, MovementData_0x195f27
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
special Function14209
special RunCallback_04
UnknownScript_0x195ea0:
faceplayer
loadfont
@@ -159,7 +159,7 @@ FuschiaGym4Script_0x195ec9:
applymovement $6, MovementData_0x195f27
faceplayer
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
special Function14209
special RunCallback_04
UnknownScript_0x195eda:
faceplayer
loadfont

4
maps/FuchsiaPokeCenter1F.asm
View File

@@ -29,7 +29,7 @@ JanineImpersonatorScript_0x196462:
applymovement $5, MovementData_0x196486
faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE
special Function14209
special RunCallback_04
loadfont
writetext UnknownText_0x19654e
closetext
@@ -37,7 +37,7 @@ JanineImpersonatorScript_0x196462:
applymovement $5, MovementData_0x196486
faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
special Function14209
special RunCallback_04
end
MovementData_0x196486:

2
maps/GoldenrodCity.asm
View File

@@ -11,7 +11,7 @@ GoldenrodCity_MapScriptHeader:
.FlyPointAndFloria
setflag ENGINE_FLYPOINT_GOLDENROD
setflag ENGINE_16
setflag ENGINE_FLORIA
checkevent EVENT_MET_FLORIA
iftrue .FloriaDone
clearevent EVENT_FLORIA_AT_SUDOWOODO

2
maps/GoldenrodDeptStoreB1F.asm
View File

@@ -12,7 +12,7 @@ GoldenrodDeptStoreB1F_MapScriptHeader:
dbw 5, UnknownScript_0x7d7ac
UnknownScript_0x7d781:
checkevent EVENT_04A
checkevent EVENT_RECEIVED_CARD_KEY
iftrue UnknownScript_0x7d78a
jump UnknownScript_0x7d791

4
maps/GoldenrodFlowerShop.asm
View File

@@ -12,7 +12,7 @@ TeacherScript_0x5535d:
iftrue UnknownScript_0x55399
checkevent EVENT_MET_FLORIA
iffalse UnknownScript_0x5539f
checkevent EVENT_0BA
checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
iffalse UnknownScript_0x5538f
checkflag ENGINE_PLAINBADGE
iffalse UnknownScript_0x5539c
@@ -54,7 +54,7 @@ LassScript_0x553a2:
writetext UnknownText_0x55561
closetext
loadmovesprites
setevent EVENT_0BA
setevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
setevent EVENT_FLORIA_AT_FLOWER_SHOP
clearevent EVENT_FLORIA_AT_SUDOWOODO
end

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