Special script annotation, trainer constant enumeration, person-event structure update

This commit is contained in:
PikalaxALT
2015-07-16 18:10:10 -04:00
parent 7054bfe717
commit 894955f9d9
382 changed files with 4179 additions and 4035 deletions

View File

@@ -643,21 +643,21 @@ Route45_MapEventHeader:
; signposts
db 2
signpost 4, 10, $0, MapRoute45Signpost0Script
signpost 80, 13, $7, MapRoute45SignpostItem1
signpost 4, 10, SIGNPOST_READ, MapRoute45Signpost0Script
signpost 80, 13, SIGNPOST_ITEMIFSET, MapRoute45SignpostItem1
; people-events
db 13
person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, -1
person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, -1
person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry, -1
person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, -1
person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji, -1
person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, -1
person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, -1
person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, -1
person_event SPRITE_POKE_BALL, 55, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e296, EVENT_6B8
person_event SPRITE_POKE_BALL, 70, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e298, EVENT_6B9
person_event SPRITE_POKE_BALL, 24, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29a, EVENT_6BA
person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, EVENT_6BB
person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, -1
person_event SPRITE_POKEFAN_M, 20, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerErik, -1
person_event SPRITE_POKEFAN_M, 69, 19, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerMichael, -1
person_event SPRITE_POKEFAN_M, 32, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerParry, -1
person_event SPRITE_POKEFAN_M, 69, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerTimothy, -1
person_event SPRITE_BLACK_BELT, 54, 15, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBlackbeltKenji, -1
person_event SPRITE_COOLTRAINER_M, 22, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermRyan, -1
person_event SPRITE_COOLTRAINER_F, 40, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfKelly, -1
person_event SPRITE_FRUIT_TREE, 86, 20, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19e294, -1
person_event SPRITE_POKE_BALL, 55, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e296, EVENT_6B8
person_event SPRITE_POKE_BALL, 70, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e298, EVENT_6B9
person_event SPRITE_POKE_BALL, 24, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29a, EVENT_6BA
person_event SPRITE_POKE_BALL, 37, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29c, EVENT_6BB
person_event SPRITE_YOUNGSTER, 74, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x19e269, -1