summaryrefslogtreecommitdiff
path: root/maps/PowerPlant.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-31 15:02:32 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-31 15:16:53 -0400
commitaa27080e29e04dadb9986cd4f1f73579a3b01e96 (patch)
treebf555ac0c8d1b79e46797492342de453d8c10a7e /maps/PowerPlant.asm
parent895e14cd05c95859820b4bae6b8ee0b6b3603f50 (diff)
Split fourth-to-last byte of person_event into nybble arguments
Diffstat (limited to 'maps/PowerPlant.asm')
-rw-r--r--maps/PowerPlant.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index f4c46ae76..dfd984d84 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -401,10 +401,10 @@ PowerPlant_MapEventHeader:
.PersonEvents:
db 7
- person_event SPRITE_OFFICER, 18, 8, $6, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x188df5, -1
- person_event SPRITE_GYM_GUY, 13, 6, $3, 0, 0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188e15, -1
- person_event SPRITE_GYM_GUY, 15, 10, $7, 0, 0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188e29, -1
- person_event SPRITE_OFFICER, 7, 13, $8, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x188e3d, -1
- person_event SPRITE_GYM_GUY, 6, 11, $5, 0, 1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188e51, -1
- person_event SPRITE_FISHER, 14, 18, $7, 0, 0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PowerPlantManager, -1
- person_event SPRITE_GYM_GUY, 9, 9, $7, 0, 0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188ecb, -1
+ person_event SPRITE_OFFICER, 18, 8, $6, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, OfficerScript_0x188df5, -1
+ person_event SPRITE_GYM_GUY, 13, 6, $3, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e15, -1
+ person_event SPRITE_GYM_GUY, 15, 10, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e29, -1
+ person_event SPRITE_OFFICER, 7, 13, $8, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, OfficerScript_0x188e3d, -1
+ person_event SPRITE_GYM_GUY, 6, 11, $5, 0, 1, -1, -1, 8 + PAL_OW_BLUE, 0, 0, GymGuyScript_0x188e51, -1
+ person_event SPRITE_FISHER, 14, 18, $7, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, PowerPlantManager, -1
+ person_event SPRITE_GYM_GUY, 9, 9, $7, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, GymGuyScript_0x188ecb, -1