diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-12 15:16:23 -0500 |
| commit | 1cb19a03a3c57c85d27495f95483b30ae37f0976 (patch) | |
| tree | 0f798841fdf32e9ee4fdee93fb0b43d8cb73fa5b /maps/Route31VioletGate.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route31VioletGate.asm')
| -rw-r--r-- | maps/Route31VioletGate.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index e5b7dbc1c..20bf5bb49 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -6,11 +6,11 @@ Route31VioletGate_MapScriptHeader: ; 0x197632 db 0 ; 0x197634 -UnknownScript_0x197634: ; 0x197634 +OfficerScript_0x197634: ; 0x197634 jumptextfaceplayer UnknownText_0x19763a ; 0x197637 -UnknownScript_0x197637: ; 0x197637 +CooltrainerFScript_0x197637: ; 0x197637 jumptextfaceplayer UnknownText_0x197661 ; 0x19763a @@ -45,8 +45,8 @@ Route31VioletGate_MapEventHeader: ; 0x19768c ; people-events db 2 - person_event $43, 6, 9, $6, $0, 255, 255, $80, 0, UnknownScript_0x197634, $ffff - person_event $24, 6, 5, $3, $0, 255, 255, $90, 0, UnknownScript_0x197637, $ffff + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, $ffff + person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, $ffff ; 0x1976c0 |