diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc index 61e143e23..afd77cf10 100644 --- a/data/maps/GraniteCave_B1F/scripts.inc +++ b/data/maps/GraniteCave_B1F/scripts.inc @@ -1,10 +1,10 @@ GraniteCave_B1F_MapScripts:: @ 822DC5E - map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole - map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_MapScript1_FixCrackedGround - map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_SetHoleWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_SetHoleWarp .byte 0 -GraniteCave_B1F_MapScript1_SetHoleWarp: @ 822DC6E +GraniteCave_B1F_SetHoleWarp: @ 822DC6E setstepcallback 7 setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc index 6fa89f400..2ccf628c0 100644 --- a/data/maps/MirageTower_2F/scripts.inc +++ b/data/maps/MirageTower_2F/scripts.inc @@ -1,10 +1,10 @@ MirageTower_2F_MapScripts:: @ 823AD11 - map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole - map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_MapScript1_FixCrackedGround - map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_SetHoleWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_SetHoleWarp .byte 0 -MirageTower_2F_MapScript1_SetHoleWarp: @ 823AD21 +MirageTower_2F_SetHoleWarp: @ 823AD21 setstepcallback 7 setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 end diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc index 05cac7c03..854619f1c 100644 --- a/data/maps/MirageTower_3F/scripts.inc +++ b/data/maps/MirageTower_3F/scripts.inc @@ -1,10 +1,10 @@ MirageTower_3F_MapScripts:: @ 823AD2C - map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole - map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_MapScript1_FixCrackedGround - map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_SetHoleWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_SetHoleWarp .byte 0 -MirageTower_3F_MapScript1_SetHoleWarp: @ 823AD3C +MirageTower_3F_SetHoleWarp: @ 823AD3C setstepcallback 7 setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 end diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 2c8a93155..f8efe996e 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -1,10 +1,10 @@ MtPyre_2F_MapScripts:: @ 82310FB - map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole - map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_MapScript1_FixCrackedGround - map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_SetHoleWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole + map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround + map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_SetHoleWarp .byte 0 -MtPyre_2F_MapScript1_SetHoleWarp: @ 823110B +MtPyre_2F_SetHoleWarp: @ 823110B setstepcallback 7 setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 2578c5527..0629d8f0d 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,10 +1,10 @@ Route120_MapScripts:: @ 81F53EC - map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_OnResume + map_script MAP_SCRIPT_ON_RESUME, Route120_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route120_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 + map_script MAP_SCRIPT_ON_LOAD, Route120_OnLoad .byte 0 -Route120_MapScript1_OnResume: @ 81F53FC +Route120_OnResume: @ 81F53FC call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_RemoveKecleonObject end @@ -38,7 +38,7 @@ Route120_EventScript_RemoveKecleon:: @ 81F5460 removeobject VAR_LAST_TALKED return -Route120_MapScript1_1F5474: @ 81F5474 +Route120_OnLoad: @ 81F5474 call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1F5490 call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54A3 call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54C8 diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index 710dd9372..6dd71f51b 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_2F_MapScripts:: @ 823962B - map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_SetHoleWarp + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_SetHoleWarp .byte 0 SkyPillar_2F_OnTransition: @ 823963B @@ -14,7 +14,7 @@ SkyPillar_2F_EventScript_CleanFloor:: @ 823964C setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN return -SkyPillar_2F_MapScript1_SetHoleWarp: @ 8239650 +SkyPillar_2F_SetHoleWarp: @ 8239650 setstepcallback 7 setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 5b13ab4f1..009a1a567 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 - map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_MapScript2_CheckFallDownHole + map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_OnTransition - map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_SetHoleWarp + map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_SetHoleWarp .byte 0 SkyPillar_4F_OnTransition: @ 8239681 @@ -14,7 +14,7 @@ SkyPillar_4F_EventScript_CleanFloor:: @ 8239692 setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN return -SkyPillar_4F_MapScript1_SetHoleWarp: @ 8239696 +SkyPillar_4F_SetHoleWarp: @ 8239696 setstepcallback 7 setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index 0852149a6..7f0dd5534 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -1,8 +1,8 @@ -CaveHole_MapScript2_CheckFallDownHole: @ 82A8327 +CaveHole_CheckFallDownHole: @ 82A8327 map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole .2byte 0 -CaveHole_MapScript1_FixCrackedGround: @ 82A8331 +CaveHole_FixCrackedGround: @ 82A8331 copyvar VAR_ICE_STEP_COUNT, 1 end diff --git a/include/constants/field_poison.h b/include/constants/field_poison.h index f74c3fb56..19b91e7c2 100644 --- a/include/constants/field_poison.h +++ b/include/constants/field_poison.h @@ -9,4 +9,4 @@ #define FLDPSN_WHITEOUT 1 #define FLDPSN_FRONTIER_WHITEOUT 2 -#endif //GUARD_CONSTANTS_FIELD_POISON_H \ No newline at end of file +#endif //GUARD_CONSTANTS_FIELD_POISON_H