Updated signpost items and person_event flags

This commit is contained in:
PikalaxALT
2015-07-18 15:46:38 -04:00
parent 0fcef5fc08
commit e674869018
176 changed files with 1602 additions and 1633 deletions

View File

@@ -245,7 +245,7 @@ Function967d1: ; 967d1
; 967e1
Function967e1: ; 967e1
callba Function5920
callba RefreshMapAppearDisappear
callba Functiond4d2
callba Functionb8098
ret
@@ -648,7 +648,7 @@ TryObjectEvent: ; 969b5
; 96a04
.zero ; 96a04
ld hl, MAPOBJECT_POINTER_LO
ld hl, MAPOBJECT_SCRIPT_POINTER
add hl, bc
ld a, [hli]
ld h, [hl]
@@ -660,7 +660,7 @@ TryObjectEvent: ; 969b5
; 96a12
.one ; 96a12
ld hl, MAPOBJECT_POINTER_LO
ld hl, MAPOBJECT_SCRIPT_POINTER
add hl, bc
ld a, [hli]
ld h, [hl]

View File

@@ -2761,7 +2761,7 @@ Function5602: ; 5602
call Function5629
.ok
call Function5920
call RefreshMapAppearDisappear
ret
; 561d
@@ -2769,7 +2769,7 @@ Function561d: ; 561d
call Function5645
ld a, 0
call Function5629
call Function5920
call RefreshMapAppearDisappear
ret
; 5629
@@ -2777,7 +2777,7 @@ Function5629: ; 5629
cp $10
ret nc
call GetMapObject
ld hl, MAPOBJECT_VRAM_ID
ld hl, MAPOBJECT_OBJECT_STRUCT_ID
add hl, bc
ld a, [hl]
cp MAPOBJECT_NOT_VISIBLE
@@ -3320,7 +3320,7 @@ Function5903: ; 5903
db 6, 7, 8, 9
; 5920
Function5920:: ; 5920
RefreshMapAppearDisappear:: ; 5920
ld a, [VramState]
bit 0, a
ret z

View File

@@ -1253,10 +1253,10 @@ Script_appear: ; 0x972dd
call GetScriptByte
call GetScriptPerson
call Function1956
call _CopyObjectStruct
ld a, [$ffaf]
ld b, $0
call Function9730b
ld b, 0 ; clear
call ApplyEventActionAppearDisappear
ret
; 0x972ee
@@ -1267,35 +1267,35 @@ Script_disappear: ; 0x972ee
call GetScriptByte
call GetScriptPerson
cp $fe
jr nz, .asm_972fa ; 0x972f6 $2
cp -2
jr nz, .skip ; 0x972f6 $2
ld a, [$ffe0]
.asm_972fa
call Function199f
.skip
call DeleteObjectStruct
ld a, [$ffaf]
ld b, $1
call Function9730b
callba Function5920
ld b, 1 ; set
call ApplyEventActionAppearDisappear
callba RefreshMapAppearDisappear
ret
; 0x9730b
Function9730b: ; 0x9730b
ApplyEventActionAppearDisappear: ; 0x9730b
push bc
call GetMapObject
ld hl, $000c
ld hl, MAPOBJECT_EVENT_FLAG
add hl, bc
pop bc
ld e, [hl]
inc hl
ld d, [hl]
ld a, $ff
ld a, -1
cp e
jr nz, .asm_97321 ; 0x9731a $5
jr nz, .okay ; 0x9731a $5
cp d
jr nz, .asm_97321 ; 0x9731d $2
jr nz, .okay ; 0x9731d $2
xor a
ret
.asm_97321
.okay
call EventFlagAction
ret
; 0x97325

View File

@@ -287,25 +287,25 @@ DayToTextScript:
db "SATURDAY@"
GoldenrodRocketsScript:
clearevent EVENT_6CD
clearevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
end
RadioTowerRocketsScript:
setflag ENGINE_ROCKETS_IN_RADIO_TOWER
setevent EVENT_6CF
setevent EVENT_6D1
clearevent EVENT_6CE
setevent EVENT_GOLDENROD_CITY_CIVILIANS
setevent EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS
clearevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_756
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall ELMCALL_WEIRDBROADCAST
domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1
end
BugContestResultsWarpScript:
special WhiteBGMap
scall BugContestResults_EnsureNoDuplicateSprites
setevent EVENT_747
clearevent EVENT_748
scall BugContestResults_CopyContestantsToResults
setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_2D2
warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
applymovement $0, Movement_ContestResults_WalkAfterWarp
@@ -438,7 +438,7 @@ BugContestResults_NoRoomForBerry ; 0xbc375
jump BugContestResults_DidNotWin
; 0xbc380
BugContestResults_EnsureNoDuplicateSprites ; 0xbc380
BugContestResults_CopyContestantsToResults ; 0xbc380
checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
iftrue .skip1
clearevent EVENT_BUG_CATCHING_CONTESTANT_1B
@@ -482,35 +482,35 @@ BugContestResults_EnsureNoDuplicateSprites ; 0xbc380
end
InitializeEventsScript:
setevent EVENT_6CB
setevent EVENT_6CE
setevent EVENT_6CD
setevent EVENT_6D0
setevent EVENT_6F3
setevent EVENT_6E9
setevent EVENT_6F4
setevent EVENT_6D5
setevent EVENT_6DE
setevent EVENT_6DD
setevent EVENT_6DF
setevent EVENT_6C0
setevent EVENT_6E4
setevent EVENT_EARLS_ACADEMY_EARL
setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER
setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
setevent EVENT_RADIO_TOWER_CIVILIANS_AFTER
setevent EVENT_ILEX_FOREST_APPRENTICE
setevent EVENT_ILEX_FOREST_FARFETCHD
setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER
setevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
setevent EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
setevent EVENT_RIVAL_TEAM_ROCKET_BASE
setevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM
setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_6BE
setevent EVENT_6BF
setevent EVENT_6C1
setevent EVENT_6F9
setevent EVENT_6FD
setevent EVENT_RIVAL_CHERRYGROVE_CITY
setevent EVENT_RIVAL_AZALEA_TOWN
setevent EVENT_RIVAL_UNDERGROUND_PATH
setevent EVENT_AZALEA_TOWN_SLOWPOKES
setevent EVENT_KURTS_HOUSE_SLOWPOKE
setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
setevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
setevent EVENT_COP_IN_ELMS_LAB
setevent EVENT_703
setevent EVENT_704
setevent EVENT_BOULDER_IN_ICE_PATH_1
setevent EVENT_BOULDER_IN_ICE_PATH_2
setevent EVENT_BOULDER_IN_ICE_PATH_3
setevent EVENT_BOULDER_IN_ICE_PATH_4
setevent EVENT_715
setevent EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST
setevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST
setevent EVENT_BOULDER_IN_ICE_PATH_1A
setevent EVENT_BOULDER_IN_ICE_PATH_2A
setevent EVENT_BOULDER_IN_ICE_PATH_3A
setevent EVENT_BOULDER_IN_ICE_PATH_4A
setevent EVENT_ROUTE_30_YOUNGSTER_JOEY
setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A
@@ -531,70 +531,70 @@ InitializeEventsScript:
setevent EVENT_BUG_CATCHING_CONTESTANT_8B
setevent EVENT_BUG_CATCHING_CONTESTANT_9B
setevent EVENT_BUG_CATCHING_CONTESTANT_10B
setevent EVENT_72C
setevent EVENT_72F
setevent EVENT_72D
setevent EVENT_735
setevent EVENT_736
setevent EVENT_73C
setevent EVENT_73D
setevent EVENT_741
setevent EVENT_742
setevent EVENT_743
setevent EVENT_744
setevent EVENT_FAST_SHIP_1F_GENTLEMAN
setevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
setevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
setevent EVENT_LAKE_OF_RAGE_CIVILIANS
setevent EVENT_MAHOGANY_MART_OWNERS
setevent EVENT_TIN_TOWER_ROOF_HO_OH
setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
setevent EVENT_KRISS_HOUSE_2F_CONSOLE
setevent EVENT_KRISS_HOUSE_2F_DOLL_1
setevent EVENT_KRISS_HOUSE_2F_DOLL_2
setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL
setevent EVENT_2A4
setevent EVENT_2AF
setevent EVENT_749
setevent EVENT_6D3
setevent EVENT_74D
setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
setevent EVENT_OLIVINE_GYM_JASMINE
setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
setevent EVENT_MET_BILL
setevent EVENT_713
setevent EVENT_ECRUTEAK_POKE_CENTER_BILL
setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
setevent EVENT_6D4
setevent EVENT_LAKE_OF_RAGE_LANCE
setevent EVENT_WAREHOUSE_LAYOUT_1
setevent EVENT_WAREHOUSE_BLOCKED_OFF
setevent EVENT_6D8
setevent EVENT_6C3
setevent EVENT_6C2
setevent EVENT_6C6
setevent EVENT_75F
setevent EVENT_731
setevent EVENT_74A
setevent EVENT_DRAGONS_DEN_CLAIR
setevent EVENT_RIVAL_OLIVINE_CITY
setevent EVENT_RIVAL_VICTORY_ROAD
setevent EVENT_RIVAL_DRAGONS_DEN
setevent EVENT_LANCES_ROOM_OAK_AND_MARY
setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
setevent EVENT_BURNED_TOWER_B1F_BEASTS_1
setevent EVENT_RED_IN_MT_SILVER
setevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
setevent EVENT_73A
setevent EVENT_73B
setevent EVENT_733
setevent EVENT_73F
setevent EVENT_78D
setevent EVENT_766
setevent EVENT_768
setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
setevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
setevent EVENT_KURTS_HOUSE_KURT_2
setevent EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
setevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_FLORIA_AT_FLOWER_SHOP
setevent EVENT_FLORIA_AT_SUDOWOODO
setevent EVENT_76A
setevent EVENT_78E
setevent EVENT_78F
setevent EVENT_790
setevent EVENT_791
setevent EVENT_793
setevent EVENT_7A4
setevent EVENT_7A4
setevent EVENT_7A5
setevent EVENT_6EC
setevent EVENT_6ED
setevent EVENT_GOLDENROD_CITY_MOVE_TUTOR
setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
setevent EVENT_DRAGON_SHRINE_CLAIR
setevent EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
setevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
setevent EVENT_AZALEA_TOWN_KURT
setevent EVENT_AZALEA_TOWN_KURT
setevent EVENT_ILEX_FOREST_KURT
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY
setevent EVENT_ILEX_FOREST_LASS
setevent EVENT_GOLDENROD_SALE_OFF
setevent EVENT_7A9
setevent EVENT_ECRUTEAK_CITY_GRAMPS
setevent EVENT_EUSINE_IN_BURNED_TOWER
setevent EVENT_6C8
setevent EVENT_7AC
setevent EVENT_7AD
setevent EVENT_7B5
setevent EVENT_7B6
setevent EVENT_7C5
setevent EVENT_KRISS_HOUSE_MOM_2
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
setevent EVENT_CIANWOOD_CITY_EUSINE
setevent EVENT_TIN_TOWER_1F_EUSINE
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
setevent EVENT_SET_WHEN_FOUGHT_HO_OH
setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_7CF
setevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
setflag ENGINE_ROCKET_SIGNAL_ON_CH20
setflag ENGINE_ROCKETS_IN_MAHOGANY
variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO
@@ -607,16 +607,16 @@ InitializeEventsScript:
variablesprite SPRITE_COPYCAT, SPRITE_LASS
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
setevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
setevent EVENT_76D
setevent EVENT_76C
setevent EVENT_76E
setevent EVENT_CERULEAN_GYM_ROCKET
setevent EVENT_ROUTE_24_ROCKET
setevent EVENT_ROUTE_25_MISTY_BOYFRIEND
setevent EVENT_TRAINERS_IN_CERULEAN_GYM
setevent EVENT_773
setevent EVENT_776
setevent EVENT_777
setevent EVENT_779
setevent EVENT_772
setevent EVENT_77B
setevent EVENT_COPYCATS_HOUSE_2F_DOLL
setevent EVENT_VIRIDIAN_GYM_BLUE
setevent EVENT_SEAFOAM_GYM_GYM_GUY
setevent EVENT_MT_MOON_SQUARE_CLEFAIRY
setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION
setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
setevent EVENT_036
return