diff options
| author | dannye <33dannye@gmail.com> | 2025-09-06 16:54:17 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-09-06 16:54:17 -0500 |
| commit | 377749ca4efac05b6c57dfed049899891af6c35a (patch) | |
| tree | 4b429403935c4a7c2de710a6cbf7310246874539 /data/maps | |
| parent | Fix .tilemap file extension, fix some typos (#138) (diff) | |
| parent | Document visual glitch with Pewter City Gym guy (#526) (diff) | |
| download | pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.tar.gz pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.tar.xz pokeyellow-377749ca4efac05b6c57dfed049899891af6c35a.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/hide_show_data.asm | 6 | ||||
| -rw-r--r-- | data/maps/objects/Route2Gate.asm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 72e3add9..de9eb979 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -256,7 +256,7 @@ MapHSPointers: dw -1 ; end NoHS: - db $FF, $FF, $FF + db -1, -1, -1 ; end MissableObjects: ; entries correspond to HS_* constants (see constants/hide_show_constants) @@ -578,5 +578,5 @@ BluesHouseHSCopy: ; unreferenced db BLUES_HOUSE, BLUESHOUSE_DAISY1, SHOW db BLUES_HOUSE, BLUESHOUSE_DAISY2, HIDE db BLUES_HOUSE, BLUESHOUSE_TOWN_MAP, SHOW - db $FF, $01, SHOW ; end - assert_table_length NUM_HS_OBJECTS + 1 + assert_table_length NUM_HS_OBJECTS + db -1, 1, SHOW ; end diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index 6c46736d..44e4aa67 100644 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm @@ -1,6 +1,6 @@ object_const_def - const_export ROUTE2_OAKS_AIDE - const_export ROUTE2_YOUNGSTER + const_export ROUTE2GATE_OAKS_AIDE + const_export ROUTE2GATE_YOUNGSTER Route2Gate_Object: db $a ; border block |