summaryrefslogtreecommitdiff
path: root/maps/ElmsLab.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/ElmsLab.asm')
-rw-r--r--maps/ElmsLab.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 45e0c2311..11ab81dfb 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -3,12 +3,12 @@ ElmsLab_MapScriptHeader:
db 6
; triggers
- dw UnknownScript_0x78b7a, $0000
- dw UnknownScript_0x78b7e, $0000
- dw UnknownScript_0x78b7f, $0000
- dw UnknownScript_0x78b80, $0000
- dw UnknownScript_0x78b81, $0000
- dw UnknownScript_0x78b82, $0000
+ dw UnknownScript_0x78b7a, 0
+ dw UnknownScript_0x78b7e, 0
+ dw UnknownScript_0x78b7f, 0
+ dw UnknownScript_0x78b80, 0
+ dw UnknownScript_0x78b81, 0
+ dw UnknownScript_0x78b82, 0
.MapCallbacks:
db 1
@@ -1408,9 +1408,9 @@ ElmsLab_MapEventHeader:
.PersonEvents:
db 6
- person_event SPRITE_ELM, 2, 5, $6, 0, 0, -1, -1, 0, 0, 0, ProfElmScript, -1
- person_event SPRITE_SCIENTIST, 9, 2, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
- person_event SPRITE_POKE_BALL, 3, 6, $1, 0, 0, -1, -1, 0, 0, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
- person_event SPRITE_POKE_BALL, 3, 7, $1, 0, 0, -1, -1, 0, 0, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
- person_event SPRITE_POKE_BALL, 3, 8, $1, 0, 0, -1, -1, 0, 0, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
- person_event SPRITE_OFFICER, 3, 5, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopScript, EVENT_COP_IN_ELMS_LAB
+ person_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, ProfElmScript, -1
+ person_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
+ person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
+ person_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
+ person_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_01, 0, 0, -1, -1, 0, 0, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
+ person_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, CopScript, EVENT_COP_IN_ELMS_LAB