pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary event and engine flags (#1)

Browse Source
This commit is contained in:
xCrystal 2023-07-25 18:24:38 +02:00
parent 7bbe559252
commit 473c23a727
10 changed files with 37 additions and 1724 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
constants/engine_flags.asm
View File

@ -97,66 +97,14 @@
; wCelebiEvent ; wCelebiEvent
const ENGINE_FOREST_IS_RESTLESS const ENGINE_FOREST_IS_RESTLESS
; wDailyRematchFlags ; wDailyRematchFlags
const ENGINE_JACK_READY_FOR_REMATCH ; const ENGINE_JACK_READY_FOR_REMATCH
const ENGINE_HUEY_READY_FOR_REMATCH ; const ENGINE_HUEY_READY_FOR_REMATCH
const ENGINE_GAVEN_READY_FOR_REMATCH
const ENGINE_BETH_READY_FOR_REMATCH
const ENGINE_JOSE_READY_FOR_REMATCH
const ENGINE_REENA_READY_FOR_REMATCH
const ENGINE_JOEY_READY_FOR_REMATCH
const ENGINE_WADE_READY_FOR_REMATCH
const ENGINE_RALPH_READY_FOR_REMATCH
const ENGINE_LIZ_READY_FOR_REMATCH
const ENGINE_ANTHONY_READY_FOR_REMATCH
const ENGINE_TODD_READY_FOR_REMATCH
const ENGINE_GINA_READY_FOR_REMATCH
const ENGINE_ARNIE_READY_FOR_REMATCH
const ENGINE_ALAN_READY_FOR_REMATCH
const ENGINE_DANA_READY_FOR_REMATCH
const ENGINE_CHAD_READY_FOR_REMATCH
const ENGINE_TULLY_READY_FOR_REMATCH
const ENGINE_BRENT_READY_FOR_REMATCH
const ENGINE_TIFFANY_READY_FOR_REMATCH
const ENGINE_VANCE_READY_FOR_REMATCH
const ENGINE_WILTON_READY_FOR_REMATCH
const ENGINE_PARRY_READY_FOR_REMATCH
const ENGINE_ERIN_READY_FOR_REMATCH
; wDailyPhoneItemFlags ; wDailyPhoneItemFlags
const ENGINE_BEVERLY_HAS_NUGGET ; const ENGINE_BEVERLY_HAS_NUGGET
const ENGINE_JOSE_HAS_STAR_PIECE ; const ENGINE_JOSE_HAS_STAR_PIECE
const ENGINE_WADE_HAS_ITEM
const ENGINE_GINA_HAS_LEAF_STONE
const ENGINE_ALAN_HAS_FIRE_STONE
const ENGINE_DANA_HAS_THUNDERSTONE
const ENGINE_DEREK_HAS_NUGGET
const ENGINE_TULLY_HAS_WATER_STONE
const ENGINE_TIFFANY_HAS_PINK_BOW
const ENGINE_WILTON_HAS_ITEM
; wDailyPhoneTimeOfDayFlags ; wDailyPhoneTimeOfDayFlags
const ENGINE_JACK_MONDAY_MORNING ; const ENGINE_JACK_MONDAY_MORNING
const ENGINE_HUEY_WEDNESDAY_NIGHT ; const ENGINE_HUEY_WEDNESDAY_NIGHT
const ENGINE_GAVEN_THURSDAY_MORNING
const ENGINE_BETH_FRIDAY_AFTERNOON
const ENGINE_JOSE_SATURDAY_NIGHT
const ENGINE_REENA_SUNDAY_MORNING
const ENGINE_JOEY_MONDAY_AFTERNOON
const ENGINE_WADE_TUESDAY_NIGHT
const ENGINE_RALPH_WEDNESDAY_MORNING
const ENGINE_LIZ_THURSDAY_AFTERNOON
const ENGINE_ANTHONY_FRIDAY_NIGHT
const ENGINE_TODD_SATURDAY_MORNING
const ENGINE_GINA_SUNDAY_AFTERNOON
const ENGINE_ARNIE_TUESDAY_MORNING
const ENGINE_ALAN_WEDNESDAY_AFTERNOON
const ENGINE_DANA_THURSDAY_NIGHT
const ENGINE_CHAD_FRIDAY_MORNING
const ENGINE_TULLY_SUNDAY_NIGHT
const ENGINE_BRENT_MONDAY_MORNING
const ENGINE_TIFFANY_TUESDAY_AFTERNOON
const ENGINE_VANCE_WEDNESDAY_NIGHT
const ENGINE_WILTON_THURSDAY_MORNING
const ENGINE_PARRY_FRIDAY_AFTERNOON
const ENGINE_ERIN_SATURDAY_NIGHT
; wPlayerSpriteSetupFlags ; wPlayerSpriteSetupFlags
const ENGINE_KRIS_IN_CABLE_CLUB const ENGINE_KRIS_IN_CABLE_CLUB
; wSwarmFlags ; wSwarmFlags

1396
constants/event_flags.asm
View File

File diff suppressed because it is too large Load Diff

64
data/events/engine_flags.asm
View File

@ -108,66 +108,14 @@ EngineFlags:
engine_flag wCelebiEvent, CELEBIEVENT_FOREST_IS_RESTLESS_F engine_flag wCelebiEvent, CELEBIEVENT_FOREST_IS_RESTLESS_F
; rematches ; rematches
engine_flag wDailyRematchFlags, 0 ; jack ; engine_flag wDailyRematchFlags, 0 ; jack
engine_flag wDailyRematchFlags, 1 ; huey ; engine_flag wDailyRematchFlags, 1 ; huey
engine_flag wDailyRematchFlags, 2 ; gaven
engine_flag wDailyRematchFlags, 3 ; beth
engine_flag wDailyRematchFlags, 4 ; jose
engine_flag wDailyRematchFlags, 5 ; reena
engine_flag wDailyRematchFlags, 6 ; joey
engine_flag wDailyRematchFlags, 7 ; wade
engine_flag wDailyRematchFlags, 8 ; ralph
engine_flag wDailyRematchFlags, 9 ; liz
engine_flag wDailyRematchFlags, 10 ; anthony
engine_flag wDailyRematchFlags, 11 ; todd
engine_flag wDailyRematchFlags, 12 ; gina
engine_flag wDailyRematchFlags, 13 ; arnie
engine_flag wDailyRematchFlags, 14 ; alan
engine_flag wDailyRematchFlags, 15 ; dana
engine_flag wDailyRematchFlags, 16 ; chad
engine_flag wDailyRematchFlags, 17 ; tully
engine_flag wDailyRematchFlags, 18 ; brent
engine_flag wDailyRematchFlags, 19 ; tiffany
engine_flag wDailyRematchFlags, 20 ; vance
engine_flag wDailyRematchFlags, 21 ; wilton
engine_flag wDailyRematchFlags, 22 ; parry
engine_flag wDailyRematchFlags, 23 ; erin
engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget ; engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget
engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece ; engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece
engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see EVENT_WADE_HAS_*** in constants/event_flags.asm)
engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone
engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone
engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone
engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget
engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone
engine_flag wDailyPhoneItemFlags, 8 ; tiffany has pink bow
engine_flag wDailyPhoneItemFlags, 9 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm)
engine_flag wDailyPhoneTimeOfDayFlags, 0 ; jack ; engine_flag wDailyPhoneTimeOfDayFlags, 0 ; jack
engine_flag wDailyPhoneTimeOfDayFlags, 1 ; huey ; engine_flag wDailyPhoneTimeOfDayFlags, 1 ; huey
engine_flag wDailyPhoneTimeOfDayFlags, 2 ; gaven
engine_flag wDailyPhoneTimeOfDayFlags, 3 ; beth
engine_flag wDailyPhoneTimeOfDayFlags, 4 ; jose
engine_flag wDailyPhoneTimeOfDayFlags, 5 ; reena
engine_flag wDailyPhoneTimeOfDayFlags, 6 ; joey
engine_flag wDailyPhoneTimeOfDayFlags, 7 ; wade
engine_flag wDailyPhoneTimeOfDayFlags, 8 ; ralph
engine_flag wDailyPhoneTimeOfDayFlags, 9 ; liz
engine_flag wDailyPhoneTimeOfDayFlags, 10 ; anthony
engine_flag wDailyPhoneTimeOfDayFlags, 11 ; todd
engine_flag wDailyPhoneTimeOfDayFlags, 12 ; gina
engine_flag wDailyPhoneTimeOfDayFlags, 13 ; arnie
engine_flag wDailyPhoneTimeOfDayFlags, 14 ; alan
engine_flag wDailyPhoneTimeOfDayFlags, 15 ; dana
engine_flag wDailyPhoneTimeOfDayFlags, 16 ; chad
engine_flag wDailyPhoneTimeOfDayFlags, 17 ; tully
engine_flag wDailyPhoneTimeOfDayFlags, 18 ; brent
engine_flag wDailyPhoneTimeOfDayFlags, 19 ; tiffany
engine_flag wDailyPhoneTimeOfDayFlags, 20 ; vance
engine_flag wDailyPhoneTimeOfDayFlags, 21 ; wilton
engine_flag wDailyPhoneTimeOfDayFlags, 22 ; parry
engine_flag wDailyPhoneTimeOfDayFlags, 23 ; erin
engine_flag wPlayerSpriteSetupFlags, PLAYERSPRITESETUP_FEMALE_TO_MALE_F engine_flag wPlayerSpriteSetupFlags, PLAYERSPRITESETUP_FEMALE_TO_MALE_F

2
data/maps/landmarks.asm
View File

@ -11,5 +11,5 @@ Landmarks:
landmark 140, 100, Level1LandmarkName landmark 140, 100, Level1LandmarkName
assert_table_length NUM_LANDMARKS assert_table_length NUM_LANDMARKS
Level1LandmarkName: db "LEVEL 1@"
SpecialLandmarkName: db "SPECIAL@" SpecialLandmarkName: db "SPECIAL@"
Level1LandmarkName: db "LEVEL 1@"

180
engine/events/std_scripts.asm
View File

@ -58,8 +58,6 @@ StdScripts::
add_stdscript HappinessCheckScript add_stdscript HappinessCheckScript
PokecenterNurseScript: PokecenterNurseScript:
; EVENT_WELCOMED_TO_POKECOM_CENTER is never set
opentext opentext
checktime MORN checktime MORN
iftrue .morn iftrue .morn
@ -70,42 +68,21 @@ PokecenterNurseScript:
sjump .ok sjump .ok
.morn .morn
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .morn_comcenter
farwritetext NurseMornText farwritetext NurseMornText
promptbutton promptbutton
sjump .ok sjump .ok
.morn_comcenter
farwritetext PokeComNurseMornText
promptbutton
sjump .ok
.day .day
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .day_comcenter
farwritetext NurseDayText farwritetext NurseDayText
promptbutton promptbutton
sjump .ok sjump .ok
.day_comcenter
farwritetext PokeComNurseDayText
promptbutton
sjump .ok
.nite .nite
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .nite_comcenter
farwritetext NurseNiteText farwritetext NurseNiteText
promptbutton promptbutton
sjump .ok sjump .ok
.nite_comcenter
farwritetext PokeComNurseNiteText
promptbutton
sjump .ok
.ok .ok
; only do this once
clearevent EVENT_WELCOMED_TO_POKECOM_CENTER
farwritetext NurseAskHealText farwritetext NurseAskHealText
yesorno yesorno
iffalse .done iffalse .done
@ -147,20 +124,9 @@ PokecenterNurseScript:
end end
.pokerus .pokerus
; already cleared earlier in the script
checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
iftrue .pokerus_comcenter
farwritetext NursePokerusText farwritetext NursePokerusText
waitbutton waitbutton
closetext closetext
sjump .pokerus_done
.pokerus_comcenter
farwritetext PokeComNursePokerusText
waitbutton
closetext
.pokerus_done
setflag ENGINE_CAUGHT_POKERUS setflag ENGINE_CAUGHT_POKERUS
end end
@ -289,29 +255,18 @@ DayToTextScript:
db "SATURDAY@" db "SATURDAY@"
GoldenrodRocketsScript: GoldenrodRocketsScript:
clearevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
end end
RadioTowerRocketsScript: RadioTowerRocketsScript:
setflag ENGINE_ROCKETS_IN_RADIO_TOWER
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_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
end end
BugContestResultsWarpScript: BugContestResultsWarpScript:
special ClearBGPalettes special ClearBGPalettes
scall BugContestResults_CopyContestantsToResults 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_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
applymovement PLAYER, Movement_ContestResults_WalkAfterWarp applymovement PLAYER, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript: BugContestResultsScript:
clearflag ENGINE_BUG_CONTEST_TIMER clearflag ENGINE_BUG_CONTEST_TIMER
clearevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
@ -471,141 +426,6 @@ BugContestResults_CopyContestantsToResults:
end end
InitializeEventsScript: InitializeEventsScript:
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_RIVAL_CHERRYGROVE_CITY
setevent EVENT_RIVAL_AZALEA_TOWN
setevent EVENT_RIVAL_GOLDENROD_UNDERGROUND
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_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
setevent EVENT_BUG_CATCHING_CONTESTANT_4A
setevent EVENT_BUG_CATCHING_CONTESTANT_5A
setevent EVENT_BUG_CATCHING_CONTESTANT_6A
setevent EVENT_BUG_CATCHING_CONTESTANT_7A
setevent EVENT_BUG_CATCHING_CONTESTANT_8A
setevent EVENT_BUG_CATCHING_CONTESTANT_9A
setevent EVENT_BUG_CATCHING_CONTESTANT_10A
setevent EVENT_BUG_CATCHING_CONTESTANT_1B
setevent EVENT_BUG_CATCHING_CONTESTANT_2B
setevent EVENT_BUG_CATCHING_CONTESTANT_3B
setevent EVENT_BUG_CATCHING_CONTESTANT_4B
setevent EVENT_BUG_CATCHING_CONTESTANT_5B
setevent EVENT_BUG_CATCHING_CONTESTANT_6B
setevent EVENT_BUG_CATCHING_CONTESTANT_7B
setevent EVENT_BUG_CATCHING_CONTESTANT_8B
setevent EVENT_BUG_CATCHING_CONTESTANT_9B
setevent EVENT_BUG_CATCHING_CONTESTANT_10B
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_PLAYERS_HOUSE_2F_CONSOLE
setevent EVENT_PLAYERS_HOUSE_2F_DOLL_1
setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2
setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
setevent EVENT_DECO_BED_1
setevent EVENT_DECO_POSTER_1
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_ECRUTEAK_POKE_CENTER_BILL
setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
setevent EVENT_LAKE_OF_RAGE_LANCE
setevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_1
setevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
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_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_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_PLAYERS_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_ECRUTEAK_CITY_GRAMPS
setevent EVENT_EUSINE_IN_BURNED_TOWER
setevent EVENT_PLAYERS_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_BATTLE_TOWER_OPEN_CIVILIANS
setflag ENGINE_ROCKET_SIGNAL_ON_CH20
setflag ENGINE_ROCKETS_IN_MAHOGANY
variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_RIVAL
variablesprite SPRITE_AZALEA_ROCKET, SPRITE_ROCKET
variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_JANINE
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_JANINE
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_JANINE
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_JANINE
variablesprite SPRITE_COPYCAT, SPRITE_LASS
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
setevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM
setevent EVENT_CERULEAN_GYM_ROCKET
setevent EVENT_ROUTE_24_ROCKET
setevent EVENT_ROUTE_25_MISTY_BOYFRIEND
setevent EVENT_TRAINERS_IN_CERULEAN_GYM
setevent EVENT_COPYCATS_HOUSE_2F_DOLL
setevent EVENT_VIRIDIAN_GYM_BLUE
setevent EVENT_SEAFOAM_GYM_GYM_GUIDE
setevent EVENT_MT_MOON_SQUARE_CLEFAIRY
setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION
setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
setevent EVENT_INITIALIZED_EVENTS setevent EVENT_INITIALIZED_EVENTS
endcallback endcallback

12
engine/overworld/time.asm
View File

@ -110,18 +110,6 @@ CheckDailyResetTimer::
ld [hli], a ; wDailyFlags2 ld [hli], a ; wDailyFlags2
ld [hli], a ; wSwarmFlags ld [hli], a ; wSwarmFlags
ld [hl], a ; wSwarmFlags + 1 ld [hl], a ; wSwarmFlags + 1
ld hl, wDailyRematchFlags
rept 4
ld [hli], a
endr
ld hl, wDailyPhoneItemFlags
rept 4
ld [hli], a
endr
ld hl, wDailyPhoneTimeOfDayFlags
rept 4
ld [hli], a
endr
ld hl, wKenjiBreakTimer ld hl, wKenjiBreakTimer
ld a, [hl] ld a, [hl]
and a and a

20
engine/pokegear/pokegear.asm
View File

@ -520,12 +520,13 @@ PokegearMap_Init:
ret ret
PokegearMap_KantoMap: PokegearMap_KantoMap:
call TownMap_GetKantoLandmarkLimits ld d, NUM_LANDMARKS - 1
ld e, LANDMARK_LEVEL_1
jr PokegearMap_ContinueMap jr PokegearMap_ContinueMap
PokegearMap_JohtoMap: PokegearMap_JohtoMap:
ld d, LANDMARK_SPECIAL ld d, NUM_LANDMARKS - 1
ld e, LANDMARK_SPECIAL ld e, LANDMARK_LEVEL_1
PokegearMap_ContinueMap: PokegearMap_ContinueMap:
ld hl, hJoyLast ld hl, hJoyLast
ld a, [hl] ld a, [hl]
@ -683,19 +684,6 @@ PokegearMap_UpdateCursorPosition:
ld [hl], d ld [hl], d
ret ret
TownMap_GetKantoLandmarkLimits:
ld a, [wStatusFlags]
bit STATUSFLAGS_HALL_OF_FAME_F, a
jr z, .not_hof
ld d, LANDMARK_SPECIAL
ld e, LANDMARK_SPECIAL
ret
.not_hof
ld d, LANDMARK_SPECIAL
ld e, LANDMARK_SPECIAL
ret
PokegearRadio_Init: PokegearRadio_Init:
call InitPokegearTilemap call InitPokegearTilemap
depixel 4, 10, 4, 4 depixel 4, 10, 4, 4

9
engine/pokemon/breeding.asm
View File

@ -235,15 +235,6 @@ HatchEggs:
dec a dec a
call SetSeenAndCaughtMon call SetSeenAndCaughtMon
ld a, [wCurPartySpecies]
cp TOGEPI
jr nz, .nottogepi
; set the event flag for hatching togepi
ld de, EVENT_TOGEPI_HATCHED
ld b, SET_FLAG
call EventFlagAction
.nottogepi
pop de pop de
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]

8
maps/Level1_Map1.asm
View File

@ -81,7 +81,7 @@ Level1_Map1_MapEvents:
bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript
def_object_events def_object_events
object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseGameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseGameConsoleScript, -1
object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, -1
object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, -1
object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, -1

6
ram/wram.asm
View File

@ -2628,15 +2628,9 @@ wdc41:: ds 1
wdc42:: ds 8 wdc42:: ds 8
wBuenasPassword:: db wBuenasPassword:: db
wBlueCardBalance:: db wBlueCardBalance:: db
wDailyRematchFlags:: ds 4
wDailyPhoneItemFlags:: ds 4
wDailyPhoneTimeOfDayFlags:: ds 4
wKenjiBreakTimer:: ds 2 ; Kenji wKenjiBreakTimer:: ds 2 ; Kenji
wYanmaMapGroup:: db wYanmaMapGroup:: db
wYanmaMapNumber:: db wYanmaMapNumber:: db
wPlayerMonSelection:: ds 3
wdc5f:: db
wdc60:: db
ds 18 ds 18