summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_anims.s2
-rw-r--r--data/battle_message.s7
-rw-r--r--data/battle_scripts_1.s26
-rw-r--r--data/battle_scripts_2.s10
-rw-r--r--data/data2b.s54
-rw-r--r--data/event_scripts.s6
6 files changed, 37 insertions, 68 deletions
diff --git a/data/battle_anims.s b/data/battle_anims.s
index 6b48bcd2a..8b285f7be 100644
--- a/data/battle_anims.s
+++ b/data/battle_anims.s
@@ -327,7 +327,7 @@ gUnknown_08525E98:: @ 8525E98
gUnknown_08525F58:: @ 8525F58
.incbin "baserom.gba", 0x525f58, 0x20
-gUnknown_08525F78:: @ 8525F78
+gCastformFrontSpriteCoords:: @ 8525F78
.incbin "baserom.gba", 0x525f78, 0x10
gUnknown_08525F88:: @ 8525F88
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/battle_scripts_1.s b/data/battle_scripts_1.s
index 206519f40..b2dfec5d8 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -45,40 +45,40 @@ gUnknown_082DA7C4:: @ 82DA7C4
gUnknown_082DA7CD:: @ 82DA7CD
.incbin "baserom.gba", 0x2da7cd, 0x160
-gUnknown_082DA92D:: @ 82DA92D
+BattleScript_LocalTrainerBattleWon:: @ 82DA92D
.incbin "baserom.gba", 0x2da92d, 0x3d
-gUnknown_082DA96A:: @ 82DA96A
+BattleScript_PayDayMoneyAndPickUpItems:: @ 82DA96A
.incbin "baserom.gba", 0x2da96a, 0x3
-gUnknown_082DA96D:: @ 82DA96D
+BattleScript_LocalBattleLost:: @ 82DA96D
.incbin "baserom.gba", 0x2da96d, 0x9e
gUnknown_082DAA0B:: @ 82DAA0B
.incbin "baserom.gba", 0x2daa0b, 0x2a
-gUnknown_082DAA35:: @ 82DAA35
+BattleScript_LinkBattleWonOrLost:: @ 82DAA35
.incbin "baserom.gba", 0x2daa35, 0x52
-gUnknown_082DAA87:: @ 82DAA87
+BattleScript_FrontierTrainerBattleWon:: @ 82DAA87
.incbin "baserom.gba", 0x2daa87, 0x54
-gUnknown_082DAADB:: @ 82DAADB
+BattleScript_SmokeBallEscape:: @ 82DAADB
.incbin "baserom.gba", 0x2daadb, 0xe
-gUnknown_082DAAE9:: @ 82DAAE9
+BattleScript_RanAwayUsingMonAbility:: @ 82DAAE9
.incbin "baserom.gba", 0x2daae9, 0x7
-gUnknown_082DAAF0:: @ 82DAAF0
+BattleScript_GotAwaySafely:: @ 82DAAF0
.incbin "baserom.gba", 0x2daaf0, 0x7
-gUnknown_082DAAF7:: @ 82DAAF7
+BattleScript_WildMonFled:: @ 82DAAF7
.incbin "baserom.gba", 0x2daaf7, 0x7
gUnknown_082DAAFE:: @ 82DAAFE
.incbin "baserom.gba", 0x2daafe, 0x4
-gUnknown_082DAB02:: @ 82DAB02
+BattleScript_PrintFailedToRunString:: @ 82DAB02
.incbin "baserom.gba", 0x2dab02, 0x9
gUnknown_082DAB0B:: @ 82DAB0B
@@ -87,7 +87,7 @@ gUnknown_082DAB0B:: @ 82DAB0B
gUnknown_082DAB11:: @ 82DAB11
.incbin "baserom.gba", 0x2dab11, 0x4
-gUnknown_082DAB15:: @ 82DAB15
+BattleScript_ActionSwitch:: @ 82DAB15
.incbin "baserom.gba", 0x2dab15, 0xa4
BattleScript_Pausex20:: @ 82DABB9
@@ -255,7 +255,7 @@ BattleScript_OneHitKOMsg:: @ 82DB1CE
BattleScript_SAtkDown2:: @ 82DB1D5
.incbin "baserom.gba", 0x2db1d5, 0x2a
-gUnknown_082DB1FF:: @ 82DB1FF
+BattleScript_FocusPunchSetUp:: @ 82DB1FF
.incbin "baserom.gba", 0x2db1ff, 0x14
BattleScript_MoveUsedIsAsleep:: @ 82DB213
@@ -561,7 +561,7 @@ BattleScript_BerryStatRaiseEnd2:: @ 82DB84E
BattleScript_BerryFocusEnergyEnd2:: @ 82DB869
.incbin "baserom.gba", 0x2db869, 0x10
-gUnknown_082DB879:: @ 82DB879
+BattleScript_ActionSelectionItemsCantBeUsed:: @ 82DB879
.incbin "baserom.gba", 0x2db879, 0x4
gUnknown_082DB87D:: @ 82DB87D
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index adabccb88..4a4dc4665 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -4,7 +4,7 @@
.section script_data, "aw", %progbits
.align 2
-gUnknown_082DBD08:: @ 82DBD08
+gBattlescriptsForBallThrow:: @ 82DBD08
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
@@ -29,11 +29,11 @@ gUnknown_082DBD3C:: @ 82DBD3C
.4byte gUnknown_082DBE91
.align 2
-gUnknown_082DBD54:: @ 82DBD54
- .4byte gUnknown_082DBEB3
+gBattlescriptsForRunningByItem:: @ 82DBD54
+ .4byte BattleScript_RunByUsingItem
.align 2
-gUnknown_082DBD58:: @ 82DBD58
+gBattlescriptsForSafariActions:: @ 82DBD58
.4byte gUnknown_082DBEBD
.4byte gUnknown_082DBEC4
.4byte gUnknown_082DBECD
@@ -72,7 +72,7 @@ gUnknown_082DBE6F:: @ 82DBE6F
gUnknown_082DBE91:: @ 82DBE91
.incbin "baserom.gba", 0x2dbe91, 0x22
-gUnknown_082DBEB3:: @ 82DBEB3
+BattleScript_RunByUsingItem:: @ 82DBEB3
.incbin "baserom.gba", 0x2dbeb3, 0xA
gUnknown_082DBEBD:: @ 82DBEBD
diff --git a/data/data2b.s b/data/data2b.s
index fd72e835e..802399fca 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -95,7 +95,7 @@ gUnknown_082FF6C0:: @ 82FF6C0
gUnknown_082FF70C:: @ 82FF70C
.incbin "baserom.gba", 0x2ff70c, 0x162c
-gUnknown_08300D38:: @ 8300D38
+gMonFrontPicCoords:: @ 8300D38
.incbin "baserom.gba", 0x300d38, 0x6e0
@ 8301418
@@ -196,8 +196,13 @@ gUnknown_0831AC70:: @ 831AC70
gUnknown_0831AC88:: @ 831AC88
.incbin "baserom.gba", 0x31ac88, 0x18
-gUnknown_0831ACA0:: @ 831ACA0
- .incbin "baserom.gba", 0x31aca0, 0x40
+gText_ShedinjaJapaneseName:: @ 831ACA0
+ .string "ヌケニン$" @Nukenin
+
+.align 2
+
+gUnknown_0831ACA8:: @ 831ACA8
+ .incbin "baserom.gba", 0x31aca8, 0x38
gUnknown_0831ACE0:: @ 831ACE0
.incbin "baserom.gba", 0x31ace0, 0x8
@@ -220,46 +225,3 @@ gTrainerMoneyTable:: @ 831AEB8
@ 831BAD4
.include "data/text/ability_description_pointers.inc"
-
-gUnknown_0831BC0C:: @ 831BC0C
- .incbin "baserom.gba", 0x31bc0c, 0x38
-
-gUnknown_0831BC44:: @ 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
-
diff --git a/data/event_scripts.s b/data/event_scripts.s
index e4293570d..4dd5761e5 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -84,14 +84,14 @@ gUnknown_0823B68C:: @ 823B68C
gUnknown_0823C050:: @ 823C050
.incbin "baserom.gba", 0x23c050, 0x6431
-gUnknown_08242481:: @ 8242481
+gText_BattleRecordCouldntBeSaved:: @ 8242481
.incbin "baserom.gba", 0x242481, 0x87b
gUnknown_08242CFC:: @ 8242CFC
.incbin "baserom.gba", 0x242cfc, 0x6a91
-gUnknown_0824978D:: @ 824978D
- .incbin "baserom.gba", 0x24978d, 0xe
+gText_LinkStandby3:: @ 824978D
+ .string "Link standby…$"
gUnknown_0824979B:: @ 824979B
.incbin "baserom.gba", 0x24979b, 0x944d