diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 17:51:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 17:51:03 -0700 |
| commit | 54143d33fc1211fb0c949ba62633d1c8d94f2717 (patch) | |
| tree | 9176ffc5b6384a48eb32ea8f33ac97d1d67f6865 /data/hide_show_data.asm | |
| parent | Merge pull request #14 from PikalaxALT/master (diff) | |
| parent | remove address comments (diff) | |
| download | pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.tar.gz pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.tar.xz pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.zip | |
Merge pull request #13 from YamaArashi/master
remove address comments
Diffstat (limited to 'data/hide_show_data.asm')
| -rwxr-xr-x | data/hide_show_data.asm | 156 |
1 files changed, 78 insertions, 78 deletions
diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 5b522f8e..72822a40 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -4,7 +4,7 @@ ; Table of 2-Byte pointers, one pointer per map, ; goes up to Map_F7, ends with $FFFF. ; points to table listing all missable object in the area -MapHSPointers: ; c69b (3:469b) +MapHSPointers: dw MapHS00 dw MapHS01 dw MapHS02 @@ -270,24 +270,24 @@ MapHSPointers: ; c69b (3:469b) Hide EQU $11 ; (HideObjectPredef - PredefPointers) / 3 Show EQU $15 ; (ShowObjectPredef - PredefPointers) / 3 -MapHSXX: ; c88f (3:488f) +MapHSXX: db $FF, $FF, $FF -MapHS00: ; c892 (3:4892) +MapHS00: db PALLET_TOWN, $01, Hide -MapHS01: ; c895 (3:4895) +MapHS01: db VIRIDIAN_CITY, $05, Show db VIRIDIAN_CITY, $07, Hide db VIRIDIAN_CITY, $08, Hide -MapHS02: ; c89e (3:489e) +MapHS02: db PEWTER_CITY, $03, Show db PEWTER_CITY, $05, Show -MapHS03: ; c8a4 (3:48a4) +MapHS03: db CERULEAN_CITY, $01, Hide db CERULEAN_CITY, $02, Show db CERULEAN_CITY, $06, Hide db CERULEAN_CITY, $0A, Show db CERULEAN_CITY, $0B, Show -MapHS0A: ; c8b3 (3:48b3) +MapHS0A: db SAFFRON_CITY, $01, Show db SAFFRON_CITY, $02, Show db SAFFRON_CITY, $03, Show @@ -303,86 +303,86 @@ MapHS0A: ; c8b3 (3:48b3) db SAFFRON_CITY, $0D, Hide db SAFFRON_CITY, $0E, Show db SAFFRON_CITY, $0F, Hide -MapHS0D: ; c8e0 (3:48e0) +MapHS0D: db ROUTE_2, $01, Show db ROUTE_2, $02, Show -MapHS0F: ; c8e6 (3:48e6) +MapHS0F: db ROUTE_4, $03, Show -MapHS14: ; c8e9 (3:48e9) +MapHS14: db ROUTE_9, $0A, Show -MapHS17: ; c8ec (3:48ec) +MapHS17: db ROUTE_12, $01, Show db ROUTE_12, $09, Show db ROUTE_12, $0A, Show -MapHS1A: ; c8f5 (3:48f5) +MapHS1A: db ROUTE_15, $0B, Show -MapHS1B: ; c8f8 (3:48f8) +MapHS1B: db ROUTE_16, $07, Show -MapHS21: ; c8fb (3:48fb) +MapHS21: db ROUTE_22, $01, Hide db ROUTE_22, $02, Hide -MapHS23: ; c901 (3:4901) +MapHS23: db ROUTE_24, $01, Show db ROUTE_24, $08, Show -MapHS24: ; c907 (3:4907) +MapHS24: db ROUTE_25, $0A, Show -MapHS27: ; c90a (3:490a) +MapHS27: db BLUES_HOUSE, $01, Show db BLUES_HOUSE, $02, Hide db BLUES_HOUSE, $03, Show -MapHS28: ; c913 (3:4913) +MapHS28: db OAKS_LAB, $01, Show db OAKS_LAB, $02, Show db OAKS_LAB, $03, Hide db OAKS_LAB, $04, Show db OAKS_LAB, $05, Show db OAKS_LAB, $06, Hide -MapHS2D: ; c925 (3:4925) +MapHS2D: db VIRIDIAN_GYM, $01, Show db VIRIDIAN_GYM, $0B, Show -MapHS34: ; c92b (3:492b) +MapHS34: db MUSEUM_1F, $05, Show MapHS3F: ; c92e (3:492e) ; bulbasaur adoption house db CERULEAN_HOUSE_1, $02, Show -MapHSE4: ; c931 (3:4931) +MapHSE4: db UNKNOWN_DUNGEON_1, $01, Show db UNKNOWN_DUNGEON_1, $02, Show db UNKNOWN_DUNGEON_1, $03, Show db UNKNOWN_DUNGEON_1, $04, Show -MapHS8F: ; c93d (3:493d) +MapHS8F: db POKEMONTOWER_2, $01, Show -MapHS90: ; c940 (3:4940) +MapHS90: db POKEMONTOWER_3, $04, Show -MapHS91: ; c943 (3:4943) +MapHS91: db POKEMONTOWER_4, $04, Show db POKEMONTOWER_4, $05, Show db POKEMONTOWER_4, $06, Show -MapHS92: ; c94c (3:494c) +MapHS92: db POKEMONTOWER_5, $06, Show -MapHS93: ; c94f (3:494f) +MapHS93: db POKEMONTOWER_6, $04, Show db POKEMONTOWER_6, $05, Show -MapHS94: ; c955 (3:4955) +MapHS94: db POKEMONTOWER_7, $01, Hide ; jessie & james? db POKEMONTOWER_7, $02, Hide db POKEMONTOWER_7, $03, Show -MapHS95: ; c95e (3:495e) +MapHS95: db LAVENDER_HOUSE_1, $05, Hide -MapHS84: ; c961 (3:4961) +MapHS84: db CELADON_MANSION_5, $02, Show -MapHS87: ; c964 (3:4964) +MapHS87: db GAME_CORNER, $0B, Show -MapHS9B: ; c967 (3:4967) +MapHS9B: db FUCHSIA_HOUSE_2, $02, Show -MapHSA5: ; c96a (3:496a) +MapHSA5: db MANSION_1, $02, Show db MANSION_1, $03, Show -MapHSB1: ; c970 (3:4970) +MapHSB1: db FIGHTING_DOJO, $06, Show db FIGHTING_DOJO, $07, Show -MapHSB5: ; c976 (3:4976) +MapHSB5: db SILPH_CO_1F, $01, Hide -MapHS53: ; c979 (3:4979) +MapHS53: db POWER_PLANT, $01, Show db POWER_PLANT, $02, Show db POWER_PLANT, $03, Show @@ -397,62 +397,62 @@ MapHS53: ; c979 (3:4979) db POWER_PLANT, $0C, Show db POWER_PLANT, $0D, Show db POWER_PLANT, $0E, Show -MapHSC2: ; c9a3 (3:49a3) +MapHSC2: db VICTORY_ROAD_2, $06, Show db VICTORY_ROAD_2, $07, Show db VICTORY_ROAD_2, $08, Show db VICTORY_ROAD_2, $09, Show db VICTORY_ROAD_2, $0A, Show db VICTORY_ROAD_2, $0D, Show -MapHS58: ; c9b5 (3:49b5) +MapHS58: db BILLS_HOUSE, $01, Show db BILLS_HOUSE, $02, Hide db BILLS_HOUSE, $03, Hide -MapHS33: ; c9be (3:49be) +MapHS33: db VIRIDIAN_FOREST, $07, Show db VIRIDIAN_FOREST, $08, Show db VIRIDIAN_FOREST, $09, Show -MapHS3B: ; c9c7 (3:49c7) +MapHS3B: db MT_MOON_1, $08, Show db MT_MOON_1, $09, Show db MT_MOON_1, $0A, Show db MT_MOON_1, $0B, Show db MT_MOON_1, $0C, Show db MT_MOON_1, $0D, Show -MapHS3D: ; c9d9 (3:49d9) +MapHS3D: db MT_MOON_3, $02, Hide db MT_MOON_3, $06, Hide db MT_MOON_3, $07, Show db MT_MOON_3, $08, Show db MT_MOON_3, $09, Show db MT_MOON_3, $0A, Show -MapHS60: ; c9eb (3:49eb) +MapHS60: db SS_ANNE_2, $02, Hide -MapHS66: ; c9ee (3:49ee) +MapHS66: db SS_ANNE_8, $0A, Show -MapHS67: ; c9f1 (3:49f1) +MapHS67: db SS_ANNE_9, $06, Show db SS_ANNE_9, $09, Show -MapHS68: ; c9f7 (3:49f7) +MapHS68: db SS_ANNE_10, $09, Show db SS_ANNE_10, $0A, Show db SS_ANNE_10, $0B, Show -MapHSC6: ; ca00 (3:4a00) +MapHSC6: db VICTORY_ROAD_3, $05, Show db VICTORY_ROAD_3, $06, Show db VICTORY_ROAD_3, $0A, Show -MapHSC7: ; ca09 (3:4a09) +MapHSC7: db ROCKET_HIDEOUT_1, $06, Show db ROCKET_HIDEOUT_1, $07, Show -MapHSC8: ; ca0f (3:4a0f) +MapHSC8: db ROCKET_HIDEOUT_2, $02, Show db ROCKET_HIDEOUT_2, $03, Show db ROCKET_HIDEOUT_2, $04, Show db ROCKET_HIDEOUT_2, $05, Show -MapHSC9: ; ca1b (3:4a1b) +MapHSC9: db ROCKET_HIDEOUT_3, $03, Show db ROCKET_HIDEOUT_3, $04, Show -MapHSCA: ; ca21 (3:4a21) +MapHSCA: db ROCKET_HIDEOUT_4, $01, Show db ROCKET_HIDEOUT_4, $02, Hide db ROCKET_HIDEOUT_4, $03, Hide @@ -461,24 +461,24 @@ MapHSCA: ; ca21 (3:4a21) db ROCKET_HIDEOUT_4, $07, Show db ROCKET_HIDEOUT_4, $08, Hide db ROCKET_HIDEOUT_4, $09, Hide -MapHSCF: ; ca39 (3:4a39) +MapHSCF: db SILPH_CO_2F, $01, Show db SILPH_CO_2F, $02, Show db SILPH_CO_2F, $03, Show db SILPH_CO_2F, $04, Show db SILPH_CO_2F, $05, Show -MapHSD0: ; ca48 (3:4a48) +MapHSD0: db SILPH_CO_3F, $02, Show db SILPH_CO_3F, $03, Show db SILPH_CO_3F, $04, Show -MapHSD1: ; ca51 (3:4a51) +MapHSD1: db SILPH_CO_4F, $02, Show db SILPH_CO_4F, $03, Show db SILPH_CO_4F, $04, Show db SILPH_CO_4F, $05, Show db SILPH_CO_4F, $06, Show db SILPH_CO_4F, $07, Show -MapHSD2: ; ca63 (3:4a63) +MapHSD2: db SILPH_CO_5F, $02, Show db SILPH_CO_5F, $03, Show db SILPH_CO_5F, $04, Show @@ -486,13 +486,13 @@ MapHSD2: ; ca63 (3:4a63) db SILPH_CO_5F, $06, Show db SILPH_CO_5F, $07, Show db SILPH_CO_5F, $08, Show -MapHSD3: ; ca78 (3:4a78) +MapHSD3: db SILPH_CO_6F, $06, Show db SILPH_CO_6F, $07, Show db SILPH_CO_6F, $08, Show db SILPH_CO_6F, $09, Show db SILPH_CO_6F, $0A, Show -MapHSD4: ; ca87 (3:4a87) +MapHSD4: db SILPH_CO_7F, $05, Show db SILPH_CO_7F, $06, Show db SILPH_CO_7F, $07, Show @@ -501,93 +501,93 @@ MapHSD4: ; ca87 (3:4a87) db SILPH_CO_7F, $0A, Show db SILPH_CO_7F, $0B, Show db SILPH_CO_7F, $0C, Show -MapHSD5: ; ca9f (3:4a9f) +MapHSD5: db SILPH_CO_8F, $02, Show db SILPH_CO_8F, $03, Show db SILPH_CO_8F, $04, Show -MapHSE9: ; caa8 (3:4aa8) +MapHSE9: db SILPH_CO_9F, $02, Show db SILPH_CO_9F, $03, Show db SILPH_CO_9F, $04, Show -MapHSEA: ; cab1 (3:4ab1) +MapHSEA: db SILPH_CO_10F, $01, Show db SILPH_CO_10F, $02, Show db SILPH_CO_10F, $03, Show db SILPH_CO_10F, $04, Show db SILPH_CO_10F, $05, Show db SILPH_CO_10F, $06, Show -MapHSEB: ; cac3 (3:4ac3) +MapHSEB: db SILPH_CO_11F, $03, Show db SILPH_CO_11F, $04, Show db SILPH_CO_11F, $05, Show db SILPH_CO_11F, $06, Show -MapHSF4: ; cacf (3:4acf) +MapHSF4: db $F4, $02, Show -MapHSD6: ; cad2 (3:4ad2) +MapHSD6: db MANSION_2, $02, Show -MapHSD7: ; cad5 (3:4ad5) +MapHSD7: db MANSION_3, $03, Show db MANSION_3, $04, Show -MapHSD8: ; cadb (3:4adb) +MapHSD8: db MANSION_4, $03, Show db MANSION_4, $04, Show db MANSION_4, $05, Show db MANSION_4, $06, Show db MANSION_4, $08, Show -MapHSD9: ; caea (3:4aea) +MapHSD9: db SAFARI_ZONE_EAST, $01, Show db SAFARI_ZONE_EAST, $02, Show db SAFARI_ZONE_EAST, $03, Show db SAFARI_ZONE_EAST, $04, Show -MapHSDA: ; caf6 (3:4af6) +MapHSDA: db SAFARI_ZONE_NORTH, $01, Show db SAFARI_ZONE_NORTH, $02, Show -MapHSDB: ; cafc (3:4afc) +MapHSDB: db SAFARI_ZONE_WEST, $01, Show db SAFARI_ZONE_WEST, $02, Show db SAFARI_ZONE_WEST, $03, Show db SAFARI_ZONE_WEST, $04, Show -MapHSDC: ; cb08 (3:4b08) +MapHSDC: db SAFARI_ZONE_CENTER, $01, Show -MapHSE2: ; cb0b (3:4b0b) +MapHSE2: db UNKNOWN_DUNGEON_2, $01, Show db UNKNOWN_DUNGEON_2, $02, Show db UNKNOWN_DUNGEON_2, $03, Show db UNKNOWN_DUNGEON_2, $04, Show -MapHSE3: ; cb17 (3:4b17) +MapHSE3: db UNKNOWN_DUNGEON_3, $01, Show db UNKNOWN_DUNGEON_3, $02, Show db UNKNOWN_DUNGEON_3, $03, Show db UNKNOWN_DUNGEON_3, $04, Show db UNKNOWN_DUNGEON_3, $05, Show -MapHS6C: ; cb26 (3:4b26) +MapHS6C: db VICTORY_ROAD_1, $03, Show db VICTORY_ROAD_1, $04, Show -MapHS78: ; cb2c (3:4b2c) +MapHS78: db CHAMPIONS_ROOM, $02, Hide -MapHSC0: ; cb2f (3:4b2f) +MapHSC0: db SEAFOAM_ISLANDS_1, $01, Show db SEAFOAM_ISLANDS_1, $02, Show -MapHS9F: ; cb35 (3:4b35) +MapHS9F: db SEAFOAM_ISLANDS_2, $01, Hide db SEAFOAM_ISLANDS_2, $02, Hide -MapHSA0: ; cb3b (3:4b3b) +MapHSA0: db SEAFOAM_ISLANDS_3, $01, Hide db SEAFOAM_ISLANDS_3, $02, Hide -MapHSA1: ; cb41 (3:4b41) +MapHSA1: db SEAFOAM_ISLANDS_4, $02, Show db SEAFOAM_ISLANDS_4, $03, Show db SEAFOAM_ISLANDS_4, $05, Hide db SEAFOAM_ISLANDS_4, $06, Hide -MapHSA2: ; cb4d (3:4b4d) +MapHSA2: db SEAFOAM_ISLANDS_5, $01, Hide db SEAFOAM_ISLANDS_5, $02, Hide db SEAFOAM_ISLANDS_5, $03, Show -MapHS27Copy: ; cb56 (3:4b56) +MapHS27Copy: ; doesn't seem to be referenced db BLUES_HOUSE, $01, Show db BLUES_HOUSE, $02, Hide db BLUES_HOUSE, $03, Show - db $FF, $01, Show
\ No newline at end of file + db $FF, $01, Show |
