pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Replace EVENT_ALWAYS_THERE with -1

Browse Source
This commit is contained in:
PikalaxALT 2015-07-13 00:16:35 -04:00
parent d282fe4799
commit 249bad9551
294 changed files with 1768 additions and 2895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
constants/event_flags.asm
View File

@ -2001,53 +2001,5 @@
const EVENT_7CD
const EVENT_7CE
const EVENT_7CF
const EVENT_7D0
const EVENT_7D1
const EVENT_7D2
const EVENT_7D3
const EVENT_7D4
const EVENT_7D5
const EVENT_7D6
const EVENT_7D7
const EVENT_7D8
const EVENT_7D9
const EVENT_7DA
const EVENT_7DB
const EVENT_7DC
const EVENT_7DD
const EVENT_7DE
const EVENT_7DF
const EVENT_7E0
const EVENT_7E1
const EVENT_7E2
const EVENT_7E3
const EVENT_7E4
const EVENT_7E5
const EVENT_7E6
const EVENT_7E7
const EVENT_7E8
const EVENT_7E9
const EVENT_7EA
const EVENT_7EB
const EVENT_7EC
const EVENT_7ED
const EVENT_7EE
const EVENT_7EF
const EVENT_7F0
const EVENT_7F1
const EVENT_7F2
const EVENT_7F3
const EVENT_7F4
const EVENT_7F5
const EVENT_7F6
const EVENT_7F7
const EVENT_7F8
const EVENT_7F9
const EVENT_7FA
const EVENT_7FB
const EVENT_7FC
const EVENT_7FD
const EVENT_7FE
const EVENT_7FF
EVENT_ALWAYS_THERE EQU $ffff
NUM_EVENTS EQU const_value

79
constants/gfx_constants.asm
View File

@ -1,39 +1,40 @@
ANIM_GFX_HIT EQU 1
ANIM_GFX_CUT EQU 2
ANIM_GFX_FIRE EQU 3
ANIM_GFX_WATER EQU 4
ANIM_GFX_LIGHTNING EQU 5
ANIM_GFX_PLANT EQU 6
ANIM_GFX_SMOKE EQU 7
ANIM_GFX_EXPLOSION EQU 8
ANIM_GFX_ROCKS EQU 9
ANIM_GFX_ICE EQU 10
ANIM_GFX_POKE_BALL EQU 11
ANIM_GFX_POISON EQU 12
ANIM_GFX_BUBBLE EQU 13
ANIM_GFX_NOISE EQU 14
ANIM_GFX_POWDER EQU 15
ANIM_GFX_BEAM EQU 16
ANIM_GFX_SPEED EQU 17
ANIM_GFX_CHARGE EQU 18
ANIM_GFX_WIND EQU 19
ANIM_GFX_WHIP EQU 20
ANIM_GFX_EGG EQU 21
ANIM_GFX_ROPE EQU 22
ANIM_GFX_PSYCHIC EQU 23
ANIM_GFX_REFLECT EQU 24
ANIM_GFX_STATUS EQU 25
ANIM_GFX_SAND EQU 26
ANIM_GFX_WEB EQU 27
ANIM_GFX_HAZE EQU 28
ANIM_GFX_HORN EQU 29
ANIM_GFX_FLOWER EQU 30
ANIM_GFX_MISC EQU 31
ANIM_GFX_SKY_ATTACK EQU 32
ANIM_GFX_GLOBE EQU 33
ANIM_GFX_SHAPES EQU 34
ANIM_GFX_OBJECTS EQU 35
ANIM_GFX_SHINE EQU 36
ANIM_GFX_ANGELS EQU 37
ANIM_GFX_WAVE EQU 38
ANIM_GFX_AEROBLAST EQU 39
const_value = 1
const ANIM_GFX_HIT
const ANIM_GFX_CUT
const ANIM_GFX_FIRE
const ANIM_GFX_WATER
const ANIM_GFX_LIGHTNING
const ANIM_GFX_PLANT
const ANIM_GFX_SMOKE
const ANIM_GFX_EXPLOSION
const ANIM_GFX_ROCKS
const ANIM_GFX_ICE
const ANIM_GFX_POKE_BALL
const ANIM_GFX_POISON
const ANIM_GFX_BUBBLE
const ANIM_GFX_NOISE
const ANIM_GFX_POWDER
const ANIM_GFX_BEAM
const ANIM_GFX_SPEED
const ANIM_GFX_CHARGE
const ANIM_GFX_WIND
const ANIM_GFX_WHIP
const ANIM_GFX_EGG
const ANIM_GFX_ROPE
const ANIM_GFX_PSYCHIC
const ANIM_GFX_REFLECT
const ANIM_GFX_STATUS
const ANIM_GFX_SAND
const ANIM_GFX_WEB
const ANIM_GFX_HAZE
const ANIM_GFX_HORN
const ANIM_GFX_FLOWER
const ANIM_GFX_MISC
const ANIM_GFX_SKY_ATTACK
const ANIM_GFX_GLOBE
const ANIM_GFX_SHAPES
const ANIM_GFX_OBJECTS
const ANIM_GFX_SHINE
const ANIM_GFX_ANGELS
const ANIM_GFX_WAVE
const ANIM_GFX_AEROBLAST

2460
constants/map_constants.asm
View File

File diff suppressed because it is too large Load Diff

207
constants/music_constants.asm
View File

@ -1,106 +1,107 @@
MUSIC_NONE EQU 0
MUSIC_TITLE EQU 1
MUSIC_ROUTE_1 EQU 2
MUSIC_ROUTE_3 EQU 3
MUSIC_ROUTE_12 EQU 4
MUSIC_MAGNET_TRAIN EQU 5
MUSIC_KANTO_GYM_LEADER_BATTLE EQU 6
MUSIC_KANTO_TRAINER_BATTLE EQU 7
MUSIC_KANTO_WILD_BATTLE EQU 8
MUSIC_POKEMON_CENTER EQU 9
MUSIC_HIKER_ENCOUNTER EQU 10
MUSIC_LASS_ENCOUNTER EQU 11
MUSIC_OFFICER_ENCOUNTER EQU 12
MUSIC_HEAL EQU 13
MUSIC_LAVENDER_TOWN EQU 14
MUSIC_ROUTE_2 EQU 15
MUSIC_MT_MOON EQU 16
MUSIC_SHOW_ME_AROUND EQU 17
MUSIC_GAME_CORNER EQU 18
MUSIC_BICYCLE EQU 19
MUSIC_HALL_OF_FAME EQU 20
MUSIC_VIRIDIAN_CITY EQU 21
MUSIC_CELADON_CITY EQU 22
MUSIC_TRAINER_VICTORY EQU 23
MUSIC_WILD_VICTORY EQU 24
MUSIC_GYM_VICTORY EQU 25
MUSIC_MT_MOON_SQUARE EQU 26
MUSIC_GYM EQU 27
MUSIC_PALLET_TOWN EQU 28
MUSIC_POKEMON_TALK EQU 29
MUSIC_PROF_OAK EQU 30
MUSIC_RIVAL_ENCOUNTER EQU 31
MUSIC_RIVAL_AFTER EQU 32
MUSIC_SURF EQU 33
MUSIC_EVOLUTION EQU 34
MUSIC_NATIONAL_PARK EQU 35
MUSIC_CREDITS EQU 36
MUSIC_AZALEA_TOWN EQU 37
MUSIC_CHERRYGROVE_CITY EQU 38
MUSIC_KIMONO_ENCOUNTER EQU 39
MUSIC_UNION_CAVE EQU 40
MUSIC_JOHTO_WILD_BATTLE EQU 41
MUSIC_JOHTO_TRAINER_BATTLE EQU 42
MUSIC_ROUTE_30 EQU 43
MUSIC_ECRUTEAK_CITY EQU 44
MUSIC_VIOLET_CITY EQU 45
MUSIC_JOHTO_GYM_LEADER_BATTLE EQU 46
MUSIC_CHAMPION_BATTLE EQU 47
MUSIC_RIVAL_BATTLE EQU 48
MUSIC_ROCKET_BATTLE EQU 49
MUSIC_PROF_ELM EQU 50
MUSIC_DARK_CAVE EQU 51
MUSIC_ROUTE_29 EQU 52
MUSIC_ROUTE_36 EQU 53
MUSIC_SS_AQUA EQU 54
MUSIC_YOUNGSTER_ENCOUNTER EQU 55
MUSIC_BEAUTY_ENCOUNTER EQU 56
MUSIC_ROCKET_ENCOUNTER EQU 57
MUSIC_POKEMANIAC_ENCOUNTER EQU 58
MUSIC_SAGE_ENCOUNTER EQU 59
MUSIC_NEW_BARK_TOWN EQU 60
MUSIC_GOLDENROD_CITY EQU 61
MUSIC_VERMILION_CITY EQU 62
MUSIC_POKEMON_CHANNEL EQU 63
MUSIC_POKE_FLUTE_CHANNEL EQU 64
MUSIC_TIN_TOWER EQU 65
MUSIC_SPROUT_TOWER EQU 66
MUSIC_BURNED_TOWER EQU 67
MUSIC_LIGHTHOUSE EQU 68
MUSIC_LAKE_OF_RAGE EQU 69
MUSIC_INDIGO_PLATEAU EQU 70
MUSIC_ROUTE_37 EQU 71
MUSIC_ROCKET_HIDEOUT EQU 72
MUSIC_DRAGONS_DEN EQU 73
MUSIC_JOHTO_WILD_BATTLE_NIGHT EQU 74
MUSIC_RUINS_OF_ALPH_RADIO EQU 75
MUSIC_CAPTURE EQU 76
MUSIC_ROUTE_26 EQU 77
MUSIC_MOM EQU 78
MUSIC_VICTORY_ROAD EQU 79
MUSIC_POKEMON_LULLABY EQU 80
MUSIC_POKEMON_MARCH EQU 81
MUSIC_GS_OPENING EQU 82
MUSIC_GS_OPENING_2 EQU 83
MUSIC_MAIN_MENU EQU 84
MUSIC_RUINS_OF_ALPH_INTERIOR EQU 85
MUSIC_ROCKET_OVERTURE EQU 86
MUSIC_DANCING_HALL EQU 87
MUSIC_BUG_CATCHING_CONTEST_RANKING EQU 88
MUSIC_BUG_CATCHING_CONTEST EQU 89
MUSIC_LAKE_OF_RAGE_ROCKET_RADIO EQU 90
MUSIC_PRINTER EQU 91
MUSIC_POST_CREDITS EQU 92
const_def
MUSIC_CLAIR EQU 93
MUSIC_MOBILE_ADAPTER_MENU EQU 94
MUSIC_MOBILE_ADAPTER EQU 95
MUSIC_BUENAS_PASSWORD EQU 96
MUSIC_MYSTICALMAN_ENCOUNTER EQU 97
MUSIC_CRYSTAL_OPENING EQU 98
MUSIC_BATTLE_TOWER_THEME EQU 99
MUSIC_SUICUNE_BATTLE EQU 100
MUSIC_BATTLE_TOWER_LOBBY EQU 101
MUSIC_MOBILE_CENTER EQU 102
const MUSIC_NONE
const MUSIC_TITLE
const MUSIC_ROUTE_1
const MUSIC_ROUTE_3
const MUSIC_ROUTE_12
const MUSIC_MAGNET_TRAIN
const MUSIC_KANTO_GYM_LEADER_BATTLE
const MUSIC_KANTO_TRAINER_BATTLE
const MUSIC_KANTO_WILD_BATTLE
const MUSIC_POKEMON_CENTER
const MUSIC_HIKER_ENCOUNTER
const MUSIC_LASS_ENCOUNTER
const MUSIC_OFFICER_ENCOUNTER
const MUSIC_HEAL
const MUSIC_LAVENDER_TOWN
const MUSIC_ROUTE_2
const MUSIC_MT_MOON
const MUSIC_SHOW_ME_AROUND
const MUSIC_GAME_CORNER
const MUSIC_BICYCLE
const MUSIC_HALL_OF_FAME
const MUSIC_VIRIDIAN_CITY
const MUSIC_CELADON_CITY
const MUSIC_TRAINER_VICTORY
const MUSIC_WILD_VICTORY
const MUSIC_GYM_VICTORY
const MUSIC_MT_MOON_SQUARE
const MUSIC_GYM
const MUSIC_PALLET_TOWN
const MUSIC_POKEMON_TALK
const MUSIC_PROF_OAK
const MUSIC_RIVAL_ENCOUNTER
const MUSIC_RIVAL_AFTER
const MUSIC_SURF
const MUSIC_EVOLUTION
const MUSIC_NATIONAL_PARK
const MUSIC_CREDITS
const MUSIC_AZALEA_TOWN
const MUSIC_CHERRYGROVE_CITY
const MUSIC_KIMONO_ENCOUNTER
const MUSIC_UNION_CAVE
const MUSIC_JOHTO_WILD_BATTLE
const MUSIC_JOHTO_TRAINER_BATTLE
const MUSIC_ROUTE_30
const MUSIC_ECRUTEAK_CITY
const MUSIC_VIOLET_CITY
const MUSIC_JOHTO_GYM_LEADER_BATTLE
const MUSIC_CHAMPION_BATTLE
const MUSIC_RIVAL_BATTLE
const MUSIC_ROCKET_BATTLE
const MUSIC_PROF_ELM
const MUSIC_DARK_CAVE
const MUSIC_ROUTE_29
const MUSIC_ROUTE_36
const MUSIC_SS_AQUA
const MUSIC_YOUNGSTER_ENCOUNTER
const MUSIC_BEAUTY_ENCOUNTER
const MUSIC_ROCKET_ENCOUNTER
const MUSIC_POKEMANIAC_ENCOUNTER
const MUSIC_SAGE_ENCOUNTER
const MUSIC_NEW_BARK_TOWN
const MUSIC_GOLDENROD_CITY
const MUSIC_VERMILION_CITY
const MUSIC_POKEMON_CHANNEL
const MUSIC_POKE_FLUTE_CHANNEL
const MUSIC_TIN_TOWER
const MUSIC_SPROUT_TOWER
const MUSIC_BURNED_TOWER
const MUSIC_LIGHTHOUSE
const MUSIC_LAKE_OF_RAGE
const MUSIC_INDIGO_PLATEAU
const MUSIC_ROUTE_37
const MUSIC_ROCKET_HIDEOUT
const MUSIC_DRAGONS_DEN
const MUSIC_JOHTO_WILD_BATTLE_NIGHT
const MUSIC_RUINS_OF_ALPH_RADIO
const MUSIC_CAPTURE
const MUSIC_ROUTE_26
const MUSIC_MOM
const MUSIC_VICTORY_ROAD
const MUSIC_POKEMON_LULLABY
const MUSIC_POKEMON_MARCH
const MUSIC_GS_OPENING
const MUSIC_GS_OPENING_2
const MUSIC_MAIN_MENU
const MUSIC_RUINS_OF_ALPH_INTERIOR
const MUSIC_ROCKET_OVERTURE
const MUSIC_DANCING_HALL
const MUSIC_BUG_CATCHING_CONTEST_RANKING
const MUSIC_BUG_CATCHING_CONTEST
const MUSIC_LAKE_OF_RAGE_ROCKET_RADIO
const MUSIC_PRINTER
const MUSIC_POST_CREDITS
const MUSIC_CLAIR
const MUSIC_MOBILE_ADAPTER_MENU
const MUSIC_MOBILE_ADAPTER
const MUSIC_BUENAS_PASSWORD
const MUSIC_MYSTICALMAN_ENCOUNTER
const MUSIC_CRYSTAL_OPENING
const MUSIC_BATTLE_TOWER_THEME
const MUSIC_SUICUNE_BATTLE
const MUSIC_BATTLE_TOWER_LOBBY
const MUSIC_MOBILE_CENTER
MUSIC_MAHOGANY_MART EQU 100 ; leftover from gold

2
constants/std_constants.asm
View File

@ -48,6 +48,6 @@
enum gymstatue2
enum receiveitem
enum receivetogepiegg
enum pc
enum pcscript
enum gamecornercoinvendor
enum happinesschecknpc

2
engine/spawn_points.asm
View File

@ -18,7 +18,7 @@ ENDM
spawn VIRIDIAN, VIRIDIAN_CITY, 23, 26
spawn PEWTER, PEWTER_CITY, 13, 26
spawn CERULEAN, CERULEAN_CITY, 19, 22
spawn ROCK_TUNNEL, ROUTE_10A, 11, 2
spawn ROCK_TUNNEL, ROUTE_10_NORTH, 11, 2
spawn VERMILION, VERMILION_CITY, 9, 6
spawn LAVENDER, LAVENDER_TOWN, 5, 6
spawn SAFFRON, SAFFRON_CITY, 9, 30

8
macros.asm
View File

@ -44,6 +44,14 @@ dbwww: MACRO
dw \2, \3, \4
ENDM
dbankaddr: MACRO
dbw BANK(\1), \1
ENDM
daddrbank: MACRO
dwb \1, BANK(\1)
ENDM
dn: MACRO
rept _NARG / 2
db (\1) << 4 + (\2)

5
macros/enum.asm
View File

@ -29,3 +29,8 @@ const: MACRO
\1 EQU const_value
const_value = const_value + 1
ENDM
shift_const: MACRO
\1 EQU 1 << const_value
const_value = const_value + 1
ENDM

14
macros/map.asm
View File

@ -162,3 +162,17 @@ if "\1" == "east"
endc
ENDM
mapgroup: MACRO
\1\@ EQUS "GROUP_\1"
\1\@2 EQUS "MAP_\1"
\1\@ EQU const_value
enum \1\@2
\1_HEIGHT EQU \2
\1_WIDTH EQU \3
ENDM
newgroup: MACRO
const_value = const_value + 1
enum_start 1
ENDM

14
maps/AzaleaGym.asm
View File

@ -451,10 +451,10 @@ AzaleaGym_MapEventHeader:
; people-events
db 7
person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, EVENT_ALWAYS_THERE
person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, EVENT_ALWAYS_THERE
person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, EVENT_ALWAYS_THERE
person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, EVENT_ALWAYS_THERE
person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, EVENT_ALWAYS_THERE
person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, EVENT_ALWAYS_THERE
person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, EVENT_ALWAYS_THERE
person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, -1
person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, -1
person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, -1
person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, -1
person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, -1
person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, -1
person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, -1

6
maps/AzaleaMart.asm
View File

@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader:
; people-events
db 3
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, EVENT_ALWAYS_THERE
person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, EVENT_ALWAYS_THERE
person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, EVENT_ALWAYS_THERE
person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, -1
person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, -1
person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, -1

8
maps/AzaleaPokeCenter1F.asm
View File

@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader:
; people-events
db 4
person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, EVENT_ALWAYS_THERE
person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, EVENT_ALWAYS_THERE
person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, EVENT_ALWAYS_THERE
person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, EVENT_ALWAYS_THERE
person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, -1
person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, -1
person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, -1
person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, -1

8
maps/AzaleaTown.asm
View File

@ -483,14 +483,14 @@ AzaleaTown_MapEventHeader:
; people-events
db 12
person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_6FA
person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, EVENT_ALWAYS_THERE
person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, EVENT_ALWAYS_THERE
person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, EVENT_ALWAYS_THERE
person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, -1
person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, -1
person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, -1
person_event SPRITE_SLOWPOKE, 21, 12, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9
person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9
person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9
person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9
person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, EVENT_ALWAYS_THERE
person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, -1
person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BF
person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_6FC
person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, EVENT_7A4

10
maps/BattleTower1F.asm
View File

@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader:
; people-events
db 5
person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, EVENT_ALWAYS_THERE
person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, EVENT_ALWAYS_THERE
person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, EVENT_ALWAYS_THERE
person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, EVENT_ALWAYS_THERE
person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, EVENT_ALWAYS_THERE
person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, -1
person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, -1
person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, -1
person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, -1
person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, -1

2
maps/BattleTowerBattleRoom.asm
View File

@ -156,4 +156,4 @@ BattleTowerBattleRoom_MapEventHeader:
; people-events
db 2
person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_791
person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_ALWAYS_THERE
person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, -1

2
maps/BattleTowerElevator.asm
View File

@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
; people-events
db 1
person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, EVENT_ALWAYS_THERE
person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, -1

2
maps/BattleTowerHallway.asm
View File

@ -96,4 +96,4 @@ BattleTowerHallway_MapEventHeader:
; people-events
db 1
person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, EVENT_ALWAYS_THERE
person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, -1

6
maps/BattleTowerOutside.asm
View File

@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader:
; people-events
db 4
person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, EVENT_ALWAYS_THERE
person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, EVENT_ALWAYS_THERE
person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, -1
person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, -1
person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, EVENT_7CF
person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_ALWAYS_THERE
person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, -1

2
maps/BillsHouse.asm
View File

@ -367,4 +367,4 @@ BillsHouse_MapEventHeader:
; people-events
db 1
person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, EVENT_ALWAYS_THERE
person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, -1

8
maps/BlackthornCity.asm
View File

@ -337,8 +337,8 @@ BlackthornCity_MapEventHeader:
person_event SPRITE_SUPER_NERD, 16, 23, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E4
person_event SPRITE_GRAMPS, 6, 24, $6, $0, 255, 255, $0, 0, GrampsScript_0x1a4708, EVENT_74C
person_event SPRITE_GRAMPS, 6, 25, $8, $0, 255, 255, $0, 0, GrampsScript_0x1a470b, EVENT_74D
person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, EVENT_ALWAYS_THERE
person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, EVENT_ALWAYS_THERE
person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, EVENT_ALWAYS_THERE
person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, -1
person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, -1
person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, -1
person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, SantosScript, EVENT_75D
person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, EVENT_ALWAYS_THERE
person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, -1

Some files were not shown because too many files have changed in this diff Show More