dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into contest-data

Browse Source
This commit is contained in:
Phlosioneer
2019-03-31 20:22:47 -04:00
parent 23ac2cc94e 93c4e35d84
commit 37c7441a15
3196 changed files with 55655 additions and 75454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
"name": "BattleFrontier_BattlePyramidEmptySquare",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattleFrontier_BattlePyramidTop/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
"name": "BattleFrontier_BattlePyramidTop",
"layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BATTLE_FRONTIER",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattleFrontier_OutsideEast/scripts.inc
View File

@@ -121,7 +121,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
playse 269
applymovement 14, BattleFrontier_OutsideEast_Movement_242D69
waitmovement 0
msgbox gUnknown_082731BD, MSGBOX_DEFAULT
msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT
closemessage
waitse
playmoncry SPECIES_SUDOWOODO, 2

2
data/maps/BattlePyramidSquare01/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE01",
"name": "BattlePyramidSquare01",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare02/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE02",
"name": "BattlePyramidSquare02",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare03/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE03",
"name": "BattlePyramidSquare03",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare04/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE04",
"name": "BattlePyramidSquare04",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare05/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE05",
"name": "BattlePyramidSquare05",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare06/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE06",
"name": "BattlePyramidSquare06",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare07/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE07",
"name": "BattlePyramidSquare07",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare08/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE08",
"name": "BattlePyramidSquare08",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare09/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE09",
"name": "BattlePyramidSquare09",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare10/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE10",
"name": "BattlePyramidSquare10",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare11/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE11",
"name": "BattlePyramidSquare11",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare12/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE12",
"name": "BattlePyramidSquare12",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare13/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE13",
"name": "BattlePyramidSquare13",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare14/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE14",
"name": "BattlePyramidSquare14",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare15/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE15",
"name": "BattlePyramidSquare15",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BattlePyramidSquare16/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BATTLE_PYRAMID_SQUARE16",
"name": "BattlePyramidSquare16",
"layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_DYNAMIC",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BirthIsland_Exterior/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BIRTH_ISLAND_EXTERIOR",
"name": "BirthIsland_Exterior",
"layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BIRTH_ISLAND_2",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/BirthIsland_Harbor/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_BIRTH_ISLAND_HARBOR",
"name": "BirthIsland_Harbor",
"layout": "LAYOUT_ISLAND_HARBOR",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_BIRTH_ISLAND_2",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/CaveOfOrigin_B1F/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_CAVE_OF_ORIGIN_B1F",
"name": "CaveOfOrigin_B1F",
"layout": "LAYOUT_CAVE_OF_ORIGIN_B1F",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
"requires_flash": false,
"weather": "WEATHER_FOG_1",

2
data/maps/FallarborTown_House2/scripts.inc
View File

@@ -37,7 +37,7 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6
FallarborTown_House2_EventScript_20140C:: @ 820140C
msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT
special TeachMoveTutorMove
special TeachMoveRelearnerMove
waitstate
compare VAR_0x8004, 0
goto_if_eq FallarborTown_House2_EventScript_2013D6

2
data/maps/FarawayIsland_Interior/scripts.inc
View File

@@ -38,7 +38,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
return
FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
setvar VAR_NEVER_READ_0x403A, 0
setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0
setvar VAR_TEMP_1, 1
call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86
end

2
data/maps/InsideOfTruck/map.json
View File

@@ -2,7 +2,7 @@
"id": "MAP_INSIDE_OF_TRUCK",
"name": "InsideOfTruck",
"layout": "LAYOUT_INSIDE_OF_TRUCK",
"music": "65535",
"music": "MUS_NONE",
"region_map_section": "MAPSEC_INSIDE_OF_TRUCK",
"requires_flash": false,
"weather": "WEATHER_NONE",

2
data/maps/InsideOfTruck/scripts.inc
View File

@@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_23BF01: @ 823BF01
InsideOfTruck_EventScript_23BF04:: @ 823BF04
lockall
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
checkplayergender
compare VAR_RESULT, MALE
goto_if_eq InsideOfTruck_EventScript_23BF20

4
data/maps/LavaridgeTown/scripts.inc
View File

@@ -37,7 +37,7 @@ LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
return
LavaridgeTown_EventScript_1EA543:: @ 81EA543
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
return
LavaridgeTown_MapScript2_1EA547: @ 81EA547
@@ -95,7 +95,7 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
call_if_ne LavaridgeTown_EventScript_1EA6C9
removeobject 7
setvar VAR_LAVARIDGE_RIVAL_STATE, 2
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
savebgm MUS_DUMMY
fadedefaultbgm
releaseall

6
data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
View File

@@ -151,7 +151,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
bufferstdstring 2, 14
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
random 64
compare VAR_RESULT, 0
goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
@@ -163,7 +163,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
bufferstdstring 2, 14
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
random 64
compare VAR_RESULT, 0
goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_220436
@@ -175,7 +175,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
giveitem VAR_TEMP_0, 1
bufferitemname 1, VAR_TEMP_0
bufferstdstring 2, 14
msgbox gUnknown_08272A9A, MSGBOX_DEFAULT
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436
end

6
data/maps/LittlerootTown/scripts.inc
View File

@@ -31,7 +31,7 @@ LittlerootTown_EventScript_1E7E45:: @ 81E7E45
return
LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
return
LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
@@ -141,7 +141,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
closedoor VAR_0x8004, VAR_0x8005
waitdooranim
clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
return
LittlerootTown_Movement_1E7F98: @ 81E7F98
@@ -194,7 +194,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
delay 20
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
waitstate
releaseall

2
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
View File

@@ -257,7 +257,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626
setvar VAR_0x8004, 1
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, MSGBOX_DEFAULT
msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT
special BedroomPC
waitstate
releaseall

2
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
View File

@@ -315,7 +315,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576
setvar VAR_0x8004, 2
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox gUnknown_08272D87, MSGBOX_DEFAULT
msgbox gText_PlayerHouseBootPC, MSGBOX_DEFAULT
special BedroomPC
waitstate
releaseall

12
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View File

@@ -347,7 +347,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 4
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@@ -358,7 +358,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 4
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2
call LittlerootTown_ProfessorBirchsLab_EventScript_273797
@@ -392,7 +392,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 5
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@@ -403,7 +403,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142
LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 5
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193
call LittlerootTown_ProfessorBirchsLab_EventScript_273797
@@ -437,7 +437,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 6
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F
call LittlerootTown_ProfessorBirchsLab_EventScript_27378B
@@ -448,7 +448,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3
LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E
call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F
removeobject 6
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234
call LittlerootTown_ProfessorBirchsLab_EventScript_273797

4
data/maps/MossdeepCity_StevensHouse/scripts.inc
View File

@@ -95,7 +95,7 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
call MossdeepCity_StevensHouse_EventScript_2228EB
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_StevensHouse_EventScript_222901
call MossdeepCity_StevensHouse_EventScript_27378B
@@ -105,7 +105,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD
call MossdeepCity_StevensHouse_EventScript_2228EB
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0
call MossdeepCity_StevensHouse_EventScript_273797

8
data/maps/PetalburgCity/scripts.inc
View File

@@ -20,7 +20,7 @@ PetalburgCity_EventScript_1DC307:: @ 81DC307
return
PetalburgCity_EventScript_1DC30F:: @ 81DC30F
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
savebgm MUS_TSURETEK
return
@@ -48,7 +48,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
waitmovement 2, MAP_PETALBURG_CITY
msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT
closemessage
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_PETALBURG_STATE, 3
fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001
@@ -61,7 +61,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
PetalburgCity_EventScript_1DC390:: @ 81DC390
lockall
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
applymovement 5, PetalburgCity_Movement_1DC41B
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406
waitmovement 0
@@ -76,7 +76,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor VAR_0x8004, VAR_0x8005
waitdooranim
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001
warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4

4
data/maps/Route101/scripts.inc
View File

@@ -12,7 +12,7 @@ Route101_MapScript2_1EBCCB: @ 81EBCCB
.2byte 0
Route101_EventScript_1EBCD5:: @ 81EBCD5
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_ROUTE101_STATE, 1
end
@@ -236,7 +236,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
setvar VAR_BIRCH_LAB_STATE, 2
setvar VAR_ROUTE101_STATE, 3
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
checkplayergender
compare VAR_RESULT, MALE
call_if_eq Route101_EventScript_1EBE85

4
data/maps/Route110_TrickHouseEnd/scripts.inc
View File

@@ -45,7 +45,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
faceplayer
msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT
setvar VAR_TEMP_2, 1
switch VAR_0x4044
switch VAR_TRICK_HOUSE_LEVEL
case 0, Route110_TrickHouseEnd_EventScript_26AD84
case 1, Route110_TrickHouseEnd_EventScript_26ADC0
case 2, Route110_TrickHouseEnd_EventScript_26ADFC
@@ -196,7 +196,7 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
applymovement 1, Route110_TrickHouseEnd_Movement_269E3F
waitmovement 0
removeobject 1
addvar VAR_0x4044, 1
addvar VAR_TRICK_HOUSE_LEVEL, 1
return
Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF

64
data/maps/Route110_TrickHouseEntrance/scripts.inc
View File

@@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
compare VAR_0x4044, 8
compare VAR_TRICK_HOUSE_LEVEL, 8
goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
end
@@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3
Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
compare VAR_0x4044, 1
compare VAR_TRICK_HOUSE_LEVEL, 1
call_if_eq Route110_TrickHouseEntrance_EventScript_269B61
compare VAR_0x4044, 2
compare VAR_TRICK_HOUSE_LEVEL, 2
call_if_eq Route110_TrickHouseEntrance_EventScript_269B6B
compare VAR_0x4044, 3
compare VAR_TRICK_HOUSE_LEVEL, 3
call_if_eq Route110_TrickHouseEntrance_EventScript_269B75
compare VAR_0x4044, 4
compare VAR_TRICK_HOUSE_LEVEL, 4
call_if_eq Route110_TrickHouseEntrance_EventScript_269B7F
compare VAR_0x4044, 5
compare VAR_TRICK_HOUSE_LEVEL, 5
call_if_eq Route110_TrickHouseEntrance_EventScript_269B89
compare VAR_0x4044, 6
compare VAR_TRICK_HOUSE_LEVEL, 6
call_if_eq Route110_TrickHouseEntrance_EventScript_269B93
compare VAR_0x4044, 7
compare VAR_TRICK_HOUSE_LEVEL, 7
call_if_eq Route110_TrickHouseEntrance_EventScript_269B9D
compare VAR_0x4044, 8
compare VAR_TRICK_HOUSE_LEVEL, 8
call_if_eq Route110_TrickHouseEntrance_EventScript_269BA7
return
@@ -139,7 +139,7 @@ Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26
addobject 1
hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
switch VAR_0x4044
switch VAR_TRICK_HOUSE_LEVEL
case 0, Route110_TrickHouseEntrance_EventScript_269C8C
case 1, Route110_TrickHouseEntrance_EventScript_269C94
case 2, Route110_TrickHouseEntrance_EventScript_269C9C
@@ -205,7 +205,7 @@ Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
lockall
delay 20
compare VAR_0x4044, 0
compare VAR_TRICK_HOUSE_LEVEL, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_269E48
msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT
closemessage
@@ -240,21 +240,21 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
waitmovement 0
compare VAR_0x4044, 0
compare VAR_TRICK_HOUSE_LEVEL, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE
compare VAR_0x4044, 1
compare VAR_TRICK_HOUSE_LEVEL, 1
call_if_eq Route110_TrickHouseEntrance_EventScript_269DF7
compare VAR_0x4044, 2
compare VAR_TRICK_HOUSE_LEVEL, 2
call_if_eq Route110_TrickHouseEntrance_EventScript_269E00
compare VAR_0x4044, 3
compare VAR_TRICK_HOUSE_LEVEL, 3
call_if_eq Route110_TrickHouseEntrance_EventScript_269E09
compare VAR_0x4044, 4
compare VAR_TRICK_HOUSE_LEVEL, 4
call_if_eq Route110_TrickHouseEntrance_EventScript_269E12
compare VAR_0x4044, 5
compare VAR_TRICK_HOUSE_LEVEL, 5
call_if_eq Route110_TrickHouseEntrance_EventScript_269E1B
compare VAR_0x4044, 6
compare VAR_TRICK_HOUSE_LEVEL, 6
call_if_eq Route110_TrickHouseEntrance_EventScript_269E24
compare VAR_0x4044, 7
compare VAR_TRICK_HOUSE_LEVEL, 7
call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D
closemessage
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
@@ -343,19 +343,19 @@ Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F
applymovement 1, Common_Movement_FacePlayer
waitmovement 0
msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT
compare VAR_0x4044, 1
compare VAR_TRICK_HOUSE_LEVEL, 1
goto_if_eq Route110_TrickHouseEntrance_EventScript_269EEF
compare VAR_0x4044, 2
compare VAR_TRICK_HOUSE_LEVEL, 2
goto_if_eq Route110_TrickHouseEntrance_EventScript_269F1B
compare VAR_0x4044, 3
compare VAR_TRICK_HOUSE_LEVEL, 3
goto_if_eq Route110_TrickHouseEntrance_EventScript_269F47
compare VAR_0x4044, 4
compare VAR_TRICK_HOUSE_LEVEL, 4
goto_if_eq Route110_TrickHouseEntrance_EventScript_269F73
compare VAR_0x4044, 5
compare VAR_TRICK_HOUSE_LEVEL, 5
goto_if_eq Route110_TrickHouseEntrance_EventScript_269F9F
compare VAR_0x4044, 6
compare VAR_TRICK_HOUSE_LEVEL, 6
goto_if_eq Route110_TrickHouseEntrance_EventScript_269FCB
compare VAR_0x4044, 7
compare VAR_TRICK_HOUSE_LEVEL, 7
goto_if_eq Route110_TrickHouseEntrance_EventScript_269FF7
end
@@ -510,7 +510,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7
waitmovement 0
switch VAR_0x4044
switch VAR_TRICK_HOUSE_LEVEL
case 0, Route110_TrickHouseEntrance_EventScript_26A1A9
case 1, Route110_TrickHouseEntrance_EventScript_26A1B4
case 2, Route110_TrickHouseEntrance_EventScript_26A1BF
@@ -579,7 +579,7 @@ Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201
end
Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B
compare VAR_0x4044, 8
compare VAR_TRICK_HOUSE_LEVEL, 8
goto_if_eq Route110_TrickHouseEntrance_EventScript_26A220
msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT
releaseall
@@ -592,7 +592,7 @@ Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220
Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A
lockall
switch VAR_0x4044
switch VAR_TRICK_HOUSE_LEVEL
case 0, Route110_TrickHouseEntrance_EventScript_26A289
case 1, Route110_TrickHouseEntrance_EventScript_26A2B2
case 2, Route110_TrickHouseEntrance_EventScript_26A2DB
@@ -727,11 +727,11 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
lockall
msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT
releaseall
compare VAR_0x4044, 0
compare VAR_TRICK_HOUSE_LEVEL, 0
call_if_eq Route110_TrickHouseEntrance_EventScript_26A429
compare VAR_0x4044, 1
compare VAR_TRICK_HOUSE_LEVEL, 1
call_if_eq Route110_TrickHouseEntrance_EventScript_26A439
compare VAR_0x4044, 2
compare VAR_TRICK_HOUSE_LEVEL, 2
call_if_eq Route110_TrickHouseEntrance_EventScript_26A449
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
end

4
data/maps/Route119_WeatherInstitute_2F/scripts.inc
View File

@@ -94,7 +94,7 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
call Route119_WeatherInstitute_2F_EventScript_2700DB
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700EA
call Route119_WeatherInstitute_2F_EventScript_27378B
@@ -104,7 +104,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD
call Route119_WeatherInstitute_2F_EventScript_2700DB
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route119_WeatherInstitute_2F_EventScript_2700D0
call Route119_WeatherInstitute_2F_EventScript_273797

2
data/maps/Route128/scripts.inc
View File

@@ -73,7 +73,7 @@ Route128_EventScript_1F6B57:: @ 81F6B57
delay 15
removeobject 3
waitfieldeffect 30
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_ROUTE128_STATE, 2
releaseall
end

4
data/maps/RustboroCity/scripts.inc
View File

@@ -24,7 +24,7 @@ RustboroCity_EventScript_1E06FF:: @ 81E06FF
end
RustboroCity_EventScript_1E0707:: @ 81E0707
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
return
RustboroCity_MapScript2_1E070B: @ 81E070B
@@ -100,7 +100,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
removeobject 15
setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
setvar VAR_RUSTBORO_STATE, 7
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall
end

8
data/maps/RustboroCity_DevonCorp_2F/scripts.inc
View File

@@ -167,7 +167,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E
RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
call RustboroCity_DevonCorp_2F_EventScript_211AC4
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AD7
call RustboroCity_DevonCorp_2F_EventScript_27378B
@@ -177,7 +177,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E
RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96
call RustboroCity_DevonCorp_2F_EventScript_211AC4
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211AB9
call RustboroCity_DevonCorp_2F_EventScript_273797
@@ -216,7 +216,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1
RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
call RustboroCity_DevonCorp_2F_EventScript_211B67
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B7A
call RustboroCity_DevonCorp_2F_EventScript_27378B
@@ -226,7 +226,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11
RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39
call RustboroCity_DevonCorp_2F_EventScript_211B67
msgbox gUnknown_08273374, MSGBOX_YESNO
msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211B5C
call RustboroCity_DevonCorp_2F_EventScript_273797

2
data/maps/SeafloorCavern_Room9/scripts.inc
View File

@@ -140,7 +140,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
warp MAP_ROUTE128, 255, 38, 22
waitstate
releaseall

4
data/maps/SkyPillar_Outside/scripts.inc
View File

@@ -12,7 +12,7 @@ SkyPillar_Outside_MapScript1_2392B8: @ 82392B8
end
SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
return
SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
@@ -81,7 +81,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
closemessage
playse SE_KAIDAN
fadescreenswapbuffers 1
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_RAYQUAZA_STATE, 4
removeobject 1
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE

2
data/maps/SkyPillar_Top/scripts.inc
View File

@@ -87,7 +87,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785
removeobject VAR_LAST_TALKED
fadescreenswapbuffers 0
bufferspeciesname 0, VAR_0x8004
msgbox gUnknown_08273204, MSGBOX_DEFAULT
msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
releaseall
end

20
data/maps/SlateportCity/scripts.inc
View File

@@ -36,7 +36,7 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99
return
SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 30
goto_if_eq SlateportCity_EventScript_1DCD06
@@ -83,7 +83,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
removeobject 35
setobjectxyperm 35, 10, 12
setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2
addvar VAR_SCOTT_STATE, 1
releaseall
@@ -732,11 +732,11 @@ SlateportCity_EventScript_1DD36E:: @ 81DD36E
SlateportCity_EventScript_1DD39A:: @ 81DD39A
setvar VAR_0x8004, 1
specialvar VAR_RESULT, sub_80246D4
specialvar VAR_RESULT, HasEnoughBerryPowder
compare VAR_RESULT, 0
goto_if_eq SlateportCity_EventScript_1DD3C0
msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT
special sub_80248B0
special DisplayBerryPowderVendorMenu
goto SlateportCity_EventScript_1DD3CA
end
@@ -846,7 +846,7 @@ SlateportCity_EventScript_1DD536:: @ 81DD536
SlateportCity_EventScript_1DD54A:: @ 81DD54A
msgbox SlateportCity_Text_1DEFBC, MSGBOX_DEFAULT
special sub_8024918
special RemoveBerryPowderVendorMenu
release
end
@@ -855,26 +855,26 @@ SlateportCity_EventScript_1DD557:: @ 81DD557
compare VAR_RESULT, 0
goto_if_eq SlateportCity_EventScript_1DD3CA
copyvar VAR_0x8004, VAR_0x8009
specialvar VAR_RESULT, sub_80246D4
specialvar VAR_RESULT, HasEnoughBerryPowder
compare VAR_RESULT, 0
goto_if_eq SlateportCity_EventScript_1DD5CE
giveitem_std VAR_0x8008
compare VAR_RESULT, 0
goto_if_eq SlateportCity_EventScript_1DD5C1
copyvar VAR_0x8004, VAR_0x8009
special sub_802477C
special sub_802488C
special TakeBerryPowder
special PrintPlayerBerryPowderAmount
msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq SlateportCity_EventScript_1DD3CA
msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT
special sub_8024918
special RemoveBerryPowderVendorMenu
release
end
SlateportCity_EventScript_1DD5C1:: @ 81DD5C1
msgbox gUnknown_08272A89, MSGBOX_DEFAULT
special sub_8024918
special RemoveBerryPowderVendorMenu
release
end

10
data/maps/SootopolisCity/scripts.inc
View File

@@ -62,7 +62,7 @@ SootopolisCity_MapScript1_1E56EF: @ 81E56EF
end
SootopolisCity_EventScript_1E5781:: @ 81E5781
setflag FLAG_SPECIAL_FLAG_0x4000
setflag FLAG_HIDE_MAP_NAME_POPUP
return
SootopolisCity_EventScript_1E5785:: @ 81E5785
@@ -272,7 +272,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
waitmovement 0
special RemoveCameraObject
setvar VAR_RAYQUAZA_STATE, 2
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall
end
@@ -372,7 +372,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
waitmovement 0
special RemoveCameraObject
setvar VAR_RAYQUAZA_STATE, 2
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall
end
@@ -544,7 +544,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
fadenewbgm MUS_RUNECITY
delay 120
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32
waitstate
end
@@ -597,7 +597,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
fadenewbgm MUS_NAMINORI
delay 120
clearflag FLAG_SPECIAL_FLAG_0x4000
clearflag FLAG_HIDE_MAP_NAME_POPUP
warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53
waitstate
end