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/Route2Gate.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/Route2Gate.asm')
| -rw-r--r-- | maps/Route2Gate.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 4d416de8e..d582543a0 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -6,7 +6,7 @@ Route2Gate_MapScriptHeader: ; 0x9b950 db 0 ; 0x9b952 -UnknownScript_0x9b952: ; 0x9b952 +ScientistScript_0x9b952: ; 0x9b952 jumptextfaceplayer UnknownText_0x9b955 ; 0x9b955 @@ -40,6 +40,6 @@ Route2Gate_MapEventHeader: ; 0x9b9ca ; people-events db 1 - person_event $3c, 8, 10, $4, $20, 255, 255, $90, 0, UnknownScript_0x9b952, $ffff + person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, $ffff ; 0x9b9f1 |