diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/gfx_constants.asm | 15 | ||||
| -rwxr-xr-x | constants/hide_show_constants.asm | 239 | ||||
| -rw-r--r-- | constants/map_constants.asm | 2 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 23 | ||||
| -rwxr-xr-x | constants/oam_constants.asm | 15 | ||||
| -rw-r--r-- | constants/pikachu_emotion_constants.asm | 120 | ||||
| -rw-r--r-- | constants/sprite_anim_constants.asm | 17 | ||||
| -rwxr-xr-x | constants/sprite_constants.asm | 6 | ||||
| -rw-r--r-- | constants/tileset_constants.asm | 2 |
9 files changed, 215 insertions, 224 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 912e5835..e6eb50db 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -2,10 +2,18 @@ TILE_WIDTH EQU 8 ; pixels LEN_1BPP_TILE EQU 1 * TILE_WIDTH ; bytes LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes -NUM_PAL_COLORS EQU 4 + const_def + const SHADE_WHITE ; %00 + const SHADE_LIGHT ; %01 + const SHADE_DARK ; %10 + const SHADE_BLACK ; %11 +NUM_PAL_COLORS EQU const_value + PAL_COLOR_SIZE EQU 2 PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE +NUM_ACTIVE_PALS EQU 4 + SCREEN_WIDTH EQU 20 SCREEN_HEIGHT EQU 18 SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels @@ -16,6 +24,11 @@ BG_MAP_HEIGHT EQU 32 ; tiles SPRITEBUFFERSIZE EQU 7 * 7 * LEN_1BPP_TILE +; DMGPalToGBCPal +CONVERT_BGP EQU 0 +CONVERT_OBP0 EQU 1 +CONVERT_OBP1 EQU 2 + ; HP bar HP_BAR_GREEN EQU 0 HP_BAR_YELLOW EQU 1 diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 54d27769..08bb2607 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -3,8 +3,7 @@ SHOW EQU $15 ; MissableObjects indexes (see data/maps/hide_show_data.asm) ; this is a list of the sprites that can be enabled/disabled during the game -; there may be unused sprites, but these will remain unmarked until -; the disassembly is complete +; TODO: mark sprite constants with an X that are never used const_def const HS_PALLET_TOWN_OAK ; 00 @@ -33,20 +32,20 @@ SHOW EQU $15 const HS_SAFFRON_CITY_D ; 17 const HS_SAFFRON_CITY_E ; 18 const HS_SAFFRON_CITY_F ; 19 - const HS_ROUTE_2_ITEM_1 ; 1A X - const HS_ROUTE_2_ITEM_2 ; 1B X - const HS_ROUTE_4_ITEM ; 1C X - const HS_ROUTE_9_ITEM ; 1D X + const HS_ROUTE_2_ITEM_1 ; 1A + const HS_ROUTE_2_ITEM_2 ; 1B + const HS_ROUTE_4_ITEM ; 1C + const HS_ROUTE_9_ITEM ; 1D const HS_ROUTE_12_SNORLAX ; 1E - const HS_ROUTE_12_ITEM_1 ; 1F X - const HS_ROUTE_12_ITEM_2 ; 20 X - const HS_ROUTE_15_ITEM ; 21 X + const HS_ROUTE_12_ITEM_1 ; 1F + const HS_ROUTE_12_ITEM_2 ; 20 + const HS_ROUTE_15_ITEM ; 21 const HS_ROUTE_16_SNORLAX ; 22 const HS_ROUTE_22_RIVAL_1 ; 23 const HS_ROUTE_22_RIVAL_2 ; 24 const HS_NUGGET_BRIDGE_GUY ; 25 - const HS_ROUTE_24_ITEM ; 26 X - const HS_ROUTE_25_ITEM ; 27 X + const HS_ROUTE_24_ITEM ; 26 + const HS_ROUTE_25_ITEM ; 27 const HS_DAISY_SITTING ; 28 const HS_DAISY_WALKING ; 29 const HS_TOWN_MAP ; 2A @@ -57,95 +56,95 @@ SHOW EQU $15 const HS_POKEDEX_2 ; 2F const HS_OAKS_LAB_OAK_2 ; 30 const HS_VIRIDIAN_GYM_GIOVANNI ; 31 - const HS_VIRIDIAN_GYM_ITEM ; 32 X + const HS_VIRIDIAN_GYM_ITEM ; 32 const HS_OLD_AMBER ; 33 const HS_CERULEAN_BULBASAUR ; 34 - const HS_CERULEAN_CAVE_1F_ITEM_1 ; 35 X - const HS_CERULEAN_CAVE_1F_ITEM_2 ; 36 X - const HS_CERULEAN_CAVE_1F_ITEM_3 ; 37 X - const HS_CERULEAN_CAVE_1F_ITEM_4 ; 38 X + const HS_CERULEAN_CAVE_1F_ITEM_1 ; 35 + const HS_CERULEAN_CAVE_1F_ITEM_2 ; 36 + const HS_CERULEAN_CAVE_1F_ITEM_3 ; 37 + const HS_CERULEAN_CAVE_1F_ITEM_4 ; 38 const HS_POKEMON_TOWER_2F_RIVAL ; 39 - const HS_POKEMON_TOWER_3F_ITEM ; 3A X - const HS_POKEMON_TOWER_4F_ITEM_1 ; 3B X - const HS_POKEMON_TOWER_4F_ITEM_2 ; 3C X - const HS_POKEMON_TOWER_4F_ITEM_3 ; 3D X - const HS_POKEMON_TOWER_5F_ITEM ; 3E X - const HS_POKEMON_TOWER_6F_ITEM_1 ; 3F X - const HS_POKEMON_TOWER_6F_ITEM_2 ; 40 X + const HS_POKEMON_TOWER_3F_ITEM ; 3A + const HS_POKEMON_TOWER_4F_ITEM_1 ; 3B + const HS_POKEMON_TOWER_4F_ITEM_2 ; 3C + const HS_POKEMON_TOWER_4F_ITEM_3 ; 3D + const HS_POKEMON_TOWER_5F_ITEM ; 3E + const HS_POKEMON_TOWER_6F_ITEM_1 ; 3F + const HS_POKEMON_TOWER_6F_ITEM_2 ; 40 const HS_POKEMON_TOWER_7F_JESSIE ; 41 const HS_POKEMON_TOWER_7F_JAMES ; 42 const HS_POKEMON_TOWER_7F_MR_FUJI ; 43 const HS_MR_FUJIS_HOUSE_MR_FUJI ; 44 const HS_CELADON_MANSION_EEVEE_GIFT ; 45 const HS_GAME_CORNER_ROCKET ; 46 - const HS_WARDENS_HOUSE_ITEM ; 47 X - const HS_POKEMON_MANSION_1F_ITEM_1 ; 48 X - const HS_POKEMON_MANSION_1F_ITEM_2 ; 49 X + const HS_WARDENS_HOUSE_ITEM ; 47 + const HS_POKEMON_MANSION_1F_ITEM_1 ; 48 + const HS_POKEMON_MANSION_1F_ITEM_2 ; 49 const HS_FIGHTING_DOJO_GIFT_1 ; 4A const HS_FIGHTING_DOJO_GIFT_2 ; 4B const HS_SILPH_CO_1F_RECEPTIONIST ; 4C - const HS_VOLTORB_1 ; 4D X - const HS_VOLTORB_2 ; 4E X - const HS_VOLTORB_3 ; 4F X - const HS_ELECTRODE_1 ; 50 X - const HS_VOLTORB_4 ; 51 X - const HS_VOLTORB_5 ; 52 X - const HS_ELECTRODE_2 ; 53 X - const HS_VOLTORB_6 ; 54 X - const HS_ZAPDOS ; 55 X - const HS_POWER_PLANT_ITEM_1 ; 56 X - const HS_POWER_PLANT_ITEM_2 ; 57 X - const HS_POWER_PLANT_ITEM_3 ; 58 X - const HS_POWER_PLANT_ITEM_4 ; 59 X - const HS_POWER_PLANT_ITEM_5 ; 5A X - const HS_MOLTRES ; 5B X - const HS_VICTORY_ROAD_2F_ITEM_1 ; 5C X - const HS_VICTORY_ROAD_2F_ITEM_2 ; 5D X - const HS_VICTORY_ROAD_2F_ITEM_3 ; 5E X - const HS_VICTORY_ROAD_2F_ITEM_4 ; 5F X + const HS_VOLTORB_1 ; 4D + const HS_VOLTORB_2 ; 4E + const HS_VOLTORB_3 ; 4F + const HS_ELECTRODE_1 ; 50 + const HS_VOLTORB_4 ; 51 + const HS_VOLTORB_5 ; 52 + const HS_ELECTRODE_2 ; 53 + const HS_VOLTORB_6 ; 54 + const HS_ZAPDOS ; 55 + const HS_POWER_PLANT_ITEM_1 ; 56 + const HS_POWER_PLANT_ITEM_2 ; 57 + const HS_POWER_PLANT_ITEM_3 ; 58 + const HS_POWER_PLANT_ITEM_4 ; 59 + const HS_POWER_PLANT_ITEM_5 ; 5A + const HS_MOLTRES ; 5B + const HS_VICTORY_ROAD_2F_ITEM_1 ; 5C + const HS_VICTORY_ROAD_2F_ITEM_2 ; 5D + const HS_VICTORY_ROAD_2F_ITEM_3 ; 5E + const HS_VICTORY_ROAD_2F_ITEM_4 ; 5F const HS_VICTORY_ROAD_2F_BOULDER ; 60 const HS_BILL_POKEMON ; 61 const HS_BILL_1 ; 62 const HS_BILL_2 ; 63 - const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 X - const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 X - const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 X - const HS_MT_MOON_1F_ITEM_1 ; 67 X - const HS_MT_MOON_1F_ITEM_2 ; 68 X - const HS_MT_MOON_1F_ITEM_3 ; 69 X - const HS_MT_MOON_1F_ITEM_4 ; 6A X - const HS_MT_MOON_1F_ITEM_5 ; 6B X - const HS_MT_MOON_1F_ITEM_6 ; 6C X + const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 + const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 + const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 + const HS_MT_MOON_1F_ITEM_1 ; 67 + const HS_MT_MOON_1F_ITEM_2 ; 68 + const HS_MT_MOON_1F_ITEM_3 ; 69 + const HS_MT_MOON_1F_ITEM_4 ; 6A + const HS_MT_MOON_1F_ITEM_5 ; 6B + const HS_MT_MOON_1F_ITEM_6 ; 6C const HS_MT_MOON_B2F_JESSIE ; 6D const HS_MT_MOON_B2F_JAMES ; 6E const HS_MT_MOON_B2F_FOSSIL_1 ; 6F const HS_MT_MOON_B2F_FOSSIL_2 ; 70 - const HS_MT_MOON_B2F_ITEM_1 ; 71 X - const HS_MT_MOON_B2F_ITEM_2 ; 72 X + const HS_MT_MOON_B2F_ITEM_1 ; 71 + const HS_MT_MOON_B2F_ITEM_2 ; 72 const HS_SS_ANNE_2F_RIVAL ; 73 - const HS_SS_ANNE_1F_ROOMS_ITEM ; 74 X - const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 75 X - const HS_SS_ANNE_2F_ROOMS_ITEM_2 ; 76 X - const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 77 X - const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 78 X - const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 79 X - const HS_VICTORY_ROAD_3F_ITEM_1 ; 7A X - const HS_VICTORY_ROAD_3F_ITEM_2 ; 7B X + const HS_SS_ANNE_1F_ROOMS_ITEM ; 74 + const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 75 + const HS_SS_ANNE_2F_ROOMS_ITEM_2 ; 76 + const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 77 + const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 78 + const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 79 + const HS_VICTORY_ROAD_3F_ITEM_1 ; 7A + const HS_VICTORY_ROAD_3F_ITEM_2 ; 7B const HS_VICTORY_ROAD_3F_BOULDER ; 7C - const HS_ROCKET_HIDEOUT_B1F_ITEM_1 ; 7D X - const HS_ROCKET_HIDEOUT_B1F_ITEM_2 ; 7E X - const HS_ROCKET_HIDEOUT_B2F_ITEM_1 ; 7F X - const HS_ROCKET_HIDEOUT_B2F_ITEM_2 ; 80 X - const HS_ROCKET_HIDEOUT_B2F_ITEM_3 ; 81 X - const HS_ROCKET_HIDEOUT_B2F_ITEM_4 ; 82 X - const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 83 X - const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 84 X + const HS_ROCKET_HIDEOUT_B1F_ITEM_1 ; 7D + const HS_ROCKET_HIDEOUT_B1F_ITEM_2 ; 7E + const HS_ROCKET_HIDEOUT_B2F_ITEM_1 ; 7F + const HS_ROCKET_HIDEOUT_B2F_ITEM_2 ; 80 + const HS_ROCKET_HIDEOUT_B2F_ITEM_3 ; 81 + const HS_ROCKET_HIDEOUT_B2F_ITEM_4 ; 82 + const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 83 + const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 84 const HS_ROCKET_HIDEOUT_B4F_GIOVANNI ; 85 const HS_ROCKET_HIDEOUT_B4F_JAMES ; 86 const HS_ROCKET_HIDEOUT_B4F_JESSIE ; 87 - const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 88 X - const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 89 X - const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 8A X + const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 88 + const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 89 + const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 8A const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 8B const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 8C const HS_SILPH_CO_2F_1 ; 8D XXX never (de)activated? @@ -155,32 +154,32 @@ SHOW EQU $15 const HS_SILPH_CO_2F_5 ; 91 const HS_SILPH_CO_3F_1 ; 92 const HS_SILPH_CO_3F_2 ; 93 - const HS_SILPH_CO_3F_ITEM ; 94 X + const HS_SILPH_CO_3F_ITEM ; 94 const HS_SILPH_CO_4F_1 ; 95 const HS_SILPH_CO_4F_2 ; 96 const HS_SILPH_CO_4F_3 ; 97 - const HS_SILPH_CO_4F_ITEM_1 ; 98 X - const HS_SILPH_CO_4F_ITEM_2 ; 99 X - const HS_SILPH_CO_4F_ITEM_3 ; 9A X + const HS_SILPH_CO_4F_ITEM_1 ; 98 + const HS_SILPH_CO_4F_ITEM_2 ; 99 + const HS_SILPH_CO_4F_ITEM_3 ; 9A const HS_SILPH_CO_5F_1 ; 9B const HS_SILPH_CO_5F_2 ; 9C const HS_SILPH_CO_5F_3 ; 9D const HS_SILPH_CO_5F_4 ; 9E - const HS_SILPH_CO_5F_ITEM_1 ; 9F X - const HS_SILPH_CO_5F_ITEM_2 ; A0 X - const HS_SILPH_CO_5F_ITEM_3 ; A1 X + const HS_SILPH_CO_5F_ITEM_1 ; 9F + const HS_SILPH_CO_5F_ITEM_2 ; A0 + const HS_SILPH_CO_5F_ITEM_3 ; A1 const HS_SILPH_CO_6F_1 ; A2 const HS_SILPH_CO_6F_2 ; A3 const HS_SILPH_CO_6F_3 ; A4 - const HS_SILPH_CO_6F_ITEM_1 ; A5 X - const HS_SILPH_CO_6F_ITEM_2 ; A6 X + const HS_SILPH_CO_6F_ITEM_1 ; A5 + const HS_SILPH_CO_6F_ITEM_2 ; A6 const HS_SILPH_CO_7F_1 ; A7 const HS_SILPH_CO_7F_2 ; A8 const HS_SILPH_CO_7F_3 ; A9 const HS_SILPH_CO_7F_4 ; AA const HS_SILPH_CO_7F_RIVAL ; AB - const HS_SILPH_CO_7F_ITEM_1 ; AC X - const HS_SILPH_CO_7F_ITEM_2 ; AD X + const HS_SILPH_CO_7F_ITEM_1 ; AC + const HS_SILPH_CO_7F_ITEM_2 ; AD const HS_SILPH_CO_7F_8 ; AE XXX sprite doesn't exist const HS_SILPH_CO_8F_1 ; AF const HS_SILPH_CO_8F_2 ; B0 @@ -191,44 +190,44 @@ SHOW EQU $15 const HS_SILPH_CO_10F_1 ; B5 const HS_SILPH_CO_10F_2 ; B6 const HS_SILPH_CO_10F_3 ; B7 XXX never (de)activated? - const HS_SILPH_CO_10F_ITEM_1 ; B8 X - const HS_SILPH_CO_10F_ITEM_2 ; B9 X - const HS_SILPH_CO_10F_ITEM_3 ; BA X + const HS_SILPH_CO_10F_ITEM_1 ; B8 + const HS_SILPH_CO_10F_ITEM_2 ; B9 + const HS_SILPH_CO_10F_ITEM_3 ; BA const HS_SILPH_CO_11F_1 ; BB const HS_SILPH_CO_11F_JAMES ; BC const HS_SILPH_CO_11F_2 ; BD const HS_SILPH_CO_11F_JESSIE ; BE const HS_UNUSED_MAP_F4_1 ; BF XXX sprite doesn't exist - const HS_POKEMON_MANSION_2F_ITEM ; C0 X - const HS_POKEMON_MANSION_3F_ITEM_1 ; C1 X - const HS_POKEMON_MANSION_3F_ITEM_2 ; C2 X - const HS_POKEMON_MANSION_B1F_ITEM_1 ; C3 X - const HS_POKEMON_MANSION_B1F_ITEM_2 ; C4 X - const HS_POKEMON_MANSION_B1F_ITEM_3 ; C5 X - const HS_POKEMON_MANSION_B1F_ITEM_4 ; C6 X - const HS_POKEMON_MANSION_B1F_ITEM_5 ; C7 X - const HS_SAFARI_ZONE_EAST_ITEM_1 ; C8 X - const HS_SAFARI_ZONE_EAST_ITEM_2 ; C9 X - const HS_SAFARI_ZONE_EAST_ITEM_3 ; CA X - const HS_SAFARI_ZONE_EAST_ITEM_4 ; CB X - const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CC X - const HS_SAFARI_ZONE_NORTH_ITEM_2 ; CD X - const HS_SAFARI_ZONE_WEST_ITEM_1 ; CE X - const HS_SAFARI_ZONE_WEST_ITEM_2 ; CF X - const HS_SAFARI_ZONE_WEST_ITEM_3 ; D0 X - const HS_SAFARI_ZONE_WEST_ITEM_4 ; D1 X - const HS_SAFARI_ZONE_CENTER_ITEM ; D2 X - const HS_CERULEAN_CAVE_2F_ITEM_1 ; D3 X - const HS_CERULEAN_CAVE_2F_ITEM_2 ; D4 X - const HS_CERULEAN_CAVE_2F_ITEM_3 ; D5 X - const HS_CERULEAN_CAVE_2F_ITEM_4 ; D6 X - const HS_MEWTWO ; D7 X - const HS_CERULEAN_CAVE_B1F_ITEM_1 ; D8 X - const HS_CERULEAN_CAVE_B1F_ITEM_2 ; D9 X - const HS_CERULEAN_CAVE_B1F_ITEM_3 ; DA X - const HS_CERULEAN_CAVE_B1F_ITEM_4 ; DB X - const HS_VICTORY_ROAD_1F_ITEM_1 ; DC X - const HS_VICTORY_ROAD_1F_ITEM_2 ; DD X + const HS_POKEMON_MANSION_2F_ITEM ; C0 + const HS_POKEMON_MANSION_3F_ITEM_1 ; C1 + const HS_POKEMON_MANSION_3F_ITEM_2 ; C2 + const HS_POKEMON_MANSION_B1F_ITEM_1 ; C3 + const HS_POKEMON_MANSION_B1F_ITEM_2 ; C4 + const HS_POKEMON_MANSION_B1F_ITEM_3 ; C5 + const HS_POKEMON_MANSION_B1F_ITEM_4 ; C6 + const HS_POKEMON_MANSION_B1F_ITEM_5 ; C7 + const HS_SAFARI_ZONE_EAST_ITEM_1 ; C8 + const HS_SAFARI_ZONE_EAST_ITEM_2 ; C9 + const HS_SAFARI_ZONE_EAST_ITEM_3 ; CA + const HS_SAFARI_ZONE_EAST_ITEM_4 ; CB + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CC + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; CD + const HS_SAFARI_ZONE_WEST_ITEM_1 ; CE + const HS_SAFARI_ZONE_WEST_ITEM_2 ; CF + const HS_SAFARI_ZONE_WEST_ITEM_3 ; D0 + const HS_SAFARI_ZONE_WEST_ITEM_4 ; D1 + const HS_SAFARI_ZONE_CENTER_ITEM ; D2 + const HS_CERULEAN_CAVE_2F_ITEM_1 ; D3 + const HS_CERULEAN_CAVE_2F_ITEM_2 ; D4 + const HS_CERULEAN_CAVE_2F_ITEM_3 ; D5 + const HS_CERULEAN_CAVE_2F_ITEM_4 ; D6 + const HS_MEWTWO ; D7 + const HS_CERULEAN_CAVE_B1F_ITEM_1 ; D8 + const HS_CERULEAN_CAVE_B1F_ITEM_2 ; D9 + const HS_CERULEAN_CAVE_B1F_ITEM_3 ; DA + const HS_CERULEAN_CAVE_B1F_ITEM_4 ; DB + const HS_VICTORY_ROAD_1F_ITEM_1 ; DC + const HS_VICTORY_ROAD_1F_ITEM_2 ; DD const HS_CHAMPIONS_ROOM_OAK ; DE const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; DF const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; E0 @@ -242,7 +241,7 @@ SHOW EQU $15 const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; E8 const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E9 const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; EA - const HS_ARTICUNO ; EB X + const HS_ARTICUNO ; EB const HS_DAISY_SITTING_COPY ; EC const HS_DAISY_WALKING_COPY ; ED const HS_TOWN_MAP_COPY ; EE diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 038c2ab2..366c8619 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -266,7 +266,7 @@ FIRST_INDOOR_MAP EQU const_value mapconst LORELEIS_ROOM, 6, 5 ; $F5 mapconst BRUNOS_ROOM, 6, 5 ; $F6 mapconst AGATHAS_ROOM, 6, 5 ; $F7 - mapconst BEACH_HOUSE, 4, 7 ; $F8 + mapconst SUMMER_BEACH_HOUSE, 4, 7 ; $F8 ; Indoor maps, such as houses, use this as the Map ID in their exit warps ; This map ID takes the player back to the last outdoor map they were on, stored in wLastMap diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 6fb43490..1bb32f8e 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -7,26 +7,3 @@ TRUE EQU 1 const FLAG_RESET ; 0 const FLAG_SET ; 1 const FLAG_TEST ; 2 - -; pikachu happiness modifiers - const_def 1 - const PIKAHAPPY_LEVELUP - const PIKAHAPPY_USEDITEM - const PIKAHAPPY_USEDXITEM - const PIKAHAPPY_GYMLEADER - const PIKAHAPPY_USEDTMHM - const PIKAHAPPY_WALKING - const PIKAHAPPY_DEPOSITED - const PIKAHAPPY_FAINTED - const PIKAHAPPY_PSNFNT - const PIKAHAPPY_CARELESSTRAINER - const PIKAHAPPY_TRADE - -; DMGPalToGBCPal -CONVERT_BGP EQU 0 -CONVERT_OBP0 EQU 1 -CONVERT_OBP1 EQU 2 - -NUM_COLORS EQU 4 -PAL_SIZE EQU NUM_COLORS * 2 -NUM_ACTIVE_PALS EQU 4 diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm index 7a80bdd2..be63dc24 100755 --- a/constants/oam_constants.asm +++ b/constants/oam_constants.asm @@ -15,18 +15,3 @@ OAM_OBP1 EQU 1 << OAM_OBP_NUM ; OBJ palette 1 OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip OAM_BEHIND_BG EQU 1 << OAM_PRIORITY ; behind bg (except color 0) - -frame: MACRO - db \1 -x = \2 -REPT _NARG +- 2 -x = x | (\3 << 1) - shift -endr - db x - endm - -delanim EQUS "db $fc" -dorepeat EQUS "db $fd," -dorestart EQUS "db $fe" -endanim EQUS "db $ff" diff --git a/constants/pikachu_emotion_constants.asm b/constants/pikachu_emotion_constants.asm index feb4a438..fa2a9457 100644 --- a/constants/pikachu_emotion_constants.asm +++ b/constants/pikachu_emotion_constants.asm @@ -1,29 +1,28 @@ -dpikapic: macro +; pikachu happiness modifiers + const_def 1 + const PIKAHAPPY_LEVELUP + const PIKAHAPPY_USEDITEM + const PIKAHAPPY_USEDXITEM + const PIKAHAPPY_GYMLEADER + const PIKAHAPPY_USEDTMHM + const PIKAHAPPY_WALKING + const PIKAHAPPY_DEPOSITED + const PIKAHAPPY_FAINTED + const PIKAHAPPY_PSNFNT + const PIKAHAPPY_CARELESSTRAINER + const PIKAHAPPY_TRADE + +dpikapic: MACRO db (\1_id - PikaPicAnimPointers) / 2 - endm - -ldpikapic: macro - ld \1, (\2_id - PikaPicAnimPointers) / 2 - endm +ENDM -dpikaemotion: macro +dpikaemotion: MACRO db (\1_id - PikachuEmotionTable) / 2 - endm +ENDM -ldpikaemotion: macro +ldpikaemotion: MACRO ld \1, (\2_id - PikachuEmotionTable) / 2 - endm - -dpikaanim: macro - db (\1_id - PikaPicAnimBGFramesPointers) / 2 - endm - -pikaframeend EQUS "db $e0" -pikaframe: macro - db (\1_id - PikaPicTilemapPointers) / 2, \2 - endm - -pikaframedelay EQUS "db 0," +ENDM ; Starter Pikachu emotion commands constants @@ -60,7 +59,7 @@ pikaframedelay EQUS "db 0," const PIKASTEPDIR_UP_RIGHT -; Macros for commands +; MACROs for commands pikaemotion_dummy1: MACRO db PIKAEMOTION_DUMMY1 ENDM @@ -117,108 +116,109 @@ pikaemotion_dummy3: MACRO ENDM pikacry_def: MACRO -\1_id:: dba \1 -endm +\1_id:: + dba \1 +ENDM dpikacry: MACRO db (\1_id - PikachuCriesPointerTable) / 3 - endm +ENDM ldpikacry: MACRO ld \1, (\2_id - PikachuCriesPointerTable) / 3 - ENDM +ENDM pikacry: MACRO ldpikacry a, \1 - endm +ENDM const_def const pikapic_nop_command -pikapic_nop: macro +pikapic_nop: MACRO db pikapic_nop_command - endm +ENDM const pikapic_writebyte_command -pikapic_writebyte: macro +pikapic_writebyte: MACRO db pikapic_writebyte_command, \1 - endm +ENDM const pikapic_loadgfx_command -pikapic_loadgfx: macro +pikapic_loadgfx: MACRO db pikapic_loadgfx_command, (\1_id - PikaPicAnimGFXHeaders) / 4 - endm +ENDM const pikapic_animation_command -pikapic_animation: macro +pikapic_animation: MACRO ; frameset pointer, starting vtile, y offset, x offset db pikapic_animation_command - dpikaanim \1 + db (\1_id - PikaPicAnimBGFramesPointers) / 2 db 0, \2, \3, \4 - endm +ENDM const pikapic_nop4_command -pikapic_nop4: macro +pikapic_nop4: MACRO db pikapic_nop4_command - endm +ENDM const pikapic_nop5_command -pikapic_nop5: macro +pikapic_nop5: MACRO db pikapic_nop5_command - endm +ENDM const pikapic_waitbgmapeleteobject_command -pikapic_waitbgmapeleteobject: macro +pikapic_waitbgmapeleteobject: MACRO db pikapic_waitbgmapeleteobject_command, \1 - endm +ENDM const pikapic_nop7_command -pikapic_nop7: macro +pikapic_nop7: MACRO db pikapic_nop7_command - endm +ENDM const pikapic_nop8_command -pikapic_nop8: macro +pikapic_nop8: MACRO db pikapic_nop8_command - endm +ENDM const pikapic_jump_command -pikapic_jump: macro ; 9 +pikapic_jump: MACRO ; 9 dbw pikapic_jump_command, \1 - endm +ENDM const pikapic_setduration_command -pikapic_setduration: macro ; a +pikapic_setduration: MACRO ; a dbw pikapic_setduration_command, \1 - endm +ENDM const pikapic_cry_command -pikapic_cry: macro ; b +pikapic_cry: MACRO ; b db pikapic_cry_command IF _NARG == 0 db $ff else dpikacry \1 endc - endm +ENDM const pikapic_thunderbolt_command -pikapic_thunderbolt: macro ; c +pikapic_thunderbolt: MACRO ; c db pikapic_thunderbolt_command - endm +ENDM const pikapic_waitbgmap_command -pikapic_waitbgmap: macro ; d +pikapic_waitbgmap: MACRO ; d db pikapic_waitbgmap_command - endm +ENDM const pikapic_ret_command -pikapic_ret: macro ; e +pikapic_ret: MACRO ; e db pikapic_ret_command - endm +ENDM -pikapic_looptofinish: macro +pikapic_looptofinish: MACRO .loop\@ pikapic_waitbgmap pikapic_jump .loop\@ - endm +ENDM diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm new file mode 100644 index 00000000..f5a90ab9 --- /dev/null +++ b/constants/sprite_anim_constants.asm @@ -0,0 +1,17 @@ +; animated_object struct members (see macros/wram.asm) +ANIM_OBJ_INDEX EQUS "wAnimatedObject0Index - wAnimatedObject0" +ANIM_OBJ_FRAME_SET EQUS "wAnimatedObject0FramesetID - wAnimatedObject0" +ANIM_OBJ_CALLBACK EQUS "wAnimatedObject0AnimSeqID - wAnimatedObject0" +ANIM_OBJ_TILE EQUS "wAnimatedObject0TileID - wAnimatedObject0" +ANIM_OBJ_X_COORD EQUS "wAnimatedObject0XCoord - wAnimatedObject0" +ANIM_OBJ_Y_COORD EQUS "wAnimatedObject0YCoord - wAnimatedObject0" +ANIM_OBJ_X_OFFSET EQUS "wAnimatedObject0XOffset - wAnimatedObject0" +ANIM_OBJ_Y_OFFSET EQUS "wAnimatedObject0YOffset - wAnimatedObject0" +ANIM_OBJ_DURATION EQUS "wAnimatedObject0Duration - wAnimatedObject0" +ANIM_OBJ_DURATION_OFFSET EQUS "wAnimatedObject0DurationOffset - wAnimatedObject0" +ANIM_OBJ_FRAME_IDX EQUS "wAnimatedObject0FrameIndex - wAnimatedObject0" +ANIM_OBJ_FIELD_B EQUS "wAnimatedObject0FieldB - wAnimatedObject0" +ANIM_OBJ_FIELD_C EQUS "wAnimatedObject0FieldC - wAnimatedObject0" +ANIM_OBJ_FIELD_D EQUS "wAnimatedObject0FieldD - wAnimatedObject0" +ANIM_OBJ_FIELD_E EQUS "wAnimatedObject0FieldE - wAnimatedObject0" +ANIM_OBJ_FIELD_F EQUS "wAnimatedObject0FieldF - wAnimatedObject0" diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index da0b3b43..2613f707 100755 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -32,7 +32,7 @@ const SPRITE_MIDDLE_AGED_WOMAN ; $1c const SPRITE_BRUNETTE_GIRL ; $1d const SPRITE_LANCE ; $1e - const SPRITE_UNUSED_SCIENTIST ; $1f + const SPRITE_UNUSED_RED_1 ; $1f const SPRITE_SCIENTIST ; $20 const SPRITE_ROCKER ; $21 const SPRITE_SWIMMER ; $22 @@ -51,11 +51,11 @@ const SPRITE_FISHER ; $2f const SPRITE_KOGA ; $30 const SPRITE_GUARD ; $31 - const SPRITE_UNUSED_GUARD ; $32 + const SPRITE_UNUSED_RED_2 ; $32 const SPRITE_MOM ; $33 const SPRITE_BALDING_GUY ; $34 const SPRITE_LITTLE_BOY ; $35 - const SPRITE_UNUSED_GAMEBOY_KID ; $36 + const SPRITE_UNUSED_RED_3 ; $36 const SPRITE_GAMEBOY_KID ; $37 const SPRITE_FAIRY ; $38 const SPRITE_AGATHA ; $39 diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index 12b30ffe..3991ac4d 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -25,4 +25,4 @@ const CLUB ; 21 const FACILITY ; 22 const PLATEAU ; 23 - const BEACH_HOUSE_TILESET ; 24 + const BEACH_HOUSE ; 24 |