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/MtEmber_Summit/map.json
+10 -10
View File
@@ -14,7 +14,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "137",
"graphics_id": "MAP_OBJ_GFX_MOLTRES",
"x": 9,
"y": 6,
"elevation": 3,
@@ -24,10 +24,10 @@
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Summit_EventScript_163B33",
"flag": "82"
"flag": "FLAG_HIDE_MOLTRES"
},
{
"graphics_id": "97",
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
"x": 10,
"y": 12,
"elevation": 3,
@@ -36,11 +36,11 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Summit_EventScript_1BE11D",
"script": "EventScript_InteractWithStrengthBoulderObject",
"flag": "0"
},
{
"graphics_id": "97",
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
"x": 9,
"y": 12,
"elevation": 3,
@@ -49,11 +49,11 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Summit_EventScript_1BE11D",
"script": "EventScript_InteractWithStrengthBoulderObject",
"flag": "0"
},
{
"graphics_id": "97",
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
"x": 8,
"y": 11,
"elevation": 3,
@@ -62,11 +62,11 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Summit_EventScript_1BE11D",
"script": "EventScript_InteractWithStrengthBoulderObject",
"flag": "0"
},
{
"graphics_id": "97",
"graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER",
"x": 8,
"y": 10,
"elevation": 3,
@@ -75,7 +75,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "MtEmber_Summit_EventScript_1BE11D",
"script": "EventScript_InteractWithStrengthBoulderObject",
"flag": "0"
}
],
data/maps/MtEmber_Summit/scripts.inc
+20 -20
View File
@@ -4,30 +4,30 @@ MtEmber_Summit_MapScripts:: @ 8163AFC
.byte 0
MtEmber_Summit_MapScript2_163B07:: @ 8163B07
checkflag FLAG_0x807
call_if 1, EventScript_163B11
checkflag FLAG_SYS_SPECIAL_WILD_BATTLE
call_if TRUE, EventScript_163B11
end
EventScript_163B11:: @ 8163B11
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
MtEmber_Summit_MapScript1_163B25:: @ 8163B25
checkflag FLAG_0x2BD
call_if 0, EventScript_163B2F
checkflag FLAG_FOUGHT_MOLTRES
call_if FALSE, EventScript_163B2F
end
EventScript_163B2F:: @ 8163B2F
clearflag FLAG_0x052
clearflag FLAG_HIDE_MOLTRES
return
MtEmber_Summit_EventScript_163B33:: @ 8163B33
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 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
delay 10
playbgm MUS_EXEYE, 0
waitbuttonpress
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_163B96
compare_var_to_value VAR_RESULT, 4
goto_if_eq EventScript_163B9F
compare_var_to_value VAR_RESULT, 5
goto_if_eq EventScript_163B9F
setflag FLAG_0x2BD
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome
compare_var_to_value VAR_RESULT, B_OUTCOME_WON
goto_if eq, EventScript_163B96
compare_var_to_value VAR_RESULT, B_OUTCOME_RAN
goto_if eq, EventScript_163B9F
compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if eq, EventScript_163B9F
setflag FLAG_FOUGHT_MOLTRES
release
end
EventScript_163B96:: @ 8163B96
setflag FLAG_0x2BD
setflag FLAG_FOUGHT_MOLTRES
goto EventScript_1A922D
end