mirror of
https://github.com/pret/pokegold.git
synced 2026-10-02 11:56:40 -05:00
Update for unused wram and event flags.
This commit is contained in:
entrpntr
@@ -191,17 +191,16 @@
|
||||
const EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY
|
||||
const EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION
|
||||
const EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE
|
||||
; Crystal-exclusive events in Johto
|
||||
const EVENT_MET_FLORIA
|
||||
const EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
|
||||
const EVENT_BUGGING_KURT_TOO_MUCH
|
||||
const EVENT_TALKED_TO_RUINS_COWARD
|
||||
const EVENT_GOT_DRATINI
|
||||
const EVENT_CAN_GIVE_GS_BALL_TO_KURT
|
||||
const EVENT_GAVE_GS_BALL_TO_KURT
|
||||
const EVENT_FOREST_IS_RESTLESS ; 0c0
|
||||
const EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
|
||||
; Unused
|
||||
const EVENT_0B9
|
||||
const EVENT_0BA
|
||||
const EVENT_0BB
|
||||
const EVENT_0BC
|
||||
const EVENT_0BD
|
||||
const EVENT_0BE
|
||||
const EVENT_0BF
|
||||
const EVENT_0C0 ; 0c0
|
||||
const EVENT_0C1
|
||||
const EVENT_0C2
|
||||
const EVENT_0C3
|
||||
const EVENT_0C4
|
||||
@@ -822,35 +821,34 @@
|
||||
const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
|
||||
const EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
|
||||
const EVENT_LISTENED_TO_INITIAL_RADIO
|
||||
; More Crystal-exclusive events in Johto (change to unused?)
|
||||
const EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
|
||||
const EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
|
||||
const EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
|
||||
const EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
|
||||
const EVENT_WELCOMED_TO_POKECOM_CENTER
|
||||
const EVENT_WADE_HAS_BERRY
|
||||
const EVENT_WADE_HAS_PSNCUREBERRY
|
||||
const EVENT_WADE_HAS_PRZCUREBERRY
|
||||
const EVENT_WADE_HAS_BITTER_BERRY
|
||||
const EVENT_WILTON_HAS_ULTRA_BALL
|
||||
const EVENT_WILTON_HAS_GREAT_BALL
|
||||
const EVENT_WILTON_HAS_POKE_BALL
|
||||
const EVENT_HOLE_IN_BURNED_TOWER
|
||||
const EVENT_FOUGHT_EUSINE
|
||||
const EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
|
||||
const EVENT_FOUGHT_SUICUNE
|
||||
const EVENT_GOT_RAINBOW_WING_FROM_EUSINE
|
||||
const EVENT_HUEY_PROTEIN
|
||||
const EVENT_JOEY_HP_UP
|
||||
const EVENT_VANCE_CARBOS
|
||||
const EVENT_PARRY_IRON
|
||||
const EVENT_ERIN_CALCIUM
|
||||
const EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
|
||||
const EVENT_MET_BUENA
|
||||
const EVENT_GOT_ODD_EGG
|
||||
const EVENT_33F ; unused
|
||||
const EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
|
||||
; Unused
|
||||
const EVENT_326
|
||||
const EVENT_327
|
||||
const EVENT_328
|
||||
const EVENT_329
|
||||
const EVENT_32A
|
||||
const EVENT_32B
|
||||
const EVENT_32C
|
||||
const EVENT_32D
|
||||
const EVENT_32E
|
||||
const EVENT_32F
|
||||
const EVENT_330
|
||||
const EVENT_331
|
||||
const EVENT_332
|
||||
const EVENT_333
|
||||
const EVENT_334
|
||||
const EVENT_335
|
||||
const EVENT_336
|
||||
const EVENT_337
|
||||
const EVENT_338
|
||||
const EVENT_339
|
||||
const EVENT_33A
|
||||
const EVENT_33B
|
||||
const EVENT_33C
|
||||
const EVENT_33D
|
||||
const EVENT_33E
|
||||
const EVENT_33F
|
||||
const EVENT_340
|
||||
const EVENT_341
|
||||
const EVENT_342
|
||||
const EVENT_343
|
||||
@@ -1531,23 +1529,22 @@
|
||||
const EVENT_BEAT_ELITE_4_BRUNO
|
||||
const EVENT_BEAT_ELITE_4_KAREN
|
||||
const EVENT_BEAT_CHAMPION_LANCE
|
||||
; Crystal-exclusive trainer flags (change to unused?)
|
||||
const EVENT_BEAT_COOLTRAINERM_DARIN
|
||||
const EVENT_BEAT_COOLTRAINERF_CARA
|
||||
const EVENT_BEAT_TWINS_LEA_AND_PIA
|
||||
const EVENT_BEAT_BUG_CATCHER_WAYNE
|
||||
const EVENT_BEAT_BEAUTY_OLIVIA
|
||||
const EVENT_BEAT_POKEFANF_JAIME
|
||||
const EVENT_BEAT_CAMPER_QUENTIN
|
||||
const EVENT_BEAT_POKEMANIAC_MILLER
|
||||
const EVENT_BEAT_SUPER_NERD_HUGH
|
||||
const EVENT_BEAT_SUPER_NERD_MARKUS
|
||||
const EVENT_BEAT_POKEFANM_REX
|
||||
const EVENT_BEAT_POKEFANM_ALLAN
|
||||
const EVENT_BEAT_SAGE_GAKU
|
||||
const EVENT_BEAT_SAGE_MASA
|
||||
const EVENT_BEAT_SAGE_KOJI
|
||||
; Unused
|
||||
const EVENT_5BD
|
||||
const EVENT_5BE
|
||||
const EVENT_5BF
|
||||
const EVENT_5C0
|
||||
const EVENT_5C1
|
||||
const EVENT_5C2
|
||||
const EVENT_5C3
|
||||
const EVENT_5C4
|
||||
const EVENT_5C5
|
||||
const EVENT_5C6
|
||||
const EVENT_5C7
|
||||
const EVENT_5C8
|
||||
const EVENT_5C9
|
||||
const EVENT_5CA
|
||||
const EVENT_5CB
|
||||
const EVENT_5CC
|
||||
const EVENT_5CD
|
||||
const EVENT_5CE
|
||||
@@ -1964,12 +1961,12 @@
|
||||
const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
|
||||
const EVENT_BURNED_TOWER_FIREBREATHER_DICK_NORMAL
|
||||
const EVENT_BURNED_TOWER_FIREBREATHER_DICK_ASHES
|
||||
const EVENT_RANG_CLEAR_BELL_1 ; rename?
|
||||
const EVENT_RANG_CLEAR_BELL_2 ; rename?
|
||||
const EVENT_FLORIA_AT_FLOWER_SHOP ; rename?
|
||||
const EVENT_FLORIA_AT_SUDOWOODO ; rename?
|
||||
const EVENT_GOLDENROD_CITY_MOVE_TUTOR ; rename?
|
||||
const EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR ; rename?
|
||||
const EVENT_RANG_CLEAR_BELL_1 ; needs rename
|
||||
const EVENT_RANG_CLEAR_BELL_2 ; needs rename
|
||||
const EVENT_768 ; unused
|
||||
const EVENT_769 ; unused
|
||||
const EVENT_76A ; unused
|
||||
const EVENT_76B ; unused
|
||||
; Kanto people
|
||||
const EVENT_ROUTE_24_ROCKET
|
||||
const EVENT_CERULEAN_GYM_ROCKET
|
||||
@@ -2004,73 +2001,4 @@
|
||||
const EVENT_ROUTE_12_NUGGET
|
||||
const EVENT_ROUTE_15_PP_UP
|
||||
const EVENT_ROUTE_25_PROTEIN
|
||||
; New to Crystal (change to unused?)
|
||||
const EVENT_KURTS_HOUSE_GRANDDAUGHTER_1
|
||||
const EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
|
||||
const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
|
||||
const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
|
||||
const EVENT_DRAGON_SHRINE_CLAIR ; 790
|
||||
const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
|
||||
const EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
|
||||
const EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
|
||||
const EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM ; 7a0
|
||||
const EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
|
||||
const EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
|
||||
const EVENT_AZALEA_TOWN_KURT
|
||||
const EVENT_ILEX_FOREST_KURT
|
||||
const EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION
|
||||
const EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET
|
||||
const EVENT_ECRUTEAK_GYM_GRAMPS
|
||||
const EVENT_ECRUTEAK_CITY_GRAMPS
|
||||
const EVENT_EUSINE_IN_BURNED_TOWER
|
||||
const EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
|
||||
const EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
|
||||
const EVENT_CIANWOOD_CITY_EUSINE
|
||||
const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
|
||||
const EVENT_SAW_SUICUNE_ON_ROUTE_42
|
||||
const EVENT_SAW_SUICUNE_ON_ROUTE_36 ; 7b0
|
||||
const EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
|
||||
const EVENT_TIN_TOWER_1F_SUICUNE
|
||||
const EVENT_TIN_TOWER_1F_ENTEI
|
||||
const EVENT_TIN_TOWER_1F_RAIKOU
|
||||
const EVENT_TIN_TOWER_1F_EUSINE
|
||||
const EVENT_TIN_TOWER_1F_WISE_TRIO_1
|
||||
const EVENT_SET_WHEN_FOUGHT_HO_OH
|
||||
const EVENT_ROUTE_30_ANTIDOTE
|
||||
const EVENT_ILEX_FOREST_X_ATTACK
|
||||
const EVENT_ILEX_FOREST_ANTIDOTE
|
||||
const EVENT_ILEX_FOREST_ETHER
|
||||
const EVENT_ROUTE_34_NUGGET
|
||||
const EVENT_ROUTE_44_MAX_REPEL
|
||||
const EVENT_ICE_PATH_1F_PROTEIN
|
||||
const EVENT_DRAGONS_DEN_B1F_CALCIUM
|
||||
const EVENT_DRAGONS_DEN_B1F_MAX_ELIXER ; 7c0
|
||||
const EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
|
||||
const EVENT_SILVER_CAVE_ROOM_2_CALCIUM
|
||||
const EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
|
||||
const EVENT_SILVER_CAVE_ROOM_2_PP_UP
|
||||
const EVENT_TIN_TOWER_1F_WISE_TRIO_2
|
||||
const EVENT_TIN_TOWER_6F_MAX_POTION
|
||||
const EVENT_TIN_TOWER_9F_HP_UP
|
||||
const EVENT_MOUNT_MORTAR_1F_INSIDE_IRON
|
||||
const EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL
|
||||
const EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE
|
||||
const EVENT_MOUNT_MORTAR_B1F_MAX_ETHER
|
||||
const EVENT_MOUNT_MORTAR_B1F_PP_UP
|
||||
const EVENT_RADIO_TOWER_5F_ULTRA_BALL
|
||||
const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
|
||||
const EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
|
||||
NUM_EVENTS EQU const_value ; 7d0
|
||||
NUM_EVENTS EQU const_value ; 78c
|
||||
|
||||
@@ -249,7 +249,7 @@ Unreferenced_Function92d7a:
|
||||
|
||||
Unreferenced_Function92d95:
|
||||
; animate OAM tiles?
|
||||
ld hl, wSlotsCE66
|
||||
ld hl, wce66
|
||||
ld a, [hl]
|
||||
inc [hl]
|
||||
and $7
|
||||
|
||||
@@ -91,7 +91,7 @@ InitPokedex:
|
||||
ld [wJumptableIndex], a
|
||||
ld [wPrevDexEntryJumptableIndex], a
|
||||
ld [wPrevDexEntryBackup], a
|
||||
ld [wPokegearCE66], a
|
||||
ld [wce66], a
|
||||
|
||||
call Pokedex_CheckUnlockedUnownMode
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ PokeGear:
|
||||
ld [wJumptableIndex], a ; POKEGEARSTATE_CLOCKINIT
|
||||
ld [wPokegearCard], a ; POKEGEARCARD_CLOCK
|
||||
ld [wPokegearMapRegion], a ; JOHTO_REGION
|
||||
ld [wPokegearCE66], a
|
||||
ld [wce66], a
|
||||
ld [wPokegearPhoneScrollPosition], a
|
||||
ld [wPokegearPhoneCursorPosition], a
|
||||
ld [wPokegearPhoneSelectedPerson], a
|
||||
|
||||
73
wram.asm
73
wram.asm
@@ -744,14 +744,13 @@ wIntroFrameCounter2:: db
|
||||
wcb19:: db
|
||||
ENDU ; cb2c
|
||||
|
||||
wcb2c:: ds 1 ; cb2c
|
||||
wcb2d:: ds 1 ; cb2d
|
||||
ds 2
|
||||
|
||||
wEnemyTrainerItem1:: db ; cb2e
|
||||
wEnemyTrainerItem2:: db ; cb2f
|
||||
wEnemyTrainerBaseReward:: db ; cb30
|
||||
wcb31:: ds 1 ; cb31
|
||||
wcb32:: ds 1 ; cb32
|
||||
wcb33:: ds 1 ; cb33
|
||||
|
||||
ds 3
|
||||
|
||||
wOTClassName:: ds TRAINER_CLASS_NAME_LENGTH ; cb34
|
||||
|
||||
@@ -1160,7 +1159,6 @@ NEXTU ; ce64
|
||||
; pokegear
|
||||
wPokegearCard:: db
|
||||
wPokegearMapRegion:: db
|
||||
wPokegearCE66:: db
|
||||
|
||||
NEXTU ; ce64
|
||||
; pack
|
||||
@@ -1201,9 +1199,6 @@ wHallOfFameMonCounter::
|
||||
wSlotsDelay::
|
||||
db
|
||||
wPrinterQueueLength:: db
|
||||
wSlotsCE66::
|
||||
wPokedexCE66::
|
||||
db
|
||||
ENDU ; ce67
|
||||
|
||||
wRequested2bpp::
|
||||
@@ -1221,18 +1216,7 @@ wMinutesSince:: db ; ce72
|
||||
wHoursSince:: db ; ce73
|
||||
wDaysSince:: db ; ce74
|
||||
|
||||
wce75:: ds 1 ; ce75
|
||||
wce76:: ds 1 ; ce76
|
||||
wce77:: ds 1 ; ce77
|
||||
wce78:: ds 1 ; ce78
|
||||
wce79:: ds 1 ; ce79
|
||||
wce7a:: ds 1 ; ce7a
|
||||
wce7b:: ds 1 ; ce7b
|
||||
wce7c:: ds 1 ; ce7c
|
||||
wce7d:: ds 1 ; ce7d
|
||||
wce7e:: ds 1 ; ce7e
|
||||
wce7f:: ds 1 ; ce7f
|
||||
wce80:: ds 1 ; ce80
|
||||
ds 12
|
||||
|
||||
wPlayerBGMapOffsetX:: db ; used in FollowNotExact; unit is pixels
|
||||
wPlayerBGMapOffsetY:: db ; used in FollowNotExact; unit is pixels
|
||||
@@ -1244,15 +1228,16 @@ wPlayerStepDirection:: db ; ce86
|
||||
|
||||
wPlayerNextMovement:: db ; ce87
|
||||
wPlayerMovement:: db ; ce88
|
||||
wce89:: ds 1 ; ce89
|
||||
wce8a:: ds 1 ; ce8a
|
||||
|
||||
ds 2
|
||||
|
||||
wMovementObject:: db ; ce8b
|
||||
wMovementDataBank:: db ; ce8c
|
||||
wMovementDataAddress:: dw ; ce8d
|
||||
wce8f:: ds 1 ; ce8f
|
||||
wce90:: ds 1 ; ce90
|
||||
wce91:: ds 1 ; ce91
|
||||
wce92:: ds 1 ; ce92
|
||||
wce8f:: db ; ce8f
|
||||
|
||||
ds 3
|
||||
|
||||
wMovementByteWasControlSwitch:: db ; ce93
|
||||
wMovementPointer:: dw ; ce94
|
||||
|
||||
@@ -1484,34 +1469,16 @@ wceed:: db
|
||||
wceee:: db
|
||||
wceef:: db
|
||||
|
||||
ds 1
|
||||
wcef1:: ds 2
|
||||
wcef3:: ds 2
|
||||
ds 2
|
||||
wcef7:: ds 1
|
||||
ds 8
|
||||
|
||||
wcef8:: ds 1
|
||||
ds 1
|
||||
wcefa:: ds 1
|
||||
wcefb:: ds 1
|
||||
ds 1
|
||||
wcefc:: ds 1
|
||||
wcefd:: ds 1
|
||||
wcefe:: ds 1
|
||||
wceff:: ds 2
|
||||
ds 1
|
||||
wcf02:: ds 1
|
||||
wcf03:: ds 1
|
||||
wcf04:: ds 1
|
||||
ds 19
|
||||
wcf18:: ds 1
|
||||
wcf19:: ds 1
|
||||
wcf1a:: ds 1
|
||||
wcf1b:: ds 1
|
||||
wcf1c:: ds 1
|
||||
wcf1d:: ds 1
|
||||
wcf1e:: ds 1
|
||||
wcf1f:: ds 2
|
||||
wcf21:: ds 2
|
||||
ds 6
|
||||
|
||||
ds 43
|
||||
|
||||
UNION ; cf29
|
||||
; trainer data
|
||||
@@ -1720,7 +1687,9 @@ wBattleResult:: ; cfe9
|
||||
; WIN, LOSE, or DRAW
|
||||
; bit 7: box full
|
||||
db
|
||||
wcfea:: ds 1 ; cfea
|
||||
|
||||
ds 1
|
||||
|
||||
wUsingItemWithSelect:: db ; cfeb
|
||||
|
||||
UNION ; cfec
|
||||
@@ -2365,7 +2334,7 @@ wMountMoonSquareSceneID:: db ; d6f1
|
||||
|
||||
wEventFlags:: flag_array NUM_EVENTS ; d7b7
|
||||
|
||||
ds 6
|
||||
ds 14
|
||||
|
||||
wd8b7:: db
|
||||
|
||||
|
||||
Reference in New Issue
Block a user