ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix map script names

Browse Source
This commit is contained in:
GriffinR 2019-10-13 15:29:53 -04:00
parent c4deb4db96
commit 144c5888a1
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/maps/GraniteCave_B1F/scripts.inc
View File

@ -1,10 +1,10 @@
GraniteCave_B1F_MapScripts:: @ 822DC5E GraniteCave_B1F_MapScripts:: @ 822DC5E
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, CaveHole_MapScript1_FixCrackedGround map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_SetHoleWarp map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_SetHoleWarp
.byte 0 .byte 0
GraniteCave_B1F_MapScript1_SetHoleWarp: @ 822DC6E GraniteCave_B1F_SetHoleWarp: @ 822DC6E
setstepcallback 7 setstepcallback 7
setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0
end end

8
data/maps/MirageTower_2F/scripts.inc
View File

@ -1,10 +1,10 @@
MirageTower_2F_MapScripts:: @ 823AD11 MirageTower_2F_MapScripts:: @ 823AD11
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, CaveHole_MapScript1_FixCrackedGround map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_SetHoleWarp map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_SetHoleWarp
.byte 0 .byte 0
MirageTower_2F_MapScript1_SetHoleWarp: @ 823AD21 MirageTower_2F_SetHoleWarp: @ 823AD21
setstepcallback 7 setstepcallback 7
setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0
end end

8
data/maps/MirageTower_3F/scripts.inc
View File

@ -1,10 +1,10 @@
MirageTower_3F_MapScripts:: @ 823AD2C MirageTower_3F_MapScripts:: @ 823AD2C
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, CaveHole_MapScript1_FixCrackedGround map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_SetHoleWarp map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_SetHoleWarp
.byte 0 .byte 0
MirageTower_3F_MapScript1_SetHoleWarp: @ 823AD3C MirageTower_3F_SetHoleWarp: @ 823AD3C
setstepcallback 7 setstepcallback 7
setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0
end end

8
data/maps/MtPyre_2F/scripts.inc
View File

@ -1,10 +1,10 @@
MtPyre_2F_MapScripts:: @ 82310FB MtPyre_2F_MapScripts:: @ 82310FB
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, CaveHole_MapScript1_FixCrackedGround map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_SetHoleWarp map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_SetHoleWarp
.byte 0 .byte 0
MtPyre_2F_MapScript1_SetHoleWarp: @ 823110B MtPyre_2F_SetHoleWarp: @ 823110B
setstepcallback 7 setstepcallback 7
setholewarp MAP_MT_PYRE_1F, 255, 0, 0 setholewarp MAP_MT_PYRE_1F, 255, 0, 0
end end

8
data/maps/Route120/scripts.inc
View File

@ -1,10 +1,10 @@
Route120_MapScripts:: @ 81F53EC 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_TRANSITION, Route120_OnTransition
map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 map_script MAP_SCRIPT_ON_LOAD, Route120_OnLoad
.byte 0 .byte 0
Route120_MapScript1_OnResume: @ 81F53FC Route120_OnResume: @ 81F53FC
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_RemoveKecleonObject call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_RemoveKecleonObject
end end
@ -38,7 +38,7 @@ Route120_EventScript_RemoveKecleon:: @ 81F5460
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
Route120_MapScript1_1F5474: @ 81F5474 Route120_OnLoad: @ 81F5474
call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1F5490 call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1F5490
call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54A3 call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54A3
call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54C8 call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54C8

6
data/maps/SkyPillar_2F/scripts.inc
View File

@ -1,7 +1,7 @@
SkyPillar_2F_MapScripts:: @ 823962B 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_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 .byte 0
SkyPillar_2F_OnTransition: @ 823963B SkyPillar_2F_OnTransition: @ 823963B
@ -14,7 +14,7 @@ SkyPillar_2F_EventScript_CleanFloor:: @ 823964C
setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN
return return
SkyPillar_2F_MapScript1_SetHoleWarp: @ 8239650 SkyPillar_2F_SetHoleWarp: @ 8239650
setstepcallback 7 setstepcallback 7
setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0
end end

6
data/maps/SkyPillar_4F/scripts.inc
View File

@ -1,7 +1,7 @@
SkyPillar_4F_MapScripts:: @ 8239671 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_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 .byte 0
SkyPillar_4F_OnTransition: @ 8239681 SkyPillar_4F_OnTransition: @ 8239681
@ -14,7 +14,7 @@ SkyPillar_4F_EventScript_CleanFloor:: @ 8239692
setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN
return return
SkyPillar_4F_MapScript1_SetHoleWarp: @ 8239696 SkyPillar_4F_SetHoleWarp: @ 8239696
setstepcallback 7 setstepcallback 7
setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0
end end

4
data/scripts/cave_hole.inc
View File

@ -1,8 +1,8 @@
CaveHole_MapScript2_CheckFallDownHole: @ 82A8327 CaveHole_CheckFallDownHole: @ 82A8327
map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole
.2byte 0 .2byte 0
CaveHole_MapScript1_FixCrackedGround: @ 82A8331 CaveHole_FixCrackedGround: @ 82A8331
copyvar VAR_ICE_STEP_COUNT, 1 copyvar VAR_ICE_STEP_COUNT, 1
end end

2
include/constants/field_poison.h
View File

@ -9,4 +9,4 @@
#define FLDPSN_WHITEOUT 1 #define FLDPSN_WHITEOUT 1
#define FLDPSN_FRONTIER_WHITEOUT 2 #define FLDPSN_FRONTIER_WHITEOUT 2
#endif //GUARD_CONSTANTS_FIELD_POISON_H #endif //GUARD_CONSTANTS_FIELD_POISON_H