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/Colosseum.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Colosseum.asm')
| -rw-r--r-- | maps/Colosseum.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index a21d7ce1c..dd351bc89 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -61,7 +61,7 @@ MapColosseumSignpost1Script: ; 0x193493 end ; 0x193499 -UnknownScript_0x193499: ; 0x193499 +ChrisScript_0x193499: ; 0x193499 loadfont 2writetext UnknownText_0x1934a0 closetext @@ -93,7 +93,7 @@ Colosseum_MapEventHeader: ; 0x1934b7 ; people-events db 2 - person_event $1, 8, 7, $9, $0, 255, 255, $0, 0, UnknownScript_0x193499, $0000 - person_event $1, 8, 10, $8, $0, 255, 255, $0, 0, UnknownScript_0x193499, $0001 + person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000 + person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001 ; 0x1934eb |