diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_message.s | 7 | ||||
| -rw-r--r-- | data/data2b.s | 43 |
2 files changed, 7 insertions, 43 deletions
diff --git a/data/battle_message.s b/data/battle_message.s index 05847eed0..4c72557d8 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -1768,12 +1768,19 @@ gText_SafariBalls:: @ 85CCB2C gText_SafariBallLeft:: @ 85CCB3C .string "{HIGHLIGHT DARK_GREY}Left: $" .string "{HIGHLIGHT DARK_GREY}$" +gText_Sleep:: .string "sleep$" +gText_Poison:: .string "poison$" +gText_Burn:: .string "burn$" +gText_Paralysis:: .string "paralysis$" +gText_Ice:: .string "ice$" +gText_Confusion:: .string "confusion$" +gText_Love:: .string "love$" gText_SpaceAndSpace:: @ 85CCB79 diff --git a/data/data2b.s b/data/data2b.s index 717b70d4d..802399fca 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -225,46 +225,3 @@ gTrainerMoneyTable:: @ 831AEB8 @ 831BAD4 .include "data/text/ability_description_pointers.inc" - -gTurnActionsFuncsTable:: @ 831BC0C - .incbin "baserom.gba", 0x31bc0c, 0x38 - -gEndTurnFuncsTable:: @ 831BC44 - .incbin "baserom.gba", 0x31bc44, 0x2c - -gStatusConditionString_PoisonJpn:: @ 831BC70 - .incbin "baserom.gba", 0x31bc70, 0x8 - -gStatusConditionString_SleepJpn:: @ 831BC78 - .incbin "baserom.gba", 0x31bc78, 0x8 - -gStatusConditionString_ParalysisJpn:: @ 831BC80 - .incbin "baserom.gba", 0x31bc80, 0x8 - -gStatusConditionString_BurnJpn:: @ 831BC88 - .incbin "baserom.gba", 0x31bc88, 0x8 - -gStatusConditionString_IceJpn:: @ 831BC90 - .incbin "baserom.gba", 0x31bc90, 0x8 - -gStatusConditionString_ConfusionJpn:: @ 831BC98 - .incbin "baserom.gba", 0x31bc98, 0x8 - -gStatusConditionString_LoveJpn:: @ 831BCA0 - .incbin "baserom.gba", 0x31bca0, 0x8 - -gUnknown_0831BCA8:: @ 831BCA8 - .incbin "baserom.gba", 0x31bca8, 0x38 - -gUnknown_0831BCE0:: @ 831BCE0 - .incbin "baserom.gba", 0x31bce0, 0xf - -gUnknown_0831BCEF:: @ 831BCEF - .incbin "baserom.gba", 0x31bcef, 0x4 - -gUnknown_0831BCF3:: @ 831BCF3 - .incbin "baserom.gba", 0x31bcf3, 0x5 - -gSoundMovesTable:: @ 831BCF8 - .incbin "baserom.gba", 0x31bcf8, 0x18 - |