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/RuinsofAlphResearchCenter.asm | |
| parent | b676c24aefc3213d844fba9572dcb327be16a4d9 (diff) | |
| parent | 8d75f962e45694555b10ac78a3e78e3f53682db0 (diff) | |
Merge commit '8d75f96' into master
Mostly sprite stuff.
Diffstat (limited to 'maps/RuinsofAlphResearchCenter.asm')
| -rw-r--r-- | maps/RuinsofAlphResearchCenter.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index c8ac6f660..b7dca96d7 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -65,7 +65,7 @@ UnknownScript_0x59192: ; 0x59192 end ; 0x591d1 -UnknownScript_0x591d1: ; 0x591d1 +ScientistScript_0x591d1: ; 0x591d1 faceplayer loadfont checkcode $e @@ -83,7 +83,7 @@ UnknownScript_0x591df: ; 0x591df end ; 0x591e5 -UnknownScript_0x591e5: ; 0x591e5 +ScientistScript_0x591e5: ; 0x591e5 faceplayer loadfont checkcode $e @@ -120,7 +120,7 @@ UnknownScript_0x5920b: ; 0x5920b end ; 0x59214 -UnknownScript_0x59214: ; 0x59214 +ScientistScript_0x59214: ; 0x59214 faceplayer loadfont checkcode $e @@ -404,8 +404,8 @@ RuinsofAlphResearchCenter_MapEventHeader: ; 0x598d0 ; people-events db 3 - person_event $3c, 9, 8, $7, $0, 255, 255, $90, 0, UnknownScript_0x591e5, $ffff - person_event $3c, 6, 9, $2, $12, 255, 255, $90, 0, UnknownScript_0x59214, $ffff - person_event $3c, 9, 6, $7, $0, 255, 255, $90, 0, UnknownScript_0x591d1, $0704 + person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, $ffff + person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, $ffff + person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, $0704 ; 0x59916 |