diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-12 13:10:01 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-12 13:31:27 -0400 |
| commit | 3e40a1ecd0dc81d1d5be5f1adda1fbbe14b67d83 (patch) | |
| tree | f16febfeb0c404b6fd1c0e630d26da14eaf07a71 /constants | |
| parent | dac57cee381b68350ef50317619334892c140945 (diff) | |
Simple cleanups in constants/data/macros and banks 1-4.
Diffstat (limited to 'constants')
25 files changed, 583 insertions, 569 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm index 2fbbf595..bd5036d6 100644 --- a/constants/battle_anim_constants.asm +++ b/constants/battle_anim_constants.asm @@ -11,7 +11,7 @@ const BATTLEANIMSTRUCT_YCOORD const BATTLEANIMSTRUCT_XOFFSET const BATTLEANIMSTRUCT_YOFFSET - const BATTLEANIMSTRUCT_0B + const BATTLEANIMSTRUCT_PARAM const BATTLEANIMSTRUCT_DURATION const BATTLEANIMSTRUCT_FRAME const BATTLEANIMSTRUCT_ANON_JT_INDEX @@ -708,7 +708,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const BATTLEANIMOAMSET_D7 ; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm) -const_value SET 1 + const_def 1 const ANIM_BG_FLASH_INVERTED const ANIM_BG_FLASH_WHITE const ANIM_BG_WHITE_HUES @@ -763,7 +763,7 @@ const_value SET 1 const ANIM_BG_34 ; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm) -const_value SET 1 + const_def 1 const ANIM_GFX_HIT const ANIM_GFX_CUT const ANIM_GFX_FIRE diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index ba373a0a..636d917a 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -37,19 +37,19 @@ NO_EFFECT EQU 00 const SP_DEFENSE const ACCURACY const EVASION - const ABILITY + const ABILITY ; used for BattleCommand_Curse NUM_LEVEL_STATS EQU const_value ; move struct members (see data/moves/moves.asm) const_def - const MOVE_ANIM - const MOVE_EFFECT - const MOVE_POWER - const MOVE_TYPE - const MOVE_ACC - const MOVE_PP - const MOVE_CHANCE - const MOVE_LENGTH + const MOVE_ANIM ; 0 + const MOVE_EFFECT ; 1 + const MOVE_POWER ; 2 + const MOVE_TYPE ; 3 + const MOVE_ACC ; 4 + const MOVE_PP ; 5 + const MOVE_CHANCE ; 6 +MOVE_LENGTH EQU const_value ; stat constants ; indexes for: @@ -76,12 +76,12 @@ MAX_STAT_VALUE EQU 999 ATKDEFDV_SHINY EQU $EA SPDSPCDV_SHINY EQU $AA -; battle classes -const_value SET 1 +; battle classes (wBattleMode values) + const_def 1 const WILD_BATTLE const TRAINER_BATTLE -; battle types +; battle types (wBattleType values) const_def const BATTLETYPE_NORMAL const BATTLETYPE_CANLOSE @@ -95,7 +95,7 @@ const_value SET 1 const BATTLETYPE_TRAP const BATTLETYPE_FORCEITEM -; battle variables +; BattleVarPairs indexes (see home/battle.asm) const_def const BATTLE_VARS_SUBSTATUS1 const BATTLE_VARS_SUBSTATUS2 @@ -119,17 +119,46 @@ const_value SET 1 const BATTLE_VARS_LAST_MOVE const BATTLE_VARS_LAST_MOVE_OPP -; status -const_value SET 3 +; BattleVarLocations indexes (see home/battle.asm) + const_def + const PLAYER_SUBSTATUS_1 + const ENEMY_SUBSTATUS_1 + const PLAYER_SUBSTATUS_2 + const ENEMY_SUBSTATUS_2 + const PLAYER_SUBSTATUS_3 + const ENEMY_SUBSTATUS_3 + const PLAYER_SUBSTATUS_4 + const ENEMY_SUBSTATUS_4 + const PLAYER_SUBSTATUS_5 + const ENEMY_SUBSTATUS_5 + const PLAYER_STATUS + const ENEMY_STATUS + const PLAYER_MOVE_ANIMATION + const ENEMY_MOVE_ANIMATION + const PLAYER_MOVE_EFFECT + const ENEMY_MOVE_EFFECT + const PLAYER_MOVE_POWER + const ENEMY_MOVE_POWER + const PLAYER_MOVE_TYPE + const ENEMY_MOVE_TYPE + const PLAYER_CUR_MOVE + const ENEMY_CUR_MOVE + const PLAYER_COUNTER_MOVE + const ENEMY_COUNTER_MOVE + const PLAYER_LAST_MOVE + const ENEMY_LAST_MOVE + +; status condition bit flags +SLP EQU %111 ; 0-7 turns + const_def 3 const PSN const BRN const FRZ const PAR - const SLP ; 7 turns -ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP +ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP -; substatus +; wPlayerSubStatus1 or wEnemySubStatus1 bit flags enum_start 7, -1 enum SUBSTATUS_IN_LOVE enum SUBSTATUS_ROLLOUT @@ -140,8 +169,10 @@ ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP enum SUBSTATUS_CURSE enum SUBSTATUS_NIGHTMARE -SUBSTATUS_CURLED EQU 0 +; wPlayerSubStatus2 or wEnemySubStatus2 bit flags +SUBSTATUS_CURLED EQU 0 +; wPlayerSubStatus3 or wEnemySubStatus3 bit flags enum_start 7, -1 enum SUBSTATUS_CONFUSED enum SUBSTATUS_FLYING @@ -152,6 +183,7 @@ SUBSTATUS_CURLED EQU 0 enum SUBSTATUS_RAMPAGE enum SUBSTATUS_BIDE +; wPlayerSubStatus4 or wEnemySubStatus4 bit flags enum_start 7, -1 enum SUBSTATUS_LEECH_SEED enum SUBSTATUS_RAGE @@ -162,6 +194,7 @@ SUBSTATUS_CURLED EQU 0 enum SUBSTATUS_MIST enum SUBSTATUS_X_ACCURACY +; wPlayerSubStatus5 or wEnemySubStatus5 bit flags enum_start 7, -1 enum SUBSTATUS_CANT_RUN enum SUBSTATUS_DESTINY_BOND @@ -172,7 +205,7 @@ SUBSTATUS_CURLED EQU 0 enum SUBSTATUS_UNKNOWN_3 enum SUBSTATUS_TOXIC -; environmental +; wPlayerScreens or wEnemyScreens bit flags enum_start 4, -1 enum SCREENS_REFLECT enum SCREENS_LIGHT_SCREEN @@ -180,7 +213,7 @@ SUBSTATUS_CURLED EQU 0 enum SCREENS_UNUSED enum SCREENS_SPIKES -; weather +; values in wBattleWeather const_def const WEATHER_NONE const WEATHER_RAIN @@ -190,36 +223,6 @@ SUBSTATUS_CURLED EQU 0 const WEATHER_SUN_END const WEATHER_SANDSTORM_END - -; Battle vars used in home/battle.asm - const_def - const PLAYER_SUBSTATUS_1 - const ENEMY_SUBSTATUS_1 - const PLAYER_SUBSTATUS_2 - const ENEMY_SUBSTATUS_2 - const PLAYER_SUBSTATUS_3 - const ENEMY_SUBSTATUS_3 - const PLAYER_SUBSTATUS_4 - const ENEMY_SUBSTATUS_4 - const PLAYER_SUBSTATUS_5 - const ENEMY_SUBSTATUS_5 - const PLAYER_STATUS - const ENEMY_STATUS - const PLAYER_MOVE_ANIMATION - const ENEMY_MOVE_ANIMATION - const PLAYER_MOVE_EFFECT - const ENEMY_MOVE_EFFECT - const PLAYER_MOVE_POWER - const ENEMY_MOVE_POWER - const PLAYER_MOVE_TYPE - const ENEMY_MOVE_TYPE - const PLAYER_CUR_MOVE - const ENEMY_CUR_MOVE - const PLAYER_COUNTER_MOVE - const ENEMY_COUNTER_MOVE - const PLAYER_LAST_MOVE - const ENEMY_LAST_MOVE - ; wBattleAction const_def const BATTLEACTION_MOVE1 diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index 7d2266f3..5626cb09 100755 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -1,8 +1,8 @@ ; collision permissions (see data/collision_permissions.asm) -LANDTILE EQU $00 -WATER_TILE EQU $01 -WALLTILE EQU $0f -TALK EQU $10 +LAND_TILE EQU $00 +WATER_TILE EQU $01 +WALL_TILE EQU $0f +TALK EQU $10 ; collision data types (see data/tilesets/*_collision.asm) ; TileCollisionTable indexes (see data/collision_permissions.asm) @@ -20,7 +20,7 @@ COLL_TALL_GRASS EQU $18 COLL_CUT_TREE_1A EQU $1a ; unused COLL_LONG_GRASS_1C EQU $1c ; unused COLL_HEADBUTT_TREE_1D EQU $1d ; unused -COLL_WATER_21 EQU $21 ; ??? +COLL_WATER_21 EQU $21 ; unused COLL_ICE EQU $23 COLL_WHIRLPOOL EQU $24 COLL_BUOY EQU $27 diff --git a/constants/cry_constants.asm b/constants/cry_constants.asm index da40877c..654aac52 100755 --- a/constants/cry_constants.asm +++ b/constants/cry_constants.asm @@ -1,3 +1,4 @@ +; Cries indexes (see audio/cry_pointers.asm) const_def ; gen 1 diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 0d9e6e43..09d292d5 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -1,3 +1,4 @@ +; decoration types const_value = 1 const DECO_PLANT const DECO_BED @@ -6,6 +7,7 @@ const_value = 1 const DECO_DOLL const DECO_BIGDOLL +; DecorationNames indexes (see data/decorations/names.asm) const_value = 1 const PUT_IT_AWAY const MAGNAPLANT @@ -33,6 +35,7 @@ const_value = 1 const YELLOW_CARPET const GREEN_CARPET +; DoDecorationAction2.DecoActions indexes (see engine/overworld/decorations.asm) const_value = 1 const SET_UP_BED const PUT_AWAY_BED @@ -54,68 +57,71 @@ const_value = 1 deco: MACRO const DECO_\1 enum DECOFLAG_\1 -endm +ENDM -const_value = 1 -__enum__ = 0 +; decorations: +; - DecorationAttributes (see data/decorations/attributes.asm) +; - DecorationIDs (see data/decorations/decorations.asm) + const_def 1 + enum_start +; FindOwnedBeds.beds values (see engine/overworld/decorations.asm) const BEDS - deco FEATHERY_BED ; 2 (0) - deco PINK_BED ; 3 (1) - deco POLKADOT_BED ; 4 (2) - deco PIKACHU_BED ; 5 (3) - + deco FEATHERY_BED + deco PINK_BED + deco POLKADOT_BED + deco PIKACHU_BED +; FindOwnedCarpets.carpets values (see engine/overworld/decorations.asm) const CARPETS - deco RED_CARPET ; 7 (4) - deco BLUE_CARPET ; 8 (5) - deco YELLOW_CARPET ; 9 (6) - deco GREEN_CARPET ; a (7) - + deco RED_CARPET + deco BLUE_CARPET + deco YELLOW_CARPET + deco GREEN_CARPET +; FindOwnedPlants.plants values (see engine/overworld/decorations.asm) const PLANTS - deco MAGNAPLANT ; c (8) - deco TROPICPLANT ; d (9) - deco JUMBOPLANT ; e (a) - + deco MAGNAPLANT + deco TROPICPLANT + deco JUMBOPLANT +; FindOwnedPosters.posters values (see engine/overworld/decorations.asm) const POSTERS - deco TOWN_MAP ; 10 (b) - deco PIKACHU_POSTER ; 11 (c) - deco CLEFAIRY_POSTER ; 12 (d) - deco JIGGLYPUFF_POSTER ; 13(e) - + deco TOWN_MAP + deco PIKACHU_POSTER + deco CLEFAIRY_POSTER + deco JIGGLYPUFF_POSTER +; FindOwnedConsoles.consoles values (see engine/overworld/decorations.asm) const CONSOLES - deco FAMICOM ; 15 (f) - deco SNES ; 16 (10) - deco N64 ; 17 (11) - deco VIRTUAL_BOY ; 18 (12) - + deco FAMICOM + deco SNES + deco N64 + deco VIRTUAL_BOY +; FindOwnedBigDolls.big_dolls values (see engine/overworld/decorations.asm) const BIG_DOLLS - deco BIG_SNORLAX_DOLL ; 1a (13) - deco BIG_ONIX_DOLL ; 1b (14) - deco BIG_LAPRAS_DOLL ; 1c (15) - + deco BIG_SNORLAX_DOLL + deco BIG_ONIX_DOLL + deco BIG_LAPRAS_DOLL +; FindOwnedOrnaments.ornaments values (see engine/overworld/decorations.asm) const DOLLS - deco PIKACHU_DOLL ; 1e (16) - deco SURF_PIKACHU_DOLL ; 1f (17) - deco CLEFAIRY_DOLL ; 20 (18) - deco JIGGLYPUFF_DOLL ; 21 (19) - deco BULBASAUR_DOLL ; 22 (1a) - deco CHARMANDER_DOLL ; 23 (1b) - deco SQUIRTLE_DOLL ; 24 (1c) - deco POLIWAG_DOLL ; 25 (1d) - deco DIGLETT_DOLL ; 26 (1e) - deco STARMIE_DOLL ; 27 (1f) - deco MAGIKARP_DOLL ; 28 (20) - deco ODDISH_DOLL ; 29 (21) - deco GENGAR_DOLL ; 2a (22) - deco SHELLDER_DOLL ; 2b (23) - deco GRIMER_DOLL ; 2c (24) - deco VOLTORB_DOLL ; 2d (25) - deco WEEDLE_DOLL ; 2e (26) - deco UNOWN_DOLL ; 2f (27) - deco GEODUDE_DOLL ; 30 (28) - deco MACHOP_DOLL ; 31 (29) - deco TENTACOOL_DOLL ; 32 (2a) - deco GOLD_TROPHY_DOLL ; 33 (2b) - deco SILVER_TROPHY_DOLL ; 34 (2c) - -NUM_NON_TROPHY_DECOS EQU $2b -NUM_DECOS EQU $2d + deco PIKACHU_DOLL + deco SURF_PIKACHU_DOLL + deco CLEFAIRY_DOLL + deco JIGGLYPUFF_DOLL + deco BULBASAUR_DOLL + deco CHARMANDER_DOLL + deco SQUIRTLE_DOLL + deco POLIWAG_DOLL + deco DIGLETT_DOLL + deco STARMIE_DOLL + deco MAGIKARP_DOLL + deco ODDISH_DOLL + deco GENGAR_DOLL + deco SHELLDER_DOLL + deco GRIMER_DOLL + deco VOLTORB_DOLL + deco WEEDLE_DOLL + deco UNOWN_DOLL + deco GEODUDE_DOLL + deco MACHOP_DOLL + deco TENTACOOL_DOLL +NUM_NON_TROPHY_DECOS EQU __enum__ + deco GOLD_TROPHY_DOLL + deco SILVER_TROPHY_DOLL +NUM_DECOS EQU __enum__ diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 70b24344..a110855e 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -41,6 +41,8 @@ HP_RED EQU 2 SPRITEOAMSTRUCT_LENGTH EQU const_value NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM +SPRITE_GFX_LIST_CAPACITY EQU 12 ; see wUsedSprites + ; PokeAnims indexes (see engine/gfx/pic_animation.asm) const_def const ANIM_MON_SLOW diff --git a/constants/map_constants.asm b/constants/map_constants.asm index c6df95c8..3e5af01e 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -24,8 +24,6 @@ ENDM ; - attributes (see data/maps/attributes.asm) ; - blocks (see data/maps/blocks.asm) ; - scripts and events (see data/maps/scripts.asm) - -; map group ids const_def newgroup ; 1 diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 71fe803e..89762da7 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -129,6 +129,4 @@ KANTO_FLYPOINT EQU const_value const FLY_CINNABAR const FLY_INDIGO -; outdoor sprite limits (see engine/overworld/overworld.asm) -MAX_OUTDOOR_SPRITES EQU 11 -SPRITE_GFX_LIST_CAPACITY EQU 12 +MAX_OUTDOOR_SPRITES EQU 11 ; see engine/overworld/overworld.asm diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm index c877f469..28ea3a17 100644 --- a/constants/menu_constants.asm +++ b/constants/menu_constants.asm @@ -38,7 +38,7 @@ const SCROLLINGMENU_ITEMS_QUANTITY ; MonMenuOptions indexes (see data/mon_menu.asm) -; used by PokemonActionSubmenu (see engine/menus/start_menu.asm) +; used by PokemonActionSubmenu (see engine/pokemon/mon_menu.asm) const_def 1 ; moves const MONMENUITEM_CUT ; 1 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 37cee638..9efd3c55 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -7,9 +7,10 @@ MALE EQU 0 FEMALE EQU 1 ; FlagAction arguments (see home/flag.asm) -RESET_FLAG EQU 0 -SET_FLAG EQU 1 -CHECK_FLAG EQU 2 + const_def + const RESET_FLAG + const SET_FLAG + const CHECK_FLAG ; G/S version ID: 0 = Gold, 1 = Silver (used by checkver) IF DEF(_GOLD) diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 2f39eefc..b26f86d0 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -1,291 +1,293 @@ - +; move ids +; indexes for: +; - Moves (see data/moves/moves.asm) +; - MoveNames (see data/moves/names.asm) +; - MoveDescriptions (see data/moves/descriptions.asm) +; - BattleAnimations (see data/moves/animations.asm) const_def - const NO_MOVE ; $00 - const POUND ; $01 - const KARATE_CHOP ; $02 - const DOUBLESLAP ; $03 - const COMET_PUNCH ; $04 - const MEGA_PUNCH ; $05 - const PAY_DAY ; $06 - const FIRE_PUNCH ; $07 - const ICE_PUNCH ; $08 - const THUNDERPUNCH ; $09 - const SCRATCH ; $0a - const VICEGRIP ; $0b - const GUILLOTINE ; $0c - const RAZOR_WIND ; $0d - const SWORDS_DANCE ; $0e - const CUT ; $0f - const GUST ; $10 - const WING_ATTACK ; $11 - const WHIRLWIND ; $12 - const FLY ; $13 - const BIND ; $14 - const SLAM ; $15 - const VINE_WHIP ; $16 - const STOMP ; $17 - const DOUBLE_KICK ; $18 - const MEGA_KICK ; $19 - const JUMP_KICK ; $1a - const ROLLING_KICK ; $1b - const SAND_ATTACK ; $1c - const HEADBUTT ; $1d - const HORN_ATTACK ; $1e - const FURY_ATTACK ; $1f - const HORN_DRILL ; $20 - const TACKLE ; $21 - const BODY_SLAM ; $22 - const WRAP ; $23 - const TAKE_DOWN ; $24 - const THRASH ; $25 - const DOUBLE_EDGE ; $26 - const TAIL_WHIP ; $27 - const POISON_STING ; $28 - const TWINEEDLE ; $29 - const PIN_MISSILE ; $2a - const LEER ; $2b - const BITE ; $2c - const GROWL ; $2d - const ROAR ; $2e - const SING ; $2f - const SUPERSONIC ; $30 - const SONICBOOM ; $31 - const DISABLE ; $32 - const ACID ; $33 - const EMBER ; $34 - const FLAMETHROWER ; $35 - const MIST ; $36 - const WATER_GUN ; $37 - const HYDRO_PUMP ; $38 - const SURF ; $39 - const ICE_BEAM ; $3a - const BLIZZARD ; $3b - const PSYBEAM ; $3c - const BUBBLEBEAM ; $3d - const AURORA_BEAM ; $3e - const HYPER_BEAM ; $3f - const PECK ; $40 - const DRILL_PECK ; $41 - const SUBMISSION ; $42 - const LOW_KICK ; $43 - const COUNTER ; $44 - const SEISMIC_TOSS ; $45 - const STRENGTH ; $46 - const ABSORB ; $47 - const MEGA_DRAIN ; $48 - const LEECH_SEED ; $49 - const GROWTH ; $4a - const RAZOR_LEAF ; $4b - const SOLARBEAM ; $4c - const POISONPOWDER ; $4d - const STUN_SPORE ; $4e - const SLEEP_POWDER ; $4f - const PETAL_DANCE ; $50 - const STRING_SHOT ; $51 - const DRAGON_RAGE ; $52 - const FIRE_SPIN ; $53 - const THUNDERSHOCK ; $54 - const THUNDERBOLT ; $55 - const THUNDER_WAVE ; $56 - const THUNDER ; $57 - const ROCK_THROW ; $58 - const EARTHQUAKE ; $59 - const FISSURE ; $5a - const DIG ; $5b - const TOXIC ; $5c - const CONFUSION ; $5d - const PSYCHIC_M ; $5e - const HYPNOSIS ; $5f - const MEDITATE ; $60 - const AGILITY ; $61 - const QUICK_ATTACK ; $62 - const RAGE ; $63 - const TELEPORT ; $64 - const NIGHT_SHADE ; $65 - const MIMIC ; $66 - const SCREECH ; $67 - const DOUBLE_TEAM ; $68 - const RECOVER ; $69 - const HARDEN ; $6a - const MINIMIZE ; $6b - const SMOKESCREEN ; $6c - const CONFUSE_RAY ; $6d - const WITHDRAW ; $6e - const DEFENSE_CURL ; $6f - const BARRIER ; $70 - const LIGHT_SCREEN ; $71 - const HAZE ; $72 - const REFLECT ; $73 - const FOCUS_ENERGY ; $74 - const BIDE ; $75 - const METRONOME ; $76 - const MIRROR_MOVE ; $77 - const SELFDESTRUCT ; $78 - const EGG_BOMB ; $79 - const LICK ; $7a - const SMOG ; $7b - const SLUDGE ; $7c - const BONE_CLUB ; $7d - const FIRE_BLAST ; $7e - const WATERFALL ; $7f - const CLAMP ; $80 - const SWIFT ; $81 - const SKULL_BASH ; $82 - const SPIKE_CANNON ; $83 - const CONSTRICT ; $84 - const AMNESIA ; $85 - const KINESIS ; $86 - const SOFTBOILED ; $87 - const HI_JUMP_KICK ; $88 - const GLARE ; $89 - const DREAM_EATER ; $8a - const POISON_GAS ; $8b - const BARRAGE ; $8c - const LEECH_LIFE ; $8d - const LOVELY_KISS ; $8e - const SKY_ATTACK ; $8f - const TRANSFORM ; $90 - const BUBBLE ; $91 - const DIZZY_PUNCH ; $92 - const SPORE ; $93 - const FLASH ; $94 - const PSYWAVE ; $95 - const SPLASH ; $96 - const ACID_ARMOR ; $97 - const CRABHAMMER ; $98 - const EXPLOSION ; $99 - const FURY_SWIPES ; $9a - const BONEMERANG ; $9b - const REST ; $9c - const ROCK_SLIDE ; $9d - const HYPER_FANG ; $9e - const SHARPEN ; $9f - const CONVERSION ; $a0 - const TRI_ATTACK ; $a1 - const SUPER_FANG ; $a2 - const SLASH ; $a3 - const SUBSTITUTE ; $a4 - const STRUGGLE ; $a5 - const SKETCH ; $a6 - const TRIPLE_KICK ; $a7 - const THIEF ; $a8 - const SPIDER_WEB ; $a9 - const MIND_READER ; $aa - const NIGHTMARE ; $ab - const FLAME_WHEEL ; $ac - const SNORE ; $ad - const CURSE ; $ae - const FLAIL ; $af - const CONVERSION2 ; $b0 - const AEROBLAST ; $b1 - const COTTON_SPORE ; $b2 - const REVERSAL ; $b3 - const SPITE ; $b4 - const POWDER_SNOW ; $b5 - const PROTECT ; $b6 - const MACH_PUNCH ; $b7 - const SCARY_FACE ; $b8 - const FAINT_ATTACK ; $b9 - const SWEET_KISS ; $ba - const BELLY_DRUM ; $bb - const SLUDGE_BOMB ; $bc - const MUD_SLAP ; $bd - const OCTAZOOKA ; $be - const SPIKES ; $bf - const ZAP_CANNON ; $c0 - const FORESIGHT ; $c1 - const DESTINY_BOND ; $c2 - const PERISH_SONG ; $c3 - const ICY_WIND ; $c4 - const DETECT ; $c5 - const BONE_RUSH ; $c6 - const LOCK_ON ; $c7 - const OUTRAGE ; $c8 - const SANDSTORM ; $c9 - const GIGA_DRAIN ; $ca - const ENDURE ; $cb - const CHARM ; $cc - const ROLLOUT ; $cd - const FALSE_SWIPE ; $ce - const SWAGGER ; $cf - const MILK_DRINK ; $d0 - const SPARK ; $d1 - const FURY_CUTTER ; $d2 - const STEEL_WING ; $d3 - const MEAN_LOOK ; $d4 - const ATTRACT ; $d5 - const SLEEP_TALK ; $d6 - const HEAL_BELL ; $d7 - const RETURN ; $d8 - const PRESENT ; $d9 - const FRUSTRATION ; $da - const SAFEGUARD ; $db - const PAIN_SPLIT ; $dc - const SACRED_FIRE ; $dd - const MAGNITUDE ; $de - const DYNAMICPUNCH ; $df - const MEGAHORN ; $e0 - const DRAGONBREATH ; $e1 - const BATON_PASS ; $e2 - const ENCORE ; $e3 - const PURSUIT ; $e4 - const RAPID_SPIN ; $e5 - const SWEET_SCENT ; $e6 - const IRON_TAIL ; $e7 - const METAL_CLAW ; $e8 - const VITAL_THROW ; $e9 - const MORNING_SUN ; $ea - const SYNTHESIS ; $eb - const MOONLIGHT ; $ec - const HIDDEN_POWER ; $ed - const CROSS_CHOP ; $ee - const TWISTER ; $ef - const RAIN_DANCE ; $f0 - const SUNNY_DAY ; $f1 - const CRUNCH ; $f2 - const MIRROR_COAT ; $f3 - const PSYCH_UP ; $f4 - const EXTREMESPEED ; $f5 - const ANCIENTPOWER ; $f6 - const SHADOW_BALL ; $f7 - const FUTURE_SIGHT ; $f8 - const ROCK_SMASH ; $f9 - const WHIRLPOOL ; $fa - const BEAT_UP ; $fb - -const_value SET const_value - 1 + const NO_MOVE ; 00 + const POUND ; 01 + const KARATE_CHOP ; 02 + const DOUBLESLAP ; 03 + const COMET_PUNCH ; 04 + const MEGA_PUNCH ; 05 + const PAY_DAY ; 06 + const FIRE_PUNCH ; 07 + const ICE_PUNCH ; 08 + const THUNDERPUNCH ; 09 + const SCRATCH ; 0a + const VICEGRIP ; 0b + const GUILLOTINE ; 0c + const RAZOR_WIND ; 0d + const SWORDS_DANCE ; 0e + const CUT ; 0f + const GUST ; 10 + const WING_ATTACK ; 11 + const WHIRLWIND ; 12 + const FLY ; 13 + const BIND ; 14 + const SLAM ; 15 + const VINE_WHIP ; 16 + const STOMP ; 17 + const DOUBLE_KICK ; 18 + const MEGA_KICK ; 19 + const JUMP_KICK ; 1a + const ROLLING_KICK ; 1b + const SAND_ATTACK ; 1c + const HEADBUTT ; 1d + const HORN_ATTACK ; 1e + const FURY_ATTACK ; 1f + const HORN_DRILL ; 20 + const TACKLE ; 21 + const BODY_SLAM ; 22 + const WRAP ; 23 + const TAKE_DOWN ; 24 + const THRASH ; 25 + const DOUBLE_EDGE ; 26 + const TAIL_WHIP ; 27 + const POISON_STING ; 28 + const TWINEEDLE ; 29 + const PIN_MISSILE ; 2a + const LEER ; 2b + const BITE ; 2c + const GROWL ; 2d + const ROAR ; 2e + const SING ; 2f + const SUPERSONIC ; 30 + const SONICBOOM ; 31 + const DISABLE ; 32 + const ACID ; 33 + const EMBER ; 34 + const FLAMETHROWER ; 35 + const MIST ; 36 + const WATER_GUN ; 37 + const HYDRO_PUMP ; 38 + const SURF ; 39 + const ICE_BEAM ; 3a + const BLIZZARD ; 3b + const PSYBEAM ; 3c + const BUBBLEBEAM ; 3d + const AURORA_BEAM ; 3e + const HYPER_BEAM ; 3f + const PECK ; 40 + const DRILL_PECK ; 41 + const SUBMISSION ; 42 + const LOW_KICK ; 43 + const COUNTER ; 44 + const SEISMIC_TOSS ; 45 + const STRENGTH ; 46 + const ABSORB ; 47 + const MEGA_DRAIN ; 48 + const LEECH_SEED ; 49 + const GROWTH ; 4a + const RAZOR_LEAF ; 4b + const SOLARBEAM ; 4c + const POISONPOWDER ; 4d + const STUN_SPORE ; 4e + const SLEEP_POWDER ; 4f + const PETAL_DANCE ; 50 + const STRING_SHOT ; 51 + const DRAGON_RAGE ; 52 + const FIRE_SPIN ; 53 + const THUNDERSHOCK ; 54 + const THUNDERBOLT ; 55 + const THUNDER_WAVE ; 56 + const THUNDER ; 57 + const ROCK_THROW ; 58 + const EARTHQUAKE ; 59 + const FISSURE ; 5a + const DIG ; 5b + const TOXIC ; 5c + const CONFUSION ; 5d + const PSYCHIC_M ; 5e + const HYPNOSIS ; 5f + const MEDITATE ; 60 + const AGILITY ; 61 + const QUICK_ATTACK ; 62 + const RAGE ; 63 + const TELEPORT ; 64 + const NIGHT_SHADE ; 65 + const MIMIC ; 66 + const SCREECH ; 67 + const DOUBLE_TEAM ; 68 + const RECOVER ; 69 + const HARDEN ; 6a + const MINIMIZE ; 6b + const SMOKESCREEN ; 6c + const CONFUSE_RAY ; 6d + const WITHDRAW ; 6e + const DEFENSE_CURL ; 6f + const BARRIER ; 70 + const LIGHT_SCREEN ; 71 + const HAZE ; 72 + const REFLECT ; 73 + const FOCUS_ENERGY ; 74 + const BIDE ; 75 + const METRONOME ; 76 + const MIRROR_MOVE ; 77 + const SELFDESTRUCT ; 78 + const EGG_BOMB ; 79 + const LICK ; 7a + const SMOG ; 7b + const SLUDGE ; 7c + const BONE_CLUB ; 7d + const FIRE_BLAST ; 7e + const WATERFALL ; 7f + const CLAMP ; 80 + const SWIFT ; 81 + const SKULL_BASH ; 82 + const SPIKE_CANNON ; 83 + const CONSTRICT ; 84 + const AMNESIA ; 85 + const KINESIS ; 86 + const SOFTBOILED ; 87 + const HI_JUMP_KICK ; 88 + const GLARE ; 89 + const DREAM_EATER ; 8a + const POISON_GAS ; 8b + const BARRAGE ; 8c + const LEECH_LIFE ; 8d + const LOVELY_KISS ; 8e + const SKY_ATTACK ; 8f + const TRANSFORM ; 90 + const BUBBLE ; 91 + const DIZZY_PUNCH ; 92 + const SPORE ; 93 + const FLASH ; 94 + const PSYWAVE ; 95 + const SPLASH ; 96 + const ACID_ARMOR ; 97 + const CRABHAMMER ; 98 + const EXPLOSION ; 99 + const FURY_SWIPES ; 9a + const BONEMERANG ; 9b + const REST ; 9c + const ROCK_SLIDE ; 9d + const HYPER_FANG ; 9e + const SHARPEN ; 9f + const CONVERSION ; a0 + const TRI_ATTACK ; a1 + const SUPER_FANG ; a2 + const SLASH ; a3 + const SUBSTITUTE ; a4 + const STRUGGLE ; a5 + const SKETCH ; a6 + const TRIPLE_KICK ; a7 + const THIEF ; a8 + const SPIDER_WEB ; a9 + const MIND_READER ; aa + const NIGHTMARE ; ab + const FLAME_WHEEL ; ac + const SNORE ; ad + const CURSE ; ae + const FLAIL ; af + const CONVERSION2 ; b0 + const AEROBLAST ; b1 + const COTTON_SPORE ; b2 + const REVERSAL ; b3 + const SPITE ; b4 + const POWDER_SNOW ; b5 + const PROTECT ; b6 + const MACH_PUNCH ; b7 + const SCARY_FACE ; b8 + const FAINT_ATTACK ; b9 + const SWEET_KISS ; ba + const BELLY_DRUM ; bb + const SLUDGE_BOMB ; bc + const MUD_SLAP ; bd + const OCTAZOOKA ; be + const SPIKES ; bf + const ZAP_CANNON ; c0 + const FORESIGHT ; c1 + const DESTINY_BOND ; c2 + const PERISH_SONG ; c3 + const ICY_WIND ; c4 + const DETECT ; c5 + const BONE_RUSH ; c6 + const LOCK_ON ; c7 + const OUTRAGE ; c8 + const SANDSTORM ; c9 + const GIGA_DRAIN ; ca + const ENDURE ; cb + const CHARM ; cc + const ROLLOUT ; cd + const FALSE_SWIPE ; ce + const SWAGGER ; cf + const MILK_DRINK ; d0 + const SPARK ; d1 + const FURY_CUTTER ; d2 + const STEEL_WING ; d3 + const MEAN_LOOK ; d4 + const ATTRACT ; d5 + const SLEEP_TALK ; d6 + const HEAL_BELL ; d7 + const RETURN ; d8 + const PRESENT ; d9 + const FRUSTRATION ; da + const SAFEGUARD ; db + const PAIN_SPLIT ; dc + const SACRED_FIRE ; dd + const MAGNITUDE ; de + const DYNAMICPUNCH ; df + const MEGAHORN ; e0 + const DRAGONBREATH ; e1 + const BATON_PASS ; e2 + const ENCORE ; e3 + const PURSUIT ; e4 + const RAPID_SPIN ; e5 + const SWEET_SCENT ; e6 + const IRON_TAIL ; e7 + const METAL_CLAW ; e8 + const VITAL_THROW ; e9 + const MORNING_SUN ; ea + const SYNTHESIS ; eb + const MOONLIGHT ; ec + const HIDDEN_POWER ; ed + const CROSS_CHOP ; ee + const TWISTER ; ef + const RAIN_DANCE ; f0 + const SUNNY_DAY ; f1 + const CRUNCH ; f2 + const MIRROR_COAT ; f3 + const PSYCH_UP ; f4 + const EXTREMESPEED ; f5 + const ANCIENTPOWER ; f6 + const SHADOW_BALL ; f7 + const FUTURE_SIGHT ; f8 + const ROCK_SMASH ; f9 + const WHIRLPOOL ; fa + const BEAT_UP ; fb +NUM_ATTACKS EQU const_value - 1 - const NUM_ATTACKS ; $fb + const MOVE_OR_ANIM_FC ; fc + const MOVE_OR_ANIM_FD ; fd + const MOVE_OR_ANIM_FE ; fe -; Battle animations use the same constants -; as the moves up to this point. - const ANIM_FC ; $fc - const ANIM_FD ; $fd - const ANIM_FE ; $fe - const ANIM_SWEET_SCENT_2 ; $ff - const ANIM_THROW_POKE_BALL ; $100 - const ANIM_SEND_OUT_MON ; $101 - const ANIM_RETURN_MON ; $102 - const ANIM_CONFUSED ; $103 - const ANIM_SLP ; $104 - const ANIM_BRN ; $105 - const ANIM_PSN ; $106 - const ANIM_SAP ; $107 - const ANIM_FRZ ; $108 - const ANIM_PAR ; $109 - const ANIM_IN_LOVE ; $10a - const ANIM_IN_SANDSTORM ; $10b - const ANIM_IN_NIGHTMARE ; $10c - const ANIM_IN_WHIRLPOOL ; $10d +; Battle animations use the same constants as the moves up to this point + const ANIM_SWEET_SCENT_2 ; ff + const ANIM_THROW_POKE_BALL ; 100 + const ANIM_SEND_OUT_MON ; 101 + const ANIM_RETURN_MON ; 102 + const ANIM_CONFUSED ; 103 + const ANIM_SLP ; 104 + const ANIM_BRN ; 105 + const ANIM_PSN ; 106 + const ANIM_SAP ; 107 + const ANIM_FRZ ; 108 + const ANIM_PAR ; 109 + const ANIM_IN_LOVE ; 10a + const ANIM_IN_SANDSTORM ; 10b + const ANIM_IN_NIGHTMARE ; 10c + const ANIM_IN_WHIRLPOOL ; 10d ; battle anims - const ANIM_MISS ; $10e - const ANIM_ENEMY_DAMAGE ; $10f - const ANIM_ENEMY_STAT_DOWN ; $110 - const ANIM_PLAYER_STAT_DOWN ; $111 - const ANIM_PLAYER_DAMAGE ; $112 - const ANIM_WOBBLE ; $113 - const ANIM_SHAKE ; $114 - const ANIM_HIT_CONFUSION ; $115 + const ANIM_MISS ; 10e + const ANIM_ENEMY_DAMAGE ; 10f + const ANIM_ENEMY_STAT_DOWN ; 110 + const ANIM_PLAYER_STAT_DOWN ; 111 + const ANIM_PLAYER_DAMAGE ; 112 + const ANIM_WOBBLE ; 113 + const ANIM_SHAKE ; 114 + const ANIM_HIT_CONFUSION ; 115 ; wNumHits uses offsets from ANIM_MISS const_def diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 2c46d106..d225787c 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -1,3 +1,5 @@ +; song ids +; Music indexes (see audio/music_pointers.asm) const_def const MUSIC_NONE ; 00 @@ -94,6 +96,7 @@ const MUSIC_PRINTER ; 5b const MUSIC_POST_CREDITS ; 5c +; GetMapMusic picks music for this value (see home/map.asm) MUSIC_MAHOGANY_MART EQU $64 ; ExitPokegearRadio_HandleMusic uses these values diff --git a/constants/phone_constants.asm b/constants/phone_constants.asm index 1718e892..2483d9df 100644 --- a/constants/phone_constants.asm +++ b/constants/phone_constants.asm @@ -1,4 +1,4 @@ - +; PhoneContacts indexes (see data/phone/phone_contacts.asm) const_def const PHONE_00 const PHONE_MOM @@ -37,8 +37,8 @@ const PHONE_BLACKBELT_KENJI const PHONE_HIKER_PARRY const PHONE_PICNICKER_ERIN - const PHONE_BUENA +; SpecialPhoneCallList indexes (see data/phone/special_calls.asm) const_def const SPECIALCALL_NONE const SPECIALCALL_POKERUS @@ -50,6 +50,7 @@ const SPECIALCALL_WORRIED const SPECIALCALL_MASTERBALL +; phone struct members const_def const PHONE_CONTACT_TRAINER_CLASS const PHONE_CONTACT_TRAINER_NUMBER @@ -64,4 +65,6 @@ const PHONE_CONTACT_SCRIPT2_ADDR_LO const PHONE_CONTACT_SCRIPT2_ADDR_HI PHONE_CONTACT_SIZE EQU const_value + +; maximum number of pokegear contacts CONTACT_LIST_SIZE EQU 10 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 58aa684a..2f0ce2c7 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -306,61 +306,3 @@ NUM_POKEMON EQU const_value - 1 const UNOWN_Y ; 25 const UNOWN_Z ; 26 NUM_UNOWN EQU const_value - 1 ; 26 - -; pokemon structure in RAM -MON_SPECIES EQUS "(wPartyMon1Species - wPartyMon1)" -MON_ITEM EQUS "(wPartyMon1Item - wPartyMon1)" -MON_MOVES EQUS "(wPartyMon1Moves - wPartyMon1)" -MON_ID EQUS "(wPartyMon1ID - wPartyMon1)" -MON_EXP EQUS "(wPartyMon1Exp - wPartyMon1)" -MON_STAT_EXP EQUS "(wPartyMon1StatExp - wPartyMon1)" -MON_HP_EXP EQUS "(wPartyMon1HPExp - wPartyMon1)" -MON_ATK_EXP EQUS "(wPartyMon1AtkExp - wPartyMon1)" -MON_DEF_EXP EQUS "(wPartyMon1DefExp - wPartyMon1)" -MON_SPD_EXP EQUS "(wPartyMon1SpdExp - wPartyMon1)" -MON_SPC_EXP EQUS "(wPartyMon1SpcExp - wPartyMon1)" -MON_DVS EQUS "(wPartyMon1DVs - wPartyMon1)" -MON_PP EQUS "(wPartyMon1PP - wPartyMon1)" -MON_HAPPINESS EQUS "(wPartyMon1Happiness - wPartyMon1)" -MON_PKRUS EQUS "(wPartyMon1PokerusStatus - wPartyMon1)" -MON_CAUGHTDATA EQUS "(wPartyMon1CaughtData - wPartyMon1)" -MON_CAUGHTLEVEL EQUS "(wPartyMon1CaughtLevel - wPartyMon1)" -MON_CAUGHTTIME EQUS "(wPartyMon1CaughtTime - wPartyMon1)" -MON_CAUGHTGENDER EQUS "(wPartyMon1CaughtGender - wPartyMon1)" -MON_CAUGHTLOCATION EQUS "(wPartyMon1CaughtLocation - wPartyMon1)" -MON_LEVEL EQUS "(wPartyMon1Level - wPartyMon1)" -MON_STATUS EQUS "(wPartyMon1Status - wPartyMon1)" -MON_HP EQUS "(wPartyMon1HP - wPartyMon1)" -MON_MAXHP EQUS "(wPartyMon1MaxHP - wPartyMon1)" -MON_ATK EQUS "(wPartyMon1Attack - wPartyMon1)" -MON_DEF EQUS "(wPartyMon1Defense - wPartyMon1)" -MON_SPD EQUS "(wPartyMon1Speed - wPartyMon1)" -MON_SAT EQUS "(wPartyMon1SpclAtk - wPartyMon1)" -MON_SDF EQUS "(wPartyMon1SpclDef - wPartyMon1)" -BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)" -PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)" -REDMON_STRUCT_LENGTH EQU 44 - -const_value SET 1 - const MONMENU_CUT ; 1 - const MONMENU_FLY ; 2 - const MONMENU_SURF ; 3 - const MONMENU_STRENGTH ; 4 - const MONMENU_WATERFALL ; 5 - const MONMENU_FLASH ; 6 - const MONMENU_WHIRLPOOL ; 7 - const MONMENU_DIG ; 8 - const MONMENU_TELEPORT ; 9 - const MONMENU_SOFTBOILED ; 10 - const MONMENU_HEADBUTT ; 11 - const MONMENU_ROCKSMASH ; 12 - const MONMENU_MILKDRINK ; 13 - const MONMENU_SWEETSCENT ; 14 - - const MONMENU_STATS ; 15 - const MONMENU_SWITCH ; 16 - const MONMENU_ITEM ; 17 - const MONMENU_CANCEL ; 18 - const MONMENU_MOVE ; 19 - const MONMENU_MAIL ; 20 - const MONMENU_ERROR ; 21 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 83d5d7b6..da0008b1 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -27,11 +27,11 @@ BASE_TMHM EQUS "(wBaseTMHM - wCurBaseData)" BASE_DATA_SIZE EQUS "(wCurBaseDataEnd - wCurBaseData)" ; gender ratio constants -GENDER_F0 EQU 0 percent -GENDER_F12_5 EQU 12 percent + 1 -GENDER_F25 EQU 25 percent -GENDER_F50 EQU 50 percent -GENDER_F75 EQU 75 percent +GENDER_F0 EQU 0 percent +GENDER_F12_5 EQU 12 percent + 1 +GENDER_F25 EQU 25 percent +GENDER_F50 EQU 50 percent +GENDER_F75 EQU 75 percent GENDER_F100 EQU 100 percent - 1 GENDER_UNKNOWN EQU -1 @@ -63,6 +63,45 @@ GENDER_UNKNOWN EQU -1 const EGG_DRAGON ; e const EGG_NONE ; f (Undiscovered) +; pokedex entries (see data/pokemon/dex_entries.asm) +NUM_DEX_ENTRY_BANKS EQU 4 + +; party_struct members (see macros/wram.asm) +MON_SPECIES EQUS "(wPartyMon1Species - wPartyMon1)" +MON_ITEM EQUS "(wPartyMon1Item - wPartyMon1)" +MON_MOVES EQUS "(wPartyMon1Moves - wPartyMon1)" +MON_ID EQUS "(wPartyMon1ID - wPartyMon1)" +MON_EXP EQUS "(wPartyMon1Exp - wPartyMon1)" +MON_STAT_EXP EQUS "(wPartyMon1StatExp - wPartyMon1)" +MON_HP_EXP EQUS "(wPartyMon1HPExp - wPartyMon1)" +MON_ATK_EXP EQUS "(wPartyMon1AtkExp - wPartyMon1)" +MON_DEF_EXP EQUS "(wPartyMon1DefExp - wPartyMon1)" +MON_SPD_EXP EQUS "(wPartyMon1SpdExp - wPartyMon1)" +MON_SPC_EXP EQUS "(wPartyMon1SpcExp - wPartyMon1)" +MON_DVS EQUS "(wPartyMon1DVs - wPartyMon1)" +MON_PP EQUS "(wPartyMon1PP - wPartyMon1)" +MON_HAPPINESS EQUS "(wPartyMon1Happiness - wPartyMon1)" +MON_PKRUS EQUS "(wPartyMon1PokerusStatus - wPartyMon1)" +MON_CAUGHTDATA EQUS "(wPartyMon1CaughtData - wPartyMon1)" +MON_CAUGHTLEVEL EQUS "(wPartyMon1CaughtLevel - wPartyMon1)" +MON_CAUGHTTIME EQUS "(wPartyMon1CaughtTime - wPartyMon1)" +MON_CAUGHTGENDER EQUS "(wPartyMon1CaughtGender - wPartyMon1)" +MON_CAUGHTLOCATION EQUS "(wPartyMon1CaughtLocation - wPartyMon1)" +MON_LEVEL EQUS "(wPartyMon1Level - wPartyMon1)" +MON_STATUS EQUS "(wPartyMon1Status - wPartyMon1)" +MON_HP EQUS "(wPartyMon1HP - wPartyMon1)" +MON_MAXHP EQUS "(wPartyMon1MaxHP - wPartyMon1)" +MON_ATK EQUS "(wPartyMon1Attack - wPartyMon1)" +MON_DEF EQUS "(wPartyMon1Defense - wPartyMon1)" +MON_SPD EQUS "(wPartyMon1Speed - wPartyMon1)" +MON_SAT EQUS "(wPartyMon1SpclAtk - wPartyMon1)" +MON_SDF EQUS "(wPartyMon1SpclDef - wPartyMon1)" +BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)" +PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)" + +NICKNAMED_MON_STRUCT_LENGTH EQUS "(PARTYMON_STRUCT_LENGTH + MON_NAME_LENGTH)" +REDMON_STRUCT_LENGTH EQU 44 + ; maximum number of party pokemon PARTY_LENGTH EQU 6 diff --git a/constants/printer_constants.asm b/constants/printer_constants.asm index 5cd8fcd7..f0b8b481 100755 --- a/constants/printer_constants.asm +++ b/constants/printer_constants.asm @@ -1,5 +1,5 @@ -const_value SET 1 - +; wPrinterStatus + const_def 1 const PRINTER_STATUS_CHECKING const PRINTER_STATUS_TRANSMITTING const PRINTER_STATUS_PRINTING diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm index b1c2c287..e9b54176 100644 --- a/constants/radio_constants.asm +++ b/constants/radio_constants.asm @@ -1,77 +1,84 @@ +; radio channel ids +; indexes for: +; - RadioChannelSongs (see data/radio/channel_music.asm) +; - PlayRadioShow/RadioJumptable (see engine/pokegear/radio.asm) +; - RadioChannels (see engine/pokegear/pokegear.asm) const_def - const OAKS_POKEMON_TALK ; $00 - const POKEDEX_SHOW ; $01 - const POKEMON_MUSIC ; $02 - const LUCKY_CHANNEL ; $03 - const PLACES_AND_PEOPLE ; $04 - const LETS_ALL_SING ; $05 - const ROCKET_RADIO ; $06 - const POKE_FLUTE_RADIO ; $07 - const UNOWN_RADIO ; $08 - const EVOLUTION_RADIO ; $09 - const OAKS_POKEMON_TALK_2 ; $0a - const OAKS_POKEMON_TALK_3 ; $0b - const OAKS_POKEMON_TALK_4 ; $0c - const OAKS_POKEMON_TALK_5 ; $0d - const OAKS_POKEMON_TALK_6 ; $0e - const OAKS_POKEMON_TALK_7 ; $0f - const OAKS_POKEMON_TALK_8 ; $10 - const OAKS_POKEMON_TALK_9 ; $11 - const POKEDEX_SHOW_2 ; $12 - const POKEDEX_SHOW_3 ; $13 - const POKEDEX_SHOW_4 ; $14 - const POKEDEX_SHOW_5 ; $15 - const POKEMON_MUSIC_2 ; $16 - const POKEMON_MUSIC_3 ; $17 - const POKEMON_MUSIC_4 ; $18 - const POKEMON_MUSIC_5 ; $19 - const POKEMON_MUSIC_6 ; $1a - const POKEMON_MUSIC_7 ; $1b - const LETS_ALL_SING_2 ; $1c - const LUCKY_NUMBER_SHOW_2 ; $1d - const LUCKY_NUMBER_SHOW_3 ; $1e - const LUCKY_NUMBER_SHOW_4 ; $1f - const LUCKY_NUMBER_SHOW_5 ; $20 - const LUCKY_NUMBER_SHOW_6 ; $21 - const LUCKY_NUMBER_SHOW_7 ; $22 - const LUCKY_NUMBER_SHOW_8 ; $23 - const LUCKY_NUMBER_SHOW_9 ; $24 - const LUCKY_NUMBER_SHOW_10 ; $25 - const LUCKY_NUMBER_SHOW_11 ; $26 - const LUCKY_NUMBER_SHOW_12 ; $27 - const LUCKY_NUMBER_SHOW_13 ; $28 - const LUCKY_NUMBER_SHOW_14 ; $29 - const LUCKY_NUMBER_SHOW_15 ; $2a - const PLACES_AND_PEOPLE_2 ; $2b - const PLACES_AND_PEOPLE_3 ; $2c - const PLACES_AND_PEOPLE_4 ; $2d - const PLACES_AND_PEOPLE_5 ; $2e - const PLACES_AND_PEOPLE_6 ; $2f - const PLACES_AND_PEOPLE_7 ; $30 - const ROCKET_RADIO_2 ; $31 - const ROCKET_RADIO_3 ; $32 - const ROCKET_RADIO_4 ; $33 - const ROCKET_RADIO_5 ; $34 - const ROCKET_RADIO_6 ; $35 - const ROCKET_RADIO_7 ; $36 - const ROCKET_RADIO_8 ; $37 - const ROCKET_RADIO_9 ; $38 - const ROCKET_RADIO_10 ; $39 - const OAKS_POKEMON_TALK_10 ; $3a - const OAKS_POKEMON_TALK_11 ; $3b - const OAKS_POKEMON_TALK_12 ; $3c - const OAKS_POKEMON_TALK_13 ; $3d - const OAKS_POKEMON_TALK_14 ; $3e - const RADIO_SCROLL ; $3f - const POKEDEX_SHOW_6 ; $40 - const POKEDEX_SHOW_7 ; $41 - const POKEDEX_SHOW_8 ; $42 + const OAKS_POKEMON_TALK ; 00 + const POKEDEX_SHOW ; 01 + const POKEMON_MUSIC ; 02 + const LUCKY_CHANNEL ; 03 + const PLACES_AND_PEOPLE ; 04 + const LETS_ALL_SING ; 05 + const ROCKET_RADIO ; 06 + const POKE_FLUTE_RADIO ; 07 + const UNOWN_RADIO ; 08 + const EVOLUTION_RADIO ; 09 +; internal indexes for channel segments + const OAKS_POKEMON_TALK_2 ; 0a + const OAKS_POKEMON_TALK_3 ; 0b + const OAKS_POKEMON_TALK_4 ; 0c + const OAKS_POKEMON_TALK_5 ; 0d + const OAKS_POKEMON_TALK_6 ; 0e + const OAKS_POKEMON_TALK_7 ; 0f + const OAKS_POKEMON_TALK_8 ; 10 + const OAKS_POKEMON_TALK_9 ; 11 + const POKEDEX_SHOW_2 ; 12 + const POKEDEX_SHOW_3 ; 13 + const POKEDEX_SHOW_4 ; 14 + const POKEDEX_SHOW_5 ; 15 + const POKEMON_MUSIC_2 ; 16 + const POKEMON_MUSIC_3 ; 17 + const POKEMON_MUSIC_4 ; 18 + const POKEMON_MUSIC_5 ; 19 + const POKEMON_MUSIC_6 ; 1a + const POKEMON_MUSIC_7 ; 1b + const LETS_ALL_SING_2 ; 1c + const LUCKY_NUMBER_SHOW_2 ; 1d + const LUCKY_NUMBER_SHOW_3 ; 1e + const LUCKY_NUMBER_SHOW_4 ; 1f + const LUCKY_NUMBER_SHOW_5 ; 20 + const LUCKY_NUMBER_SHOW_6 ; 21 + const LUCKY_NUMBER_SHOW_7 ; 22 + const LUCKY_NUMBER_SHOW_8 ; 23 + const LUCKY_NUMBER_SHOW_9 ; 24 + const LUCKY_NUMBER_SHOW_10 ; 25 + const LUCKY_NUMBER_SHOW_11 ; 26 + const LUCKY_NUMBER_SHOW_12 ; 27 + const LUCKY_NUMBER_SHOW_13 ; 28 + const LUCKY_NUMBER_SHOW_14 ; 29 + const LUCKY_NUMBER_SHOW_15 ; 2a + const PLACES_AND_PEOPLE_2 ; 2b + const PLACES_AND_PEOPLE_3 ; 2c + const PLACES_AND_PEOPLE_4 ; 2d + const PLACES_AND_PEOPLE_5 ; 2e + const PLACES_AND_PEOPLE_6 ; 2f + const PLACES_AND_PEOPLE_7 ; 30 + const ROCKET_RADIO_2 ; 31 + const ROCKET_RADIO_3 ; 32 + const ROCKET_RADIO_4 ; 33 + const ROCKET_RADIO_5 ; 34 + const ROCKET_RADIO_6 ; 35 + const ROCKET_RADIO_7 ; 36 + const ROCKET_RADIO_8 ; 37 + const ROCKET_RADIO_9 ; 38 + const ROCKET_RADIO_10 ; 39 + const OAKS_POKEMON_TALK_10 ; 3a + const OAKS_POKEMON_TALK_11 ; 3b + const OAKS_POKEMON_TALK_12 ; 3c + const OAKS_POKEMON_TALK_13 ; 3d + const OAKS_POKEMON_TALK_14 ; 3e + const RADIO_SCROLL ; 3f + const POKEDEX_SHOW_6 ; 40 + const POKEDEX_SHOW_7 ; 41 + const POKEDEX_SHOW_8 ; 42 +; PlayRadio.StationPointers indexes (see engine/pokegear/pokegear.asm) const_def const MAPRADIO_POKEMON_CHANNEL - const MAPRADIO_OAKS_MON_TALK + const MAPRADIO_OAKS_POKEMON_TALK const MAPRADIO_POKEDEX_SHOW - const MAPRADIO_PKMN_MUSIC + const MAPRADIO_POKEMON_MUSIC const MAPRADIO_LUCKY_CHANNEL const MAPRADIO_UNOWN const MAPRADIO_PLACES_PEOPLE diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 878e2cf4..4f9e8488 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -1,3 +1,4 @@ +; GetSGBLayout arguments (see engine/gfx/cgb_layouts.asm and engine/gfx/sgb_layouts.asm) const_def const SCGB_BATTLE_GRAYSCALE const SCGB_BATTLE_COLORS @@ -5,20 +6,20 @@ const SCGB_STATS_SCREEN_HP_PALS const SCGB_POKEDEX const SCGB_SLOT_MACHINE - const SCGB_06 - const SCGB_07 + const SCGB_BETA_TITLE_SCREEN + const SCGB_GS_INTRO const SCGB_DIPLOMA const SCGB_MAPPALS const SCGB_PARTY_MENU const SCGB_EVOLUTION - const SCGB_0C + const SCGB_GS_TITLE_SCREEN const SCGB_0D const SCGB_MOVE_LIST - const SCGB_0F + const SCGB_BETA_PIKACHU_MINIGAME const SCGB_POKEDEX_SEARCH_OPTION - const SCGB_11 + const SCGB_BETA_POKER const SCGB_POKEPIC - const SCGB_13 + const SCGB_MAGNET_TRAIN const SCGB_PACKPALS const SCGB_TRAINER_CARD const SCGB_POKEDEX_UNOWN_MODE @@ -30,6 +31,10 @@ const SCGB_TRAINER_OR_MON_FRONTPIC_PALS const SCGB_MYSTERY_GIFT const SCGB_1E + const SCGB_1F + +SCGB_PARTY_MENU_HP_PALS EQU -4 +SCGB_RAM EQU -1 ; PredefPals indexes (see gfx/sgb/predef.pal) ; GetPredefPal arguments (see engine/gfx/color.asm) @@ -143,6 +148,4 @@ const SGB_MASK_EN const SGB_OBJ_TRN -SCGB_PARTY_MENU_HP_PALS EQU -4 -SCGB_RAM EQU -1 PALPACKET_LENGTH EQU $10 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index de59a7ee..e850d4fe 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -40,7 +40,7 @@ NUM_STRING_BUFFERS EQU const_value const TRAINERTEXT_WIN const TRAINERTEXT_LOSS -; writecode/checkcode arguments +; readvar/writevar/loadvar arguments ; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm) const_def const VAR_STRINGBUFFER2 ; 00 @@ -72,7 +72,7 @@ RETVAR_ADDR_DE EQU (1 << 6) RETVAR_EXECUTE EQU (2 << 6) ; PlayerEventScriptPointers indexes (see engine/overworld/events.asm) -const_value SET -1 + const_def -1 const PLAYEREVENT_MAPSCRIPT const PLAYEREVENT_NONE const PLAYEREVENT_SEENBYTRAINER @@ -262,14 +262,14 @@ NUM_FRUIT_TREES EQU const_value - 1 const BUGCONTEST_BOXED_MON ; 1 const BUGCONTEST_NO_CATCH ; 2 -; HealMachineAnim writebyte arguments +; HealMachineAnim setval arguments ; HealMachineAnim.Pointers indexes (see engine/events/heal_machine_anim.asm) const_def const HEALMACHINE_POKECENTER ; 0 const HEALMACHINE_ELMS_LAB ; 1 const HEALMACHINE_HALL_OF_FAME ; 2 -; UnownPuzzle writebyte arguments +; UnownPuzzle setval arguments ; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/games/unown_puzzle.asm) const_def const UNOWNPUZZLE_KABUTO ; 0 diff --git a/constants/serial_constants.asm b/constants/serial_constants.asm index 5a59ceec..be11bd3e 100644 --- a/constants/serial_constants.asm +++ b/constants/serial_constants.asm @@ -1,4 +1,4 @@ -; link types +; wLinkMode const_def const LINK_NULL ; 0 const LINK_TIMECAPSULE ; 1 diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index ccca4e5d..0cecccf4 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -1,3 +1,4 @@ +; SFX indexes (see audio/sfx_pointers.asm) const_def const SFX_DEX_FANFARE_50_79 ; 00 @@ -188,5 +189,3 @@ const SFX_TRAIN_ARRIVED ; b9 const SFX_STOP_SLOT ; ba const SFX_2_BOOPS ; bb - const SFX_GLASS_TING ; bc - const SFX_GLASS_TING_2 ; bd diff --git a/constants/std_constants.asm b/constants/std_constants.asm index 9cfcbc8a..352c93cb 100644 --- a/constants/std_constants.asm +++ b/constants/std_constants.asm @@ -1,3 +1,5 @@ +; StdScripts indexes (see engine/events/std_scripts.asm) +; also used in TileCollisionStdScripts (see data/events/collision_stdscripts.asm) enum_start enum pokecenternurse enum difficultbookshelf diff --git a/constants/text_constants.asm b/constants/text_constants.asm index f1c3a0bf..dbe06a36 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -44,3 +44,6 @@ PRINTNUM_LEADINGZEROS EQU 1 << PRINTNUM_LEADINGZEROS_F ; character sets (see charmap.asm) FIRST_REGULAR_TEXT_CHAR EQU $60 FIRST_HIRAGANA_DAKUTEN_CHAR EQU $20 + +; gfx/font/unown_font.png +FIRST_UNOWN_CHAR EQU $40 diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index 3d68dba4..e02393cb 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -1,4 +1,4 @@ -const_value SET 1 +; Tilesets indexes (see data/tilesets.asm) const_def 1 const TILESET_JOHTO ; 01 const TILESET_JOHTO_MODERN ; 02 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index a56a59aa..da50cd5d 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -80,14 +80,16 @@ RIGHT_MASK EQU 1 << RIGHT ; wFacingDirection:: ; cf2f FACE_CURRENT EQU 0 -FACE_DOWN EQU 8 -FACE_UP EQU 4 -FACE_LEFT EQU 2 -FACE_RIGHT EQU 1 +FACE_DOWN EQU 8 +FACE_UP EQU 4 +FACE_LEFT EQU 2 +FACE_RIGHT EQU 1 ; wPokemonWithdrawDepositParameter:: ; d008 -PC_WITHDRAW EQU 0 -PC_DEPOSIT EQU 1 +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 @@ -151,7 +153,7 @@ SCRIPT_RUNNING EQU 2 ; wSpawnAfterChampion:: SPAWN_LANCE EQU 1 -SPAWN_RED EQU 2 +SPAWN_RED EQU 2 ; wCurDay:: ; d1f2 const_def @@ -278,5 +280,5 @@ DAYCAREMAN_HAS_EGG_F EQU 6 ; wDayCareLady:: ; dc77 DAYCARELADY_HAS_MON_F EQU 0 -; used with both wDayCareMan and wDayCareLady +; shared flag between wDayCareMan and wDayCareLady DAYCARE_INTRO_SEEN_F EQU 7 |