ref: 5459477ecd3c60342f31881343bc921b41b94eb0
parent: 519dd7fd56c4688ead80e444d945fc188cea5b66
parent: 0991bd3abed50f4d249da1ef38d77cd5cd39a77e
author: IIMarckus <iimarckus@gmail.com>
date: Mon Oct 20 14:56:21 EDT 2014
Merge branch 'master' of https://github.com/dannye/pokered
--- a/constants.asm
+++ b/constants.asm
@@ -25,6 +25,7 @@
INCLUDE "constants/map_constants.asm"
INCLUDE "constants/map_dimensions.asm"
INCLUDE "constants/connection_constants.asm"
+INCLUDE "constants/hide_show_constants.asm"
INCLUDE "constants/credits_constants.asm"
INCLUDE "constants/music_constants.asm"
INCLUDE "constants/tilesets.asm"
--- /dev/null
+++ b/constants/hide_show_constants.asm
@@ -1,0 +1,236 @@
+; this is a list of the sprites that can be enabled/disabled during the game
+; sprites marked with an X are constants that are never used
+; because those sprites are not (de)activated in a map's script
+; (they are either items or sprites that deactivate after battle
+; and are detected in W_MISSABLEOBJECTLIST)
+
+const_value = 0
+
+ const HS_PALLET_TOWN_OAK ; 00
+ const HS_LYING_OLD_MAN ; 01
+ const HS_OLD_MAN ; 02
+ const HS_MUSEUM_GUY ; 03
+ const HS_GYM_GUY ; 04
+ const HS_CERULEAN_RIVAL ; 05
+ const HS_CERULEAN_ROCKET ; 06
+ const HS_CERULEAN_GUARD_1 ; 07
+ const HS_UNKNOWN_DUNGEON_GUY ; 08
+ const HS_CERULEAN_GUARD_2 ; 09
+ const HS_SAFFRON_CITY_1 ; 0A
+ const HS_SAFFRON_CITY_2 ; 0B
+ const HS_SAFFRON_CITY_3 ; 0C
+ const HS_SAFFRON_CITY_4 ; 0D
+ const HS_SAFFRON_CITY_5 ; 0E
+ const HS_SAFFRON_CITY_6 ; 0F
+ const HS_SAFFRON_CITY_7 ; 10
+ const HS_SAFFRON_CITY_8 ; 11
+ const HS_SAFFRON_CITY_9 ; 12
+ const HS_SAFFRON_CITY_A ; 13
+ const HS_SAFFRON_CITY_B ; 14
+ const HS_SAFFRON_CITY_C ; 15
+ const HS_SAFFRON_CITY_D ; 16
+ const HS_SAFFRON_CITY_E ; 17
+ const HS_SAFFRON_CITY_F ; 18
+ const HS_ROUTE_2_ITEM_1 ; 19 X
+ const HS_ROUTE_2_ITEM_2 ; 1A X
+ const HS_ROUTE_4_ITEM ; 1B X
+ const HS_ROUTE_9_ITEM ; 1C X
+ const HS_ROUTE_12_SNORLAX ; 1D
+ const HS_ROUTE_12_ITEM_1 ; 1E X
+ const HS_ROUTE_12_ITEM_2 ; 1F X
+ const HS_ROUTE_15_ITEM ; 20 X
+ const HS_ROUTE_16_SNORLAX ; 21
+ const HS_ROUTE_22_RIVAL_1 ; 22
+ const HS_ROUTE_22_RIVAL_2 ; 23
+ const HS_NUGGET_BRIDGE_GUY ; 24
+ const HS_ROUTE_24_ITEM ; 25 X
+ const HS_ROUTE_25_ITEM ; 26 X
+ const HS_DAISY_SITTING ; 27
+ const HS_DAISY_WALKING ; 28
+ const HS_TOWN_MAP ; 29
+ const HS_OAKS_LAB_RIVAL ; 2A
+ const HS_STARTER_BALL_1 ; 2B
+ const HS_STARTER_BALL_2 ; 2C
+ const HS_STARTER_BALL_3 ; 2D
+ const HS_OAKS_LAB_OAK_1 ; 2E
+ const HS_POKEDEX_1 ; 2F
+ const HS_POKEDEX_2 ; 30
+ const HS_OAKS_LAB_OAK_2 ; 31
+ const HS_VIRIDIAN_GYM_GIOVANNI ; 32
+ const HS_VIRIDIAN_GYM_ITEM ; 33 X
+ const HS_OLD_AMBER ; 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 X
+ const HS_POKEMONTOWER_7_MR_FUJI ; 43
+ const HS_LAVENDER_HOUSE_1_MR_FUJI ; 44
+ const HS_CELADON_MANSION_5_GIFT ; 45
+ const HS_GAME_CORNER_ROCKET ; 46
+ const HS_FUCHSIA_HOUSE_2_ITEM ; 47 X
+ const HS_MANSION_1_ITEM_1 ; 48 X
+ const HS_MANSION_1_ITEM_2 ; 49 X
+ const HS_FIGHTING_DOJO_GIFT_1 ; 4A
+ const HS_FIGHTING_DOJO_GIFT_2 ; 4B
+ const HS_SILPH_CO_1F_1 ; 4C
+ const HS_VOLTORB_1 ; 4D X
+ const HS_VOLTORB_2 ; 4E X
+ const HS_VOLTORB_3 ; 4F X
+ const HS_ELECTRODE_1 ; 50 X
+ const HS_VOLTORB_4 ; 51 X
+ const HS_VOLTORB_5 ; 52 X
+ const HS_ELECTRODE_2 ; 53 X
+ const HS_VOLTORB_6 ; 54 X
+ const HS_ZAPDOS ; 55 X
+ const HS_POWER_PLANT_ITEM_1 ; 56 X
+ const HS_POWER_PLANT_ITEM_2 ; 57 X
+ const HS_POWER_PLANT_ITEM_3 ; 58 X
+ const HS_POWER_PLANT_ITEM_4 ; 59 X
+ const HS_POWER_PLANT_ITEM_5 ; 5A X
+ const HS_MOLTRES ; 5B X
+ const HS_VICTORY_ROAD_2_ITEM_1 ; 5C X
+ const HS_VICTORY_ROAD_2_ITEM_2 ; 5D X
+ const HS_VICTORY_ROAD_2_ITEM_3 ; 5E X
+ const HS_VICTORY_ROAD_2_ITEM_4 ; 5F X
+ const HS_VICTORY_ROAD_2_BOULDER ; 60
+ const HS_BILL_POKEMON ; 61
+ const HS_BILL_1 ; 62
+ const HS_BILL_2 ; 63
+ const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 X
+ const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 X
+ const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 X
+ const HS_MT_MOON_1_ITEM_1 ; 67 X
+ const HS_MT_MOON_1_ITEM_2 ; 68 X
+ const HS_MT_MOON_1_ITEM_3 ; 69 X
+ const HS_MT_MOON_1_ITEM_4 ; 6A X
+ const HS_MT_MOON_1_ITEM_5 ; 6B X
+ const HS_MT_MOON_1_ITEM_6 ; 6C X
+ const HS_MT_MOON_3_FOSSIL_1 ; 6D
+ const HS_MT_MOON_3_FOSSIL_2 ; 6E
+ const HS_MT_MOON_3_ITEM_1 ; 6F X
+ const HS_MT_MOON_3_ITEM_2 ; 70 X
+ const HS_SS_ANNE_2_RIVAL ; 71
+ const HS_SS_ANNE_8_ITEM ; 72 X
+ const HS_SS_ANNE_9_ITEM_1 ; 73 X
+ const HS_SS_ANNE_9_ITEM_2 ; 74 X
+ const HS_SS_ANNE_10_ITEM_1 ; 75 X
+ const HS_SS_ANNE_10_ITEM_2 ; 76 X
+ const HS_SS_ANNE_10_ITEM_3 ; 77 X
+ const HS_VICTORY_ROAD_3_ITEM_1 ; 78 X
+ const HS_VICTORY_ROAD_3_ITEM_2 ; 79 X
+ const HS_VICTORY_ROAD_3_BOULDER ; 7A
+ const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7B X
+ const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7C X
+ const HS_ROCKET_HIDEOUT_2_ITEM_1 ; 7D X
+ const HS_ROCKET_HIDEOUT_2_ITEM_2 ; 7E X
+ const HS_ROCKET_HIDEOUT_2_ITEM_3 ; 7F X
+ const HS_ROCKET_HIDEOUT_2_ITEM_4 ; 80 X
+ const HS_ROCKET_HIDEOUT_3_ITEM_1 ; 81 X
+ const HS_ROCKET_HIDEOUT_3_ITEM_2 ; 82 X
+ const HS_ROCKET_HIDEOUT_4_GIOVANNI ; 83
+ const HS_ROCKET_HIDEOUT_4_ITEM_1 ; 84 X
+ const HS_ROCKET_HIDEOUT_4_ITEM_2 ; 85 X
+ const HS_ROCKET_HIDEOUT_4_ITEM_3 ; 86 X
+ const HS_ROCKET_HIDEOUT_4_ITEM_4 ; 87
+ const HS_ROCKET_HIDEOUT_4_ITEM_5 ; 88
+ const HS_SILPH_CO_2F_1 ; 89 XXX never (de)activated?
+ const HS_SILPH_CO_2F_2 ; 8A
+ const HS_SILPH_CO_2F_3 ; 8B
+ const HS_SILPH_CO_2F_4 ; 8C
+ const HS_SILPH_CO_2F_5 ; 8D
+ const HS_SILPH_CO_3F_1 ; 8E
+ const HS_SILPH_CO_3F_2 ; 8F
+ const HS_SILPH_CO_3F_ITEM ; 90 X
+ const HS_SILPH_CO_4F_1 ; 91
+ const HS_SILPH_CO_4F_2 ; 92
+ const HS_SILPH_CO_4F_3 ; 93
+ const HS_SILPH_CO_4F_ITEM_1 ; 94 X
+ const HS_SILPH_CO_4F_ITEM_2 ; 95 X
+ const HS_SILPH_CO_4F_ITEM_3 ; 96 X
+ const HS_SILPH_CO_5F_1 ; 97
+ const HS_SILPH_CO_5F_2 ; 98
+ const HS_SILPH_CO_5F_3 ; 99
+ const HS_SILPH_CO_5F_4 ; 9A
+ const HS_SILPH_CO_5F_ITEM_1 ; 9B X
+ const HS_SILPH_CO_5F_ITEM_2 ; 9C X
+ const HS_SILPH_CO_5F_ITEM_3 ; 9D X
+ const HS_SILPH_CO_6F_1 ; 9E
+ const HS_SILPH_CO_6F_2 ; 9F
+ const HS_SILPH_CO_6F_3 ; A0
+ const HS_SILPH_CO_6F_ITEM_1 ; A1 X
+ const HS_SILPH_CO_6F_ITEM_2 ; A2 X
+ const HS_SILPH_CO_7F_1 ; A3
+ const HS_SILPH_CO_7F_2 ; A4
+ const HS_SILPH_CO_7F_3 ; A5
+ const HS_SILPH_CO_7F_4 ; A6
+ const HS_SILPH_CO_7F_RIVAL ; A7
+ const HS_SILPH_CO_7F_ITEM_1 ; A8 X
+ const HS_SILPH_CO_7F_ITEM_2 ; A9 X
+ const HS_SILPH_CO_7F_8 ; AA XXX sprite doesn't exist
+ const HS_SILPH_CO_8F_1 ; AB
+ const HS_SILPH_CO_8F_2 ; AC
+ const HS_SILPH_CO_8F_3 ; AD
+ const HS_SILPH_CO_9F_1 ; AE
+ const HS_SILPH_CO_9F_2 ; AF
+ const HS_SILPH_CO_9F_3 ; B0
+ const HS_SILPH_CO_10F_1 ; B1
+ const HS_SILPH_CO_10F_2 ; B2
+ const HS_SILPH_CO_10F_3 ; B3 XXX never (de)activated?
+ const HS_SILPH_CO_10F_ITEM_1 ; B4 X
+ const HS_SILPH_CO_10F_ITEM_2 ; B5 X
+ const HS_SILPH_CO_10F_ITEM_3 ; B6 X
+ const HS_SILPH_CO_11F_1 ; B7
+ const HS_SILPH_CO_11F_2 ; B8
+ const HS_SILPH_CO_11F_3 ; B9
+ const HS_MAP_F4_1 ; BA XXX sprite doesn't exist
+ const HS_MANSION_2_ITEM ; BB X
+ const HS_MANSION_3_ITEM_1 ; BC X
+ const HS_MANSION_3_ITEM_2 ; BD X
+ const HS_MANSION_4_ITEM_1 ; BE X
+ const HS_MANSION_4_ITEM_2 ; BF X
+ const HS_MANSION_4_ITEM_3 ; C0 X
+ const HS_MANSION_4_ITEM_4 ; C1 X
+ const HS_MANSION_4_ITEM_5 ; C2 X
+ const HS_SAFARI_ZONE_EAST_ITEM_1 ; C3 X
+ const HS_SAFARI_ZONE_EAST_ITEM_2 ; C4 X
+ const HS_SAFARI_ZONE_EAST_ITEM_3 ; C5 X
+ const HS_SAFARI_ZONE_EAST_ITEM_4 ; C6 X
+ const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C7 X
+ const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C8 X
+ const HS_SAFARI_ZONE_WEST_ITEM_1 ; C9 X
+ const HS_SAFARI_ZONE_WEST_ITEM_2 ; CA X
+ const HS_SAFARI_ZONE_WEST_ITEM_3 ; CB X
+ const HS_SAFARI_ZONE_WEST_ITEM_4 ; CC X
+ const HS_SAFARI_ZONE_CENTER_ITEM ; CD X
+ const HS_UNKNOWN_DUNGEON_2_ITEM_1 ; CE X
+ const HS_UNKNOWN_DUNGEON_2_ITEM_2 ; CF X
+ const HS_UNKNOWN_DUNGEON_2_ITEM_3 ; D0 X
+ const HS_MEWTWO ; D1 X
+ const HS_UNKNOWN_DUNGEON_3_ITEM_1 ; D2 X
+ const HS_UNKNOWN_DUNGEON_3_ITEM_2 ; D3 X
+ const HS_VICTORY_ROAD_1_ITEM_1 ; D4 X
+ const HS_VICTORY_ROAD_1_ITEM_2 ; D5 X
+ const HS_CHAMPIONS_ROOM_OAK ; D6
+ const HS_SEAFOAM_ISLANDS_1_BOULDER_1 ; D7
+ const HS_SEAFOAM_ISLANDS_1_BOULDER_2 ; D8
+ const HS_SEAFOAM_ISLANDS_2_BOULDER_1 ; D9
+ const HS_SEAFOAM_ISLANDS_2_BOULDER_2 ; DA
+ const HS_SEAFOAM_ISLANDS_3_BOULDER_1 ; DB
+ const HS_SEAFOAM_ISLANDS_3_BOULDER_2 ; DC
+ const HS_SEAFOAM_ISLANDS_4_BOULDER_1 ; DD
+ const HS_SEAFOAM_ISLANDS_4_BOULDER_2 ; DE
+ const HS_SEAFOAM_ISLANDS_4_BOULDER_3 ; DF
+ const HS_SEAFOAM_ISLANDS_4_BOULDER_4 ; E0
+ const HS_SEAFOAM_ISLANDS_5_BOULDER_1 ; E1
+ const HS_SEAFOAM_ISLANDS_5_BOULDER_2 ; E2
+ const HS_ARTICUNO ; E3 X
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -39,7 +39,7 @@
ld a, [wd730]
bit 0, a
ret nz
- ld a, $61
+ ld a, HS_BILL_POKEMON
ld [wcc4d], a
predef HideObject
ld hl, wd7f2
@@ -67,7 +67,7 @@
ld a, $5
ld [$ffee], a
call SetSpritePosition1
- ld a, $62
+ ld a, HS_BILL_1
ld [wcc4d], a
predef ShowObject
ld c, $8
@@ -161,10 +161,10 @@
call PrintText
ld hl, wd7f2
set 4, [hl]
- ld a, $7
+ ld a, HS_CERULEAN_GUARD_1
ld [wcc4d], a
predef ShowObject
- ld a, $9
+ ld a, HS_CERULEAN_GUARD_2
ld [wcc4d], a
predef HideObject
.asm_5491f ; 0x1e8a9
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -42,7 +42,7 @@
ld bc,(TOWN_MAP << 8) | 1
call GiveItem
jr nc, .BagFull
- ld a,$29
+ ld a,HS_TOWN_MAP
ld [wcc4d],a
predef HideObject ; hide table map object
ld hl,GotMapText
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -94,7 +94,7 @@
ret nz
xor a
ld [wJoyIgnore], a
- ld a, $46
+ ld a, HS_GAME_CORNER_ROCKET
ld [wcc4d], a
predef HideObject
ld hl, wd126
--- a/scripts/celadonmansion5.asm
+++ b/scripts/celadonmansion5.asm
@@ -14,7 +14,7 @@
ld bc,(EEVEE << 8) | 25
call GivePokemon
jr nc, .asm_24365 ; 0x1dd4d
- ld a, $45
+ ld a, HS_CELADON_MANSION_5_GIFT
ld [wcc4d], a
predef HideObject
.asm_24365 ; 0x1dd59
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@@ -8,7 +8,7 @@
xor a
ld [wJoyIgnore], a
ld [W_CERULEANCITYCURSCRIPT], a
- ld a, $5
+ ld a, HS_CERULEAN_RIVAL
ld [wcc4d], a
predef_jump HideObject
@@ -88,7 +88,7 @@
call GetPointerWithinSpriteStateData2
ld [hl], $19
.asm_19535
- ld a, $5
+ ld a, HS_CERULEAN_RIVAL
ld [wcc4d], a
predef ShowObject
ld de, CeruleanCityMovement1
@@ -204,7 +204,7 @@
ld a, [wd730]
bit 0, a
ret nz
- ld a, $5
+ ld a, HS_CERULEAN_RIVAL
ld [wcc4d], a
predef HideObject
xor a
--- a/scripts/ceruleancity2.asm
+++ b/scripts/ceruleancity2.asm
@@ -3,13 +3,13 @@
; one is called after you beat the Rocket that gives you TM28 DIG.
; the screen then fades out, he disappears, and fades back in
call GBFadeOutToBlack
- ld a, $07
+ ld a, HS_CERULEAN_GUARD_1
ld [wcc4d], a
predef ShowObject
- ld a, $09
+ ld a, HS_CERULEAN_GUARD_2
ld [wcc4d], a
predef HideObject
- ld a, $06
+ ld a, HS_CERULEAN_ROCKET
ld [wcc4d], a
predef HideObject
call GBFadeInFromBlack
--- a/scripts/fightingdojo.asm
+++ b/scripts/fightingdojo.asm
@@ -279,7 +279,7 @@
jr nc, .done
; once Poké Ball is taken, hide sprite
- ld a, $4a
+ ld a, HS_FIGHTING_DOJO_GIFT_1
ld [wcc4d], a
predef HideObject
ld hl, wd7b1
@@ -320,7 +320,7 @@
set 0, [hl]
; once Poké Ball is taken, hide sprite
- ld a, $4b
+ ld a, HS_FIGHTING_DOJO_GIFT_2
ld [wcc4d], a
predef HideObject
.done
--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@@ -120,7 +120,7 @@
ld a, $2
ld [$ff8c], a
call MoveSprite
- ld a, $d6
+ ld a, HS_CHAMPIONS_ROOM_OAK
ld [wcc4d], a
predef ShowObject
ld a, $5
@@ -190,7 +190,7 @@
ld a, [wd730]
bit 0, a
ret nz
- ld a, $d6
+ ld a, HS_CHAMPIONS_ROOM_OAK
ld [wcc4d], a
predef HideObject
ld a, $9
--- a/scripts/halloffameroom.asm
+++ b/scripts/halloffameroom.asm
@@ -98,7 +98,7 @@
call DisplayTextID
ld a, $ff
ld [wJoyIgnore], a
- ld a, $8
+ ld a, HS_UNKNOWN_DUNGEON_GUY
ld [wcc4d], a
predef HideObject
ld a, $2
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@@ -145,10 +145,10 @@
ld a, [wd7f6]
bit 6, a
jr z, .asm_49e1d
- ld a, $6e
+ ld a, HS_MT_MOON_3_FOSSIL_2
jr .asm_49e1f
.asm_49e1d
- ld a, $6d
+ ld a, HS_MT_MOON_3_FOSSIL_1
.asm_49e1f
ld [wcc4d], a
predef HideObject
@@ -281,7 +281,7 @@
call GiveItem
jp nc, MtMoon3Script_49f76
call MtMoon3Script_49f69
- ld a, $6d
+ ld a, HS_MT_MOON_3_FOSSIL_1
ld [wcc4d], a
predef HideObject
ld hl, wd7f6
@@ -310,7 +310,7 @@
call GiveItem
jp nc, MtMoon3Script_49f76
call MtMoon3Script_49f69
- ld a, $6e
+ ld a, HS_MT_MOON_3_FOSSIL_2
ld [wcc4d], a
predef HideObject
ld hl, wd7f6
--- a/scripts/museum1f.asm
+++ b/scripts/museum1f.asm
@@ -200,7 +200,7 @@
jr nc, .BagFull
ld hl, wd754
set 1, [hl]
- ld a, $34
+ ld a, HS_OLD_AMBER
ld [wcc4d], a
predef HideObject
ld hl, ReceivedOldAmberText
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -38,7 +38,7 @@
ld a, [wNPCMovementScriptFunctionNum]
and a
ret nz
- ld a, $31
+ ld a, HS_OAKS_LAB_OAK_2
ld [wcc4d], a
predef ShowObject
ld hl, wd72e
@@ -65,10 +65,10 @@
ld a, [wd730]
bit 0, a
ret nz
- ld a, $31
+ ld a, HS_OAKS_LAB_OAK_2
ld [wcc4d], a
predef HideObject
- ld a, $2e
+ ld a, HS_OAKS_LAB_OAK_1
ld [wcc4d], a
predef ShowObject
@@ -280,15 +280,15 @@
ld a, [wTrainerEngageDistance]
cp $2
jr nz, .asm_1cd28 ; 0x1cd22 $4
- ld a, $2b
+ ld a, HS_STARTER_BALL_1
jr .asm_1cd32 ; 0x1cd26 $a
.asm_1cd28
cp $3
jr nz, .asm_1cd30 ; 0x1cd2a $4
- ld a, $2c
+ ld a, HS_STARTER_BALL_2
jr .asm_1cd32 ; 0x1cd2e $2
.asm_1cd30
- ld a, $2d
+ ld a, HS_STARTER_BALL_3
.asm_1cd32
ld [wcc4d], a
predef HideObject
@@ -445,7 +445,7 @@
ld a, [wd730]
bit 0, a
jr nz, .asm_1ce8c ; 0x1ce72 $18
- ld a, $2a
+ ld a, HS_OAKS_LAB_RIVAL
ld [wcc4d], a
predef HideObject
xor a
@@ -488,7 +488,7 @@
ld [$ff8c], a
call DisplayTextID
call OaksLabScript_1d02b
- ld a, $2a
+ ld a, HS_OAKS_LAB_RIVAL
ld [wcc4d], a
predef ShowObject
ld a, [wNPCMovementDirections2Index]
@@ -547,10 +547,10 @@
ld [$ff8c], a
call DisplayTextID
call Delay3
- ld a, $2f
+ ld a, HS_POKEDEX_1
ld [wcc4d], a
predef HideObject
- ld a, $30
+ ld a, HS_POKEDEX_2
ld [wcc4d], a
predef HideObject
call OaksLabScript_1cefd
@@ -570,10 +570,10 @@
set 5, [hl]
ld hl, wd74e
set 0, [hl]
- ld a, $1
+ ld a, HS_LYING_OLD_MAN
ld [wcc4d], a
predef HideObject
- ld a, $2
+ ld a, HS_OLD_MAN
ld [wcc4d], a
predef ShowObject
ld a, [wd157]
@@ -601,7 +601,7 @@
bit 0, a
ret nz
call PlayDefaultMusic
- ld a, $2a
+ ld a, HS_OAKS_LAB_RIVAL
ld [wcc4d], a
predef HideObject
ld hl, wd7eb
@@ -608,7 +608,7 @@
set 0, [hl]
res 1, [hl]
set 7, [hl]
- ld a, $22
+ ld a, HS_ROUTE_22_RIVAL_1
ld [wcc4d], a
predef ShowObject
ld a, $5
@@ -880,15 +880,15 @@
ld a, [wSpriteIndex]
cp $2
jr nz, asm_1d1db ; 0x1d1d5 $4
- ld a, $2b
+ ld a, HS_STARTER_BALL_1
jr asm_1d1e5 ; 0x1d1d9 $a
asm_1d1db: ; 1d1db (7:51db)
cp $3
jr nz, asm_1d1e3 ; 0x1d1dd $4
- ld a, $2c
+ ld a, HS_STARTER_BALL_2
jr asm_1d1e5 ; 0x1d1e1 $2
asm_1d1e3: ; 1d1e3 (7:51e3)
- ld a, $2d
+ ld a, HS_STARTER_BALL_3
asm_1d1e5: ; 1d1e5 (7:51e5)
ld [wcc4d], a
predef HideObject
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -54,7 +54,7 @@
call DisplayTextID
ld a,$FF
ld [wJoyIgnore],a
- ld a,0
+ ld a,HS_PALLET_TOWN_OAK
ld [wcc4d],a
predef ShowObject
@@ -141,10 +141,10 @@
jr nz,.next
ld hl,wd74a
set 2,[hl]
- ld a,$27
+ ld a,HS_DAISY_SITTING
ld [wcc4d],a
predef HideObject
- ld a,$28
+ ld a,HS_DAISY_WALKING
ld [wcc4d],a
predef_jump ShowObject
.next
--- a/scripts/pewtercity.asm
+++ b/scripts/pewtercity.asm
@@ -85,7 +85,7 @@
ld a, [wd730]
bit 0, a
ret nz
- ld a, $3
+ ld a, HS_MUSEUM_GUY
ld [wcc4d], a
predef HideObject
ld a, $3
@@ -96,7 +96,7 @@
ld a, $3
ld [wSpriteIndex], a
call SetSpritePosition2
- ld a, $3
+ ld a, HS_MUSEUM_GUY
ld [wcc4d], a
predef ShowObject
xor a
@@ -149,7 +149,7 @@
ld a, [wd730]
bit 0, a
ret nz
- ld a, $4
+ ld a, HS_GYM_GUY
ld [wcc4d], a
predef HideObject
ld a, $6
@@ -160,7 +160,7 @@
ld a, $5
ld [wSpriteIndex], a
call SetSpritePosition2
- ld a, $4
+ ld a, HS_GYM_GUY
ld [wcc4d], a
predef ShowObject
xor a
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -67,10 +67,10 @@
ld hl, wd72a
set 0, [hl]
- ld a, $4
+ ld a, HS_GYM_GUY
ld [wcc4d], a
predef HideObject
- ld a, $22
+ ld a, HS_ROUTE_22_RIVAL_1
ld [wcc4d], a
predef HideObject
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@@ -99,7 +99,7 @@
ld a, [wd730]
bit 0, a
ret nz
- ld a, $38
+ ld a, HS_POKEMONTOWER_2_RIVAL
ld [wcc4d], a
predef HideObject
xor a
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -66,7 +66,7 @@
PokemonTower7Script4: ; 60d86 (18:4d86)
ld a, $ff
ld [wJoyIgnore], a
- ld a, $43
+ ld a, HS_POKEMONTOWER_7_MR_FUJI
ld [wcc4d], a
predef HideObject
ld a, $4
@@ -222,13 +222,13 @@
set 7, [hl]
ld hl, wd769
set 7, [hl]
- ld a, $44
+ ld a, HS_LAVENDER_HOUSE_1_MR_FUJI
ld [wcc4d], a
predef ShowObject
- ld a, $17
+ ld a, HS_SAFFRON_CITY_E
ld [wcc4d], a
predef HideObject
- ld a, $18
+ ld a, HS_SAFFRON_CITY_F
ld [wcc4d], a
predef ShowObject
ld a, $4
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@@ -59,10 +59,10 @@
ld [H_SPRITEHEIGHT], a
call DisplayTextID
call GBFadeOutToBlack
- ld a, $83
+ ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI
ld [wcc4d], a
predef HideObject
- ld a, $87
+ ld a, HS_ROCKET_HIDEOUT_4_ITEM_4
ld [wcc4d], a
predef ShowObject
call UpdateSprites
@@ -217,7 +217,7 @@
bit 6, [hl]
set 6, [hl]
jr nz, .asm_455e9 ; 0x455dd $a
- ld a, $88
+ ld a, HS_ROCKET_HIDEOUT_4_ITEM_5
ld [wcc4d], a
predef ShowObject
.asm_455e9
--- a/scripts/route12.asm
+++ b/scripts/route12.asm
@@ -34,7 +34,7 @@
ld [W_CUROPPONENT], a ; wd059
ld a, 30
ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
- ld a, $1d
+ ld a, HS_ROUTE_12_SNORLAX
ld [wcc4d], a
predef HideObject
ld a, $3
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@@ -34,7 +34,7 @@
ld [W_CUROPPONENT], a ; wd059
ld a, 30
ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
- ld a, $21
+ ld a, HS_ROUTE_16_SNORLAX
ld [wcc4d], a
predef HideObject
call UpdateSprites
--- a/scripts/route20.asm
+++ b/scripts/route20.asm
@@ -31,7 +31,13 @@
jr .asm_50cdc
.MissableObjectIDs: ; 50ce8 (14:4ce8)
- db $D9,$DA,$DB,$DC,$DF,$E0,$FF
+ db HS_SEAFOAM_ISLANDS_2_BOULDER_1
+ db HS_SEAFOAM_ISLANDS_2_BOULDER_2
+ db HS_SEAFOAM_ISLANDS_3_BOULDER_1
+ db HS_SEAFOAM_ISLANDS_3_BOULDER_2
+ db HS_SEAFOAM_ISLANDS_4_BOULDER_3
+ db HS_SEAFOAM_ISLANDS_4_BOULDER_4
+ db $FF
.asm_50cef
ld a, [wd881]
@@ -38,13 +44,13 @@
and $3
cp $3
ret z
- ld a, $dd
+ ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1
call Route20Script_50d0c
- ld a, $de
+ ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2
call Route20Script_50d0c
- ld a, $e1
+ ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1
call Route20Script_50d14
- ld a, $e2
+ ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2
call Route20Script_50d14
ret
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -205,7 +205,7 @@
ret nz
xor a
ld [wJoyIgnore], a
- ld a, $22
+ ld a, HS_ROUTE_22_RIVAL_1
ld [wcc4d], a
predef HideObject
call PlayDefaultMusic
@@ -350,7 +350,7 @@
ret nz
xor a
ld [wJoyIgnore], a
- ld a, $23
+ ld a, HS_ROUTE_22_RIVAL_2
ld [wcc4d], a
predef HideObject
call PlayDefaultMusic
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -16,10 +16,10 @@
ld hl, wd813
res 0, [hl]
res 6, [hl]
- ld a, $7a
+ ld a, HS_VICTORY_ROAD_3_BOULDER
ld [wcc4d], a
predef ShowObject
- ld a, $60
+ ld a, HS_VICTORY_ROAD_2_BOULDER
ld [wcc4d], a
predef_jump HideObject
--- a/scripts/route25.asm
+++ b/scripts/route25.asm
@@ -19,7 +19,7 @@
bit 5, [hl]
jr nz, .asm_515ff
res 6, [hl]
- ld a, $61
+ ld a, HS_BILL_POKEMON
ld [wcc4d], a
predef_jump ShowObject
.asm_515ff
@@ -26,13 +26,13 @@
bit 4, [hl]
ret z
set 7, [hl]
- ld a, $24
+ ld a, HS_NUGGET_BRIDGE_GUY
ld [wcc4d], a
predef HideObject
- ld a, $62
+ ld a, HS_BILL_1
ld [wcc4d], a
predef HideObject
- ld a, $63
+ ld a, HS_BILL_2
ld [wcc4d], a
predef_jump ShowObject
--- a/scripts/seafoamislands1.asm
+++ b/scripts/seafoamislands1.asm
@@ -14,16 +14,16 @@
cp $1
jr nz, .asm_44819 ; 0x44809 $e
set 6, [hl]
- ld a, $d7
+ ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1
ld [wd079], a
- ld a, $d9
+ ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1
ld [wd07a], a
jr .asm_44825 ; 0x44817 $c
.asm_44819
set 7, [hl]
- ld a, $d8
+ ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2
ld [wd079], a
- ld a, $da
+ ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2
ld [wd07a], a
.asm_44825
ld a, [wd079]
--- a/scripts/seafoamislands2.asm
+++ b/scripts/seafoamislands2.asm
@@ -12,16 +12,16 @@
cp $1
jr nz, .asm_46340 ; 0x46330 $e
set 0, [hl]
- ld a, $d9
+ ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1
ld [wd079], a
- ld a, $db
+ ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1
ld [wd07a], a
jr .asm_4634c ; 0x4633e $c
.asm_46340
set 1, [hl]
- ld a, $da
+ ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2
ld [wd079], a
- ld a, $dc
+ ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2
ld [wd07a], a
.asm_4634c
ld a, [wd079]
--- a/scripts/seafoamislands3.asm
+++ b/scripts/seafoamislands3.asm
@@ -12,16 +12,16 @@
cp $1
jr nz, .asm_4647c ; 0x4646c $e
set 0, [hl]
- ld a, $db
+ ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1
ld [wd079], a
- ld a, $df
+ ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_3
ld [wd07a], a
jr .asm_46488 ; 0x4647a $c
.asm_4647c
set 1, [hl]
- ld a, $dc
+ ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2
ld [wd079], a
- ld a, $e0
+ ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_4
ld [wd07a], a
.asm_46488
ld a, [wd079]
--- a/scripts/seafoamislands4.asm
+++ b/scripts/seafoamislands4.asm
@@ -12,16 +12,16 @@
cp $1
jr nz, .asm_465b8 ; 0x465a8 $e
set 0, [hl]
- ld a, $dd
+ ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1
ld [wd079], a
- ld a, $e1
+ ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1
ld [wd07a], a
jr .asm_465c4 ; 0x465b6 $c
.asm_465b8
set 1, [hl]
- ld a, $de
+ ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2
ld [wd079], a
- ld a, $e2
+ ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2
ld [wd07a], a
.asm_465c4
ld a, [wd079]
--- a/scripts/silphco1.asm
+++ b/scripts/silphco1.asm
@@ -7,7 +7,7 @@
bit 7, [hl]
set 7, [hl]
ret nz
- ld a, $4c
+ ld a, HS_SILPH_CO_1F_1
ld [wcc4d], a
predef_jump ShowObject
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -95,14 +95,55 @@
jr .asm_62184
MissableObjectIDs_62194: ; 62194 (18:6194)
- db $11,$12,$13,$14,$15,$16,$FF
+ db HS_SAFFRON_CITY_8
+ db HS_SAFFRON_CITY_9
+ db HS_SAFFRON_CITY_A
+ db HS_SAFFRON_CITY_B
+ db HS_SAFFRON_CITY_C
+ db HS_SAFFRON_CITY_D
+ db $FF
MissableObjectIDs_6219b: ; 6219b (18:619b)
- db $0A,$0B,$0C,$0D,$0E,$0F,$10,$17
- db $18,$8A,$8B,$8C,$8D,$8E,$8F,$91
- db $92,$93,$97,$98,$99,$9A,$9E,$9F
- db $A0,$A3,$A4,$A5,$A6,$AB,$AC,$AD
- db $AE,$AF,$B0,$B1,$B2,$B7,$B8,$B9
+ db HS_SAFFRON_CITY_1
+ db HS_SAFFRON_CITY_2
+ db HS_SAFFRON_CITY_3
+ db HS_SAFFRON_CITY_4
+ db HS_SAFFRON_CITY_5
+ db HS_SAFFRON_CITY_6
+ db HS_SAFFRON_CITY_7
+ db HS_SAFFRON_CITY_E
+ db HS_SAFFRON_CITY_F
+ db HS_SILPH_CO_2F_2
+ db HS_SILPH_CO_2F_3
+ db HS_SILPH_CO_2F_4
+ db HS_SILPH_CO_2F_5
+ db HS_SILPH_CO_3F_1
+ db HS_SILPH_CO_3F_2
+ db HS_SILPH_CO_4F_1
+ db HS_SILPH_CO_4F_2
+ db HS_SILPH_CO_4F_3
+ db HS_SILPH_CO_5F_1
+ db HS_SILPH_CO_5F_2
+ db HS_SILPH_CO_5F_3
+ db HS_SILPH_CO_5F_4
+ db HS_SILPH_CO_6F_1
+ db HS_SILPH_CO_6F_2
+ db HS_SILPH_CO_6F_3
+ db HS_SILPH_CO_7F_1
+ db HS_SILPH_CO_7F_2
+ db HS_SILPH_CO_7F_3
+ db HS_SILPH_CO_7F_4
+ db HS_SILPH_CO_8F_1
+ db HS_SILPH_CO_8F_2
+ db HS_SILPH_CO_8F_3
+ db HS_SILPH_CO_9F_1
+ db HS_SILPH_CO_9F_2
+ db HS_SILPH_CO_9F_3
+ db HS_SILPH_CO_10F_1
+ db HS_SILPH_CO_10F_2
+ db HS_SILPH_CO_11F_1
+ db HS_SILPH_CO_11F_2
+ db HS_SILPH_CO_11F_3
db $FF
SilphCo11Script_621c4: ; 621c4 (18:61c4)
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -241,7 +241,7 @@
ld a, [wd730]
bit 0, a
ret nz
- ld a, $a7
+ ld a, HS_SILPH_CO_7F_RIVAL
ld [wcc4d], a
predef HideObject
call PlayDefaultMusic
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@@ -32,7 +32,7 @@
call PlayMusic
ld a, [wWhichTrade]
ld [$ffdb], a
- ld a, $71
+ ld a, HS_SS_ANNE_2_RIVAL
ld [wcc4d], a
predef ShowObject
call Delay3
@@ -160,7 +160,7 @@
ret nz
xor a
ld [wJoyIgnore], a
- ld a, $71
+ ld a, HS_SS_ANNE_2_RIVAL
ld [wcc4d], a
predef HideObject
call PlayDefaultMusic
--- a/scripts/victoryroad3.asm
+++ b/scripts/victoryroad3.asm
@@ -47,10 +47,10 @@
bit 6, [hl]
set 6, [hl]
jr nz, .asm_449fe
- ld a, $7a
+ ld a, HS_VICTORY_ROAD_3_BOULDER
ld [wcc4d], a
predef HideObject
- ld a, $60
+ ld a, HS_VICTORY_ROAD_2_BOULDER
ld [wcc4d], a
predef_jump ShowObject
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -175,7 +175,7 @@
or %00000011
ld [wd752], a
- ld a, $23
+ ld a, HS_ROUTE_22_RIVAL_2
ld [wcc4d], a
predef ShowObject
ld hl, wd7eb
@@ -290,7 +290,7 @@
ld hl, ViridianGymText_74ad9
call PrintText
call GBFadeOutToBlack
- ld a, $32
+ ld a, HS_VIRIDIAN_GYM_GIOVANNI
ld [wcc4d], a
predef HideObject
call UpdateSprites
--
⑨