summaryrefslogtreecommitdiff
path: root/maps/RuinsofAlphResearchCenter.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-10-25 20:48:44 -0400
committeryenatch <yenatch@gmail.com>2015-10-25 20:48:44 -0400
commit0d17d4a75866d053f5e0b48c66deb2508071d98b (patch)
tree75bb638d39ab6b4d0bcd3167c22d275eb52ffdbd /maps/RuinsofAlphResearchCenter.asm
parent6fcba7a28a0d3d7826603b54b187dc5fca853669 (diff)
parent79ceca591b022673cb7fb2cc59e5175716743eb5 (diff)
Merge pull request #322 from PikalaxALT/master
Split out and comment phone and animation code.
Diffstat (limited to 'maps/RuinsofAlphResearchCenter.asm')
-rw-r--r--maps/RuinsofAlphResearchCenter.asm6
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