diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /data/scripts/maps/UnionRoom.inc | |
parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) |
recorded battle merge conflicts fix
Diffstat (limited to 'data/scripts/maps/UnionRoom.inc')
-rw-r--r-- | data/scripts/maps/UnionRoom.inc | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/data/scripts/maps/UnionRoom.inc b/data/scripts/maps/UnionRoom.inc new file mode 100644 index 000000000..250b4b402 --- /dev/null +++ b/data/scripts/maps/UnionRoom.inc @@ -0,0 +1,107 @@ +UnionRoom_MapScripts:: @ 823D1A6 + map_script 5, UnionRoom_MapScript1_23D1B1 + map_script 3, UnionRoom_MapScript1_23D1E5 + .byte 0 + +UnionRoom_MapScript1_23D1B1: @ 823D1B1 + setflag FLAG_0x2BF + setflag FLAG_0x2C0 + setflag FLAG_0x2C1 + setflag FLAG_0x2C2 + setflag FLAG_0x2C3 + setflag FLAG_0x2C4 + setflag FLAG_0x2C5 + setflag FLAG_0x2C6 + removeobject 9 + removeobject 8 + removeobject 7 + removeobject 2 + removeobject 6 + removeobject 5 + removeobject 4 + removeobject 3 + special UnionRoomSpecial + end + +UnionRoom_MapScript1_23D1E5: @ 823D1E5 + end + +UnionRoom_EventScript_23D1E6:: @ 823D1E6 + lock + faceplayer + setvar VAR_RESULT, 1 + waitstate + release + end + +UnionRoom_EventScript_23D1F0:: @ 823D1F0 + lock + faceplayer + setvar VAR_RESULT, 2 + waitstate + release + end + +UnionRoom_EventScript_23D1FA:: @ 823D1FA + lock + faceplayer + setvar VAR_RESULT, 3 + waitstate + release + end + +UnionRoom_EventScript_23D204:: @ 823D204 + lock + faceplayer + setvar VAR_RESULT, 4 + waitstate + release + end + +UnionRoom_EventScript_23D20E:: @ 823D20E + lock + faceplayer + setvar VAR_RESULT, 5 + waitstate + release + end + +UnionRoom_EventScript_23D218:: @ 823D218 + lock + faceplayer + setvar VAR_RESULT, 6 + waitstate + release + end + +UnionRoom_EventScript_23D222:: @ 823D222 + lock + faceplayer + setvar VAR_RESULT, 7 + waitstate + release + end + +UnionRoom_EventScript_23D22C:: @ 823D22C + lock + faceplayer + setvar VAR_RESULT, 8 + waitstate + release + end + +UnionRoom_EventScript_23D236:: @ 823D236 + lock + faceplayer + setvar VAR_RESULT, 9 + waitstate + release + end + +UnionRoom_EventScript_23D240:: @ 823D240 + lockall + setvar VAR_RESULT, 10 + waitstate + releaseall + end + |