From e0b4fc781aba3c9ac184e0ab91dfcf5d11c585c5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Nov 2015 00:49:27 -0500 Subject: sprite engine; tileset constants --- constants/tilemap_constants.asm | 72 ++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'constants') diff --git a/constants/tilemap_constants.asm b/constants/tilemap_constants.asm index 215bd2934..e64d042d8 100644 --- a/constants/tilemap_constants.asm +++ b/constants/tilemap_constants.asm @@ -5,39 +5,39 @@ WATRTILE EQU 15 TALK EQU 1 << 4 const_value SET 1 - const TILESET_JOHTO_OUTSIDE_1 ; 01 - const TILESET_JOHTO_OUTSIDE_2 ; 02 - const TILESET_KANTO_OUTSIDE ; 03 - const TILESET_BATTLE_TOWER_OUTSIDE ; 04 - const TILESET_HOUSE_1 ; 05 - const TILESET_KRISS_HOUSE ; 06 - const TILESET_POKECENTER ; 07 - const TILESET_GATE ; 08 - const TILESET_PORT ; 09 - const TILESET_LAB ; 0a - const TILESET_POWER_PLANT ; 0b - const TILESET_MART ; 0c - const TILESET_CELADON_MANSION ; 0d - const TILESET_GAME_CORNER ; 0e - const TILESET_GYM_1 ; 0f - const TILESET_KURT_HOUSE ; 10 - const TILESET_TRAIN_STATION ; 11 - const TILESET_OLIVINE_GYM ; 12 - const TILESET_LIGHTHOUSE ; 13 - const TILESET_KRISS_HOUSE_2F ; 14 - const TILESET_GOLDENROD_POKECOM_CENTER_2F_MOBILE ; 15 - const TILESET_BATTLE_TOWER ; 16 - const TILESET_SPROUT_TOWER ; 17 - const TILESET_CAVE ; 18 - const TILESET_PARK ; 19 - const TILESET_RUINS_OF_ALPH ; 1a - const TILESET_RADIO_TOWER ; 1b - const TILESET_UNDERGROUND ; 1c - const TILESET_ICE_PATH ; 1d - const TILESET_WHIRL_ISLANDS ; 1e - const TILESET_ILEX_FOREST ; 1f - const TILESET_20 ; 20 - const TILESET_HO_OH_WORD_ROOM ; 21 - const TILESET_KABUTO_WORD_ROOM ; 22 - const TILESET_OMANYTE_WORD_ROOM ; 23 - const TILESET_AERODACTYL_WORD_ROOM ; 24 + const TILESET_JOHTO_1 ; 01 + const TILESET_JOHTO_2 ; 02 + const TILESET_KANTO ; 03 + const TILESET_BATTLE_TOWER_OUTSIDE ; 04 + const TILESET_HOUSE_1 ; 05 + const TILESET_KRISS_HOUSE ; 06 + const TILESET_POKECENTER ; 07 + const TILESET_GATE ; 08 + const TILESET_PORT ; 09 + const TILESET_LAB ; 0a + const TILESET_POWER_PLANT ; 0b + const TILESET_MART ; 0c + const TILESET_CELADON_MANSION ; 0d + const TILESET_GAME_CORNER ; 0e + const TILESET_GYM_1 ; 0f + const TILESET_KURT_HOUSE ; 10 + const TILESET_TRAIN_STATION ; 11 + const TILESET_OLIVINE_GYM ; 12 + const TILESET_LIGHTHOUSE ; 13 + const TILESET_KRISS_HOUSE_2F ; 14 + const TILESET_POKECOM_CENTER ; 15 + const TILESET_BATTLE_TOWER ; 16 + const TILESET_SPROUT_TOWER ; 17 + const TILESET_CAVE ; 18 + const TILESET_PARK ; 19 + const TILESET_RUINS_OF_ALPH ; 1a + const TILESET_RADIO_TOWER ; 1b + const TILESET_UNDERGROUND ; 1c + const TILESET_ICE_PATH ; 1d + const TILESET_WHIRL_ISLANDS ; 1e + const TILESET_ILEX_FOREST ; 1f + const TILESET_20 ; 20 + const TILESET_HO_OH_WORD_ROOM ; 21 + const TILESET_KABUTO_WORD_ROOM ; 22 + const TILESET_OMANYTE_WORD_ROOM ; 23 + const TILESET_AERODACTYL_WORD_ROOM ; 24 -- cgit v1.2.3 From 21276b79f12fa8e261e63f7ddba0cdfb2391c0f9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Nov 2015 10:48:49 -0500 Subject: SpriteAnim --- constants/misc_constants.asm | 117 ++++++++++++++++++++++++++++++------------- 1 file changed, 82 insertions(+), 35 deletions(-) (limited to 'constants') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 108eda873..4991daf0a 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -189,38 +189,85 @@ NUM_KANTO_BADGES EQU const_value NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES const_def - const JUMPTABLE_8D24B_FUNCTION_00 - const JUMPTABLE_8D24B_FUNCTION_01 - const JUMPTABLE_8D24B_FUNCTION_02 - const JUMPTABLE_8D24B_FUNCTION_03 - const JUMPTABLE_8D24B_FUNCTION_04 - const JUMPTABLE_8D24B_FUNCTION_05 - const JUMPTABLE_8D24B_FUNCTION_06 - const JUMPTABLE_8D24B_FUNCTION_07 - const JUMPTABLE_8D24B_FUNCTION_08 - const JUMPTABLE_8D24B_FUNCTION_09 - const JUMPTABLE_8D24B_FUNCTION_0A - const JUMPTABLE_8D24B_FUNCTION_0B - const JUMPTABLE_8D24B_FUNCTION_0C - const JUMPTABLE_8D24B_FUNCTION_0D - const JUMPTABLE_8D24B_FUNCTION_0E - const JUMPTABLE_8D24B_FUNCTION_0F - const JUMPTABLE_8D24B_FUNCTION_10 - const JUMPTABLE_8D24B_FUNCTION_11 - const JUMPTABLE_8D24B_FUNCTION_12 - const JUMPTABLE_8D24B_FUNCTION_13 - const JUMPTABLE_8D24B_FUNCTION_14 - const JUMPTABLE_8D24B_FUNCTION_15 - const JUMPTABLE_8D24B_FUNCTION_16 - const JUMPTABLE_8D24B_FUNCTION_17 - const JUMPTABLE_8D24B_FUNCTION_18 - const JUMPTABLE_8D24B_FUNCTION_19 - const JUMPTABLE_8D24B_FUNCTION_1A - const JUMPTABLE_8D24B_FUNCTION_1B - const JUMPTABLE_8D24B_FUNCTION_1C - const JUMPTABLE_8D24B_FUNCTION_1D - const JUMPTABLE_8D24B_FUNCTION_1E - const JUMPTABLE_8D24B_FUNCTION_1F - const JUMPTABLE_8D24B_FUNCTION_20 - const JUMPTABLE_8D24B_FUNCTION_21 - const JUMPTABLE_8D24B_FUNCTION_22 + const SPRITE_ANIM_SEQ_00 + const SPRITE_ANIM_SEQ_01 + const SPRITE_ANIM_SEQ_02 + const SPRITE_ANIM_SEQ_03 + const SPRITE_ANIM_SEQ_04 + const SPRITE_ANIM_SEQ_05 + const SPRITE_ANIM_SEQ_06 + const SPRITE_ANIM_SEQ_07 + const SPRITE_ANIM_SEQ_08 + const SPRITE_ANIM_SEQ_09 + const SPRITE_ANIM_SEQ_0A + const SPRITE_ANIM_SEQ_0B + const SPRITE_ANIM_SEQ_0C + const SPRITE_ANIM_SEQ_0D + const SPRITE_ANIM_SEQ_0E + const SPRITE_ANIM_SEQ_0F + const SPRITE_ANIM_SEQ_10 + const SPRITE_ANIM_SEQ_11 + const SPRITE_ANIM_SEQ_12 + const SPRITE_ANIM_SEQ_13 + const SPRITE_ANIM_SEQ_14 + const SPRITE_ANIM_SEQ_15 + const SPRITE_ANIM_SEQ_16 + const SPRITE_ANIM_SEQ_17 + const SPRITE_ANIM_SEQ_18 + const SPRITE_ANIM_SEQ_19 + const SPRITE_ANIM_SEQ_1A + const SPRITE_ANIM_SEQ_1B + const SPRITE_ANIM_SEQ_1C + const SPRITE_ANIM_SEQ_1D + const SPRITE_ANIM_SEQ_1E + const SPRITE_ANIM_SEQ_1F + const SPRITE_ANIM_SEQ_20 + const SPRITE_ANIM_SEQ_21 + const SPRITE_ANIM_SEQ_22 + + const_def + const SPRITE_ANIM_INDEX_00 + const SPRITE_ANIM_INDEX_01 + const SPRITE_ANIM_INDEX_02 + const SPRITE_ANIM_INDEX_03 + const SPRITE_ANIM_INDEX_04 + const SPRITE_ANIM_INDEX_05 + const SPRITE_ANIM_INDEX_06 + const SPRITE_ANIM_INDEX_07 + const SPRITE_ANIM_INDEX_08 + const SPRITE_ANIM_INDEX_09 + const SPRITE_ANIM_INDEX_0A + const SPRITE_ANIM_INDEX_0B + const SPRITE_ANIM_INDEX_0C + const SPRITE_ANIM_INDEX_0D + const SPRITE_ANIM_INDEX_0E + const SPRITE_ANIM_INDEX_0F + const SPRITE_ANIM_INDEX_10 + const SPRITE_ANIM_INDEX_11 + const SPRITE_ANIM_INDEX_12 + const SPRITE_ANIM_INDEX_13 + const SPRITE_ANIM_INDEX_14 + const SPRITE_ANIM_INDEX_15 + const SPRITE_ANIM_INDEX_16 + const SPRITE_ANIM_INDEX_17 + const SPRITE_ANIM_INDEX_18 + const SPRITE_ANIM_INDEX_19 + const SPRITE_ANIM_INDEX_1A + const SPRITE_ANIM_INDEX_1B + const SPRITE_ANIM_INDEX_1C + const SPRITE_ANIM_INDEX_1D + const SPRITE_ANIM_INDEX_1E + const SPRITE_ANIM_INDEX_1F + const SPRITE_ANIM_INDEX_20 + const SPRITE_ANIM_INDEX_21 + const SPRITE_ANIM_INDEX_22 + const SPRITE_ANIM_INDEX_23 + const SPRITE_ANIM_INDEX_24 + const SPRITE_ANIM_INDEX_25 + const SPRITE_ANIM_INDEX_26 + const SPRITE_ANIM_INDEX_27 + const SPRITE_ANIM_INDEX_28 + const SPRITE_ANIM_INDEX_29 + const SPRITE_ANIM_INDEX_2A + const SPRITE_ANIM_INDEX_2B + const SPRITE_ANIM_INDEX_2C -- cgit v1.2.3 From cc8c36ee149b287b7a1cabb85abb4bf42873a3b2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 13 Nov 2015 18:59:49 -0500 Subject: Creation of constants for OBJECT_09 indices --- constants/sprite_constants.asm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'constants') diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index a017d41b0..d42f0f5d8 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -266,3 +266,31 @@ SPRITEMOVEDATA_FIELDS EQU 6 const SPRITEMOVEFN_1B MAX_OUTDOOR_SPRITES EQU 23 + + const_def + const OBJECT_09_VALUE_00 + const OBJECT_09_VALUE_01 + const OBJECT_09_VALUE_02 + const OBJECT_09_VALUE_03 + const OBJECT_09_VALUE_04 + const OBJECT_09_VALUE_05 + const OBJECT_09_VALUE_06 + const OBJECT_09_VALUE_07 + const OBJECT_09_VALUE_08 + const OBJECT_09_VALUE_09 + const OBJECT_09_VALUE_0A + const OBJECT_09_VALUE_0B + const OBJECT_09_VALUE_0C + const OBJECT_09_VALUE_0D + const OBJECT_09_VALUE_0E + const OBJECT_09_VALUE_0F + const OBJECT_09_VALUE_10 + const OBJECT_09_VALUE_11 + const OBJECT_09_VALUE_12 + const OBJECT_09_VALUE_13 + const OBJECT_09_VALUE_14 + const OBJECT_09_VALUE_15 + const OBJECT_09_VALUE_16 + const OBJECT_09_VALUE_17 + const OBJECT_09_VALUE_18 + const OBJECT_09_VALUE_19 -- cgit v1.2.3 From ed44de4bb4688f6b8c83aeb4f5fd8658d17615fb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 14 Nov 2015 14:41:47 -0500 Subject: More map object work --- constants/map_constants.asm | 16 +++++++++------- constants/sprite_constants.asm | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 20 deletions(-) (limited to 'constants') diff --git a/constants/map_constants.asm b/constants/map_constants.asm index c98c64ff9..7891b10f9 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -529,18 +529,18 @@ const_value SET 1 const OBJECT_FACING const OBJECT_09 const OBJECT_STEP_DURATION - const OBJECT_11 + const OBJECT_ACTION const OBJECT_12 const OBJECT_FACING_STEP const OBJECT_STANDING_TILE const OBJECT_NEXT_TILE - const OBJECT_MAP_X - const OBJECT_MAP_Y const OBJECT_NEXT_MAP_X const OBJECT_NEXT_MAP_Y - const OBJECT_20 - const OBJECT_21 - const OBJECT_22 + const OBJECT_MAP_X + const OBJECT_MAP_Y + const OBJECT_INIT_X + const OBJECT_INIT_Y + const OBJECT_RADIUS const OBJECT_SPRITE_X const OBJECT_SPRITE_Y const OBJECT_SPRITE_X_OFFSET @@ -550,7 +550,7 @@ const_value SET 1 const OBJECT_29 const OBJECT_30 const OBJECT_31 - const OBJECT_32 + const OBJECT_RANGE ; 33-39 are not used ; map object struct @@ -651,3 +651,5 @@ NUM_SPAWNS EQU const_value const PALETTE_NITE const PALETTE_MORN const PALETTE_DARK + +FIXED_FACING EQU 2 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index d42f0f5d8..1310b0565 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -220,15 +220,15 @@ NUM_SPRITEHEADER_FIELDS EQU const_value const SPRITEMOVEDATA_SMASHABLE_ROCK const SPRITEMOVEDATA_STRENGTH_BOULDER const SPRITEMOVEDATA_FOLLOWNOTEXACT - const SPRITEMOVEDATA_1B - const SPRITEMOVEDATA_1C - const SPRITEMOVEDATA_1D + const SPRITEMOVEDATA_SHADOW + const SPRITEMOVEDATA_EMOTE + const SPRITEMOVEDATA_SCREENSHAKE const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE const SPRITEMOVEDATA_SPINCLOCKWISE const SPRITEMOVEDATA_20 const SPRITEMOVEDATA_BIGDOLL - const SPRITEMOVEDATA_22 - const SPRITEMOVEDATA_23 + const SPRITEMOVEDATA_BOULDERDUST + const SPRITEMOVEDATA_GRASS const SPRITEMOVEDATA_LAPRAS const SPRITEMOVEDATA_25 NUM_SPRITEMOVEDATA EQU const_value +- 1 @@ -255,23 +255,23 @@ SPRITEMOVEDATA_FIELDS EQU 6 const SPRITEMOVEFN_SCRIPTED const SPRITEMOVEFN_STRENGTH const SPRITEMOVEFN_FOLLOWNOTEXACT - const SPRITEMOVEFN_13 - const SPRITEMOVEFN_14 + const SPRITEMOVEFN_SHADOW + const SPRITEMOVEFN_EMOTE const SPRITEMOVEFN_BIG_SNORLAX const SPRITEMOVEFN_BOUNCE - const SPRITEMOVEFN_17 + const SPRITEMOVEFN_SCREENSHAKE const SPRITEMOVEFN_SPIN_CLOCKWISE const SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE - const SPRITEMOVEFN_1A - const SPRITEMOVEFN_1B + const SPRITEMOVEFN_BOULDERDUST + const SPRITEMOVEFN_GRASS MAX_OUTDOOR_SPRITES EQU 23 const_def const OBJECT_09_VALUE_00 - const OBJECT_09_VALUE_01 - const OBJECT_09_VALUE_02 - const OBJECT_09_VALUE_03 + const OBJECT_09_VALUE_01 ; standing + const OBJECT_09_VALUE_02 ; walking + const OBJECT_09_VALUE_03 ; bumping const OBJECT_09_VALUE_04 const OBJECT_09_VALUE_05 const OBJECT_09_VALUE_06 -- cgit v1.2.3 From b921226aea7e624655f0d32436638ea3ffd63419 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 14 Nov 2015 23:02:38 -0500 Subject: More map object, swap StandingTile and NextTile --- constants/map_constants.asm | 10 +++--- constants/sprite_constants.asm | 71 ++++++++++++++++++++++++++---------------- 2 files changed, 50 insertions(+), 31 deletions(-) (limited to 'constants') diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 7891b10f9..2b5a139c7 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -527,13 +527,13 @@ const_value SET 1 const OBJECT_PALETTE const OBJECT_DIRECTION_WALKING const OBJECT_FACING - const OBJECT_09 + const OBJECT_STEP_TYPE const OBJECT_STEP_DURATION const OBJECT_ACTION const OBJECT_12 const OBJECT_FACING_STEP - const OBJECT_STANDING_TILE const OBJECT_NEXT_TILE + const OBJECT_STANDING_TILE const OBJECT_NEXT_MAP_X const OBJECT_NEXT_MAP_Y const OBJECT_MAP_X @@ -590,9 +590,9 @@ OW_RIGHT EQU RIGHT << 2 const EMOTE_BOLT ; 5 const EMOTE_SLEEP ; 6 const EMOTE_FISH ; 7 - const EMOTE_08 ; 8 - const EMOTE_09 ; 9 - const EMOTE_0A ; 10 + const EMOTE_SHADOW ; 8 + const EMOTE_ROD ; 9 + const EMOTE_BOULDER_DUST ; 10 const EMOTE_0B ; 11 EMOTE_MEM EQU -1 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 1310b0565..f507ad6f6 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -268,29 +268,48 @@ SPRITEMOVEDATA_FIELDS EQU 6 MAX_OUTDOOR_SPRITES EQU 23 const_def - const OBJECT_09_VALUE_00 - const OBJECT_09_VALUE_01 ; standing - const OBJECT_09_VALUE_02 ; walking - const OBJECT_09_VALUE_03 ; bumping - const OBJECT_09_VALUE_04 - const OBJECT_09_VALUE_05 - const OBJECT_09_VALUE_06 - const OBJECT_09_VALUE_07 - const OBJECT_09_VALUE_08 - const OBJECT_09_VALUE_09 - const OBJECT_09_VALUE_0A - const OBJECT_09_VALUE_0B - const OBJECT_09_VALUE_0C - const OBJECT_09_VALUE_0D - const OBJECT_09_VALUE_0E - const OBJECT_09_VALUE_0F - const OBJECT_09_VALUE_10 - const OBJECT_09_VALUE_11 - const OBJECT_09_VALUE_12 - const OBJECT_09_VALUE_13 - const OBJECT_09_VALUE_14 - const OBJECT_09_VALUE_15 - const OBJECT_09_VALUE_16 - const OBJECT_09_VALUE_17 - const OBJECT_09_VALUE_18 - const OBJECT_09_VALUE_19 + const STEP_TYPE_00 + const STEP_TYPE_01 ; standing + const STEP_TYPE_02 ; walking + const STEP_TYPE_03 ; bumping + const STEP_TYPE_04 + const STEP_TYPE_05 + const STEP_TYPE_06 + const STEP_TYPE_07 + const STEP_TYPE_08 + const STEP_TYPE_09 + const STEP_TYPE_0A + const STEP_TYPE_0B + const STEP_TYPE_0C + const STEP_TYPE_0D + const STEP_TYPE_0E + const STEP_TYPE_0F + const STEP_TYPE_10 + const STEP_TYPE_11 + const STEP_TYPE_12 + const STEP_TYPE_13 + const STEP_TYPE_14 + const STEP_TYPE_15 + const STEP_TYPE_16 + const STEP_TYPE_17 + const STEP_TYPE_18 + const STEP_TYPE_19 + + const_def + const PERSON_ACTION_00 + const PERSON_ACTION_01 + const PERSON_ACTION_02 + const PERSON_ACTION_03 + const PERSON_ACTION_04 + const PERSON_ACTION_05 + const PERSON_ACTION_06 + const PERSON_ACTION_07 + const PERSON_ACTION_08 + const PERSON_ACTION_09 + const PERSON_ACTION_0A + const PERSON_ACTION_0B + const PERSON_ACTION_0C + const PERSON_ACTION_0D + const PERSON_ACTION_0E + const PERSON_ACTION_0F + const PERSON_ACTION_10 -- cgit v1.2.3 From ead04b3b75c79446a337b5b2c38f2650f22a5f3b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 15 Nov 2015 14:59:38 -0500 Subject: Backup prior to global introduction of PERSONTYPE constants --- constants/map_constants.asm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'constants') diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 2b5a139c7..71a877c4c 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -653,3 +653,12 @@ NUM_SPAWNS EQU const_value const PALETTE_DARK FIXED_FACING EQU 2 + + const_def + const PERSONTYPE_SCRIPT + const PERSONTYPE_ITEMFRAGMENT + const PERSONTYPE_TRAINER + const PERSONTYPE_3 + const PERSONTYPE_4 + const PERSONTYPE_5 + const PERSONTYPE_6 -- cgit v1.2.3 From aba038a4a4b5a1ef9ab683a3683849809ef95467 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 15 Nov 2015 21:28:15 -0500 Subject: Fix some movement macro/function names --- constants/map_constants.asm | 5 ++++- constants/sprite_constants.asm | 48 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 8 deletions(-) (limited to 'constants') diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 71a877c4c..bdc1319ae 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -530,7 +530,7 @@ const_value SET 1 const OBJECT_STEP_TYPE const OBJECT_STEP_DURATION const OBJECT_ACTION - const OBJECT_12 + const OBJECT_STEP_FRAME const OBJECT_FACING_STEP const OBJECT_NEXT_TILE const OBJECT_STANDING_TILE @@ -652,7 +652,10 @@ NUM_SPAWNS EQU const_value const PALETTE_MORN const PALETTE_DARK +INVISIBLE EQU 0 FIXED_FACING EQU 2 +SLIDING EQU 3 +EMOTE_OBJECT EQU 7 const_def const PERSONTYPE_SCRIPT diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index f507ad6f6..438e4cb54 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -269,20 +269,20 @@ MAX_OUTDOOR_SPRITES EQU 23 const_def const STEP_TYPE_00 - const STEP_TYPE_01 ; standing + const STEP_TYPE_01 const STEP_TYPE_02 ; walking - const STEP_TYPE_03 ; bumping + const STEP_TYPE_03 ; stationary const STEP_TYPE_04 const STEP_TYPE_05 const STEP_TYPE_06 const STEP_TYPE_07 const STEP_TYPE_08 const STEP_TYPE_09 - const STEP_TYPE_0A - const STEP_TYPE_0B - const STEP_TYPE_0C - const STEP_TYPE_0D - const STEP_TYPE_0E + const STEP_TYPE_0A ; half step + const STEP_TYPE_0B ; bump + const STEP_TYPE_TELEPORT_FROM + const STEP_TYPE_TELEPORT_TO + const STEP_TYPE_SKYFALL const STEP_TYPE_0F const STEP_TYPE_10 const STEP_TYPE_11 @@ -313,3 +313,37 @@ MAX_OUTDOOR_SPRITES EQU 23 const PERSON_ACTION_0E const PERSON_ACTION_0F const PERSON_ACTION_10 + + const_def + const FACING_00 + const FACING_01 + const FACING_02 + const FACING_03 + const FACING_04 + const FACING_05 + const FACING_06 + const FACING_07 + const FACING_08 + const FACING_09 + const FACING_0A + const FACING_0B + const FACING_0C + const FACING_0D + const FACING_0E + const FACING_0F + const FACING_10 + const FACING_11 + const FACING_12 + const FACING_13 + const FACING_14 + const FACING_15 + const FACING_16 + const FACING_17 + const FACING_18 + const FACING_19 + const FACING_1A + const FACING_1B + const FACING_1C + const FACING_1D + const FACING_1E + const FACING_1F -- cgit v1.2.3 From fb88b2ccf8f0897f95d25b82f95444ec775aa917 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 16 Nov 2015 11:53:26 -0500 Subject: Movement constants, script stack --- constants/script_constants.asm | 56 +++++++++++++++++++++--------------------- constants/sprite_constants.asm | 38 ++++++++++++++-------------- 2 files changed, 47 insertions(+), 47 deletions(-) (limited to 'constants') diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 058f9d92d..f1e608ab9 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -3,34 +3,34 @@ PLAYER EQU 0 LAST_TALKED EQU -2 const_def - const VAR_STRINGBUFFER2 - const VAR_PARTYCOUNT - const VAR_BATTLERESULT - const VAR_BATTLETYPE - const VAR_TIMEOFDAY - const VAR_DEXCAUGHT - const VAR_DEXSEEN - const VAR_BADGES - const VAR_MOVEMENT - const VAR_FACING - const VAR_HOUR - const VAR_WEEKDAY - const VAR_MAPGROUP - const VAR_MAPNUMBER - const VAR_UNOWNCOUNT - const VAR_ROOFPALETTE - const VAR_BOXSPACE - const VAR_CONTESTMINUTES - const VAR_XCOORD - const VAR_YCOORD - const VAR_SPECIALPHONECALL - const VAR_15 - const VAR_KURT_APRICORNS - const VAR_CALLERID - const VAR_BLUECARDBALANCE - const VAR_BUENASPASSWORD - const VAR_KENJI_BREAK -NUM_VARS EQU const_value + const VAR_STRINGBUFFER2 ; 00 + const VAR_PARTYCOUNT ; 01 + const VAR_BATTLERESULT ; 02 + const VAR_BATTLETYPE ; 03 + const VAR_TIMEOFDAY ; 04 + const VAR_DEXCAUGHT ; 05 + const VAR_DEXSEEN ; 06 + const VAR_BADGES ; 07 + const VAR_MOVEMENT ; 08 + const VAR_FACING ; 09 + const VAR_HOUR ; 0a + const VAR_WEEKDAY ; 0b + const VAR_MAPGROUP ; 0c + const VAR_MAPNUMBER ; 0d + const VAR_UNOWNCOUNT ; 0e + const VAR_ROOFPALETTE ; 0f + const VAR_BOXSPACE ; 10 + const VAR_CONTESTMINUTES ; 11 + const VAR_XCOORD ; 12 + const VAR_YCOORD ; 13 + const VAR_SPECIALPHONECALL ; 14 + const VAR_15 ; 15 + const VAR_KURT_APRICORNS ; 16 + const VAR_CALLERID ; 17 + const VAR_BLUECARDBALANCE ; 18 + const VAR_BUENASPASSWORD ; 19 + const VAR_KENJI_BREAK ; 1a +NUM_VARS EQU const_value ; 1b RETVAR_STRBUF2 EQU (0 << 6) RETVAR_ADDR_DE EQU (1 << 6) diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 438e4cb54..c34ac6c28 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -269,24 +269,24 @@ MAX_OUTDOOR_SPRITES EQU 23 const_def const STEP_TYPE_00 - const STEP_TYPE_01 - const STEP_TYPE_02 ; walking - const STEP_TYPE_03 ; stationary + const STEP_TYPE_STANDING + const STEP_TYPE_NPC_WALK + const STEP_TYPE_03 const STEP_TYPE_04 const STEP_TYPE_05 - const STEP_TYPE_06 + const STEP_TYPE_PLAYER_WALK const STEP_TYPE_07 - const STEP_TYPE_08 - const STEP_TYPE_09 - const STEP_TYPE_0A ; half step - const STEP_TYPE_0B ; bump + const STEP_TYPE_NPC_JUMP + const STEP_TYPE_PLAYER_JUMP + const STEP_TYPE_HALF_STEP + const STEP_TYPE_BUMP const STEP_TYPE_TELEPORT_FROM const STEP_TYPE_TELEPORT_TO const STEP_TYPE_SKYFALL const STEP_TYPE_0F - const STEP_TYPE_10 - const STEP_TYPE_11 - const STEP_TYPE_12 + const STEP_TYPE_GOT_BITE + const STEP_TYPE_ROCK_SMASH + const STEP_TYPE_RETURN_DIG const STEP_TYPE_13 const STEP_TYPE_14 const STEP_TYPE_15 @@ -297,14 +297,14 @@ MAX_OUTDOOR_SPRITES EQU 23 const_def const PERSON_ACTION_00 - const PERSON_ACTION_01 - const PERSON_ACTION_02 - const PERSON_ACTION_03 - const PERSON_ACTION_04 - const PERSON_ACTION_05 - const PERSON_ACTION_06 + const PERSON_ACTION_STAND + const PERSON_ACTION_STEP + const PERSON_ACTION_BUMP + const PERSON_ACTION_SPIN + const PERSON_ACTION_SPIN_FLICKER + const PERSON_ACTION_FISHING const PERSON_ACTION_07 - const PERSON_ACTION_08 + const PERSON_ACTION_EMOTE const PERSON_ACTION_09 const PERSON_ACTION_0A const PERSON_ACTION_0B @@ -335,7 +335,7 @@ MAX_OUTDOOR_SPRITES EQU 23 const FACING_11 const FACING_12 const FACING_13 - const FACING_14 + const FACING_EMOTE const FACING_15 const FACING_16 const FACING_17 -- cgit v1.2.3 From 435b0cf686e55bbe60acbce1e6154b0c2450bbac Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 16 Nov 2015 16:01:45 -0500 Subject: Options menu, some mobile fns --- constants/cgb_constants.asm | 32 ++++++++++++++++++++++++++++++++ constants/misc_constants.asm | 26 ++++++++++++++++++-------- constants/wram_constants.asm | 15 +++++++++++++++ 3 files changed, 65 insertions(+), 8 deletions(-) create mode 100755 constants/cgb_constants.asm (limited to 'constants') diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm new file mode 100755 index 000000000..27dce0494 --- /dev/null +++ b/constants/cgb_constants.asm @@ -0,0 +1,32 @@ + const_def + const SCGB_00 + const SCGB_01 + const SCGB_02 + const SCGB_03 + const SCGB_04 + const SCGB_05 + const SCGB_06 + const SCGB_07 + const SCGB_08 + const SCGB_09 + const SCGB_0A + const SCGB_0B + const SCGB_0C + const SCGB_0D + const SCGB_0E + const SCGB_0F + const SCGB_10 + const SCGB_11 + const SCGB_12 + const SCGB_13 + const SCGB_14 + const SCGB_15 + const SCGB_16 + const SCGB_17 + const SCGB_18 + const SCGB_19 + const SCGB_1A + const SCGB_1B + const SCGB_1C + const SCGB_1D + const SCGB_1E diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 4991daf0a..cc0257cfb 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -46,15 +46,25 @@ CHECK_FLAG EQU 2 ; joypad + const_def + const A_BUTTON_F + const B_BUTTON_F + const SELECT_F + const START_F + const D_RIGHT_F + const D_LEFT_F + const D_UP_F + const D_DOWN_F + NO_INPUT EQU %00000000 -A_BUTTON EQU %00000001 -B_BUTTON EQU %00000010 -SELECT EQU %00000100 -START EQU %00001000 -D_RIGHT EQU %00010000 -D_LEFT EQU %00100000 -D_UP EQU %01000000 -D_DOWN EQU %10000000 +A_BUTTON EQU 1 << A_BUTTON_F +B_BUTTON EQU 1 << B_BUTTON_F +SELECT EQU 1 << SELECT_F +START EQU 1 << START_F +D_RIGHT EQU 1 << D_RIGHT_F +D_LEFT EQU 1 << D_LEFT_F +D_UP EQU 1 << D_UP_F +D_DOWN EQU 1 << D_DOWN_F BUTTONS EQU A_BUTTON | B_BUTTON | SELECT | START D_PAD EQU D_RIGHT | D_LEFT | D_UP | D_DOWN diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index ffe9b11a6..a8d348e6c 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -7,10 +7,25 @@ BREEDMON EQU 3 WILDMON EQU 4 ; Options: ; cfcc +FAST_TEXT EQU 0 +MED_TEXT EQU 1 +SLOW_TEXT EQU 2 NO_TEXT_SCROLL EQU 4 +; bits +STEREO EQU 5 BATTLE_SHIFT EQU 6 BATTLE_SCENE EQU 7 +; Options2: +MENU_ACCOUNT EQU 0 + +; GBPrinter: +PRINT_LIGHTEST EQU $00 +PRINT_LIGHTER EQU $20 +PRINT_NORMAL EQU $40 +PRINT_DARKER EQU $60 +PRINT_DARKEST EQU $7f + ; WalkingDirection: ; d043 STANDING EQU -1 DOWN EQU 0 -- cgit v1.2.3 From e88c88ff2015a55ff0d04f9ac1dc55d7f0567f7c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 17 Nov 2015 15:54:03 -0500 Subject: engine/decorations.asm --- constants/deco_constants.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'constants') diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 6f15b5f35..d48f0b997 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -52,12 +52,12 @@ const_value = 1 const PUT_AWAY_ORNAMENT const_value = 1 - const DECO_01 + const DECO_BEDS const DECO_FEATHERY_BED ; 2 const DECO_PINK_BED ; 3 const DECO_POLKADOT_BED ; 4 const DECO_PIKACHU_BED ; 5 - const DECO_06 + const DECO_CARPETS const DECO_RED_CARPET ; 7 const DECO_BLUE_CARPET ; 8 const DECO_YELLOW_CARPET ; 9 @@ -66,21 +66,21 @@ const_value = 1 const DECO_MAGNAPLANT ; c const DECO_TROPICPLANT ; d const DECO_JUMBOPLANT ; e - const DECO_0F + const DECO_POSTERS const DECO_TOWN_MAP ; 10 const DECO_PIKACHU_POSTER ; 11 const DECO_CLEFAIRY_POSTER ; 12 const DECO_JIGGLYPUFF_POSTER ; 13 - const DECO_14 + const DECO_CONSOLES const DECO_FAMICOM ; 15 const DECO_SNES ; 16 const DECO_N64 ; 17 const DECO_VIRTUAL_BOY ; 18 - const DECO_19 + const DECO_BIG_DOLLS const DECO_BIG_SNORLAX_DOLL ; 1a const DECO_BIG_ONIX_DOLL ; 1b const DECO_BIG_LAPRAS_DOLL ; 1c - const DECO_1D + const DECO_DOLLS const DECO_PIKACHU_DOLL ; 1e const DECO_SURF_PIKACHU_DOLL ; 1f const DECO_CLEFAIRY_DOLL ; 20 -- cgit v1.2.3 From 27ef600ace40671a78f5bb3a71f507e42c175f50 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 17 Nov 2015 17:56:49 -0500 Subject: Here's the mail it never fails --- constants/misc_constants.asm | 4 ++++ constants/pokemon_constants.asm | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'constants') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index cc0257cfb..964783a5e 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -32,6 +32,10 @@ HP_RED EQU 2 MONS_PER_BOX EQU 20 NUM_BOXES EQU 14 +; mail +MAIL_STRUCT_LENGTH EQU $2f +MAILBOX_CAPACITY EQU 10 + ; hall of fame HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (PKMN_NAME_LENGTH +- 1) ; species, id, dvs, level, nick HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 3407281c4..654459c44 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -291,7 +291,6 @@ MON_SAT EQUS "(PartyMon1SpclAtk - PartyMon1)" MON_SDF EQUS "(PartyMon1SpclDef - PartyMon1)" BOXMON_STRUCT_LENGTH EQUS "(PartyMon1End - PartyMon1)" PARTYMON_STRUCT_LENGTH EQUS "(PartyMon1StatsEnd - PartyMon1)" -SCRATCHMON_STRUCT_LENGTH EQUS "(PartyMon1StatsEnd - PartyMon1Item)" const_value SET 1 const MONMENU_CUT ; 1 -- cgit v1.2.3 From 6d47be8d8c02317a963c6ff5266a50a8674d285d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 18 Nov 2015 10:42:42 -0500 Subject: Fruit tree constants, more mail engine --- constants/map_constants.asm | 33 +++++++++++++++++++++++++++++++++ constants/misc_constants.asm | 1 + 2 files changed, 34 insertions(+) (limited to 'constants') diff --git a/constants/map_constants.asm b/constants/map_constants.asm index bdc1319ae..6ff5bc55b 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -665,3 +665,36 @@ EMOTE_OBJECT EQU 7 const PERSONTYPE_4 const PERSONTYPE_5 const PERSONTYPE_6 + +; fruit trees +const_value SET 1 + const FRUITTREE_ROUTE_29 + const FRUITTREE_ROUTE_30_1 + const FRUITTREE_ROUTE_38 + const FRUITTREE_ROUTE_46_1 + const FRUITTREE_ROUTE_30_2 + const FRUITTREE_ROUTE_33 + const FRUITTREE_ROUTE_31 + const FRUITTREE_ROUTE_43 + const FRUITTREE_VIOLET_CITY + const FRUITTREE_ROUTE_46_2 + const FRUITTREE_ROUTE_35 + const FRUITTREE_ROUTE_45 + const FRUITTREE_ROUTE_36 + const FRUITTREE_ROUTE_26 + const FRUITTREE_ROUTE_39 + const FRUITTREE_ROUTE_44 + const FRUITTREE_ROUTE_37_1 + const FRUITTREE_ROUTE_37_2 + const FRUITTREE_ROUTE_37_3 + const FRUITTREE_AZALEA_TOWN + const FRUITTREE_ROUTE_42_1 + const FRUITTREE_ROUTE_42_2 + const FRUITTREE_ROUTE_42_3 + const FRUITTREE_ROUTE_11 + const FRUITTREE_ROUTE_2 + const FRUITTREE_ROUTE_1 + const FRUITTREE_ROUTE_8 + const FRUITTREE_PEWTER_CITY_1 + const FRUITTREE_PEWTER_CITY_2 + const FRUITTREE_FUCHSIA_CITY diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 964783a5e..741750e34 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -35,6 +35,7 @@ NUM_BOXES EQU 14 ; mail MAIL_STRUCT_LENGTH EQU $2f MAILBOX_CAPACITY EQU 10 +MAIL_MSG_LENGTH EQU $20 ; hall of fame HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (PKMN_NAME_LENGTH +- 1) ; species, id, dvs, level, nick -- cgit v1.2.3 From 3f4044cd4628c156e975971ce0655d3d51917b87 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 18 Nov 2015 13:01:55 -0500 Subject: engine/compose_mail.asm; ldpixel --- constants/misc_constants.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'constants') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 741750e34..63d46c646 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -85,8 +85,8 @@ EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * 8 SCREEN_WIDTH EQU 20 SCREEN_HEIGHT EQU 18 -SCREEN_WIDTH_PX EQU 160 -SCREEN_HEIGHT_PX EQU 144 +SCREEN_WIDTH_PX EQU SCREEN_WIDTH * 8 +SCREEN_HEIGHT_PX EQU SCREEN_HEIGHT * 8 BG_MAP_WIDTH EQU 32 BG_MAP_HEIGHT EQU 32 -- cgit v1.2.3 From 8a6a1a7d77fdcd1f8468f0c411795a8f039d4bd8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 18 Nov 2015 23:16:25 -0500 Subject: CmdQueues --- constants/map_constants.asm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'constants') diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 6ff5bc55b..b0b1ad588 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -698,3 +698,11 @@ const_value SET 1 const FRUITTREE_PEWTER_CITY_1 const FRUITTREE_PEWTER_CITY_2 const FRUITTREE_FUCHSIA_CITY + +CMDQUEUE_TYPE EQU 0 +CMDQUEUE_ADDR EQU 1 +CMDQUEUE_03 EQU 3 +CMDQUEUE_04 EQU 4 +CMDQUEUE_05 EQU 5 +CMDQUEUE_ENTRY_SIZE EQU 6 +CMDQUEUE_CAPACITY EQU 4 -- cgit v1.2.3 From 812976cee6ba39d50583921273ad85195e77be37 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 20 Nov 2015 11:47:52 -0500 Subject: bgcoord --- constants/deco_constants.asm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'constants') diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index d48f0b997..cb5b6d00a 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -104,3 +104,6 @@ const_value = 1 const DECO_TENTACOOL_DOLL ; 32 const DECO_GOLD_TROPHY_DOLL ; 33 const DECO_SILVER_TROPHY_DOLL ; 34 + +NUM_NON_TROPHY_DECOS EQU $2b +NUM_DECOS EQU $2d -- cgit v1.2.3 From 7b3090e22aefffa464570ac34665ee8e43df873d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 20 Nov 2015 15:15:32 -0500 Subject: Annotate battle tower text bug --- constants/cgb_constants.asm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'constants') diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm index 27dce0494..5fb29ae84 100755 --- a/constants/cgb_constants.asm +++ b/constants/cgb_constants.asm @@ -30,3 +30,6 @@ const SCGB_1C const SCGB_1D const SCGB_1E + +SCGB_FC EQU -4 +SCGB_RAM EQU -1 -- cgit v1.2.3 From d972564175bcee324877f1e016fafd349c50e7d3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 23 Nov 2015 16:04:53 -0500 Subject: link and seer labels --- constants/misc_constants.asm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'constants') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 63d46c646..e9f2a387f 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -176,6 +176,10 @@ const_value = 1 const LINK_COLOSSEUM const LINK_MOBILE +SERIAL_TIMECAPSULE EQU $60 +SERIAL_TRADECENTER EQU $70 +SERIAL_BATTLE EQU $80 + HMENURETURN_SCRIPT EQU %10000000 HMENURETURN_ASM EQU %11111111 -- cgit v1.2.3 From 6c248953b79237de98a177b7820ed7b9c4e96880 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 24 Nov 2015 10:35:13 -0500 Subject: Mobile functions for fixed-phrase selection --- constants/misc_constants.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'constants') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index e9f2a387f..cf1e9dfae 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -290,3 +290,5 @@ NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES const SPRITE_ANIM_INDEX_2A const SPRITE_ANIM_INDEX_2B const SPRITE_ANIM_INDEX_2C + +NUM_KANA EQU $2d -- cgit v1.2.3