diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-12-28 13:10:02 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-12-29 11:36:54 -0600 |
| commit | 67636b7c64ccbd6a638cf55ee153d70fde27ded8 (patch) | |
| tree | 5f562cd4f51b12035316d8ef9e7802386a097135 /data | |
| parent | 46d41d2fb9c5d8ff842139410ebf0ff1642f9b82 (diff) | |
Document deoxys rock
Diffstat (limited to 'data')
| -rw-r--r-- | data/field_effect_scripts.s | 2 | ||||
| -rw-r--r-- | data/maps/BirthIsland_Exterior/scripts.inc | 8 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 81de41aaa..93fe33f8a 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -341,5 +341,5 @@ gFieldEffectScript_Unknown65:: @ 82DBCF9 field_eff_end gFieldEffectScript_Unknown66:: @ 82DBCFF - field_eff_callnative sub_80B9E28 + field_eff_callnative Fldeff_MoveDeoxysRock field_eff_end diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index cb84a51bd..8e0a475a7 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -11,8 +11,8 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 setflag FLAG_0x8D3 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL - setvar VAR_0x4034, 0 - setvar VAR_0x4035, 0 + setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0 + setvar VAR_DEOXYS_ROCK_LEVEL, 0 call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E call_if_unset FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F55 end @@ -25,7 +25,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 goto_if_set FLAG_0x1AC, BirthIsland_Exterior_EventScript_27374E clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE - clearflag FLAG_0x8D4 + clearflag FLAG_DEOXYS_ROCK_COMPLETE return BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 @@ -42,7 +42,7 @@ BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F BirthIsland_Exterior_EventScript_267F83:: @ 8267F83 lock faceplayer - special sub_813AFC8 + special DoDeoxysRockInteraction waitstate switch VAR_RESULT case 0, BirthIsland_Exterior_EventScript_267FBB diff --git a/data/specials.inc b/data/specials.inc index fed1b6641..c1c76e520 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -488,7 +488,7 @@ gSpecials:: @ 81DBA64 def_special sub_81B892C def_special sub_813AEB4 def_special sub_813AF48 - def_special sub_813AFC8 + def_special DoDeoxysRockInteraction def_special sub_813B1D0 def_special CreateObedientEnemyMon def_special StartMirageTowerDisintegration |