dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve most hardcoded values in map scripts

Browse Source
This commit is contained in:
PikalaxALT
2019-05-16 10:40:51 -04:00
parent 244d73af29
commit 006881415d
37 changed files with 112 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BirthIsland_Exterior/scripts.inc
+3 -3
View File
@@ -91,7 +91,7 @@ EventScript_1652C0:: @ 81652C0
delay 40
waitmoncry
setvar VAR_LAST_TALKED, 2
setvar VAR_0x8004, 410
setvar VAR_0x8004, SPECIES_DEOXYS
setvar VAR_0x8005, 30
setvar VAR_0x8006, 0
special sub_8044838
@@ -112,12 +112,12 @@ EventScript_1652C0:: @ 81652C0
EventScript_16533A:: @ 816533A
setflag FLAG_0x2F7
setvar VAR_0x8004, 410
setvar VAR_0x8004, SPECIES_DEOXYS
goto EventScript_1A9236
end
EventScript_165348:: @ 8165348
setvar VAR_0x8004, 410
setvar VAR_0x8004, SPECIES_DEOXYS
goto EventScript_1A9236
end
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464
CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
lock
faceplayer
setvar VAR_0x4001, 133
setvar VAR_0x4001, SPECIES_EEVEE
givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_16C4A6
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+20 -20
View File
@@ -152,8 +152,8 @@ EventScript_16BED7:: @ 816BED7
end
EventScript_16BF19:: @ 816BF19
setvar VAR_0x8008, 26
setvar VAR_0x8009, 304
setvar VAR_0x8008, ITEM_FRESH_WATER
setvar VAR_0x8009, ITEM_TM16
checkflag FLAG_0x296
goto_if 1, EventScript_16C018
msgbox gUnknown_8195D75
@@ -161,8 +161,8 @@ EventScript_16BF19:: @ 816BF19
end
EventScript_16BF3A:: @ 816BF3A
setvar VAR_0x8008, 27
setvar VAR_0x8009, 308
setvar VAR_0x8008, ITEM_SODA_POP
setvar VAR_0x8009, ITEM_TM20
checkflag FLAG_0x295
goto_if 1, EventScript_16C018
msgbox gUnknown_8195E33
@@ -170,8 +170,8 @@ EventScript_16BF3A:: @ 816BF3A
end
EventScript_16BF5B:: @ 816BF5B
setvar VAR_0x8008, 28
setvar VAR_0x8009, 321
setvar VAR_0x8008, ITEM_LEMONADE
setvar VAR_0x8009, ITEM_TM33
checkflag FLAG_0x294
goto_if 1, EventScript_16C018
msgbox gUnknown_8195EBF
@@ -179,13 +179,13 @@ EventScript_16BF5B:: @ 816BF5B
end
EventScript_16BF7C:: @ 816BF7C
getitemname 0, 32776
getitemname 1, 32777
removeitem 32776, 1
checkitemspace 32777, 1
getitemname 0, VAR_0x8008
getitemname 1, VAR_0x8009
removeitem VAR_0x8008, 1
checkitemspace VAR_0x8009, 1
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_16C002
additem 32777, 1
additem VAR_0x8009, 1
textcolor 3
playfanfare MUS_FANFA1
message Text_195DAD
@@ -193,11 +193,11 @@ EventScript_16BF7C:: @ 816BF7C
waitfanfare
giveitem VAR_0x8009, 1, 8
call EventScript_1A6675
compare_var_to_value VAR_0x8008, 26
compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER
call_if 1, EventScript_16BFDE
compare_var_to_value VAR_0x8008, 27
compare_var_to_value VAR_0x8008, ITEM_SODA_POP
call_if 1, EventScript_16BFEA
compare_var_to_value VAR_0x8008, 28
compare_var_to_value VAR_0x8008, ITEM_LEMONADE
call_if 1, EventScript_16BFF6
release
end
@@ -267,19 +267,19 @@ EventScript_16C045:: @ 816C045
end
EventScript_16C083:: @ 816C083
setvar VAR_0x4000, 26
setvar VAR_0x4000, ITEM_FRESH_WATER
checkmoney 200, 0
goto EventScript_16C0CB
end
EventScript_16C094:: @ 816C094
setvar VAR_0x4000, 27
setvar VAR_0x4000, ITEM_SODA_POP
checkmoney 300, 0
goto EventScript_16C0CB
end
EventScript_16C0A5:: @ 816C0A5
setvar VAR_0x4000, 28
setvar VAR_0x4000, ITEM_LEMONADE
checkmoney 350, 0
goto EventScript_16C0CB
end
@@ -299,7 +299,7 @@ EventScript_16C0C4:: @ 816C0C4
EventScript_16C0CB:: @ 816C0CB
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_16C131
checkitemspace 16384, 1
checkitemspace VAR_0x4000, 1
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_16C13F
compare_var_to_value VAR_0x4001, 0
@@ -309,10 +309,10 @@ EventScript_16C0CB:: @ 816C0CB
compare_var_to_value VAR_0x4001, 2
call_if 1, EventScript_16C0C4
updatemoneybox 0, 0, 0
getitemname 0, 16384
getitemname 0, VAR_0x4000
playse SE_C_PASI
msgbox gUnknown_8196076
additem 16384, 1
additem VAR_0x4000, 1
goto EventScript_16C125
end
data/maps/CeladonCity_GameCorner/scripts.inc
+4 -4
View File
@@ -78,7 +78,7 @@ EventScript_16C734:: @ 816C734
EventScript_16C762:: @ 816C762
updatemoneybox 0, 0, 0
updatecoinsbox 0, 5
playse 248
playse SE_CASHIER
msgbox gUnknown_8196A62
goto EventScript_16C77A
end
@@ -146,7 +146,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
givecoins 10
textcolor 3
msgbox gUnknown_8196B0D
playse 248
playse SE_CASHIER
waitse
setflag FLAG_0x26E
goto EventScript_16C7CA
@@ -210,7 +210,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
givecoins 20
textcolor 3
msgbox gUnknown_8196D47
playse 248
playse SE_CASHIER
waitse
setflag FLAG_0x26F
goto EventScript_16C7CA
@@ -240,7 +240,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
givecoins 20
textcolor 3
msgbox gUnknown_8196DF8
playse 248
playse SE_CASHIER
waitse
setflag FLAG_0x270
goto EventScript_16C7CA
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+21 -21
View File
@@ -49,31 +49,31 @@ EventScript_16CC10:: @ 816CC10
end
EventScript_16CC15:: @ 816CC15
setvar VAR_0x4001, 63
setvar VAR_0x4001, SPECIES_ABRA
setvar VAR_0x4002, 180
goto EventScript_16CC65
end
EventScript_16CC25:: @ 816CC25
setvar VAR_0x4001, 35
setvar VAR_0x4001, SPECIES_CLEFAIRY
setvar VAR_0x4002, 500
goto EventScript_16CC65
end
EventScript_16CC35:: @ 816CC35
setvar VAR_0x4001, 147
setvar VAR_0x4001, SPECIES_DRATINI
setvar VAR_0x4002, 2800
goto EventScript_16CC65
end
EventScript_16CC45:: @ 816CC45
setvar VAR_0x4001, 123
setvar VAR_0x4001, SPECIES_SCYTHER
setvar VAR_0x4002, 5500
goto EventScript_16CC65
end
EventScript_16CC55:: @ 816CC55
setvar VAR_0x4001, 137
setvar VAR_0x4001, SPECIES_PORYGON
setvar VAR_0x4002, 9999
goto EventScript_16CC65
end
@@ -88,17 +88,17 @@ EventScript_16CC65:: @ 816CC65
goto_if 0, EventScript_16CDA5
textcolor 3
copyvar VAR_0x8000, VAR_0x4001
compare_var_to_value VAR_0x8000, 63
compare_var_to_value VAR_0x8000, SPECIES_ABRA
goto_if 1, EventScript_16CCD4
compare_var_to_value VAR_0x8000, 35
compare_var_to_value VAR_0x8000, SPECIES_CLEFAIRY
goto_if 1, EventScript_16CCE9
compare_var_to_value VAR_0x8000, 147
compare_var_to_value VAR_0x8000, SPECIES_DRATINI
goto_if 1, EventScript_16CCFE
compare_var_to_value VAR_0x8000, 123
compare_var_to_value VAR_0x8000, SPECIES_SCYTHER
goto_if 1, EventScript_16CD13
compare_var_to_value VAR_0x8000, 137
compare_var_to_value VAR_0x8000, SPECIES_PORYGON
goto_if 1, EventScript_16CD28
compare_var_to_value VAR_0x8000, 127
compare_var_to_value VAR_0x8000, SPECIES_PINSIR
goto_if 1, EventScript_16CD3D
end
@@ -236,35 +236,35 @@ EventScript_16CE47:: @ 816CE47
end
EventScript_16CEA5:: @ 816CEA5
setvar VAR_0x4001, 301
setvar VAR_0x4001, ITEM_TM13
setvar VAR_0x4002, 4000
getmovename 1, MOVE_ICE_BEAM
goto EventScript_16CF09
end
EventScript_16CEB9:: @ 816CEB9
setvar VAR_0x4001, 311
setvar VAR_0x4001, ITEM_TM23
setvar VAR_0x4002, 3500
getmovename 1, MOVE_IRON_TAIL
goto EventScript_16CF09
end
EventScript_16CECD:: @ 816CECD
setvar VAR_0x4001, 312
setvar VAR_0x4001, ITEM_TM24
setvar VAR_0x4002, 4000
getmovename 1, MOVE_THUNDERBOLT
goto EventScript_16CF09
end
EventScript_16CEE1:: @ 816CEE1
setvar VAR_0x4001, 318
setvar VAR_0x4001, ITEM_TM30
setvar VAR_0x4002, 4500
getmovename 1, MOVE_SHADOW_BALL
goto EventScript_16CF09
end
EventScript_16CEF5:: @ 816CEF5
setvar VAR_0x4001, 323
setvar VAR_0x4001, ITEM_TM35
setvar VAR_0x4002, 4000
getmovename 1, MOVE_FLAMETHROWER
goto EventScript_16CF09
@@ -341,31 +341,31 @@ EventScript_16CFB2:: @ 816CFB2
end
EventScript_16D010:: @ 816D010
setvar VAR_0x4001, 194
setvar VAR_0x4001, ITEM_SMOKE_BALL
setvar VAR_0x4002, 800
goto EventScript_16CF22
end
EventScript_16D020:: @ 816D020
setvar VAR_0x4001, 205
setvar VAR_0x4001, ITEM_MIRACLE_SEED
setvar VAR_0x4002, 1000
goto EventScript_16CF22
end
EventScript_16D030:: @ 816D030
setvar VAR_0x4001, 215
setvar VAR_0x4001, ITEM_CHARCOAL
setvar VAR_0x4002, 1000
goto EventScript_16CF22
end
EventScript_16D040:: @ 816D040
setvar VAR_0x4001, 209
setvar VAR_0x4001, ITEM_MYSTIC_WATER
setvar VAR_0x4002, 1000
goto EventScript_16CF22
end
EventScript_16D050:: @ 816D050
setvar VAR_0x4001, 40
setvar VAR_0x4001, ITEM_YELLOW_FLUTE
setvar VAR_0x4002, 1600
goto EventScript_16CF22
end
data/maps/CeruleanCave_B1F/scripts.inc
+1 -1
View File
@@ -63,7 +63,7 @@ EventScript_162560:: @ 8162560
end
EventScript_162561:: @ 8162561
setvar VAR_0x8004, 150
setvar VAR_0x8004, SPECIES_MEWTWO
goto EventScript_1A9236
EventScript_16256B:: @ 816256B
data/maps/CeruleanCity_House3/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ EventScript_16AA0B:: @ 816AA0B
end
EventScript_16AA15:: @ 816AA15
getspeciesname 0, 32777
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A5A6A
release
end
data/maps/CeruleanCity_House5/scripts.inc
+11 -11
View File
@@ -73,77 +73,77 @@ EventScript_16AEC8:: @ 816AEC8
EventScript_16AF6C:: @ 816AF6C
getitemname 0, ITEM_ENERGY_POWDER
setvar VAR_0x8008, 30
setvar VAR_0x8008, ITEM_ENERGY_POWDER
setvar VAR_0x8009, 50
goto EventScript_16B055
end
EventScript_16AF80:: @ 816AF80
getitemname 0, ITEM_ENERGY_ROOT
setvar VAR_0x8008, 31
setvar VAR_0x8008, ITEM_ENERGY_ROOT
setvar VAR_0x8009, 80
goto EventScript_16B055
end
EventScript_16AF94:: @ 816AF94
getitemname 0, ITEM_HEAL_POWDER
setvar VAR_0x8008, 32
setvar VAR_0x8008, ITEM_HEAL_POWDER
setvar VAR_0x8009, 50
goto EventScript_16B055
end
EventScript_16AFA8:: @ 816AFA8
getitemname 0, ITEM_REVIVAL_HERB
setvar VAR_0x8008, 33
setvar VAR_0x8008, ITEM_REVIVAL_HERB
setvar VAR_0x8009, 300
goto EventScript_16B055
end
EventScript_16AFBC:: @ 816AFBC
getitemname 0, ITEM_PROTEIN
setvar VAR_0x8008, 64
setvar VAR_0x8008, ITEM_PROTEIN
setvar VAR_0x8009, 1000
goto EventScript_16B055
end
EventScript_16AFD0:: @ 816AFD0
getitemname 0, ITEM_IRON
setvar VAR_0x8008, 65
setvar VAR_0x8008, ITEM_IRON
setvar VAR_0x8009, 1000
goto EventScript_16B055
end
EventScript_16AFE4:: @ 816AFE4
getitemname 0, ITEM_CARBOS
setvar VAR_0x8008, 66
setvar VAR_0x8008, ITEM_CARBOS
setvar VAR_0x8009, 1000
goto EventScript_16B055
end
EventScript_16AFF8:: @ 816AFF8
getitemname 0, ITEM_CALCIUM
setvar VAR_0x8008, 67
setvar VAR_0x8008, ITEM_CALCIUM
setvar VAR_0x8009, 1000
goto EventScript_16B055
end
EventScript_16B00C:: @ 816B00C
getitemname 0, ITEM_ZINC
setvar VAR_0x8008, 70
setvar VAR_0x8008, ITEM_ZINC
setvar VAR_0x8009, 1000
goto EventScript_16B055
end
EventScript_16B020:: @ 816B020
getitemname 0, ITEM_HP_UP
setvar VAR_0x8008, 63
setvar VAR_0x8008, ITEM_HP_UP
setvar VAR_0x8009, 1000
goto EventScript_16B055
end
EventScript_16B034:: @ 816B034
getitemname 0, ITEM_PP_UP
setvar VAR_0x8008, 69
setvar VAR_0x8008, ITEM_PP_UP
setvar VAR_0x8009, 3000
goto EventScript_16B055
end
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ EventScript_16E45B:: @ 816E45B
end
EventScript_16E465:: @ 816E465
getspeciesname 0, 32777
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A59C6
release
end
data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+2 -2
View File
@@ -33,7 +33,7 @@ EventScript_16E31C:: @ 816E31C
end
EventScript_16E326:: @ 816E326
getspeciesname 0, 32777
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A5A6A
release
end
@@ -81,7 +81,7 @@ EventScript_16E3BC:: @ 816E3BC
end
EventScript_16E3C6:: @ 816E3C6
getspeciesname 0, 32777
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A5B18
release
end
data/maps/FourIsland_PokemonDayCare/scripts.inc
+2 -2
View File
@@ -36,7 +36,7 @@ EventScript_171993:: @ 8171993
goto_if 1, EventScript_171A24
specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
waitse
playmoncry 32773, 0
playmoncry VAR_0x8005, 0
msgbox gUnknown_81BF860
waitmoncry
special StoreSelectedPokemonInDaycare
@@ -137,7 +137,7 @@ EventScript_171B05:: @ 8171B05
playse SE_T_KAMI2
msgbox gUnknown_81BFA67
waitse
playmoncry 32781, 0
playmoncry VAR_RESULT, 0
textcolor 3
msgbox gUnknown_81BFA85
call EventScript_1A6675
data/maps/FuchsiaCity/scripts.inc
+7 -7
View File
@@ -75,7 +75,7 @@ FuchsiaCity_EventScript_166E07:: @ 8166E07
FuchsiaCity_EventScript_166E1F:: @ 8166E1F
lockall
setvar VAR_0x8004, 113
setvar VAR_0x8004, SPECIES_CHANSEY
special sub_80CBDCC
drawmonpic SPECIES_CHANSEY, 10, 3
msgbox gUnknown_81807A9
@@ -85,7 +85,7 @@ FuchsiaCity_EventScript_166E1F:: @ 8166E1F
FuchsiaCity_EventScript_166E38:: @ 8166E38
lockall
setvar VAR_0x8004, 100
setvar VAR_0x8004, SPECIES_VOLTORB
special sub_80CBDCC
drawmonpic SPECIES_VOLTORB, 10, 3
msgbox gUnknown_81807D9
@@ -95,7 +95,7 @@ FuchsiaCity_EventScript_166E38:: @ 8166E38
FuchsiaCity_EventScript_166E51:: @ 8166E51
lockall
setvar VAR_0x8004, 115
setvar VAR_0x8004, SPECIES_KANGASKHAN
special sub_80CBDCC
drawmonpic SPECIES_KANGASKHAN, 10, 3
msgbox gUnknown_8180806
@@ -105,7 +105,7 @@ FuchsiaCity_EventScript_166E51:: @ 8166E51
FuchsiaCity_EventScript_166E6A:: @ 8166E6A
lockall
setvar VAR_0x8004, 79
setvar VAR_0x8004, SPECIES_SLOWPOKE
special sub_80CBDCC
drawmonpic SPECIES_SLOWPOKE, 10, 3
msgbox gUnknown_8180859
@@ -115,7 +115,7 @@ FuchsiaCity_EventScript_166E6A:: @ 8166E6A
FuchsiaCity_EventScript_166E83:: @ 8166E83
lockall
setvar VAR_0x8004, 131
setvar VAR_0x8004, SPECIES_LAPRAS
special sub_80CBDCC
drawmonpic SPECIES_LAPRAS, 10, 3
msgbox gUnknown_8180887
@@ -127,7 +127,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C
lockall
checkflag FLAG_0x272
goto_if 1, EventScript_166EBE
setvar VAR_0x8004, 140
setvar VAR_0x8004, SPECIES_KABUTO
special sub_80CBDCC
drawmonpic SPECIES_KABUTO, 10, 3
msgbox gUnknown_81808FA
@@ -136,7 +136,7 @@ FuchsiaCity_EventScript_166E9C:: @ 8166E9C
end
EventScript_166EBE:: @ 8166EBE
setvar VAR_0x8004, 138
setvar VAR_0x8004, SPECIES_OMANYTE
special sub_80CBDCC
drawmonpic SPECIES_OMANYTE, 10, 3
msgbox gUnknown_81808AE
data/maps/FuchsiaCity_House1/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6
FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF
lock
faceplayer
setvar VAR_0x8004, 13
setvar VAR_0x8004, 13 @ FAMECHECKER_BILL
setvar VAR_0x8005, 2
special SetFlavorTextFlagFromSpecialVars
msgbox gUnknown_8198C1F
data/maps/LavenderTown_House2/scripts.inc
+1 -1
View File
@@ -28,7 +28,7 @@ EventScript_16B2AA:: @ 816B2AA
EventScript_16B2B4:: @ 816B2B4
specialvar VAR_RESULT, sub_80CAD54
compare_var_to_value VAR_RESULT, 412
compare_var_to_value VAR_RESULT, SPECIES_EGG
goto_if 1, EventScript_16B307
special TV_CopyNicknameToStringVar1AndEnsureTerminated
special TV_CheckMonOTIDEqualsPlayerID
data/maps/MtEmber_Summit/scripts.inc
+1 -1
View File
@@ -61,6 +61,6 @@ EventScript_163B96:: @ 8163B96
end
EventScript_163B9F:: @ 8163B9F
setvar VAR_0x8004, 146
setvar VAR_0x8004, SPECIES_MOLTRES
goto EventScript_1A9236
end
data/maps/NavelRock_Base/scripts.inc
+3 -3
View File
@@ -60,7 +60,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134
playmoncry SPECIES_LUGIA, 2
waitmoncry
delay 20
setvar VAR_0x8004, 249
setvar VAR_0x8004, SPECIES_LUGIA
setvar VAR_0x8005, 70
setvar VAR_0x8006, 0
special sub_8044838
@@ -81,11 +81,11 @@ NavelRock_Base_EventScript_165134:: @ 8165134
EventScript_1651D9:: @ 81651D9
setflag FLAG_0x2F5
setvar VAR_0x8004, 249
setvar VAR_0x8004, SPECIES_LUGIA
goto EventScript_1A9236
end
EventScript_1651E7:: @ 81651E7
setvar VAR_0x8004, 249
setvar VAR_0x8004, SPECIES_LUGIA
goto EventScript_1A9236
end
data/maps/NavelRock_Summit/scripts.inc
+3 -3
View File
@@ -64,7 +64,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
applymovement 1, Movement_1650D7
waitmovement 0
special RemoveScriptFieldObject
setvar VAR_0x8004, 250
setvar VAR_0x8004, SPECIES_HO_OH
setvar VAR_0x8005, 70
setvar VAR_0x8006, 0
special sub_8044838
@@ -86,12 +86,12 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
EventScript_1650B4:: @ 81650B4
setflag FLAG_0x2F6
setvar VAR_0x8004, 250
setvar VAR_0x8004, SPECIES_HO_OH
goto EventScript_1A9236
end
EventScript_1650C2:: @ 81650C2
setvar VAR_0x8004, 250
setvar VAR_0x8004, SPECIES_HO_OH
goto EventScript_1A9236
end
data/maps/PalletTown_GarysHouse/scripts.inc
+1 -1
View File
@@ -64,7 +64,7 @@ EventScript_168DB9:: @ 8168DB9
compare_var_to_value VAR_0x8004, 6
goto_if 4, EventScript_168E3C
specialvar VAR_RESULT, sub_80CAD54
compare_var_to_value VAR_RESULT, 412
compare_var_to_value VAR_RESULT, SPECIES_EGG
goto_if 1, EventScript_168E32
msgbox gUnknown_818D8CC
closemessage
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+1 -1
View File
@@ -1260,7 +1260,7 @@ EventScript_169D2F:: @ 8169D2F
msgbox gUnknown_818DD34
removeobject VAR_0x4004
textcolor 3
getspeciesname 0, 16387
getspeciesname 0, VAR_0x4003
message Text_18DD52
waitmessage
playfanfare BGM_FRLG_ME_KEYITEM
data/maps/PewterCity_Museum_1F/scripts.inc
+3 -3
View File
@@ -87,7 +87,7 @@ EventScript_16A402:: @ 816A402
call_if 1, EventScript_16A460
compare_var_to_value VAR_0x4001, 2
call_if 1, EventScript_16A46B
playse 248
playse SE_CASHIER
takemoney 50, 0
updatemoneybox 0, 0, 0
waitse
@@ -187,7 +187,7 @@ PewterCity_Museum_1F_EventScript_16A509:: @ 816A509
PewterCity_Museum_1F_EventScript_16A512:: @ 816A512
lockall
setvar VAR_0x8004, 142
setvar VAR_0x8004, SPECIES_AERODACTYL
setvar VAR_0x8005, 10
setvar VAR_0x8006, 3
special sub_809D504
@@ -198,7 +198,7 @@ PewterCity_Museum_1F_EventScript_16A512:: @ 816A512
PewterCity_Museum_1F_EventScript_16A532:: @ 816A532
lockall
setvar VAR_0x8004, 141
setvar VAR_0x8004, SPECIES_KABUTOPS
setvar VAR_0x8005, 10
setvar VAR_0x8006, 3
special sub_809D504
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+1 -1
View File
@@ -88,7 +88,7 @@ EventScript_162B76:: @ 8162B76
waitmovement 0
delay 25
specialvar VAR_RESULT, ScrSpecial_GetStarter
getspeciesname 0, 32781
getspeciesname 0, VAR_RESULT
msgbox gUnknown_8178FCF
applymovement 2, Movement_1A75EB
applymovement 1, Movement_1A75E7
data/maps/PowerPlant/scripts.inc
+1 -1
View File
@@ -74,7 +74,7 @@ EventScript_16381B:: @ 816381B
end
EventScript_163824:: @ 8163824
setvar VAR_0x8004, 145
setvar VAR_0x8004, SPECIES_ZAPDOS
goto EventScript_1A9236
end
data/maps/Route11_EastEntrance_2F/scripts.inc
+1 -1
View File
@@ -46,7 +46,7 @@ EventScript_16FDB6:: @ 816FDB6
end
EventScript_16FDC0:: @ 816FDC0
getspeciesname 0, 32777
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A59C6
release
end
data/maps/Route12_FishingHouse/scripts.inc
+1 -1
View File
@@ -35,7 +35,7 @@ EventScript_16FF7F:: @ 816FF7F
compare_var_to_value VAR_RESULT, 2
goto_if 1, EventScript_1A7AE0
special sub_8112364
setvar VAR_0x8004, 129
setvar VAR_0x8004, SPECIES_MAGIKARP
specialvar VAR_RESULT, sub_80CC48C
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_16FFF5
data/maps/Route15_WestEntrance_2F/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ Route15_WestEntrance_2F_EventScript_170093:: @ 8170093
delay 20
waitbuttonpress
erasemonpic
setvar VAR_0x8004, 144
setvar VAR_0x8004, SPECIES_ARTICUNO
special sub_80CBDCC
releaseall
end
data/maps/Route18_EastEntrance_2F/scripts.inc
+1 -1
View File
@@ -37,7 +37,7 @@ EventScript_1704D8:: @ 81704D8
end
EventScript_1704E2:: @ 81704E2
getspeciesname 0, 32777
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A59C6
release
end
data/maps/Route25_SeaCottage/scripts.inc
+4 -4
View File
@@ -270,7 +270,7 @@ EventScript_17082B:: @ 817082B
drawmonpic SPECIES_EEVEE, 10, 3
waitbuttonpress
erasemonpic
setvar VAR_0x8004, 133
setvar VAR_0x8004, SPECIES_EEVEE
special sub_80CBDCC
goto EventScript_1707D8
end
@@ -279,7 +279,7 @@ EventScript_170840:: @ 8170840
drawmonpic SPECIES_FLAREON, 10, 3
waitbuttonpress
erasemonpic
setvar VAR_0x8004, 136
setvar VAR_0x8004, SPECIES_FLAREON
special sub_80CBDCC
goto EventScript_1707D8
end
@@ -288,7 +288,7 @@ EventScript_170855:: @ 8170855
drawmonpic SPECIES_JOLTEON, 10, 3
waitbuttonpress
erasemonpic
setvar VAR_0x8004, 135
setvar VAR_0x8004, SPECIES_JOLTEON
special sub_80CBDCC
goto EventScript_1707D8
end
@@ -297,7 +297,7 @@ EventScript_17086A:: @ 817086A
drawmonpic SPECIES_VAPOREON, 10, 3
waitbuttonpress
erasemonpic
setvar VAR_0x8004, 134
setvar VAR_0x8004, SPECIES_VAPOREON
special sub_80CBDCC
goto EventScript_1707D8
end
data/maps/Route2_House/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ EventScript_16F65C:: @ 816F65C
end
EventScript_16F666:: @ 816F666
getspeciesname 0, 32777
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A59C6
release
end
data/maps/SSAnne_2F_Room1/scripts.inc
+1 -1
View File
@@ -6,7 +6,7 @@ SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97
faceplayer
message Text_173CE3
waitmessage
setvar VAR_0x8004, 143
setvar VAR_0x8004, SPECIES_SNORLAX
special sub_80CBDCC
drawmonpic SPECIES_SNORLAX, 10, 3
waitbuttonpress
data/maps/SaffronCity_Dojo/scripts.inc
+2 -2
View File
@@ -23,7 +23,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00
checkflag FLAG_0x278
goto_if 1, EventScript_16EC3C
drawmonpic SPECIES_HITMONLEE, 10, 3
setvar VAR_0x4001, 106
setvar VAR_0x4001, SPECIES_HITMONLEE
applymovement 5, Movement_1A75E9
waitmovement 0
textcolor 0
@@ -46,7 +46,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46
checkflag FLAG_0x278
goto_if 1, EventScript_16EC3C
drawmonpic SPECIES_HITMONCHAN, 10, 3
setvar VAR_0x4001, 107
setvar VAR_0x4001, SPECIES_HITMONCHAN
applymovement 5, Movement_1A75E9
waitmovement 0
textcolor 0
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -1
View File
@@ -201,7 +201,7 @@ EventScript_163217:: @ 8163217
end
EventScript_163218:: @ 8163218
setvar VAR_0x8004, 144
setvar VAR_0x8004, SPECIES_ARTICUNO
goto EventScript_1A9236
EventScript_163222:: @ 8163222
data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+2 -2
View File
@@ -5,7 +5,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
lock
checkflag FLAG_0x002
goto_if 1, EventScript_172211
playbgm 267, 0
playbgm BGM_FRLG_CHANSEY_DANCE, 0
applymovement 1, Movement_172231
waitmovement 0
fadedefaultbgm
@@ -23,7 +23,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
compare_var_to_value VAR_FACING, 1
call_if 5, EventScript_172206
delay 30
playbgm 267, 0
playbgm BGM_FRLG_CHANSEY_DANCE, 0
applymovement 255, Movement_172231
waitmovement 0
fadedefaultbgm
data/maps/SilphCo_7F/scripts.inc
+1 -1
View File
@@ -133,7 +133,7 @@ SilphCo_7F_EventScript_161AC8:: @ 8161AC8
checkflag FLAG_0x246
goto_if 1, EventScript_161B8D
msgbox gUnknown_8176266
setvar VAR_0x4001, 131
setvar VAR_0x4001, SPECIES_LAPRAS
givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_161B12
data/maps/SixIsland_WaterPath_House1/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
compare_var_to_value VAR_RESULT, 2
goto_if 1, EventScript_1A7AE0
special sub_8112364
setvar VAR_0x8004, 214
setvar VAR_0x8004, SPECIES_HERACROSS
specialvar VAR_RESULT, sub_80CC48C
compare_var_to_value VAR_RESULT, 0
goto_if 1, EventScript_1720E5
data/maps/UndergroundPath_NorthEntrance/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ EventScript_160E93:: @ 8160E93
end
EventScript_160E9D:: @ 8160E9D
getspeciesname 0, 32777
getspeciesname 0, VAR_0x8009
msgbox gUnknown_81A5B18
release
end
data/maps/VermilionCity_PokemonFanClub/scripts.inc
+1 -1
View File
@@ -155,7 +155,7 @@ EventScript_16B631:: @ 816B631
end
EventScript_16B63B:: @ 816B63B
getspeciesname 0, 32777
getspeciesname 0, VAR_0x8009
msgbox gUnknown_8194A0D
release
end
include/constants/songs.h
+3
View File
@@ -250,6 +250,8 @@
#define SE_W287B 245
#define SE_W114 246
#define SE_W063B 247
#define SE_CASHIER 248
#define MUS_ME_ASA 256
#define MUS_FANFA1 257
#define MUS_FANFA4 258
@@ -260,6 +262,7 @@
#define MUS_ME_SHINKA 263
#define BGM_FRLG_SAFARI_ZONE 264
#define MUS_SHINKA BGM_FRLG_SAFARI_ZONE
#define BGM_FRLG_CHANSEY_DANCE 267
#define MUS_ME_B_BIG 268
#define MUS_ME_B_SMALL 269
#define MUS_ME_WASURE 270