Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split fourth-to-last byte of person_event into nybble arguments

Browse Source
This commit is contained in:
PikalaxALT
2015-07-31 15:02:32 -04:00
parent 895e14cd05
commit aa27080e29
350 changed files with 1469 additions and 1468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
maps/Route40.asm
View File

@@ -344,15 +344,15 @@ Route40_MapEventHeader:
.PersonEvents:
db 12
person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, 0, 0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerSwimmermSimon, -1
person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, 0, 0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerSwimmermRandall, -1
person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerSwimmerfElaine, -1
person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfPaula, -1
person_event SPRITE_ROCK, 15, 11, $18, 0, 0, -1, -1, $0, 0, Route40Rock, -1
person_event SPRITE_ROCK, 13, 10, $18, 0, 0, -1, -1, $0, 0, Route40Rock, -1
person_event SPRITE_ROCK, 12, 11, $18, 0, 0, -1, -1, $0, 0, Route40Rock, -1
person_event SPRITE_LASS, 17, 15, $6, 0, 0, -1, -1, $0, 0, LassScript_0x1a61c4, -1
person_event SPRITE_BUENA, 14, 12, $3, 0, 0, -1, -1, $0, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
person_event SPRITE_POKEFAN_M, 10, 11, $9, 0, 0, -1, -1, $0, 0, PokefanMScript_0x1a61c7, -1
person_event SPRITE_LASS, 8, 17, $3, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a61d3, -1
person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, 0, 0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 4, TrainerSwimmermSimon, -1
person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, 0, 0, -1, -1, 8 + PAL_OW_RED, 2, 5, TrainerSwimmermRandall, -1
person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 2, 4, TrainerSwimmerfElaine, -1
person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 2, 3, TrainerSwimmerfPaula, -1
person_event SPRITE_ROCK, 15, 11, $18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
person_event SPRITE_ROCK, 13, 10, $18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
person_event SPRITE_ROCK, 12, 11, $18, 0, 0, -1, -1, 0, 0, 0, Route40Rock, -1
person_event SPRITE_LASS, 17, 15, $6, 0, 0, -1, -1, 0, 0, 0, LassScript_0x1a61c4, -1
person_event SPRITE_BUENA, 14, 12, $3, 0, 0, -1, -1, 0, 0, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
person_event SPRITE_POKEFAN_M, 10, 11, $9, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x1a61c7, -1
person_event SPRITE_LASS, 8, 17, $3, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, LassScript_0x1a61d3, -1
person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, 0, 0, -1, -1, 8 + PAL_OW_BLUE, 0, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR