diff --git a/Makefile b/Makefile index 89d7af7a7..7a78be8ba 100644 --- a/Makefile +++ b/Makefile @@ -235,8 +235,6 @@ gfx/unknown/unknown_egg.2bpp: rgbgfx += -h $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -d1 -o $@ $@) -%.tilemap: %.png - $(RGBGFX) -t $@ $< %.gbcpal: %.png $(RGBGFX) -p $@ $< %.dimensions: %.png diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 71b8de8be..5a4048550 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -1,7 +1,7 @@ BATTLETOWER_PARTY_LENGTH EQU 3 BATTLETOWER_STREAK_LENGTH EQU 7 -BATTLETOWER_NUM_UNIQUE_PKMN EQU 21 +BATTLETOWER_NUM_UNIQUE_MON EQU 21 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 BATTLETOWER_TRAINERDATALENGTH EQU $24 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 204b2cf20..0b8037633 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -3,14 +3,14 @@ const_value = const_value + 1 enum_start 1 ENDM -mapconst: MACRO +map_const: MACRO ;\1: map id ;\2: height: in blocks ;\3: width: in blocks GROUP_\1 EQU const_value enum MAP_\1 -\1_HEIGHT EQU \2 -\1_WIDTH EQU \3 +\1_WIDTH EQU \2 +\1_HEIGHT EQU \3 ENDM ; map group ids @@ -19,471 +19,471 @@ ENDM ; - MapGroupRoofs (see data/maps/roofs.asm) ; - OutdoorSprites (see data/maps/outdoor_sprites.asm) ; - RoofPals (see gfx/tilesets/roofs.pal) -; `mapconst` indexes are for the sub-tables of MapGroupPointers (see data/maps/definitions.asm) +; `map_const` indexes are for the sub-tables of MapGroupPointers (see data/maps/definitions.asm) const_def - newgroup ; 1 + newgroup ; 1 - mapconst OLIVINE_POKECENTER_1F, 4, 5 ; 1 - mapconst OLIVINE_GYM, 8, 5 ; 2 - mapconst OLIVINE_TIMS_HOUSE, 4, 4 ; 3 - mapconst OLIVINE_HOUSE_BETA, 4, 4 ; 4 - mapconst OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 ; 5 - mapconst OLIVINE_GOOD_ROD_HOUSE, 4, 4 ; 6 - mapconst OLIVINE_CAFE, 4, 4 ; 7 - mapconst OLIVINE_MART, 4, 6 ; 8 - mapconst ROUTE_38_ECRUTEAK_GATE, 4, 5 ; 9 - mapconst ROUTE_39_BARN, 4, 4 ; 10 - mapconst ROUTE_39_FARMHOUSE, 4, 4 ; 11 - mapconst ROUTE_38, 9, 20 ; 12 - mapconst ROUTE_39, 18, 10 ; 13 - mapconst OLIVINE_CITY, 18, 20 ; 14 + map_const OLIVINE_POKECENTER_1F, 5, 4 ; 1 + map_const OLIVINE_GYM, 5, 8 ; 2 + map_const OLIVINE_TIMS_HOUSE, 4, 4 ; 3 + map_const OLIVINE_HOUSE_BETA, 4, 4 ; 4 + map_const OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 ; 5 + map_const OLIVINE_GOOD_ROD_HOUSE, 4, 4 ; 6 + map_const OLIVINE_CAFE, 4, 4 ; 7 + map_const OLIVINE_MART, 6, 4 ; 8 + map_const ROUTE_38_ECRUTEAK_GATE, 5, 4 ; 9 + map_const ROUTE_39_BARN, 4, 4 ; 10 + map_const ROUTE_39_FARMHOUSE, 4, 4 ; 11 + map_const ROUTE_38, 20, 9 ; 12 + map_const ROUTE_39, 10, 18 ; 13 + map_const OLIVINE_CITY, 20, 18 ; 14 - newgroup ; 2 + newgroup ; 2 - mapconst MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 4, 4 ; 1 - mapconst MAHOGANY_GYM, 9, 5 ; 2 - mapconst MAHOGANY_POKECENTER_1F, 4, 5 ; 3 - mapconst ROUTE_42_ECRUTEAK_GATE, 4, 5 ; 4 - mapconst ROUTE_42, 9, 30 ; 5 - mapconst ROUTE_44, 9, 30 ; 6 - mapconst MAHOGANY_TOWN, 9, 10 ; 7 + map_const MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 4, 4 ; 1 + map_const MAHOGANY_GYM, 5, 9 ; 2 + map_const MAHOGANY_POKECENTER_1F, 5, 4 ; 3 + map_const ROUTE_42_ECRUTEAK_GATE, 5, 4 ; 4 + map_const ROUTE_42, 30, 9 ; 5 + map_const ROUTE_44, 30, 9 ; 6 + map_const MAHOGANY_TOWN, 10, 9 ; 7 - newgroup ; 3 + newgroup ; 3 - mapconst SPROUT_TOWER_1F, 8, 10 ; 1 - mapconst SPROUT_TOWER_2F, 8, 10 ; 2 - mapconst SPROUT_TOWER_3F, 8, 10 ; 3 - mapconst TIN_TOWER_1F, 9, 10 ; 4 - mapconst TIN_TOWER_2F, 9, 10 ; 5 - mapconst TIN_TOWER_3F, 9, 10 ; 6 - mapconst TIN_TOWER_4F, 9, 10 ; 7 - mapconst TIN_TOWER_5F, 9, 10 ; 8 - mapconst TIN_TOWER_6F, 9, 10 ; 9 - mapconst TIN_TOWER_7F, 9, 10 ; 10 - mapconst TIN_TOWER_8F, 9, 10 ; 11 - mapconst TIN_TOWER_9F, 9, 10 ; 12 - mapconst BURNED_TOWER_1F, 9, 10 ; 13 - mapconst BURNED_TOWER_B1F, 9, 10 ; 14 - mapconst NATIONAL_PARK, 27, 20 ; 15 - mapconst NATIONAL_PARK_BUG_CONTEST, 27, 20 ; 16 - mapconst RADIO_TOWER_1F, 4, 9 ; 17 - mapconst RADIO_TOWER_2F, 4, 9 ; 18 - mapconst RADIO_TOWER_3F, 4, 9 ; 19 - mapconst RADIO_TOWER_4F, 4, 9 ; 20 - mapconst RADIO_TOWER_5F, 4, 9 ; 21 - mapconst RUINS_OF_ALPH_OUTSIDE, 18, 10 ; 22 - mapconst RUINS_OF_ALPH_HO_OH_CHAMBER, 5, 4 ; 23 - mapconst RUINS_OF_ALPH_KABUTO_CHAMBER, 5, 4 ; 24 - mapconst RUINS_OF_ALPH_OMANYTE_CHAMBER, 5, 4 ; 25 - mapconst RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5, 4 ; 26 - mapconst RUINS_OF_ALPH_INNER_CHAMBER, 14, 10 ; 27 - mapconst RUINS_OF_ALPH_RESEARCH_CENTER, 4, 4 ; 28 - mapconst RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 5, 4 ; 29 - mapconst RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 5, 4 ; 30 - mapconst RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 5, 4 ; 31 - mapconst RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 5, 4 ; 32 - mapconst RUINS_OF_ALPH_HO_OH_WORD_ROOM, 12, 10 ; 33 - mapconst RUINS_OF_ALPH_KABUTO_WORD_ROOM, 7, 10 ; 34 - mapconst RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 8, 10 ; 35 - mapconst RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 7, 10 ; 36 - mapconst UNION_CAVE_1F, 18, 10 ; 37 - mapconst UNION_CAVE_B1F, 18, 10 ; 38 - mapconst UNION_CAVE_B2F, 18, 10 ; 39 - mapconst SLOWPOKE_WELL_B1F, 9, 10 ; 40 - mapconst SLOWPOKE_WELL_B2F, 9, 10 ; 41 - mapconst OLIVINE_LIGHTHOUSE_1F, 9, 10 ; 42 - mapconst OLIVINE_LIGHTHOUSE_2F, 9, 10 ; 43 - mapconst OLIVINE_LIGHTHOUSE_3F, 9, 10 ; 44 - mapconst OLIVINE_LIGHTHOUSE_4F, 9, 10 ; 45 - mapconst OLIVINE_LIGHTHOUSE_5F, 9, 10 ; 46 - mapconst OLIVINE_LIGHTHOUSE_6F, 9, 10 ; 47 - mapconst MAHOGANY_MART_1F, 4, 4 ; 48 - mapconst TEAM_ROCKET_BASE_B1F, 9, 15 ; 49 - mapconst TEAM_ROCKET_BASE_B2F, 9, 15 ; 50 - mapconst TEAM_ROCKET_BASE_B3F, 9, 15 ; 51 - mapconst ILEX_FOREST, 27, 15 ; 52 - mapconst GOLDENROD_UNDERGROUND, 18, 15 ; 53 - mapconst GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 18, 15 ; 54 - mapconst GOLDENROD_DEPT_STORE_B1F, 9, 10 ; 55 - mapconst GOLDENROD_UNDERGROUND_WAREHOUSE, 9, 10 ; 56 - mapconst MOUNT_MORTAR_1F_OUTSIDE, 18, 20 ; 57 - mapconst MOUNT_MORTAR_1F_INSIDE, 27, 20 ; 58 - mapconst MOUNT_MORTAR_2F_INSIDE, 18, 20 ; 59 - mapconst MOUNT_MORTAR_B1F, 18, 20 ; 60 - mapconst ICE_PATH_1F, 18, 20 ; 61 - mapconst ICE_PATH_B1F, 18, 10 ; 62 - mapconst ICE_PATH_B2F_MAHOGANY_SIDE, 9, 10 ; 63 - mapconst ICE_PATH_B2F_BLACKTHORN_SIDE, 9, 5 ; 64 - mapconst ICE_PATH_B3F, 9, 10 ; 65 - mapconst WHIRL_ISLAND_NW, 9, 5 ; 66 - mapconst WHIRL_ISLAND_NE, 9, 10 ; 67 - mapconst WHIRL_ISLAND_SW, 9, 10 ; 68 - mapconst WHIRL_ISLAND_CAVE, 9, 5 ; 69 - mapconst WHIRL_ISLAND_SE, 9, 5 ; 70 - mapconst WHIRL_ISLAND_B1F, 18, 20 ; 71 - mapconst WHIRL_ISLAND_B2F, 18, 10 ; 72 - mapconst WHIRL_ISLAND_LUGIA_CHAMBER, 9, 10 ; 73 - mapconst SILVER_CAVE_ROOM_1, 18, 10 ; 74 - mapconst SILVER_CAVE_ROOM_2, 18, 15 ; 75 - mapconst SILVER_CAVE_ROOM_3, 18, 10 ; 76 - mapconst SILVER_CAVE_ITEM_ROOMS, 9, 10 ; 77 - mapconst DARK_CAVE_VIOLET_ENTRANCE, 18, 20 ; 78 - mapconst DARK_CAVE_BLACKTHORN_ENTRANCE, 18, 15 ; 79 - mapconst DRAGONS_DEN_1F, 9, 5 ; 80 - mapconst DRAGONS_DEN_B1F, 18, 20 ; 81 - mapconst DRAGON_SHRINE, 5, 5 ; 82 - mapconst TOHJO_FALLS, 9, 15 ; 83 - mapconst DIGLETTS_CAVE, 18, 10 ; 84 - mapconst MOUNT_MOON, 9, 15 ; 85 - mapconst UNDERGROUND_PATH, 14, 3 ; 86 - mapconst ROCK_TUNNEL_1F, 18, 15 ; 87 - mapconst ROCK_TUNNEL_B1F, 18, 15 ; 88 - mapconst SAFARI_ZONE_FUCHSIA_GATE_BETA, 4, 5 ; 89 - mapconst SAFARI_ZONE_BETA, 18, 10 ; 90 - mapconst VICTORY_ROAD, 36, 10 ; 91 + map_const SPROUT_TOWER_1F, 10, 8 ; 1 + map_const SPROUT_TOWER_2F, 10, 8 ; 2 + map_const SPROUT_TOWER_3F, 10, 8 ; 3 + map_const TIN_TOWER_1F, 10, 9 ; 4 + map_const TIN_TOWER_2F, 10, 9 ; 5 + map_const TIN_TOWER_3F, 10, 9 ; 6 + map_const TIN_TOWER_4F, 10, 9 ; 7 + map_const TIN_TOWER_5F, 10, 9 ; 8 + map_const TIN_TOWER_6F, 10, 9 ; 9 + map_const TIN_TOWER_7F, 10, 9 ; 10 + map_const TIN_TOWER_8F, 10, 9 ; 11 + map_const TIN_TOWER_9F, 10, 9 ; 12 + map_const BURNED_TOWER_1F, 10, 9 ; 13 + map_const BURNED_TOWER_B1F, 10, 9 ; 14 + map_const NATIONAL_PARK, 20, 27 ; 15 + map_const NATIONAL_PARK_BUG_CONTEST, 20, 27 ; 16 + map_const RADIO_TOWER_1F, 9, 4 ; 17 + map_const RADIO_TOWER_2F, 9, 4 ; 18 + map_const RADIO_TOWER_3F, 9, 4 ; 19 + map_const RADIO_TOWER_4F, 9, 4 ; 20 + map_const RADIO_TOWER_5F, 9, 4 ; 21 + map_const RUINS_OF_ALPH_OUTSIDE, 10, 18 ; 22 + map_const RUINS_OF_ALPH_HO_OH_CHAMBER, 4, 5 ; 23 + map_const RUINS_OF_ALPH_KABUTO_CHAMBER, 4, 5 ; 24 + map_const RUINS_OF_ALPH_OMANYTE_CHAMBER, 4, 5 ; 25 + map_const RUINS_OF_ALPH_AERODACTYL_CHAMBER, 4, 5 ; 26 + map_const RUINS_OF_ALPH_INNER_CHAMBER, 10, 14 ; 27 + map_const RUINS_OF_ALPH_RESEARCH_CENTER, 4, 4 ; 28 + map_const RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 4, 5 ; 29 + map_const RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 4, 5 ; 30 + map_const RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 4, 5 ; 31 + map_const RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 4, 5 ; 32 + map_const RUINS_OF_ALPH_HO_OH_WORD_ROOM, 10, 12 ; 33 + map_const RUINS_OF_ALPH_KABUTO_WORD_ROOM, 10, 7 ; 34 + map_const RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 10, 8 ; 35 + map_const RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 10, 7 ; 36 + map_const UNION_CAVE_1F, 10, 18 ; 37 + map_const UNION_CAVE_B1F, 10, 18 ; 38 + map_const UNION_CAVE_B2F, 10, 18 ; 39 + map_const SLOWPOKE_WELL_B1F, 10, 9 ; 40 + map_const SLOWPOKE_WELL_B2F, 10, 9 ; 41 + map_const OLIVINE_LIGHTHOUSE_1F, 10, 9 ; 42 + map_const OLIVINE_LIGHTHOUSE_2F, 10, 9 ; 43 + map_const OLIVINE_LIGHTHOUSE_3F, 10, 9 ; 44 + map_const OLIVINE_LIGHTHOUSE_4F, 10, 9 ; 45 + map_const OLIVINE_LIGHTHOUSE_5F, 10, 9 ; 46 + map_const OLIVINE_LIGHTHOUSE_6F, 10, 9 ; 47 + map_const MAHOGANY_MART_1F, 4, 4 ; 48 + map_const TEAM_ROCKET_BASE_B1F, 15, 9 ; 49 + map_const TEAM_ROCKET_BASE_B2F, 15, 9 ; 50 + map_const TEAM_ROCKET_BASE_B3F, 15, 9 ; 51 + map_const ILEX_FOREST, 15, 27 ; 52 + map_const GOLDENROD_UNDERGROUND, 15, 18 ; 53 + map_const GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, 15, 18 ; 54 + map_const GOLDENROD_DEPT_STORE_B1F, 10, 9 ; 55 + map_const GOLDENROD_UNDERGROUND_WAREHOUSE, 10, 9 ; 56 + map_const MOUNT_MORTAR_1F_OUTSIDE, 20, 18 ; 57 + map_const MOUNT_MORTAR_1F_INSIDE, 20, 27 ; 58 + map_const MOUNT_MORTAR_2F_INSIDE, 20, 18 ; 59 + map_const MOUNT_MORTAR_B1F, 20, 18 ; 60 + map_const ICE_PATH_1F, 20, 18 ; 61 + map_const ICE_PATH_B1F, 10, 18 ; 62 + map_const ICE_PATH_B2F_MAHOGANY_SIDE, 10, 9 ; 63 + map_const ICE_PATH_B2F_BLACKTHORN_SIDE, 5, 9 ; 64 + map_const ICE_PATH_B3F, 10, 9 ; 65 + map_const WHIRL_ISLAND_NW, 5, 9 ; 66 + map_const WHIRL_ISLAND_NE, 10, 9 ; 67 + map_const WHIRL_ISLAND_SW, 10, 9 ; 68 + map_const WHIRL_ISLAND_CAVE, 5, 9 ; 69 + map_const WHIRL_ISLAND_SE, 5, 9 ; 70 + map_const WHIRL_ISLAND_B1F, 20, 18 ; 71 + map_const WHIRL_ISLAND_B2F, 10, 18 ; 72 + map_const WHIRL_ISLAND_LUGIA_CHAMBER, 10, 9 ; 73 + map_const SILVER_CAVE_ROOM_1, 10, 18 ; 74 + map_const SILVER_CAVE_ROOM_2, 15, 18 ; 75 + map_const SILVER_CAVE_ROOM_3, 10, 18 ; 76 + map_const SILVER_CAVE_ITEM_ROOMS, 10, 9 ; 77 + map_const DARK_CAVE_VIOLET_ENTRANCE, 20, 18 ; 78 + map_const DARK_CAVE_BLACKTHORN_ENTRANCE, 15, 18 ; 79 + map_const DRAGONS_DEN_1F, 5, 9 ; 80 + map_const DRAGONS_DEN_B1F, 20, 18 ; 81 + map_const DRAGON_SHRINE, 5, 5 ; 82 + map_const TOHJO_FALLS, 15, 9 ; 83 + map_const DIGLETTS_CAVE, 10, 18 ; 84 + map_const MOUNT_MOON, 15, 9 ; 85 + map_const UNDERGROUND_PATH, 3, 14 ; 86 + map_const ROCK_TUNNEL_1F, 15, 18 ; 87 + map_const ROCK_TUNNEL_B1F, 15, 18 ; 88 + map_const SAFARI_ZONE_FUCHSIA_GATE_BETA, 5, 4 ; 89 + map_const SAFARI_ZONE_BETA, 10, 18 ; 90 + map_const VICTORY_ROAD, 10, 36 ; 91 - newgroup ; 4 + newgroup ; 4 - mapconst ECRUTEAK_HOUSE, 9, 10 ; 1 - mapconst WISE_TRIOS_ROOM, 4, 4 ; 2 - mapconst ECRUTEAK_POKECENTER_1F, 4, 5 ; 3 - mapconst ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 - mapconst DANCE_THEATRE, 7, 6 ; 5 - mapconst ECRUTEAK_MART, 4, 6 ; 6 - mapconst ECRUTEAK_GYM, 9, 5 ; 7 - mapconst ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8 - mapconst ECRUTEAK_CITY, 18, 20 ; 9 + map_const ECRUTEAK_HOUSE, 10, 9 ; 1 + map_const WISE_TRIOS_ROOM, 4, 4 ; 2 + map_const ECRUTEAK_POKECENTER_1F, 5, 4 ; 3 + map_const ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 + map_const DANCE_THEATRE, 6, 7 ; 5 + map_const ECRUTEAK_MART, 6, 4 ; 6 + map_const ECRUTEAK_GYM, 5, 9 ; 7 + map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8 + map_const ECRUTEAK_CITY, 20, 18 ; 9 - newgroup ; 5 + newgroup ; 5 - mapconst BLACKTHORN_GYM_1F, 9, 5 ; 1 - mapconst BLACKTHORN_GYM_2F, 9, 5 ; 2 - mapconst BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 ; 3 - mapconst BLACKTHORN_EMYS_HOUSE, 4, 4 ; 4 - mapconst BLACKTHORN_MART, 4, 6 ; 5 - mapconst BLACKTHORN_POKECENTER_1F, 4, 5 ; 6 - mapconst MOVE_DELETERS_HOUSE, 4, 4 ; 7 - mapconst ROUTE_45, 45, 10 ; 8 - mapconst ROUTE_46, 18, 10 ; 9 - mapconst BLACKTHORN_CITY, 18, 20 ; 10 + map_const BLACKTHORN_GYM_1F, 5, 9 ; 1 + map_const BLACKTHORN_GYM_2F, 5, 9 ; 2 + map_const BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 ; 3 + map_const BLACKTHORN_EMYS_HOUSE, 4, 4 ; 4 + map_const BLACKTHORN_MART, 6, 4 ; 5 + map_const BLACKTHORN_POKECENTER_1F, 5, 4 ; 6 + map_const MOVE_DELETERS_HOUSE, 4, 4 ; 7 + map_const ROUTE_45, 10, 45 ; 8 + map_const ROUTE_46, 10, 18 ; 9 + map_const BLACKTHORN_CITY, 20, 18 ; 10 - newgroup ; 6 + newgroup ; 6 - mapconst CINNABAR_POKECENTER_1F, 4, 5 ; 1 - mapconst CINNABAR_POKECENTER_2F_BETA, 4, 8 ; 2 - mapconst ROUTE_19_FUCHSIA_GATE, 4, 5 ; 3 - mapconst SEAFOAM_GYM, 4, 5 ; 4 - mapconst ROUTE_19, 18, 10 ; 5 - mapconst ROUTE_20, 9, 30 ; 6 - mapconst ROUTE_21, 18, 10 ; 7 - mapconst CINNABAR_ISLAND, 9, 10 ; 8 + map_const CINNABAR_POKECENTER_1F, 5, 4 ; 1 + map_const CINNABAR_POKECENTER_2F_BETA, 8, 4 ; 2 + map_const ROUTE_19_FUCHSIA_GATE, 5, 4 ; 3 + map_const SEAFOAM_GYM, 5, 4 ; 4 + map_const ROUTE_19, 10, 18 ; 5 + map_const ROUTE_20, 30, 9 ; 6 + map_const ROUTE_21, 10, 18 ; 7 + map_const CINNABAR_ISLAND, 10, 9 ; 8 - newgroup ; 7 + newgroup ; 7 - mapconst CERULEAN_GYM_BADGE_SPEECH_HOUSE, 4, 4 ; 1 - mapconst CERULEAN_POLICE_STATION, 4, 4 ; 2 - mapconst CERULEAN_TRADE_SPEECH_HOUSE, 4, 4 ; 3 - mapconst CERULEAN_POKECENTER_1F, 4, 5 ; 4 - mapconst CERULEAN_POKECENTER_2F_BETA, 4, 8 ; 5 - mapconst CERULEAN_GYM, 8, 5 ; 6 - mapconst CERULEAN_MART, 4, 6 ; 7 - mapconst ROUTE_10_POKECENTER_1F, 4, 5 ; 8 - mapconst ROUTE_10_POKECENTER_2F_BETA, 4, 8 ; 9 - mapconst POWER_PLANT, 9, 10 ; 10 - mapconst BILLS_HOUSE, 4, 4 ; 11 - mapconst ROUTE_4, 9, 20 ; 12 - mapconst ROUTE_9, 9, 30 ; 13 - mapconst ROUTE_10_NORTH, 9, 10 ; 14 - mapconst ROUTE_24, 9, 10 ; 15 - mapconst ROUTE_25, 9, 30 ; 16 - mapconst CERULEAN_CITY, 18, 20 ; 17 + map_const CERULEAN_GYM_BADGE_SPEECH_HOUSE, 4, 4 ; 1 + map_const CERULEAN_POLICE_STATION, 4, 4 ; 2 + map_const CERULEAN_TRADE_SPEECH_HOUSE, 4, 4 ; 3 + map_const CERULEAN_POKECENTER_1F, 5, 4 ; 4 + map_const CERULEAN_POKECENTER_2F_BETA, 8, 4 ; 5 + map_const CERULEAN_GYM, 5, 8 ; 6 + map_const CERULEAN_MART, 6, 4 ; 7 + map_const ROUTE_10_POKECENTER_1F, 5, 4 ; 8 + map_const ROUTE_10_POKECENTER_2F_BETA, 8, 4 ; 9 + map_const POWER_PLANT, 10, 9 ; 10 + map_const BILLS_HOUSE, 4, 4 ; 11 + map_const ROUTE_4, 20, 9 ; 12 + map_const ROUTE_9, 30, 9 ; 13 + map_const ROUTE_10_NORTH, 10, 9 ; 14 + map_const ROUTE_24, 10, 9 ; 15 + map_const ROUTE_25, 30, 9 ; 16 + map_const CERULEAN_CITY, 20, 18 ; 17 - newgroup ; 8 + newgroup ; 8 - mapconst AZALEA_POKECENTER_1F, 4, 5 ; 1 - mapconst CHARCOAL_KILN, 4, 4 ; 2 - mapconst AZALEA_MART, 4, 6 ; 3 - mapconst KURTS_HOUSE, 4, 8 ; 4 - mapconst AZALEA_GYM, 8, 5 ; 5 - mapconst ROUTE_33, 9, 10 ; 6 - mapconst AZALEA_TOWN, 9, 20 ; 7 + map_const AZALEA_POKECENTER_1F, 5, 4 ; 1 + map_const CHARCOAL_KILN, 4, 4 ; 2 + map_const AZALEA_MART, 6, 4 ; 3 + map_const KURTS_HOUSE, 8, 4 ; 4 + map_const AZALEA_GYM, 5, 8 ; 5 + map_const ROUTE_33, 10, 9 ; 6 + map_const AZALEA_TOWN, 20, 9 ; 7 - newgroup ; 9 + newgroup ; 9 - mapconst LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 4, 4 ; 1 - mapconst LAKE_OF_RAGE_MAGIKARP_HOUSE, 4, 4 ; 2 - mapconst ROUTE_43_MAHOGANY_GATE, 4, 5 ; 3 - mapconst ROUTE_43_GATE, 4, 5 ; 4 - mapconst ROUTE_43, 27, 10 ; 5 - mapconst LAKE_OF_RAGE, 18, 20 ; 6 + map_const LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 4, 4 ; 1 + map_const LAKE_OF_RAGE_MAGIKARP_HOUSE, 4, 4 ; 2 + map_const ROUTE_43_MAHOGANY_GATE, 5, 4 ; 3 + map_const ROUTE_43_GATE, 5, 4 ; 4 + map_const ROUTE_43, 10, 27 ; 5 + map_const LAKE_OF_RAGE, 20, 18 ; 6 - newgroup ; 10 + newgroup ; 10 - mapconst ROUTE_32, 45, 10 ; 1 - mapconst ROUTE_35, 18, 10 ; 2 - mapconst ROUTE_36, 9, 30 ; 3 - mapconst ROUTE_37, 9, 10 ; 4 - mapconst VIOLET_CITY, 18, 20 ; 5 - mapconst VIOLET_MART, 4, 6 ; 6 - mapconst VIOLET_GYM, 8, 5 ; 7 - mapconst EARLS_POKEMON_ACADEMY, 8, 4 ; 8 - mapconst VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4 ; 9 - mapconst VIOLET_POKECENTER_1F, 4, 5 ; 10 - mapconst VIOLET_KYLES_HOUSE, 4, 4 ; 11 - mapconst ROUTE_32_RUINS_OF_ALPH_GATE, 4, 5 ; 12 - mapconst ROUTE_32_POKECENTER_1F, 4, 5 ; 13 - mapconst ROUTE_35_GOLDENROD_GATE, 4, 5 ; 14 - mapconst ROUTE_35_NATIONAL_PARK_GATE, 4, 4 ; 15 - mapconst ROUTE_36_RUINS_OF_ALPH_GATE, 4, 5 ; 16 - mapconst ROUTE_36_NATIONAL_PARK_GATE, 4, 5 ; 17 + map_const ROUTE_32, 10, 45 ; 1 + map_const ROUTE_35, 10, 18 ; 2 + map_const ROUTE_36, 30, 9 ; 3 + map_const ROUTE_37, 10, 9 ; 4 + map_const VIOLET_CITY, 20, 18 ; 5 + map_const VIOLET_MART, 6, 4 ; 6 + map_const VIOLET_GYM, 5, 8 ; 7 + map_const EARLS_POKEMON_ACADEMY, 4, 8 ; 8 + map_const VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4 ; 9 + map_const VIOLET_POKECENTER_1F, 5, 4 ; 10 + map_const VIOLET_KYLES_HOUSE, 4, 4 ; 11 + map_const ROUTE_32_RUINS_OF_ALPH_GATE, 5, 4 ; 12 + map_const ROUTE_32_POKECENTER_1F, 5, 4 ; 13 + map_const ROUTE_35_GOLDENROD_GATE, 5, 4 ; 14 + map_const ROUTE_35_NATIONAL_PARK_GATE, 4, 4 ; 15 + map_const ROUTE_36_RUINS_OF_ALPH_GATE, 5, 4 ; 16 + map_const ROUTE_36_NATIONAL_PARK_GATE, 5, 4 ; 17 - newgroup ; 11 + newgroup ; 11 - mapconst ROUTE_34, 27, 10 ; 1 - mapconst GOLDENROD_CITY, 18, 20 ; 2 - mapconst GOLDENROD_GYM, 9, 10 ; 3 - mapconst GOLDENROD_BIKE_SHOP, 4, 4 ; 4 - mapconst GOLDENROD_HAPPINESS_RATER, 4, 4 ; 5 - mapconst GOLDENROD_BILLS_HOUSE, 4, 4 ; 6 - mapconst GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 ; 7 - mapconst GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 - mapconst GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 - mapconst GOLDENROD_NAME_RATER, 4, 4 ; 10 - mapconst GOLDENROD_DEPT_STORE_1F, 4, 8 ; 11 - mapconst GOLDENROD_DEPT_STORE_2F, 4, 8 ; 12 - mapconst GOLDENROD_DEPT_STORE_3F, 4, 8 ; 13 - mapconst GOLDENROD_DEPT_STORE_4F, 4, 8 ; 14 - mapconst GOLDENROD_DEPT_STORE_5F, 4, 8 ; 15 - mapconst GOLDENROD_DEPT_STORE_6F, 4, 8 ; 16 - mapconst GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2 ; 17 - mapconst GOLDENROD_DEPT_STORE_ROOF, 4, 8 ; 18 - mapconst GOLDENROD_GAME_CORNER, 7, 10 ; 19 - mapconst GOLDENROD_POKECENTER_1F, 4, 5 ; 20 - mapconst GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21 - mapconst ILEX_FOREST_AZALEA_GATE, 4, 5 ; 22 - mapconst ROUTE_34_ILEX_FOREST_GATE, 4, 5 ; 23 - mapconst DAY_CARE, 4, 5 ; 24 + map_const ROUTE_34, 10, 27 ; 1 + map_const GOLDENROD_CITY, 20, 18 ; 2 + map_const GOLDENROD_GYM, 10, 9 ; 3 + map_const GOLDENROD_BIKE_SHOP, 4, 4 ; 4 + map_const GOLDENROD_HAPPINESS_RATER, 4, 4 ; 5 + map_const GOLDENROD_BILLS_HOUSE, 4, 4 ; 6 + map_const GOLDENROD_MAGNET_TRAIN_STATION, 10, 9 ; 7 + map_const GOLDENROD_FLOWER_SHOP, 4, 4 ; 8 + map_const GOLDENROD_PP_SPEECH_HOUSE, 4, 4 ; 9 + map_const GOLDENROD_NAME_RATER, 4, 4 ; 10 + map_const GOLDENROD_DEPT_STORE_1F, 8, 4 ; 11 + map_const GOLDENROD_DEPT_STORE_2F, 8, 4 ; 12 + map_const GOLDENROD_DEPT_STORE_3F, 8, 4 ; 13 + map_const GOLDENROD_DEPT_STORE_4F, 8, 4 ; 14 + map_const GOLDENROD_DEPT_STORE_5F, 8, 4 ; 15 + map_const GOLDENROD_DEPT_STORE_6F, 8, 4 ; 16 + map_const GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2 ; 17 + map_const GOLDENROD_DEPT_STORE_ROOF, 8, 4 ; 18 + map_const GOLDENROD_GAME_CORNER, 10, 7 ; 19 + map_const GOLDENROD_POKECENTER_1F, 5, 4 ; 20 + map_const GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 ; 21 + map_const ILEX_FOREST_AZALEA_GATE, 5, 4 ; 22 + map_const ROUTE_34_ILEX_FOREST_GATE, 5, 4 ; 23 + map_const DAY_CARE, 5, 4 ; 24 - newgroup ; 12 + newgroup ; 12 - mapconst ROUTE_6, 9, 10 ; 1 - mapconst ROUTE_11, 9, 20 ; 2 - mapconst VERMILION_CITY, 18, 20 ; 3 - mapconst VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4 ; 4 - mapconst VERMILION_POKECENTER_1F, 4, 5 ; 5 - mapconst VERMILION_POKECENTER_2F_BETA, 4, 8 ; 6 - mapconst POKEMON_FAN_CLUB, 4, 5 ; 7 - mapconst VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 ; 8 - mapconst VERMILION_MART, 4, 6 ; 9 - mapconst VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 - mapconst VERMILION_GYM, 9, 5 ; 11 - mapconst ROUTE_6_SAFFRON_GATE, 4, 5 ; 12 - mapconst ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13 + map_const ROUTE_6, 10, 9 ; 1 + map_const ROUTE_11, 20, 9 ; 2 + map_const VERMILION_CITY, 20, 18 ; 3 + map_const VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4 ; 4 + map_const VERMILION_POKECENTER_1F, 5, 4 ; 5 + map_const VERMILION_POKECENTER_2F_BETA, 8, 4 ; 6 + map_const POKEMON_FAN_CLUB, 5, 4 ; 7 + map_const VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 ; 8 + map_const VERMILION_MART, 6, 4 ; 9 + map_const VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 ; 10 + map_const VERMILION_GYM, 5, 9 ; 11 + map_const ROUTE_6_SAFFRON_GATE, 5, 4 ; 12 + map_const ROUTE_6_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13 - newgroup ; 13 + newgroup ; 13 - mapconst ROUTE_1, 18, 10 ; 1 - mapconst PALLET_TOWN, 9, 10 ; 2 - mapconst REDS_HOUSE_1F, 4, 4 ; 3 - mapconst REDS_HOUSE_2F, 4, 4 ; 4 - mapconst BLUES_HOUSE, 4, 4 ; 5 - mapconst OAKS_LAB, 6, 5 ; 6 + map_const ROUTE_1, 10, 18 ; 1 + map_const PALLET_TOWN, 10, 9 ; 2 + map_const REDS_HOUSE_1F, 4, 4 ; 3 + map_const REDS_HOUSE_2F, 4, 4 ; 4 + map_const BLUES_HOUSE, 4, 4 ; 5 + map_const OAKS_LAB, 5, 6 ; 6 - newgroup ; 14 + newgroup ; 14 - mapconst ROUTE_3, 9, 30 ; 1 - mapconst PEWTER_CITY, 18, 20 ; 2 - mapconst PEWTER_NIDORAN_SPEECH_HOUSE, 4, 4 ; 3 - mapconst PEWTER_GYM, 7, 5 ; 4 - mapconst PEWTER_MART, 4, 6 ; 5 - mapconst PEWTER_POKECENTER_1F, 4, 5 ; 6 - mapconst PEWTER_POKECENTER_2F_BETA, 4, 8 ; 7 - mapconst PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8 + map_const ROUTE_3, 30, 9 ; 1 + map_const PEWTER_CITY, 20, 18 ; 2 + map_const PEWTER_NIDORAN_SPEECH_HOUSE, 4, 4 ; 3 + map_const PEWTER_GYM, 5, 7 ; 4 + map_const PEWTER_MART, 6, 4 ; 5 + map_const PEWTER_POKECENTER_1F, 5, 4 ; 6 + map_const PEWTER_POKECENTER_2F_BETA, 8, 4 ; 7 + map_const PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8 - newgroup ; 15 + newgroup ; 15 - mapconst OLIVINE_PORT, 18, 10 ; 1 - mapconst VERMILION_PORT, 18, 10 ; 2 - mapconst FAST_SHIP_1F, 9, 16 ; 3 - mapconst FAST_SHIP_CABINS_NNW_NNE_NE, 16, 4 ; 4 - mapconst FAST_SHIP_CABINS_SW_SSW_NW, 16, 4 ; 5 - mapconst FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 17, 5 ; 6 - mapconst FAST_SHIP_B1F, 8, 16 ; 7 - mapconst OLIVINE_PORT_PASSAGE, 9, 10 ; 8 - mapconst VERMILION_PORT_PASSAGE, 9, 10 ; 9 - mapconst MOUNT_MOON_SQUARE, 9, 15 ; 10 - mapconst MOUNT_MOON_GIFT_SHOP, 4, 4 ; 11 - mapconst TIN_TOWER_ROOF, 9, 10 ; 12 + map_const OLIVINE_PORT, 10, 18 ; 1 + map_const VERMILION_PORT, 10, 18 ; 2 + map_const FAST_SHIP_1F, 16, 9 ; 3 + map_const FAST_SHIP_CABINS_NNW_NNE_NE, 4, 16 ; 4 + map_const FAST_SHIP_CABINS_SW_SSW_NW, 4, 16 ; 5 + map_const FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 5, 17 ; 6 + map_const FAST_SHIP_B1F, 16, 8 ; 7 + map_const OLIVINE_PORT_PASSAGE, 10, 9 ; 8 + map_const VERMILION_PORT_PASSAGE, 10, 9 ; 9 + map_const MOUNT_MOON_SQUARE, 15, 9 ; 10 + map_const MOUNT_MOON_GIFT_SHOP, 4, 4 ; 11 + map_const TIN_TOWER_ROOF, 10, 9 ; 12 - newgroup ; 16 + newgroup ; 16 - mapconst ROUTE_23, 9, 10 ; 1 - mapconst INDIGO_PLATEAU_POKECENTER_1F, 7, 9 ; 2 - mapconst WILLS_ROOM, 9, 5 ; 3 - mapconst KOGAS_ROOM, 9, 5 ; 4 - mapconst BRUNOS_ROOM, 9, 5 ; 5 - mapconst KARENS_ROOM, 9, 5 ; 6 - mapconst LANCES_ROOM, 12, 5 ; 7 - mapconst HALL_OF_FAME, 7, 5 ; 8 + map_const ROUTE_23, 10, 9 ; 1 + map_const INDIGO_PLATEAU_POKECENTER_1F, 9, 7 ; 2 + map_const WILLS_ROOM, 5, 9 ; 3 + map_const KOGAS_ROOM, 5, 9 ; 4 + map_const BRUNOS_ROOM, 5, 9 ; 5 + map_const KARENS_ROOM, 5, 9 ; 6 + map_const LANCES_ROOM, 5, 12 ; 7 + map_const HALL_OF_FAME, 5, 7 ; 8 - newgroup ; 17 + newgroup ; 17 - mapconst ROUTE_13, 9, 30 ; 1 - mapconst ROUTE_14, 18, 10 ; 2 - mapconst ROUTE_15, 9, 20 ; 3 - mapconst ROUTE_18, 9, 10 ; 4 - mapconst FUCHSIA_CITY, 18, 20 ; 5 - mapconst FUCHSIA_MART, 4, 6 ; 6 - mapconst SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7 - mapconst FUCHSIA_GYM, 9, 5 ; 8 - mapconst FUCHSIA_BILL_SPEECH_HOUSE, 4, 4 ; 9 - mapconst FUCHSIA_POKECENTER_1F, 4, 5 ; 10 - mapconst FUCHSIA_POKECENTER_2F_BETA, 4, 8 ; 11 - mapconst SAFARI_ZONE_WARDENS_HOME, 4, 5 ; 12 - mapconst ROUTE_15_FUCHSIA_GATE, 4, 5 ; 13 + map_const ROUTE_13, 30, 9 ; 1 + map_const ROUTE_14, 10, 18 ; 2 + map_const ROUTE_15, 20, 9 ; 3 + map_const ROUTE_18, 10, 9 ; 4 + map_const FUCHSIA_CITY, 20, 18 ; 5 + map_const FUCHSIA_MART, 6, 4 ; 6 + map_const SAFARI_ZONE_MAIN_OFFICE, 4, 4 ; 7 + map_const FUCHSIA_GYM, 5, 9 ; 8 + map_const FUCHSIA_BILL_SPEECH_HOUSE, 4, 4 ; 9 + map_const FUCHSIA_POKECENTER_1F, 5, 4 ; 10 + map_const FUCHSIA_POKECENTER_2F_BETA, 8, 4 ; 11 + map_const SAFARI_ZONE_WARDENS_HOME, 5, 4 ; 12 + map_const ROUTE_15_FUCHSIA_GATE, 5, 4 ; 13 - newgroup ; 18 + newgroup ; 18 - mapconst ROUTE_8, 9, 20 ; 1 - mapconst ROUTE_12, 27, 10 ; 2 - mapconst ROUTE_10_SOUTH, 9, 10 ; 3 - mapconst LAVENDER_TOWN, 9, 10 ; 4 - mapconst LAVENDER_POKECENTER_1F, 4, 5 ; 5 - mapconst LAVENDER_POKECENTER_2F_BETA, 4, 8 ; 6 - mapconst MR_FUJIS_HOUSE, 4, 5 ; 7 - mapconst LAVENDER_SPEECH_HOUSE, 4, 4 ; 8 - mapconst LAVENDER_NAME_RATER, 4, 4 ; 9 - mapconst LAVENDER_MART, 4, 6 ; 10 - mapconst SOUL_HOUSE, 4, 5 ; 11 - mapconst LAV_RADIO_TOWER_1F, 4, 10 ; 12 - mapconst ROUTE_8_SAFFRON_GATE, 4, 5 ; 13 - mapconst ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; 14 + map_const ROUTE_8, 20, 9 ; 1 + map_const ROUTE_12, 10, 27 ; 2 + map_const ROUTE_10_SOUTH, 10, 9 ; 3 + map_const LAVENDER_TOWN, 10, 9 ; 4 + map_const LAVENDER_POKECENTER_1F, 5, 4 ; 5 + map_const LAVENDER_POKECENTER_2F_BETA, 8, 4 ; 6 + map_const MR_FUJIS_HOUSE, 5, 4 ; 7 + map_const LAVENDER_SPEECH_HOUSE, 4, 4 ; 8 + map_const LAVENDER_NAME_RATER, 4, 4 ; 9 + map_const LAVENDER_MART, 6, 4 ; 10 + map_const SOUL_HOUSE, 5, 4 ; 11 + map_const LAV_RADIO_TOWER_1F, 10, 4 ; 12 + map_const ROUTE_8_SAFFRON_GATE, 5, 4 ; 13 + map_const ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; 14 - newgroup ; 19 + newgroup ; 19 - mapconst ROUTE_28, 9, 20 ; 1 - mapconst SILVER_CAVE_OUTSIDE, 18, 20 ; 2 - mapconst SILVER_CAVE_POKECENTER_1F, 4, 5 ; 3 - mapconst ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 ; 4 + map_const ROUTE_28, 20, 9 ; 1 + map_const SILVER_CAVE_OUTSIDE, 20, 18 ; 2 + map_const SILVER_CAVE_POKECENTER_1F, 5, 4 ; 3 + map_const ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 ; 4 - newgroup ; 20 + newgroup ; 20 - mapconst POKECENTER_2F, 4, 8 ; 1 - mapconst TRADE_CENTER, 4, 5 ; 2 - mapconst COLOSSEUM, 4, 5 ; 3 - mapconst TIME_CAPSULE, 4, 5 ; 4 - mapconst MOBILE_TRADE_ROOM_MOBILE, 4, 5 ; 5 - mapconst MOBILE_BATTLE_ROOM, 4, 5 ; 6 + map_const POKECENTER_2F, 8, 4 ; 1 + map_const TRADE_CENTER, 5, 4 ; 2 + map_const COLOSSEUM, 5, 4 ; 3 + map_const TIME_CAPSULE, 5, 4 ; 4 + map_const MOBILE_TRADE_ROOM_MOBILE, 5, 4 ; 5 + map_const MOBILE_BATTLE_ROOM, 5, 4 ; 6 - newgroup ; 21 + newgroup ; 21 - mapconst ROUTE_7, 9, 10 ; 1 - mapconst ROUTE_16, 9, 10 ; 2 - mapconst ROUTE_17, 45, 10 ; 3 - mapconst CELADON_CITY, 18, 20 ; 4 - mapconst CELADON_DEPT_STORE_1F, 4, 8 ; 5 - mapconst CELADON_DEPT_STORE_2F, 4, 8 ; 6 - mapconst CELADON_DEPT_STORE_3F, 4, 8 ; 7 - mapconst CELADON_DEPT_STORE_4F, 4, 8 ; 8 - mapconst CELADON_DEPT_STORE_5F, 4, 8 ; 9 - mapconst CELADON_DEPT_STORE_6F, 4, 8 ; 10 - mapconst CELADON_DEPT_STORE_ELEVATOR, 2, 2 ; 11 - mapconst CELADON_MANSION_1F, 5, 4 ; 12 - mapconst CELADON_MANSION_2F, 5, 4 ; 13 - mapconst CELADON_MANSION_3F, 5, 4 ; 14 - mapconst CELADON_MANSION_ROOF, 5, 4 ; 15 - mapconst CELADON_MANSION_ROOF_HOUSE, 4, 4 ; 16 - mapconst CELADON_POKECENTER_1F, 4, 5 ; 17 - mapconst CELADON_POKECENTER_2F_BETA, 4, 8 ; 18 - mapconst CELADON_GAME_CORNER, 7, 10 ; 19 - mapconst CELADON_GAME_CORNER_PRIZE_ROOM, 3, 3 ; 20 - mapconst CELADON_GYM, 9, 5 ; 21 - mapconst CELADON_CAFE, 4, 6 ; 22 - mapconst ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4 ; 23 - mapconst ROUTE_16_GATE, 4, 5 ; 24 - mapconst ROUTE_7_SAFFRON_GATE, 4, 5 ; 25 - mapconst ROUTE_17_ROUTE_18_GATE, 4, 5 ; 26 + map_const ROUTE_7, 10, 9 ; 1 + map_const ROUTE_16, 10, 9 ; 2 + map_const ROUTE_17, 10, 45 ; 3 + map_const CELADON_CITY, 20, 18 ; 4 + map_const CELADON_DEPT_STORE_1F, 8, 4 ; 5 + map_const CELADON_DEPT_STORE_2F, 8, 4 ; 6 + map_const CELADON_DEPT_STORE_3F, 8, 4 ; 7 + map_const CELADON_DEPT_STORE_4F, 8, 4 ; 8 + map_const CELADON_DEPT_STORE_5F, 8, 4 ; 9 + map_const CELADON_DEPT_STORE_6F, 8, 4 ; 10 + map_const CELADON_DEPT_STORE_ELEVATOR, 2, 2 ; 11 + map_const CELADON_MANSION_1F, 4, 5 ; 12 + map_const CELADON_MANSION_2F, 4, 5 ; 13 + map_const CELADON_MANSION_3F, 4, 5 ; 14 + map_const CELADON_MANSION_ROOF, 4, 5 ; 15 + map_const CELADON_MANSION_ROOF_HOUSE, 4, 4 ; 16 + map_const CELADON_POKECENTER_1F, 5, 4 ; 17 + map_const CELADON_POKECENTER_2F_BETA, 8, 4 ; 18 + map_const CELADON_GAME_CORNER, 10, 7 ; 19 + map_const CELADON_GAME_CORNER_PRIZE_ROOM, 3, 3 ; 20 + map_const CELADON_GYM, 5, 9 ; 21 + map_const CELADON_CAFE, 6, 4 ; 22 + map_const ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4 ; 23 + map_const ROUTE_16_GATE, 5, 4 ; 24 + map_const ROUTE_7_SAFFRON_GATE, 5, 4 ; 25 + map_const ROUTE_17_ROUTE_18_GATE, 5, 4 ; 26 - newgroup ; 22 + newgroup ; 22 - mapconst ROUTE_40, 18, 10 ; 1 - mapconst ROUTE_41, 27, 25 ; 2 - mapconst CIANWOOD_CITY, 27, 15 ; 3 - mapconst MANIAS_HOUSE, 4, 4 ; 4 - mapconst CIANWOOD_GYM, 9, 5 ; 5 - mapconst CIANWOOD_POKECENTER_1F, 4, 5 ; 6 - mapconst CIANWOOD_PHARMACY, 4, 4 ; 7 - mapconst CIANWOOD_PHOTO_STUDIO, 4, 4 ; 8 - mapconst CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 ; 9 - mapconst POKE_SEERS_HOUSE, 4, 4 ; 10 - mapconst BATTLE_TOWER_1F, 5, 8 ; 11 - mapconst BATTLE_TOWER_BATTLE_ROOM, 4, 4 ; 12 - mapconst BATTLE_TOWER_ELEVATOR, 2, 2 ; 13 - mapconst BATTLE_TOWER_HALLWAY, 2, 11 ; 14 - mapconst ROUTE_40_BATTLE_TOWER_GATE, 4, 5 ; 15 - mapconst BATTLE_TOWER_OUTSIDE, 14, 10 ; 16 + map_const ROUTE_40, 10, 18 ; 1 + map_const ROUTE_41, 25, 27 ; 2 + map_const CIANWOOD_CITY, 15, 27 ; 3 + map_const MANIAS_HOUSE, 4, 4 ; 4 + map_const CIANWOOD_GYM, 5, 9 ; 5 + map_const CIANWOOD_POKECENTER_1F, 5, 4 ; 6 + map_const CIANWOOD_PHARMACY, 4, 4 ; 7 + map_const CIANWOOD_PHOTO_STUDIO, 4, 4 ; 8 + map_const CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 ; 9 + map_const POKE_SEERS_HOUSE, 4, 4 ; 10 + map_const BATTLE_TOWER_1F, 8, 5 ; 11 + map_const BATTLE_TOWER_BATTLE_ROOM, 4, 4 ; 12 + map_const BATTLE_TOWER_ELEVATOR, 2, 2 ; 13 + map_const BATTLE_TOWER_HALLWAY, 11, 2 ; 14 + map_const ROUTE_40_BATTLE_TOWER_GATE, 5, 4 ; 15 + map_const BATTLE_TOWER_OUTSIDE, 10, 14 ; 16 - newgroup ; 23 + newgroup ; 23 - mapconst ROUTE_2, 27, 10 ; 1 - mapconst ROUTE_22, 9, 20 ; 2 - mapconst VIRIDIAN_CITY, 18, 20 ; 3 - mapconst VIRIDIAN_GYM, 9, 5 ; 4 - mapconst VIRIDIAN_NICKNAME_SPEECH_HOUSE, 4, 4 ; 5 - mapconst TRAINER_HOUSE_1F, 7, 5 ; 6 - mapconst TRAINER_HOUSE_B1F, 8, 5 ; 7 - mapconst VIRIDIAN_MART, 4, 6 ; 8 - mapconst VIRIDIAN_POKECENTER_1F, 4, 5 ; 9 - mapconst VIRIDIAN_POKECENTER_2F_BETA, 4, 8 ; 10 - mapconst ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 ; 11 - mapconst ROUTE_2_GATE, 4, 5 ; 12 - mapconst VICTORY_ROAD_GATE, 9, 10 ; 13 + map_const ROUTE_2, 10, 27 ; 1 + map_const ROUTE_22, 20, 9 ; 2 + map_const VIRIDIAN_CITY, 20, 18 ; 3 + map_const VIRIDIAN_GYM, 5, 9 ; 4 + map_const VIRIDIAN_NICKNAME_SPEECH_HOUSE, 4, 4 ; 5 + map_const TRAINER_HOUSE_1F, 5, 7 ; 6 + map_const TRAINER_HOUSE_B1F, 5, 8 ; 7 + map_const VIRIDIAN_MART, 6, 4 ; 8 + map_const VIRIDIAN_POKECENTER_1F, 5, 4 ; 9 + map_const VIRIDIAN_POKECENTER_2F_BETA, 8, 4 ; 10 + map_const ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 ; 11 + map_const ROUTE_2_GATE, 5, 4 ; 12 + map_const VICTORY_ROAD_GATE, 10, 9 ; 13 - newgroup ; 24 + newgroup ; 24 - mapconst ROUTE_26, 54, 10 ; 1 - mapconst ROUTE_27, 9, 40 ; 2 - mapconst ROUTE_29, 9, 30 ; 3 - mapconst NEW_BARK_TOWN, 9, 10 ; 4 - mapconst ELMS_LAB, 6, 5 ; 5 - mapconst KRISS_HOUSE_1F, 4, 5 ; 6 - mapconst KRISS_HOUSE_2F, 3, 4 ; 7 - mapconst KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8 - mapconst ELMS_HOUSE, 4, 4 ; 9 - mapconst ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 - mapconst ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 - mapconst ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12 - mapconst ROUTE_29_ROUTE_46_GATE, 4, 5 ; 13 + map_const ROUTE_26, 10, 54 ; 1 + map_const ROUTE_27, 40, 9 ; 2 + map_const ROUTE_29, 30, 9 ; 3 + map_const NEW_BARK_TOWN, 10, 9 ; 4 + map_const ELMS_LAB, 5, 6 ; 5 + map_const KRISS_HOUSE_1F, 5, 4 ; 6 + map_const KRISS_HOUSE_2F, 4, 3 ; 7 + map_const KRISS_NEIGHBORS_HOUSE, 4, 4 ; 8 + map_const ELMS_HOUSE, 4, 4 ; 9 + map_const ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 ; 10 + map_const ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 ; 11 + map_const ROUTE_27_SANDSTORM_HOUSE, 4, 4 ; 12 + map_const ROUTE_29_ROUTE_46_GATE, 5, 4 ; 13 - newgroup ; 25 + newgroup ; 25 - mapconst ROUTE_5, 9, 10 ; 1 - mapconst SAFFRON_CITY, 18, 20 ; 2 - mapconst FIGHTING_DOJO, 6, 5 ; 3 - mapconst SAFFRON_GYM, 9, 10 ; 4 - mapconst SAFFRON_MART, 4, 6 ; 5 - mapconst SAFFRON_POKECENTER_1F, 4, 5 ; 6 - mapconst SAFFRON_POKECENTER_2F_BETA, 4, 8 ; 7 - mapconst MR_PSYCHICS_HOUSE, 4, 4 ; 8 - mapconst SAFFRON_MAGNET_TRAIN_STATION, 9, 10 ; 9 - mapconst SILPH_CO_1F, 4, 8 ; 10 - mapconst COPYCATS_HOUSE_1F, 4, 4 ; 11 - mapconst COPYCATS_HOUSE_2F, 3, 5 ; 12 - mapconst ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13 - mapconst ROUTE_5_SAFFRON_GATE, 4, 5 ; 14 - mapconst ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15 + map_const ROUTE_5, 10, 9 ; 1 + map_const SAFFRON_CITY, 20, 18 ; 2 + map_const FIGHTING_DOJO, 5, 6 ; 3 + map_const SAFFRON_GYM, 10, 9 ; 4 + map_const SAFFRON_MART, 6, 4 ; 5 + map_const SAFFRON_POKECENTER_1F, 5, 4 ; 6 + map_const SAFFRON_POKECENTER_2F_BETA, 8, 4 ; 7 + map_const MR_PSYCHICS_HOUSE, 4, 4 ; 8 + map_const SAFFRON_MAGNET_TRAIN_STATION, 10, 9 ; 9 + map_const SILPH_CO_1F, 8, 4 ; 10 + map_const COPYCATS_HOUSE_1F, 4, 4 ; 11 + map_const COPYCATS_HOUSE_2F, 5, 3 ; 12 + map_const ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 4, 4 ; 13 + map_const ROUTE_5_SAFFRON_GATE, 5, 4 ; 14 + map_const ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 ; 15 - newgroup ; 26 + newgroup ; 26 - mapconst ROUTE_30, 27, 10 ; 1 - mapconst ROUTE_31, 9, 20 ; 2 - mapconst CHERRYGROVE_CITY, 9, 20 ; 3 - mapconst CHERRYGROVE_MART, 4, 6 ; 4 - mapconst CHERRYGROVE_POKECENTER_1F, 4, 5 ; 5 - mapconst CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6 - mapconst GUIDE_GENTS_HOUSE, 4, 4 ; 7 - mapconst CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8 - mapconst ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 ; 9 - mapconst MR_POKEMONS_HOUSE, 4, 4 ; 10 - mapconst ROUTE_31_VIOLET_GATE, 4, 5 ; 11 + map_const ROUTE_30, 10, 27 ; 1 + map_const ROUTE_31, 20, 9 ; 2 + map_const CHERRYGROVE_CITY, 20, 9 ; 3 + map_const CHERRYGROVE_MART, 6, 4 ; 4 + map_const CHERRYGROVE_POKECENTER_1F, 5, 4 ; 5 + map_const CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 ; 6 + map_const GUIDE_GENTS_HOUSE, 4, 4 ; 7 + map_const CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 ; 8 + map_const ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 ; 9 + map_const MR_POKEMONS_HOUSE, 4, 4 ; 10 + map_const ROUTE_31_VIOLET_GATE, 5, 4 ; 11 diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm index d3f14e34c..8903ef005 100644 --- a/constants/radio_constants.asm +++ b/constants/radio_constants.asm @@ -97,7 +97,7 @@ ; PlayRadio.StationPointers indexes (see engine/pokegear.asm) const_def const MAPRADIO_POKEMON_CHANNEL - const MAPRADIO_OAKS_MON_TALK + const MAPRADIO_OAKS_POKEMON_TALK const MAPRADIO_POKEDEX_SHOW const MAPRADIO_POKEMON_MUSIC const MAPRADIO_LUCKY_CHANNEL @@ -108,8 +108,8 @@ ; These tables in engine/radio.asm are all sized to a power of 2 ; so there's no need for a rejection sampling loop -NUM_OAKS_MON_TALK_ADVERBS EQU 16 ; OaksPkmnTalk8.Adverbs -NUM_OAKS_MON_TALK_ADJECTIVES EQU 16 ; OaksPkmnTalk9.Adjectives +NUM_OAKS_POKEMON_TALK_ADVERBS EQU 16 ; OaksPKMNTalk8.Adverbs +NUM_OAKS_POKEMON_TALK_ADJECTIVES EQU 16 ; OaksPKMNTalk9.Adjectives NUM_PNP_PEOPLE_ADJECTIVES EQU 16 ; PeoplePlaces5.Adjectives NUM_PNP_PLACES_ADJECTIVES EQU 16 ; PeoplePlaces7.Adjectives diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 074f8a7de..631bf6482 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -128,6 +128,8 @@ SPAWN_RED EQU 2 ; wPokemonWithdrawDepositParameter PC_WITHDRAW EQU 0 PC_DEPOSIT EQU 1 +REMOVE_PARTY EQU 0 +REMOVE_BOX EQU 1 DAY_CARE_WITHDRAW EQU 2 DAY_CARE_DEPOSIT EQU 3 diff --git a/data/battle/battle_text.asm b/data/battle/battle_text.asm index 1a609b476..9508c8c80 100644 --- a/data/battle/battle_text.asm +++ b/data/battle/battle_text.asm @@ -137,14 +137,14 @@ BattleText_SafeguardFaded: ; 0x808d2 prompt ; 0x808e7 -BattleText_PkmnLightScreenFell: ; 0x808e7 +BattleText_MonsLightScreenFell: ; 0x808e7 text_from_ram wStringBuffer1 text " #MON's" line "LIGHT SCREEN fell!" prompt ; 0x80905 -BattleText_PkmnReflectFaded: ; 0x80905 +BattleText_MonsReflectFaded: ; 0x80905 text_from_ram wStringBuffer1 text " #MON's" line "REFLECT faded!" @@ -186,7 +186,7 @@ BattleText_TheSandstormSubsided: ; 0x8098f prompt ; 0x809a8 -BattleText_EnemyPkmnFainted: ; 0x809a8 +BattleText_EnemyMonFainted: ; 0x809a8 text "Enemy @" text_from_ram wEnemyMonNick text_start @@ -236,7 +236,7 @@ BattleText_0x80a4f: ; 0x80a4f prompt ; 0x80a75 -BattleText_PkmnFainted: ; 0x80a75 +BattleText_MonFainted: ; 0x80a75 text_from_ram wBattleMonNick text_start line "fainted!" @@ -261,7 +261,7 @@ LostAgainstText: ; 0x80ab9 prompt ; 0x80aca -BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca +BattleText_EnemyIsAboutToUseWillPlayerChangeMon: ; 0x80aca text "" line "is about to use" cont "@" @@ -353,14 +353,14 @@ BattleText_ItemsCantBeUsedHere: ; 0x80bf3 prompt ; 0x80c0d -BattleText_PkmnIsAlreadyOut: ; 0x80c0d +BattleText_MonIsAlreadyOut: ; 0x80c0d text_from_ram wBattleMonNick text_start line "is already out." prompt ; 0x80c22 -BattleText_PkmnCantBeRecalled: ; 0x80c22 +BattleText_MonCantBeRecalled: ; 0x80c22 text_from_ram wBattleMonNick text_start line "can't be recalled!" @@ -379,7 +379,7 @@ BattleText_TheMoveIsDisabled: ; 0x80c5b prompt ; 0x80c72 -BattleText_PkmnHasNoMovesLeft: ; 0x80c72 +BattleText_MonHasNoMovesLeft: ; 0x80c72 text_from_ram wBattleMonNick text_start line "has no moves left!" @@ -402,7 +402,7 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c db "@@" ; 0x80cb9 -BattleText_WildPkmnIsEating: ; 0x80cba +BattleText_WildMonIsEating: ; 0x80cba text "Wild @" text_from_ram wEnemyMonNick text_start @@ -410,7 +410,7 @@ BattleText_WildPkmnIsEating: ; 0x80cba prompt ; 0x80cd1 -BattleText_WildPkmnIsAngry: ; 0x80cd1 +BattleText_WildMonIsAngry: ; 0x80cd1 text "Wild @" text_from_ram wEnemyMonNick text_start diff --git a/data/common_text/common_text_1.asm b/data/common_text/common_text_1.asm index 80b47013d..a6e867498 100644 --- a/data/common_text/common_text_1.asm +++ b/data/common_text/common_text_1.asm @@ -1121,7 +1121,7 @@ Text_RemainingTime:: text "Remaining Time" done -Text_YourPkmnsHPWasHealed:: +Text_YourMonsHPWasHealed:: text "Your #MON's HP" line "was healed." prompt diff --git a/data/common_text/common_text_2.asm b/data/common_text/common_text_2.asm index 183d254fc..12600c443 100644 --- a/data/common_text/common_text_2.asm +++ b/data/common_text/common_text_2.asm @@ -113,17 +113,17 @@ Text_StringBuffer2ExpPoints:: text " EXP. Points!" prompt -Text_GoPkmn:: +Text_GoMon:: text "Go! @@" -Text_DoItPkmn:: +Text_DoItMon:: text "Do it! @@" -Text_GoForItPkmn:: +Text_GoForItMon:: text "Go for it," line "@@" -Text_YourFoesWeakGetmPkmn:: +Text_YourFoesWeakGetmMon:: text "Your foe's weak!" line "Get'm, @@" @@ -618,7 +618,7 @@ UnknownText_0x1c0bee:: cont "time to use that!" prompt -Text_YouDontHaveAPkmn:: +Text_YouDontHaveAMon:: text "You don't have a" line "#MON!" prompt diff --git a/data/common_text/common_text_3.asm b/data/common_text/common_text_3.asm index 7724775a4..4ed12258b 100644 --- a/data/common_text/common_text_3.asm +++ b/data/common_text/common_text_3.asm @@ -1139,14 +1139,14 @@ UnknownText_0x1c59a3:: para "" done -Text_OnlyThreePkmnMayBeEntered:: +Text_OnlyThreeMonMayBeEntered:: text "Only three #MON" line "may be entered." para "" done -Text_ThePkmnMustAllBeDifferentKinds:: +Text_TheMonMustAllBeDifferentKinds:: text "The @" text_from_ram wStringBuffer2 text " #MON" @@ -1156,7 +1156,7 @@ Text_ThePkmnMustAllBeDifferentKinds:: para "" done -Text_ThePkmnMustNotHoldTheSameItems:: +Text_TheMonMustNotHoldTheSameItems:: text "The @" text_from_ram wStringBuffer2 text " #MON" diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 16281d035..3a14a19ee 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -15,19 +15,19 @@ PredefPointers:: ; 856b add_predef FillPP add_predef TryAddMonToParty add_predef AddTempmonToParty - add_predef SendGetPkmnIntoFromBox - add_predef SendPkmnIntoBox + add_predef SendGetMonIntoFromBox + add_predef SendMonIntoBox add_predef GiveEgg add_predef AnimateHPBar - add_predef CalcPkmnStats - add_predef CalcPkmnStatC + add_predef CalcMonStats + add_predef CalcMonStatC add_predef CanLearnTMHMMove add_predef GetTMHMMove add_predef LinkTextboxAtHL ; $ 10 add_predef PrintMoveDesc add_predef UpdatePlayerHUD add_predef PlaceGraphic - add_predef CheckPlayerPartyForFitPkmn + add_predef CheckPlayerPartyForFitMon add_predef UpdateEnemyHUD add_predef StartBattle add_predef FillInExpBar @@ -38,7 +38,7 @@ PredefPointers:: ; 856b add_predef EvolveAfterBattle add_predef TradeAnimationPlayer2 add_predef TradeAnimation - add_predef CopyPkmnToTempMon + add_predef CopyMonToTempMon add_predef ListMoves ; $20 add_predef PlaceNonFaintStatus add_predef Unused_PlaceEnemyHPLevel diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm index ad7b6529d..56b679741 100644 --- a/data/radio/oaks_pkmn_talk_routes.asm +++ b/data/radio/oaks_pkmn_talk_routes.asm @@ -1,6 +1,6 @@ ; Oak's Pokémon Talk will list wild Pokémon on these maps. -OaksPkmnTalkRoutes: +OaksPKMNTalkRoutes: map ROUTE_29 map ROUTE_46 map ROUTE_30 @@ -16,4 +16,4 @@ OaksPkmnTalkRoutes: map ROUTE_45 map ROUTE_36 map ROUTE_31 -OaksPkmnTalkRoutesEnd +OaksPKMNTalkRoutesEnd diff --git a/data/radio/pnp_hidden_places.asm b/data/radio/pnp_hidden_places.asm index 4cf1987d3..689dd4814 100644 --- a/data/radio/pnp_hidden_places.asm +++ b/data/radio/pnp_hidden_places.asm @@ -10,4 +10,4 @@ PnP_HiddenPlaces: map ROUTE_16 map ROUTE_14 map CINNABAR_POKECENTER_2F_BETA -PnP_HiddenPlacesEnd +PnP_HiddenPlacesEnd: diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 5abf9d08a..24b147942 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -261,7 +261,7 @@ This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engi ret nz .force_struggle - ld hl, BattleText_PkmnHasNoMovesLeft + ld hl, BattleText_MonHasNoMovesLeft call StdBattleTextBox ld c, 60 call DelayFrames diff --git a/docs/images/hp_exp_bar_border_fix.png b/docs/images/hp_exp_bar_border_fix.png index 26135576f..dd79d6636 100644 Binary files a/docs/images/hp_exp_bar_border_fix.png and b/docs/images/hp_exp_bar_border_fix.png differ diff --git a/docs/images/port_fix.png b/docs/images/port_fix.png index 3156b065d..45fa26338 100644 Binary files a/docs/images/port_fix.png and b/docs/images/port_fix.png differ diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index 4d1eea2e8..8fb420bd6 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -74,7 +74,7 @@ SwitchOften: ; 38045 ld a, [wEnemySwitchMonParam] and $f inc a - ; In register 'a' is the number (1-6) of the Pkmn to switch to + ; In register 'a' is the number (1-6) of the mon to switch to ld [wEnemySwitchMonIndex], a jp AI_TrySwitch ; 38083 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 0fe77df40..df9d4cbc5 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -47,7 +47,7 @@ DoBattle: ; 3c000 .player_2 call LoadTileMapToTempTileMap - call CheckPlayerPartyForFitPkmn + call CheckPlayerPartyForFitMon ld a, d and a jp z, LostBattle @@ -86,7 +86,7 @@ DoBattle: ; 3c000 call ResetBattleParticipants call InitBattleMon call ResetPlayerStatLevels - call SendOutPkmnText + call SendOutMonText call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon @@ -1697,7 +1697,7 @@ HandleScreens: ; 3cb36 res SCREENS_LIGHT_SCREEN, [hl] push hl push de - ld hl, BattleText_PkmnLightScreenFell + ld hl, BattleText_MonsLightScreenFell call StdBattleTextBox pop de pop hl @@ -1711,7 +1711,7 @@ HandleScreens: ; 3cb36 ld [de], a ret nz res SCREENS_REFLECT, [hl] - ld hl, BattleText_PkmnReflectFaded + ld hl, BattleText_MonsReflectFaded jp StdBattleTextBox ; 3cb9e @@ -1822,7 +1822,7 @@ SubtractHPFromTarget: ; 3cc39 ; 3cc3f SubtractHPFromUser: ; 3cc3f -; Subtract HP from Pkmn +; Subtract HP from mon call SubtractHP jp UpdateHPBarBattleHuds ; 3cc45 @@ -2054,7 +2054,7 @@ HandleEnemyMonFaint: ; 3cd55 xor a ld [wWhichMonFaintedFirst], a call UpdateBattleStateAndExperienceAfterEnemyFaint - call CheckPlayerPartyForFitPkmn + call CheckPlayerPartyForFitMon ld a, d and a jp z, LostBattle @@ -2186,7 +2186,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01 call PlayerMonFaintHappinessMod .player_mon_did_not_faint - call CheckPlayerPartyForFitPkmn + call CheckPlayerPartyForFitMon ld a, d and a ret z @@ -2308,7 +2308,7 @@ FaintYourPokemon: ; 3cef1 hlcoord 9, 7 lb bc, 5, 11 call ClearBox - ld hl, BattleText_PkmnFainted + ld hl, BattleText_MonFainted jp StdBattleTextBox ; 3cf14 @@ -2322,7 +2322,7 @@ FaintEnemyPokemon: ; 3cf14 hlcoord 1, 0 lb bc, 4, 10 call ClearBox - ld hl, BattleText_EnemyPkmnFainted + ld hl, BattleText_EnemyMonFainted jp StdBattleTextBox ; 3cf35 @@ -2670,7 +2670,7 @@ HandlePlayerMonFaint: ; 3d14e ld a, $1 ld [wWhichMonFaintedFirst], a call PlayerMonFaintHappinessMod - call CheckPlayerPartyForFitPkmn + call CheckPlayerPartyForFitMon ld a, d and a jp z, LostBattle @@ -2829,7 +2829,7 @@ ForcePlayerMonChoice: ; 3d227 call CloseWindow call GetMemSGBLayout call SetPalettes - call SendOutPkmnText + call SendOutMonText call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon @@ -2851,7 +2851,7 @@ PlayerPartyMonEntrance: ; 3d2b3 call AddBattleParticipant call InitBattleMon call ResetPlayerStatLevels - call SendOutPkmnText + call SendOutMonText call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon @@ -2934,7 +2934,7 @@ SwitchMonAlreadyOut: ; 3d34f cp [hl] jr nz, .notout - ld hl, BattleText_PkmnIsAlreadyOut + ld hl, BattleText_MonIsAlreadyOut call StdBattleTextBox scf ret @@ -3197,11 +3197,11 @@ ForceEnemySwitch: ; 3d4c3 ld a, [wEnemySwitchMonIndex] dec a ld b, a - call LoadEnemyPkmnToSwitchTo + call LoadEnemyMonToSwitchTo call ClearEnemyMonBox call NewEnemyMonStatus call ResetEnemyStatLevels - call Function_SetEnemyPkmnAndSendOutAnimation + call Function_SetEnemyMonAndSendOutAnimation call BreakAttraction call ResetBattleParticipants ret @@ -3214,15 +3214,15 @@ EnemySwitch: ; 3d4e1 call ResetEnemyBattleVars call CheckWhetherSwitchmonIsPredetermined jr c, .skip - call FindPkmnInOTPartyToSwitchIntoBattle + call FindMonInOTPartyToSwitchIntoBattle .skip - ; 'b' contains the PartyNr of the Pkmn the AI will switch to - call LoadEnemyPkmnToSwitchTo + ; 'b' contains the PartyNr of the mon the AI will switch to + call LoadEnemyMonToSwitchTo call OfferSwitch push af call ClearEnemyMonBox call Function_BattleTextEnemySentOut - call Function_SetEnemyPkmnAndSendOutAnimation + call Function_SetEnemyMonAndSendOutAnimation pop af ret c ; If we're here, then we're switching too @@ -3240,15 +3240,15 @@ EnemySwitch_SetMode: ; 3d517 call ResetEnemyBattleVars call CheckWhetherSwitchmonIsPredetermined jr c, .skip - call FindPkmnInOTPartyToSwitchIntoBattle + call FindMonInOTPartyToSwitchIntoBattle .skip - ; 'b' contains the PartyNr of the Pkmn the AI will switch to - call LoadEnemyPkmnToSwitchTo + ; 'b' contains the PartyNr of the mon the AI will switch to + call LoadEnemyMonToSwitchTo ld a, 1 ld [wEnemyIsSwitching], a call ClearEnemyMonBox call Function_BattleTextEnemySentOut - jp Function_SetEnemyPkmnAndSendOutAnimation + jp Function_SetEnemyMonAndSendOutAnimation ; 3d533 CheckWhetherSwitchmonIsPredetermined: ; 3d533 @@ -3319,7 +3319,7 @@ AddBattleParticipant: ; 3d581 predef_jump SmallFarFlagAction ; 3d599 -FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599 +FindMonInOTPartyToSwitchIntoBattle: ; 3d599 ld b, $ff ld a, $1 ld [wBuffer1], a @@ -3347,7 +3347,7 @@ FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599 pop bc jr z, .discourage call LookUpTheEffectivenessOfEveryMove - call IsThePlayerPkmnTypesEffectiveAgainstOTPkmn + call IsThePlayerMonTypesEffectiveAgainstOTMon jr .loop .discourage @@ -3394,9 +3394,9 @@ LookUpTheEffectivenessOfEveryMove: ; 3d5d7 ret ; 3d618 -IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618 -; Calculates the effectiveness of the types of the PlayerPkmn -; against the OTPkmn +IsThePlayerMonTypesEffectiveAgainstOTMon: ; 3d618 +; Calculates the effectiveness of the types of the PlayerMon +; against the OTMon push bc ld hl, wOTPartyCount ld a, b @@ -3508,8 +3508,8 @@ ScoreMonTypeMatchups: ; 3d672 ret ; 3d6ca -LoadEnemyPkmnToSwitchTo: ; 3d6ca - ; 'b' contains the PartyNr of the Pkmn the AI will switch to +LoadEnemyMonToSwitchTo: ; 3d6ca + ; 'b' contains the PartyNr of the mon the AI will switch to ld a, b ld [wCurPartyMon], a ld hl, wOTPartyMon1Level @@ -3581,7 +3581,7 @@ OfferSwitch: ; 3d74b ld a, [wCurPartyMon] push af callfar Battle_GetTrainerName - ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangePkmn + ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon call StdBattleTextBox lb bc, 1, 7 call PlaceYesNoBox @@ -3637,14 +3637,14 @@ Function_BattleTextEnemySentOut: ; 3d7b8 jp WaitBGMap ; 3d7c7 -Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 +Function_SetEnemyMonAndSendOutAnimation: ; 3d7c7 ld a, [wTempEnemyMonSpecies] ld [wCurPartySpecies], a ld [wCurSpecies], a call GetBaseData ld a, OTPARTYMON ld [wMonType], a - predef CopyPkmnToTempMon + predef CopyMonToTempMon call GetEnemyMonFrontpic xor a @@ -3721,8 +3721,8 @@ ResetEnemyStatLevels: ; 3d867 ret ; 3d873 -CheckPlayerPartyForFitPkmn: ; 3d873 -; Has the player any Pkmn in his Party that can fight? +CheckPlayerPartyForFitMon: ; 3d873 +; Has the player any mon in his Party that can fight? ld a, [wPartyCount] ld e, a xor a @@ -4308,7 +4308,7 @@ PursuitSwitch: ; 3dc5b ld b, RESET_FLAG predef SmallFarFlagAction call PlayerMonFaintedAnimation - ld hl, BattleText_PkmnFainted + ld hl, BattleText_MonFainted jr .done_fainted .check_enemy_fainted @@ -4324,7 +4324,7 @@ PursuitSwitch: ; 3dc5b call PlaySFX call WaitSFX call EnemyMonFaintedAnimation - ld hl, BattleText_EnemyPkmnFainted + ld hl, BattleText_EnemyMonFainted .done_fainted call StdBattleTextBox @@ -5306,7 +5306,7 @@ TryPlayerSwitch: ; 3e358 ld a, [wCurPartyMon] cp d jr nz, .check_trapped - ld hl, BattleText_PkmnIsAlreadyOut + ld hl, BattleText_MonIsAlreadyOut call StdBattleTextBox jp BattleMenuPKMN_Loop @@ -5319,7 +5319,7 @@ TryPlayerSwitch: ; 3e358 jr z, .try_switch .trapped - ld hl, BattleText_PkmnCantBeRecalled + ld hl, BattleText_MonCantBeRecalled call StdBattleTextBox jp BattleMenuPKMN_Loop @@ -5396,7 +5396,7 @@ EnemyMonEntrance: ; 3e3ff ; 3e40b BattleMonEntrance: ; 3e40b - call WithdrawPkmnText + call WithdrawMonText ld c, 50 call DelayFrames @@ -5419,7 +5419,7 @@ BattleMonEntrance: ; 3e40b call AddBattleParticipant call InitBattleMon call ResetPlayerStatLevels - call SendOutPkmnText + call SendOutMonText call NewBattleMonStatus call BreakAttraction call SendOutPlayerMon @@ -5938,7 +5938,7 @@ CheckPlayerHasUsableMoves: ; 3e786 ret nz .force_struggle - ld hl, BattleText_PkmnHasNoMovesLeft + ld hl, BattleText_MonHasNoMovesLeft call StdBattleTextBox ld c, 60 call DelayFrames @@ -6408,7 +6408,7 @@ LoadEnemyMon: ; 3e8eb ld de, wEnemyMonMaxHP ld b, FALSE ld hl, wEnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1) ; wLinkBattleRNs + 7 ; ? - predef CalcPkmnStats + predef CalcMonStats ; If we're in a trainer battle, ; get the rest of the parameters from the party struct @@ -7350,7 +7350,7 @@ GiveExperiencePoints: ; 3ee3b ld a, [wCurPartyMon] ld hl, wPartyMonNicknames call GetNick - ld hl, Text_PkmnGainedExpPoint + ld hl, Text_MonGainedExpPoint call BattleTextBox ld a, [wStringBuffer2 + 1] ld [hQuotient + 2], a @@ -7419,7 +7419,7 @@ GiveExperiencePoints: ; 3ee3b .not_max_exp xor a ; PARTYMON ld [wMonType], a - predef CopyPkmnToTempMon + predef CopyMonToTempMon callfar CalcLevel pop bc ld hl, MON_LEVEL @@ -7456,7 +7456,7 @@ GiveExperiencePoints: ; 3ee3b add hl, bc push bc ld b, TRUE - predef CalcPkmnStats + predef CalcMonStats pop bc pop de ld hl, MON_MAXHP + 1 @@ -7532,7 +7532,7 @@ GiveExperiencePoints: ; 3ee3b .skip_animation2 xor a ; PARTYMON ld [wMonType], a - predef CopyPkmnToTempMon + predef CopyMonToTempMon hlcoord 9, 0 ld b, $a ld c, $9 @@ -7648,7 +7648,7 @@ BoostExp: ; 3f106 ret ; 3f11b -Text_PkmnGainedExpPoint: ; 3f11b +Text_MonGainedExpPoint: ; 3f11b text_jump Text_Gained start_asm ld hl, TextJump_StringBuffer2ExpPoints @@ -7692,7 +7692,7 @@ AnimateExpBar: ; 3f136 ld [wd002], a xor a ; PARTYMON ld [wMonType], a - predef CopyPkmnToTempMon + predef CopyMonToTempMon ld a, [wTempMonLevel] ld b, a ld e, a @@ -7856,23 +7856,23 @@ AnimateExpBar: ; 3f136 ld [hBGMapMode], a ret -SendOutPkmnText: ; 3f26d +SendOutMonText: ; 3f26d ld a, [wLinkMode] and a jr z, .not_linked - ld hl, JumpText_GoPkmn ; If we're in a LinkBattle print just "Go " + ld hl, JumpText_GoMon ; If we're in a LinkBattle print just "Go " ld a, [wBattleHasJustStarted] ; unless this (unidentified) variable is set and a jr nz, .skip_to_textbox .not_linked -; Depending on the HP of the enemy Pkmn, the game prints a different text +; Depending on the HP of the enemy mon, the game prints a different text ld hl, wEnemyMonHP ld a, [hli] or [hl] - ld hl, JumpText_GoPkmn + ld hl, JumpText_GoMon jr z, .skip_to_textbox ; compute enemy helth remaining as a percentage @@ -7901,43 +7901,43 @@ SendOutPkmnText: ; 3f26d call Divide ld a, [hQuotient + 2] - ld hl, JumpText_GoPkmn + ld hl, JumpText_GoMon cp 70 jr nc, .skip_to_textbox - ld hl, JumpText_DoItPkmn + ld hl, JumpText_DoItMon cp 40 jr nc, .skip_to_textbox - ld hl, JumpText_GoForItPkmn + ld hl, JumpText_GoForItMon cp 10 jr nc, .skip_to_textbox - ld hl, JumpText_YourFoesWeakGetmPkmn + ld hl, JumpText_YourFoesWeakGetmMon .skip_to_textbox jp BattleTextBox ; 3f2d1 -JumpText_GoPkmn: ; 3f2d1 - text_jump Text_GoPkmn +JumpText_GoMon: ; 3f2d1 + text_jump Text_GoMon start_asm jr Function_TextJump_BattleMonNick01 ; 3f2d6 -JumpText_DoItPkmn: ; 3f2d8 - text_jump Text_DoItPkmn +JumpText_DoItMon: ; 3f2d8 + text_jump Text_DoItMon start_asm jr Function_TextJump_BattleMonNick01 ; 3f2dd -JumpText_GoForItPkmn: ; 3f2df - text_jump Text_GoForItPkmn +JumpText_GoForItMon: ; 3f2df + text_jump Text_GoForItMon start_asm jr Function_TextJump_BattleMonNick01 ; 3f2e4 -JumpText_YourFoesWeakGetmPkmn: ; 3f2e6 - text_jump Text_YourFoesWeakGetmPkmn +JumpText_YourFoesWeakGetmMon: ; 3f2e6 + text_jump Text_YourFoesWeakGetmMon start_asm Function_TextJump_BattleMonNick01: ; 3f2eb ld hl, TextJump_BattleMonNick01 @@ -7949,14 +7949,14 @@ TextJump_BattleMonNick01: ; 3f2ef db "@" ; 3f2f4 -WithdrawPkmnText: ; 3f2f4 - ld hl, .WithdrawPkmnText +WithdrawMonText: ; 3f2f4 + ld hl, .WithdrawMonText jp BattleTextBox -.WithdrawPkmnText: +.WithdrawMonText: text_jump Text_BattleMonNickComma start_asm -; Print text to withdraw Pkmn +; Print text to withdraw mon ; depending on HP the message is different push de push bc @@ -8037,7 +8037,7 @@ Unreferenced_HandleSafariAngerEatingStatus: and a jr z, .angry dec [hl] - ld hl, BattleText_WildPkmnIsEating + ld hl, BattleText_WildMonIsEating jr .finish .angry @@ -8046,7 +8046,7 @@ Unreferenced_HandleSafariAngerEatingStatus: and a ret z dec [hl] - ld hl, BattleText_WildPkmnIsAngry + ld hl, BattleText_WildMonIsAngry jr nz, .finish push hl ld a, [wEnemyMonSpecies] diff --git a/engine/billspc.asm b/engine/billspc.asm index 57c4faac4..42a761634 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -203,7 +203,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0) ld hl, wBillsPC_ScrollPosition add [hl] ld [wCurPartyMon], a - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox call ReleasePKMN_ByePKMN @@ -463,7 +463,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) ld hl, wBillsPC_ScrollPosition add [hl] ld [wCurPartyMon], a - ld a, PC_DEPOSIT + ld a, REMOVE_BOX ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox call ReleasePKMN_ByePKMN @@ -591,7 +591,7 @@ _MovePKMNWithoutMail: ; e2759 ld a, [hl] and A_BUTTON jr nz, .a_button - call MovePkmnWithoutMail_DPad + call MoveMonWithoutMail_DPad jr c, .d_pad and a ret z @@ -750,7 +750,7 @@ _MovePKMNWithoutMail: ; e2759 ld a, [hl] and A_BUTTON jr nz, .a_button_2 - call MovePkmnWithoutMail_DPad_2 + call MoveMonWithoutMail_DPad_2 jr c, .dpad_2 and a ret z @@ -862,7 +862,7 @@ Withdraw_UpDown: ; e29b5 (38:69b5) jp BillsPC_JoypadDidNothing ; e29d0 (38:69d0) -MovePkmnWithoutMail_DPad: ; e29d0 +MoveMonWithoutMail_DPad: ; e29d0 ld hl, hJoyLast ld a, [wBillsPC_NumMonsOnScreen] ld d, a @@ -886,7 +886,7 @@ MovePkmnWithoutMail_DPad: ; e29d0 jr nz, BillsPC_PressRight jr BillsPC_JoypadDidNothing -MovePkmnWithoutMail_DPad_2: ; e29f4 +MoveMonWithoutMail_DPad_2: ; e29f4 ld hl, hJoyLast ld a, [wBillsPC_NumMonsOnScreen] ld d, a @@ -1763,7 +1763,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6) ld bc, PARTYMON_STRUCT_LENGTH call CopyBytes call CloseSRAM - farcall CalcwBufferMonStats + farcall CalcBufferMonStats ret .party @@ -1806,7 +1806,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6) ld bc, BOXMON_STRUCT_LENGTH call CopyMonToTemp call CloseSRAM - farcall CalcwBufferMonStats + farcall CalcBufferMonStats ret DepositPokemon: ; e307c (38:707c) @@ -1819,9 +1819,9 @@ DepositPokemon: ; e307c (38:707c) call GetNick ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - predef SendGetPkmnIntoFromBox + predef SendGetMonIntoFromBox jr c, .asm_boxisfull - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox ld a, [wCurPartySpecies] @@ -1874,9 +1874,9 @@ TryWithdrawPokemon: ; e30fa (38:70fa) call CloseSRAM xor a ld [wPokemonWithdrawDepositParameter], a - predef SendGetPkmnIntoFromBox + predef SendGetMonIntoFromBox jr c, .PartyFull - ld a, PC_DEPOSIT + ld a, REMOVE_BOX ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox ld a, [wCurPartySpecies] @@ -2010,7 +2010,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 .dw_return ; e322a pop af ld e, a - farcall MovePkmnWOMail_InsertMon_SaveGame + farcall MoveMonWOMail_InsertMon_SaveGame ret ; e3233 @@ -2095,7 +2095,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld a, [wBillsPC_BackupLoadedBox] dec a ld e, a - farcall MovePkmnWOMail_SaveGame + farcall MoveMonWOMail_SaveGame ld a, [wBillsPC_BackupCursorPosition] ld hl, wBillsPC_BackupScrollPosition add [hl] @@ -2112,8 +2112,8 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld bc, BOXMON_STRUCT_LENGTH call CopyMonToTemp call CloseSRAM - farcall CalcwBufferMonStats - ld a, PC_DEPOSIT + farcall CalcBufferMonStats + ld a, REMOVE_BOX ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox ret @@ -2123,7 +2123,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld a, [wBillsPC_LoadedBox] dec a ld e, a - farcall MovePkmnWOMail_SaveGame + farcall MoveMonWOMail_SaveGame ld a, [wBillsPC_CursorPosition] ld hl, wBillsPC_ScrollPosition add [hl] @@ -2146,7 +2146,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld hl, wPartyMon1Species ld bc, PARTYMON_STRUCT_LENGTH call CopyMonToTemp - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox ret diff --git a/engine/billspctop.asm b/engine/billspctop.asm index 2c0a110ba..8904aa4d6 100755 --- a/engine/billspctop.asm +++ b/engine/billspctop.asm @@ -117,7 +117,7 @@ BillsPC_MovePKMNMenu: ; e4cd jr .quit .no_mail - farcall StartMovePkmnWOMail_SaveGame + farcall StartMoveMonWOMail_SaveGame jr c, .quit farcall _MovePKMNWithoutMail call ReturnToMapFromSubmenu @@ -145,30 +145,30 @@ BillsPC_DepositMenu: ; e4fe (3:64fe) Unreferenced_Functione512: ld a, [wPartyCount] and a - jr z, .no_pkmn + jr z, .no_mon cp 2 - jr c, .only_one_pkmn + jr c, .only_one_mon and a ret -.no_pkmn - ld hl, .Text_NoPKMN +.no_mon + ld hl, .Text_NoMon call MenuTextBoxBackup scf ret -.only_one_pkmn - ld hl, .Text_ItsYourLastPKMN +.only_one_mon + ld hl, .Text_ItsYourLastMon call MenuTextBoxBackup scf ret -.Text_NoPKMN: ; 0xe52e +.Text_NoMon: ; 0xe52e ; You don't have a single #MON! text_jump UnknownText_0x1c1062 db "@" -.Text_ItsYourLastPKMN: ; 0xe533 +.Text_ItsYourLastMon: ; 0xe533 ; You can't deposit your last #MON! text_jump UnknownText_0x1c1080 db "@" diff --git a/engine/breeding.asm b/engine/breeding.asm index 7756d30ef..41839bb23 100755 --- a/engine/breeding.asm +++ b/engine/breeding.asm @@ -288,8 +288,8 @@ HatchEggs: ; 16f70 (5:6f70) push hl ld bc, MON_STAT_EXP - 1 add hl, bc - ld b, $0 - predef CalcPkmnStats + ld b, FALSE + predef CalcMonStats pop bc ld hl, MON_MAXHP add hl, bc diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 4b4494925..ec2f5a13c 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -95,7 +95,7 @@ Function170139: ; 170139 ld [wMisc], a ld a, l ld [wMisc + 1], a - ld hl, wBT_OTTempPkmn1DVs + ld hl, wBT_OTTempMon1DVs ld a, [wPlayerID] ld [hli], a ld a, [wPlayerID + 1] @@ -112,7 +112,7 @@ Function170139: ; 170139 ld bc, wPlayerID ld de, wPlayerGender farcall GetMobileOTTrainerClass - ld de, wBT_OTTempPkmn1CaughtGender + ld de, wBT_OTTempMon1CaughtGender ld a, c ld [de], a inc de @@ -279,59 +279,59 @@ RunBattleTowerTrainer: ; 17024d ReadBTTrainerParty: ; 1702b7 -; Initialise the BattleTower-Trainer and his Pkmn +; Initialise the BattleTower-Trainer and his mon call CopyBTTrainer_FromBT_OT_TowBT_OTTemp ; Check the nicknames for illegal characters, and replace bad nicknames ; with their species names. - ld de, wBT_OTTempPkmn1Name ; $c643 + ld de, wBT_OTTempMon1Name ; $c643 ld c, MON_NAME_LENGTH farcall CheckStringForErrors jr nc, .skip_mon_1 - ld a, [wBT_OTTempPkmn1] + ld a, [wBT_OTTempMon1] ld [wNamedObjectIndexBuffer], a call GetPokemonName ld l, e ld h, d - ld de, wBT_OTTempPkmn1Name ; $c643 + ld de, wBT_OTTempMon1Name ; $c643 ld bc, MON_NAME_LENGTH call CopyBytes .skip_mon_1 - ld de, wBT_OTTempPkmn2Name ; $c67e + ld de, wBT_OTTempMon2Name ; $c67e ld c, MON_NAME_LENGTH farcall CheckStringForErrors jr nc, .skip_mon_2 - ld a, [wBT_OTTempPkmn2] ; [$c64e] + ld a, [wBT_OTTempMon2] ; [$c64e] ld [wNamedObjectIndexBuffer], a call GetPokemonName ld l, e ld h, d - ld de, wBT_OTTempPkmn2Name ; $c67e + ld de, wBT_OTTempMon2Name ; $c67e ld bc, MON_NAME_LENGTH call CopyBytes .skip_mon_2 - ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9 + ld de, wBT_OTTempMon3Name ; $c686 + 51 = $c6b9 ld c, MON_NAME_LENGTH farcall CheckStringForErrors jr nc, .skip_mon_3 - ld a, [wBT_OTTempPkmn3] ; [$c689] + ld a, [wBT_OTTempMon3] ; [$c689] ld [wNamedObjectIndexBuffer], a call GetPokemonName ld l, e ld h, d - ld de, wBT_OTTempPkmn3Name ; $c686 + 51 = $c6b9 + ld de, wBT_OTTempMon3Name ; $c686 + 51 = $c6b9 ld bc, MON_NAME_LENGTH call CopyBytes .skip_mon_3 ; Add the terminator character to each of these names ld a, "@" - ld [wBT_OTTempPkmn1NameEnd - 1], a ; $c64d - ld [wBT_OTTempPkmn2NameEnd - 1], a ; $c688 - ld [wBT_OTTempPkmn3NameEnd - 1], a ; $c68a + 57 = $c6c3 + ld [wBT_OTTempMon1NameEnd - 1], a ; $c64d + ld [wBT_OTTempMon2NameEnd - 1], a ; $c688 + ld [wBT_OTTempMon3NameEnd - 1], a ; $c68a + 57 = $c6c3 ; Fix errors in the movesets call CheckBTMonMovesForErrors ; Repair the trainer name if needed, then copy it to wOTPlayerName @@ -360,7 +360,7 @@ ReadBTTrainerParty: ; 1702b7 ld a, HIGH(wOTPartyMonNicknames) ld [wBGMapBuffer + 1], a - ; Copy Pkmn into Memory from the address in hl + ; Copy mon into Memory from the address in hl ld de, wOTPartyMon1Species ld bc, wOTPartyCount ld a, BATTLETOWER_PARTY_LENGTH @@ -398,7 +398,7 @@ ReadBTTrainerParty: ; 1702b7 ValidateBTParty: ; 170394 ; Check for and fix errors in party data - ld hl, wBT_OTTempPkmn1Species + ld hl, wBT_OTTempMon1Species ld d, BATTLETOWER_PARTY_LENGTH .pkmn_loop push de @@ -483,8 +483,8 @@ endr push de ld hl, MON_STAT_EXP - 1 add hl, bc - ld b, $1 - predef CalcPkmnStats + ld b, TRUE + predef CalcMonStats pop de pop hl dec de diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index bfb5cf885..f3db16293 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -12,9 +12,9 @@ Function_LoadOpponentTrainerAndPokemons: ; 1f8000 ; Write $ff into the Item-Slots ld a, $ff - ld [wBT_OTPkmn1Item], a - ld [wBT_OTPkmn2Item], a - ld [wBT_OTPkmn3Item], a + ld [wBT_OTMon1Item], a + ld [wBT_OTMon2Item], a + ld [wBT_OTMon3Item], a ; Set wBT_OTTrainer as start address to write the following data to ld de, wBT_OTTrainer @@ -32,8 +32,8 @@ if DEF(_CRYSTAL11) else ; Crystal 1.0 used the wrong constant here, so only the first 21 ; trainers in BattleTowerTrainers can be sampled. - maskbits BATTLETOWER_NUM_UNIQUE_PKMN - cp BATTLETOWER_NUM_UNIQUE_PKMN + maskbits BATTLETOWER_NUM_UNIQUE_MON + cp BATTLETOWER_NUM_UNIQUE_MON endc jr nc, .resample ld b, a @@ -68,7 +68,7 @@ endc ld bc, NAME_LENGTH call CopyBytes - call Function_LoadRandomBattleTowerPkmn + call Function_LoadRandomBattleTowerMon pop af ld hl, BattleTowerTrainerData @@ -92,15 +92,15 @@ endc ret -Function_LoadRandomBattleTowerPkmn: ; 1f8081 +Function_LoadRandomBattleTowerMon: ; 1f8081 ld c, BATTLETOWER_PARTY_LENGTH .loop push bc - ld a, BANK(sBTPkmnPrevTrainer1) + ld a, BANK(sBTMonPrevTrainer1) call GetSRAMBank -.FindARandomBattleTowerPkmn: - ; From Which LevelGroup are the Pkmn loaded +.FindARandomBattleTowerMon: + ; From Which LevelGroup are the mon loaded ; a = 1..10 ld a, [wBTChoiceOfLvlGroup] dec a @@ -115,12 +115,12 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 ld a, [hRandomAdd] add b ld b, a - maskbits BATTLETOWER_NUM_UNIQUE_PKMN - cp BATTLETOWER_NUM_UNIQUE_PKMN + maskbits BATTLETOWER_NUM_UNIQUE_MON + cp BATTLETOWER_NUM_UNIQUE_MON jr nc, .resample - ; in register 'a' is the chosen Pkmn of the LevelGroup + ; in register 'a' is the chosen mon of the LevelGroup - ; Check if Pkmn was already loaded before + ; Check if mon was already loaded before ; Check current and the 2 previous teams ; includes check if item is double at the current team ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH @@ -129,42 +129,42 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 ld b, a ld a, [hld] ld c, a - ld a, [wBT_OTPkmn1] + ld a, [wBT_OTMon1] cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [wBT_OTPkmn1Item] + jr z, .FindARandomBattleTowerMon + ld a, [wBT_OTMon1Item] cp c - jr z, .FindARandomBattleTowerPkmn - ld a, [wBT_OTPkmn2] + jr z, .FindARandomBattleTowerMon + ld a, [wBT_OTMon2] cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [wBT_OTPkmn2Item] + jr z, .FindARandomBattleTowerMon + ld a, [wBT_OTMon2Item] cp c - jr z, .FindARandomBattleTowerPkmn - ld a, [wBT_OTPkmn3] + jr z, .FindARandomBattleTowerMon + ld a, [wBT_OTMon3] cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [wBT_OTPkmn3Item] + jr z, .FindARandomBattleTowerMon + ld a, [wBT_OTMon3Item] cp c - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevTrainer1] + jr z, .FindARandomBattleTowerMon + ld a, [sBTMonPrevTrainer1] cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevTrainer2] + jr z, .FindARandomBattleTowerMon + ld a, [sBTMonPrevTrainer2] cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevTrainer3] + jr z, .FindARandomBattleTowerMon + ld a, [sBTMonPrevTrainer3] cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevPrevTrainer1] + jr z, .FindARandomBattleTowerMon + ld a, [sBTMonPrevPrevTrainer1] cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevPrevTrainer2] + jr z, .FindARandomBattleTowerMon + ld a, [sBTMonPrevPrevTrainer2] cp b - jr z, .FindARandomBattleTowerPkmn - ld a, [sBTPkmnPrevPrevTrainer3] + jr z, .FindARandomBattleTowerMon + ld a, [sBTMonPrevPrevTrainer3] cp b - jr z, .FindARandomBattleTowerPkmn + jr z, .FindARandomBattleTowerMon ld bc, PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH call CopyBytes @@ -193,18 +193,18 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081 dec c jp nz, .loop - ld a, [sBTPkmnPrevTrainer1] - ld [sBTPkmnPrevPrevTrainer1], a - ld a, [sBTPkmnPrevTrainer2] - ld [sBTPkmnPrevPrevTrainer2], a - ld a, [sBTPkmnPrevTrainer3] - ld [sBTPkmnPrevPrevTrainer3], a - ld a, [wBT_OTPkmn1] - ld [sBTPkmnPrevTrainer1], a - ld a, [wBT_OTPkmn2] - ld [sBTPkmnPrevTrainer2], a - ld a, [wBT_OTPkmn3] - ld [sBTPkmnPrevTrainer3], a + ld a, [sBTMonPrevTrainer1] + ld [sBTMonPrevPrevTrainer1], a + ld a, [sBTMonPrevTrainer2] + ld [sBTMonPrevPrevTrainer2], a + ld a, [sBTMonPrevTrainer3] + ld [sBTMonPrevPrevTrainer3], a + ld a, [wBT_OTMon1] + ld [sBTMonPrevTrainer1], a + ld a, [wBT_OTMon2] + ld [sBTMonPrevTrainer2], a + ld a, [wBT_OTMon3] + ld [sBTMonPrevTrainer3], a call CloseSRAM ret ; 1f814e diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index fc9fa948a..3b0c9f930 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -56,9 +56,9 @@ CheckForBattleTowerRules: ; 8b201 .TextPointers: ; 8b222 dw JumpText_ExcuseMeYoureNotReady - dw JumpText_OnlyThreePkmnMayBeEntered - dw JumpText_ThePkmnMustAllBeDifferentKinds - dw JumpText_ThePkmnMustNotHoldTheSameItems + dw JumpText_OnlyThreeMonMayBeEntered + dw JumpText_TheMonMustAllBeDifferentKinds + dw JumpText_TheMonMustNotHoldTheSameItems dw JumpText_YouCantTakeAnEgg ; 8b22c @@ -92,21 +92,21 @@ JumpText_EggDoesNotQualify: ; 0x8b242 db "@" ; 0x8b247 -JumpText_OnlyThreePkmnMayBeEntered: ; 0x8b247 +JumpText_OnlyThreeMonMayBeEntered: ; 0x8b247 ; Only three #MON may be entered. - text_jump Text_OnlyThreePkmnMayBeEntered + text_jump Text_OnlyThreeMonMayBeEntered db "@" ; 0x8b24c -JumpText_ThePkmnMustAllBeDifferentKinds: ; 0x8b24c +JumpText_TheMonMustAllBeDifferentKinds: ; 0x8b24c ; The @ #MON must all be different kinds. - text_jump Text_ThePkmnMustAllBeDifferentKinds + text_jump Text_TheMonMustAllBeDifferentKinds db "@" ; 0x8b251 -JumpText_ThePkmnMustNotHoldTheSameItems: ; 0x8b251 +JumpText_TheMonMustNotHoldTheSameItems: ; 0x8b251 ; The @ #MON must not hold the same items. - text_jump Text_ThePkmnMustNotHoldTheSameItems + text_jump Text_TheMonMustNotHoldTheSameItems db "@" ; 0x8b256 diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 3d36bbfd7..1a00cc71f 100755 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -44,7 +44,7 @@ Special_DayCareMan: ; 166d6 call GetPriceToRetrieveBreedmon call DayCare_AskWithdrawBreedMon jr c, .print_text - farcall RetrievePokemonFromDayCareMan + farcall RetrieveMonFromDayCareMan call DayCare_GetBackMonForMoney ld hl, wDayCareMan res 0, [hl] @@ -83,7 +83,7 @@ Special_DayCareLady: ; 1672a call GetPriceToRetrieveBreedmon call DayCare_AskWithdrawBreedMon jr c, .print_text - farcall RetrievePokemonFromDayCareLady + farcall RetrieveMonFromDayCareLady call DayCare_GetBackMonForMoney ld hl, wDayCareLady res 0, [hl] @@ -566,8 +566,8 @@ DayCare_GiveEgg: ; 169ac ld e, l pop hl push bc - ld b, $0 - predef CalcPkmnStats + ld b, FALSE + predef CalcMonStats pop bc ld hl, MON_HP add hl, bc diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 47916076f..5ea094db9 100755 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -145,7 +145,7 @@ DoPoisonStep:: ; 505da ld a, [wPartyCount] cp [hl] jr nz, .party_loop - predef CheckPlayerPartyForFitPkmn + predef CheckPlayerPartyForFitMon ld a, d ld [wScriptVar], a ret diff --git a/engine/events/special.asm b/engine/events/special.asm index 081606512..e23aaae8c 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -118,7 +118,7 @@ Special_ReturnShuckle: ; 737e cp 150 ld a, SHUCKIE_HAPPY jr nc, .HappyToStayWithYou - xor a ; take from pc + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a callfar RemoveMonFromPartyOrBox ld a, SHUCKIE_RETURNED diff --git a/engine/evolve.asm b/engine/evolve.asm index 5fb5aff46..5a7e75dfa 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -55,7 +55,7 @@ EvolveAfterBattle_MasterLoop push hl xor a ld [wMonType], a - predef CopyPkmnToTempMon + predef CopyMonToTempMon pop hl .loop @@ -264,8 +264,8 @@ EvolveAfterBattle_MasterLoop ld hl, wTempMonExp + 2 ld de, wTempMonMaxHP - ld b, $1 - predef CalcPkmnStats + ld b, TRUE + predef CalcMonStats ld a, [wCurPartyMon] ld hl, wPartyMons diff --git a/engine/item_effects.asm b/engine/item_effects.asm index 114b2cb70..6205f78ca 100644 --- a/engine/item_effects.asm +++ b/engine/item_effects.asm @@ -623,7 +623,7 @@ ParkBall: ; e8a2 .SendToPC: call ClearSprites - predef SendPkmnIntoBox + predef SendMonIntoBox farcall SetBoxMonCaughtData @@ -1282,8 +1282,8 @@ UpdateStatsAfterItem: ; ee8c ld e, l ld a, MON_STAT_EXP - 1 call GetPartyParamLocation - ld b, $1 - predef_jump CalcPkmnStats + ld b, TRUE + predef_jump CalcMonStats ; ee9f RareCandy_StatBooster_ExitMenu: ; ee9f @@ -1422,7 +1422,7 @@ RareCandy: ; ef14 xor a ; PARTYMON ld [wMonType], a - predef CopyPkmnToTempMon + predef CopyMonToTempMon hlcoord 9, 0 ld b, 10 @@ -1846,13 +1846,13 @@ UseItem_SelectMon: ; f1f9 (3:71f9) push de push bc call ClearBGPalettes - call ChoosePkmnToUseItemOn + call ChooseMonToUseItemOn pop bc pop de pop hl ret -ChoosePkmnToUseItemOn: ; f21c (3:721c) +ChooseMonToUseItemOn: ; f21c (3:721c) farcall LoadPartyMenuGFX farcall InitPartyMenuWithCancel farcall InitPartyMenuGFX @@ -2154,7 +2154,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df) push bc ld a, PARTYMENUACTION_HEALING_ITEM ld [wPartyMenuActionText], a - call ChoosePkmnToUseItemOn + call ChooseMonToUseItemOn pop bc jr c, .set_carry ld a, [wPartyMenuCursor] @@ -2475,7 +2475,7 @@ Mysteryberry: ; f5bf ld [wd002], a .loop - ; Party Screen opens to choose on which Pkmn to use the Item + ; Party Screen opens to choose on which mon to use the Item ld b, PARTYMENUACTION_HEALING_ITEM call UseItem_SelectMon jp c, PPRestoreItem_Cancel diff --git a/engine/link.asm b/engine/link.asm index 59d1a149a..238ccb7f7 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -790,7 +790,7 @@ Link_PrepPartyData_Gen1: ; 28499 add hl, bc ld c, STAT_SATK ld b, TRUE - predef CalcPkmnStatC + predef CalcMonStatC pop bc pop de @@ -1069,7 +1069,7 @@ Function2868a: ; 2868a add hl, bc ld c, STAT_SATK ld b, TRUE - predef CalcPkmnStatC + predef CalcMonStatC pop bc pop hl ld a, [hQuotient + 1] @@ -1082,7 +1082,7 @@ Function2868a: ; 2868a add hl, bc ld c, STAT_SDEF ld b, TRUE - predef CalcPkmnStatC + predef CalcMonStatC pop bc pop hl ld a, [hQuotient + 1] @@ -1863,7 +1863,7 @@ LinkTrade: ; 28b87 add hl, bc ld a, [hl] ld [wd002], a - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a callfar RemoveMonFromPartyOrBox ld a, [wPartyCount] diff --git a/engine/mail.asm b/engine/mail.asm index c1a2db5aa..a8e9bd2c5 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -175,7 +175,7 @@ CheckPokeItem:: ; 44654 farcall CheckCurPartyMonFainted ld a, POKEMAIL_LAST_MON jr c, .close_sram_return - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox ld a, POKEMAIL_CORRECT diff --git a/engine/mon_stats.asm b/engine/mon_stats.asm index a06ad1a46..5ed15f4f5 100644 --- a/engine/mon_stats.asm +++ b/engine/mon_stats.asm @@ -343,7 +343,7 @@ Unused_PlaceEnemyHPLevel: call GetNick pop hl call PlaceString - call CopyPkmnToTempMon + call CopyMonToTempMon pop hl ld a, [wCurPartySpecies] cp EGG diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 0c0694851..0a4465f97 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -1,5 +1,5 @@ TryAddMonToParty: ; d88c -; Check if to copy wild Pkmn or generate new Pkmn +; Check if to copy wild mon or generate a new one ; Whose is it? ld de, wPartyCount ld a, [wMonType] @@ -47,6 +47,7 @@ TryAddMonToParty: ; d88c ld hl, wPlayerName ld bc, NAME_LENGTH call CopyBytes + ; Only initialize the nickname for party mon ld a, [wMonType] and a jr nz, .skipnickname @@ -76,24 +77,34 @@ TryAddMonToParty: ; d88c ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes GeneratePartyMonStats: ; d906 +; wBattleMode specifies whether it's a wild mon or not. +; wMonType specifies whether it's an opposing mon or not. +; wCurPartySpecies/wCurPartyLevel specify the species and level. +; hl points to the wPartyMon struct to fill. + ld e, l ld d, h push hl + + ; Initialize the species ld a, [wCurPartySpecies] ld [wCurSpecies], a call GetBaseData ld a, [wBaseDexNo] ld [de], a inc de + + ; Copy the item if it's a wild mon ld a, [wBattleMode] and a ld a, $0 jr z, .skipitem ld a, [wEnemyMonItem] - .skipitem ld [de], a inc de + + ; Copy the moves if it's a wild mon push de ld h, d ld l, e @@ -124,15 +135,19 @@ GeneratePartyMonStats: ; d906 .next pop de -rept 4 +rept NUM_MOVES inc de endr + + ; Initialize ID. ld a, [wPlayerID] ld [de], a inc de ld a, [wPlayerID + 1] ld [de], a inc de + + ; Initialize Exp. push de ld a, [wCurPartyLevel] ld d, a @@ -147,24 +162,28 @@ endr ld a, [hProduct + 3] ld [de], a inc de + + ; Initialize stat experience. xor a - ld b, $a + ld b, MON_DVS - MON_STAT_EXP .loop ld [de], a inc de dec b jr nz, .loop + pop hl push hl ld a, [wMonType] and $f - jr z, .generateDVs + jr z, .registerpokedex + push hl farcall GetTrainerDVs pop hl - jr .initializetrainermonstats + jr .initializeDVs -.generateDVs +.registerpokedex ld a, [wCurPartySpecies] ld [wd265], a dec a @@ -174,23 +193,26 @@ endr dec a call SetSeenAndCaughtMon pop de + pop hl push hl ld a, [wBattleMode] and a - jr nz, .copywildmonstats + jr nz, .copywildmonDVs + call Random ld b, a call Random ld c, a - -.initializetrainermonstats +.initializeDVs ld a, b ld [de], a inc de ld a, c ld [de], a inc de + + ; Initialize PP. push hl push de inc hl @@ -201,39 +223,52 @@ endr rept 4 inc de endr - ld a, 70 + + ; Initialize happiness. + ld a, BASE_HAPPINESS ld [de], a inc de + xor a + ; PokerusStatus ld [de], a inc de + ; CaughtData/CaughtTime/CaughtLevel ld [de], a inc de + ; CaughtGender/CaughtLocation ld [de], a inc de + + ; Initialize level. ld a, [wCurPartyLevel] ld [de], a inc de + xor a + ; Status ld [de], a inc de + ; Unused ld [de], a inc de - ld bc, 10 + + ; Initialize HP. + ld bc, MON_STAT_EXP - 1 add hl, bc - ld a, $1 + ld a, 1 ld c, a ld b, FALSE - call CalcPkmnStatC + call CalcMonStatC ld a, [hProduct + 2] ld [de], a inc de ld a, [hProduct + 3] ld [de], a inc de - jr .next2 + jr .initstats -.copywildmonstats +.copywildmonDVs ld a, [wEnemyMonDVs] ld [de], a inc de @@ -252,19 +287,27 @@ endr jr nz, .wildmonpploop pop hl + ; Initialize happiness. ld a, BASE_HAPPINESS ld [de], a inc de + xor a + ; PokerusStatus ld [de], a inc de + ; CaughtData/CaughtTime/CaughtLevel ld [de], a inc de + ; CaughtGender/CaughtLocation ld [de], a inc de + + ; Initialize level. ld a, [wCurPartyLevel] ld [de], a inc de + ld hl, wEnemyMonStatus ; Copy wEnemyMonStatus ld a, [hli] @@ -282,24 +325,24 @@ endr ld [de], a inc de -.next2 +.initstats ld a, [wBattleMode] dec a jr nz, .generatestats ld hl, wEnemyMonMaxHP - ld bc, 2 * 6 ; MaxHP + 5 Stats + ld bc, PARTYMON_STRUCT_LENGTH - MON_MAXHP call CopyBytes pop hl - jr .next3 + jr .registerunowndex .generatestats pop hl ld bc, MON_STAT_EXP - 1 add hl, bc - ld b, $0 ; if b = 1, then stat calculation takes stat exp into account. - call CalcPkmnStats + ld b, FALSE + call CalcMonStats -.next3 +.registerunowndex ld a, [wMonType] and $f jr nz, .done @@ -434,12 +477,12 @@ AddTempmonToParty: ; da96 and a ret -SendGetPkmnIntoFromBox: ; db3f -; Sents/Gets Pkmn into/from Box depending on Parameter -; wPokemonWithdrawDepositParameter == 0: get Pkmn into Party -; wPokemonWithdrawDepositParameter == 1: sent Pkmn into Box -; wPokemonWithdrawDepositParameter == 2: get Pkmn from DayCare -; wPokemonWithdrawDepositParameter == 3: put Pkmn into DayCare +SendGetMonIntoFromBox: ; db3f +; Sents/Gets mon into/from Box depending on Parameter +; wPokemonWithdrawDepositParameter == 0: get mon into Party +; wPokemonWithdrawDepositParameter == 1: sent mon into Box +; wPokemonWithdrawDepositParameter == 2: get mon from DayCare +; wPokemonWithdrawDepositParameter == 3: put mon into DayCare ld a, BANK(sBoxCount) call GetSRAMBank @@ -452,7 +495,7 @@ SendGetPkmnIntoFromBox: ; db3f ld hl, wBreedMon1Species jr z, .breedmon - ; we want to sent a Pkmn into the Box + ; we want to sent a mon into the Box ; so check if there's enough space ld hl, sBoxCount ld a, [hl] @@ -597,7 +640,7 @@ SendGetPkmnIntoFromBox: ; db3f srl a add $2 ld [wMonType], a - predef CopyPkmnToTempMon + predef CopyMonToTempMon callfar CalcLevel ld a, d ld [wCurPartyLevel], a @@ -616,8 +659,8 @@ SendGetPkmnIntoFromBox: ; db3f add hl, bc push bc - ld b, $1 - call CalcPkmnStats + ld b, TRUE + call CalcMonStats pop bc ld a, [wPokemonWithdrawDepositParameter] @@ -732,7 +775,7 @@ RestorePPofDepositedPokemon: ; dcb6 ret ; dd21 -RetrievePokemonFromDayCareMan: ; dd21 +RetrieveMonFromDayCareMan: ; dd21 ld a, [wBreedMon1Species] ld [wCurPartySpecies], a ld de, SFX_TRANSACTION @@ -745,10 +788,10 @@ RetrievePokemonFromDayCareMan: ; dd21 ld [wCurPartyLevel], a xor a ld [wPokemonWithdrawDepositParameter], a - jp Functiondd64 + jp RetrieveBreedmon ; dd42 -RetrievePokemonFromDayCareLady: ; dd42 +RetrieveMonFromDayCareLady: ; dd42 ld a, [wBreedMon2Species] ld [wCurPartySpecies], a ld de, SFX_TRANSACTION @@ -761,10 +804,10 @@ RetrievePokemonFromDayCareLady: ; dd42 ld [wCurPartyLevel], a ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a - jp Functiondd64 + jp RetrieveBreedmon ; dd64 -Functiondd64: ; dd64 +RetrieveBreedmon: ; dd64 ld hl, wPartyCount ld a, [hl] cp PARTY_LENGTH @@ -810,12 +853,12 @@ Functiondd64: ; dd64 pop hl call CopyBytes push hl - call Functionde1a + call GetLastPartyMon pop hl ld bc, BOXMON_STRUCT_LENGTH call CopyBytes call GetBaseData - call Functionde1a + call GetLastPartyMon ld b, d ld c, e ld hl, MON_LEVEL @@ -829,8 +872,8 @@ Functiondd64: ; dd64 ld hl, $a add hl, bc push bc - ld b, $1 - call CalcPkmnStats + ld b, TRUE + call CalcMonStats ld hl, wPartyMon1Moves ld a, [wPartyCount] dec a @@ -861,7 +904,7 @@ Functiondd64: ; dd64 ret ; de1a -Functionde1a: ; de1a +GetLastPartyMon: ; de1a ld a, [wPartyCount] dec a ld hl, wPartyMon1Species @@ -875,7 +918,7 @@ Functionde1a: ; de1a DepositMonWithDayCareMan: ; de2a ld de, wBreedMon1Nick call DepositBreedmon - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a jp RemoveMonFromPartyOrBox ; de37 @@ -883,7 +926,7 @@ DepositMonWithDayCareMan: ; de2a DepositMonWithDayCareLady: ; de37 ld de, wBreedMon2Nick call DepositBreedmon - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a jp RemoveMonFromPartyOrBox ; de44 @@ -904,8 +947,8 @@ DepositBreedmon: ; de44 ld bc, BOXMON_STRUCT_LENGTH jp CopyBytes -SendPkmnIntoBox: ; de6e -; Sends the Pkmn into one of Bills Boxes +SendMonIntoBox: ; de6e +; Sends the mon into one of Bills Boxes ; the data comes mainly from 'wEnemyMon:' ld a, BANK(sBoxCount) call GetSRAMBank @@ -1359,8 +1402,8 @@ ComputeNPCTrademonStats: ; e134 push de ld a, MON_STAT_EXP - 1 call GetPartyParamLocation - ld b, $1 - call CalcPkmnStats + ld b, TRUE + call CalcMonStats pop de ld a, MON_HP call GetPartyParamLocation @@ -1372,17 +1415,17 @@ ComputeNPCTrademonStats: ; e134 ret ; e167 -CalcPkmnStats: ; e167 -; Calculates all 6 Stats of a Pkmn +CalcMonStats: ; e167 +; Calculates all 6 Stats of a mon ; b: Take into account stat EXP if TRUE ; 'c' counts from 1-6 and points with 'wBaseStats' to the base value ; hl is the path to the Stat EXP -; results in $ffb5 and $ffb6 are saved in [de] +; de points to where the final stats will be saved ld c, $0 .loop inc c - call CalcPkmnStatC + call CalcMonStatC ld a, [hMultiplicand + 1] ld [de], a inc de @@ -1395,7 +1438,7 @@ CalcPkmnStats: ; e167 ret ; e17b -CalcPkmnStatC: ; e17b +CalcMonStatC: ; e17b ; 'c' is 1-6 and points to the BaseStat ; 1: HP ; 2: Attack @@ -1626,7 +1669,7 @@ GivePoke:: ; e277 ld a, [wCurPartySpecies] ld [wTempEnemyMonSpecies], a callfar LoadEnemyMon - call SendPkmnIntoBox + call SendMonIntoBox jp nc, .FailedToGiveMon ld a, BOXMON ld [wMonType], a diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 7082d5442..49f7123e1 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -185,8 +185,8 @@ DoNPCTrade: ; fcc63 ld a, [wOTTrademonSpecies] ld [wCurPartySpecies], a xor a - ld [wMonType], a - ld [wPokemonWithdrawDepositParameter], a + ld [wMonType], a ; PARTYMON + ld [wPokemonWithdrawDepositParameter], a ; REMOVE_PARTY callfar RemoveMonFromPartyOrBox predef TryAddMonToParty diff --git a/engine/pack.asm b/engine/pack.asm index e900c75b8..48911e035 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -494,7 +494,7 @@ UseItem: ; 10311 ret .NoPokemon: - ld hl, TextJump_YouDontHaveAPkmn + ld hl, TextJump_YouDontHaveAMon call Pack_PrintTextNoScroll ret @@ -648,7 +648,7 @@ GiveItem: ; 103fd ret .NoPokemon: ; 10486 (4:4486) - ld hl, TextJump_YouDontHaveAPkmn + ld hl, TextJump_YouDontHaveAMon call Pack_PrintTextNoScroll ret ; 1048d (4:448d) @@ -1668,9 +1668,9 @@ Text_ThisIsntTheTime: ; 0x10af3 db "@" ; 0x10af8 -TextJump_YouDontHaveAPkmn: ; 0x10af8 +TextJump_YouDontHaveAMon: ; 0x10af8 ; You don't have a #MON! - text_jump Text_YouDontHaveAPkmn + text_jump Text_YouDontHaveAMon db "@" ; 0x10afd diff --git a/engine/pokegear.asm b/engine/pokegear.asm index ea2afdc78..a50ad5ea1 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -1543,7 +1543,7 @@ RadioChannels: ; entries correspond to constants/radio_constants.asm ; frequency value given here = 4 × ingame_frequency − 2 - dbw 16, .PkmnTalkAndPokedexShow + dbw 16, .PKMNTalkAndPokedexShow dbw 28, .PokemonMusic dbw 32, .LuckyChannel dbw 40, .BuenasPassword @@ -1554,7 +1554,7 @@ RadioChannels: dbw 80, .EvolutionRadio db -1 -.PkmnTalkAndPokedexShow: +.PKMNTalkAndPokedexShow: ; Pokédex Show in the morning ; Oak's Pokémon Talk in the afternoon and evening @@ -1653,7 +1653,7 @@ LoadStation_OaksPokemonTalk: ; 91753 (24:5753) ld a, BANK(PlayRadioShow) ld hl, PlayRadioShow call Radio_BackUpFarCallParams - ld de, OaksPkmnTalkName + ld de, OaksPKMNTalkName ret LoadStation_PokedexShow: ; 91766 (24:5766) @@ -1846,7 +1846,7 @@ NoRadioName: ; 918a9 (24:58a9) ; 918bf -OaksPkmnTalkName: db "OAK's Talk@" +OaksPKMNTalkName: db "OAK's Talk@" PokedexShowName: db "#DEX Show@" PokemonMusicName: db "#MON Music@" LuckyChannelName: db "Lucky Channel@" diff --git a/engine/print_party.asm b/engine/print_party.asm index 5fe0e28c0..1095ce584 100755 --- a/engine/print_party.asm +++ b/engine/print_party.asm @@ -159,7 +159,7 @@ PrintPartyMonPage1: ; 1dc381 xor a ld [wMonType], a - farcall CopyPkmnToTempMon + farcall CopyMonToTempMon hlcoord 0, 7 ld b, 9 ld c, 18 @@ -243,7 +243,7 @@ PrintPartyMonPage2: ; 1dc47b call LoadFontsBattleExtra xor a ld [wMonType], a - farcall CopyPkmnToTempMon + farcall CopyMonToTempMon hlcoord 0, 0 ld b, 15 ld c, 18 diff --git a/engine/radio.asm b/engine/radio.asm index e6ee257ee..f0326f167 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -29,7 +29,7 @@ PlayRadioShow: RadioJumptable: ; entries correspond to constants/radio_constants.asm - dw OaksPkmnTalk1 ; $00 + dw OaksPKMNTalk1 ; $00 dw PokedexShow1 ; $01 dw BenMonMusic1 ; $02 dw LuckyNumberShow1 ; $03 @@ -40,15 +40,15 @@ RadioJumptable: dw PokeFluteRadio ; $08 dw UnownRadio ; $09 dw EvolutionRadio ; $0a -; OaksPkmnTalk - dw OaksPkmnTalk2 ; $0b - dw OaksPkmnTalk3 ; $0c - dw OaksPkmnTalk4 ; $0d - dw OaksPkmnTalk5 ; $0e - dw OaksPkmnTalk6 ; $0f - dw OaksPkmnTalk7 ; $10 - dw OaksPkmnTalk8 ; $11 - dw OaksPkmnTalk9 ; $12 +; OaksPKMNTalk + dw OaksPKMNTalk2 ; $0b + dw OaksPKMNTalk3 ; $0c + dw OaksPKMNTalk4 ; $0d + dw OaksPKMNTalk5 ; $0e + dw OaksPKMNTalk6 ; $0f + dw OaksPKMNTalk7 ; $10 + dw OaksPKMNTalk8 ; $11 + dw OaksPKMNTalk9 ; $12 dw PokedexShow2 ; $13 dw PokedexShow3 ; $14 dw PokedexShow4 ; $15 @@ -94,11 +94,11 @@ RadioJumptable: dw RocketRadio9 ; $39 dw RocketRadio10 ; $3a ; More Pokemon Channel stuff - dw OaksPkmnTalk10 ; $3b - dw OaksPkmnTalk11 ; $3c - dw OaksPkmnTalk12 ; $3d - dw OaksPkmnTalk13 ; $3e - dw OaksPkmnTalk14 ; $3f + dw OaksPKMNTalk10 ; $3b + dw OaksPKMNTalk11 ; $3c + dw OaksPKMNTalk12 ; $3d + dw OaksPKMNTalk13 ; $3e + dw OaksPKMNTalk14 ; $3f ; Buenas Password dw BuenasPassword2 ; $40 dw BuenasPassword3 ; $41 @@ -182,33 +182,33 @@ RadioScroll: call nz, CopyBottomLineToTopLine jp ClearBottomLine -OaksPkmnTalk1: +OaksPKMNTalk1: ld a, 5 - ld [wOaksPkmnTalkSegmentCounter], a + ld [wOaksPKMNTalkSegmentCounter], a call StartRadioStation ld hl, OPT_IntroText1 ld a, OAKS_POKEMON_TALK_2 jp NextRadioLine -OaksPkmnTalk2: +OaksPKMNTalk2: ld hl, OPT_IntroText2 ld a, OAKS_POKEMON_TALK_3 jp NextRadioLine -OaksPkmnTalk3: +OaksPKMNTalk3: ld hl, OPT_IntroText3 ld a, OAKS_POKEMON_TALK_4 jp NextRadioLine -OaksPkmnTalk4: +OaksPKMNTalk4: ; Choose a random route, and a random Pokemon from that route. .sample call Random and %11111 - cp (OaksPkmnTalkRoutesEnd - OaksPkmnTalkRoutes) / 2 + cp (OaksPKMNTalkRoutesEnd - OaksPKMNTalkRoutes) / 2 jr nc, .sample ; We now have a number between 0 and 14. - ld hl, OaksPkmnTalkRoutes + ld hl, OaksPKMNTalkRoutes ld c, a ld b, 0 add hl, bc @@ -294,12 +294,12 @@ endr INCLUDE "data/radio/oaks_pkmn_talk_routes.asm" -OaksPkmnTalk5: +OaksPKMNTalk5: ld hl, OPT_OakText2 ld a, OAKS_POKEMON_TALK_6 jp NextRadioLine -OaksPkmnTalk6: +OaksPKMNTalk6: ld hl, OPT_OakText3 ld a, OAKS_POKEMON_TALK_7 jp NextRadioLine @@ -334,7 +334,7 @@ OPT_OakText3: text_jump _OPT_OakText3 db "@" -OaksPkmnTalk7: +OaksPKMNTalk7: ld a, [wCurPartySpecies] ld [wNamedObjectIndexBuffer], a call GetPokemonName @@ -347,11 +347,11 @@ OPT_MaryText1: text_jump _OPT_MaryText1 db "@" -OaksPkmnTalk8: +OaksPKMNTalk8: ; 0-15 are all valid indexes into .Adverbs, ; so no need for a retry loop call Random - maskbits NUM_OAKS_MON_TALK_ADVERBS + maskbits NUM_OAKS_POKEMON_TALK_ADVERBS ld e, a ld d, 0 ld hl, .Adverbs @@ -364,7 +364,7 @@ OaksPkmnTalk8: jp NextRadioLine .Adverbs: -; there are NUM_OAKS_MON_TALK_ADVERBS entries +; there are NUM_OAKS_POKEMON_TALK_ADVERBS entries dw .sweetadorably dw .wigglyslickly dw .aptlynamed @@ -462,11 +462,11 @@ OaksPkmnTalk8: text_jump OPT_HeartMeltingly db "@" -OaksPkmnTalk9: +OaksPKMNTalk9: ; 0-15 are all valid indexes into .Adjectives, ; so no need for a retry loop call Random - maskbits NUM_OAKS_MON_TALK_ADJECTIVES + maskbits NUM_OAKS_POKEMON_TALK_ADJECTIVES ld e, a ld d, 0 ld hl, .Adjectives @@ -475,19 +475,19 @@ OaksPkmnTalk9: ld a, [hli] ld h, [hl] ld l, a - ld a, [wOaksPkmnTalkSegmentCounter] + ld a, [wOaksPKMNTalkSegmentCounter] dec a - ld [wOaksPkmnTalkSegmentCounter], a + ld [wOaksPKMNTalkSegmentCounter], a ld a, OAKS_POKEMON_TALK_4 jr nz, .ok ld a, 5 - ld [wOaksPkmnTalkSegmentCounter], a + ld [wOaksPKMNTalkSegmentCounter], a ld a, OAKS_POKEMON_TALK_10 .ok jp NextRadioLine .Adjectives: -; there are NUM_OAKS_MON_TALK_ADJECTIVES entries +; there are NUM_OAKS_POKEMON_TALK_ADJECTIVES entries dw .cute dw .weird dw .pleasant @@ -585,7 +585,7 @@ OaksPkmnTalk9: text_jump OPT_Speedy db "@" -OaksPkmnTalk10: +OaksPKMNTalk10: farcall RadioMusicRestartPokemonChannel ld hl, OPT_RestartText call PrintText @@ -606,7 +606,7 @@ OPT_PokemonChannelText: OPT_RestartText: db "@" -OaksPkmnTalk11: +OaksPKMNTalk11: ld hl, wRadioTextDelay dec [hl] ret nz @@ -618,7 +618,7 @@ OaksPkmnTalk11: .pokemon_string db "#MON@" -OaksPkmnTalk12: +OaksPKMNTalk12: ld hl, wRadioTextDelay dec [hl] ret nz @@ -630,7 +630,7 @@ OaksPkmnTalk12: .pokemon_channel_string db "#MON Channel@" -OaksPkmnTalk13: +OaksPKMNTalk13: ld hl, wRadioTextDelay dec [hl] ret nz @@ -642,7 +642,7 @@ OaksPkmnTalk13: .terminator db "@" -OaksPkmnTalk14: +OaksPKMNTalk14: ld hl, wRadioTextDelay dec [hl] ret nz diff --git a/engine/routines/correcterrorsinplayerparty.asm b/engine/routines/correcterrorsinplayerparty.asm index 5f2bba6bc..e815aa4c8 100644 --- a/engine/routines/correcterrorsinplayerparty.asm +++ b/engine/routines/correcterrorsinplayerparty.asm @@ -89,8 +89,8 @@ Unreferenced_CorrectErrorsInPlayerParty: ld e, l ld hl, MON_STAT_EXP - 1 add hl, bc - ld b, $1 - predef CalcPkmnStats + ld b, TRUE + predef CalcMonStats pop hl ld bc, PARTYMON_STRUCT_LENGTH add hl, bc diff --git a/engine/save.asm b/engine/save.asm index c519e50ad..4699ed125 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -74,7 +74,7 @@ Link_SaveGame: ; 14ab2 ret ; 14ac2 -MovePkmnWOMail_SaveGame: ; 14ac2 +MoveMonWOMail_SaveGame: ; 14ac2 call PauseGameLogic push de call SaveBox @@ -86,7 +86,7 @@ MovePkmnWOMail_SaveGame: ; 14ac2 ret ; 14ad5 -MovePkmnWOMail_InsertMon_SaveGame: ; 14ad5 +MoveMonWOMail_InsertMon_SaveGame: ; 14ad5 call PauseGameLogic push de call SaveBox @@ -119,8 +119,8 @@ MovePkmnWOMail_InsertMon_SaveGame: ; 14ad5 ret ; 14b34 -StartMovePkmnWOMail_SaveGame: ; 14b34 - ld hl, Text_SaveOnMovePkmnWOMail +StartMoveMonWOMail_SaveGame: ; 14b34 + ld hl, Text_SaveOnMoveMonWOMail call MenuTextBox call YesNoBox call ExitMenu @@ -1203,7 +1203,7 @@ Text_SaveOnBoxSwitch: ; 0x152a1 db "@" ; 0x152a6 -Text_SaveOnMovePkmnWOMail: ; 0x152a6 +Text_SaveOnMoveMonWOMail: ; 0x152a6 ; Each time you move a #MON, data will be saved. OK? text_jump UnknownText_0x1c465f db "@" diff --git a/engine/start_menu.asm b/engine/start_menu.asm index f0cacc5b1..e63e18bed 100755 --- a/engine/start_menu.asm +++ b/engine/start_menu.asm @@ -1788,7 +1788,7 @@ SetUpMoveScreenBG: ; 13172 hlcoord 5, 1 call PlaceString push bc - farcall CopyPkmnToTempMon + farcall CopyMonToTempMon pop hl call PrintLevel ld hl, wPlayerHPPal @@ -1805,7 +1805,7 @@ SetUpMoveList: ; 131ef ld [hBGMapMode], a ld [wMoveSwapBuffer], a ld [wMonType], a - predef CopyPkmnToTempMon + predef CopyMonToTempMon ld hl, wTempMonMoves ld de, wListMoves_MoveIndicesBuffer ld bc, NUM_MOVES diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index e55c85c86..afbe20e01 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -230,7 +230,7 @@ StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2) ld a, [wMonType] cp TEMPMON jr nz, .breedmon - ld a, [wBufferMon] + ld a, [wBufferMonSpecies] ld [wCurSpecies], a call GetBaseData ld hl, wBufferMon @@ -240,7 +240,7 @@ StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2) jr .done .breedmon - farcall CopyPkmnToTempMon + farcall CopyMonToTempMon ld a, [wCurPartySpecies] cp EGG jr z, .done diff --git a/engine/tempmon.asm b/engine/tempmon.asm index 03bec3755..723bfb1dd 100644 --- a/engine/tempmon.asm +++ b/engine/tempmon.asm @@ -1,10 +1,10 @@ -CopyPkmnToTempMon: ; 5084a -; gets the BaseData of a Pkmn -; and copys the PkmnStructure to wTempMon +CopyMonToTempMon: ; 5084a +; gets the BaseData of a mon +; and copies the party_struct to wTempMon ld a, [wCurPartyMon] ld e, a - call GetPkmnSpecies + call GetMonSpecies ld a, [wCurPartySpecies] ld [wCurSpecies], a call GetBaseData @@ -32,7 +32,7 @@ CopyPkmnToTempMon: ; 5084a .done ret -CalcwBufferMonStats: ; 5088b +CalcBufferMonStats: ; 5088b ld bc, wBufferMon jr _TempMonStatsCalculation @@ -50,8 +50,8 @@ _TempMonStatsCalculation: ; 50893 ld hl, MON_STAT_EXP - 1 add hl, bc push bc - ld b, $1 - predef CalcPkmnStats + ld b, TRUE + predef CalcMonStats pop bc ld hl, MON_HP add hl, bc @@ -82,9 +82,9 @@ _TempMonStatsCalculation: ; 50893 ld [hl], a ret -GetPkmnSpecies: ; 508d5 -; [wMonType] has the type of the Pkmn -; e = Nr. of Pkmn (i.e. [wCurPartyMon]) +GetMonSpecies: ; 508d5 +; [wMonType] has the type of the mon +; e = Nr. of mon (i.e. [wCurPartyMon]) ld a, [wMonType] and a ; PARTYMON diff --git a/gfx/battle_anims/beam.png b/gfx/battle_anims/beam.png index 32a3b1967..e8bc6cde4 100755 Binary files a/gfx/battle_anims/beam.png and b/gfx/battle_anims/beam.png differ diff --git a/gfx/battle_anims/lightning.png b/gfx/battle_anims/lightning.png index 6606fad12..fcc9376f9 100755 Binary files a/gfx/battle_anims/lightning.png and b/gfx/battle_anims/lightning.png differ diff --git a/gfx/battle_anims/misc.png b/gfx/battle_anims/misc.png index d7e67508e..7540508a4 100755 Binary files a/gfx/battle_anims/misc.png and b/gfx/battle_anims/misc.png differ diff --git a/gfx/battle_anims/noise.png b/gfx/battle_anims/noise.png index 17540a5e8..328d94c99 100755 Binary files a/gfx/battle_anims/noise.png and b/gfx/battle_anims/noise.png differ diff --git a/gfx/battle_anims/objects.png b/gfx/battle_anims/objects.png index 91ea435b8..80117f18f 100755 Binary files a/gfx/battle_anims/objects.png and b/gfx/battle_anims/objects.png differ diff --git a/gfx/battle_anims/pokeball.png b/gfx/battle_anims/pokeball.png index 47edf2190..ff76a3f74 100755 Binary files a/gfx/battle_anims/pokeball.png and b/gfx/battle_anims/pokeball.png differ diff --git a/gfx/battle_anims/rocks.png b/gfx/battle_anims/rocks.png index d7fe76b2f..78814028c 100755 Binary files a/gfx/battle_anims/rocks.png and b/gfx/battle_anims/rocks.png differ diff --git a/gfx/battle_anims/sand.png b/gfx/battle_anims/sand.png index a54db235d..7ecdeaee3 100755 Binary files a/gfx/battle_anims/sand.png and b/gfx/battle_anims/sand.png differ diff --git a/gfx/card_flip/card_flip_2.png b/gfx/card_flip/card_flip_2.png index 531417385..d7123061c 100644 Binary files a/gfx/card_flip/card_flip_2.png and b/gfx/card_flip/card_flip_2.png differ diff --git a/gfx/credits/pichu.png b/gfx/credits/pichu.png index 1d46ea807..73fd4b593 100644 Binary files a/gfx/credits/pichu.png and b/gfx/credits/pichu.png differ diff --git a/gfx/credits/theend.png b/gfx/credits/theend.png index eaaf393b7..aada755f2 100644 Binary files a/gfx/credits/theend.png and b/gfx/credits/theend.png differ diff --git a/gfx/frames/space.png b/gfx/frames/space.png index 7590b85dd..577318724 100755 Binary files a/gfx/frames/space.png and b/gfx/frames/space.png differ diff --git a/gfx/mail/cloud.png b/gfx/mail/cloud.png index bc0786238..d152f008e 100755 Binary files a/gfx/mail/cloud.png and b/gfx/mail/cloud.png differ diff --git a/gfx/mail/dragonite.png b/gfx/mail/dragonite.png index 9f792d31c..560f8f125 100755 Binary files a/gfx/mail/dragonite.png and b/gfx/mail/dragonite.png differ diff --git a/gfx/mail/flower_mail_border.png b/gfx/mail/flower_mail_border.png index d0ac239f3..a84dd8ac6 100755 Binary files a/gfx/mail/flower_mail_border.png and b/gfx/mail/flower_mail_border.png differ diff --git a/gfx/mail/large_note.png b/gfx/mail/large_note.png index 4b7a26faa..8b16f4103 100755 Binary files a/gfx/mail/large_note.png and b/gfx/mail/large_note.png differ diff --git a/gfx/mail/litebluemail_border.png b/gfx/mail/litebluemail_border.png index 878021bf8..4547e194d 100755 Binary files a/gfx/mail/litebluemail_border.png and b/gfx/mail/litebluemail_border.png differ diff --git a/gfx/mail/morph_mail_corner.png b/gfx/mail/morph_mail_corner.png index f9e7a3cae..491e64294 100755 Binary files a/gfx/mail/morph_mail_corner.png and b/gfx/mail/morph_mail_corner.png differ diff --git a/gfx/mail/surf_mail_border.png b/gfx/mail/surf_mail_border.png index 466d26c39..722fab83f 100755 Binary files a/gfx/mail/surf_mail_border.png and b/gfx/mail/surf_mail_border.png differ diff --git a/gfx/mobile/electro_ball_nonmatching.png b/gfx/mobile/electro_ball_nonmatching.png index 44ea166ef..52441bd83 100755 Binary files a/gfx/mobile/electro_ball_nonmatching.png and b/gfx/mobile/electro_ball_nonmatching.png differ diff --git a/gfx/mobile/mobile_splash.png b/gfx/mobile/mobile_splash.png index d54b68cdf..6eb92c5b2 100755 Binary files a/gfx/mobile/mobile_splash.png and b/gfx/mobile/mobile_splash.png differ diff --git a/gfx/overworld/chris_fish.png b/gfx/overworld/chris_fish.png index 81e05279a..0c968475a 100644 Binary files a/gfx/overworld/chris_fish.png and b/gfx/overworld/chris_fish.png differ diff --git a/gfx/overworld/kris_fish.png b/gfx/overworld/kris_fish.png index c0fe37544..ff1372646 100644 Binary files a/gfx/overworld/kris_fish.png and b/gfx/overworld/kris_fish.png differ diff --git a/gfx/pokegear/town_map.png b/gfx/pokegear/town_map.png index 899379826..e711c5f1d 100644 Binary files a/gfx/pokegear/town_map.png and b/gfx/pokegear/town_map.png differ diff --git a/gfx/slots/slots_3.png b/gfx/slots/slots_3.png index 456e9b6bf..e166e3fc7 100644 Binary files a/gfx/slots/slots_3.png and b/gfx/slots/slots_3.png differ diff --git a/gfx/splash/logo1.png b/gfx/splash/logo1.png index 1d2d6f479..a02eb08f6 100755 Binary files a/gfx/splash/logo1.png and b/gfx/splash/logo1.png differ diff --git a/gfx/trade/ball.png b/gfx/trade/ball.png index 4d3477bb6..9b56ae758 100755 Binary files a/gfx/trade/ball.png and b/gfx/trade/ball.png differ diff --git a/macros/wram.asm b/macros/wram.asm index 7c8ca44a1..136e42e6a 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -178,15 +178,15 @@ ENDM battle_tower_struct: MACRO \1Name:: ds NAME_LENGTH +- 1 \1TrainerClass:: ds 1 -\1Pkmn1:: party_struct \1Pkmn1 -\1Pkmn1Name:: ds MON_NAME_LENGTH -\1Pkmn1NameEnd:: -\1Pkmn2:: party_struct \1Pkmn2 -\1Pkmn2Name:: ds MON_NAME_LENGTH -\1Pkmn2NameEnd:: -\1Pkmn3:: party_struct \1Pkmn3 -\1Pkmn3Name:: ds MON_NAME_LENGTH -\1Pkmn3NameEnd:: +\1Mon1:: party_struct \1Mon1 +\1Mon1Name:: ds MON_NAME_LENGTH +\1Mon1NameEnd:: +\1Mon2:: party_struct \1Mon2 +\1Mon2Name:: ds MON_NAME_LENGTH +\1Mon2NameEnd:: +\1Mon3:: party_struct \1Mon3 +\1Mon3Name:: ds MON_NAME_LENGTH +\1Mon3NameEnd:: \1TrainerData:: ds BATTLETOWER_TRAINERDATALENGTH \1TrainerEnd:: ENDM diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 0816b5e8d..e9b18be7a 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -188,7 +188,7 @@ UnreferencedScript_0x9e4be: UnreferencedScript_0x9e4ea: writebyte BATTLETOWERACTION_LEVEL_CHECK special Special_BattleTowerAction - if_not_equal $0, Script_APkmnLevelExceeds + if_not_equal $0, Script_AMonLevelExceeds writebyte BATTLETOWERACTION_UBERS_CHECK special Special_BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 @@ -225,8 +225,8 @@ UnreferencedScript_0x9e53b: waitbutton jump Script_BattleTowerHopeToServeYouAgain -Script_APkmnLevelExceeds: ; 0x9e542 - writetext Text_APkmnLevelExceeds +Script_AMonLevelExceeds: ; 0x9e542 + writetext Text_AMonLevelExceeds waitbutton jump Script_Menu_ChallengeExplanationCancel @@ -628,7 +628,7 @@ Text_BattleTower_LeftWithoutSaving: line "invalid." done -Text_YourPkmnWillBeHealedToFullHealth: ; 0x9ee92 +Text_YourMonWillBeHealedToFullHealth: ; 0x9ee92 text "Your #MON will" line "be healed to full" cont "health." @@ -732,7 +732,7 @@ Text_RegisterRecordTimedOut_Mobile: cont "challenge." done -Text_APkmnLevelExceeds: ; 0x9f1e5 +Text_AMonLevelExceeds: ; 0x9f1e5 text "One or more of" line "your #MON's" cont "levels exceeds @" diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index dd8e08e0f..de86e6eee 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -44,7 +44,7 @@ Script_BattleRoomLoop: ; 0x9f425 applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist opentext - writetext Text_YourPkmnWillBeHealedToFullHealth + writetext Text_YourMonWillBeHealedToFullHealth waitbutton closetext playmusic MUSIC_HEAL diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index b96e6c470..1c1ae16ee 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -5410,7 +5410,7 @@ Function1023c6: ; 1023c6 ld a, [wcd4c] dec a ld [wCurPartyMon], a - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox ld hl, wPartyCount diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 0298c075b..73d92b21f 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -7145,8 +7145,8 @@ Function11b483: ; 11b483 add hl, de pop de push de - ld b, OTPARTYMON - predef CalcPkmnStats + ld b, TRUE + predef CalcMonStats pop de ld h, d ld l, e @@ -7323,7 +7323,7 @@ Function11b5c0: ; 11b5c0 ld a, [wcd82] dec a ld [wCurPartyMon], a - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox farcall Function170807 @@ -7564,8 +7564,8 @@ Function11b6b4: ; 11b6b4 ld hl, $c60d + MON_STAT_EXP - 1 ld de, $c60d + MON_MAXHP - ld b, $1 - predef CalcPkmnStats + ld b, TRUE + predef CalcMonStats ld de, $c60d + MON_MAXHP ld hl, $c60d + MON_HP ld a, [de] diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 474dde270..ec5b5428d 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -220,7 +220,7 @@ Function170c8b: ; 170c8b CheckBTMonMovesForErrors: ; 170c98 ld c, BATTLETOWER_PARTY_LENGTH - ld hl, wBT_OTTempPkmn1Moves + ld hl, wBT_OTTempMon1Moves .loop push hl ld a, [hl] diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index be9578d22..862076fd1 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -2441,8 +2441,8 @@ Function17ded9: ; 17ded9 ld d, h ld e, l push hl - ld b, $0 - farcall CalcPkmnStats + ld b, FALSE + farcall CalcMonStats ld a, [wPartyCount] dec a ld hl, wPartyMon1HP @@ -2531,7 +2531,7 @@ Function17e026: ; 17e026 push bc push hl farcall LoadEnemyMon - farcall SendPkmnIntoBox + farcall SendMonIntoBox farcall SetBoxMonCaughtData pop hl pop bc diff --git a/sram.asm b/sram.asm index 66c8af2c4..a7b9167c3 100644 --- a/sram.asm +++ b/sram.asm @@ -208,14 +208,14 @@ sBattleTowerSaveFileFlags:: db sBattleTowerReward:: db ; team of previous trainer -sBTPkmnOfTrainers:: ; 0xbe51 -sBTPkmnPrevTrainer1:: db -sBTPkmnPrevTrainer2:: db -sBTPkmnPrevTrainer3:: db +sBTMonOfTrainers:: ; 0xbe51 +sBTMonPrevTrainer1:: db +sBTMonPrevTrainer2:: db +sBTMonPrevTrainer3:: db ; team of preprevious trainer -sBTPkmnPrevPrevTrainer1:: db -sBTPkmnPrevPrevTrainer2:: db -sBTPkmnPrevPrevTrainer3:: db +sBTMonPrevPrevTrainer1:: db +sBTMonPrevPrevTrainer2:: db +sBTMonPrevPrevTrainer3:: db SECTION "Boxes 1-7", SRAM, BANK [2] diff --git a/wram.asm b/wram.asm index 1a14a0171..c26078f04 100644 --- a/wram.asm +++ b/wram.asm @@ -1641,7 +1641,7 @@ wCurrentRadioLine:: db wNextRadioLine:: db wRadioTextDelay:: db wNumRadioLinesPrinted:: db -wOaksPkmnTalkSegmentCounter:: db +wOaksPKMNTalkSegmentCounter:: db ds 5 wRadioText:: ds 2 * SCREEN_WIDTH wRadioTextEnd::