summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-29 22:36:26 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-29 22:36:26 -0400
commita8b3d3612e43cbcc7e1946c5c1a06f9c54c8d311 (patch)
treeb3cf634c201b19412d7cc0911d69ca2f3f982c0c /constants
parent037dbda5702646ea2f4fb00442071e52f8f03ec0 (diff)
Bulbasaur house in Cerulean
Diffstat (limited to 'constants')
-rw-r--r--constants/event_constants.asm2
-rwxr-xr-xconstants/hide_show_constants.asm35
2 files changed, 16 insertions, 21 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index 49050dd3..2d1fab45 100644
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -168,7 +168,7 @@ const_value = 0
const EVENT_0A5 ; 0A5, (D75B, bit 5)
const EVENT_0A6 ; 0A6, (D75B, bit 6)
const EVENT_BEAT_CERULEAN_ROCKET_THIEF ; 0A7, (D75B, bit 7)
- const EVENT_0A8 ; 0A8, (D75C, bit 0)
+ const EVENT_GOT_BULBASAUR_IN_CERULEAN ; 0A8, (D75C, bit 0)
const EVENT_0A9 ; 0A9, (D75C, bit 1)
const EVENT_0AA ; 0AA, (D75C, bit 2)
const EVENT_0AB ; 0AB, (D75C, bit 3)
diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm
index 6fc52187..f41477a5 100755
--- a/constants/hide_show_constants.asm
+++ b/constants/hide_show_constants.asm
@@ -51,10 +51,6 @@ const_value = 0
const HS_TOWN_MAP ; 2A
const HS_OAKS_LAB_RIVAL ; 2B
const HS_STARTER_BALL_1 ; 2C
- const HS_STARTER_BALL_2 ; 2D
- const HS_STARTER_BALL_3 ; 2E
-
-const_value SET $2D
const HS_OAKS_LAB_OAK_1 ; 2D
const HS_POKEDEX_1 ; 2E
const HS_POKEDEX_2 ; 2F
@@ -62,22 +58,21 @@ const_value SET $2D
const HS_VIRIDIAN_GYM_GIOVANNI ; 31
const HS_VIRIDIAN_GYM_ITEM ; 32
const HS_OLD_AMBER ; 33 X
- const HS_UNKNOWN_DUNGEON_1_ITEM_1 ; 34
- const HS_UNKNOWN_DUNGEON_1_ITEM_2 ; 35 X
- const HS_UNKNOWN_DUNGEON_1_ITEM_3 ; 36 X
- const HS_POKEMONTOWER_2_RIVAL ; 37 X
- const HS_POKEMONTOWER_3_ITEM ; 38
- const HS_POKEMONTOWER_4_ITEM_1 ; 39 X
- const HS_POKEMONTOWER_4_ITEM_2 ; 3A X
- const HS_POKEMONTOWER_4_ITEM_3 ; 3B X
- const HS_POKEMONTOWER_5_ITEM ; 3C X
- const HS_POKEMONTOWER_6_ITEM_1 ; 3D X
- const HS_POKEMONTOWER_6_ITEM_2 ; 3E X
- const HS_POKEMONTOWER_7_ROCKET_1 ; 3F X
- const HS_POKEMONTOWER_7_ROCKET_2 ; 40 X
- const HS_POKEMONTOWER_7_ROCKET_3 ; 41 X
-
-const_value SET $43 ; replace the tower rockets with jessie/james
+ const HS_CERULEAN_BULBASAUR ; 34
+ const HS_UNKNOWN_DUNGEON_1_ITEM_1 ; 35 X
+ const HS_UNKNOWN_DUNGEON_1_ITEM_2 ; 36 X
+ const HS_UNKNOWN_DUNGEON_1_ITEM_3 ; 37 X
+ const HS_POKEMONTOWER_2_RIVAL ; 38
+ const HS_POKEMONTOWER_3_ITEM ; 39 X
+ const HS_POKEMONTOWER_4_ITEM_1 ; 3A X
+ const HS_POKEMONTOWER_4_ITEM_2 ; 3B X
+ const HS_POKEMONTOWER_4_ITEM_3 ; 3C X
+ const HS_POKEMONTOWER_5_ITEM ; 3D X
+ const HS_POKEMONTOWER_6_ITEM_1 ; 3E X
+ const HS_POKEMONTOWER_6_ITEM_2 ; 3F X
+ const HS_POKEMONTOWER_7_ROCKET_1 ; 40 X
+ const HS_POKEMONTOWER_7_ROCKET_2 ; 41 X
+ const HS_POKEMONTOWER_7_ROCKET_3 ; 42
const HS_POKEMONTOWER_7_MR_FUJI ; 43
const HS_LAVENDER_HOUSE_1_MR_FUJI ; 44
const HS_CELADON_MANSION_5_GIFT ; 45