summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-10-11 03:06:48 -0700
committerYamaArashi <shadow962@live.com>2015-10-11 03:06:48 -0700
commit63ee8445108ada01280d2de23c73af5394a2cf03 (patch)
tree6a6fdf3ab87bec30a4db02aab519bee410ca33b3
parent5f550963fa483b639e0913b737c3e31e4ad183fe (diff)
ability descriptions
-rw-r--r--asm/emerald.s2
-rw-r--r--data/data2.s11
-rw-r--r--data/text/ability_description_pointers.s81
-rw-r--r--data/text/ability_descriptions.s233
4 files changed, 321 insertions, 6 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index 83bcafff1..56ac59daf 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -871176,7 +871176,7 @@ sub_81C302C: ; 81C302C
bl sub_81C2D2C
lsls r0, 24
lsrs r0, 24
- ldr r1, =gUnknown_0831BAD4
+ ldr r1, =gAbilityDescriptionPointers
lsls r4, 2
adds r4, r1
ldr r1, [r4]
diff --git a/data/data2.s b/data/data2.s
index e34164f13..c6db6bdd8 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1487,15 +1487,16 @@ gUnknown_0831ACE8: ; 831ACE8
.align 2, 0
gUnknown_0831AEB8: ; 831AEB8
- .incbin "base_emerald.gba", 0x31aeb8, 0x823
+ .incbin "base_emerald.gba", 0x31aeb8, 0xe0
+
+; 831AF98
+ .include "data/text/ability_descriptions.s"
; 831B6DB
.include "data/text/ability_names.s"
- .align 2, 0
-
-gUnknown_0831BAD4: ; 831BAD4
- .incbin "base_emerald.gba", 0x31bad4, 0x138
+; 831BAD4
+ .include "data/text/ability_description_pointers.s"
gUnknown_0831BC0C: ; 831BC0C
.incbin "base_emerald.gba", 0x31bc0c, 0x38
diff --git a/data/text/ability_description_pointers.s b/data/text/ability_description_pointers.s
new file mode 100644
index 000000000..92f081050
--- /dev/null
+++ b/data/text/ability_description_pointers.s
@@ -0,0 +1,81 @@
+ .align 2, 0
+
+gAbilityDescriptionPointers: ; 831BAD4
+ .4byte gNoneAbilityDescription
+ .4byte gStenchAbilityDescription
+ .4byte gDrizzleAbilityDescription
+ .4byte gSpeedBoostAbilityDescription
+ .4byte gBattleArmorAbilityDescription
+ .4byte gSturdyAbilityDescription
+ .4byte gDampAbilityDescription
+ .4byte gLimberAbilityDescription
+ .4byte gSandVeilAbilityDescription
+ .4byte gStaticAbilityDescription
+ .4byte gVoltAbsorbAbilityDescription
+ .4byte gWaterAbsorbAbilityDescription
+ .4byte gObliviousAbilityDescription
+ .4byte gCloudNineAbilityDescription
+ .4byte gCompoundeyesAbilityDescription
+ .4byte gInsomniaAbilityDescription
+ .4byte gColorChangeAbilityDescription
+ .4byte gImmunityAbilityDescription
+ .4byte gFlashFireAbilityDescription
+ .4byte gShieldDustAbilityDescription
+ .4byte gOwnTempoAbilityDescription
+ .4byte gSuctionCupsAbilityDescription
+ .4byte gIntimidateAbilityDescription
+ .4byte gShadowTagAbilityDescription
+ .4byte gRoughSkinAbilityDescription
+ .4byte gWonderGuardAbilityDescription
+ .4byte gLevitateAbilityDescription
+ .4byte gEffectSporeAbilityDescription
+ .4byte gSynchronizeAbilityDescription
+ .4byte gClearBodyAbilityDescription
+ .4byte gNaturalCureAbilityDescription
+ .4byte gLightningrodAbilityDescription
+ .4byte gSereneGraceAbilityDescription
+ .4byte gSwiftSwimAbilityDescription
+ .4byte gChlorophyllAbilityDescription
+ .4byte gIlluminateAbilityDescription
+ .4byte gTraceAbilityDescription
+ .4byte gHugePowerAbilityDescription
+ .4byte gPoisonPointAbilityDescription
+ .4byte gInnerFocusAbilityDescription
+ .4byte gMagmaArmorAbilityDescription
+ .4byte gWaterVeilAbilityDescription
+ .4byte gMagnetPullAbilityDescription
+ .4byte gSoundproofAbilityDescription
+ .4byte gRainDishAbilityDescription
+ .4byte gSandStreamAbilityDescription
+ .4byte gPressureAbilityDescription
+ .4byte gThickFatAbilityDescription
+ .4byte gEarlyBirdAbilityDescription
+ .4byte gFlameBodyAbilityDescription
+ .4byte gRunAwayAbilityDescription
+ .4byte gKeenEyeAbilityDescription
+ .4byte gHyperCutterAbilityDescription
+ .4byte gPickupAbilityDescription
+ .4byte gTruantAbilityDescription
+ .4byte gHustleAbilityDescription
+ .4byte gCuteCharmAbilityDescription
+ .4byte gPlusAbilityDescription
+ .4byte gMinusAbilityDescription
+ .4byte gForecastAbilityDescription
+ .4byte gStickyHoldAbilityDescription
+ .4byte gShedSkinAbilityDescription
+ .4byte gGutsAbilityDescription
+ .4byte gMarvelScaleAbilityDescription
+ .4byte gLiquidOozeAbilityDescription
+ .4byte gOvergrowAbilityDescription
+ .4byte gBlazeAbilityDescription
+ .4byte gTorrentAbilityDescription
+ .4byte gSwarmAbilityDescription
+ .4byte gRockHeadAbilityDescription
+ .4byte gDroughtAbilityDescription
+ .4byte gArenaTrapAbilityDescription
+ .4byte gVitalSpiritAbilityDescription
+ .4byte gWhiteSmokeAbilityDescription
+ .4byte gPurePowerAbilityDescription
+ .4byte gShellArmorAbilityDescription
+ .4byte gCacophonyAbilityDescription
+ .4byte gAirLockAbilityDescription
diff --git a/data/text/ability_descriptions.s b/data/text/ability_descriptions.s
new file mode 100644
index 000000000..5532a2fbc
--- /dev/null
+++ b/data/text/ability_descriptions.s
@@ -0,0 +1,233 @@
+gNoneAbilityDescription: ; 831AF98
+ .charmapstr "No special ability.$"
+
+gStenchAbilityDescription: ; 831AFAC
+ .charmapstr "Helps repel wild POKéMON.$"
+
+gDrizzleAbilityDescription: ; 831AFC6
+ .charmapstr "Summons rain in battle.$"
+
+gSpeedBoostAbilityDescription: ; 831AFDE
+ .charmapstr "Gradually boosts SPEED.$"
+
+gBattleArmorAbilityDescription: ; 831AFF6
+ .charmapstr "Blocks critical hits.$"
+
+gSturdyAbilityDescription: ; 831B00C
+ .charmapstr "Negates 1-hit KO attacks.$"
+
+gDampAbilityDescription: ; 831B026
+ .charmapstr "Prevents self-destruction.$"
+
+gLimberAbilityDescription: ; 831B041
+ .charmapstr "Prevents paralysis.$"
+
+gSandVeilAbilityDescription: ; 831B055
+ .charmapstr "Ups evasion in a sandstorm.$"
+
+gStaticAbilityDescription: ; 831B071
+ .charmapstr "Paralyzes on contact.$"
+
+gVoltAbsorbAbilityDescription: ; 831B087
+ .charmapstr "Turns electricity into HP.$"
+
+gWaterAbsorbAbilityDescription: ; 831B0A2
+ .charmapstr "Changes water into HP.$"
+
+gObliviousAbilityDescription: ; 831B0B9
+ .charmapstr "Prevents attraction.$"
+
+gCloudNineAbilityDescription: ; 831B0CE
+ .charmapstr "Negates weather effects.$"
+
+gCompoundeyesAbilityDescription: ; 831B0E7
+ .charmapstr "Raises accuracy.$"
+
+gInsomniaAbilityDescription: ; 831B0F8
+ .charmapstr "Prevents sleep.$"
+
+gColorChangeAbilityDescription: ; 831B108
+ .charmapstr "Changes type to foe’s move.$"
+
+gImmunityAbilityDescription: ; 831B124
+ .charmapstr "Prevents poisoning.$"
+
+gFlashFireAbilityDescription: ; 831B138
+ .charmapstr "Powers up if hit by fire.$"
+
+gShieldDustAbilityDescription: ; 831B152
+ .charmapstr "Prevents added effects.$"
+
+gOwnTempoAbilityDescription: ; 831B16A
+ .charmapstr "Prevents confusion.$"
+
+gSuctionCupsAbilityDescription: ; 831B17E
+ .charmapstr "Firmly anchors the body.$"
+
+gIntimidateAbilityDescription: ; 831B197
+ .charmapstr "Lowers the foe’s ATTACK.$"
+
+gShadowTagAbilityDescription: ; 831B1B0
+ .charmapstr "Prevents the foe’s escape.$"
+
+gRoughSkinAbilityDescription: ; 831B1CB
+ .charmapstr "Hurts to touch.$"
+
+gWonderGuardAbilityDescription: ; 831B1DB
+ .charmapstr "“Super effective” hits.$"
+
+gLevitateAbilityDescription: ; 831B1F3
+ .charmapstr "Not hit by GROUND attacks.$"
+
+gEffectSporeAbilityDescription: ; 831B20E
+ .charmapstr "Leaves spores on contact.$"
+
+gSynchronizeAbilityDescription: ; 831B228
+ .charmapstr "Passes on status problems.$"
+
+gClearBodyAbilityDescription: ; 831B243
+ .charmapstr "Prevents ability reduction.$"
+
+gNaturalCureAbilityDescription: ; 831B25F
+ .charmapstr "Heals upon switching out.$"
+
+gLightningrodAbilityDescription: ; 831B279
+ .charmapstr "Draws electrical moves.$"
+
+gSereneGraceAbilityDescription: ; 831B291
+ .charmapstr "Promotes added effects.$"
+
+gSwiftSwimAbilityDescription: ; 831B2A9
+ .charmapstr "Raises SPEED in rain.$"
+
+gChlorophyllAbilityDescription: ; 831B2BF
+ .charmapstr "Raises SPEED in sunshine.$"
+
+gIlluminateAbilityDescription: ; 831B2D9
+ .charmapstr "Encounter rate increases.$"
+
+gTraceAbilityDescription: ; 831B2F3
+ .charmapstr "Copies special ability.$"
+
+gHugePowerAbilityDescription: ; 831B30B
+ .charmapstr "Raises ATTACK.$"
+
+gPoisonPointAbilityDescription: ; 831B31A
+ .charmapstr "Poisons foe on contact.$"
+
+gInnerFocusAbilityDescription: ; 831B332
+ .charmapstr "Prevents flinching.$"
+
+gMagmaArmorAbilityDescription: ; 831B346
+ .charmapstr "Prevents freezing.$"
+
+gWaterVeilAbilityDescription: ; 831B359
+ .charmapstr "Prevents burns.$"
+
+gMagnetPullAbilityDescription: ; 831B369
+ .charmapstr "Traps STEEL-type POKéMON.$"
+
+gSoundproofAbilityDescription: ; 831B383
+ .charmapstr "Avoids sound-based moves.$"
+
+gRainDishAbilityDescription: ; 831B39D
+ .charmapstr "Slight HP recovery in rain.$"
+
+gSandStreamAbilityDescription: ; 831B3B9
+ .charmapstr "Summons a sandstorm.$"
+
+gPressureAbilityDescription: ; 831B3CE
+ .charmapstr "Raises foe’s PP usage.$"
+
+gThickFatAbilityDescription: ; 831B3E5
+ .charmapstr "Heat-and-cold protection.$"
+
+gEarlyBirdAbilityDescription: ; 831B3FF
+ .charmapstr "Awakens quickly from sleep.$"
+
+gFlameBodyAbilityDescription: ; 831B41B
+ .charmapstr "Burns the foe on contact.$"
+
+gRunAwayAbilityDescription: ; 831B435
+ .charmapstr "Makes escaping easier.$"
+
+gKeenEyeAbilityDescription: ; 831B44C
+ .charmapstr "Prevents loss of accuracy.$"
+
+gHyperCutterAbilityDescription: ; 831B467
+ .charmapstr "Prevents ATTACK reduction.$"
+
+gPickupAbilityDescription: ; 831B482
+ .charmapstr "May pick up items.$"
+
+gTruantAbilityDescription: ; 831B495
+ .charmapstr "Moves only every two turns.$"
+
+gHustleAbilityDescription: ; 831B4B1
+ .charmapstr "Trades accuracy for power.$"
+
+gCuteCharmAbilityDescription: ; 831B4CC
+ .charmapstr "Infatuates on contact.$"
+
+gPlusAbilityDescription: ; 831B4E3
+ .charmapstr "Powers up with MINUS.$"
+
+gMinusAbilityDescription: ; 831B4F9
+ .charmapstr "Powers up with PLUS.$"
+
+gForecastAbilityDescription: ; 831B50E
+ .charmapstr "Changes with the weather.$"
+
+gStickyHoldAbilityDescription: ; 831B528
+ .charmapstr "Prevents item theft.$"
+
+gShedSkinAbilityDescription: ; 831B53D
+ .charmapstr "Heals the body by shedding.$"
+
+gGutsAbilityDescription: ; 831B559
+ .charmapstr "Ups ATTACK if suffering.$"
+
+gMarvelScaleAbilityDescription: ; 831B572
+ .charmapstr "Ups DEFENSE if suffering.$"
+
+gLiquidOozeAbilityDescription: ; 831B58C
+ .charmapstr "Draining causes injury.$"
+
+gOvergrowAbilityDescription: ; 831B5A4
+ .charmapstr "Ups GRASS moves in a pinch.$"
+
+gBlazeAbilityDescription: ; 831B5C0
+ .charmapstr "Ups FIRE moves in a pinch.$"
+
+gTorrentAbilityDescription: ; 831B5DB
+ .charmapstr "Ups WATER moves in a pinch.$"
+
+gSwarmAbilityDescription: ; 831B5F7
+ .charmapstr "Ups BUG moves in a pinch.$"
+
+gRockHeadAbilityDescription: ; 831B611
+ .charmapstr "Prevents recoil damage.$"
+
+gDroughtAbilityDescription: ; 831B629
+ .charmapstr "Summons sunlight in battle.$"
+
+gArenaTrapAbilityDescription: ; 831B645
+ .charmapstr "Prevents fleeing.$"
+
+gVitalSpiritAbilityDescription: ; 831B657
+ .charmapstr "Prevents sleep.$"
+
+gWhiteSmokeAbilityDescription: ; 831B667
+ .charmapstr "Prevents ability reduction.$"
+
+gPurePowerAbilityDescription: ; 831B683
+ .charmapstr "Raises ATTACK.$"
+
+gShellArmorAbilityDescription: ; 831B692
+ .charmapstr "Blocks critical hits.$"
+
+gCacophonyAbilityDescription: ; 831B6A8
+ .charmapstr "Avoids sound-based moves.$"
+
+gAirLockAbilityDescription: ; 831B6C2
+ .charmapstr "Negates weather effects.$"