From 3fc06b0f9da7ef993cb75315c5b2b168a3d6a3cf Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 20:35:57 -0500 Subject: Use constants --- constants/map_data_constants.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 5a1ec6ede..3d153c63b 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -102,7 +102,9 @@ const_value set 1 const OBJECT_1E ; 1e const OBJECT_1F ; 1f const OBJECT_RANGE ; 20 -; 33-39 are not used + ; 21-27 are not used +OBJECT_STRUCT_LENGTH EQU 40 +NUM_OBJECT_STRUCTS EQU 13 ; see ObjectStructs ; map_object struct members (see macros/wram.asm) const_def -- cgit v1.2.3 From c8575823a0e3694cba7c63e7ef468c55bb301804 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 17:30:27 -0500 Subject: Battle data goes in data/battle/ TreeMons, like fish groups, have constants --- constants/map_data_constants.asm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 3d153c63b..e603a37a7 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -253,6 +253,26 @@ const_value set 1 NUM_FRUIT_TREES EQU const_value +- 1 +; treemon sets +; TreeMons indexes (see data/wild/treemons.asm) + const_def + const TREEMON_SET_CITY + const TREEMON_SET_CANYON + const TREEMON_SET_AZALEA + const TREEMON_SET_ROUTE + const TREEMON_SET_KANTO + const TREEMON_SET_LAKE + const TREEMON_SET_FOREST + const TREEMON_SET_ROCK +NUM_TREEMON_SETS EQU const_value + +; treemon scores + const_def + const TREEMON_SCORE_BAD ; 0 + const TREEMON_SCORE_GOOD ; 1 + const TREEMON_SCORE_RARE ; 2 + + ; elevator floors ; used by `elevfloor` const_def -- cgit v1.2.3 From d91e42ca5e3796108b01df9e6535e84892cbf9cc Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 18:10:01 -0500 Subject: Group some mutually edited files in data/sprites/ --- constants/map_data_constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index e603a37a7..c8066f066 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -202,7 +202,7 @@ NUM_SPAWNS EQU const_value const OBJECTTYPE_6 -; Emotes indexes (see data/emotes.asm) +; Emotes indexes (see data/sprites/emotes.asm) const_def const EMOTE_SHOCK ; 0 const EMOTE_QUESTION ; 1 -- cgit v1.2.3 From cc8dac5a22a4f9307dd2f94e4bf29ee5b132c0b7 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 00:25:14 -0500 Subject: Use constants and data for Unown chamber events --- constants/map_data_constants.asm | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index c8066f066..33a743a96 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -142,6 +142,11 @@ SLIDING EQU 3 EMOTE_OBJECT EQU 7 +; see engine/overworld.asm +MAX_OUTDOOR_SPRITES EQU 23 +SPRITE_GFX_LIST_CAPACITY EQU $20 + + ; SpawnPoints indexes (see data/maps/spawn_points.asm) const_value = -1 const SPAWN_N_A @@ -178,6 +183,26 @@ const_value = -1 NUM_SPAWNS EQU const_value +; treemon sets +; TreeMons indexes (see data/wild/treemons.asm) + const_def + const TREEMON_SET_CITY + const TREEMON_SET_CANYON + const TREEMON_SET_AZALEA + const TREEMON_SET_ROUTE + const TREEMON_SET_KANTO + const TREEMON_SET_LAKE + const TREEMON_SET_FOREST + const TREEMON_SET_ROCK +NUM_TREEMON_SETS EQU const_value + +; treemon scores + const_def + const TREEMON_SCORE_BAD ; 0 + const TREEMON_SCORE_GOOD ; 1 + const TREEMON_SCORE_RARE ; 2 + + ; TryBGEvent arguments (see engine/events.asm) const_def const BGEVENT_READ @@ -253,28 +278,8 @@ const_value set 1 NUM_FRUIT_TREES EQU const_value +- 1 -; treemon sets -; TreeMons indexes (see data/wild/treemons.asm) - const_def - const TREEMON_SET_CITY - const TREEMON_SET_CANYON - const TREEMON_SET_AZALEA - const TREEMON_SET_ROUTE - const TREEMON_SET_KANTO - const TREEMON_SET_LAKE - const TREEMON_SET_FOREST - const TREEMON_SET_ROCK -NUM_TREEMON_SETS EQU const_value - -; treemon scores - const_def - const TREEMON_SCORE_BAD ; 0 - const TREEMON_SCORE_GOOD ; 1 - const TREEMON_SCORE_RARE ; 2 - - ; elevator floors -; used by `elevfloor` +; used by elevfloor const_def const FLOOR_B4F const FLOOR_B3F @@ -305,6 +310,20 @@ CMDQUEUE_CAPACITY EQU 4 ; command queue types CMDQUEUE_STONETABLE EQU 2 -; see engine/overworld.asm -MAX_OUTDOOR_SPRITES EQU 23 -SPRITE_GFX_LIST_CAPACITY EQU $20 + +; used by Special_UnownPuzzle +; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/unown_puzzle.asm) + const_def + const UNOWNPUZZLE_KABUTO ; 0 + const UNOWNPUZZLE_OMANYTE ; 1 + const UNOWNPUZZLE_AERODACTYL ; 2 + const UNOWNPUZZLE_HO_OH ; 3 +NUM_UNOWN_PUZZLES EQU const_value + +; used by Special_DisplayUnownWords +; UnownWalls and MenuDataHeaders_UnownWalls indexes (see data/unown_walls.asm) + const_def + const UNOWNWORDS_ESCAPE ; 0 + const UNOWNWORDS_LIGHT ; 1 + const UNOWNWORDS_WATER ; 2 + const UNOWNWORDS_HO_OH ; 3 -- cgit v1.2.3 From b45f89f80c62d22cbc2a4b38ae63a2da67878ee4 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 01:45:27 -0500 Subject: More constants and data tables --- constants/map_data_constants.asm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 33a743a96..0fcb10146 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -244,6 +244,7 @@ NUM_TREEMON_SETS EQU const_value EMOTE_MEM EQU -1 ; FruitTreeItems indexes (see data/items/fruit_trees.asm) +; used by fruittree command const_value set 1 const FRUITTREE_ROUTE_29 ; 01 const FRUITTREE_ROUTE_30_1 ; 02 @@ -278,8 +279,8 @@ const_value set 1 NUM_FRUIT_TREES EQU const_value +- 1 -; elevator floors -; used by elevfloor +; ElevatorFloorNames indexes (see data/elevator_floors.asm) +; used by elevfloor macro const_def const FLOOR_B4F const FLOOR_B3F -- cgit v1.2.3 From 1a2bc578418612d074bd275c34a57e61b3d016b2 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 02:35:46 -0500 Subject: =?UTF-8?q?Event=20script=E2=80=93related=20constants=20go=20in=20?= =?UTF-8?q?constants/script=5Fconstants.asm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/map_data_constants.asm | 147 --------------------------------------- 1 file changed, 147 deletions(-) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 0fcb10146..223220db9 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -181,150 +181,3 @@ const_value = -1 const SPAWN_MT_SILVER const SPAWN_FAST_SHIP NUM_SPAWNS EQU const_value - - -; treemon sets -; TreeMons indexes (see data/wild/treemons.asm) - const_def - const TREEMON_SET_CITY - const TREEMON_SET_CANYON - const TREEMON_SET_AZALEA - const TREEMON_SET_ROUTE - const TREEMON_SET_KANTO - const TREEMON_SET_LAKE - const TREEMON_SET_FOREST - const TREEMON_SET_ROCK -NUM_TREEMON_SETS EQU const_value - -; treemon scores - const_def - const TREEMON_SCORE_BAD ; 0 - const TREEMON_SCORE_GOOD ; 1 - const TREEMON_SCORE_RARE ; 2 - - -; TryBGEvent arguments (see engine/events.asm) - const_def - const BGEVENT_READ - const BGEVENT_UP - const BGEVENT_DOWN - const BGEVENT_RIGHT - const BGEVENT_LEFT - const BGEVENT_IFSET - const BGEVENT_IFNOTSET - const BGEVENT_ITEM - const BGEVENT_COPY - -; object_event types -; TryObjectEvent arguments (see engine/events.asm) - const_def - const OBJECTTYPE_SCRIPT - const OBJECTTYPE_ITEMBALL - const OBJECTTYPE_TRAINER - const OBJECTTYPE_3 - const OBJECTTYPE_4 - const OBJECTTYPE_5 - const OBJECTTYPE_6 - - -; Emotes indexes (see data/sprites/emotes.asm) - const_def - const EMOTE_SHOCK ; 0 - const EMOTE_QUESTION ; 1 - const EMOTE_HAPPY ; 2 - const EMOTE_SAD ; 3 - const EMOTE_HEART ; 4 - const EMOTE_BOLT ; 5 - const EMOTE_SLEEP ; 6 - const EMOTE_FISH ; 7 - const EMOTE_SHADOW ; 8 - const EMOTE_ROD ; 9 - const EMOTE_BOULDER_DUST ; 10 - const EMOTE_GRASS_RUSTLE ; 11 -EMOTE_MEM EQU -1 - -; FruitTreeItems indexes (see data/items/fruit_trees.asm) -; used by fruittree command -const_value set 1 - const FRUITTREE_ROUTE_29 ; 01 - const FRUITTREE_ROUTE_30_1 ; 02 - const FRUITTREE_ROUTE_38 ; 03 - const FRUITTREE_ROUTE_46_1 ; 04 - const FRUITTREE_ROUTE_30_2 ; 05 - const FRUITTREE_ROUTE_33 ; 06 - const FRUITTREE_ROUTE_31 ; 07 - const FRUITTREE_ROUTE_43 ; 08 - const FRUITTREE_VIOLET_CITY ; 09 - const FRUITTREE_ROUTE_46_2 ; 0a - const FRUITTREE_ROUTE_35 ; 0b - const FRUITTREE_ROUTE_45 ; 0c - const FRUITTREE_ROUTE_36 ; 0d - const FRUITTREE_ROUTE_26 ; 0e - const FRUITTREE_ROUTE_39 ; 0f - const FRUITTREE_ROUTE_44 ; 10 - const FRUITTREE_ROUTE_37_1 ; 11 - const FRUITTREE_ROUTE_37_2 ; 12 - const FRUITTREE_ROUTE_37_3 ; 13 - const FRUITTREE_AZALEA_TOWN ; 14 - const FRUITTREE_ROUTE_42_1 ; 15 - const FRUITTREE_ROUTE_42_2 ; 16 - const FRUITTREE_ROUTE_42_3 ; 17 - const FRUITTREE_ROUTE_11 ; 18 - const FRUITTREE_ROUTE_2 ; 19 - const FRUITTREE_ROUTE_1 ; 1a - const FRUITTREE_ROUTE_8 ; 1b - const FRUITTREE_PEWTER_CITY_1 ; 1c - const FRUITTREE_PEWTER_CITY_2 ; 1d - const FRUITTREE_FUCHSIA_CITY ; 1e -NUM_FRUIT_TREES EQU const_value +- 1 - - -; ElevatorFloorNames indexes (see data/elevator_floors.asm) -; used by elevfloor macro - const_def - const FLOOR_B4F - const FLOOR_B3F - const FLOOR_B2F - const FLOOR_B1F - const FLOOR_1F - const FLOOR_2F - const FLOOR_3F - const FLOOR_4F - const FLOOR_5F - const FLOOR_6F - const FLOOR_7F - const FLOOR_8F - const FLOOR_9F - const FLOOR_10F - const FLOOR_11F - const FLOOR_ROOF - -; command queue members -CMDQUEUE_TYPE EQU 0 -CMDQUEUE_ADDR EQU 1 -CMDQUEUE_03 EQU 3 -CMDQUEUE_04 EQU 4 -CMDQUEUE_05 EQU 5 -CMDQUEUE_ENTRY_SIZE EQU 6 -CMDQUEUE_CAPACITY EQU 4 - -; command queue types -CMDQUEUE_STONETABLE EQU 2 - - -; used by Special_UnownPuzzle -; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/unown_puzzle.asm) - const_def - const UNOWNPUZZLE_KABUTO ; 0 - const UNOWNPUZZLE_OMANYTE ; 1 - const UNOWNPUZZLE_AERODACTYL ; 2 - const UNOWNPUZZLE_HO_OH ; 3 -NUM_UNOWN_PUZZLES EQU const_value - -; used by Special_DisplayUnownWords -; UnownWalls and MenuDataHeaders_UnownWalls indexes (see data/unown_walls.asm) - const_def - const UNOWNWORDS_ESCAPE ; 0 - const UNOWNWORDS_LIGHT ; 1 - const UNOWNWORDS_WATER ; 2 - const UNOWNWORDS_HO_OH ; 3 -- cgit v1.2.3 From 94bbfe2f0c97f653db21db3bb68fcc3263340e4e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 19:56:21 -0500 Subject: Move map-related "metadata" files into data/maps/ --- constants/map_data_constants.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 223220db9..179659865 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -3,7 +3,7 @@ MAP_N_A EQU -1 GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map header struct members (see maps/map_headers.asm) +; map header struct members (see data/maps/map_headers.asm) const_def const MAPHEADER_MAPHEADER2_BANK ; 0 const MAPHEADER_TILESET ; 1 @@ -52,7 +52,7 @@ const_value set 1 const FISHGROUP_QWILFISH_NO_SWARM -; connection directions +; connection directions (see data/maps/map_headers_2.asm) const_def const EAST_F const WEST_F -- cgit v1.2.3 From bf074f359886707d2ffb2e0b525b03dc7af0fe29 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 22:57:19 -0500 Subject: =?UTF-8?q?map=5Fheader=20=E2=86=92=20map=5Fdef;=20map=5Fheader=5F?= =?UTF-8?q?2=20=E2=86=92=20map=5Fdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/map_data_constants.asm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 179659865..b25dea04d 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -3,18 +3,18 @@ MAP_N_A EQU -1 GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map header struct members (see data/maps/map_headers.asm) +; map header struct members (see data/maps/map_defs.asm) const_def - const MAPHEADER_MAPHEADER2_BANK ; 0 - const MAPHEADER_TILESET ; 1 - const MAPHEADER_ENVIRONMENT ; 2 - const MAPHEADER_MAPHEADER2 ; 3 - const MAPHEADER_MAPHEADER2_HI ; 4 - const MAPHEADER_LOCATION ; 5 - const MAPHEADER_MUSIC ; 6 - const MAPHEADER_PALETTE ; 7 - const MAPHEADER_FISHGROUP ; 8 -NUM_MAPHEADER_ATTRIBUTES EQU const_value + const MAPDEF_MAPDATA_BANK ; 0 + const MAPDEF_TILESET ; 1 + const MAPDEF_ENVIRONMENT ; 2 + const MAPDEF_MAPDATA ; 3 + const MAPDEF_MAPDATA_HI ; 4 + const MAPDEF_LOCATION ; 5 + const MAPDEF_MUSIC ; 6 + const MAPDEF_PALETTE ; 7 + const MAPDEF_FISHGROUP ; 8 +NUM_MAPDEF_ATTRIBUTES EQU const_value ; map environments (wEnvironment) const_value set 1 @@ -52,7 +52,7 @@ const_value set 1 const FISHGROUP_QWILFISH_NO_SWARM -; connection directions (see data/maps/map_headers_2.asm) +; connection directions (see data/maps/map_data.asm) const_def const EAST_F const WEST_F -- cgit v1.2.3 From e2ac753da178063877a06f1cd577888a5337d6e8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 17 Jan 2018 00:00:43 -0500 Subject: No redundant filename prefixes --- constants/map_data_constants.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index b25dea04d..f58e8ec3a 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -3,7 +3,7 @@ MAP_N_A EQU -1 GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map header struct members (see data/maps/map_defs.asm) +; map header struct members (see data/maps/definitions.asm) const_def const MAPDEF_MAPDATA_BANK ; 0 const MAPDEF_TILESET ; 1 @@ -52,7 +52,7 @@ const_value set 1 const FISHGROUP_QWILFISH_NO_SWARM -; connection directions (see data/maps/map_data.asm) +; connection directions (see data/maps/data.asm) const_def const EAST_F const WEST_F -- cgit v1.2.3 From 72c4f9e04a33925f99d685e68f580ee29f865e22 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 15:58:55 -0500 Subject: More constants, related to map objects --- constants/map_data_constants.asm | 134 ++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 64 deletions(-) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index f58e8ec3a..1b4bb5d92 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -3,6 +3,7 @@ MAP_N_A EQU -1 GROUP_NONE EQU 0 MAP_NONE EQU 0 + ; map header struct members (see data/maps/definitions.asm) const_def const MAPDEF_MAPDATA_BANK ; 0 @@ -67,6 +68,75 @@ const_value set 1 shift_const NORTH +; SpawnPoints indexes (see data/maps/spawn_points.asm) +const_value = -1 + const SPAWN_N_A + const SPAWN_HOME + const SPAWN_DEBUG +; kanto + const SPAWN_PALLET + const SPAWN_VIRIDIAN + const SPAWN_PEWTER + const SPAWN_CERULEAN + const SPAWN_ROCK_TUNNEL + const SPAWN_VERMILION + const SPAWN_LAVENDER + const SPAWN_SAFFRON + const SPAWN_CELADON + const SPAWN_FUCHSIA + const SPAWN_CINNABAR + const SPAWN_INDIGO +; johto + const SPAWN_NEW_BARK + const SPAWN_CHERRYGROVE + const SPAWN_VIOLET + const SPAWN_UNION_CAVE + const SPAWN_AZALEA + const SPAWN_CIANWOOD + const SPAWN_GOLDENROD + const SPAWN_OLIVINE + const SPAWN_ECRUTEAK + const SPAWN_MAHOGANY + const SPAWN_LAKE + const SPAWN_BLACKTHORN + const SPAWN_MT_SILVER + const SPAWN_FAST_SHIP +NUM_SPAWNS EQU const_value + + +; outdoor sprite limits (see engine/overworld.asm) +MAX_OUTDOOR_SPRITES EQU 23 +SPRITE_GFX_LIST_CAPACITY EQU $20 + + +; map_object struct members (see macros/wram.asm) + const_def + const MAPOBJECT_OBJECT_STRUCT_ID ; 0 + const MAPOBJECT_SPRITE ; 1 + const MAPOBJECT_Y_COORD ; 2 + const MAPOBJECT_X_COORD ; 3 + const MAPOBJECT_MOVEMENT ; 4 + const MAPOBJECT_RADIUS ; 5 + const MAPOBJECT_HOUR ; 6 + const MAPOBJECT_TIMEOFDAY ; 7 + const MAPOBJECT_COLOR ; 8 + const MAPOBJECT_RANGE ; 9 + const MAPOBJECT_SCRIPT_POINTER ; a + const MAPOBJECT_POINTER_HI ; b + const MAPOBJECT_EVENT_FLAG ; c + const MAPOBJECT_FLAG_HI ; d + const MAPOBJECT_E ; unused + const MAPOBJECT_F ; unused +OBJECT_LENGTH EQU const_value + +MAPOBJECT_SCREEN_HEIGHT EQU 11 +MAPOBJECT_SCREEN_WIDTH EQU 12 + +; NPCs disappear if standing on tile $60-$7f or $e0-$ff, +; since those IDs are for text characters and textbox frames. +MAPOBJECT_VISIBLE_TILE_LIMIT EQU $60 + + ; object_struct members (see macros/wram.asm) const_def const OBJECT_SPRITE ; 00 @@ -106,29 +176,6 @@ const_value set 1 OBJECT_STRUCT_LENGTH EQU 40 NUM_OBJECT_STRUCTS EQU 13 ; see ObjectStructs -; map_object struct members (see macros/wram.asm) - const_def - const MAPOBJECT_OBJECT_STRUCT_ID ; 0 - const MAPOBJECT_SPRITE ; 1 - const MAPOBJECT_Y_COORD ; 2 - const MAPOBJECT_X_COORD ; 3 - const MAPOBJECT_MOVEMENT ; 4 - const MAPOBJECT_RADIUS ; 5 - const MAPOBJECT_HOUR ; 6 - const MAPOBJECT_TIMEOFDAY ; 7 - const MAPOBJECT_COLOR ; 8 - const MAPOBJECT_RANGE ; 9 - const MAPOBJECT_SCRIPT_POINTER ; a - const MAPOBJECT_POINTER_HI ; b - const MAPOBJECT_EVENT_FLAG ; c - const MAPOBJECT_FLAG_HI ; d - const MAPOBJECT_E ; unused - const MAPOBJECT_F ; unused -OBJECT_LENGTH EQU const_value - -MAPOBJECT_SCREEN_HEIGHT EQU 11 -MAPOBJECT_SCREEN_WIDTH EQU 12 - ; object_struct OBJECT_FACING values OW_DOWN EQU DOWN << 2 OW_UP EQU UP << 2 @@ -140,44 +187,3 @@ INVISIBLE EQU 0 FIXED_FACING EQU 2 SLIDING EQU 3 EMOTE_OBJECT EQU 7 - - -; see engine/overworld.asm -MAX_OUTDOOR_SPRITES EQU 23 -SPRITE_GFX_LIST_CAPACITY EQU $20 - - -; SpawnPoints indexes (see data/maps/spawn_points.asm) -const_value = -1 - const SPAWN_N_A - const SPAWN_HOME - const SPAWN_DEBUG -; kanto - const SPAWN_PALLET - const SPAWN_VIRIDIAN - const SPAWN_PEWTER - const SPAWN_CERULEAN - const SPAWN_ROCK_TUNNEL - const SPAWN_VERMILION - const SPAWN_LAVENDER - const SPAWN_SAFFRON - const SPAWN_CELADON - const SPAWN_FUCHSIA - const SPAWN_CINNABAR - const SPAWN_INDIGO -; johto - const SPAWN_NEW_BARK - const SPAWN_CHERRYGROVE - const SPAWN_VIOLET - const SPAWN_UNION_CAVE - const SPAWN_AZALEA - const SPAWN_CIANWOOD - const SPAWN_GOLDENROD - const SPAWN_OLIVINE - const SPAWN_ECRUTEAK - const SPAWN_MAHOGANY - const SPAWN_LAKE - const SPAWN_BLACKTHORN - const SPAWN_MT_SILVER - const SPAWN_FAST_SHIP -NUM_SPAWNS EQU const_value -- cgit v1.2.3 From 2acaa96cf16ce953a7149f300d54e5440abc27d8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 18:34:20 -0500 Subject: More charmap and home/text.asm documentation for JP chars --- constants/map_data_constants.asm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'constants/map_data_constants.asm') diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 1b4bb5d92..7bb9dbd70 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -132,10 +132,6 @@ OBJECT_LENGTH EQU const_value MAPOBJECT_SCREEN_HEIGHT EQU 11 MAPOBJECT_SCREEN_WIDTH EQU 12 -; NPCs disappear if standing on tile $60-$7f or $e0-$ff, -; since those IDs are for text characters and textbox frames. -MAPOBJECT_VISIBLE_TILE_LIMIT EQU $60 - ; object_struct members (see macros/wram.asm) const_def -- cgit v1.2.3