diff options
author | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2013-08-03 16:34:51 -0400 |
commit | a2242e1b9d95dcaf21ecdb5ae27a497c6ee6c27a (patch) | |
tree | a30798efa48b616dc655387ba8f3c1cdd8afd466 /maps/Route32RuinsofAlphGate.asm | |
parent | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (diff) | |
parent | 0ee006a145dbe45a8844ad2dc6d8bf04b51f63bc (diff) |
Merge branch 'sprites'
Diffstat (limited to 'maps/Route32RuinsofAlphGate.asm')
-rw-r--r-- | maps/Route32RuinsofAlphGate.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index d197d10b2..7300507d3 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -6,15 +6,15 @@ Route32RuinsofAlphGate_MapScriptHeader: ; 0x69a2b db 0 ; 0x69a2d -UnknownScript_0x69a2d: ; 0x69a2d +OfficerScript_0x69a2d: ; 0x69a2d jumptextfaceplayer UnknownText_0x69a36 ; 0x69a30 -UnknownScript_0x69a30: ; 0x69a30 +PokefanMScript_0x69a30: ; 0x69a30 jumptextfaceplayer UnknownText_0x69a81 ; 0x69a33 -UnknownScript_0x69a33: ; 0x69a33 +YoungsterScript_0x69a33: ; 0x69a33 jumptextfaceplayer UnknownText_0x69abd ; 0x69a36 @@ -60,8 +60,8 @@ Route32RuinsofAlphGate_MapEventHeader: ; 0x69b0f ; people-events db 3 - person_event $43, 6, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x69a2d, $ffff - person_event $2d, 6, 12, $4, $10, 255, 255, $b0, 0, UnknownScript_0x69a30, $ffff - person_event $27, 10, 5, $7, $0, 255, 255, $a0, 0, UnknownScript_0x69a33, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, $ffff + person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, $ffff + person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, $ffff ; 0x69b50 |