summaryrefslogtreecommitdiff
path: root/maps/KogasRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/KogasRoom.asm')
-rw-r--r--maps/KogasRoom.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 9d6eeb937..15d7185ab 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -2,10 +2,10 @@ const_value set 2
const KOGASROOM_KOGA
KogasRoom_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 2
- maptrigger .LockDoor
- maptrigger .DummyTrigger
+ scene_script .LockDoor
+ scene_script .DummyScene
.MapCallbacks:
db 1
@@ -15,7 +15,7 @@ KogasRoom_MapScriptHeader:
priorityjump .KogasDoorLocksBehindYou
end
-.DummyTrigger:
+.DummyScene:
end
.KogasRoomDoors:
@@ -37,7 +37,7 @@ KogasRoom_MapScriptHeader:
changeblock $4, $e, $2a
reloadmappart
closetext
- dotrigger $1
+ setscene $1
setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
waitsfx
end
@@ -140,12 +140,12 @@ KogasRoom_MapEventHeader:
warp_def $2, $4, 1, BRUNOS_ROOM
warp_def $2, $5, 2, BRUNOS_ROOM
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 0
-.PersonEvents:
+.ObjectEvents:
db 1
- person_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, KogaScript_Battle, -1
+ object_event SPRITE_KOGA, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, KogaScript_Battle, -1