summaryrefslogtreecommitdiff
path: root/maps/Route32RuinsofAlphGate.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-07-21 02:04:38 -0400
committeryenatch <yenatch@gmail.com>2015-07-21 02:04:38 -0400
commit0b5471f385d3cc66bb4ae7aa4191ce3af9f50cac (patch)
tree61cb1021673d8a9b7b1cdddc64d90053a8476e8b /maps/Route32RuinsofAlphGate.asm
parent006fc875971c92f2249f47b5fd120c5df76c6883 (diff)
parentd5ddd9e54ec2422d6f1cd7c561c1750512d0a81d (diff)
Merge pull request #302 from PikalaxALT/more_enum
More enum
Diffstat (limited to 'maps/Route32RuinsofAlphGate.asm')
-rw-r--r--maps/Route32RuinsofAlphGate.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm
index 6b3605435..57ffd34bd 100644
--- a/maps/Route32RuinsofAlphGate.asm
+++ b/maps/Route32RuinsofAlphGate.asm
@@ -1,8 +1,8 @@
Route32RuinsofAlphGate_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
OfficerScript_0x69a2d:
@@ -45,21 +45,21 @@ Route32RuinsofAlphGate_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $4, $0, 10, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE
warp_def $5, $0, 11, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE
warp_def $4, $9, 2, GROUP_ROUTE_32, MAP_ROUTE_32
warp_def $5, $9, 3, GROUP_ROUTE_32, MAP_ROUTE_32
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, -1
- person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, -1
- person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, -1
+ person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69a2d, -1
+ person_event SPRITE_POKEFAN_M, 6, 12, OW_UP | $0, $10, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x69a30, -1
+ person_event SPRITE_YOUNGSTER, 10, 5, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x69a33, -1