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

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-24 01:42:52 +08:00
parent 9a53686a4e 6e36c22920
commit 1dc0b25c1e
1127 changed files with 79056 additions and 34785 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/BirthIsland_Exterior/map.json
+4 -4
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "106",
"graphics_id": "MAP_OBJ_GFX_METEORITE",
"x": 15,
"y": 12,
"elevation": 3,
@@ -24,10 +24,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "BirthIsland_Exterior_EventScript_165271",
"flag": "154"
"flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
},
{
"graphics_id": "240",
"graphics_id": "MAP_OBJ_GFX_VAR_0",
"x": 15,
"y": 3,
"elevation": 3,
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "153"
"flag": "FLAG_HIDE_DEOXYS"
}
],
"warp_events": [
data/maps/BirthIsland_Exterior/scripts.inc
+30 -30
View File
@@ -10,36 +10,36 @@ BirthIsland_Exterior_MapScript3_165213:: @ 8165213
BirthIsland_Exterior_MapScript1_165217:: @ 8165217
setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR
setvar VAR_0x4010, 150
setvar VAR_SECRET_BASE_MAP, 0
setvar VAR_ALTERING_CAVE_WILD_SET, 0
checkflag FLAG_0x2E4
call_if 1, EventScript_16523C
checkflag FLAG_0x2E4
call_if 0, EventScript_165243
setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_DEOXYS_N
setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0
setvar VAR_DEOXYS_INTERACTION_NUM, 0
checkflag FLAG_FOUGHT_DEOXYS
call_if TRUE, EventScript_16523C
checkflag FLAG_FOUGHT_DEOXYS
call_if FALSE, EventScript_165243
end
EventScript_16523C:: @ 816523C
setflag FLAG_0x099
setflag FLAG_0x09A
setflag FLAG_HIDE_DEOXYS
setflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
return
EventScript_165243:: @ 8165243
checkflag FLAG_0x2F7
goto_if_eq EventScript_1A77A9
clearflag FLAG_0x09A
clearflag FLAG_0x848
checkflag FLAG_DEOXYS_FLEW_AWAY
goto_if TRUE, EventScript_1A77A9
clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE
clearflag FLAG_SYS_DEOXYS_AWAKENED
return
BirthIsland_Exterior_MapScript2_165253:: @ 8165253
checkflag FLAG_0x807
call_if 1, EventScript_16525D
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_16525D
end
EventScript_16525D:: @ 816525D
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 7
goto_if 5, EventScript_1A77A9
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject 2
return
@@ -48,7 +48,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271
faceplayer
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
special sub_80CCDFC
waitstate
@@ -91,23 +91,23 @@ EventScript_1652C0:: @ 81652C0
setvar VAR_0x8005, 30
setvar VAR_0x8006, 0
special CreateObedientEnemyMon
setflag FLAG_0x807
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special BattleSetup_StartLegendaryBattle
waitstate
clearflag FLAG_0x807
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16533A
compare_var_to_value VAR_RESULT, 4
goto_if_eq EventScript_165348
compare_var_to_value VAR_RESULT, 5
goto_if_eq EventScript_165348
setflag FLAG_0x2E4
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_16533A
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_165348
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_165348
setflag FLAG_FOUGHT_DEOXYS
release
end
EventScript_16533A:: @ 816533A
setflag FLAG_0x2F7
setflag FLAG_DEOXYS_FLEW_AWAY
setvar VAR_0x8004, SPECIES_DEOXYS
goto EventScript_1A9236
end
data/maps/BirthIsland_Harbor/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "108",
"graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "62",
"graphics_id": "MAP_OBJ_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
data/maps/BirthIsland_Harbor/scripts.inc
+1 -17
View File
@@ -6,23 +6,7 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7
faceplayer
message Text_181726
waitmessage
setvar VAR_0x8004, 10
multichoice 20, 8, 61, 0
switch VAR_RESULT
case 0, EventScript_1A91D5
case 1, EventScript_1A90F6
case 127, EventScript_1A90F6
end
NavelRock_Harbor_MapScripts:: @ 8165420
.byte 0
NavelRock_Harbor_EventScript_165421:: @ 8165421
lock
faceplayer
message Text_181726
waitmessage
setvar VAR_0x8004, 9
setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND
multichoice 20, 8, 61, 0
switch VAR_RESULT
case 0, EventScript_1A91D5
data/maps/CeladonCity/map.json
+25 -24
View File
@@ -25,7 +25,7 @@
],
"object_events": [
{
"graphics_id": "49",
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
"x": 48,
"y": 15,
"elevation": 3,
@@ -35,10 +35,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_166CFA",
"flag": "95"
"flag": "FLAG_HIDE_CELADON_ROCKETS"
},
{
"graphics_id": "27",
"graphics_id": "MAP_OBJ_GFX_FAT_MAN",
"x": 38,
"y": 14,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
"graphics_id": "112",
"graphics_id": "MAP_OBJ_GFX_POLIWRATH",
"x": 36,
"y": 14,
"elevation": 3,
@@ -64,7 +64,7 @@
"flag": "0"
},
{
"graphics_id": "17",
"graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
"x": 11,
"y": 18,
"elevation": 3,
@@ -77,7 +77,7 @@
"flag": "0"
},
{
"graphics_id": "28",
"graphics_id": "MAP_OBJ_GFX_WOMAN_2",
"x": 18,
"y": 22,
"elevation": 3,
@@ -90,7 +90,7 @@
"flag": "0"
},
{
"graphics_id": "32",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
"x": 30,
"y": 24,
"elevation": 3,
@@ -103,7 +103,7 @@
"flag": "0"
},
{
"graphics_id": "33",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
"x": 26,
"y": 19,
"elevation": 3,
@@ -116,7 +116,7 @@
"flag": "0"
},
{
"graphics_id": "49",
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
"x": 38,
"y": 31,
"elevation": 3,
@@ -126,10 +126,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_166D03",
"flag": "95"
"flag": "FLAG_HIDE_CELADON_ROCKETS"
},
{
"graphics_id": "32",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
"x": 9,
"y": 30,
"elevation": 3,
@@ -142,7 +142,7 @@
"flag": "0"
},
{
"graphics_id": "95",
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"x": 52,
"y": 22,
"elevation": 3,
@@ -151,11 +151,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_1BDF13",
"flag": "20"
"script": "EventScript_InteractWithCutTreeObject",
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "95",
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"x": 40,
"y": 35,
"elevation": 0,
@@ -164,11 +164,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_1BDF13",
"flag": "19"
"script": "EventScript_InteractWithCutTreeObject",
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "19",
"graphics_id": "MAP_OBJ_GFX_BOY",
"x": 25,
"y": 10,
"elevation": 3,
@@ -194,7 +194,7 @@
"flag": "0"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 5,
"y": 3,
"elevation": 3,
@@ -204,10 +204,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_1BEBC0",
"flag": "465"
"flag": "FLAG_HIDE_CELADON_CITY_ETHER"
},
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 47,
"y": 24,
"elevation": 3,
@@ -217,7 +217,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_EventScript_166D15",
"flag": "95"
"flag": "FLAG_HIDE_CELADON_ROCKETS"
}
],
"warp_events": [
@@ -377,8 +377,9 @@
"y": 20,
"elevation": 3,
"item": "ITEM_PP_UP",
"flag": "47",
"unknown": 1
"flag": "HIDDEN_ITEM_CELADON_CITY_PP_UP",
"quantity": 1,
"underfoot": false
}
]
}
data/maps/CeladonCity/scripts.inc
+1 -3
View File
@@ -77,9 +77,7 @@ CeladonCity_EventScript_166D27:: @ 8166D27
CeladonCity_EventScript_166D30:: @ 8166D30
lockall
setvar VAR_0x8004, 5
setvar VAR_0x8005, 0
special SetFlavorTextFlagFromSpecialVars
famechecker FAMECHECKER_ERIKA, 0
msgbox gUnknown_81801A2
releaseall
end
data/maps/CeladonCity_Condominiums_1F/map.json
+4 -4
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "125",
"graphics_id": "MAP_OBJ_GFX_MEOWTH",
"x": 1,
"y": 9,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "113",
"graphics_id": "MAP_OBJ_GFX_CLEFAIRY",
"x": 5,
"y": 13,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "122",
"graphics_id": "MAP_OBJ_GFX_NIDORAN_F",
"x": 5,
"y": 8,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "35",
"graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
"x": 2,
"y": 9,
"elevation": 3,
data/maps/CeladonCity_Condominiums_1F/scripts.inc
+10 -12
View File
@@ -4,17 +4,17 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320
CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
lock
faceplayer
checkflag FLAG_0x2F8
goto_if_eq EventScript_16C36A
checkflag FLAG_0x82C
goto_if_eq EventScript_16C374
checkflag FLAG_0x2A6
goto_if_eq EventScript_16C36A
checkflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF
goto_if TRUE, EventScript_16C36A
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_16C374
checkflag FLAG_GOT_TEA
goto_if TRUE, EventScript_16C36A
msgbox gUnknown_81960C9
setflag FLAG_0x2A6
setflag FLAG_GOT_TEA
giveitem ITEM_TEA
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_1A6BF9
goto_if eq, EventScript_1A6BF9
msgbox gUnknown_8196109
release
end
@@ -25,10 +25,8 @@ EventScript_16C36A:: @ 816C36A
end
EventScript_16C374:: @ 816C374
setvar VAR_0x8004, 1
setvar VAR_0x8005, 4
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x2F8
famechecker FAMECHECKER_DAISY, 4
setflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF
msgbox gUnknown_8196188
release
end
data/maps/CeladonCity_Condominiums_2F/map.json
+2 -2
View File
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
"flag": "158"
"flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
},
{
"graphics_id": "0",
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
"flag": "158"
"flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
}
],
"warp_events": [
data/maps/CeladonCity_Condominiums_3F/map.json
+4 -4
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "26",
"graphics_id": "MAP_OBJ_GFX_ROCKER",
"x": 0,
"y": 10,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "25",
"graphics_id": "MAP_OBJ_GFX_MAN",
"x": 3,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "52",
"graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
"x": 4,
"y": 10,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "27",
"graphics_id": "MAP_OBJ_GFX_FAT_MAN",
"x": 0,
"y": 13,
"elevation": 3,
data/maps/CeladonCity_Condominiums_3F/scripts.inc
+2 -2
View File
@@ -18,7 +18,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6
faceplayer
specialvar VAR_RESULT, HasAllKantoMons
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16C412
goto_if eq, EventScript_16C412
msgbox gUnknown_8196356
release
end
@@ -33,7 +33,7 @@ EventScript_16C418:: @ 816C418
delay 60
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_80CA618
waitstate
release
data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+3 -3
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "54",
"graphics_id": "MAP_OBJ_GFX_BLACKBELT",
"x": 3,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 7,
"y": 3,
"elevation": 0,
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D",
"flag": "87"
"flag": "FLAG_HIDE_EEVEE_BALL"
}
],
"warp_events": [
data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+6 -6
View File
@@ -11,11 +11,11 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
setvar VAR_0x4001, SPECIES_EEVEE
givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C4A6
goto_if eq, EventScript_16C4A6
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16C4DA
goto_if eq, EventScript_16C4DA
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A927C
goto_if eq, EventScript_1A927C
release
end
@@ -28,7 +28,7 @@ EventScript_16C4A6:: @ 816C4A6
getspeciesname 0, SPECIES_EEVEE
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C514
goto_if eq, EventScript_16C514
call EventScript_1A8C27
call EventScript_1A74EB
goto EventScript_16C514
@@ -43,7 +43,7 @@ EventScript_16C4DA:: @ 816C4DA
getspeciesname 0, SPECIES_EEVEE
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C509
goto_if eq, EventScript_16C509
call EventScript_1A8C33
goto EventScript_16C509
end
@@ -54,7 +54,7 @@ EventScript_16C509:: @ 816C509
end
EventScript_16C514:: @ 816C514
setflag FLAG_0x263
setflag FLAG_GOT_EEVEE
release
end
data/maps/CeladonCity_DepartmentStore_1F/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "48",
"graphics_id": "MAP_OBJ_GFX_WORKER_F",
"x": 6,
"y": 10,
"elevation": 3,
data/maps/CeladonCity_DepartmentStore_2F/map.json
+5 -5
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "22",
"graphics_id": "MAP_OBJ_GFX_LASS",
"x": 5,
"y": 10,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "68",
"graphics_id": "MAP_OBJ_GFX_CLERK",
"x": 1,
"y": 8,
"elevation": 0,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "68",
"graphics_id": "MAP_OBJ_GFX_CLERK",
"x": 1,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "23",
"graphics_id": "MAP_OBJ_GFX_WOMAN_1",
"x": 11,
"y": 6,
"elevation": 3,
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053",
"flag": "157"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
+2 -2
View File
@@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
lock
faceplayer
message Text_1A6211
@@ -44,7 +44,7 @@ Items_16BB38:: @ 816BB38
CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
lock
faceplayer
message Text_1A6211
data/maps/CeladonCity_DepartmentStore_3F/map.json
+5 -5
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "68",
"graphics_id": "MAP_OBJ_GFX_CLERK",
"x": 10,
"y": 9,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "51",
"graphics_id": "MAP_OBJ_GFX_GBA_KID",
"x": 11,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "51",
"graphics_id": "MAP_OBJ_GFX_GBA_KID",
"x": 4,
"y": 9,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "51",
"graphics_id": "MAP_OBJ_GFX_GBA_KID",
"x": 1,
"y": 9,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
"graphics_id": "17",
"graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
"x": 9,
"y": 14,
"elevation": 3,
data/maps/CeladonCity_DepartmentStore_4F/map.json
+3 -3
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "25",
"graphics_id": "MAP_OBJ_GFX_MAN",
"x": 6,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "18",
"graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
"x": 10,
"y": 11,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "68",
"graphics_id": "MAP_OBJ_GFX_CLERK",
"x": 3,
"y": 13,
"elevation": 0,
data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
+1 -1
View File
@@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
lock
faceplayer
message Text_1A6211
data/maps/CeladonCity_DepartmentStore_5F/map.json
+4 -4
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "61",
"graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
"x": 11,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "62",
"graphics_id": "MAP_OBJ_GFX_SAILOR",
"x": 6,
"y": 8,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "68",
"graphics_id": "MAP_OBJ_GFX_CLERK",
"x": 1,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "68",
"graphics_id": "MAP_OBJ_GFX_CLERK",
"x": 1,
"y": 6,
"elevation": 3,
data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
+2 -2
View File
@@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
lock
faceplayer
message Text_1A6211
@@ -42,7 +42,7 @@ Items_16BC84:: @ 816BC84
CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
lock
faceplayer
message Text_1A6211
data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+19 -19
View File
@@ -4,9 +4,9 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152
CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
lockall
setvar VAR_0x8004, 3
checkflag FLAG_0x002
call_if 0, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_0x403A
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
message Text_1A535C
waitmessage
@@ -61,50 +61,50 @@ EventScript_16C1F3:: @ 816C1F3
EventScript_16C246:: @ 816C246
setvar VAR_0x8006, 4
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1
compare_var_to_value VAR_0x403A, 4
goto_if_eq EventScript_16C30E
compare_var_to_value VAR_ELEVATOR_FLOOR, 4
goto_if eq, EventScript_16C30E
call EventScript_16C313
setvar VAR_0x403A, 4
setvar VAR_ELEVATOR_FLOOR, 4
goto EventScript_16C30E
end
EventScript_16C26E:: @ 816C26E
setvar VAR_0x8006, 5
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1
compare_var_to_value VAR_0x403A, 5
goto_if_eq EventScript_16C30E
compare_var_to_value VAR_ELEVATOR_FLOOR, 5
goto_if eq, EventScript_16C30E
call EventScript_16C313
setvar VAR_0x403A, 5
setvar VAR_ELEVATOR_FLOOR, 5
goto EventScript_16C30E
end
EventScript_16C296:: @ 816C296
setvar VAR_0x8006, 6
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1
compare_var_to_value VAR_0x403A, 6
goto_if_eq EventScript_16C30E
compare_var_to_value VAR_ELEVATOR_FLOOR, 6
goto_if eq, EventScript_16C30E
call EventScript_16C313
setvar VAR_0x403A, 6
setvar VAR_ELEVATOR_FLOOR, 6
goto EventScript_16C30E
end
EventScript_16C2BE:: @ 816C2BE
setvar VAR_0x8006, 7
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1
compare_var_to_value VAR_0x403A, 7
goto_if_eq EventScript_16C30E
compare_var_to_value VAR_ELEVATOR_FLOOR, 7
goto_if eq, EventScript_16C30E
call EventScript_16C313
setvar VAR_0x403A, 7
setvar VAR_ELEVATOR_FLOOR, 7
goto EventScript_16C30E
end
EventScript_16C2E6:: @ 816C2E6
setvar VAR_0x8006, 8
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1
compare_var_to_value VAR_0x403A, 8
goto_if_eq EventScript_16C30E
compare_var_to_value VAR_ELEVATOR_FLOOR, 8
goto_if eq, EventScript_16C30E
call EventScript_16C313
setvar VAR_0x403A, 8
setvar VAR_ELEVATOR_FLOOR, 8
goto EventScript_16C30E
end
@@ -119,5 +119,5 @@ EventScript_16C313:: @ 816C313
waitse
special sub_80CB498
waitstate
setflag FLAG_0x002
setflag FLAG_TEMP_2
return
data/maps/CeladonCity_DepartmentStore_Roof/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "41",
"graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
"x": 9,
"y": 5,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "17",
"graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL",
"x": 5,
"y": 4,
"elevation": 3,
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+24 -24
View File
@@ -4,13 +4,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
faceplayer
call EventScript_16BCF6
compare_var_to_value VAR_0x4001, 0
goto_if_eq EventScript_16C00E
goto_if eq, EventScript_16C00E
goto EventScript_16BD3E
end
@@ -18,13 +18,13 @@ EventScript_16BCF6:: @ 816BCF6
setvar VAR_0x4001, 0
checkitem ITEM_FRESH_WATER, 1
compare_var_to_value VAR_RESULT, 1
call_if 1, EventScript_16BD2C
call_if eq, EventScript_16BD2C
checkitem ITEM_SODA_POP, 1
compare_var_to_value VAR_RESULT, 1
call_if 1, EventScript_16BD32
call_if eq, EventScript_16BD32
checkitem ITEM_LEMONADE, 1
compare_var_to_value VAR_RESULT, 1
call_if 1, EventScript_16BD38
call_if eq, EventScript_16BD38
return
EventScript_16BD2C:: @ 816BD2C
@@ -42,7 +42,7 @@ EventScript_16BD38:: @ 816BD38
EventScript_16BD3E:: @ 816BD3E
msgbox gUnknown_8195D22, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C00C
goto_if eq, EventScript_16C00C
textcolor 3
message Text_195D5F
waitmessage
@@ -121,8 +121,8 @@ EventScript_16BED7:: @ 816BED7
EventScript_16BF19:: @ 816BF19
setvar VAR_0x8008, ITEM_FRESH_WATER
setvar VAR_0x8009, ITEM_TM16
checkflag FLAG_0x296
goto_if_eq EventScript_16C018
checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
goto_if TRUE, EventScript_16C018
msgbox gUnknown_8195D75
goto EventScript_16BF7C
end
@@ -130,8 +130,8 @@ EventScript_16BF19:: @ 816BF19
EventScript_16BF3A:: @ 816BF3A
setvar VAR_0x8008, ITEM_SODA_POP
setvar VAR_0x8009, ITEM_TM20
checkflag FLAG_0x295
goto_if_eq EventScript_16C018
checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
goto_if TRUE, EventScript_16C018
msgbox gUnknown_8195E33
goto EventScript_16BF7C
end
@@ -139,8 +139,8 @@ EventScript_16BF3A:: @ 816BF3A
EventScript_16BF5B:: @ 816BF5B
setvar VAR_0x8008, ITEM_LEMONADE
setvar VAR_0x8009, ITEM_TM33
checkflag FLAG_0x294
goto_if_eq EventScript_16C018
checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
goto_if TRUE, EventScript_16C018
msgbox gUnknown_8195EBF
goto EventScript_16BF7C
end
@@ -151,7 +151,7 @@ EventScript_16BF7C:: @ 816BF7C
removeitem VAR_0x8008, 1
checkitemspace VAR_0x8009, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C002
goto_if eq, EventScript_16C002
additem VAR_0x8009, 1
textcolor 3
playfanfare MUS_FANFA1
@@ -161,26 +161,26 @@ EventScript_16BF7C:: @ 816BF7C
giveitem VAR_0x8009, 1, 8
call EventScript_1A6675
compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER
call_if 1, EventScript_16BFDE
call_if eq, EventScript_16BFDE
compare_var_to_value VAR_0x8008, ITEM_SODA_POP
call_if 1, EventScript_16BFEA
call_if eq, EventScript_16BFEA
compare_var_to_value VAR_0x8008, ITEM_LEMONADE
call_if 1, EventScript_16BFF6
call_if eq, EventScript_16BFF6
release
end
EventScript_16BFDE:: @ 816BFDE
setflag FLAG_0x296
setflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
msgbox gUnknown_8195DD4
return
EventScript_16BFEA:: @ 816BFEA
setflag FLAG_0x295
setflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
msgbox gUnknown_8195E68
return
EventScript_16BFF6:: @ 816BFF6
setflag FLAG_0x294
setflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
msgbox gUnknown_8195EF4
return
@@ -262,16 +262,16 @@ EventScript_16C0C4:: @ 816C0C4
EventScript_16C0CB:: @ 816C0CB
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C131
goto_if eq, EventScript_16C131
checkitemspace VAR_0x4000, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C13F
goto_if eq, EventScript_16C13F
compare_var_to_value VAR_0x4001, 0
call_if 1, EventScript_16C0B6
call_if eq, EventScript_16C0B6
compare_var_to_value VAR_0x4001, 1
call_if 1, EventScript_16C0BD
call_if eq, EventScript_16C0BD
compare_var_to_value VAR_0x4001, 2
call_if 1, EventScript_16C0C4
call_if eq, EventScript_16C0C4
updatemoneybox 0, 0, 0
getitemname 0, VAR_0x4000
playse SE_JIHANKI
data/maps/CeladonCity_GameCorner/map.json
+48 -36
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "48",
"graphics_id": "MAP_OBJ_GFX_WORKER_F",
"x": 4,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "47",
"graphics_id": "MAP_OBJ_GFX_WORKER_M",
"x": 6,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "30",
"graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
"x": 1,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "28",
"graphics_id": "MAP_OBJ_GFX_WOMAN_2",
"x": 1,
"y": 8,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
"graphics_id": "57",
"graphics_id": "MAP_OBJ_GFX_FISHER",
"x": 4,
"y": 7,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
"graphics_id": "91",
"graphics_id": "MAP_OBJ_GFX_GYM_GUY",
"x": 7,
"y": 10,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
"graphics_id": "23",
"graphics_id": "MAP_OBJ_GFX_WOMAN_1",
"x": 7,
"y": 8,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
"graphics_id": "33",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
"x": 10,
"y": 9,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 13,
"y": 7,
"elevation": 3,
@@ -131,7 +131,7 @@
"flag": "0"
},
{
"graphics_id": "61",
"graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
"x": 16,
"y": 10,
"elevation": 3,
@@ -144,7 +144,7 @@
"flag": "0"
},
{
"graphics_id": "49",
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
"x": 11,
"y": 2,
"elevation": 3,
@@ -154,7 +154,7 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_GameCorner_EventScript_16CAF5",
"flag": "91"
"flag": "FLAG_HIDE_GAME_CORNER_ROCKET"
}
],
"warp_events": [
@@ -195,8 +195,9 @@
"y": 4,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "51",
"unknown": 10
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS",
"quantity": 10,
"underfoot": false
},
{
"type": "hidden_item",
@@ -204,8 +205,9 @@
"y": 8,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "52",
"unknown": 10
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_2",
"quantity": 10,
"underfoot": false
},
{
"type": "hidden_item",
@@ -213,8 +215,9 @@
"y": 11,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "53",
"unknown": 20
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_3",
"quantity": 20,
"underfoot": false
},
{
"type": "hidden_item",
@@ -222,8 +225,9 @@
"y": 12,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "54",
"unknown": 10
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_4",
"quantity": 10,
"underfoot": false
},
{
"type": "hidden_item",
@@ -231,8 +235,9 @@
"y": 9,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "55",
"unknown": 10
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_5",
"quantity": 10,
"underfoot": false
},
{
"type": "hidden_item",
@@ -240,8 +245,9 @@
"y": 5,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "56",
"unknown": 20
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_6",
"quantity": 20,
"underfoot": false
},
{
"type": "hidden_item",
@@ -249,8 +255,9 @@
"y": 4,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "57",
"unknown": 10
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_7",
"quantity": 10,
"underfoot": false
},
{
"type": "hidden_item",
@@ -258,8 +265,9 @@
"y": 3,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "58",
"unknown": 10
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_8",
"quantity": 10,
"underfoot": false
},
{
"type": "hidden_item",
@@ -267,8 +275,9 @@
"y": 5,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "59",
"unknown": 10
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_9",
"quantity": 10,
"underfoot": false
},
{
"type": "hidden_item",
@@ -276,8 +285,9 @@
"y": 5,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "60",
"unknown": 40
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_10",
"quantity": 40,
"underfoot": false
},
{
"type": "hidden_item",
@@ -285,8 +295,9 @@
"y": 13,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "61",
"unknown": 100
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_11",
"quantity": 100,
"underfoot": false
},
{
"type": "hidden_item",
@@ -294,8 +305,9 @@
"y": 12,
"elevation": 3,
"item": "ITEM_NONE",
"flag": "62",
"unknown": 10
"flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_12",
"quantity": 10,
"underfoot": false
},
{
"type": "bg_event_type_4",
data/maps/CeladonCity_GameCorner/scripts.inc
+35 -35
View File
@@ -3,8 +3,8 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646
.byte 0
CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C
checkflag FLAG_0x26D
call_if 0, EventScript_16C656
checkflag FLAG_OPENED_ROCKET_HIDEOUT
call_if FALSE, EventScript_16C656
end
EventScript_16C656:: @ 816C656
@@ -22,7 +22,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
lock
faceplayer
showmoneybox 0, 0, 0
@@ -40,20 +40,20 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
EventScript_16C6E6:: @ 816C6E6
checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16C790
goto_if FALSE, EventScript_16C790
compare_var_to_value VAR_0x8009, 0
goto_if_eq EventScript_16C734
goto_if eq, EventScript_16C734
compare_var_to_value VAR_0x8009, 1
goto_if_eq EventScript_16C706
goto_if eq, EventScript_16C706
end
EventScript_16C706:: @ 816C706
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9500
goto_if 4, EventScript_16C79E
goto_if ge, EventScript_16C79E
checkmoney 10000, 0
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C7AC
goto_if eq, EventScript_16C7AC
givecoins 500
takemoney 10000, 0
goto EventScript_16C762
@@ -62,10 +62,10 @@ EventScript_16C706:: @ 816C706
EventScript_16C734:: @ 816C734
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9950
goto_if 4, EventScript_16C79E
goto_if ge, EventScript_16C79E
checkmoney 1000, 0
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C7AC
goto_if eq, EventScript_16C7AC
givecoins 50
takemoney 1000, 0
goto EventScript_16C762
@@ -131,20 +131,20 @@ CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7
CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
lock
faceplayer
checkflag FLAG_0x26E
goto_if_eq EventScript_16C849
checkflag FLAG_GOT_10_COINS_FROM_GAMBLER
goto_if TRUE, EventScript_16C849
msgbox gUnknown_8196AF3
checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16C839
goto_if FALSE, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9990
goto_if 4, EventScript_16C82B
goto_if ge, EventScript_16C82B
givecoins 10
textcolor 3
msgbox gUnknown_8196B0D
playse SE_SHOP
waitse
setflag FLAG_0x26E
setflag FLAG_GOT_10_COINS_FROM_GAMBLER
goto EventScript_16C7CA
end
@@ -167,8 +167,8 @@ EventScript_16C849:: @ 816C849
CeladonCity_GameCorner_EventScript_16C857:: @ 816C857
lock
faceplayer
checkflag FLAG_0x4B3
goto_if_eq EventScript_16C870
checkflag FLAG_DEFEATED_ERIKA
goto_if TRUE, EventScript_16C870
msgbox gUnknown_8196BAD
goto EventScript_16C7CA
end
@@ -195,20 +195,20 @@ CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E
CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
lock
faceplayer
checkflag FLAG_0x26F
goto_if_eq EventScript_16C8F0
checkflag FLAG_GOT_20_COINS_FROM_GAMBLER
goto_if TRUE, EventScript_16C8F0
msgbox gUnknown_8196D2B
checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16C839
goto_if FALSE, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9980
goto_if 4, EventScript_16C8E2
goto_if ge, EventScript_16C8E2
givecoins 20
textcolor 3
msgbox gUnknown_8196D47
playse SE_SHOP
waitse
setflag FLAG_0x26F
setflag FLAG_GOT_20_COINS_FROM_GAMBLER
goto EventScript_16C7CA
end
@@ -225,20 +225,20 @@ EventScript_16C8F0:: @ 816C8F0
CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
lock
faceplayer
checkflag FLAG_0x270
goto_if_eq EventScript_16C950
checkflag FLAG_GOT_20_COINS_FROM_GAMBLER_2
goto_if TRUE, EventScript_16C950
msgbox gUnknown_8196DB7
checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16C839
goto_if FALSE, EventScript_16C839
checkcoins VAR_0x4001
compare_var_to_value VAR_0x4001, 9980
goto_if 4, EventScript_16C942
goto_if ge, EventScript_16C942
givecoins 20
textcolor 3
msgbox gUnknown_8196DF8
playse SE_SHOP
waitse
setflag FLAG_0x270
setflag FLAG_GOT_20_COINS_FROM_GAMBLER_2
goto EventScript_16C7CA
end
@@ -264,10 +264,10 @@ EventScript_16C96A:: @ 816C96A
EventScript_16C96C:: @ 816C96C
checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16CAA0
goto_if FALSE, EventScript_16CAA0
msgbox gUnknown_8196F46, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16C96A
goto_if eq, EventScript_16C96A
setfieldeffectarg 0, 255
setfieldeffectarg 1, 10
setfieldeffectarg 2, 14
@@ -412,8 +412,8 @@ EventScript_16CAA0:: @ 816CAA0
CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA
lockall
msgbox gUnknown_8196EDC
checkflag FLAG_0x26D
call_if 0, EventScript_16CABE
checkflag FLAG_OPENED_ROCKET_HIDEOUT
call_if FALSE, EventScript_16CABE
releaseall
end
@@ -425,11 +425,11 @@ EventScript_16CABE:: @ 816CABE
setmetatile 16, 3, 678, 1
setmetatile 17, 3, 679, 1
special DrawWholeMapView
setflag FLAG_0x26D
setflag FLAG_OPENED_ROCKET_HIDEOUT
return
CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
trainerbattle 2, 357, 0, Text_196E69, Text_196E95, EventScript_16CB10
trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10
msgbox gUnknown_8196E9B, 6
end
@@ -437,9 +437,9 @@ EventScript_16CB10:: @ 816CB10
msgbox gUnknown_8196E9B
closemessage
compare_var_to_value VAR_FACING, 3
call_if 1, EventScript_16CB34
call_if eq, EventScript_16CB34
compare_var_to_value VAR_FACING, 3
call_if 5, EventScript_16CB3F
call_if ne, EventScript_16CB3F
removeobject 11
release
end
data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
+5 -5
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "30",
"graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
"x": 2,
"y": 6,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "33",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
"x": 6,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "47",
"graphics_id": "MAP_OBJ_GFX_WORKER_M",
"x": 4,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "47",
"graphics_id": "MAP_OBJ_GFX_WORKER_M",
"x": 6,
"y": 2,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
"graphics_id": "47",
"graphics_id": "MAP_OBJ_GFX_WORKER_M",
"x": 2,
"y": 2,
"elevation": 3,
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+17 -17
View File
@@ -13,10 +13,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
lock
faceplayer
checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16CD99
goto_if FALSE, EventScript_16CD99
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
showcoinsbox 0, 0
msgbox gUnknown_8197057
goto EventScript_16CBB2
@@ -75,10 +75,10 @@ EventScript_16CC65:: @ 816CC65
getspeciesname 0, VAR_0x4001
msgbox gUnknown_819709D, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16CC10
goto_if eq, EventScript_16CC10
checkcoins VAR_RESULT
compare_var_to_var VAR_RESULT, VAR_0x4002
goto_if 0, EventScript_16CDA5
goto_if lt, EventScript_16CDA5
textcolor 3
switch VAR_0x4001
case SPECIES_ABRA, EventScript_16CCD4
@@ -121,11 +121,11 @@ EventScript_16CD3D:: @ 816CD3D
EventScript_16CD52:: @ 816CD52
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16CDB3
goto_if eq, EventScript_16CDB3
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16CDE0
goto_if eq, EventScript_16CDE0
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_16CD74
goto_if eq, EventScript_16CD74
end
EventScript_16CD74:: @ 816CD74
@@ -164,7 +164,7 @@ EventScript_16CDB3:: @ 816CDB3
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16CD83
goto_if eq, EventScript_16CD83
goto EventScript_16CC10
end
@@ -178,7 +178,7 @@ EventScript_16CDE0:: @ 816CDE0
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16CE12
goto_if eq, EventScript_16CE12
call EventScript_1A8C33
goto EventScript_16CE12
end
@@ -192,10 +192,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
lock
faceplayer
checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16CD99
goto_if FALSE, EventScript_16CD99
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
showcoinsbox 0, 0
msgbox gUnknown_8197057
goto EventScript_16CE47
@@ -253,7 +253,7 @@ EventScript_16CEF5:: @ 816CEF5
EventScript_16CF09:: @ 816CF09
msgbox gUnknown_81970B2, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16CC10
goto_if eq, EventScript_16CC10
goto EventScript_16CF3F
end
@@ -261,7 +261,7 @@ EventScript_16CF22:: @ 816CF22
getitemname 0, VAR_0x4001
msgbox gUnknown_819709D, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16CC10
goto_if eq, EventScript_16CC10
goto EventScript_16CF3F
end
@@ -269,10 +269,10 @@ EventScript_16CF3F:: @ 816CF3F
getitemname 0, VAR_0x4001
checkcoins VAR_RESULT
compare_var_to_var VAR_RESULT, VAR_0x4002
goto_if 0, EventScript_16CDA5
goto_if lt, EventScript_16CDA5
checkitemspace VAR_0x4001, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16CF79
goto_if eq, EventScript_16CF79
takecoins VAR_0x4002
updatecoinsbox 0, 5
giveitem VAR_0x4001
@@ -290,10 +290,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
lock
faceplayer
checkflag FLAG_GOT_COIN_CASE
goto_if 0, EventScript_16CD99
goto_if FALSE, EventScript_16CD99
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
showcoinsbox 0, 0
msgbox gUnknown_8197057
goto EventScript_16CFB2
data/maps/CeladonCity_Gym/map.json
+17 -17
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "22",
"graphics_id": "MAP_OBJ_GFX_LASS",
"x": 3,
"y": 11,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "29",
"graphics_id": "MAP_OBJ_GFX_BEAUTY",
"x": 9,
"y": 10,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "40",
"graphics_id": "MAP_OBJ_GFX_PICNICKER",
"x": 10,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "29",
"graphics_id": "MAP_OBJ_GFX_BEAUTY",
"x": 2,
"y": 6,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
"graphics_id": "29",
"graphics_id": "MAP_OBJ_GFX_BEAUTY",
"x": 5,
"y": 4,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
"graphics_id": "22",
"graphics_id": "MAP_OBJ_GFX_LASS",
"x": 7,
"y": 4,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
"graphics_id": "83",
"graphics_id": "MAP_OBJ_GFX_ERIKA",
"x": 6,
"y": 4,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
"graphics_id": "42",
"graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
"x": 8,
"y": 7,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
"graphics_id": "95",
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"x": 6,
"y": 8,
"elevation": 3,
@@ -127,11 +127,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Gym_EventScript_1BDF13",
"flag": "18"
"script": "EventScript_InteractWithCutTreeObject",
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "95",
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"x": 3,
"y": 5,
"elevation": 3,
@@ -140,11 +140,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Gym_EventScript_1BDF13",
"flag": "19"
"script": "EventScript_InteractWithCutTreeObject",
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "95",
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"x": 9,
"y": 6,
"elevation": 3,
@@ -153,8 +153,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_Gym_EventScript_1BDF13",
"flag": "20"
"script": "EventScript_InteractWithCutTreeObject",
"flag": "FLAG_TEMP_14"
}
],
"warp_events": [
data/maps/CeladonCity_Gym/scripts.inc
+24 -39
View File
@@ -2,28 +2,21 @@ CeladonCity_Gym_MapScripts:: @ 816D060
.byte 0
CeladonCity_Gym_EventScript_16D061:: @ 816D061
setvar VAR_0x8004, 5
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
trainerbattle 1, 417, 0, Text_197114, Text_197260, EventScript_16D0A0
checkflag FLAG_0x293
goto_if 0, EventScript_16D0C6
setvar VAR_0x8004, 5
setvar VAR_0x8005, 4
special SetFlavorTextFlagFromSpecialVars
famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0
checkflag FLAG_GOT_TM19_FROM_ERIKA
goto_if FALSE, EventScript_16D0C6
famechecker FAMECHECKER_ERIKA, 4
msgbox gUnknown_81972B8
release
end
EventScript_16D0A0:: @ 816D0A0
setvar VAR_0x8004, 5
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
clearflag FLAG_0x09E
setflag FLAG_0x4B3
setflag FLAG_0x823
setvar VAR_0x8008, 4
call EventScript_1A6B18
famechecker FAMECHECKER_ERIKA, 1
clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS
setflag FLAG_DEFEATED_ERIKA
setflag FLAG_BADGE04_GET
set_gym_trainers 4
goto EventScript_16D0C6
end
@@ -31,14 +24,10 @@ EventScript_16D0C6:: @ 816D0C6
msgbox gUnknown_8197327
checkitemspace ITEM_TM19, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16D107
goto_if eq, EventScript_16D107
additem ITEM_TM19, 1
loadword 0, gUnknown_81973BA
setorcopyvar VAR_0x8000, ITEM_TM19
setorcopyvar VAR_0x8001, 1
setorcopyvar VAR_0x8002, MUS_FANFA1
callstd 9 @ gStdScript_ItemMessageAndFanfare
setflag FLAG_0x293
giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19
setflag FLAG_GOT_TM19_FROM_ERIKA
msgbox gUnknown_81973D7
release
end
@@ -49,50 +38,46 @@ EventScript_16D107:: @ 816D107
end
CeladonCity_Gym_EventScript_16D111:: @ 816D111
trainerbattle 0, 132, 0, Text_19747C, Text_1974C4
trainerbattle 0, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4
msgbox gUnknown_81974D6, 6
end
CeladonCity_Gym_EventScript_16D128:: @ 816D128
trainerbattle 0, 133, 0, Text_1976C5, Text_1976FF
setvar VAR_0x8004, 5
setvar VAR_0x8005, 2
special SetFlavorTextFlagFromSpecialVars
trainerbattle 0, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF
famechecker FAMECHECKER_ERIKA, 2
msgbox gUnknown_8197708, 6
end
CeladonCity_Gym_EventScript_16D14C:: @ 816D14C
trainerbattle 0, 160, 0, Text_197595, Text_1975BB
trainerbattle 0, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB
msgbox gUnknown_81975D1, 6
end
CeladonCity_Gym_EventScript_16D163:: @ 816D163
trainerbattle 0, 265, 0, Text_1974FA, Text_19751C
trainerbattle 0, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C
msgbox gUnknown_8197527, 6
end
CeladonCity_Gym_EventScript_16D17A:: @ 816D17A
trainerbattle 0, 266, 0, Text_19760B, Text_197660
setvar VAR_0x8004, 5
setvar VAR_0x8005, 3
special SetFlavorTextFlagFromSpecialVars
trainerbattle 0, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660
famechecker FAMECHECKER_ERIKA, 3
msgbox gUnknown_8197664, 6
end
CeladonCity_Gym_EventScript_16D19E:: @ 816D19E
trainerbattle 0, 267, 0, Text_197747, Text_19777A
trainerbattle 0, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A
msgbox gUnknown_8197788, 6
end
CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5
trainerbattle 0, 402, 0, Text_1977E5, Text_197832
trainerbattle 0, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832
msgbox gUnknown_819783E, 6
end
CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC
lockall
checkflag FLAG_0x823
goto_if_eq EventScript_16D1E0
checkflag FLAG_BADGE04_GET
goto_if TRUE, EventScript_16D1E0
msgbox gUnknown_8197874
releaseall
end
data/maps/CeladonCity_Hotel/map.json
+4 -4
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "35",
"graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
"x": 5,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "29",
"graphics_id": "MAP_OBJ_GFX_BEAUTY",
"x": 3,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "25",
"graphics_id": "MAP_OBJ_GFX_MAN",
"x": 9,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "16",
"graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
"x": 2,
"y": 6,
"elevation": 3,
data/maps/CeladonCity_House1/map.json
+3 -3
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "33",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
"x": 5,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "49",
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
"x": 2,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "49",
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
"x": 8,
"y": 4,
"elevation": 3,
data/maps/CeladonCity_PokemonCenter_1F/map.json
+4 -4
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "64",
"graphics_id": "MAP_OBJ_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "61",
"graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
"x": 4,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "42",
"graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
"x": 10,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "18",
"graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
"x": 12,
"y": 5,
"elevation": 3,
data/maps/CeladonCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "69",
"graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "112"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/CeladonCity_Restaurant/map.json
+5 -5
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "59",
"graphics_id": "MAP_OBJ_GFX_CHEF",
"x": 12,
"y": 7,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "28",
"graphics_id": "MAP_OBJ_GFX_WOMAN_2",
"x": 11,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "27",
"graphics_id": "MAP_OBJ_GFX_FAT_MAN",
"x": 9,
"y": 4,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "30",
"graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
"x": 1,
"y": 2,
"elevation": 0,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
"graphics_id": "47",
"graphics_id": "MAP_OBJ_GFX_WORKER_M",
"x": 3,
"y": 7,
"elevation": 0,
data/maps/CeladonCity_Restaurant/scripts.inc
+2 -2
View File
@@ -13,11 +13,11 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
lock
faceplayer
checkflag FLAG_GOT_COIN_CASE
goto_if_eq EventScript_16D24B
goto_if TRUE, EventScript_16D24B
msgbox gUnknown_81979C1
checkitemspace ITEM_COIN_CASE, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16D241
goto_if eq, EventScript_16D241
additem ITEM_COIN_CASE, 1
giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE
setflag FLAG_GOT_COIN_CASE
data/maps/CeruleanCave_1F/map.json
+28 -27
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 7,
"y": 3,
"elevation": 3,
@@ -24,10 +24,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BEA47",
"flag": "434"
"flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 11,
"y": 16,
"elevation": 3,
@@ -37,10 +37,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BEA54",
"flag": "435"
"flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 25,
"y": 5,
"elevation": 4,
@@ -50,10 +50,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BEA3A",
"flag": "433"
"flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 7,
"y": 21,
"elevation": 3,
@@ -62,11 +62,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "18"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 13,
"y": 21,
"elevation": 3,
@@ -75,11 +75,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "19"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 5,
"y": 20,
"elevation": 3,
@@ -88,11 +88,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "20"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 14,
"y": 20,
"elevation": 3,
@@ -101,11 +101,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "21"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 11,
"y": 21,
"elevation": 3,
@@ -114,11 +114,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "22"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 9,
"y": 18,
"elevation": 3,
@@ -127,8 +127,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_1F_EventScript_1BE00C",
"flag": "23"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_17"
}
],
"warp_events": [
@@ -196,9 +196,10 @@
"x": 12,
"y": 2,
"elevation": 3,
"item": "POCKET_KEY_ITEMS",
"flag": "39",
"unknown": 1
"item": "ITEM_ULTRA_BALL",
"flag": "HIDDEN_ITEM_CERULEAN_CAVE_1F_ULTRA_BALL",
"quantity": 1,
"underfoot": false
}
]
}
data/maps/CeruleanCave_2F/map.json
+36 -36
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 9,
"y": 18,
"elevation": 3,
@@ -24,10 +24,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BEA6E",
"flag": "437"
"flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 29,
"y": 16,
"elevation": 3,
@@ -37,10 +37,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BEA7B",
"flag": "438"
"flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 33,
"y": 12,
"elevation": 3,
@@ -50,10 +50,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BEA61",
"flag": "436"
"flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 33,
"y": 10,
"elevation": 3,
@@ -62,11 +62,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "18"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 33,
"y": 9,
"elevation": 3,
@@ -75,11 +75,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "19"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 25,
"y": 11,
"elevation": 3,
@@ -88,11 +88,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "20"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 28,
"y": 20,
"elevation": 3,
@@ -101,11 +101,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "21"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 30,
"y": 20,
"elevation": 3,
@@ -114,11 +114,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "22"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 9,
"y": 13,
"elevation": 3,
@@ -127,11 +127,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "23"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 23,
"y": 16,
"elevation": 3,
@@ -140,11 +140,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "24"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_18"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 13,
"y": 6,
"elevation": 3,
@@ -153,11 +153,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "25"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_19"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 12,
"elevation": 3,
@@ -166,11 +166,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "26"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_1A"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 10,
"y": 20,
"elevation": 3,
@@ -179,8 +179,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_2F_EventScript_1BE00C",
"flag": "27"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_1B"
}
],
"warp_events": [
data/maps/CeruleanCave_B1F/map.json
+33 -33
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 31,
"y": 9,
"elevation": 4,
@@ -24,10 +24,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BEA95",
"flag": "440"
"flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 32,
"y": 2,
"elevation": 3,
@@ -37,10 +37,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BEA88",
"flag": "439"
"flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE"
},
{
"graphics_id": "139",
"graphics_id": "MAP_OBJ_GFX_MEWTWO",
"x": 7,
"y": 12,
"elevation": 3,
@@ -50,10 +50,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1624F5",
"flag": "129"
"flag": "FLAG_HIDE_MEWTWO"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 37,
"y": 1,
"elevation": 3,
@@ -62,11 +62,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "18"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 38,
"y": 2,
"elevation": 3,
@@ -75,11 +75,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "19"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 35,
"y": 1,
"elevation": 3,
@@ -88,11 +88,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "20"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_14"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 37,
"y": 4,
"elevation": 3,
@@ -101,11 +101,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "21"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_15"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 35,
"y": 5,
"elevation": 3,
@@ -114,11 +114,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "22"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_16"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 2,
"y": 2,
"elevation": 3,
@@ -127,11 +127,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "23"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_17"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 4,
"y": 1,
"elevation": 3,
@@ -140,11 +140,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "24"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_18"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 6,
"y": 1,
"elevation": 3,
@@ -153,11 +153,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "25"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_19"
},
{
"graphics_id": "96",
"graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK",
"x": 3,
"y": 4,
"elevation": 3,
@@ -166,8 +166,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCave_B1F_EventScript_1BE00C",
"flag": "26"
"script": "EventScript_InteractWithRockSmashRockObject",
"flag": "FLAG_TEMP_1A"
}
],
"warp_events": [
data/maps/CeruleanCave_B1F/scripts.inc
+20 -20
View File
@@ -4,30 +4,30 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE
.byte 0
CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9
checkflag FLAG_0x807
call_if 1, EventScript_1624D3
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_1624D3
end
EventScript_1624D3:: @ 81624D3
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 7
goto_if 5, EventScript_1A77A9
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT
goto_if ne, EventScript_1A77A9
removeobject VAR_LAST_TALKED
return
CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7
checkflag FLAG_0x2BC
call_if 0, EventScript_1624F1
checkflag FLAG_FOUGHT_MEWTWO
call_if FALSE, EventScript_1624F1
end
EventScript_1624F1:: @ 81624F1
clearflag FLAG_0x081
clearflag FLAG_HIDE_MEWTWO
return
CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
faceplayer
@@ -40,23 +40,23 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
playbgm MUS_EXEYE, 0
waitbuttonpress
setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
setflag FLAG_0x807
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special BattleSetup_StartLegendaryBattle
waitstate
clearflag FLAG_0x807
specialvar VAR_RESULT, sub_80CA74C
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_162558
compare_var_to_value VAR_RESULT, 4
goto_if_eq EventScript_162561
compare_var_to_value VAR_RESULT, 5
goto_if_eq EventScript_162561
setflag FLAG_0x2BC
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_162558
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_162561
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_162561
setflag FLAG_FOUGHT_MEWTWO
release
end
EventScript_162558:: @ 8162558
setflag FLAG_0x2BC
setflag FLAG_FOUGHT_MEWTWO
goto EventScript_1A922D
EventScript_162560:: @ 8162560
data/maps/CeruleanCity/events_bad.inc
-43
View File
@@ -1,43 +0,0 @@
CeruleanCity_EventObjects:
object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0
object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0
object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0
object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0
object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0
object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0
object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0
object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0
object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0
object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0
object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0
object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0
CeruleanCity_MapWarps:
warp_def 10, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE1
warp_def 30, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE2
warp_def 15, 17, 0, 1, MAP_CERULEAN_CITY_HOUSE3
warp_def 22, 19, 0, 1, MAP_CERULEAN_CITY_POKEMONCENTER_1F
warp_def 31, 21, 0, 1, MAP_CERULEAN_CITY_GYM
warp_def 13, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP
warp_def 29, 28, 0, 1, MAP_CERULEAN_CITY_MART
warp_def 1, 12, 0, 0, MAP_CERULEAN_CAVE_1F
warp_def 10, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE1
warp_def 31, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE2
warp_def 31, 9, 3, 3, MAP_CERULEAN_CITY_HOUSE2
warp_def 14, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP
warp_def 23, 28, 0, 0, MAP_CERULEAN_CITY_HOUSE4
warp_def 17, 11, 0, 0, MAP_CERULEAN_CITY_HOUSE5
CeruleanCity_MapCoordEvents:
coord_event 22, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_16649A
coord_event 23, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664A6
coord_event 24, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664B9
coord_event 33, 5, 3, VAR_0x407D, , CeruleanCity_EventScript_166683
coord_event 33, 7, 3, VAR_0x407D, , CeruleanCity_EventScript_1666A3
CeruleanCity_MapBGEvents:
bg_hidden_item_event 18, 7, 3, ITEM_RARE_CANDY,
CeruleanCity_MapEvents::
map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents
data/maps/CeruleanCity/map.json
+24 -23
View File
@@ -35,7 +35,7 @@
],
"object_events": [
{
"graphics_id": "60",
"graphics_id": "MAP_OBJ_GFX_POLICEMAN",
"x": 31,
"y": 12,
"elevation": 3,
@@ -48,7 +48,7 @@
"flag": "0"
},
{
"graphics_id": "49",
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
"x": 33,
"y": 6,
"elevation": 3,
@@ -58,10 +58,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_166603",
"flag": "59"
"flag": "FLAG_HIDE_CERULEAN_ROCKET"
},
{
"graphics_id": "16",
"graphics_id": "MAP_OBJ_GFX_LITTLE_BOY",
"x": 16,
"y": 21,
"elevation": 3,
@@ -74,7 +74,7 @@
"flag": "0"
},
{
"graphics_id": "30",
"graphics_id": "MAP_OBJ_GFX_BALDING_MAN",
"x": 9,
"y": 23,
"elevation": 3,
@@ -87,7 +87,7 @@
"flag": "0"
},
{
"graphics_id": "129",
"graphics_id": "MAP_OBJ_GFX_SLOWBRO",
"x": 32,
"y": 29,
"elevation": 3,
@@ -100,7 +100,7 @@
"flag": "0"
},
{
"graphics_id": "22",
"graphics_id": "MAP_OBJ_GFX_LASS",
"x": 33,
"y": 29,
"elevation": 3,
@@ -113,7 +113,7 @@
"flag": "0"
},
{
"graphics_id": "18",
"graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
"x": 34,
"y": 22,
"elevation": 3,
@@ -126,7 +126,7 @@
"flag": "0"
},
{
"graphics_id": "72",
"graphics_id": "MAP_OBJ_GFX_BLUE",
"x": 22,
"y": 0,
"elevation": 3,
@@ -136,10 +136,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "60"
"flag": "FLAG_HIDE_CERULEAN_RIVAL"
},
{
"graphics_id": "95",
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"x": 26,
"y": 32,
"elevation": 3,
@@ -148,8 +148,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_1BDF13",
"flag": "19"
"script": "EventScript_InteractWithCutTreeObject",
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "65375",
@@ -165,7 +165,7 @@
"flag": "0"
},
{
"graphics_id": "23",
"graphics_id": "MAP_OBJ_GFX_WOMAN_1",
"x": 12,
"y": 30,
"elevation": 3,
@@ -178,7 +178,7 @@
"flag": "0"
},
{
"graphics_id": "41",
"graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M",
"x": 1,
"y": 13,
"elevation": 3,
@@ -188,7 +188,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_EventScript_16672F",
"flag": "92"
"flag": "FLAG_HIDE_CERULEAN_CAVE_GUARD"
}
],
"warp_events": [
@@ -297,7 +297,7 @@
"x": 22,
"y": 6,
"elevation": 3,
"var": "VAR_0x4052",
"var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
"var_value": 0,
"script": "CeruleanCity_EventScript_16649A"
},
@@ -306,7 +306,7 @@
"x": 23,
"y": 6,
"elevation": 3,
"var": "VAR_0x4052",
"var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
"var_value": 0,
"script": "CeruleanCity_EventScript_1664A6"
},
@@ -315,7 +315,7 @@
"x": 24,
"y": 6,
"elevation": 3,
"var": "VAR_0x4052",
"var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL",
"var_value": 0,
"script": "CeruleanCity_EventScript_1664B9"
},
@@ -324,7 +324,7 @@
"x": 33,
"y": 5,
"elevation": 3,
"var": "VAR_0x407D",
"var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET",
"var_value": 0,
"script": "CeruleanCity_EventScript_166683"
},
@@ -333,7 +333,7 @@
"x": 33,
"y": 7,
"elevation": 3,
"var": "VAR_0x407D",
"var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET",
"var_value": 0,
"script": "CeruleanCity_EventScript_1666A3"
}
@@ -373,8 +373,9 @@
"y": 7,
"elevation": 3,
"item": "ITEM_RARE_CANDY",
"flag": "49",
"unknown": 1
"flag": "HIDDEN_ITEM_CERULEAN_CITY_RARE_CANDY",
"quantity": 1,
"underfoot": false
},
{
"type": "bg_event_type_0",
data/maps/CeruleanCity/scripts.inc
+36 -40
View File
@@ -4,8 +4,8 @@ CeruleanCity_MapScripts:: @ 8166471
CeruleanCity_MapScript1_166477:: @ 8166477
setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY
checkflag FLAG_0x234
call_if 0, EventScript_166484
checkflag FLAG_GOT_SS_TICKET
call_if FALSE, EventScript_166484
end
EventScript_166484:: @ 8166484
@@ -36,7 +36,7 @@ CeruleanCity_EventScript_1664B9:: @ 81664B9
EventScript_1664CC:: @ 81664CC
textcolor 0
setvar VAR_0x4054, 2
setvar VAR_MAP_SCENE_ROUTE22, 2
playbgm MUS_RIVAL1, 0
addobject 8
applymovement 8, Movement_1665D3
@@ -44,26 +44,24 @@ EventScript_1664CC:: @ 81664CC
msgbox gUnknown_817EAD7
setvar VAR_LAST_TALKED, 8
compare_var_to_value VAR_STARTER_MON, 2
call_if 1, EventScript_166582
call_if eq, EventScript_166582
compare_var_to_value VAR_STARTER_MON, 1
call_if 1, EventScript_16658D
call_if eq, EventScript_16658D
compare_var_to_value VAR_STARTER_MON, 0
call_if 1, EventScript_166598
setvar VAR_0x8004, 13
setvar VAR_0x8005, 0
special SetFlavorTextFlagFromSpecialVars
call_if eq, EventScript_166598
famechecker FAMECHECKER_BILL, 0
msgbox gUnknown_817EB95
closemessage
playbgm MUS_RIVAL2, 0
compare_var_to_value VAR_0x4001, 0
call_if 1, EventScript_1665A3
call_if eq, EventScript_1665A3
compare_var_to_value VAR_0x4001, 1
call_if 1, EventScript_1665A3
call_if eq, EventScript_1665A3
compare_var_to_value VAR_0x4001, 2
call_if 1, EventScript_1665B5
call_if eq, EventScript_1665B5
msgbox gUnknown_817ECD4
setvar VAR_0x4052, 1
setflag FLAG_0x29B
setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
setflag FLAG_GOT_FAME_CHECKER
giveitem ITEM_FAME_CHECKER
msgbox gUnknown_817ED5D
closemessage
@@ -75,15 +73,15 @@ EventScript_1664CC:: @ 81664CC
end
EventScript_166582:: @ 8166582
trainerbattle 3, 332, 0, Text_17EB71
trainerbattle 3, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71
return
EventScript_16658D:: @ 816658D
trainerbattle 3, 333, 0, Text_17EB71
trainerbattle 3, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71
return
EventScript_166598:: @ 8166598
trainerbattle 3, 334, 0, Text_17EB71
trainerbattle 3, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71
return
EventScript_1665A3:: @ 81665A3
@@ -173,14 +171,14 @@ Movement_1665FB:: @ 81665FB
CeruleanCity_EventScript_166603:: @ 8166603
lock
faceplayer
checktrainerflag FLAG_0x163
goto_if_eq EventScript_16662E
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5
goto_if eq, EventScript_16662E
message Text_17EE0E
waitmessage
playbgm MUS_ROCKET, 0
waitbuttonpress
trainerbattle 3, 355, 0, Text_17EE70
setvar VAR_0x407D, 1
trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
goto EventScript_16662E
end
@@ -188,7 +186,7 @@ EventScript_16662E:: @ 816662E
msgbox gUnknown_817EE9C
checkitemspace ITEM_TM28, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_166677
goto_if eq, EventScript_166677
additem ITEM_TM28, 1
giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28
msgbox gUnknown_817EEED
@@ -196,7 +194,7 @@ EventScript_16662E:: @ 816662E
fadescreen 1
removeobject 2
fadescreen 0
setflag FLAG_0x23F
setflag FLAG_GOT_TM28_FROM_ROCKET
release
end
@@ -230,8 +228,8 @@ EventScript_1666C3:: @ 81666C3
textcolor 0
msgbox Text_17EE0E
setvar VAR_LAST_TALKED, 2
trainerbattle 3, 355, 0, Text_17EE70
setvar VAR_0x407D, 1
trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70
setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1
goto EventScript_16662E
end
@@ -248,8 +246,8 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7
CeruleanCity_EventScript_1666FE:: @ 81666FE
lock
faceplayer
checkflag FLAG_0x234
goto_if_eq EventScript_166713
checkflag FLAG_GOT_SS_TICKET
goto_if TRUE, EventScript_166713
msgbox gUnknown_817F01D
release
end
@@ -286,11 +284,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F
random 3
copyvar VAR_0x8008, VAR_RESULT
compare_var_to_value VAR_0x8008, 0
call_if 1, EventScript_1667B0
call_if eq, EventScript_1667B0
compare_var_to_value VAR_0x8008, 1
call_if 1, EventScript_1667B6
call_if eq, EventScript_1667B6
compare_var_to_value VAR_0x8008, 2
call_if 1, EventScript_1667BC
call_if eq, EventScript_1667BC
waitmessage
delay 40
playse SE_PIN
@@ -298,11 +296,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F
waitmovement 0
delay 30
compare_var_to_value VAR_0x8008, 0
call_if 1, EventScript_1667C2
call_if eq, EventScript_1667C2
compare_var_to_value VAR_0x8008, 1
call_if 1, EventScript_1667CB
call_if eq, EventScript_1667CB
compare_var_to_value VAR_0x8008, 2
call_if 1, EventScript_1667D4
call_if eq, EventScript_1667D4
release
end
@@ -335,13 +333,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD
random 4
copyvar VAR_0x8008, VAR_RESULT
compare_var_to_value VAR_0x8008, 0
call_if 1, EventScript_166814
call_if eq, EventScript_166814
compare_var_to_value VAR_0x8008, 1
call_if 1, EventScript_16681D
call_if eq, EventScript_16681D
compare_var_to_value VAR_0x8008, 2
call_if 1, EventScript_166826
call_if eq, EventScript_166826
compare_var_to_value VAR_0x8008, 3
call_if 1, EventScript_16682F
call_if eq, EventScript_16682F
release
end
@@ -375,9 +373,7 @@ CeruleanCity_EventScript_16684A:: @ 816684A
CeruleanCity_EventScript_166853:: @ 8166853
lockall
setvar VAR_0x8004, 3
setvar VAR_0x8005, 0
special SetFlavorTextFlagFromSpecialVars
famechecker FAMECHECKER_MISTY, 0
msgbox gUnknown_817F4EF
releaseall
end
data/maps/CeruleanCity_BikeShop/map.json
+3 -3
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "25",
"graphics_id": "MAP_OBJ_GFX_MAN",
"x": 9,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "18",
"graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
"x": 9,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "28",
"graphics_id": "MAP_OBJ_GFX_WOMAN_2",
"x": 5,
"y": 5,
"elevation": 3,
data/maps/CeruleanCity_BikeShop/scripts.inc
+7 -7
View File
@@ -4,10 +4,10 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC
CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD
lock
faceplayer
checkflag FLAG_0x271
goto_if_eq EventScript_16AC58
checkflag FLAG_0x241
goto_if_eq EventScript_16AC22
checkflag FLAG_GOT_BICYCLE
goto_if TRUE, EventScript_16AC58
checkflag FLAG_GOT_BIKE_VOUCHER
goto_if TRUE, EventScript_16AC22
showmoneybox 0, 0, 0
message Text_192755
waitmessage
@@ -34,7 +34,7 @@ EventScript_16AC15:: @ 816AC15
EventScript_16AC22:: @ 816AC22
msgbox gUnknown_81927B2
giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5
setflag FLAG_0x271
setflag FLAG_GOT_BICYCLE
additem ITEM_BICYCLE, 1
removeitem ITEM_BIKE_VOUCHER, 1
msgbox gUnknown_819280E
@@ -58,8 +58,8 @@ CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C
CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75
lock
faceplayer
checkflag FLAG_0x271
goto_if_eq EventScript_16AC8A
checkflag FLAG_GOT_BICYCLE
goto_if TRUE, EventScript_16AC8A
msgbox gUnknown_8192937
release
end
data/maps/CeruleanCity_Gym/map.json
+4 -4
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "43",
"graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER",
"x": 10,
"y": 12,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "40",
"graphics_id": "MAP_OBJ_GFX_PICNICKER",
"x": 4,
"y": 7,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "81",
"graphics_id": "MAP_OBJ_GFX_MISTY",
"x": 8,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "91",
"graphics_id": "MAP_OBJ_GFX_GYM_GUY",
"x": 7,
"y": 16,
"elevation": 3,
data/maps/CeruleanCity_Gym/scripts.inc
+17 -24
View File
@@ -2,25 +2,20 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0
.byte 0
CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1
setvar VAR_0x8004, 3
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
trainerbattle 1, 415, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
checkflag FLAG_0x297
goto_if 0, EventScript_16AAF9
famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
checkflag FLAG_GOT_TM03_FROM_MISTY
goto_if FALSE, EventScript_16AAF9
msgbox gUnknown_81922BF
release
end
EventScript_16AAD3:: @ 816AAD3
setvar VAR_0x8004, 3
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B1
setflag FLAG_0x821
famechecker FAMECHECKER_MISTY, 1
setflag FLAG_DEFEATED_MISTY
setflag FLAG_BADGE02_GET
setrespawn SPAWN_CERULEAN_CITY
setvar VAR_0x8008, 2
call EventScript_1A6B18
set_gym_trainers 2
goto EventScript_16AAF9
end
@@ -28,10 +23,10 @@ EventScript_16AAF9:: @ 816AAF9
msgbox gUnknown_81922F7
checkitemspace ITEM_TM03, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16AB3A
goto_if eq, EventScript_16AB3A
additem ITEM_TM03, 1
giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03
setflag FLAG_0x297
setflag FLAG_GOT_TM03_FROM_MISTY
msgbox gUnknown_81922BF
release
end
@@ -42,23 +37,21 @@ EventScript_16AB3A:: @ 816AB3A
end
CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44
trainerbattle 0, 150, 0, Text_192481, Text_1924D0
trainerbattle 0, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0
msgbox gUnknown_81924E4, 6
end
CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B
trainerbattle 0, 234, 0, Text_192524, Text_192547
setvar VAR_0x8004, 3
setvar VAR_0x8005, 2
special SetFlavorTextFlagFromSpecialVars
trainerbattle 0, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547
famechecker FAMECHECKER_MISTY, 2
msgbox gUnknown_8192556, 6
end
CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F
lock
faceplayer
checkflag FLAG_0x4B1
goto_if_eq EventScript_16AB94
checkflag FLAG_DEFEATED_MISTY
goto_if TRUE, EventScript_16AB94
msgbox gUnknown_81925AC
release
end
@@ -70,8 +63,8 @@ EventScript_16AB94:: @ 816AB94
CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E
lockall
checkflag FLAG_0x821
goto_if_eq EventScript_16ABB2
checkflag FLAG_BADGE02_GET
goto_if TRUE, EventScript_16ABB2
msgbox gUnknown_81926E1
releaseall
end
data/maps/CeruleanCity_House1/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "61",
"graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
"x": 6,
"y": 5,
"elevation": 3,
data/maps/CeruleanCity_House2/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "56",
"graphics_id": "MAP_OBJ_GFX_HIKER",
"x": 1,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "22",
"graphics_id": "MAP_OBJ_GFX_LASS",
"x": 7,
"y": 6,
"elevation": 3,
data/maps/CeruleanCity_House2/scripts.inc
+2 -2
View File
@@ -4,8 +4,8 @@ CeruleanCity_House2_MapScripts:: @ 816A975
CeruleanCity_House2_EventScript_16A976:: @ 816A976
lock
faceplayer
checkflag FLAG_0x23F
goto_if_eq EventScript_16A98B
checkflag FLAG_GOT_TM28_FROM_ROCKET
goto_if TRUE, EventScript_16A98B
msgbox gUnknown_8191E13
release
end
data/maps/CeruleanCity_House3/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "32",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
"x": 2,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "35",
"graphics_id": "MAP_OBJ_GFX_OLD_WOMAN",
"x": 7,
"y": 5,
"elevation": 3,
data/maps/CeruleanCity_House3/scripts.inc
+6 -6
View File
@@ -10,20 +10,20 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1
faceplayer
setvar VAR_0x8008, 1
call EventScript_1A8CAD
checkflag FLAG_0x24A
goto_if_eq EventScript_16AA23
checkflag FLAG_DID_ZYNX_TRADE
goto_if TRUE, EventScript_16AA23
msgbox gUnknown_81A59FE, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16AA0B
goto_if eq, EventScript_16AA0B
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
goto_if 4, EventScript_16AA0B
goto_if ge, EventScript_16AA0B
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
goto_if 5, EventScript_16AA15
goto_if ne, EventScript_16AA15
call EventScript_1A8CD9
msgbox gUnknown_81A5A9D
setflag FLAG_0x24A
setflag FLAG_DID_ZYNX_TRADE
release
end
data/maps/CeruleanCity_House4/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "32",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
"x": 5,
"y": 3,
"elevation": 3,
data/maps/CeruleanCity_House4/scripts.inc
+25 -25
View File
@@ -4,83 +4,83 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE
CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
lock
specialvar VAR_0x8004, sub_8146CE8
specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState
copyvar VAR_0x8008, VAR_RESULT
compare_var_to_value VAR_0x8004, 0
goto_if_eq EventScript_16AD59
goto_if eq, EventScript_CeruleanCity_House4_NoNews
compare_var_to_value VAR_0x8004, 1
goto_if_eq EventScript_16AD63
goto_if eq, EventScript_CeruleanCity_House4_News1
compare_var_to_value VAR_0x8004, 2
goto_if_eq EventScript_16AD89
goto_if eq, EventScript_CeruleanCity_House4_News2
compare_var_to_value VAR_0x8004, 3
goto_if_eq EventScript_16ADAF
goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread
compare_var_to_value VAR_0x8004, 4
goto_if_eq EventScript_16ADC3
goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1
compare_var_to_value VAR_0x8004, 5
goto_if_eq EventScript_16ADE9
goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2
compare_var_to_value VAR_0x8004, 6
goto_if_eq EventScript_16AE0F
goto_if eq, EventScript_CeruleanCity_House4_NewsDone
end
EventScript_16AD59:: @ 816AD59
EventScript_CeruleanCity_House4_NoNews:: @ 816AD59
msgbox gUnknown_8192AF0
release
end
EventScript_16AD63:: @ 816AD63
call EventScript_16AE23
EventScript_CeruleanCity_House4_News1:: @ 816AD63
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192B43
giveitem VAR_0x8008
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16AE45
goto_if eq, EventScript_16AE45
release
end
EventScript_16AD89:: @ 816AD89
call EventScript_16AE23
EventScript_CeruleanCity_House4_News2:: @ 816AD89
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192C07
giveitem VAR_0x8008, 4
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16AE45
goto_if eq, EventScript_16AE45
release
end
EventScript_16ADAF:: @ 816ADAF
EventScript_CeruleanCity_House4_NewsNotSpread:: @ 816ADAF
applymovement 1, Movement_1A75E1
waitmovement 0
msgbox gUnknown_8192CD5
release
end
EventScript_16ADC3:: @ 816ADC3
call EventScript_16AE23
EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192D4B
giveitem VAR_0x8008
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16AE45
goto_if eq, EventScript_16AE45
release
end
EventScript_16ADE9:: @ 816ADE9
call EventScript_16AE23
EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9
call EventScript_CeruleanCity_House4_MovementReactionToNews
msgbox gUnknown_8192DE3
giveitem VAR_0x8008, 4
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16AE45
goto_if eq, EventScript_16AE45
release
end
EventScript_16AE0F:: @ 816AE0F
EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F
applymovement 1, Movement_1A75E1
waitmovement 0
msgbox gUnknown_8192EC5
release
end
EventScript_16AE23:: @ 816AE23
EventScript_CeruleanCity_House4_MovementReactionToNews:: @ 816AE23
playse SE_PIN
applymovement 1, Movement_1A75DB
waitmovement 0
data/maps/CeruleanCity_House5/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "33",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
"x": 7,
"y": 4,
"elevation": 3,
data/maps/CeruleanCity_House5/scripts.inc
+12 -12
View File
@@ -4,18 +4,18 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F
CeruleanCity_House5_EventScript_16AE50:: @ 816AE50
lock
faceplayer
checkflag FLAG_0x2BB
goto_if_eq EventScript_16AEB7
checkflag FLAG_GOT_POWDER_JAR
goto_if TRUE, EventScript_16AEB7
msgbox gUnknown_8192F67, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16AEAD
checkflag FLAG_0x847
goto_if 0, EventScript_16AEA3
goto_if eq, EventScript_16AEAD
checkflag FLAG_SYS_GOT_BERRY_POUCH
goto_if FALSE, EventScript_16AEA3
msgbox gUnknown_8193003
setflag FLAG_0x2BB
setflag FLAG_GOT_POWDER_JAR
giveitem ITEM_POWDER_JAR
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_1A6BF9
goto_if eq, EventScript_1A6BF9
msgbox gUnknown_8193033
release
end
@@ -144,20 +144,20 @@ EventScript_16B048:: @ 816B048
EventScript_16B055:: @ 816B055
msgbox gUnknown_819331E, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16AEC8
goto_if eq, EventScript_16AEC8
copyvar VAR_0x8004, VAR_0x8009
specialvar VAR_RESULT, sub_815EEB0
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16B0CC
goto_if eq, EventScript_16B0CC
giveitem VAR_0x8008
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16B0BF
goto_if eq, EventScript_16B0BF
copyvar VAR_0x8004, VAR_0x8009
special sub_815EF5C
special sub_815F070
msgbox gUnknown_819337A, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16AEC8
goto_if eq, EventScript_16AEC8
msgbox gUnknown_81933FB
special sub_815F114
release
@@ -178,7 +178,7 @@ CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA
lockall
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_814EA7C
waitstate
releaseall
data/maps/CeruleanCity_Mart/map.json
+3 -3
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "68",
"graphics_id": "MAP_OBJ_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "23",
"graphics_id": "MAP_OBJ_GFX_WOMAN_1",
"x": 9,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "18",
"graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
"x": 1,
"y": 7,
"elevation": 3,
data/maps/CeruleanCity_Mart/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7
CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
lock
faceplayer
message Text_1A6211
data/maps/CeruleanCity_PokemonCenter_1F/map.json
+7 -7
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "64",
"graphics_id": "MAP_OBJ_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "61",
"graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
"x": 12,
"y": 5,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "26",
"graphics_id": "MAP_OBJ_GFX_ROCKER",
"x": 5,
"y": 4,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "18",
"graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
"x": 4,
"y": 8,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
"graphics_id": "22",
"graphics_id": "MAP_OBJ_GFX_LASS",
"x": 3,
"y": 3,
"elevation": 3,
@@ -89,7 +89,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68",
"flag": "157"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "0",
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68",
"flag": "157"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc
+1 -3
View File
@@ -25,9 +25,7 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E
CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57
lock
faceplayer
setvar VAR_0x8004, 13
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
famechecker FAMECHECKER_BILL, 1
msgbox gUnknown_8192116
release
end
data/maps/CeruleanCity_PokemonCenter_2F/map.json
+5 -5
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "69",
"graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "112"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/CinnabarIsland/map.json
+6 -6
View File
@@ -25,7 +25,7 @@
],
"object_events": [
{
"graphics_id": "28",
"graphics_id": "MAP_OBJ_GFX_WOMAN_2",
"x": 14,
"y": 6,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
"graphics_id": "32",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
"x": 11,
"y": 11,
"elevation": 3,
@@ -51,7 +51,7 @@
"flag": "0"
},
{
"graphics_id": "73",
"graphics_id": "MAP_OBJ_GFX_BILL",
"x": 20,
"y": 7,
"elevation": 3,
@@ -61,10 +61,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "98"
"flag": "FLAG_HIDE_CINNABAR_BILL"
},
{
"graphics_id": "108",
"graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
"x": 23,
"y": 7,
"elevation": 1,
@@ -74,7 +74,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "107"
"flag": "FLAG_HIDE_CINNABAR_SEAGALLOP"
}
],
"warp_events": [
data/maps/CinnabarIsland/scripts.inc
+49 -53
View File
@@ -6,17 +6,17 @@ CinnabarIsland_MapScripts:: @ 8166ED6
CinnabarIsland_MapScript1_166EE1:: @ 8166EE1
setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND
call EventScript_166F5E
compare_var_to_value VAR_0x4071, 1
call_if 1, EventScript_166F24
compare_var_to_value VAR_0x4071, 3
call_if 1, EventScript_166F52
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1
call_if 1, EventScript_166F0B
call_if eq, EventScript_166F24
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3
call_if eq, EventScript_166F52
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
call_if eq, EventScript_166F0B
end
EventScript_166F0B:: @ 8166F0B
savebgm MUS_ANNAI
setflag FLAG_0x002
setflag FLAG_TEMP_2
setobjectxyperm 3, 15, 12
setobjectmovementtype 3, 9
setobjectxyperm 4, 30, 12
@@ -25,8 +25,8 @@ EventScript_166F0B:: @ 8166F0B
EventScript_166F24:: @ 8166F24
getplayerxy VAR_0x8004, VAR_0x8005
compare_var_to_value VAR_0x8004, 18
goto_if 4, EventScript_166F4A
setflag FLAG_0x002
goto_if ge, EventScript_166F4A
setflag FLAG_TEMP_2
setobjectxyperm 3, 18, 12
setobjectmovementtype 3, 7
setobjectxyperm 4, 30, 12
@@ -42,8 +42,8 @@ EventScript_166F52:: @ 8166F52
return
EventScript_166F5E:: @ 8166F5E
checkflag FLAG_0x1A8
goto_if_eq EventScript_166F68
checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY
goto_if TRUE, EventScript_166F68
return
EventScript_166F68:: @ 8166F68
@@ -51,9 +51,9 @@ EventScript_166F68:: @ 8166F68
return
CinnabarIsland_MapScript2_166F6E:: @ 8166F6E
map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166F88
map_script_2 VAR_0x4071, 1, EventScript_166FCD
map_script_2 VAR_0x4071, 3, EventScript_166FA0
map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, EventScript_166F88
map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166FCD
map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, EventScript_166FA0
.2byte 0
EventScript_166F88:: @ 8166F88
@@ -61,7 +61,7 @@ EventScript_166F88:: @ 8166F88
clearflag FLAG_SPECIAL_FLAG_0x4001
savebgm MUS_DUMMY
textcolor 0
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2
delay 20
call EventScript_1670E6
releaseall
@@ -75,9 +75,9 @@ EventScript_166FA0:: @ 8166FA0
applymovement 3, Movement_166FC6
waitmovement 0
removeobject 3
setvar VAR_0x4071, 4
setflag FLAG_0x075
clearflag FLAG_0x076
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4
setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE
clearflag FLAG_HIDE_LOSTELLE_IN_HER_HOME
releaseall
end
@@ -93,25 +93,25 @@ Movement_166FC6:: @ 8166FC6
EventScript_166FCD:: @ 8166FCD
lockall
textcolor 0
checkflag FLAG_0x002
call_if 0, EventScript_167032
checkflag FLAG_0x002
call_if 1, EventScript_16703D
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_167032
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_16703D
playse SE_PIN
applymovement 3, Movement_1A75DB
waitmovement 0
applymovement 3, Movement_1A75DD
waitmovement 0
checkflag FLAG_0x002
call_if 0, EventScript_167048
checkflag FLAG_0x002
call_if 1, EventScript_167053
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_167048
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_167053
msgbox gUnknown_8180C90
msgbox gUnknown_8180CAA, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_167068
goto_if eq, EventScript_167068
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_167078
goto_if eq, EventScript_167078
end
EventScript_167032:: @ 8167032
@@ -146,13 +146,13 @@ EventScript_167068:: @ 8167068
EventScript_167078:: @ 8167078
msgbox gUnknown_8180DF8
closemessage
checkflag FLAG_0x002
call_if 0, EventScript_1670A0
checkflag FLAG_0x002
call_if 1, EventScript_1670B3
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1670A0
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_1670B3
removeobject 3
setvar VAR_0x4071, 2
clearflag FLAG_0x0A2
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
releaseall
end
@@ -201,26 +201,26 @@ Movement_1670E2:: @ 81670E2
step_end
EventScript_1670E6:: @ 81670E6
checkflag FLAG_0x002
call_if 1, EventScript_167142
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_167142
addobject 4
checkflag FLAG_0x002
call_if 0, EventScript_167154
checkflag FLAG_0x002
call_if 1, EventScript_167166
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_167154
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_167166
msgbox gUnknown_8180EAD
closemessage
checkflag FLAG_0x002
call_if 0, EventScript_167171
checkflag FLAG_0x002
call_if 1, EventScript_167183
setvar VAR_0x4071, 2
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_167171
checkflag FLAG_TEMP_2
call_if TRUE, EventScript_167183
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2
removeobject 3
delay 40
setflag FLAG_0x06B
setflag FLAG_HIDE_CINNABAR_SEAGALLOP
setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1
setvar VAR_0x8004, 8
setvar VAR_0x8006, 1
setvar VAR_0x8004, SEAGALLOP_CINNABAR_ISLAND
setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND
goto EventScript_1A90DA
end
@@ -343,9 +343,7 @@ Movement_1671ED:: @ 81671ED
CinnabarIsland_EventScript_1671EF:: @ 81671EF
lock
faceplayer
setvar VAR_0x8004, 8
setvar VAR_0x8005, 3
special SetFlavorTextFlagFromSpecialVars
famechecker FAMECHECKER_BLAINE, 3
msgbox gUnknown_8180B34
release
end
@@ -364,9 +362,7 @@ CinnabarIsland_EventScript_16721A:: @ 816721A
CinnabarIsland_EventScript_167223:: @ 8167223
lockall
setvar VAR_0x8004, 8
setvar VAR_0x8005, 0
special SetFlavorTextFlagFromSpecialVars
famechecker FAMECHECKER_BLAINE, 0
msgbox gUnknown_8180C4A
releaseall
end
data/maps/CinnabarIsland_Gym/map.json
+9 -9
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "52",
"graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
"x": 25,
"y": 11,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 25,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 17,
"y": 5,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "52",
"graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
"x": 16,
"y": 11,
"elevation": 3,
@@ -66,7 +66,7 @@
"flag": "0"
},
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 16,
"y": 18,
"elevation": 3,
@@ -79,7 +79,7 @@
"flag": "0"
},
{
"graphics_id": "52",
"graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
"x": 4,
"y": 19,
"elevation": 3,
@@ -92,7 +92,7 @@
"flag": "0"
},
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 4,
"y": 11,
"elevation": 3,
@@ -105,7 +105,7 @@
"flag": "0"
},
{
"graphics_id": "86",
"graphics_id": "MAP_OBJ_GFX_BLAINE",
"x": 5,
"y": 4,
"elevation": 3,
@@ -118,7 +118,7 @@
"flag": "0"
},
{
"graphics_id": "91",
"graphics_id": "MAP_OBJ_GFX_GYM_GUY",
"x": 24,
"y": 20,
"elevation": 3,
data/maps/CinnabarIsland_Gym/scripts.inc
+122 -129
View File
@@ -3,20 +3,20 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B
.byte 0
CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951
checkflag FLAG_0x4B6
goto_if_eq EventScript_16D991
checkflag FLAG_0x265
call_if 1, EventScript_16D9B0
checkflag FLAG_0x267
call_if 1, EventScript_16D9B6
checkflag FLAG_0x268
call_if 1, EventScript_16D9BC
checkflag FLAG_0x269
call_if 1, EventScript_16D9C2
checkflag FLAG_0x26A
call_if 1, EventScript_16D9C8
checkflag FLAG_0x26B
call_if 1, EventScript_16D9CE
checkflag FLAG_DEFEATED_BLAINE
goto_if TRUE, EventScript_16D991
checkflag FLAG_CINNABAR_GYM_QUIZ_1
call_if TRUE, EventScript_16D9B0
checkflag FLAG_CINNABAR_GYM_QUIZ_2
call_if TRUE, EventScript_16D9B6
checkflag FLAG_CINNABAR_GYM_QUIZ_3
call_if TRUE, EventScript_16D9BC
checkflag FLAG_CINNABAR_GYM_QUIZ_4
call_if TRUE, EventScript_16D9C2
checkflag FLAG_CINNABAR_GYM_QUIZ_5
call_if TRUE, EventScript_16D9C8
checkflag FLAG_CINNABAR_GYM_QUIZ_6
call_if TRUE, EventScript_16D9CE
end
EventScript_16D991:: @ 816D991
@@ -53,27 +53,22 @@ EventScript_16D9CE:: @ 816D9CE
return
CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4
setvar VAR_0x8004, 8
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
trainerbattle 1, 419, 0, Text_199543, Text_1995FA, EventScript_16DA06
checkflag FLAG_0x24E
goto_if 0, EventScript_16DA34
famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle 1, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06
checkflag FLAG_GOT_TM38_FROM_BLAINE
goto_if FALSE, EventScript_16DA34
msgbox gUnknown_819971D
release
end
EventScript_16DA06:: @ 816DA06
setvar VAR_0x8004, 8
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B6
setflag FLAG_UNK826
famechecker FAMECHECKER_BLAINE, 1
setflag FLAG_DEFEATED_BLAINE
setflag FLAG_BADGE07_GET
setrespawn SPAWN_CINNABAR_ISLAND
setvar VAR_0x4071, 1
clearflag FLAG_0x062
setvar VAR_0x8008, 7
call EventScript_1A6B18
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1
clearflag FLAG_HIDE_CINNABAR_BILL
set_gym_trainers 7
goto EventScript_16DA34
end
@@ -81,10 +76,10 @@ EventScript_16DA34:: @ 816DA34
msgbox gUnknown_819969E
checkitemspace ITEM_TM38, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16DA75
goto_if eq, EventScript_16DA75
additem ITEM_TM38, 1
giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38
setflag FLAG_0x24E
setflag FLAG_GOT_TM38_FROM_BLAINE
msgbox gUnknown_8199652
release
end
@@ -95,18 +90,18 @@ EventScript_16DA75:: @ 816DA75
end
CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F
trainerbattle 0, 177, 0, Text_1997A5, Text_1997D6
trainerbattle 0, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6
msgbox gUnknown_81997EA, 6
end
CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96
trainerbattle 2, 178, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
trainerbattle 2, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
msgbox gUnknown_8199911, 6
end
EventScript_16DAB1:: @ 816DAB1
checkflag FLAG_0x267
call_if 0, EventScript_16DABC
checkflag FLAG_CINNABAR_GYM_QUIZ_2
call_if FALSE, EventScript_16DABC
release
end
@@ -115,16 +110,14 @@ EventScript_16DABC:: @ 816DABC
return
CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2
trainerbattle 2, 179, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
setvar VAR_0x8004, 8
setvar VAR_0x8005, 2
special SetFlavorTextFlagFromSpecialVars
trainerbattle 2, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
famechecker FAMECHECKER_BLAINE, 2
msgbox gUnknown_81999DF, 6
end
EventScript_16DAEA:: @ 816DAEA
checkflag FLAG_0x269
call_if 0, EventScript_16DAF5
checkflag FLAG_CINNABAR_GYM_QUIZ_4
call_if FALSE, EventScript_16DAF5
release
end
@@ -133,13 +126,13 @@ EventScript_16DAF5:: @ 816DAF5
return
CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB
trainerbattle 2, 180, 0, Text_199AFC, Text_199B16, EventScript_16DB16
trainerbattle 2, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16
msgbox gUnknown_8199B27, 6
end
EventScript_16DB16:: @ 816DB16
checkflag FLAG_0x26B
call_if 0, EventScript_16DB21
checkflag FLAG_CINNABAR_GYM_QUIZ_6
call_if FALSE, EventScript_16DB21
release
end
@@ -148,13 +141,13 @@ EventScript_16DB21:: @ 816DB21
return
CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27
trainerbattle 2, 213, 0, Text_19983F, Text_199870, EventScript_16DB42
trainerbattle 2, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42
msgbox gUnknown_819987D, 6
end
EventScript_16DB42:: @ 816DB42
checkflag FLAG_0x265
call_if 0, EventScript_16DB4D
checkflag FLAG_CINNABAR_GYM_QUIZ_1
call_if FALSE, EventScript_16DB4D
release
end
@@ -163,13 +156,13 @@ EventScript_16DB4D:: @ 816DB4D
return
CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53
trainerbattle 2, 214, 0, Text_199948, Text_199973, EventScript_16DB6E
trainerbattle 2, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E
msgbox gUnknown_8199986, 6
end
EventScript_16DB6E:: @ 816DB6E
checkflag FLAG_0x268
call_if 0, EventScript_16DB79
checkflag FLAG_CINNABAR_GYM_QUIZ_3
call_if FALSE, EventScript_16DB79
release
end
@@ -178,13 +171,13 @@ EventScript_16DB79:: @ 816DB79
return
CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F
trainerbattle 2, 215, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
trainerbattle 2, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
msgbox gUnknown_8199AC9, 6
end
EventScript_16DB9A:: @ 816DB9A
checkflag FLAG_0x26A
call_if 0, EventScript_16DBA5
checkflag FLAG_CINNABAR_GYM_QUIZ_5
call_if FALSE, EventScript_16DBA5
release
end
@@ -195,8 +188,8 @@ EventScript_16DBA5:: @ 816DBA5
CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB
lock
faceplayer
checkflag FLAG_0x4B6
goto_if_eq EventScript_16DBC0
checkflag FLAG_DEFEATED_BLAINE
goto_if TRUE, EventScript_16DBC0
msgbox gUnknown_8199B81
release
end
@@ -208,8 +201,8 @@ EventScript_16DBC0:: @ 816DBC0
CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA
lockall
checkflag FLAG_UNK826
goto_if_eq EventScript_16DBDE
checkflag FLAG_BADGE07_GET
goto_if TRUE, EventScript_16DBDE
msgbox gUnknown_8199C29
releaseall
end
@@ -235,9 +228,9 @@ EventScript_16DC00:: @ 816DC00
msgbox gUnknown_8199C9F
msgbox gUnknown_8199D5A, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16DC43
goto_if eq, EventScript_16DC43
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16DC6A
goto_if eq, EventScript_16DC6A
end
EventScript_16DC27:: @ 816DC27
@@ -256,8 +249,8 @@ EventScript_16DC34:: @ 816DC34
EventScript_16DC43:: @ 816DC43
call EventScript_16DC27
checkflag FLAG_0x265
goto_if_eq EventScript_16DC68
checkflag FLAG_CINNABAR_GYM_QUIZ_1
goto_if TRUE, EventScript_16DC68
call EventScript_16DC58
releaseall
end
@@ -267,7 +260,7 @@ EventScript_16DC58:: @ 816DC58
waitse
call EventScript_16E117
special DrawWholeMapView
setflag FLAG_0x265
setflag FLAG_CINNABAR_GYM_QUIZ_1
return
EventScript_16DC68:: @ 816DC68
@@ -276,21 +269,21 @@ EventScript_16DC68:: @ 816DC68
EventScript_16DC6A:: @ 816DC6A
call EventScript_16DC34
checktrainerflag FLAG_0x0D5
goto_if 0, EventScript_16DC7A
checktrainerflag TRAINER_BURGLAR_QUINN
goto_if lt, EventScript_16DC7A
releaseall
end
EventScript_16DC7A:: @ 816DC7A
compare_var_to_value VAR_0x4001, 0
call_if 1, EventScript_16DCB4
call_if eq, EventScript_16DCB4
compare_var_to_value VAR_0x4001, 1
call_if 1, EventScript_16DCC6
call_if eq, EventScript_16DCC6
textcolor 0
msgbox gUnknown_819983F
trainerbattle 3, 213, 0, Text_199870
checkflag FLAG_0x265
goto_if_eq EventScript_16DC68
trainerbattle 3, TRAINER_BURGLAR_QUINN, 0, Text_199870
checkflag FLAG_CINNABAR_GYM_QUIZ_1
goto_if TRUE, EventScript_16DC68
call EventScript_16DC58
releaseall
end
@@ -332,15 +325,15 @@ EventScript_16DCF5:: @ 816DCF5
msgbox gUnknown_8199C9F
msgbox gUnknown_8199D79, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16DD41
goto_if eq, EventScript_16DD41
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16DD1C
goto_if eq, EventScript_16DD1C
end
EventScript_16DD1C:: @ 816DD1C
call EventScript_16DC27
checkflag FLAG_0x267
goto_if_eq EventScript_16DC68
checkflag FLAG_CINNABAR_GYM_QUIZ_2
goto_if TRUE, EventScript_16DC68
call EventScript_16DD31
releaseall
end
@@ -350,26 +343,26 @@ EventScript_16DD31:: @ 816DD31
waitse
call EventScript_16E157
special DrawWholeMapView
setflag FLAG_0x267
setflag FLAG_CINNABAR_GYM_QUIZ_2
return
EventScript_16DD41:: @ 816DD41
call EventScript_16DC34
checktrainerflag FLAG_0x0B2
goto_if 0, EventScript_16DD51
checktrainerflag TRAINER_SUPER_NERD_AVERY
goto_if lt, EventScript_16DD51
releaseall
end
EventScript_16DD51:: @ 816DD51
compare_var_to_value VAR_0x4001, 0
call_if 1, EventScript_16DD8B
call_if eq, EventScript_16DD8B
compare_var_to_value VAR_0x4001, 1
call_if 1, EventScript_16DD9D
call_if eq, EventScript_16DD9D
textcolor 0
msgbox gUnknown_81998BD
trainerbattle 3, 178, 0, Text_1998ED
checkflag FLAG_0x267
goto_if_eq EventScript_16DC68
trainerbattle 3, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED
checkflag FLAG_CINNABAR_GYM_QUIZ_2
goto_if TRUE, EventScript_16DC68
call EventScript_16DD31
releaseall
end
@@ -420,15 +413,15 @@ EventScript_16DDD3:: @ 816DDD3
msgbox gUnknown_8199C9F
msgbox gUnknown_8199DA9, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16DE1F
goto_if eq, EventScript_16DE1F
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16DDFA
goto_if eq, EventScript_16DDFA
end
EventScript_16DDFA:: @ 816DDFA
call EventScript_16DC27
checkflag FLAG_0x268
goto_if_eq EventScript_16DC68
checkflag FLAG_CINNABAR_GYM_QUIZ_3
goto_if TRUE, EventScript_16DC68
call EventScript_16DE0F
releaseall
end
@@ -438,26 +431,26 @@ EventScript_16DE0F:: @ 816DE0F
waitse
call EventScript_16E197
special DrawWholeMapView
setflag FLAG_0x268
setflag FLAG_CINNABAR_GYM_QUIZ_3
return
EventScript_16DE1F:: @ 816DE1F
call EventScript_16DC34
checktrainerflag FLAG_0x0D6
goto_if 0, EventScript_16DE2F
checktrainerflag TRAINER_BURGLAR_RAMON
goto_if lt, EventScript_16DE2F
releaseall
end
EventScript_16DE2F:: @ 816DE2F
compare_var_to_value VAR_0x4001, 0
call_if 1, EventScript_16DE69
call_if eq, EventScript_16DE69
compare_var_to_value VAR_0x4001, 1
call_if 1, EventScript_16DE7B
call_if eq, EventScript_16DE7B
textcolor 0
msgbox gUnknown_8199948
trainerbattle 3, 214, 0, Text_199973
checkflag FLAG_0x268
goto_if_eq EventScript_16DC68
trainerbattle 3, TRAINER_BURGLAR_RAMON, 0, Text_199973
checkflag FLAG_CINNABAR_GYM_QUIZ_3
goto_if TRUE, EventScript_16DC68
call EventScript_16DE0F
releaseall
end
@@ -499,15 +492,15 @@ EventScript_16DEAA:: @ 816DEAA
msgbox gUnknown_8199C9F
msgbox gUnknown_8199DC6, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16DEF6
goto_if eq, EventScript_16DEF6
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16DED1
goto_if eq, EventScript_16DED1
end
EventScript_16DED1:: @ 816DED1
call EventScript_16DC27
checkflag FLAG_0x269
goto_if_eq EventScript_16DC68
checkflag FLAG_CINNABAR_GYM_QUIZ_4
goto_if TRUE, EventScript_16DC68
call EventScript_16DEE6
releaseall
end
@@ -517,26 +510,26 @@ EventScript_16DEE6:: @ 816DEE6
waitse
call EventScript_16E1D7
special DrawWholeMapView
setflag FLAG_0x269
setflag FLAG_CINNABAR_GYM_QUIZ_4
return
EventScript_16DEF6:: @ 816DEF6
call EventScript_16DC34
checktrainerflag FLAG_0x0B3
goto_if 0, EventScript_16DF06
checktrainerflag TRAINER_SUPER_NERD_DEREK
goto_if lt, EventScript_16DF06
releaseall
end
EventScript_16DF06:: @ 816DF06
compare_var_to_value VAR_0x4001, 0
call_if 1, EventScript_16DF40
call_if eq, EventScript_16DF40
compare_var_to_value VAR_0x4001, 1
call_if 1, EventScript_16DF52
call_if eq, EventScript_16DF52
textcolor 0
msgbox gUnknown_81999B7
trainerbattle 3, 179, 0, Text_1999DB
checkflag FLAG_0x269
goto_if_eq EventScript_16DC68
trainerbattle 3, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB
checkflag FLAG_CINNABAR_GYM_QUIZ_4
goto_if TRUE, EventScript_16DC68
call EventScript_16DEE6
releaseall
end
@@ -578,15 +571,15 @@ EventScript_16DF81:: @ 816DF81
msgbox gUnknown_8199C9F
msgbox gUnknown_8199E00, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16DFA8
goto_if eq, EventScript_16DFA8
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16DFCD
goto_if eq, EventScript_16DFCD
end
EventScript_16DFA8:: @ 816DFA8
call EventScript_16DC27
checkflag FLAG_0x26A
goto_if_eq EventScript_16DC68
checkflag FLAG_CINNABAR_GYM_QUIZ_5
goto_if TRUE, EventScript_16DC68
call EventScript_16DFBD
releaseall
end
@@ -596,26 +589,26 @@ EventScript_16DFBD:: @ 816DFBD
waitse
call EventScript_16E1F3
special DrawWholeMapView
setflag FLAG_0x26A
setflag FLAG_CINNABAR_GYM_QUIZ_5
return
EventScript_16DFCD:: @ 816DFCD
call EventScript_16DC34
checktrainerflag FLAG_0x0D7
goto_if 0, EventScript_16DFDD
checktrainerflag TRAINER_BURGLAR_DUSTY
goto_if lt, EventScript_16DFDD
releaseall
end
EventScript_16DFDD:: @ 816DFDD
compare_var_to_value VAR_0x4001, 0
call_if 1, EventScript_16E017
call_if eq, EventScript_16E017
compare_var_to_value VAR_0x4001, 1
call_if 1, EventScript_16E029
call_if eq, EventScript_16E029
textcolor 0
msgbox gUnknown_8199A7F
trainerbattle 3, 215, 0, Text_199AB9
checkflag FLAG_0x26A
goto_if_eq EventScript_16DC68
trainerbattle 3, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9
checkflag FLAG_CINNABAR_GYM_QUIZ_5
goto_if TRUE, EventScript_16DC68
call EventScript_16DFBD
releaseall
end
@@ -657,15 +650,15 @@ EventScript_16E058:: @ 816E058
msgbox gUnknown_8199C9F
msgbox gUnknown_8199E36, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E0A4
goto_if eq, EventScript_16E0A4
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E07F
goto_if eq, EventScript_16E07F
end
EventScript_16E07F:: @ 816E07F
call EventScript_16DC27
checkflag FLAG_0x26B
goto_if_eq EventScript_16DC68
checkflag FLAG_CINNABAR_GYM_QUIZ_6
goto_if TRUE, EventScript_16DC68
call EventScript_16E094
releaseall
end
@@ -675,26 +668,26 @@ EventScript_16E094:: @ 816E094
waitse
call EventScript_16E233
special DrawWholeMapView
setflag FLAG_0x26B
setflag FLAG_CINNABAR_GYM_QUIZ_6
return
EventScript_16E0A4:: @ 816E0A4
call EventScript_16DC34
checktrainerflag FLAG_0x0B4
goto_if 0, EventScript_16E0B4
checktrainerflag TRAINER_SUPER_NERD_ZAC
goto_if lt, EventScript_16E0B4
releaseall
end
EventScript_16E0B4:: @ 816E0B4
compare_var_to_value VAR_0x4001, 0
call_if 1, EventScript_16E0EE
call_if eq, EventScript_16E0EE
compare_var_to_value VAR_0x4001, 1
call_if 1, EventScript_16E100
call_if eq, EventScript_16E100
textcolor 0
msgbox gUnknown_8199AFC
trainerbattle 3, 180, 0, Text_199B16
checkflag FLAG_0x26B
goto_if_eq EventScript_16DC68
trainerbattle 3, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16
checkflag FLAG_CINNABAR_GYM_QUIZ_6
goto_if TRUE, EventScript_16DC68
call EventScript_16E094
releaseall
end
data/maps/CinnabarIsland_Mart/map.json
+3 -3
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "68",
"graphics_id": "MAP_OBJ_GFX_CLERK",
"x": 2,
"y": 3,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "28",
"graphics_id": "MAP_OBJ_GFX_WOMAN_2",
"x": 6,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 8,
"y": 2,
"elevation": 3,
data/maps/CinnabarIsland_Mart/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19
CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
lock
faceplayer
message Text_1A6211
data/maps/CinnabarIsland_PokemonCenter_1F/map.json
+8 -8
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "64",
"graphics_id": "MAP_OBJ_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "42",
"graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
"x": 2,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "61",
"graphics_id": "MAP_OBJ_GFX_GENTLEMAN",
"x": 9,
"y": 7,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "18",
"graphics_id": "MAP_OBJ_GFX_YOUNGSTER",
"x": 14,
"y": 6,
"elevation": 3,
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
"flag": "157"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "0",
@@ -89,10 +89,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9",
"flag": "157"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "73",
"graphics_id": "MAP_OBJ_GFX_BILL",
"x": 11,
"y": 5,
"elevation": 3,
@@ -102,7 +102,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A",
"flag": "162"
"flag": "FLAG_HIDE_CINNABAR_POKECENTER_BILL"
}
],
"warp_events": [
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+7 -7
View File
@@ -31,23 +31,23 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
faceplayer
msgbox gUnknown_819A725, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E9A5
goto_if eq, EventScript_16E9A5
msgbox gUnknown_819A785
closemessage
playbgm MUS_ANNAI, 1
savebgm MUS_ANNAI
setflag FLAG_SPECIAL_FLAG_0x4001
setflag FLAG_0x0A2
setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
delay 20
compare_var_to_value VAR_FACING, 1
call_if 1, EventScript_16E96F
call_if eq, EventScript_16E96F
compare_var_to_value VAR_FACING, 4
call_if 1, EventScript_16E981
call_if eq, EventScript_16E981
compare_var_to_value VAR_FACING, 3
call_if 1, EventScript_16E993
call_if eq, EventScript_16E993
removeobject 7
setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1
clearflag FLAG_0x062
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
clearflag FLAG_HIDE_CINNABAR_BILL
warp MAP_CINNABAR_ISLAND, 255, 14, 11
waitstate
release
data/maps/CinnabarIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "69",
"graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "112"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [
data/maps/CinnabarIsland_PokemonLab_Entrance/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 2,
"y": 4,
"elevation": 3,
data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc
+3 -3
View File
@@ -3,12 +3,12 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273
.byte 0
CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279
compare_var_to_value VAR_0x406A, 1
call_if 1, EventScript_16E285
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
call_if eq, EventScript_16E285
end
EventScript_16E285:: @ 816E285
setvar VAR_0x406A, 2
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
return
CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "19",
"graphics_id": "MAP_OBJ_GFX_BOY",
"x": 11,
"y": 8,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 12,
"y": 3,
"elevation": 3,
data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+72 -72
View File
@@ -6,20 +6,20 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
faceplayer
setvar VAR_0x8008, 8
call EventScript_1A8CAD
checkflag FLAG_0x276
goto_if_eq EventScript_16E473
checkflag FLAG_DID_SEELOR_TRADE
goto_if TRUE, EventScript_16E473
msgbox gUnknown_81A597B, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E45B
goto_if eq, EventScript_16E45B
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
goto_if 4, EventScript_16E45B
goto_if ge, EventScript_16E45B
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
goto_if 5, EventScript_16E465
goto_if ne, EventScript_16E465
call EventScript_1A8CD9
msgbox gUnknown_81A59DA
setflag FLAG_0x276
setflag FLAG_DID_SEELOR_TRADE
release
end
@@ -43,48 +43,48 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D
lock
faceplayer
setvar VAR_RESULT, 0
checkflag FLAG_0x2EE
call_if 1, EventScript_16E8A1
checkflag FLAG_REVIVED_AMBER
call_if TRUE, EventScript_16E8A1
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E897
compare_var_to_value VAR_0x406A, 2
goto_if_eq EventScript_16E736
compare_var_to_value VAR_0x406A, 1
goto_if_eq EventScript_16E72C
goto_if eq, EventScript_16E897
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2
goto_if eq, EventScript_16E736
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
goto_if eq, EventScript_16E72C
call EventScript_16E4EC
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E544
goto_if eq, EventScript_16E544
call EventScript_16E504
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E586
goto_if eq, EventScript_16E586
call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E5C8
goto_if eq, EventScript_16E5C8
msgbox gUnknown_819A282
goto EventScript_16E53A
end
EventScript_16E4EC:: @ 816E4EC
checkflag FLAG_0x273
goto_if 0, EventScript_16E534
checkflag FLAG_0x2ED
goto_if_eq EventScript_16E534
checkflag FLAG_GOT_HELIX_FOSSIL
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_HELIX
goto_if TRUE, EventScript_16E534
setvar VAR_RESULT, 1
return
EventScript_16E504:: @ 816E504
checkflag FLAG_0x272
goto_if 0, EventScript_16E534
checkflag FLAG_0x2EC
goto_if_eq EventScript_16E534
checkflag FLAG_GOT_DOME_FOSSIL
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_DOME
goto_if TRUE, EventScript_16E534
setvar VAR_RESULT, 1
return
EventScript_16E51C:: @ 816E51C
checkflag FLAG_0x25E
goto_if 0, EventScript_16E534
checkflag FLAG_0x2EE
goto_if_eq EventScript_16E534
checkflag FLAG_GOT_OLD_AMBER
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_AMBER
goto_if TRUE, EventScript_16E534
setvar VAR_RESULT, 1
return
@@ -102,7 +102,7 @@ EventScript_16E544:: @ 816E544
waitmessage
call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E5FA
goto_if eq, EventScript_16E5FA
multichoice 0, 0, 21, 0
switch VAR_RESULT
case 0, EventScript_16E668
@@ -115,7 +115,7 @@ EventScript_16E586:: @ 816E586
waitmessage
call EventScript_16E51C
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E631
goto_if eq, EventScript_16E631
multichoice 0, 0, 22, 0
switch VAR_RESULT
case 0, EventScript_16E6A6
@@ -156,13 +156,13 @@ EventScript_16E668:: @ 816E668
getitemname 1, ITEM_HELIX_FOSSIL
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E722
goto_if eq, EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
removeitem ITEM_HELIX_FOSSIL, 1
msgbox gUnknown_819A4AB
setvar VAR_0x406A, 1
setvar VAR_0x4069, 1
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
release
end
@@ -171,13 +171,13 @@ EventScript_16E6A6:: @ 816E6A6
getitemname 1, ITEM_DOME_FOSSIL
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E722
goto_if eq, EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
removeitem ITEM_DOME_FOSSIL, 1
msgbox gUnknown_819A4AB
setvar VAR_0x406A, 1
setvar VAR_0x4069, 2
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
release
end
@@ -186,13 +186,13 @@ EventScript_16E6E4:: @ 816E6E4
getitemname 1, ITEM_OLD_AMBER
msgbox gUnknown_819A3D4, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E722
goto_if eq, EventScript_16E722
msgbox gUnknown_819A45D
textcolor 0
removeitem ITEM_OLD_AMBER, 1
msgbox gUnknown_819A4AB
setvar VAR_0x406A, 1
setvar VAR_0x4069, 3
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
release
end
@@ -207,54 +207,54 @@ EventScript_16E72C:: @ 816E72C
end
EventScript_16E736:: @ 816E736
compare_var_to_value VAR_0x4069, 1
goto_if_eq EventScript_16E758
compare_var_to_value VAR_0x4069, 2
goto_if_eq EventScript_16E79D
compare_var_to_value VAR_0x4069, 3
goto_if_eq EventScript_16E7E2
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1
goto_if eq, EventScript_16E758
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2
goto_if eq, EventScript_16E79D
compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3
goto_if eq, EventScript_16E7E2
end
EventScript_16E758:: @ 816E758
setvar VAR_0x4001, 138
setvar VAR_0x4001, SPECIES_OMANYTE
getspeciesname 0, SPECIES_OMANYTE
msgbox gUnknown_819A34F
givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A927C
setflag FLAG_0x2ED
goto_if eq, EventScript_1A927C
setflag FLAG_REVIVED_HELIX
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E827
goto_if eq, EventScript_16E827
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E85B
goto_if eq, EventScript_16E85B
end
EventScript_16E79D:: @ 816E79D
setvar VAR_0x4001, 140
setvar VAR_0x4001, SPECIES_KABUTO
getspeciesname 0, SPECIES_KABUTO
msgbox gUnknown_819A34F
givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A927C
setflag FLAG_0x2EC
goto_if eq, EventScript_1A927C
setflag FLAG_REVIVED_DOME
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E827
goto_if eq, EventScript_16E827
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E85B
goto_if eq, EventScript_16E85B
end
EventScript_16E7E2:: @ 816E7E2
setvar VAR_0x4001, 142
setvar VAR_0x4001, SPECIES_AERODACTYL
getspeciesname 0, SPECIES_AERODACTYL
msgbox gUnknown_819A34F
givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A927C
setflag FLAG_0x2EE
goto_if eq, EventScript_1A927C
setflag FLAG_REVIVED_AMBER
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E827
goto_if eq, EventScript_16E827
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_16E85B
goto_if eq, EventScript_16E85B
end
EventScript_16E827:: @ 816E827
@@ -263,10 +263,10 @@ EventScript_16E827:: @ 816E827
message Text_19A39E
waitmessage
waitfanfare
setvar VAR_0x406A, 0
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E895
goto_if eq, EventScript_16E895
call EventScript_1A8C27
call EventScript_1A74EB
goto EventScript_16E895
@@ -278,10 +278,10 @@ EventScript_16E85B:: @ 816E85B
message Text_19A39E
waitmessage
waitfanfare
setvar VAR_0x406A, 0
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E88A
goto_if eq, EventScript_16E88A
call EventScript_1A8C33
goto EventScript_16E88A
end
@@ -301,21 +301,21 @@ EventScript_16E897:: @ 816E897
end
EventScript_16E8A1:: @ 816E8A1
checkflag FLAG_0x273
goto_if_eq EventScript_16E8B9
checkflag FLAG_0x272
goto_if_eq EventScript_16E8C8
checkflag FLAG_GOT_HELIX_FOSSIL
goto_if TRUE, EventScript_16E8B9
checkflag FLAG_GOT_DOME_FOSSIL
goto_if TRUE, EventScript_16E8C8
goto EventScript_16E534
end
EventScript_16E8B9:: @ 816E8B9
checkflag FLAG_0x2ED
goto_if 0, EventScript_16E534
checkflag FLAG_REVIVED_HELIX
goto_if FALSE, EventScript_16E534
setvar VAR_RESULT, 1
return
EventScript_16E8C8:: @ 816E8C8
checkflag FLAG_0x2EC
goto_if 0, EventScript_16E534
checkflag FLAG_REVIVED_DOME
goto_if FALSE, EventScript_16E534
setvar VAR_RESULT, 1
return
data/maps/CinnabarIsland_PokemonLab_Lounge/map.json
+3 -3
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 5,
"y": 3,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "33",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_2",
"x": 4,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "28",
"graphics_id": "MAP_OBJ_GFX_WOMAN_2",
"x": 10,
"y": 5,
"elevation": 3,
data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+13 -13
View File
@@ -10,20 +10,20 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
faceplayer
setvar VAR_0x8008, 6
call EventScript_1A8CAD
checkflag FLAG_0x274
goto_if_eq EventScript_16E334
checkflag FLAG_DID_ESPHERE_TRADE
goto_if TRUE, EventScript_16E334
msgbox gUnknown_81A59FE, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E31C
goto_if eq, EventScript_16E31C
call EventScript_1A8CBD
compare_var_to_value VAR_0x8004, 6
goto_if 4, EventScript_16E31C
goto_if ge, EventScript_16E31C
call EventScript_1A8CC9
compare_var_to_var VAR_RESULT, VAR_0x8009
goto_if 5, EventScript_16E326
goto_if ne, EventScript_16E326
call EventScript_1A8CD9
msgbox gUnknown_81A5A9D
setflag FLAG_0x274
setflag FLAG_DID_ESPHERE_TRADE
release
end
@@ -50,28 +50,28 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_8053A9C
copyvar VAR_0x8009, VAR_RESULT
checkflag FLAG_0x275
goto_if_eq EventScript_16E3D4
checkflag FLAG_DID_TANGENY_TRADE
goto_if TRUE, EventScript_16E3D4
msgbox gUnknown_81A5AD6, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_16E3BC
special sub_80BF8FC
goto_if eq, EventScript_16E3BC
special Special_ChooseMonFromParty
waitstate
copyvar VAR_0x800A, VAR_0x8004
compare_var_to_value VAR_0x8004, 6
goto_if 4, EventScript_16E3BC
goto_if ge, EventScript_16E3BC
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_8053D2C
copyvar VAR_0x800B, VAR_RESULT
compare_var_to_var VAR_RESULT, VAR_0x8009
goto_if 5, EventScript_16E3C6
goto_if ne, EventScript_16E3C6
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_8053D68
special sub_8054440
waitstate
msgbox gUnknown_81A5B4A
setflag FLAG_0x275
setflag FLAG_DID_TANGENY_TRADE
release
end
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "52",
"graphics_id": "MAP_OBJ_GFX_SUPER_NERD",
"x": 5,
"y": 4,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "55",
"graphics_id": "MAP_OBJ_GFX_SCIENTIST",
"x": 10,
"y": 3,
"elevation": 3,
data/maps/DiglettsCave_NorthEntrance/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "56",
"graphics_id": "MAP_OBJ_GFX_HIKER",
"x": 4,
"y": 4,
"elevation": 3,
data/maps/DiglettsCave_SouthEntrance/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "32",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
"x": 4,
"y": 4,
"elevation": 3,
data/maps/FiveIsland/map.json
+2 -2
View File
@@ -25,7 +25,7 @@
],
"object_events": [
{
"graphics_id": "57",
"graphics_id": "MAP_OBJ_GFX_FISHER",
"x": 8,
"y": 5,
"elevation": 3,
@@ -38,7 +38,7 @@
"flag": "0"
},
{
"graphics_id": "20",
"graphics_id": "MAP_OBJ_GFX_BUG_CATCHER",
"x": 16,
"y": 10,
"elevation": 3,
data/maps/FiveIsland_Harbor/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "108",
"graphics_id": "MAP_OBJ_GFX_SEAGALLOP",
"x": 8,
"y": 9,
"elevation": 0,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "62",
"graphics_id": "MAP_OBJ_GFX_SAILOR",
"x": 8,
"y": 6,
"elevation": 3,
data/maps/FiveIsland_Harbor/scripts.inc
+1 -1
View File
@@ -6,6 +6,6 @@ FiveIsland_Harbor_EventScript_171D43:: @ 8171D43
faceplayer
message Text_181726
waitmessage
setvar VAR_0x8004, 5
setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND
goto EventScript_1A900F
end
data/maps/FiveIsland_House1/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "31",
"graphics_id": "MAP_OBJ_GFX_WOMAN_3",
"x": 10,
"y": 2,
"elevation": 3,
data/maps/FiveIsland_House2/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "32",
"graphics_id": "MAP_OBJ_GFX_OLD_MAN_1",
"x": 2,
"y": 3,
"elevation": 3,
data/maps/FiveIsland_LostCave_Room1/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "56",
"graphics_id": "MAP_OBJ_GFX_HIKER",
"x": 5,
"y": 4,
"elevation": 3,
data/maps/FiveIsland_LostCave_Room1/scripts.inc
+1 -1
View File
@@ -2,6 +2,6 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6
.byte 0
FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7
trainerbattle 0, 607, 0, Text_17CEF5, Text_17CF42
trainerbattle 0, TRAINER_RUIN_MANIAC_LAWSON, 0, Text_17CEF5, Text_17CF42
msgbox gUnknown_817CF54, 6
end
data/maps/FiveIsland_LostCave_Room10/map.json
+4 -4
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "28",
"graphics_id": "MAP_OBJ_GFX_WOMAN_2",
"x": 5,
"y": 5,
"elevation": 3,
@@ -24,10 +24,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "0x0",
"flag": "147"
"flag": "FLAG_HIDE_LOST_CAVE_SELPHY"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 5,
"y": 2,
"elevation": 3,
@@ -37,7 +37,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB",
"flag": "504"
"flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM10_SILK_SCARF"
}
],
"warp_events": [
data/maps/FiveIsland_LostCave_Room10/scripts.inc
+7 -7
View File
@@ -4,8 +4,8 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D
.byte 0
FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38
checktrainerflag FLAG_0x25E
call_if 1, EventScript_164C42
checktrainerflag TRAINER_LADY_SELPHY
call_if eq, EventScript_164C42
end
EventScript_164C42:: @ 8164C42
@@ -27,8 +27,8 @@ EventScript_164C52:: @ 8164C52
msgbox gUnknown_817D062
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_164CB6
trainerbattle 3, 606, 0, Text_17D086
goto_if eq, EventScript_164CB6
trainerbattle 3, TRAINER_LADY_SELPHY, 0, Text_17D086
msgbox gUnknown_817D0B2
closemessage
call EventScript_164CA5
@@ -38,14 +38,14 @@ EventScript_164C52:: @ 8164C52
end
EventScript_164CA5:: @ 8164CA5
setflag FLAG_0x093
clearflag FLAG_0x094
setflag FLAG_HIDE_LOST_CAVE_SELPHY
clearflag FLAG_HIDE_RESORT_GORGEOUS_SELPHY
setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1
setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1
return
EventScript_164CB6:: @ 8164CB6
settrainerflag FLAG_0x25E
settrainerflag TRAINER_LADY_SELPHY
call EventScript_164CA5
releaseall
end
data/maps/FiveIsland_LostCave_Room11/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 5,
"y": 5,
"elevation": 3,
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8",
"flag": "505"
"flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM11_LAX_INCENSE"
}
],
"warp_events": [
data/maps/FiveIsland_LostCave_Room12/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 5,
"y": 5,
"elevation": 3,
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_LostCave_Room12_EventScript_1BEDD5",
"flag": "506"
"flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM12_SEA_INCENSE"
}
],
"warp_events": [
data/maps/FiveIsland_LostCave_Room13/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 5,
"y": 5,
"elevation": 3,
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_LostCave_Room13_EventScript_1BEDE2",
"flag": "507"
"flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM13_MAX_REVIVE"
}
],
"warp_events": [
data/maps/FiveIsland_LostCave_Room14/map.json
+2 -2
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 5,
"y": 5,
"elevation": 3,
@@ -24,7 +24,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_LostCave_Room14_EventScript_1BEDEF",
"flag": "508"
"flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM14_RARE_CANDY"
}
],
"warp_events": [
data/maps/FiveIsland_LostCave_Room4/map.json
+1 -1
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "23",
"graphics_id": "MAP_OBJ_GFX_WOMAN_1",
"x": 6,
"y": 4,
"elevation": 3,
data/maps/FiveIsland_LostCave_Room4/scripts.inc
+1 -1
View File
@@ -2,6 +2,6 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10
.byte 0
FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11
trainerbattle 0, 608, 0, Text_17CFC1, Text_17CFFB
trainerbattle 0, TRAINER_PSYCHIC_LAURA, 0, Text_17CFC1, Text_17CFFB
msgbox gUnknown_817D037, 6
end
data/maps/FiveIsland_Meadow/map.json
+16 -16
View File
@@ -25,7 +25,7 @@
],
"object_events": [
{
"graphics_id": "50",
"graphics_id": "MAP_OBJ_GFX_ROCKET_F",
"x": 18,
"y": 18,
"elevation": 3,
@@ -35,10 +35,10 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 1,
"script": "FiveIsland_Meadow_EventScript_1689BB",
"flag": "136"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "49",
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
"x": 17,
"y": 5,
"elevation": 3,
@@ -48,10 +48,10 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 5,
"script": "FiveIsland_Meadow_EventScript_16898D",
"flag": "136"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "49",
"graphics_id": "MAP_OBJ_GFX_ROCKET_M",
"x": 11,
"y": 27,
"elevation": 3,
@@ -61,10 +61,10 @@
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "FiveIsland_Meadow_EventScript_1689A4",
"flag": "136"
"flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
},
{
"graphics_id": "95",
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"x": 8,
"y": 9,
"elevation": 3,
@@ -73,11 +73,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_Meadow_EventScript_1BDF13",
"flag": "18"
"script": "EventScript_InteractWithCutTreeObject",
"flag": "FLAG_TEMP_12"
},
{
"graphics_id": "95",
"graphics_id": "MAP_OBJ_GFX_CUT_TREE",
"x": 19,
"y": 12,
"elevation": 3,
@@ -86,11 +86,11 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_Meadow_EventScript_1BDF13",
"flag": "19"
"script": "EventScript_InteractWithCutTreeObject",
"flag": "FLAG_TEMP_13"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 12,
"y": 11,
"elevation": 3,
@@ -100,10 +100,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_Meadow_EventScript_1BEC69",
"flag": "478"
"flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 3,
"y": 22,
"elevation": 3,
@@ -113,7 +113,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_Meadow_EventScript_1BEC76",
"flag": "479"
"flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_PP_UP"
}
],
"warp_events": [
data/maps/FiveIsland_Meadow/scripts.inc
+10 -10
View File
@@ -3,22 +3,22 @@ FiveIsland_Meadow_MapScripts:: @ 8168932
.byte 0
FiveIsland_Meadow_MapScript1_168938:: @ 8168938
checkflag FLAG_0x2D6
call_if 1, EventScript_168983
checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE
call_if TRUE, EventScript_168983
end
FiveIsland_Meadow_EventScript_168942:: @ 8168942
lockall
checkflag FLAG_0x2D6
goto_if_eq EventScript_168979
checkflag FLAG_0x2D8
goto_if_eq EventScript_16895F
checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE
goto_if TRUE, EventScript_168979
checkflag FLAG_LEARNED_YES_NAH_CHANSEY
goto_if TRUE, EventScript_16895F
msgbox gUnknown_818AB8E
releaseall
end
EventScript_16895F:: @ 816895F
setflag FLAG_0x2D6
setflag FLAG_UNLOCKED_ROCKET_WAREHOUSE
message Text_18ABF4
waitmessage
delay 60
@@ -39,16 +39,16 @@ EventScript_168983:: @ 8168983
return
FiveIsland_Meadow_EventScript_16898D:: @ 816898D
trainerbattle 0, 567, 0, Text_18AC88, Text_18ACB3
trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_49, 0, Text_18AC88, Text_18ACB3
msgbox gUnknown_818ACC5, 6
end
FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4
trainerbattle 0, 568, 0, Text_18ACF0, Text_18AD39
trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_50, 0, Text_18ACF0, Text_18AD39
msgbox gUnknown_818AD59, 6
end
FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB
trainerbattle 0, 569, 0, Text_18ADC6, Text_18ADFB
trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_51, 0, Text_18ADC6, Text_18ADFB
msgbox gUnknown_818AE16, 6
end
data/maps/FiveIsland_MemorialPillar/map.json
+18 -14
View File
@@ -20,7 +20,7 @@
],
"object_events": [
{
"graphics_id": "25",
"graphics_id": "MAP_OBJ_GFX_MAN",
"x": 8,
"y": 44,
"elevation": 4,
@@ -33,7 +33,7 @@
"flag": "0"
},
{
"graphics_id": "26",
"graphics_id": "MAP_OBJ_GFX_ROCKER",
"x": 12,
"y": 6,
"elevation": 3,
@@ -46,7 +46,7 @@
"flag": "0"
},
{
"graphics_id": "26",
"graphics_id": "MAP_OBJ_GFX_ROCKER",
"x": 14,
"y": 17,
"elevation": 3,
@@ -59,7 +59,7 @@
"flag": "0"
},
{
"graphics_id": "26",
"graphics_id": "MAP_OBJ_GFX_ROCKER",
"x": 17,
"y": 31,
"elevation": 3,
@@ -72,7 +72,7 @@
"flag": "0"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 4,
"y": 47,
"elevation": 3,
@@ -82,7 +82,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_MemorialPillar_EventScript_1BEC83",
"flag": "480"
"flag": "FLAG_HIDE_FIVE_ISLAND_MEMORIAL_PILLAR_METAL_COAT"
}
],
"warp_events": [],
@@ -101,8 +101,9 @@
"y": 52,
"elevation": 3,
"item": "ITEM_BIG_PEARL",
"flag": "170",
"unknown": 1
"flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL",
"quantity": 1,
"underfoot": false
},
{
"type": "hidden_item",
@@ -110,8 +111,9 @@
"y": 7,
"elevation": 3,
"item": "ITEM_RAZZ_BERRY",
"flag": "171",
"unknown": 1
"flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_RAZZ_BERRY",
"quantity": 1,
"underfoot": false
},
{
"type": "hidden_item",
@@ -119,8 +121,9 @@
"y": 22,
"elevation": 3,
"item": "ITEM_SITRUS_BERRY",
"flag": "172",
"unknown": 1
"flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_SITRUS_BERRY",
"quantity": 1,
"underfoot": false
},
{
"type": "hidden_item",
@@ -128,8 +131,9 @@
"y": 25,
"elevation": 3,
"item": "ITEM_BLUK_BERRY",
"flag": "173",
"unknown": 1
"flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BLUK_BERRY",
"quantity": 1,
"underfoot": false
}
]
}
data/maps/FiveIsland_MemorialPillar/scripts.inc
+15 -15
View File
@@ -3,10 +3,10 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2
FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3
lock
checkflag FLAG_0x236
goto_if_eq EventScript_168A18
checkflag FLAG_0x2D7
goto_if_eq EventScript_168A22
checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168A18
checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168A22
msgbox gUnknown_818B02E
closemessage
applymovement 1, Movement_1A75E1
@@ -28,7 +28,7 @@ EventScript_168A22:: @ 8168A22
msgbox gUnknown_818B282
giveitem ITEM_TM42
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_168AFE
goto_if eq, EventScript_168AFE
call EventScript_168AE8
release
end
@@ -36,24 +36,24 @@ EventScript_168A22:: @ 8168A22
FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
lockall
checkflag FLAG_0x236
goto_if_eq EventScript_168B0B
checkflag FLAG_0x2D7
goto_if_eq EventScript_168B0B
checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168B0B
checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR
goto_if TRUE, EventScript_168B0B
msgbox gUnknown_818B095
checkitem ITEM_LEMONADE, 1
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_168A86
goto_if eq, EventScript_168A86
releaseall
end
EventScript_168A86:: @ 8168A86
msgbox gUnknown_818B105, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_168A9B
goto_if eq, EventScript_168A9B
releaseall
end
@@ -70,7 +70,7 @@ EventScript_168A9B:: @ 8168A9B
msgbox gUnknown_818B171
giveitem ITEM_TM42
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_168AFE
goto_if eq, EventScript_168AFE
call EventScript_168AE8
releaseall
end
@@ -79,11 +79,11 @@ EventScript_168AE8:: @ 8168AE8
msgbox gUnknown_818B219
applymovement 1, Movement_1A75E9
waitmovement 0
setflag FLAG_0x236
setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
return
EventScript_168AFE:: @ 8168AFE
setflag FLAG_0x2D7
setflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR
msgbox gUnknown_818B23E
releaseall
end
data/maps/FiveIsland_PokemonCenter_1F/map.json
+5 -5
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "64",
"graphics_id": "MAP_OBJ_GFX_NURSE",
"x": 7,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "42",
"graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F",
"x": 9,
"y": 4,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "59",
"graphics_id": "MAP_OBJ_GFX_CHEF",
"x": 4,
"y": 8,
"elevation": 3,
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F",
"flag": "157"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
"graphics_id": "0",
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F",
"flag": "157"
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
"warp_events": [
data/maps/FiveIsland_PokemonCenter_2F/map.json
+5 -5
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 6,
"y": 2,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 2,
"y": 2,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "65",
"graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST",
"x": 10,
"y": 2,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "69",
"graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN",
"x": 1,
"y": 2,
"elevation": 3,
@@ -63,7 +63,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2",
"flag": "112"
"flag": "FLAG_HIDE_MG_DELIVERYMEN"
}
],
"warp_events": [

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