diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_constants.asm | 16 | ||||
| -rwxr-xr-x | constants/battle_tower_constants.asm | 12 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 1 | ||||
| -rwxr-xr-x | constants/sram_constants.asm | 53 |
4 files changed, 15 insertions, 67 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 793650913..523713574 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -171,7 +171,7 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_BURN_HIT const EFFECT_FREEZE_HIT const EFFECT_PARALYZE_HIT - const EFFECT_EXPLOSION + const EFFECT_SELFDESTRUCT const EFFECT_DREAM_EATER const EFFECT_MIRROR_MOVE const EFFECT_ATTACK_UP @@ -189,10 +189,10 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_SP_DEF_DOWN const EFFECT_ACCURACY_DOWN const EFFECT_EVASION_DOWN - const EFFECT_HAZE + const EFFECT_RESET_STATS const EFFECT_BIDE const EFFECT_RAMPAGE - const EFFECT_WHIRLWIND + const EFFECT_FORCE_SWITCH const EFFECT_MULTI_HIT const EFFECT_CONVERSION const EFFECT_FLINCH_HIT @@ -206,7 +206,7 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_RAZOR_WIND const EFFECT_SUPER_FANG const EFFECT_STATIC_DAMAGE - const EFFECT_BIND + const EFFECT_TRAP_TARGET const EFFECT_UNUSED_2B const EFFECT_DOUBLE_HIT const EFFECT_JUMP_KICK @@ -241,7 +241,7 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_EVASION_DOWN_HIT const EFFECT_SKY_ATTACK const EFFECT_CONFUSE_HIT - const EFFECT_TWINEEDLE + const EFFECT_POISON_MULTI_HIT const EFFECT_UNUSED_4E const EFFECT_SUBSTITUTE const EFFECT_HYPER_BEAM @@ -302,9 +302,9 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_HIDDEN_POWER const EFFECT_RAIN_DANCE const EFFECT_SUNNY_DAY - const EFFECT_STEEL_WING - const EFFECT_METAL_CLAW - const EFFECT_ANCIENTPOWER + const EFFECT_DEFENSE_UP_HIT + const EFFECT_ATTACK_UP_HIT + const EFFECT_ALL_UP_HIT const EFFECT_FAKE_OUT const EFFECT_BELLY_DRUM const EFFECT_PSYCH_UP diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index c690c9b0b..481c1f19b 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -1,7 +1,7 @@ const_def - const BATTLETOWERACTION_00 - const BATTLETOWERACTION_01 - const BATTLETOWERACTION_02 + const BATTLETOWERACTION_CHECK_EXPLANATION_READ + const BATTLETOWERACTION_SET_EXPLANATION_READ + const BATTLETOWERACTION_GET_CHALLENGE_STATE const BATTLETOWERACTION_SAVE_AND_QUIT const BATTLETOWERACTION_CHALLENGECANCELED const BATTLETOWERACTION_05 @@ -13,7 +13,7 @@ const BATTLETOWERACTION_CHECKMOBILEEVENT const BATTLETOWERACTION_0C ; more time stuff in SRAM bank 5 const BATTLETOWERACTION_0D ; more time stuff in SRAM bank 5 - const BATTLETOWERACTION_EGGTICKET ; egg ticket + const BATTLETOWERACTION_EGGTICKET const BATTLETOWERACTION_0F ; check w3_d090 const BATTLETOWERACTION_10 ; dw based on 5:a800 const BATTLETOWERACTION_11 ; store 0 in 5:aa8d @@ -23,8 +23,8 @@ const BATTLETOWERACTION_15 ; set 0, [s1_be4f] const BATTLETOWERACTION_16 ; update time in SRAM bank 5 const BATTLETOWERACTION_17 ; check time in SRAM bank 5 - const BATTLETOWERACTION_18 ; level check - const BATTLETOWERACTION_19 ; ubers check + const BATTLETOWERACTION_LEVEL_CHECK + const BATTLETOWERACTION_UBERS_CHECK const BATTLETOWERACTION_RESETDATA ; clear data const BATTLETOWERACTION_GIVEREWARD ; give reward const BATTLETOWERACTION_1C ; set won challenge diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 6082768ac..77b65a38a 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -142,6 +142,7 @@ NUM_WILDMONS_PER_AREA_TIME_OF_DAY EQU 7 WILDMON_GRASS_STRUCTURE_LENGTH EQU 2 + 3 * (1 + 2 * NUM_WILDMONS_PER_AREA_TIME_OF_DAY) MOBILE_EVENT_OBJECT_GS_BALL EQU $b +MOBILE_LOGIN_PASSWORD_LENGTH EQU 17 MALE EQU 0 FEMALE EQU 1 diff --git a/constants/sram_constants.asm b/constants/sram_constants.asm deleted file mode 100755 index c2d112b7d..000000000 --- a/constants/sram_constants.asm +++ /dev/null @@ -1,53 +0,0 @@ -; Mobile bank 5 - -; sMobileEventIndex EQU $a000 ; moved to 1:BE3C in English -sTrainerRankings EQU $a001 -sTrainerRankingGameTimeHOF EQU $a001 -sTrainerRankingStepCountHOF EQU $a005 -sTrainerRankingHealingsHOF EQU $a009 -sTrainerRankingBattlesHOF EQU $a00d -sTrainerRankingStepCount EQU $a010 -sTrainerRankingBattleTowerWins EQU $a014 -sTrainerRankingTMsHMsTaught EQU $a018 -sTrainerRankingBattles EQU $a01b -sTrainerRankingWildBattles EQU $a01e -sTrainerRankingTrainerBattles EQU $a021 -sTrainerRankingUnused1 EQU $a024 -sTrainerRankingHOFEntries EQU $a027 -sTrainerRankingWildMonsCaught EQU $a02a -sTrainerRankingHookedEncounters EQU $a02d -sTrainerRankingEggsHatched EQU $a030 -sTrainerRankingMonsEvolved EQU $a033 -sTrainerRankingFruitPicked EQU $a036 -sTrainerRankingHealings EQU $a039 -sTrainerRankingMysteryGift EQU $a03c -sTrainerRankingTrades EQU $a03f -sTrainerRankingFly EQU $a042 -sTrainerRankingSurf EQU $a045 -sTrainerRankingWaterfall EQU $a048 -sTrainerRankingWhiteOuts EQU $a04b -sTrainerRankingLuckyNumberShow EQU $a04e -sTrainerRankingPhoneCalls EQU $a051 -sTrainerRankingUnused2 EQU $a054 -sTrainerRankingLinkBattles EQU $a057 -sTrainerRankingSplash EQU $a05a -sTrainerRankingTreeEncounters EQU $a05d -sTrainerRankingUnused3 EQU $a060 -sTrainerRankingColosseumWins EQU $a063 -sTrainerRankingColosseumLosses EQU $a066 -sTrainerRankingColosseumDraws EQU $a069 -sTrainerRankingSelfDestruct EQU $a06c -sTrainerRankingCurrentSlotsStreak EQU $a06f -sTrainerRankingLongestSlotsStreak EQU $a071 -sTrainerRankingTotalSlotsPayouts EQU $a073 -sTrainerRankingTotalBattlePayouts EQU $a077 -sTrainerRankingLongestMagikarp EQU $a07b -sTrainerRankingShortestMagikarp EQU $a07d -sTrainerRankingBugContestScore EQU $a07f -sTrainerRankingsChecksum EQU $a081 -sTrainerRankingsEnd EQU $a083 -; sMobileEventIndexBackup EQU $a083 ; moved to 1:BE44 in English -sTrainerRankingsBackup EQU $a084 - -sMobileLoginPassword EQU $aa4b -LOGIN_PASSWORD_LENGTH EQU 17 |