diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index c55d4e9d6..58e19462e 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -708,7 +708,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const BATTLEANIMOAMSET_D7 ; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm) -const_value set 1 + const_def 1 const ANIM_BG_FLASH_INVERTED const ANIM_BG_FLASH_WHITE const ANIM_BG_WHITE_HUES @@ -764,7 +764,7 @@ const_value set 1 const ANIM_BG_35 ; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm) -const_value set 1 + const_def 1 const ANIM_GFX_HIT const ANIM_GFX_CUT const ANIM_GFX_FIRE diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 6f4f48669..949e28ab4 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -55,7 +55,7 @@ MOVE_LENGTH EQU const_value ; indexes for: ; - PlayerStats and EnemyStats (see wram.asm) ; - party_struct and battle_struct members (see macros/wram.asm) -const_value set 1 + const_def 1 const STAT_HP const STAT_ATK const STAT_DEF @@ -76,7 +76,7 @@ ATKDEFDV_SHINY EQU $EA SPDSPCDV_SHINY EQU $AA ; battle classes (wBattleMode values) -const_value set 1 + const_def 1 const WILD_BATTLE const TRAINER_BATTLE @@ -151,7 +151,7 @@ const_value set 1 ; status condition bit flags SLP EQU %111 ; 0-7 turns -const_value set 3 + const_def 3 const PSN const BRN const FRZ diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 71b8de8be..81e1880a0 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -47,7 +47,7 @@ BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (P MOBILE_EVENT_OBJECT_GS_BALL EQU $b ; BattleTowerText arguments (see engine/events/battle_tower/trainer_text.asm) -const_value set 1 + const_def 1 const BATTLETOWERTEXT_INTRO const BATTLETOWERTEXT_WIN_TEXT const BATTLETOWERTEXT_LOSS_TEXT diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index fba7583c0..7b23e11e1 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -105,7 +105,7 @@ const PAAD_TESTING ; CreditsScript indexes (see data/credits_script.asm) -const_value set -7 + const_def -7 const CREDITS_THEEND const CREDITS_WAIT2 const CREDITS_MUSIC diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm index 495469e02..1af3c47ac 100644 --- a/constants/item_data_constants.asm +++ b/constants/item_data_constants.asm @@ -10,7 +10,7 @@ ITEMATTR_STRUCT_LENGTH EQU const_value ; item types -const_value set 1 + const_def 1 const ITEM ; 1 const KEY_ITEM ; 2 const BALL ; 3 @@ -65,7 +65,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct const HELD_7 const HELD_CLEANSE_TAG -const_value set 10 + const_def 10 const HELD_HEAL_POISON const HELD_HEAL_FREEZE const HELD_HEAL_BURN @@ -74,7 +74,7 @@ const_value set 10 const HELD_HEAL_STATUS const HELD_HEAL_CONFUSION -const_value set 20 + const_def 20 const HELD_PREVENT_POISON const HELD_PREVENT_BURN const HELD_PREVENT_FREEZE @@ -82,7 +82,7 @@ const_value set 20 const HELD_PREVENT_PARALYZE const HELD_PREVENT_CONFUSE -const_value set 30 + const_def 30 const HELD_30 const HELD_ATTACK_UP const HELD_DEFENSE_UP @@ -93,12 +93,12 @@ const_value set 30 const HELD_EVASION_UP const HELD_38 -const_value set 40 + const_def 40 const HELD_40 const HELD_41 const HELD_METAL_POWDER -const_value set 50 + const_def 50 const HELD_NORMAL_BOOST const HELD_FIGHTING_BOOST const HELD_FLYING_BOOST @@ -117,7 +117,7 @@ const_value set 50 const HELD_DARK_BOOST const HELD_STEEL_BOOST -const_value set 70 + const_def 70 const HELD_CATCH_CHANCE const HELD_71 const HELD_ESCAPE diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index a569aec21..6e5c4b23f 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -18,7 +18,7 @@ MAP_NONE EQU 0 NUM_MAPDEF_ATTRIBUTES EQU const_value ; map environments (wEnvironment) -const_value set 1 + const_def 1 const TOWN const ROUTE const INDOOR diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm index d9abd6e9b..a281c8813 100644 --- a/constants/map_setup_constants.asm +++ b/constants/map_setup_constants.asm @@ -1,6 +1,6 @@ ; hMapEntryMethod values ; MapSetupScripts indexes (see data/maps/setup_scripts.asm) -const_value set $f1 + const_def $f1 const MAPSETUP_WARP ; f1 const MAPSETUP_CONTINUE ; f2 const MAPSETUP_RELOADMAP ; f3 @@ -67,7 +67,7 @@ const_value set $f1 map_end EQU -1 ; callback types -const_value set 1 + const_def 1 const MAPCALLBACK_TILES const MAPCALLBACK_OBJECTS const MAPCALLBACK_CMDQUEUE diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index 08f584ff1..f1ca20ae5 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -35,8 +35,8 @@ ; MonMenuOptions indexes (see data/mon_menu.asm) ; used by PokemonActionSubmenu (see engine/start_menu.asm) -const_value set 1 -; moves + const_def 1 + ; moves const MONMENUITEM_CUT ; 1 const MONMENUITEM_FLY ; 2 const MONMENUITEM_SURF ; 3 @@ -51,7 +51,7 @@ const_value set 1 const MONMENUITEM_ROCKSMASH ; 12 const MONMENUITEM_MILKDRINK ; 13 const MONMENUITEM_SWEETSCENT ; 14 -; options + ; options const MONMENUITEM_STATS ; 15 const MONMENUITEM_SWITCH ; 16 const MONMENUITEM_ITEM ; 17 @@ -84,7 +84,7 @@ HMENURETURN_ASM EQU %11111111 const PARTYMENUACTION_GIVE_ITEM const PARTYMENUACTION_MOBILE ; mobile ; PrintPartyMenuActionText arguments (see engine/party_menu.asm) -const_value set $f0 + const_def $f0 const PARTYMENUTEXT_HEAL_PSN const PARTYMENUTEXT_HEAL_BRN const PARTYMENUTEXT_HEAL_FRZ diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 8b3b45100..a72145c54 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -18,7 +18,7 @@ ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm) ; - FramesPointers (see gfx/pokemon/frame_pointers.asm) ; - Footprints (see gfx/footprints.asm) -const_value set 1 + const_def 1 const BULBASAUR ; 01 const IVYSAUR ; 02 const VENUSAUR ; 03 @@ -284,7 +284,7 @@ NUM_POKEMON EQU const_value +- 1 ; - UnownAnimationIdlePointers (see gfx/pokemon/unown_idle_pointers.asm) ; - UnownBitmasksPointers (see gfx/pokemon/unown_bitmask_pointers.asm) ; - UnownFramesPointers (see gfx/pokemon/unown_frame_pointers.asm) -const_value set 1 + const_def 1 const UNOWN_A ; 1 const UNOWN_B ; 2 const UNOWN_C ; 3 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 09a5abfd1..1a1cc6ab8 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -45,7 +45,7 @@ GENDERLESS EQU 255 const SLOW ; BaseEggGroups values -const_value set 1 + const_def 1 const MONSTER ; 1 const AMPHIBIAN ; 2 const INSECT ; 3 @@ -131,7 +131,7 @@ NUM_HOF_TEAMS = 30 ; evolution types (used in data/pokemon/evos_attacks.asm) -const_value set 1 + const_def 1 const EVOLVE_LEVEL const EVOLVE_ITEM const EVOLVE_TRADE @@ -139,13 +139,13 @@ const_value set 1 const EVOLVE_STAT ; EVOLVE_HAPPINESS triggers -const_value set 1 + const_def 1 const TR_ANYTIME const TR_MORNDAY const TR_NITE ; EVOLVE_STAT triggers -const_value set 1 + const_def 1 const ATK_GT_DEF const ATK_LT_DEF const ATK_EQ_DEF diff --git a/constants/printer_constants.asm b/constants/printer_constants.asm index b6b5da7e7..f0b8b4818 100755 --- a/constants/printer_constants.asm +++ b/constants/printer_constants.asm @@ -1,5 +1,5 @@ ; wPrinterStatus -const_value set 1 + const_def 1 const PRINTER_STATUS_CHECKING const PRINTER_STATUS_TRANSMITTING const PRINTER_STATUS_PRINTING diff --git a/constants/script_constants.asm b/constants/script_constants.asm index eb7f9b8d6..4ffdb6c16 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -76,7 +76,7 @@ RETVAR_EXECUTE EQU (2 << 6) ; PlayerEventScriptPointers indexes (see engine/events.asm) -const_value set -1 + const_def -1 const PLAYEREVENT_MAPSCRIPT const PLAYEREVENT_NONE const PLAYEREVENT_SEENBYTRAINER @@ -168,7 +168,7 @@ EMOTE_MEM EQU -1 ; fruittree arguments ; FruitTreeItems indexes (see data/items/fruit_trees.asm) -const_value set 1 + const_def 1 const FRUITTREE_ROUTE_29 ; 01 const FRUITTREE_ROUTE_30_1 ; 02 const FRUITTREE_ROUTE_38 ; 03 @@ -275,7 +275,7 @@ NUM_UNOWN_PUZZLES EQU const_value const UNOWNWORDS_HO_OH ; 3 ; MoveTutor writebyte arguments -const_value set 1 + const_def 1 const MOVETUTOR_FLAMETHROWER ; 1 const MOVETUTOR_THUNDERBOLT ; 2 const MOVETUTOR_ICE_BEAM ; 3 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 767d7a3c6..cef3dd486 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -106,7 +106,7 @@ const SPRITE_STANDING_YOUNGSTER ; 66 ; SpriteMons indexes (see data/sprites/sprite_mons.asm) -const_value set $80 + const_def $80 SPRITE_POKEMON EQU const_value const SPRITE_UNOWN ; 80 const SPRITE_GEODUDE ; 81 @@ -145,12 +145,12 @@ SPRITE_POKEMON EQU const_value const SPRITE_HO_OH ; a2 ; special GetMonSprite values (see engine/overworld.asm) -const_value set $e0 + const_def $e0 const SPRITE_DAY_CARE_MON_1 ; e0 const SPRITE_DAY_CARE_MON_2 ; e1 ; VariableSprites indexes (see wram.asm) -const_value set $f0 + const_def $f0 SPRITE_VARS EQU const_value const SPRITE_CONSOLE ; f0 const SPRITE_DOLL_1 ; f1 diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm index 0ab039efa..329833b1e 100644 --- a/constants/sprite_data_constants.asm +++ b/constants/sprite_data_constants.asm @@ -9,7 +9,7 @@ NUM_SPRITEDATA_FIELDS EQU const_value ; sprite types -const_value set 1 + const_def 1 const WALKING_SPRITE ; 1 const STANDING_SPRITE ; 2 const STILL_SPRITE ; 3 @@ -27,7 +27,7 @@ const_value set 1 ; object_events set bit 3 so as not to use the sprite's default palette ; MapObjectPals indexes (see gfx/overworld/npc_sprites.pal) -const_value set (1 << 3) + const_def 1 << 3 const PAL_NPC_RED ; 8 const PAL_NPC_BLUE ; 9 const PAL_NPC_GREEN ; a diff --git a/constants/text_constants.asm b/constants/text_constants.asm index a6052065c..a64039f64 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -9,7 +9,7 @@ TRAINER_CLASS_NAME_LENGTH EQU 13 NAME_LENGTH_JAPANESE EQU 6 ; GetName types (see home/names.asm) -const_value set 1 + const_def 1 const MON_NAME ; 1 const MOVE_NAME ; 2 const DUMMY_NAME ; 3 @@ -31,7 +31,7 @@ TEXTBOX_Y EQU SCREEN_HEIGHT - TEXTBOX_HEIGHT TEXTBOX_INNERY EQU TEXTBOX_Y + 2 ; PrintNum bit flags -const_value set 5 + const_def 5 const PRINTNUM_MONEY_F ; 5 const PRINTNUM_RIGHTALIGN_F ; 6 const PRINTNUM_LEADINGZEROS_F ; 7 diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index 5fda5bd5b..e89714fee 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -1,5 +1,5 @@ ; Tilesets indexes (see data/tilesets.asm) -const_value set 1 + const_def 1 const TILESET_JOHTO ; 01 const TILESET_JOHTO_MODERN ; 02 const TILESET_KANTO ; 03 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index fa8edf232..65af255be 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -21,7 +21,7 @@ GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0 GAMETIMERPAUSE_MOBILE_7_F EQU 7 ; Options:: ; cfcc -const_value set 4 + const_def 4 const NO_TEXT_SCROLL ; 4 const STEREO ; 5 const BATTLE_SHIFT ; 6 @@ -60,7 +60,7 @@ GBPRINTER_DARKEST EQU $7f const MENU_ACCOUNT ; 0 ; WalkingDirection:: ; d043 -const_value set -1 + const_def -1 const STANDING ; -1 const DOWN ; 0 const UP ; 1 diff --git a/data/mon_menu.asm b/data/mon_menu.asm index e8a262059..ec9a59a94 100644 --- a/data/mon_menu.asm +++ b/data/mon_menu.asm @@ -1,5 +1,5 @@ ; MonMenuOptionStrings indexes -const_value set 1 + const_def 1 const MONMENUVALUE_STATS ; 1 const MONMENUVALUE_SWITCH ; 2 const MONMENUVALUE_ITEM ; 3 diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md index b9f2f35a8..c8edc9dc1 100644 --- a/docs/map_event_scripts.md +++ b/docs/map_event_scripts.md @@ -24,7 +24,7 @@ ## Object constants 
-const_value set 2 ; object constants
+	const_def 2 ; object constants
 	const MAPNAME_OBJECTNAME
diff --git a/engine/debug.asm b/engine/debug.asm index c15481926..4e3ce6f60 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -1,4 +1,4 @@ -const_value set $6a + const_def $6a const DEBUGTEST_UP_ARROW ; $6a const DEBUGTEST_TICKS ; $6b const DEBUGTEST_WHITE ; $6c diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index a65cecc8a..8079088d9 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -1,4 +1,4 @@ -const_value set 1 + const_def 1 const PINK_PAGE ; 1 const GREEN_PAGE ; 2 const BLUE_PAGE ; 3 diff --git a/macros/enum.asm b/macros/enum.asm index c1321a636..385aee6f8 100644 --- a/macros/enum.asm +++ b/macros/enum.asm @@ -26,7 +26,11 @@ ENDM ; Enumerate constants const_def: MACRO +if _NARG >= 1 +const_value = \1 +else const_value = 0 +endc ENDM const: MACRO diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 5681c3df8..7967fed01 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const AZALEAGYM_BUGSY const AZALEAGYM_BUG_CATCHER1 const AZALEAGYM_BUG_CATCHER2 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 984b7651a..3d224bb74 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const AZALEAMART_CLERK const AZALEAMART_COOLTRAINER_M const AZALEAMART_BUG_CATCHER diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index b135229d0..84c7a3bae 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const AZALEAPOKECENTER1F_NURSE const AZALEAPOKECENTER1F_GENTLEMAN const AZALEAPOKECENTER1F_FISHING_GURU diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 15d867608..aba022cad 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const AZALEATOWN_AZALEA_ROCKET1 const AZALEATOWN_GRAMPS const AZALEATOWN_TEACHER diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 526f08274..8fd6f9f97 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BATTLETOWER1F_RECEPTIONIST const BATTLETOWER1F_YOUNGSTER const BATTLETOWER1F_COOLTRAINER_F diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index bb3203d06..06d582ea8 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BATTLETOWERBATTLEROOM_YOUNGSTER const BATTLETOWERBATTLEROOM_RECEPTIONIST diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index ec2c0462c..4e6912c00 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BATTLETOWERELEVATOR_RECEPTIONIST BattleTowerElevator_MapScripts: diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index fe249f2d9..47971c815 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BATTLETOWERHALLWAY_RECEPTIONIST BattleTowerHallway_MapScripts: diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 5ade6be43..23d265637 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER const BATTLETOWEROUTSIDE_BUENA const BATTLETOWEROUTSIDE_SAILOR diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm index 2652b7e6c..452b1fdb8 100644 --- a/maps/BillsBrothersHouse.asm +++ b/maps/BillsBrothersHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BILLSBROTHERSHOUSE_POKEFAN_F const BILLSBROTHERSHOUSE_YOUNGSTER diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 5b0c0ec5f..a0ce47a75 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BILLSFAMILYSHOUSE_BILL const BILLSFAMILYSHOUSE_POKEFAN_F const BILLSFAMILYSHOUSE_TWIN diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 5dca2ea41..6de4d2bc7 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BILLSHOUSE_GRAMPS BillsHouse_MapScripts: diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index c413df225..0ba92b110 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BLACKTHORNCITY_SUPER_NERD1 const BLACKTHORNCITY_SUPER_NERD2 const BLACKTHORNCITY_GRAMPS1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 19e8fd744..d9425f9ed 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY const BLACKTHORNDRAGONSPEECHHOUSE_EKANS diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index c3a4e4939..8e9d9af23 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BLACKTHORNEMYSHOUSE_EMY BlackthornEmysHouse_MapScripts: diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index d8e74049f..1e9b7fb7e 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BLACKTHORNGYM1F_CLAIR const BLACKTHORNGYM1F_COOLTRAINER_M1 const BLACKTHORNGYM1F_COOLTRAINER_M2 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 6e923c44a..73cf4bc88 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BLACKTHORNGYM2F_COOLTRAINER_M const BLACKTHORNGYM2F_COOLTRAINER_F const BLACKTHORNGYM2F_BOULDER1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 03315f745..d0a4e541b 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BLACKTHORNMART_CLERK const BLACKTHORNMART_COOLTRAINER_M const BLACKTHORNMART_BLACK_BELT diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index 61c9e50a9..c39cd68b3 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BLACKTHORNPOKECENTER1F_NURSE const BLACKTHORNPOKECENTER1F_GENTLEMAN const BLACKTHORNPOKECENTER1F_TWIN diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 474b9c370..ebc528bbe 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BLUESHOUSE_DAISY BluesHouse_MapScripts: diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 4f900e180..06694dc9c 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BRUNOSROOM_BRUNO BrunosRoom_MapScripts: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 349f3a674..4c8f5e912 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BURNEDTOWER1F_ROCK const BURNEDTOWER1F_EUSINE const BURNEDTOWER1F_SILVER diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 4e04f5c2a..ab4d5f5ce 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const BURNEDTOWERB1F_BOULDER const BURNEDTOWERB1F_RAIKOU1 const BURNEDTOWERB1F_ENTEI1 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index e0dd922b2..039231283 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONCAFE_SUPER_NERD const CELADONCAFE_FISHER1 const CELADONCAFE_FISHER2 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index c1a19e8b6..606587906 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONCITY_FISHER const CELADONCITY_POLIWAG const CELADONCITY_TEACHER1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index f8d44e887..515ab70b0 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONDEPTSTORE1F_RECEPTIONIST const CELADONDEPTSTORE1F_GENTLEMAN const CELADONDEPTSTORE1F_TEACHER diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index ef774ab35..6810cf390 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONDEPTSTORE2F_CLERK1 const CELADONDEPTSTORE2F_CLERK2 const CELADONDEPTSTORE2F_POKEFAN_M diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 6f73f1772..2527599c4 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONDEPTSTORE3F_CLERK const CELADONDEPTSTORE3F_YOUNGSTER const CELADONDEPTSTORE3F_GAMEBOY_KID1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 676088476..46532322f 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONDEPTSTORE4F_CLERK const CELADONDEPTSTORE4F_SUPER_NERD const CELADONDEPTSTORE4F_YOUNGSTER diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 7a380064b..94fc55de3 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONDEPTSTORE5F_CLERK1 const CELADONDEPTSTORE5F_CLERK2 const CELADONDEPTSTORE5F_GENTLEMAN diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 1c472b0a6..d85fdda2e 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONDEPTSTORE6F_SUPER_NERD const CELADONDEPTSTORE6F_YOUNGSTER diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index d453f757f..d39f09586 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONGAMECORNER_CLERK const CELADONGAMECORNER_RECEPTIONIST const CELADONGAMECORNER_POKEFAN_M diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index e3106a78b..347aa1513 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONGAMECORNERPRIZEROOM_GENTLEMAN const CELADONGAMECORNERPRIZEROOM_PHARMACIST diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 5422ae253..1d6a23b40 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONGYM_ERIKA const CELADONGYM_LASS1 const CELADONGYM_LASS2 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 57ac84436..79c4fbaec 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONMANSION1F_GRANNY const CELADONMANSION1F_GROWLITHE1 const CELADONMANSION1F_CLEFAIRY diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 8b363fe04..ce7e0c1fc 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONMANSION3F_COOLTRAINER_M const CELADONMANSION3F_GYM_GUY const CELADONMANSION3F_SUPER_NERD diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 969290800..de9bed48f 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONMANSIONROOF_FISHER CeladonMansionRoof_MapScripts: diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 01e70490e..a818b2875 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONMANSIONROOFHOUSE_PHARMACIST CeladonMansionRoofHouse_MapScripts: diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index ac68363fc..098d4f9f5 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CELADONPOKECENTER1F_NURSE const CELADONPOKECENTER1F_GENTLEMAN const CELADONPOKECENTER1F_PHARMACIST diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index d06370a37..36495ce7d 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CERULEANCITY_COOLTRAINER_M const CERULEANCITY_SUPER_NERD const CERULEANCITY_SLOWPOKE diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index ad03c9aba..cc11ce209 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CERULEANGYM_ROCKET const CERULEANGYM_MISTY const CERULEANGYM_SWIMMER_GIRL1 diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 0abe42089..2e15a2d43 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M CeruleanGymBadgeSpeechHouse_MapScripts: diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index ab5973ab0..4165f1c3e 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CERULEANMART_CLERK const CERULEANMART_COOLTRAINER_M const CERULEANMART_COOLTRAINER_F diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 02c86774c..6a777da4a 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CERULEANPOKECENTER1F_NURSE const CERULEANPOKECENTER1F_SUPER_NERD const CERULEANPOKECENTER1F_GYM_GUY diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index f653716f4..a06c81ef7 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CERULEANPOLICESTATION_FISHING_GURU const CERULEANPOLICESTATION_POKEFAN_F const CERULEANPOLICESTATION_DIGLETT diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index e7f19a518..5f6cf03ed 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CERULEANTRADESPEECHHOUSE_GRANNY const CERULEANTRADESPEECHHOUSE_GRAMPS const CERULEANTRADESPEECHHOUSE_RHYDON diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 1eb7bfb1c..94b936421 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CHARCOALKILN_BLACK_BELT const CHARCOALKILN_YOUNGSTER const CHARCOALKILN_MOLTRES diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 29a437826..aadb9c98e 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CHERRYGROVECITY_GRAMPS const CHERRYGROVECITY_SILVER const CHERRYGROVECITY_TEACHER diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index b49d2de52..fdda1d4c0 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 995b3a7f7..c8ba5248e 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 777bc1db4..e05d21749 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CHERRYGROVEMART_CLERK const CHERRYGROVEMART_COOLTRAINER_M const CHERRYGROVEMART_YOUNGSTER diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 8374215b8..194b48e03 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CHERRYGROVEPOKECENTER1F_NURSE const CHERRYGROVEPOKECENTER1F_FISHER const CHERRYGROVEPOKECENTER1F_GENTLEMAN diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index af154437e..5d0d1c6fc 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CIANWOODCITY_STANDING_YOUNGSTER const CIANWOODCITY_POKEFAN_M const CIANWOODCITY_LASS diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 365c68e11..4da9613b9 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CIANWOODGYM_CHUCK const CIANWOODGYM_BLACK_BELT1 const CIANWOODGYM_BLACK_BELT2 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 88bbf8065..686802ccc 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CIANWOODLUGIASPEECHHOUSE_TEACHER const CIANWOODLUGIASPEECHHOUSE_LASS const CIANWOODLUGIASPEECHHOUSE_TWIN diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 016531227..bc7bffe0d 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CIANWOODPHARMACY_PHARMACIST CianwoodPharmacy_MapScripts: diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 3fb00c944..6abdd835c 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CIANWOODPHOTOSTUDIO_FISHING_GURU CianwoodPhotoStudio_MapScripts: diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index 2698b9089..1a561c517 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CIANWOODPOKECENTER1F_NURSE const CIANWOODPOKECENTER1F_LASS const CIANWOODPOKECENTER1F_GYM_GUY diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index e920b5c92..9f559bff3 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CINNABARISLAND_BLUE CinnabarIsland_MapScripts: diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index e4e8d42af..81610ee64 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const CINNABARPOKECENTER1F_NURSE const CINNABARPOKECENTER1F_COOLTRAINER_F const CINNABARPOKECENTER1F_FISHER diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index a8c85bf6c..ea5a0ba29 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 1550d8340..fb5cbd042 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const COPYCATSHOUSE1F_POKEFAN_M const COPYCATSHOUSE1F_POKEFAN_F const COPYCATSHOUSE1F_CLEFAIRY diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 37d654090..d385ef0d5 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const COPYCATSHOUSE2F_COPYCAT1 ; if player is male const COPYCATSHOUSE2F_DODRIO const COPYCATSHOUSE2F_FAIRYDOLL ; lost item diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 4873e7981..ec4a257bb 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const DANCETHEATRE_KIMONO_GIRL1 const DANCETHEATRE_KIMONO_GIRL2 const DANCETHEATRE_KIMONO_GIRL3 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index c9a7ac415..71b160fd9 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1 const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 3050258ff..eba31b40d 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const DARKCAVEVIOLETENTRANCE_POKE_BALL1 const DARKCAVEVIOLETENTRANCE_ROCK1 const DARKCAVEVIOLETENTRANCE_ROCK2 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 6fad13a54..ce7e04c21 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const DAYCARE_GRAMPS const DAYCARE_GRANNY diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index 6a3d59b77..40efae76e 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const DAYOFWEEKSIBLINGSHOUSE_POKEDEX DayOfWeekSiblingsHouse_MapScripts: diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 0de2befa4..6552e4d57 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const DIGLETTSCAVE_POKEFAN_M DiglettsCave_MapScripts: diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 9d87efb33..3de5e46cc 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const DRAGONSHRINE_ELDER1 const DRAGONSHRINE_ELDER2 const DRAGONSHRINE_ELDER3 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 36597835b..f9c0809fa 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const DRAGONSDENB1F_POKE_BALL1 const DRAGONSDENB1F_CLAIR const DRAGONSDENB1F_SILVER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 2d27c9c8f..b20863fd1 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const EARLSPOKEMONACADEMY_EARL const EARLSPOKEMONACADEMY_YOUNGSTER1 const EARLSPOKEMONACADEMY_GAMEBOY_KID1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 6f0960530..6ba623bab 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ECRUTEAKCITY_GRAMPS1 const ECRUTEAKCITY_GRAMPS2 const ECRUTEAKCITY_LASS1 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 4dad860bd..1c1abddda 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ECRUTEAKGYM_MORTY const ECRUTEAKGYM_SAGE1 const ECRUTEAKGYM_SAGE2 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 9836f2198..7ecf9dcb6 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M const ECRUTEAKITEMFINDERHOUSE_POKEDEX diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index caee5ddaa..47735d27a 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index be43855ab..07e680de6 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ECRUTEAKMART_CLERK const ECRUTEAKMART_SUPER_NERD const ECRUTEAKMART_GRANNY diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 022ecd13f..1afaa6ea3 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ECRUTEAKPOKECENTER1F_NURSE const ECRUTEAKPOKECENTER1F_POKEFAN_M const ECRUTEAKPOKECENTER1F_COOLTRAINER_F diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index da281bf90..184abc16b 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ECRUTEAKTINTOWERENTRANCE_SAGE1 const ECRUTEAKTINTOWERENTRANCE_SAGE2 const ECRUTEAKTINTOWERENTRANCE_SAGE3 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 2adec1838..d41cc9ea4 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ELMSHOUSE_ELMS_WIFE const ELMSHOUSE_ELMS_SON diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index bc8ce87a7..a5030a436 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ELMSLAB_ELM const ELMSLAB_ELMS_AIDE const ELMSLAB_POKE_BALL1 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 4ccc1d56f..9e20d9d41 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const FASTSHIP1F_SAILOR1 const FASTSHIP1F_SAILOR2 const FASTSHIP1F_SAILOR3 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index a3a65c63f..08d27eef3 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const FASTSHIPB1F_SAILOR1 const FASTSHIPB1F_SAILOR2 const FASTSHIPB1F_SAILOR3 diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 719c7d4b2..8d69f3e31 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index a1e19be2c..ba9a31fbe 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index a6d898ff9..15daeeae2 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const FASTSHIPCABINS_SW_SSW_NW_FISHER const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER const FASTSHIPCABINS_SW_SSW_NW_BUENA diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 6c8125dae..3ec583d79 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index b76e574b6..a576868a7 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const FUCHSIACITY_YOUNGSTER const FUCHSIACITY_POKEFAN_M const FUCHSIACITY_TEACHER diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 402f89d23..a64dd49e1 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const FUCHSIAGYM_JANINE const FUCHSIAGYM_FUCHSIA_GYM_1 const FUCHSIAGYM_FUCHSIA_GYM_2 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 0cb11eb56..98808262f 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const FUCHSIAMART_CLERK const FUCHSIAMART_FISHER const FUCHSIAMART_COOLTRAINER_F diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index c7691e111..01609dc48 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const FUCHSIAPOKECENTER1F_NURSE const FUCHSIAPOKECENTER1F_COOLTRAINER_M const FUCHSIAPOKECENTER1F_COOLTRAINER_F diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index b5506e149..980b3c940 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODBIKESHOP_CLERK GoldenrodBikeShop_MapScripts: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index f69f86dea..623107e95 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODCITY_POKEFAN_M1 const GOLDENRODCITY_YOUNGSTER1 const GOLDENRODCITY_COOLTRAINER_F1 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 50314f07a..b38f5cddd 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODDEPTSTORE1F_RECEPTIONIST const GOLDENRODDEPTSTORE1F_POKEFAN_F const GOLDENRODDEPTSTORE1F_BUG_CATCHER diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 121937ad5..6c6f99124 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODDEPTSTORE2F_CLERK1 const GOLDENRODDEPTSTORE2F_CLERK2 const GOLDENRODDEPTSTORE2F_YOUNGSTER diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 951cb7965..1bd2fecf8 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODDEPTSTORE3F_CLERK const GOLDENRODDEPTSTORE3F_SUPER_NERD const GOLDENRODDEPTSTORE3F_ROCKER diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index a671c44ce..4263957f8 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODDEPTSTORE4F_CLERK const GOLDENRODDEPTSTORE4F_COOLTRAINER_M const GOLDENRODDEPTSTORE4F_BUG_CATCHER diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 8708f52b0..31f5c0e3f 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODDEPTSTORE5F_CLERK const GOLDENRODDEPTSTORE5F_LASS const GOLDENRODDEPTSTORE5F_MIKE diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index a143bd758..4fb4b9ff9 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODDEPTSTORE6F_LASS const GOLDENRODDEPTSTORE6F_SUPER_NERD diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 1de53a034..d18a191da 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODDEPTSTOREB1F_POKE_BALL1 const GOLDENRODDEPTSTOREB1F_POKE_BALL2 const GOLDENRODDEPTSTOREB1F_POKE_BALL3 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 90b0db3bf..f991bfe9d 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODDEPTSTOREROOF_CLERK const GOLDENRODDEPTSTOREROOF_POKEFAN_F const GOLDENRODDEPTSTOREROOF_FISHER diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 9adf901c4..9e182f8d8 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODFLOWERSHOP_TEACHER const GOLDENRODFLOWERSHOP_FLORIA diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 823ea9907..d435b7e5e 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODGAMECORNER_CLERK const GOLDENRODGAMECORNER_RECEPTIONIST1 const GOLDENRODGAMECORNER_RECEPTIONIST2 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index fba07c9df..2453afa30 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODGYM_WHITNEY const GOLDENRODGYM_LASS1 const GOLDENRODGYM_LASS2 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 7dc7e4f53..2b582347b 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODHAPPINESSRATER_TEACHER const GOLDENRODHAPPINESSRATER_POKEFAN_M const GOLDENRODHAPPINESSRATER_TWIN diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 7c4af43a3..e678d71e0 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODMAGNETTRAINSTATION_OFFICER const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index f105e6826..40a5d4719 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODNAMERATER_NAME_RATER GoldenrodNameRater_MapScripts: diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 61010b316..82d0fc72e 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODPPSPEECHHOUSE_FISHER const GOLDENRODPPSPEECHHOUSE_LASS diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 162c0d04f..521cacfe3 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODPOKECENTER1F_NURSE const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST const GOLDENRODPOKECENTER1F_GAMEBOY_KID diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index 46d01a4d8..daa35641f 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODUNDERGROUND_SUPER_NERD1 const GOLDENRODUNDERGROUND_SUPER_NERD2 const GOLDENRODUNDERGROUND_SUPER_NERD3 diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index f8476e0f4..3ac711ba2 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -31,7 +31,7 @@ doorstate: MACRO changeblock UGDOOR_\1_YCOORD, UGDOOR_\1_XCOORD, UNDERGROUND_DOOR_\2 ENDM -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST1 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_PHARMACIST2 const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_ROCKET1 diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 99785528e..4227dc7cc 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET1 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET2 const GOLDENRODUNDERGROUNDWAREHOUSE_ROCKET3 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index ca307d98e..98ac32ada 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const GUIDEGENTSHOUSE_GRAMPS GuideGentsHouse_MapScripts: diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 55c856de4..314628091 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const HALLOFFAME_LANCE HallOfFame_MapScripts: diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index dd76d5597..58edccf9b 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ICEPATH1F_POKE_BALL1 const ICEPATH1F_POKE_BALL2 const ICEPATH1F_POKE_BALL3 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 9dfe2fc3d..0fa627255 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ICEPATHB1F_BOULDER1 const ICEPATHB1F_BOULDER2 const ICEPATHB1F_BOULDER3 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 86a171820..85d35d7b7 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL IcePathB2FBlackthornSide_MapScripts: diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 61f38c1d3..cecdd5452 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ICEPATHB2FMAHOGANYSIDE_BOULDER1 const ICEPATHB2FMAHOGANYSIDE_BOULDER2 const ICEPATHB2FMAHOGANYSIDE_BOULDER3 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 352db71ed..dbe60aea7 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ICEPATHB3F_POKE_BALL const ICEPATHB3F_ROCK diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 25ebe0c42..0407c97f4 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ILEXFOREST_FARFETCHD const ILEXFOREST_YOUNGSTER1 const ILEXFOREST_BLACK_BELT diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 881b58640..c0dc50d9b 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ILEXFORESTAZALEAGATE_OFFICER const ILEXFORESTAZALEAGATE_GRANNY diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 9f820c967..eb2ef3328 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const INDIGOPLATEAUPOKECENTER1F_NURSE const INDIGOPLATEAUPOKECENTER1F_CLERK const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index badcaf0b8..814e9825b 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const KARENSROOM_KAREN KarensRoom_MapScripts: diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index bf05e7623..63726fe91 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const KOGASROOM_KOGA KogasRoom_MapScripts: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index ae04c5814..ea462477b 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const KURTSHOUSE_KURT1 const KURTSHOUSE_TWIN1 const KURTSHOUSE_SLOWPOKE diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 1130ccd21..a66aa5126 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const LAKEOFRAGE_LANCE const LAKEOFRAGE_GRAMPS const LAKEOFRAGE_SUPER_NERD1 diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index d6235e606..2c9b3e645 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER LakeOfRageHiddenPowerHouse_MapScripts: diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index c08414e9c..4f41b1a4c 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU LakeOfRageMagikarpHouse_MapScripts: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 5873e601f..eae0d03c2 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const LANCESROOM_LANCE const LANCESROOM_MARY const LANCESROOM_OAK diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 4d3e18175..30e7871fd 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const LAVRADIOTOWER1F_RECEPTIONIST const LAVRADIOTOWER1F_OFFICER const LAVRADIOTOWER1F_SUPER_NERD1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 3a391a529..2f313d3a3 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const LAVENDERMART_CLERK const LAVENDERMART_POKEFAN_M const LAVENDERMART_ROCKER diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index b3ddfd158..93ab36b9a 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const LAVENDERNAMERATER_NAME_RATER LavenderNameRater_MapScripts: diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index e18e2f5b7..ec9d41ab4 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const LAVENDERPOKECENTER1F_NURSE const LAVENDERPOKECENTER1F_GENTLEMAN const LAVENDERPOKECENTER1F_TEACHER diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index 73f159b02..7891ce23d 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const LAVENDERSPEECHHOUSE_POKEFAN_F LavenderSpeechHouse_MapScripts: diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index f528e90c9..8e16f47c7 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const LAVENDERTOWN_POKEFAN_M const LAVENDERTOWN_TEACHER const LAVENDERTOWN_GRAMPS diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 1dd398448..0828bdf7a 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MAHOGANYGYM_PRYCE const MAHOGANYGYM_BUENA1 const MAHOGANYGYM_ROCKER1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 0ea9e0348..78ae42318 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MAHOGANYMART1F_PHARMACIST const MAHOGANYMART1F_BLACK_BELT const MAHOGANYMART1F_LANCE diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index affae9afc..c28a62c67 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MAHOGANYPOKECENTER1F_NURSE const MAHOGANYPOKECENTER1F_POKEFAN_M const MAHOGANYPOKECENTER1F_YOUNGSTER diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 51e895be6..2a657d60f 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 4058a85dc..eb02ba0d9 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MAHOGANYTOWN_POKEFAN_M const MAHOGANYTOWN_GRAMPS const MAHOGANYTOWN_FISHER diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 5dd992685..0bf8a2c20 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MANIASHOUSE_ROCKER ManiasHouse_MapScripts: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 528192eb0..510dc69a0 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MOUNTMOON_SILVER MountMoon_MapScripts: diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index f4bc75cca..df3a7aca6 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MOUNTMOONGIFTSHOP_GRAMPS1 ; morning only const MOUNTMOONGIFTSHOP_GRAMPS2 ; day only const MOUNTMOONGIFTSHOP_LASS1 ; morning only diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index f11f0e9ad..742c169c0 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MOUNTMOONSQUARE_FAIRY1 const MOUNTMOONSQUARE_FAIRY2 const MOUNTMOONSQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index d52255cac..5f9056e29 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MOUNTMORTAR1FINSIDE_BOULDER const MOUNTMORTAR1FINSIDE_POKE_BALL1 const MOUNTMORTAR1FINSIDE_POKE_BALL2 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 7b4f6ef4d..c261d1a3b 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index b03e6eeba..ce6811bca 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MOUNTMORTAR2FINSIDE_POKE_BALL1 const MOUNTMORTAR2FINSIDE_POKE_BALL2 const MOUNTMORTAR2FINSIDE_POKE_BALL3 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 3e0c96912..986e6e928 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MOUNTMORTARB1F_POKE_BALL1 const MOUNTMORTARB1F_POKE_BALL2 const MOUNTMORTARB1F_BOULDER diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 7761cea57..0b42fe99e 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MOVEDELETERSHOUSE_SUPER_NERD MoveDeletersHouse_MapScripts: diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 731001d7f..fc547e2d6 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MRFUJISHOUSE_SUPER_NERD const MRFUJISHOUSE_LASS const MRFUJISHOUSE_PSYDUCK diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index ab62fc3f7..5d85b2fbf 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MRPOKEMONSHOUSE_GENTLEMAN const MRPOKEMONSHOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index d7c6eb4da..610a5e846 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const MRPSYCHICSHOUSE_FISHING_GURU MrPsychicsHouse_MapScripts: diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 681ea96f8..850c2ab9d 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const NATIONALPARK_LASS1 const NATIONALPARK_POKEFAN_F1 const NATIONALPARK_TEACHER1 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 5161cf8bf..dd969f477 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const NATIONALPARKBUGCONTEST_YOUNGSTER1 const NATIONALPARKBUGCONTEST_YOUNGSTER2 const NATIONALPARKBUGCONTEST_ROCKER diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 6e59a96db..82d5364cd 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const NEWBARKTOWN_TEACHER const NEWBARKTOWN_FISHER const NEWBARKTOWN_SILVER diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index c3f714aa2..f6bae3fd2 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OAKSLAB_OAK const OAKSLAB_SCIENTIST1 const OAKSLAB_SCIENTIST2 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index e6f9e3696..79a7f0540 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINECAFE_SAILOR1 const OLIVINECAFE_FISHING_GURU const OLIVINECAFE_SAILOR2 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 635f0ab0d..a7ef4f8b6 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINECITY_SAILOR1 const OLIVINECITY_STANDING_YOUNGSTER const OLIVINECITY_SAILOR2 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 3aecc8590..65e8a773d 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINEGOODRODHOUSE_FISHING_GURU OlivineGoodRodHouse_MapScripts: diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 2bc723c31..5c024f015 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINEGYM_JASMINE const OLIVINEGYM_GYM_GUY diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 1e50ada20..085c67685 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINEHOUSEBETA_TEACHER const OLIVINEHOUSEBETA_RHYDON diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 6fa52b850..66d8d89ac 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINELIGHTHOUSE1F_SAILOR const OLIVINELIGHTHOUSE1F_POKEFAN_F diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 51a814a72..bedd5d8c9 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINELIGHTHOUSE2F_SAILOR const OLIVINELIGHTHOUSE2F_GENTLEMAN diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index cd8f54b33..63f02d6e2 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINELIGHTHOUSE3F_SAILOR const OLIVINELIGHTHOUSE3F_GENTLEMAN const OLIVINELIGHTHOUSE3F_YOUNGSTER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 8bcd055b5..51b764d35 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINELIGHTHOUSE4F_SAILOR const OLIVINELIGHTHOUSE4F_LASS diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 7b1df8982..a5219ff17 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINELIGHTHOUSE5F_SAILOR const OLIVINELIGHTHOUSE5F_YOUNGSTER const OLIVINELIGHTHOUSE5F_POKE_BALL1 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index a8f600b99..110b25353 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINELIGHTHOUSE6F_JASMINE const OLIVINELIGHTHOUSE6F_MONSTER const OLIVINELIGHTHOUSE6F_POKE_BALL diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 78bcb1aee..1356455a1 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINEMART_CLERK const OLIVINEMART_COOLTRAINER_F const OLIVINEMART_LASS diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index b9fa1cc44..4e970a2bf 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINEPOKECENTER1F_NURSE const OLIVINEPOKECENTER1F_FISHING_GURU const OLIVINEPOKECENTER1F_FISHER diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index caccd4241..399cd2f69 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINEPORT_SAILOR1 const OLIVINEPORT_SAILOR2 const OLIVINEPORT_SAILOR3 diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 63298a665..4e68743a9 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINEPORTPASSAGE_POKEFAN_M OlivinePortPassage_MapScripts: diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index d11c76af1..a6a436674 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M const OLIVINEPUNISHMENTSPEECHHOUSE_LASS diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 9c59d5cda..83ce60ddc 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScripts: diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 94b383489..65cca5e3b 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const PALLETTOWN_TEACHER const PALLETTOWN_FISHER diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 996c5b935..5be0c8087 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const PEWTERCITY_COOLTRAINER_F const PEWTERCITY_BUG_CATCHER const PEWTERCITY_GRAMPS diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 546736b6e..211d7ac3b 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const PEWTERGYM_BROCK const PEWTERGYM_YOUNGSTER const PEWTERGYM_GYM_GUY diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index a747a1918..be0b3413f 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const PEWTERMART_CLERK const PEWTERMART_YOUNGSTER const PEWTERMART_SUPER_NERD diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 4e7f83863..4202f9766 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index e81178f07..83a065116 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const PEWTERPOKECENTER1F_NURSE const PEWTERPOKECENTER1F_TEACHER const PEWTERPOKECENTER1F_JIGGLYPUFF diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 56b317e98..d7feb63ad 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const PEWTERSNOOZESPEECHHOUSE_GRAMPS PewterSnoozeSpeechHouse_MapScripts: diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 2850ee979..34e53f347 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const PLAYERSHOUSE1F_MOM1 const PLAYERSHOUSE1F_MOM2 const PLAYERSHOUSE1F_MOM3 diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 3709184bf..d3748359c 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const PLAYERSHOUSE2F_CONSOLE const PLAYERSHOUSE2F_DOLL_1 const PLAYERSHOUSE2F_DOLL_2 diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index 377062191..e5afd0949 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const PLAYERSNEIGHBORSHOUSE_COOLTRAINER_F const PLAYERSNEIGHBORSHOUSE_POKEFAN_F diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index ae709ef8a..6d0cadefe 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const POKESEERSHOUSE_GRANNY PokeSeersHouse_MapScripts: diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index cd890bc94..8b7eafc61 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const POKECENTER2F_TRADE_RECEPTIONIST const POKECENTER2F_BATTLE_RECEPTIONIST const POKECENTER2F_TIME_CAPSULE_RECEPTIONIST diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm index f201f90d6..48428ec33 100644 --- a/maps/PokecomCenterAdminRoomMobile.asm +++ b/maps/PokecomCenterAdminRoomMobile.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1 const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2 const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index e39103888..bba5fff95 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const POKEMONFANCLUB_GENTLEMAN const POKEMONFANCLUB_RECEPTIONIST const POKEMONFANCLUB_FISHER diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index ea01312ec..c5305e61f 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const POWERPLANT_OFFICER1 const POWERPLANT_GYM_GUY1 const POWERPLANT_GYM_GUY2 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index c19fbcbd2..655d77a91 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RADIOTOWER1F_RECEPTIONIST const RADIOTOWER1F_LASS const RADIOTOWER1F_YOUNGSTER diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 12360c4c2..049c2c596 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RADIOTOWER2F_SUPER_NERD const RADIOTOWER2F_TEACHER const RADIOTOWER2F_ROCKET1 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 666b2eba0..737d19cce 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RADIOTOWER3F_SUPER_NERD const RADIOTOWER3F_GYM_GUY const RADIOTOWER3F_COOLTRAINER_F diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 0ef1fc1a4..8b9adc7d0 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RADIOTOWER4F_FISHER const RADIOTOWER4F_TEACHER const RADIOTOWER4F_GROWLITHE diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index ae3e22b88..9cf31369e 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RADIOTOWER5F_DIRECTOR const RADIOTOWER5F_ROCKET const RADIOTOWER5F_ROCKET_GIRL diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 6e0e33ba6..eb23329db 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const REDSHOUSE1F_REDS_MOM RedsHouse1F_MapScripts: diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 85c5233b2..8577d592e 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROCKTUNNEL1F_POKE_BALL1 const ROCKTUNNEL1F_POKE_BALL2 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 48f7ecb0b..df9c0db34 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROCKTUNNELB1F_POKE_BALL1 const ROCKTUNNELB1F_POKE_BALL2 const ROCKTUNNELB1F_POKE_BALL3 diff --git a/maps/Route1.asm b/maps/Route1.asm index de43075b5..d3d48d91e 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE1_YOUNGSTER const ROUTE1_COOLTRAINER_F const ROUTE1_FRUIT_TREE diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index ebddd0133..7b409c8c9 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE10POKECENTER1F_NURSE const ROUTE10POKECENTER1F_GENTLEMAN const ROUTE10POKECENTER1F_GYM_GUY diff --git a/maps/Route10South.asm b/maps/Route10South.asm index fa8dcbe8a..655722c21 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE10SOUTH_POKEFAN_M1 const ROUTE10SOUTH_POKEFAN_M2 diff --git a/maps/Route11.asm b/maps/Route11.asm index d1bd97060..9cb88e091 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE11_YOUNGSTER1 const ROUTE11_YOUNGSTER2 const ROUTE11_YOUNGSTER3 diff --git a/maps/Route12.asm b/maps/Route12.asm index 73d2a9b73..5dc4a81f8 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE12_FISHER1 const ROUTE12_FISHER2 const ROUTE12_FISHER3 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index ea4bcd2d7..6856f2ab4 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE12SUPERRODHOUSE_FISHING_GURU Route12SuperRodHouse_MapScripts: diff --git a/maps/Route13.asm b/maps/Route13.asm index a61770be8..3f466b04e 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE13_YOUNGSTER1 const ROUTE13_YOUNGSTER2 const ROUTE13_POKEFAN_M1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 0db21d474..ab862d46a 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE14_POKEFAN_M1 const ROUTE14_YOUNGSTER const ROUTE14_POKEFAN_M2 diff --git a/maps/Route15.asm b/maps/Route15.asm index 437eb3925..0f0725262 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE15_YOUNGSTER1 const ROUTE15_YOUNGSTER2 const ROUTE15_YOUNGSTER3 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index c9d237a00..c1ce3787e 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE15FUCHSIAGATE_OFFICER Route15FuchsiaGate_MapScripts: diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index b65c1037b..aa2d700c9 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD Route16FuchsiaSpeechHouse_MapScripts: diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 57b298f08..d2df553f0 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE16GATE_OFFICER Route16Gate_MapScripts: diff --git a/maps/Route17.asm b/maps/Route17.asm index 410d7bbd0..4035e1a13 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE17_BIKER1 const ROUTE17_BIKER2 const ROUTE17_BIKER3 diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index bed797ff7..c448d333d 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE17ROUTE18GATE_OFFICER Route17Route18Gate_MapScripts: diff --git a/maps/Route18.asm b/maps/Route18.asm index 70ff5368a..a30ab3332 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE18_YOUNGSTER1 const ROUTE18_YOUNGSTER2 diff --git a/maps/Route19.asm b/maps/Route19.asm index 13e111726..a0b947c7c 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE19_SWIMMER_GIRL const ROUTE19_SWIMMER_GUY1 const ROUTE19_SWIMMER_GUY2 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 3673b2908..04afecfdc 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE19FUCHSIAGATE_OFFICER Route19FuchsiaGate_MapScripts: diff --git a/maps/Route2.asm b/maps/Route2.asm index 8c8a2b95f..c42ce8d86 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE2_BUG_CATCHER1 const ROUTE2_BUG_CATCHER2 const ROUTE2_BUG_CATCHER3 diff --git a/maps/Route20.asm b/maps/Route20.asm index 91145b8ea..c5aa82140 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE20_SWIMMER_GIRL1 const ROUTE20_SWIMMER_GIRL2 const ROUTE20_SWIMMER_GUY diff --git a/maps/Route21.asm b/maps/Route21.asm index a2bfc3348..54612a7ef 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE21_SWIMMER_GIRL const ROUTE21_SWIMMER_GUY const ROUTE21_FISHER diff --git a/maps/Route24.asm b/maps/Route24.asm index c1e701d01..173be8f99 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE24_ROCKET Route24_MapScripts: diff --git a/maps/Route25.asm b/maps/Route25.asm index e4c7efda5..a67718922 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE25_MISTY const ROUTE25_COOLTRAINER_M1 const ROUTE25_YOUNGSTER1 diff --git a/maps/Route26.asm b/maps/Route26.asm index 08037328a..971729d94 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE26_COOLTRAINER_M1 const ROUTE26_COOLTRAINER_M2 const ROUTE26_COOLTRAINER_F1 diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index 7d92969e6..76c5b670b 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE26HEALHOUSE_TEACHER Route26HealHouse_MapScripts: diff --git a/maps/Route27.asm b/maps/Route27.asm index 8d7d81d9e..bc39ed3cf 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE27_COOLTRAINER_M1 const ROUTE27_COOLTRAINER_M2 const ROUTE27_COOLTRAINER_F1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 71acec3de..34afb530f 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE27SANDSTORMHOUSE_GRANNY Route27SandstormHouse_MapScripts: diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index 88ff3d0d4..df418b8f7 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE28STEELWINGHOUSE_CELEBRITY const ROUTE28STEELWINGHOUSE_FEAROW diff --git a/maps/Route29.asm b/maps/Route29.asm index 3b07029f7..39fc0c960 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE29_COOLTRAINER_M1 const ROUTE29_YOUNGSTER const ROUTE29_TEACHER1 diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index 41955f82c..9259074f3 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE29ROUTE46GATE_OFFICER const ROUTE29ROUTE46GATE_YOUNGSTER diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 6556ab8b7..9b90d34e4 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE2GATE_SCIENTIST Route2Gate_MapScripts: diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index 5ad1dac2e..cacd90080 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE2NUGGETHOUSE_FISHER Route2NuggetHouse_MapScripts: diff --git a/maps/Route3.asm b/maps/Route3.asm index 72a8848c8..6821bea8e 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE3_FISHER1 const ROUTE3_YOUNGSTER1 const ROUTE3_YOUNGSTER2 diff --git a/maps/Route30.asm b/maps/Route30.asm index e26c6fe26..9cf36ad60 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE30_YOUNGSTER1 const ROUTE30_YOUNGSTER2 const ROUTE30_YOUNGSTER3 diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index e1c17a11a..e8403352d 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE30BERRYHOUSE_POKEFAN_M Route30BerryHouse_MapScripts: diff --git a/maps/Route31.asm b/maps/Route31.asm index e47a2a7f1..3215a83bd 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE31_FISHER const ROUTE31_YOUNGSTER const ROUTE31_BUG_CATCHER diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 72783eb79..2d07a5ef3 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE31VIOLETGATE_OFFICER const ROUTE31VIOLETGATE_COOLTRAINER_F diff --git a/maps/Route32.asm b/maps/Route32.asm index e445cedfb..6a93d73e3 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE32_FISHER1 const ROUTE32_FISHER2 const ROUTE32_FISHER3 diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index fef720d3b..0dbc204b8 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE32POKECENTER1F_NURSE const ROUTE32POKECENTER1F_FISHING_GURU const ROUTE32POKECENTER1F_COOLTRAINER_F diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index bada251da..ebcdb8e83 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE32RUINSOFALPHGATE_OFFICER const ROUTE32RUINSOFALPHGATE_POKEFAN_M const ROUTE32RUINSOFALPHGATE_YOUNGSTER diff --git a/maps/Route33.asm b/maps/Route33.asm index 71608ce8f..4aa3fd6f4 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE33_POKEFAN_M const ROUTE33_LASS const ROUTE33_FRUIT_TREE diff --git a/maps/Route34.asm b/maps/Route34.asm index dcd079d73..e20b348b9 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE34_YOUNGSTER1 const ROUTE34_YOUNGSTER2 const ROUTE34_YOUNGSTER3 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index e689a5cd1..85b0ec3b2 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE34ILEXFORESTGATE_TEACHER1 const ROUTE34ILEXFORESTGATE_BUTTERFREE const ROUTE34ILEXFORESTGATE_LASS diff --git a/maps/Route35.asm b/maps/Route35.asm index 1d40dd1e6..52ebe785d 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE35_YOUNGSTER1 const ROUTE35_YOUNGSTER2 const ROUTE35_LASS1 diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 7f52d0d36..3aeae2ff2 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE35GOLDENRODGATE_OFFICER const ROUTE35GOLDENRODGATE_POKEFAN_F const ROUTE35GOLDENRODGATE_FISHER diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index afec3d1bc..15d5eb5dc 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE35NATIONALPARKGATE_OFFICER1 const ROUTE35NATIONALPARKGATE_YOUNGSTER const ROUTE35NATIONALPARKGATE_OFFICER2 diff --git a/maps/Route36.asm b/maps/Route36.asm index 6483f865f..e383cfa6b 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE36_YOUNGSTER1 const ROUTE36_YOUNGSTER2 const ROUTE36_WEIRD_TREE diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 014d4b499..6668b2457 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE36NATIONALPARKGATE_OFFICER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER1 const ROUTE36NATIONALPARKGATE_YOUNGSTER2 diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index 87a357167..077b9debe 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE36RUINSOFALPHGATE_OFFICER const ROUTE36RUINSOFALPHGATE_GRAMPS diff --git a/maps/Route37.asm b/maps/Route37.asm index 7e7d14753..7b0cdbe74 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE37_WEIRD_TREE1 const ROUTE37_WEIRD_TREE2 const ROUTE37_YOUNGSTER diff --git a/maps/Route38.asm b/maps/Route38.asm index b604bcede..32b9a6feb 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE38_STANDING_YOUNGSTER1 const ROUTE38_LASS const ROUTE38_STANDING_YOUNGSTER2 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 6dcd59c73..f97705b22 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE38ECRUTEAKGATE_OFFICER Route38EcruteakGate_MapScripts: diff --git a/maps/Route39.asm b/maps/Route39.asm index 24d536aae..426eb6449 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE39_SAILOR const ROUTE39_POKEFAN_M const ROUTE39_POKEFAN_F1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 2b6e949fb..68187ecd5 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE39BARN_TWIN1 const ROUTE39BARN_TWIN2 const ROUTE39BARN_MOOMOO diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 18cebb4e1..caf17f96b 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE39FARMHOUSE_POKEFAN_M const ROUTE39FARMHOUSE_POKEFAN_F diff --git a/maps/Route4.asm b/maps/Route4.asm index c7fac12eb..371bca62b 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE4_YOUNGSTER const ROUTE4_LASS1 const ROUTE4_LASS2 diff --git a/maps/Route40.asm b/maps/Route40.asm index ea55d433a..1a3cde94a 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE40_OLIVINE_RIVAL1 const ROUTE40_OLIVINE_RIVAL2 const ROUTE40_SWIMMER_GIRL1 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 5e09612cf..be048fa04 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE40BATTLETOWERGATE_ROCKER const ROUTE40BATTLETOWERGATE_TWIN diff --git a/maps/Route41.asm b/maps/Route41.asm index c3eb56ca4..b061f469d 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE41_OLIVINE_RIVAL1 const ROUTE41_OLIVINE_RIVAL2 const ROUTE41_OLIVINE_RIVAL3 diff --git a/maps/Route42.asm b/maps/Route42.asm index 44121b503..91590df01 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE42_FISHER const ROUTE42_POKEFAN_M const ROUTE42_SUPER_NERD diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 1c5a13e38..4b0196f29 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE42ECRUTEAKGATE_OFFICER Route42EcruteakGate_MapScripts: diff --git a/maps/Route43.asm b/maps/Route43.asm index 90919060a..1860caa49 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE43_SUPER_NERD1 const ROUTE43_SUPER_NERD2 const ROUTE43_SUPER_NERD3 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 08d109c12..81935c025 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,6 +1,6 @@ ROUTE43GATE_TOLL EQU 1000 -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE43GATE_OFFICER const ROUTE43GATE_ROCKET1 const ROUTE43GATE_ROCKET2 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index d69265e6c..c2641abcd 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE43MAHOGANYGATE_OFFICER Route43MahoganyGate_MapScripts: diff --git a/maps/Route44.asm b/maps/Route44.asm index 978f8e976..5cb2f9e9e 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE44_FISHER1 const ROUTE44_FISHER2 const ROUTE44_YOUNGSTER1 diff --git a/maps/Route45.asm b/maps/Route45.asm index 47aa5649c..721e3cb4c 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE45_POKEFAN_M1 const ROUTE45_POKEFAN_M2 const ROUTE45_POKEFAN_M3 diff --git a/maps/Route46.asm b/maps/Route46.asm index 33a8d46ef..86b7b7396 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE46_POKEFAN_M const ROUTE46_YOUNGSTER const ROUTE46_LASS diff --git a/maps/Route5.asm b/maps/Route5.asm index d6d557e67..f1d7f0ef4 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE5_POKEFAN_M Route5_MapScripts: diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index d8fe0714f..2e268d68d 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE5CLEANSETAGHOUSE_GRANNY const ROUTE5CLEANSETAGHOUSE_TEACHER diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index 096e2d041..8ab29c1e5 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE5SAFFRONGATE_OFFICER Route5SaffronGate_MapScripts: diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index 774035bd1..5ffbee7d0 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER Route5UndergroundPathEntrance_MapScripts: diff --git a/maps/Route6.asm b/maps/Route6.asm index 56f1a7e73..5a42ddc0c 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE6_POKEFAN_M1 const ROUTE6_POKEFAN_M2 const ROUTE6_POKEFAN_M3 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index ab4a6c481..fb278c277 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE6SAFFRONGATE_OFFICER Route6SaffronGate_MapScripts: diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index c9144a255..566b58123 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE7SAFFRONGATE_OFFICER Route7SaffronGate_MapScripts: diff --git a/maps/Route8.asm b/maps/Route8.asm index ba46ea877..a70558e44 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE8_BIKER1 const ROUTE8_BIKER2 const ROUTE8_BIKER3 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 58fba365e..51c9d8958 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE8SAFFRONGATE_OFFICER Route8SaffronGate_MapScripts: diff --git a/maps/Route9.asm b/maps/Route9.asm index 55b3e50df..984f08413 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const ROUTE9_YOUNGSTER1 const ROUTE9_LASS1 const ROUTE9_YOUNGSTER2 diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 5f6ba0bf6..732ac2a16 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2 const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 2acc16dbe..4536e09b6 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RUINSOFALPHHOOHITEMROOM_POKE_BALL1 const RUINSOFALPHHOOHITEMROOM_POKE_BALL2 const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index e51489af2..445cb36b9 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RUINSOFALPHINNERCHAMBER_FISHER const RUINSOFALPHINNERCHAMBER_TEACHER const RUINSOFALPHINNERCHAMBER_GRAMPS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index ac003b6f9..26743a3df 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST const RUINSOFALPHKABUTOCHAMBER_SCIENTIST diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index 450bb5de5..5239b562e 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2 const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 73edc01d8..a9a0acde5 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2 const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index ac4cdc282..c6197632a 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RUINSOFALPHOUTSIDE_YOUNGSTER1 const RUINSOFALPHOUTSIDE_SCIENTIST const RUINSOFALPHOUTSIDE_FISHER diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 427ca14da..f5b1e1564 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const RUINSOFALPHRESEARCHCENTER_SCIENTIST1 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index e5d0d6557..c0c75f227 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScripts: diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 2ca9e6021..06c7119d7 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SAFFRONCITY_LASS1 const SAFFRONCITY_POKEFAN_M const SAFFRONCITY_COOLTRAINER_M diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 7911d9d56..f6926ddc0 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SAFFRONGYM_SABRINA const SAFFRONGYM_GRANNY1 const SAFFRONGYM_YOUNGSTER1 diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index b0f3faf7b..205bad774 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SAFFRONMAGNETTRAINSTATION_OFFICER const SAFFRONMAGNETTRAINSTATION_GYM_GUY const SAFFRONMAGNETTRAINSTATION_TEACHER diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 8d3e89e3e..2d9708c49 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SAFFRONMART_CLERK const SAFFRONMART_COOLTRAINER_M const SAFFRONMART_COOLTRAINER_F diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index 3399e4f95..9680de72f 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SAFFRONPOKECENTER1F_NURSE const SAFFRONPOKECENTER1F_TEACHER const SAFFRONPOKECENTER1F_FISHER diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 651a6b540..2870ea52a 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SEAFOAMGYM_BLAINE const SEAFOAMGYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 1aa66b2da..a14659571 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SILPHCO1F_RECEPTIONIST const SILPHCO1F_OFFICER diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 7ef61fba9..3aa1b2ab5 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SILVERCAVEITEMROOMS_POKE_BALL1 const SILVERCAVEITEMROOMS_POKE_BALL2 diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index 234585be3..326e5bde2 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SILVERCAVEPOKECENTER1F_NURSE const SILVERCAVEPOKECENTER1F_GRANNY diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 1df3d2603..b6dad455c 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SILVERCAVEROOM1_POKE_BALL1 const SILVERCAVEROOM1_POKE_BALL2 const SILVERCAVEROOM1_POKE_BALL3 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 6c721e6f7..774e105bc 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SILVERCAVEROOM2_POKE_BALL1 const SILVERCAVEROOM2_POKE_BALL2 const SILVERCAVEROOM2_POKE_BALL3 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 3fece56d7..4c4e5ef02 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SILVERCAVEROOM3_RED SilverCaveRoom3_MapScripts: diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 9cbeca82c..518c20e4b 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SLOWPOKEWELLB1F_ROCKET1 const SLOWPOKEWELLB1F_ROCKET2 const SLOWPOKEWELLB1F_ROCKET3 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index de70031b2..195ab560c 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SLOWPOKEWELLB2F_GYM_GUY const SLOWPOKEWELLB2F_POKE_BALL diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 6b741e62a..d8bd3951e 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SOULHOUSE_MRFUJI const SOULHOUSE_TEACHER const SOULHOUSE_LASS diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 71278bcaf..d3d8ff323 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SPROUTTOWER1F_SAGE1 const SPROUTTOWER1F_SAGE2 const SPROUTTOWER1F_GRANNY diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 84983e833..73cc7bd48 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SPROUTTOWER2F_SAGE1 const SPROUTTOWER2F_SAGE2 const SPROUTTOWER2F_POKE_BALL diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 012cf74fe..74d614246 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const SPROUTTOWER3F_SAGE1 const SPROUTTOWER3F_SAGE2 const SPROUTTOWER3F_SAGE3 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 098ac842a..b18d55ce8 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TEAMROCKETBASEB1F_ROCKET1 const TEAMROCKETBASEB1F_ROCKET2 const TEAMROCKETBASEB1F_SCIENTIST diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0b9647164..250a11fb8 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TEAMROCKETBASEB2F_ROCKET1 const TEAMROCKETBASEB2F_ROCKET_GIRL const TEAMROCKETBASEB2F_LANCE diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 88665bc08..dd491e6f4 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TEAMROCKETBASEB3F_LANCE const TEAMROCKETBASEB3F_ROCKET1 const TEAMROCKETBASEB3F_MOLTRES diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 32e216aaa..a0c59f6b3 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TIMECAPSULE_CHRIS1 const TIMECAPSULE_CHRIS2 diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index d80ec69c8..b9ab9a0f3 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TINTOWER1F_SUICUNE const TINTOWER1F_RAIKOU const TINTOWER1F_ENTEI diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index fcd70791e..ce81f87c0 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TINTOWER3F_POKE_BALL TinTower3F_MapScripts: diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 9397ff802..6d7a69860 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TINTOWER4F_POKE_BALL1 const TINTOWER4F_POKE_BALL2 const TINTOWER4F_POKE_BALL3 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 2d1521590..0e199be0b 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TINTOWER5F_POKE_BALL TinTower5F_MapScripts: diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index b35b5403d..ac4e7adb6 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TINTOWER6F_POKE_BALL TinTower6F_MapScripts: diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 557a3609f..323ee7cdd 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TINTOWER7F_POKE_BALL TinTower7F_MapScripts: diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index d8c2e97cb..af18d7615 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TINTOWER8F_POKE_BALL1 const TINTOWER8F_POKE_BALL2 const TINTOWER8F_POKE_BALL3 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index fc768a378..070ced50d 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TINTOWER9F_POKE_BALL TinTower9F_MapScripts: diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index f96faf98c..d997c0f03 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TINTOWERROOF_HO_OH TinTowerRoof_MapScripts: diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index bade89d75..6e25876e5 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TOHJOFALLS_POKE_BALL TohjoFalls_MapScripts: diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 915edcb12..0d911108a 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TRADECENTER_CHRIS1 const TRADECENTER_CHRIS2 diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 4334fa9ab..666b795c4 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TRAINERHOUSE1F_RECEPTIONIST const TRAINERHOUSE1F_COOLTRAINER_M const TRAINERHOUSE1F_COOLTRAINER_F diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index c8ed1bbbb..7c6a1262d 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const TRAINERHOUSEB1F_RECEPTIONIST const TRAINERHOUSEB1F_CHRIS diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 149e70ce0..84189c9d3 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const UNIONCAVE1F_POKEFAN_M1 const UNIONCAVE1F_SUPER_NERD const UNIONCAVE1F_POKEFAN_M2 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 2d729d299..6a9d7da72 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const UNIONCAVEB1F_POKEFAN_M1 const UNIONCAVEB1F_POKEFAN_M2 const UNIONCAVEB1F_SUPER_NERD1 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index af63ea9b9..0e9be1712 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const UNIONCAVEB2F_ROCKER const UNIONCAVEB2F_COOLTRAINER_F1 const UNIONCAVEB2F_COOLTRAINER_F2 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index a0882fdd5..55feb54b5 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VERMILIONCITY_TEACHER const VERMILIONCITY_GRAMPS const VERMILIONCITY_MACHOP diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm index 4f5d80a2f..a7c9c9979 100644 --- a/maps/VermilionDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN VermilionDiglettsCaveSpeechHouse_MapScripts: diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index 9f3cfeefd..84fc0dc04 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU VermilionFishingSpeechHouse_MapScripts: diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index e04195f4d..9da49e767 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VERMILIONGYM_SURGE const VERMILIONGYM_GENTLEMAN const VERMILIONGYM_ROCKER diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index d5027f2cc..b88489650 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index c8a3a8cec..8c7fd611b 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VERMILIONMART_CLERK const VERMILIONMART_SUPER_NERD const VERMILIONMART_BUENA diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index 67eefe48f..7330b6f31 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VERMILIONPOKECENTER1F_NURSE const VERMILIONPOKECENTER1F_FISHING_GURU const VERMILIONPOKECENTER1F_SAILOR diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 577e20bac..eed1716a2 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VERMILIONPORT_SAILOR1 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index d6255b560..e7afefffe 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VERMILIONPORTPASSAGE_TEACHER VermilionPortPassage_MapScripts: diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 7b4b062ab..480a79b9f 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VICTORYROAD_SILVER const VICTORYROAD_POKE_BALL1 const VICTORYROAD_POKE_BALL2 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index a798da797..4fdbfe5eb 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VICTORYROADGATE_OFFICER const VICTORYROADGATE_BLACK_BELT1 const VICTORYROADGATE_BLACK_BELT2 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 616866de7..bcbdcb870 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIOLETCITY_EARL const VIOLETCITY_LASS const VIOLETCITY_SUPER_NERD diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index d3779ddf2..c803d7ef1 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIOLETGYM_FALKNER const VIOLETGYM_YOUNGSTER1 const VIOLETGYM_YOUNGSTER2 diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index a30522f6f..288b8cbb2 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIOLETKYLESHOUSE_POKEFAN_M const VIOLETKYLESHOUSE_KYLE diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 062bf664d..fd520e94b 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIOLETMART_CLERK const VIOLETMART_GRANNY const VIOLETMART_COOLTRAINER_M diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 85ec155fb..0706369d7 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIOLETNICKNAMESPEECHHOUSE_TEACHER const VIOLETNICKNAMESPEECHHOUSE_LASS const VIOLETNICKNAMESPEECHHOUSE_BIRD diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index 324dfc8c0..d7f6756fa 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIOLETPOKECENTER1F_NURSE const VIOLETPOKECENTER1F_GAMEBOY_KID const VIOLETPOKECENTER1F_GENTLEMAN diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 544072054..92dabcf8b 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIRIDIANCITY_GRAMPS1 const VIRIDIANCITY_GRAMPS2 const VIRIDIANCITY_FISHER diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 5d3e34335..3079b852e 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIRIDIANGYM_BLUE const VIRIDIANGYM_GYM_GUY diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 9b3f6af3a..7f41f5c73 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIRIDIANMART_CLERK const VIRIDIANMART_LASS const VIRIDIANMART_COOLTRAINER_M diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 73001124a..7c186e22d 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M const VIRIDIANNICKNAMESPEECHHOUSE_LASS const VIRIDIANNICKNAMESPEECHHOUSE_SPEARY diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index aa5df856e..8fc0749d8 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const VIRIDIANPOKECENTER1F_NURSE const VIRIDIANPOKECENTER1F_COOLTRAINER_M const VIRIDIANPOKECENTER1F_COOLTRAINER_F diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index aeacbdf1f..f5d19b391 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const WHIRLISLANDB1F_POKE_BALL1 const WHIRLISLANDB1F_POKE_BALL2 const WHIRLISLANDB1F_POKE_BALL3 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 413a6256e..6a8754b6c 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const WHIRLISLANDB2F_POKE_BALL1 const WHIRLISLANDB2F_POKE_BALL2 const WHIRLISLANDB2F_POKE_BALL3 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index ab06aef0f..cc3138331 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const WHIRLISLANDLUGIACHAMBER_LUGIA WhirlIslandLugiaChamber_MapScripts: diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index c92e798d5..d1a41c13b 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const WHIRLISLANDNE_POKE_BALL WhirlIslandNE_MapScripts: diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 084a63b5f..c2e1d8295 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const WHIRLISLANDSW_POKE_BALL WhirlIslandSW_MapScripts: diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 8f0e73aa3..17c6fd7ee 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const WILLSROOM_WILL WillsRoom_MapScripts: diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 2fb21c5d9..79694c5da 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,4 +1,4 @@ -const_value set 2 ; object constants + const_def 2 ; object constants const WISETRIOSROOM_SAGE1 const WISETRIOSROOM_SAGE2 const WISETRIOSROOM_SAGE3