summaryrefslogtreecommitdiff
path: root/data/scripts/maps
diff options
context:
space:
mode:
authorJaceCearK1 <JaceCearK1@users.noreply.github.com>2017-07-01 21:04:18 +0200
committerGitHub <noreply@github.com>2017-07-01 21:04:18 +0200
commit0dd804a99e5455a0eac8ff6ed87d9de16c7380b7 (patch)
tree7b3567978b63ee6548a7b945e075ea8ba37bef51 /data/scripts/maps
parentf1344efd2aff92292f58f7323bd9297a38fe9b02 (diff)
parent8d82578d3a101b06f9d2ced31738021007c4e533 (diff)
Merge pull request #1 from pret/master
Update fork to match main fork.
Diffstat (limited to 'data/scripts/maps')
-rw-r--r--data/scripts/maps/IslandCave.inc2
-rw-r--r--data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc2
-rw-r--r--data/scripts/maps/LittlerootTown_MaysHouse_2F.inc2
-rw-r--r--data/scripts/maps/SlateportCity.inc8
-rw-r--r--data/scripts/maps/SlateportCity_House1.inc2
-rw-r--r--data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc8
6 files changed, 12 insertions, 12 deletions
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index b52b13b5a..c5d932a91 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -31,7 +31,7 @@ IslandCave_MapScript1_15EF15:: @ 815EF15
setflag 2133
end
-gUnknown_0815EF19:: @ 815EF19
+gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19
setmaptile 7, 19, 554, 1
setmaptile 8, 19, 555, 1
setmaptile 9, 19, 556, 1
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
index 4f121118a..0c6ec79f7 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
@@ -67,7 +67,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837
releaseall
end
-gUnknown_08152850:: @ 8152850
+gBrendanHouse_TurnPCOff:: @ 8152850
setvar 0x8004, 1
playsfx SE_PC_OFF
special 215
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index 7871940ca..1aca3f86e 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
@@ -215,7 +215,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
releaseall
end
-gUnknown_08152C75:: @ 8152C75
+gMayHouse_TurnPCOff:: @ 8152C75
setvar 0x8004, 2
playsfx SE_PC_OFF
special 215
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 19f9af2eb..6125c4871 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36
SlateportCity_MapScript1_14BA3C:: @ 814BA3C
.ifdef SAPPHIRE
- setvar 0x4010, 118
- setvar 0x4011, 117
+ setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F
+ setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M
.else
- setvar 0x4010, 120
- setvar 0x4011, 119
+ setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F
+ setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M
.endif
setvar 0x40aa, 0
call SlateportCity_EventScript_14BA5C
diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc
index 936d520dd..702e52d84 100644
--- a/data/scripts/maps/SlateportCity_House1.inc
+++ b/data/scripts/maps/SlateportCity_House1.inc
@@ -28,7 +28,7 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF
SlateportCity_House1_EventScript_1556C9:: @ 81556C9
specialval RESULT, 327
- compare RESULT, 412
+ compare RESULT, SPECIES_EGG
jumpeq SlateportCity_House1_EventScript_15571C
special 124
special 125
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index 0bfeb4f5a..e84f8ccc6 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA
SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0
.ifdef SAPPHIRE
- setvar 0x4010, 118
- setvar 0x4011, 117
+ setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F
+ setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M
.else
- setvar 0x4010, 120
- setvar 0x4011, 119
+ setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F
+ setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M
.endif
end