summaryrefslogtreecommitdiff
path: root/data/maps/UnionRoom
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-20 15:17:34 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-20 15:17:34 -0500
commit2908c9fa954b2e4b6afa70f3686853ea69cf8569 (patch)
treeabdbf13b7663f124f92cafa5dcbb4534abcc338d /data/maps/UnionRoom
parent055e5d2bbff31a98bcdffec0d7392e7ce77bcd46 (diff)
Document some misc small scripts
Diffstat (limited to 'data/maps/UnionRoom')
-rw-r--r--data/maps/UnionRoom/map.json34
-rw-r--r--data/maps/UnionRoom/scripts.inc36
2 files changed, 35 insertions, 35 deletions
diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json
index 91cf2cb49..7427f28c3 100644
--- a/data/maps/UnionRoom/map.json
+++ b/data/maps/UnionRoom/map.json
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "UnionRoom_EventScript_16050C",
+ "script": "UnionRoom_EventScript_Attendant",
"flag": "0"
},
{
@@ -36,8 +36,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "UnionRoom_EventScript_1604DA",
- "flag": "FLAG_HIDE_UNION_ROOM_4"
+ "script": "UnionRoom_EventScript_Player4",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_7",
@@ -49,8 +49,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "UnionRoom_EventScript_160502",
- "flag": "FLAG_HIDE_UNION_ROOM_8"
+ "script": "UnionRoom_EventScript_Player8",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_6",
@@ -62,8 +62,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "UnionRoom_EventScript_1604F8",
- "flag": "FLAG_HIDE_UNION_ROOM_7"
+ "script": "UnionRoom_EventScript_Player7",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_5",
@@ -75,8 +75,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "UnionRoom_EventScript_1604EE",
- "flag": "FLAG_HIDE_UNION_ROOM_6"
+ "script": "UnionRoom_EventScript_Player6",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_4",
@@ -88,8 +88,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "UnionRoom_EventScript_1604E4",
- "flag": "FLAG_HIDE_UNION_ROOM_5"
+ "script": "UnionRoom_EventScript_Player5",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_2",
@@ -101,8 +101,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "UnionRoom_EventScript_1604D0",
- "flag": "FLAG_HIDE_UNION_ROOM_3"
+ "script": "UnionRoom_EventScript_Player3",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_1",
@@ -114,8 +114,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "UnionRoom_EventScript_1604C6",
- "flag": "FLAG_HIDE_UNION_ROOM_2"
+ "script": "UnionRoom_EventScript_Player2",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2"
},
{
"graphics_id": "OBJECT_EVENT_GFX_VAR_0",
@@ -127,8 +127,8 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "UnionRoom_EventScript_1604BC",
- "flag": "FLAG_HIDE_UNION_ROOM_1"
+ "script": "UnionRoom_EventScript_Player1",
+ "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1"
}
],
"warp_events": [
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc
index c948682ce..35222ba8b 100644
--- a/data/maps/UnionRoom/scripts.inc
+++ b/data/maps/UnionRoom/scripts.inc
@@ -4,14 +4,14 @@ UnionRoom_MapScripts:: @ 816047C
.byte 0
UnionRoom_OnResume:: @ 8160487
- setflag FLAG_HIDE_UNION_ROOM_1
- setflag FLAG_HIDE_UNION_ROOM_2
- setflag FLAG_HIDE_UNION_ROOM_3
- setflag FLAG_HIDE_UNION_ROOM_4
- setflag FLAG_HIDE_UNION_ROOM_5
- setflag FLAG_HIDE_UNION_ROOM_6
- setflag FLAG_HIDE_UNION_ROOM_7
- setflag FLAG_HIDE_UNION_ROOM_8
+ setflag FLAG_HIDE_UNION_ROOM_PLAYER_1
+ setflag FLAG_HIDE_UNION_ROOM_PLAYER_2
+ setflag FLAG_HIDE_UNION_ROOM_PLAYER_3
+ setflag FLAG_HIDE_UNION_ROOM_PLAYER_4
+ setflag FLAG_HIDE_UNION_ROOM_PLAYER_5
+ setflag FLAG_HIDE_UNION_ROOM_PLAYER_6
+ setflag FLAG_HIDE_UNION_ROOM_PLAYER_7
+ setflag FLAG_HIDE_UNION_ROOM_PLAYER_8
removeobject 9
removeobject 8
removeobject 7
@@ -26,7 +26,7 @@ UnionRoom_OnResume:: @ 8160487
UnionRoom_OnTransition:: @ 81604BB
end
-UnionRoom_EventScript_1604BC:: @ 81604BC
+UnionRoom_EventScript_Player1:: @ 81604BC
lock
faceplayer
setvar VAR_RESULT, 1
@@ -34,7 +34,7 @@ UnionRoom_EventScript_1604BC:: @ 81604BC
release
end
-UnionRoom_EventScript_1604C6:: @ 81604C6
+UnionRoom_EventScript_Player2:: @ 81604C6
lock
faceplayer
setvar VAR_RESULT, 2
@@ -42,7 +42,7 @@ UnionRoom_EventScript_1604C6:: @ 81604C6
release
end
-UnionRoom_EventScript_1604D0:: @ 81604D0
+UnionRoom_EventScript_Player3:: @ 81604D0
lock
faceplayer
setvar VAR_RESULT, 3
@@ -50,7 +50,7 @@ UnionRoom_EventScript_1604D0:: @ 81604D0
release
end
-UnionRoom_EventScript_1604DA:: @ 81604DA
+UnionRoom_EventScript_Player4:: @ 81604DA
lock
faceplayer
setvar VAR_RESULT, 4
@@ -58,7 +58,7 @@ UnionRoom_EventScript_1604DA:: @ 81604DA
release
end
-UnionRoom_EventScript_1604E4:: @ 81604E4
+UnionRoom_EventScript_Player5:: @ 81604E4
lock
faceplayer
setvar VAR_RESULT, 5
@@ -66,7 +66,7 @@ UnionRoom_EventScript_1604E4:: @ 81604E4
release
end
-UnionRoom_EventScript_1604EE:: @ 81604EE
+UnionRoom_EventScript_Player6:: @ 81604EE
lock
faceplayer
setvar VAR_RESULT, 6
@@ -74,7 +74,7 @@ UnionRoom_EventScript_1604EE:: @ 81604EE
release
end
-UnionRoom_EventScript_1604F8:: @ 81604F8
+UnionRoom_EventScript_Player7:: @ 81604F8
lock
faceplayer
setvar VAR_RESULT, 7
@@ -82,7 +82,7 @@ UnionRoom_EventScript_1604F8:: @ 81604F8
release
end
-UnionRoom_EventScript_160502:: @ 8160502
+UnionRoom_EventScript_Player8:: @ 8160502
lock
faceplayer
setvar VAR_RESULT, 8
@@ -90,7 +90,7 @@ UnionRoom_EventScript_160502:: @ 8160502
release
end
-UnionRoom_EventScript_16050C:: @ 816050C
+UnionRoom_EventScript_Attendant:: @ 816050C
lock
faceplayer
setvar VAR_RESULT, 9
@@ -98,7 +98,7 @@ UnionRoom_EventScript_16050C:: @ 816050C
release
end
-UnionRoom_EventScript_160516:: @ 8160516
+UnionRoom_EventScript_Unused:: @ 8160516
lockall
setvar VAR_RESULT, 10
waitstate