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/PokemonTower_6F/map.json
+9 -9
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "58",
"graphics_id": "MAP_OBJ_GFX_CHANNELER",
"x": 13,
"y": 10,
"elevation": 3,
@@ -27,7 +27,7 @@
"flag": "0"
},
{
"graphics_id": "58",
"graphics_id": "MAP_OBJ_GFX_CHANNELER",
"x": 18,
"y": 6,
"elevation": 3,
@@ -40,7 +40,7 @@
"flag": "0"
},
{
"graphics_id": "58",
"graphics_id": "MAP_OBJ_GFX_CHANNELER",
"x": 9,
"y": 6,
"elevation": 3,
@@ -53,7 +53,7 @@
"flag": "0"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 5,
"y": 15,
"elevation": 3,
@@ -63,10 +63,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_6F_EventScript_1BE796",
"flag": "380"
"flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY"
},
{
"graphics_id": "92",
"graphics_id": "MAP_OBJ_GFX_ITEM_BALL",
"x": 15,
"y": 15,
"elevation": 3,
@@ -76,7 +76,7 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "PokemonTower_6F_EventScript_1BE7A3",
"flag": "381"
"flag": "FLAG_HIDE_POKEMON_TOWER_6F_X_ACCURACY"
}
],
"warp_events": [
@@ -101,7 +101,7 @@
"x": 11,
"y": 15,
"elevation": 3,
"var": "VAR_0x4059",
"var": "VAR_MAP_SCENE_POKEMON_TOWER_6F",
"var_value": 0,
"script": "PokemonTower_6F_EventScript_1634B8"
},
@@ -110,7 +110,7 @@
"x": 12,
"y": 16,
"elevation": 3,
"var": "VAR_0x4059",
"var": "VAR_MAP_SCENE_POKEMON_TOWER_6F",
"var_value": 0,
"script": "PokemonTower_6F_EventScript_1634B8"
}
data/maps/PokemonTower_6F/scripts.inc
+6 -6
View File
@@ -7,13 +7,13 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
msgbox gUnknown_817A2F8
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special BattleSetup_StartMarowakBattle
waitstate
special sub_8112364
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_1634F5
goto_if eq, EventScript_1634F5
applymovement 255, Movement_163512
waitmovement 0
releaseall
@@ -27,7 +27,7 @@ EventScript_1634F5:: @ 81634F5
waitbuttonpress
waitmoncry
msgbox gUnknown_817A342
setvar VAR_0x4059, 1
setvar VAR_MAP_SCENE_POKEMON_TOWER_6F, 1
releaseall
end
@@ -36,16 +36,16 @@ Movement_163512:: @ 8163512
step_end
PokemonTower_6F_EventScript_163514:: @ 8163514
trainerbattle 0, 451, 0, Text_17A243, Text_17A253
trainerbattle 0, TRAINER_CHANNELER_ANGELICA, 0, Text_17A243, Text_17A253
msgbox gUnknown_817A25A, 6
end
PokemonTower_6F_EventScript_16352B:: @ 816352B
trainerbattle 0, 452, 0, Text_17A272, Text_17A27F
trainerbattle 0, TRAINER_CHANNELER_EMILIA, 0, Text_17A272, Text_17A27F
msgbox gUnknown_817A293, 6
end
PokemonTower_6F_EventScript_163542:: @ 8163542
trainerbattle 0, 453, 0, Text_17A2C8, Text_17A2DC
trainerbattle 0, TRAINER_CHANNELER_JENNIFER, 0, Text_17A2C8, Text_17A2DC
msgbox gUnknown_817A2E2, 6
end