diff options
| author | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
| commit | 9a9cb38e39c991e102a1c6da7e8e16b2a1c61e07 (patch) | |
| tree | 46c064628b3d8015da22d6396b3c711e80646745 /maps/RuinsofAlphResearchCenter.asm | |
| parent | 3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
merge with newest update
Diffstat (limited to 'maps/RuinsofAlphResearchCenter.asm')
| -rw-r--r-- | maps/RuinsofAlphResearchCenter.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index bbdc6c12b..47aa063fc 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -412,6 +412,6 @@ RuinsofAlphResearchCenter_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_SCIENTIST, 9, 8, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ScientistScript_0x591e5, -1 - person_event SPRITE_SCIENTIST, 6, 9, $2, 1, 2, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ScientistScript_0x59214, -1 - person_event SPRITE_SCIENTIST, 9, 6, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + person_event SPRITE_SCIENTIST, 5, 4, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x591e5, -1 + person_event SPRITE_SCIENTIST, 2, 5, $2, 1, 2, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x59214, -1 + person_event SPRITE_SCIENTIST, 5, 2, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST |