summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_anim_scripts.s4
-rw-r--r--data/battle_scripts_1.s206
-rw-r--r--data/data.s64
-rw-r--r--data/data_83FECCC.s6
-rw-r--r--data/graphics.s29
5 files changed, 144 insertions, 165 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 3d1de8ac5..4b45f3669 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -10,8 +10,8 @@ gUnknown_81C68F4:: @ 81C68F4
gUnknown_81C6E84:: @ 81C6E84
.incbin "baserom.gba", 0x1C6E84, 0x24
-gUnknown_81C6EA8:: @ 81C6EA8
+gBattleAnims_General:: @ 81C6EA8
.incbin "baserom.gba", 0x1C6EA8, 0x70
-gUnknown_81C6F18:: @ 81C6F18
+gBattleAnims_Special:: @ 81C6F18
.incbin "baserom.gba", 0x1C6F18, 0xF690
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index a3b44dc0d..317a4991f 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -18,7 +18,7 @@ gUnknown_81D6BD1:: @ 81D6BD1
gUnknown_81D6C62:: @ 81D6C62
.incbin "baserom.gba", 0x1D6C62, 0x6E0
-gUnknown_81D7342:: @ 81D7342
+BattleScript_MoveUsedMustRecharge:: @ 81D7342
.incbin "baserom.gba", 0x1D7342, 0xA75
gUnknown_81D7DB7:: @ 81D7DB7
@@ -36,10 +36,10 @@ gUnknown_81D8674:: @ 81D8674
gUnknown_81D8684:: @ 81D8684
.incbin "baserom.gba", 0x1D8684, 0x10
-gUnknown_81D8694:: @ 81D8694
+BattleScript_GiveExp:: @ 81D8694
.incbin "baserom.gba", 0x1D8694, 0x9
-gUnknown_81D869D:: @ 81D869D
+BattleScript_HandleFaintedMon:: @ 81D869D
.incbin "baserom.gba", 0x1D869D, 0x152
gUnknown_81D87EF:: @ 81D87EF
@@ -90,40 +90,40 @@ gUnknown_81D89F1:: @ 81D89F1
gUnknown_81D89F5:: @ 81D89F5
.incbin "baserom.gba", 0x1D89F5, 0x6F
-gUnknown_81D8A64:: @ 81D8A64
+BattleScript_RainContinuesOrEnds:: @ 81D8A64
.incbin "baserom.gba", 0x1D8A64, 0x1B
-gUnknown_81D8A7F:: @ 81D8A7F
+BattleScript_DamagingWeatherContinues:: @ 81D8A7F
.incbin "baserom.gba", 0x1D8A7F, 0x82
-gUnknown_81D8B01:: @ 81D8B01
+BattleScript_SandStormHailEnds:: @ 81D8B01
.incbin "baserom.gba", 0x1D8B01, 0x9
-gUnknown_81D8B0A:: @ 81D8B0A
+BattleScript_SunlightContinues:: @ 81D8B0A
.incbin "baserom.gba", 0x1D8B0A, 0xE
-gUnknown_81D8B18:: @ 81D8B18
+BattleScript_SunlightFaded:: @ 81D8B18
.incbin "baserom.gba", 0x1D8B18, 0x7
-gUnknown_81D8B1F:: @ 81D8B1F
+BattleScript_OverworldWeatherStarts:: @ 81D8B1F
.incbin "baserom.gba", 0x1D8B1F, 0x13
-gUnknown_81D8B32:: @ 81D8B32
+BattleScript_SideStatusWoreOff:: @ 81D8B32
.incbin "baserom.gba", 0x1D8B32, 0x11
-gUnknown_81D8B43:: @ 81D8B43
+BattleScript_SafeguardEnds:: @ 81D8B43
.incbin "baserom.gba", 0x1D8B43, 0xA
-gUnknown_81D8B4D:: @ 81D8B4D
+BattleScript_LeechSeedTurnDrain:: @ 81D8B4D
.incbin "baserom.gba", 0x1D8B4D, 0x5C
-gUnknown_81D8BA9:: @ 81D8BA9
+BattleScript_BideStoringEnergy:: @ 81D8BA9
.incbin "baserom.gba", 0x1D8BA9, 0xB
-gUnknown_81D8BB4:: @ 81D8BB4
+BattleScript_BideAttack:: @ 81D8BB4
.incbin "baserom.gba", 0x1D8BB4, 0x48
-gUnknown_81D8BFC:: @ 81D8BFC
+BattleScript_BideNoEnergyToAttack:: @ 81D8BFC
.incbin "baserom.gba", 0x1D8BFC, 0x14
gUnknown_81D8C10:: @ 81D8C10
@@ -135,16 +135,16 @@ gUnknown_81D8C3E:: @ 81D8C3E
gUnknown_81D8C48:: @ 81D8C48
.incbin "baserom.gba", 0x1D8C48, 0x7
-gUnknown_81D8C4F:: @ 81D8C4F
+BattleScript_MoveUsedIsDisabled:: @ 81D8C4F
.incbin "baserom.gba", 0x1D8C4F, 0xB
-gUnknown_81D8C5A:: @ 81D8C5A
+BattleScript_SelectingDisabledMove:: @ 81D8C5A
.incbin "baserom.gba", 0x1D8C5A, 0x4
-gUnknown_81D8C5E:: @ 81D8C5E
+BattleScript_DisabledNoMore:: @ 81D8C5E
.incbin "baserom.gba", 0x1D8C5E, 0x7
-gUnknown_81D8C65:: @ 81D8C65
+BattleScript_EncoredNoMore:: @ 81D8C65
.incbin "baserom.gba", 0x1D8C65, 0x7
gUnknown_81D8C6C:: @ 81D8C6C
@@ -159,10 +159,10 @@ gUnknown_81D8CBE:: @ 81D8CBE
gUnknown_81D8CF5:: @ 81D8CF5
.incbin "baserom.gba", 0x1D8CF5, 0x3E
-gUnknown_81D8D33:: @ 81D8D33
+BattleScript_PerishSongTakesLife:: @ 81D8D33
.incbin "baserom.gba", 0x1D8D33, 0x1B
-gUnknown_81D8D4E:: @ 81D8D4E
+BattleScript_PerishSongCountGoesDown:: @ 81D8D4E
.incbin "baserom.gba", 0x1D8D4E, 0x7
gUnknown_81D8D55:: @ 81D8D55
@@ -180,31 +180,31 @@ gUnknown_81D8E04:: @ 81D8E04
gUnknown_81D8E0B:: @ 81D8E0B
.incbin "baserom.gba", 0x1D8E0B, 0x7
-gUnknown_81D8E12:: @ 81D8E12
+BattleScript_MonTookFutureAttack:: @ 81D8E12
.incbin "baserom.gba", 0x1D8E12, 0x8E
-gUnknown_81D8EA0:: @ 81D8EA0
+BattleScript_NoMovesLeft:: @ 81D8EA0
.incbin "baserom.gba", 0x1D8EA0, 0x4
-gUnknown_81D8EA4:: @ 81D8EA4
+BattleScript_SelectingMoveWithNoPP:: @ 81D8EA4
.incbin "baserom.gba", 0x1D8EA4, 0x4
gUnknown_81D8EA8:: @ 81D8EA8
.incbin "baserom.gba", 0x1D8EA8, 0xF
-gUnknown_81D8EB7:: @ 81D8EB7
+BattleScript_SelectingTormentedMove:: @ 81D8EB7
.incbin "baserom.gba", 0x1D8EB7, 0xF
-gUnknown_81D8EC6:: @ 81D8EC6
+BattleScript_SelectingNotAllowedMoveTaunt:: @ 81D8EC6
.incbin "baserom.gba", 0x1D8EC6, 0x4
-gUnknown_81D8ECA:: @ 81D8ECA
+BattleScript_MoveUsedIsTaunted:: @ 81D8ECA
.incbin "baserom.gba", 0x1D8ECA, 0xB
-gUnknown_81D8ED5:: @ 81D8ED5
+BattleScript_WishComesTrue:: @ 81D8ED5
.incbin "baserom.gba", 0x1D8ED5, 0x37
-gUnknown_81D8F0C:: @ 81D8F0C
+BattleScript_IngrainTurnHeal:: @ 81D8F0C
.incbin "baserom.gba", 0x1D8F0C, 0x29
gUnknown_81D8F35:: @ 81D8F35
@@ -213,10 +213,10 @@ gUnknown_81D8F35:: @ 81D8F35
gUnknown_81D8F86:: @ 81D8F86
.incbin "baserom.gba", 0x1D8F86, 0xE
-gUnknown_81D8F94:: @ 81D8F94
+BattleScript_MoveUsedIsImprisoned:: @ 81D8F94
.incbin "baserom.gba", 0x1D8F94, 0xB
-gUnknown_81D8F9F:: @ 81D8F9F
+BattleScript_SelectingImprisonedMove:: @ 81D8F9F
.incbin "baserom.gba", 0x1D8F9F, 0x4
gUnknown_81D8FA3:: @ 81D8FA3
@@ -240,67 +240,67 @@ gUnknown_81D8FEB:: @ 81D8FEB
gUnknown_81D9015:: @ 81D9015
.incbin "baserom.gba", 0x1D9015, 0x14
-gUnknown_81D9029:: @ 81D9029
+BattleScript_MoveUsedIsAsleep:: @ 81D9029
.incbin "baserom.gba", 0x1D9029, 0xD
-gUnknown_81D9036:: @ 81D9036
+BattleScript_MoveUsedWokeUp:: @ 81D9036
.incbin "baserom.gba", 0x1D9036, 0x14
-gUnknown_81D904A:: @ 81D904A
+BattleScript_MonWokeUpInUproar:: @ 81D904A
.incbin "baserom.gba", 0x1D904A, 0x9
-gUnknown_81D9053:: @ 81D9053
+BattleScript_PoisonTurnDmg:: @ 81D9053
.incbin "baserom.gba", 0x1D9053, 0x22
-gUnknown_81D9075:: @ 81D9075
+BattleScript_BurnTurnDmg:: @ 81D9075
.incbin "baserom.gba", 0x1D9075, 0xB
-gUnknown_81D9080:: @ 81D9080
+BattleScript_MoveUsedIsFrozen:: @ 81D9080
.incbin "baserom.gba", 0x1D9080, 0xD
-gUnknown_81D908D:: @ 81D908D
+BattleScript_MoveUsedUnfroze:: @ 81D908D
.incbin "baserom.gba", 0x1D908D, 0xB
gUnknown_81D9098:: @ 81D9098
.incbin "baserom.gba", 0x1D9098, 0x9
-gUnknown_81D90A1:: @ 81D90A1
+BattleScript_MoveUsedIsParalyzed:: @ 81D90A1
.incbin "baserom.gba", 0x1D90A1, 0x10
-gUnknown_81D90B1:: @ 81D90B1
+BattleScript_MoveUsedFlinched:: @ 81D90B1
.incbin "baserom.gba", 0x1D90B1, 0xB
-gUnknown_81D90BC:: @ 81D90BC
+BattleScript_PrintUproarOverTurns:: @ 81D90BC
.incbin "baserom.gba", 0x1D90BC, 0x9
-gUnknown_81D90C5:: @ 81D90C5
+BattleScript_ThrashConfuses:: @ 81D90C5
.incbin "baserom.gba", 0x1D90C5, 0xE
-gUnknown_81D90D3:: @ 81D90D3
+BattleScript_MoveUsedIsConfused:: @ 81D90D3
.incbin "baserom.gba", 0x1D90D3, 0x43
-gUnknown_81D9116:: @ 81D9116
+BattleScript_MoveUsedIsConfusedNoMore:: @ 81D9116
.incbin "baserom.gba", 0x1D9116, 0x7
gUnknown_81D911D:: @ 81D911D
.incbin "baserom.gba", 0x1D911D, 0x7
-gUnknown_81D9124:: @ 81D9124
+BattleScript_WrapTurnDmg:: @ 81D9124
.incbin "baserom.gba", 0x1D9124, 0x12
-gUnknown_81D9136:: @ 81D9136
+BattleScript_WrapEnds:: @ 81D9136
.incbin "baserom.gba", 0x1D9136, 0x7
-gUnknown_81D913D:: @ 81D913D
+BattleScript_MoveUsedIsInLove:: @ 81D913D
.incbin "baserom.gba", 0x1D913D, 0xD
-gUnknown_81D914A:: @ 81D914A
+BattleScript_MoveUsedIsInLoveCantAttack:: @ 81D914A
.incbin "baserom.gba", 0x1D914A, 0xB
-gUnknown_81D9155:: @ 81D9155
+BattleScript_NightmareTurnDmg:: @ 81D9155
.incbin "baserom.gba", 0x1D9155, 0x11
-gUnknown_81D9166:: @ 81D9166
+BattleScript_CurseTurnDmg:: @ 81D9166
.incbin "baserom.gba", 0x1D9166, 0x11
gUnknown_81D9177:: @ 81D9177
@@ -315,40 +315,40 @@ gUnknown_81D9192:: @ 81D9192
gUnknown_81D91A1:: @ 81D91A1
.incbin "baserom.gba", 0x1D91A1, 0x26
-gUnknown_81D91C7:: @ 81D91C7
+BattleScript_YawnMakesAsleep:: @ 81D91C7
.incbin "baserom.gba", 0x1D91C7, 0xAA
gUnknown_81D9271:: @ 81D9271
.incbin "baserom.gba", 0x1D9271, 0xE
-gUnknown_81D927F:: @ 81D927F
+BattleScript_DrizzleActivates:: @ 81D927F
.incbin "baserom.gba", 0x1D927F, 0x14
-gUnknown_81D9293:: @ 81D9293
+BattleScript_SpeedBoostActivates:: @ 81D9293
.incbin "baserom.gba", 0x1D9293, 0xE
-gUnknown_81D92A1:: @ 81D92A1
+BattleScript_TraceActivates:: @ 81D92A1
.incbin "baserom.gba", 0x1D92A1, 0xA
-gUnknown_81D92AB:: @ 81D92AB
+BattleScript_RainDishActivates:: @ 81D92AB
.incbin "baserom.gba", 0x1D92AB, 0x14
-gUnknown_81D92BF:: @ 81D92BF
+BattleScript_SandstreamActivates:: @ 81D92BF
.incbin "baserom.gba", 0x1D92BF, 0x14
-gUnknown_81D92D3:: @ 81D92D3
+BattleScript_ShedSkinActivates:: @ 81D92D3
.incbin "baserom.gba", 0x1D92D3, 0x25
-gUnknown_81D92F8:: @ 81D92F8
+BattleScript_CastformChange:: @ 81D92F8
.incbin "baserom.gba", 0x1D92F8, 0xF
-gUnknown_81D9307:: @ 81D9307
+BattleScript_IntimidateActivatesEnd3:: @ 81D9307
.incbin "baserom.gba", 0x1D9307, 0x9
-gUnknown_81D9310:: @ 81D9310
+BattleScript_IntimidateActivates:: @ 81D9310
.incbin "baserom.gba", 0x1D9310, 0x69
-gUnknown_81D9379:: @ 81D9379
+BattleScript_DroughtActivates:: @ 81D9379
.incbin "baserom.gba", 0x1D9379, 0x14
gUnknown_81D938D:: @ 81D938D
@@ -360,22 +360,22 @@ gUnknown_81D93A1:: @ 81D93A1
gUnknown_81D93AF:: @ 81D93AF
.incbin "baserom.gba", 0x1D93AF, 0xE
-gUnknown_81D93BD:: @ 81D93BD
+BattleScript_MoveHPDrain_PPLoss:: @ 81D93BD
.incbin "baserom.gba", 0x1D93BD, 0x1
-gUnknown_81D93BE:: @ 81D93BE
+BattleScript_MoveHPDrain:: @ 81D93BE
.incbin "baserom.gba", 0x1D93BE, 0x22
-gUnknown_81D93E0:: @ 81D93E0
+BattleScript_MonMadeMoveUseless_PPLoss:: @ 81D93E0
.incbin "baserom.gba", 0x1D93E0, 0x1
-gUnknown_81D93E1:: @ 81D93E1
+BattleScript_MonMadeMoveUseless:: @ 81D93E1
.incbin "baserom.gba", 0x1D93E1, 0x15
-gUnknown_81D93F6:: @ 81D93F6
+BattleScript_FlashFireBoost_PPLoss:: @ 81D93F6
.incbin "baserom.gba", 0x1D93F6, 0x1
-gUnknown_81D93F7:: @ 81D93F7
+BattleScript_FlashFireBoost:: @ 81D93F7
.incbin "baserom.gba", 0x1D93F7, 0x1F
gUnknown_81D9416:: @ 81D9416
@@ -396,7 +396,7 @@ gUnknown_81D9444:: @ 81D9444
gUnknown_81D9452:: @ 81D9452
.incbin "baserom.gba", 0x1D9452, 0x1C
-gUnknown_81D946E:: @ 81D946E
+BattleScript_SoundproofProtected:: @ 81D946E
.incbin "baserom.gba", 0x1D946E, 0x10
gUnknown_81D947E:: @ 81D947E
@@ -405,115 +405,115 @@ gUnknown_81D947E:: @ 81D947E
gUnknown_81D948E:: @ 81D948E
.incbin "baserom.gba", 0x1D948E, 0xE
-gUnknown_81D949C:: @ 81D949C
+BattleScript_ColorChangeActivates:: @ 81D949C
.incbin "baserom.gba", 0x1D949C, 0x7
-gUnknown_81D94A3:: @ 81D94A3
+BattleScript_RoughSkinActivates:: @ 81D94A3
.incbin "baserom.gba", 0x1D94A3, 0x1B
-gUnknown_81D94BE:: @ 81D94BE
+BattleScript_CuteCharmActivates:: @ 81D94BE
.incbin "baserom.gba", 0x1D94BE, 0xD
-gUnknown_81D94CB:: @ 81D94CB
+BattleScript_ApplySecondaryEffect:: @ 81D94CB
.incbin "baserom.gba", 0x1D94CB, 0x3
-gUnknown_81D94CE:: @ 81D94CE
+BattleScript_SynchronizeActivates:: @ 81D94CE
.incbin "baserom.gba", 0x1D94CE, 0x3
-gUnknown_81D94D1:: @ 81D94D1
+BattleScript_AbilityCuredStatus:: @ 81D94D1
.incbin "baserom.gba", 0x1D94D1, 0x9
-gUnknown_81D94DA:: @ 81D94DA
+BattleScript_IgnoresWhileAsleep:: @ 81D94DA
.incbin "baserom.gba", 0x1D94DA, 0x10
-gUnknown_81D94EA:: @ 81D94EA
+BattleScript_IgnoresAndUsesRandomMove:: @ 81D94EA
.incbin "baserom.gba", 0x1D94EA, 0x8
-gUnknown_81D94F2:: @ 81D94F2
+BattleScript_MoveUsedLoafingAround:: @ 81D94F2
.incbin "baserom.gba", 0x1D94F2, 0x12
-gUnknown_81D9504:: @ 81D9504
+BattleScript_IgnoresAndFallsAsleep:: @ 81D9504
.incbin "baserom.gba", 0x1D9504, 0x17
-gUnknown_81D951B:: @ 81D951B
+BattleScript_IgnoresAndHitsItself:: @ 81D951B
.incbin "baserom.gba", 0x1D951B, 0xB
gUnknown_81D9526:: @ 81D9526
.incbin "baserom.gba", 0x1D9526, 0xB
-gUnknown_81D9531:: @ 81D9531
+BattleScript_BerryCurePrlzEnd2:: @ 81D9531
.incbin "baserom.gba", 0x1D9531, 0x6
-gUnknown_81D9537:: @ 81D9537
+BattleScript_BerryCureParRet:: @ 81D9537
.incbin "baserom.gba", 0x1D9537, 0x12
-gUnknown_81D9549:: @ 81D9549
+BattleScript_BerryCurePsnEnd2:: @ 81D9549
.incbin "baserom.gba", 0x1D9549, 0x6
-gUnknown_81D954F:: @ 81D954F
+BattleScript_BerryCurePsnRet:: @ 81D954F
.incbin "baserom.gba", 0x1D954F, 0x12
-gUnknown_81D9561:: @ 81D9561
+BattleScript_BerryCureBrnEnd2:: @ 81D9561
.incbin "baserom.gba", 0x1D9561, 0x6
-gUnknown_81D9567:: @ 81D9567
+BattleScript_BerryCureBrnRet:: @ 81D9567
.incbin "baserom.gba", 0x1D9567, 0x12
-gUnknown_81D9579:: @ 81D9579
+BattleScript_BerryCureFrzEnd2:: @ 81D9579
.incbin "baserom.gba", 0x1D9579, 0x6
-gUnknown_81D957F:: @ 81D957F
+BattleScript_BerryCureFrzRet:: @ 81D957F
.incbin "baserom.gba", 0x1D957F, 0x12
-gUnknown_81D9591:: @ 81D9591
+BattleScript_BerryCureSlpEnd2:: @ 81D9591
.incbin "baserom.gba", 0x1D9591, 0x6
-gUnknown_81D9597:: @ 81D9597
+BattleScript_BerryCureSlpRet:: @ 81D9597
.incbin "baserom.gba", 0x1D9597, 0x12
-gUnknown_81D95A9:: @ 81D95A9
+BattleScript_BerryCureConfusionEnd2:: @ 81D95A9
.incbin "baserom.gba", 0x1D95A9, 0x6
-gUnknown_81D95AF:: @ 81D95AF
+BattleScript_BerryCureConfusionRet:: @ 81D95AF
.incbin "baserom.gba", 0x1D95AF, 0x10
-gUnknown_81D95BF:: @ 81D95BF
+BattleScript_BerryCureChosenStatusEnd2:: @ 81D95BF
.incbin "baserom.gba", 0x1D95BF, 0x6
-gUnknown_81D95C5:: @ 81D95C5
+BattleScript_BerryCureChosenStatusRet:: @ 81D95C5
.incbin "baserom.gba", 0x1D95C5, 0x14
-gUnknown_81D95D9:: @ 81D95D9
+BattleScript_WhiteHerbEnd2:: @ 81D95D9
.incbin "baserom.gba", 0x1D95D9, 0x6
-gUnknown_81D95DF:: @ 81D95DF
+BattleScript_WhiteHerbRet:: @ 81D95DF
.incbin "baserom.gba", 0x1D95DF, 0x10
-gUnknown_81D95EF:: @ 81D95EF
+BattleScript_ItemHealHP_RemoveItem:: @ 81D95EF
.incbin "baserom.gba", 0x1D95EF, 0x1D
-gUnknown_81D960C:: @ 81D960C
+BattleScript_BerryPPHealEnd2:: @ 81D960C
.incbin "baserom.gba", 0x1D960C, 0x10
-gUnknown_81D961C:: @ 81D961C
+BattleScript_ItemHealHP_End2:: @ 81D961C
.incbin "baserom.gba", 0x1D961C, 0x6
-gUnknown_81D9622:: @ 81D9622
+BattleScript_ItemHealHP_Ret:: @ 81D9622
.incbin "baserom.gba", 0x1D9622, 0x1B
-gUnknown_81D963D:: @ 81D963D
+BattleScript_SelectingNotAllowedMoveChoiceItem:: @ 81D963D
.incbin "baserom.gba", 0x1D963D, 0x4
gUnknown_81D9641:: @ 81D9641
.incbin "baserom.gba", 0x1D9641, 0xE
-gUnknown_81D964F:: @ 81D964F
+BattleScript_BerryConfuseHealEnd2:: @ 81D964F
.incbin "baserom.gba", 0x1D964F, 0x2A
-gUnknown_81D9679:: @ 81D9679
+BattleScript_BerryStatRaiseEnd2:: @ 81D9679
.incbin "baserom.gba", 0x1D9679, 0x1B
-gUnknown_81D9694:: @ 81D9694
+BattleScript_BerryFocusEnergyEnd2:: @ 81D9694
.incbin "baserom.gba", 0x1D9694, 0x10
gUnknown_81D96A4:: @ 81D96A4
diff --git a/data/data.s b/data/data.s
index 0322670c0..0a2298a65 100644
--- a/data/data.s
+++ b/data/data.s
@@ -145,7 +145,7 @@ gMonShinyPaletteTable:: @ 82380CC
gTrainerFrontAnimsPtrTable:: @ 82390DC
.incbin "baserom.gba", 0x2390DC, 0x250
-gUnknown_823932C:: @ 823932C
+gTrainerFrontPicCoords:: @ 823932C
.incbin "baserom.gba", 0x23932C, 0x250
gTrainerFrontPicTable:: @ 823957C
@@ -157,7 +157,7 @@ gTrainerFrontPicPaletteTable:: @ 8239A1C
gTrainerBackAnimsPtrTable:: @ 8239F74
.incbin "baserom.gba", 0x239F74, 0x18
-gUnknown_8239F8C:: @ 8239F8C
+gTrainerBackPicCoords:: @ 8239F8C
.incbin "baserom.gba", 0x239F8C, 0x18
gTrainerBackPicTable:: @ 8239FA4
@@ -166,7 +166,7 @@ gTrainerBackPicTable:: @ 8239FA4
gUnknown_8239FD4:: @ 8239FD4
.incbin "baserom.gba", 0x239FD4, 0x30
-gUnknown_823A004:: @ 823A004
+gEnemyMonElevation:: @ 823A004
.incbin "baserom.gba", 0x23A004, 0x4554
gTrainerClassNames:: @ 823E558
@@ -254,34 +254,34 @@ gUnknown_8250038:: @ 8250038
gUnknown_8250070:: @ 8250070
.incbin "baserom.gba", 0x250070, 0x24
-gUnknown_8250094:: @ 8250094
+gStatusConditionString_PoisonJpn:: @ 8250094
.incbin "baserom.gba", 0x250094, 0x8
-gUnknown_825009C:: @ 825009C
+gStatusConditionString_SleepJpn:: @ 825009C
.incbin "baserom.gba", 0x25009C, 0x8
-gUnknown_82500A4:: @ 82500A4
+gStatusConditionString_ParalysisJpn:: @ 82500A4
.incbin "baserom.gba", 0x2500A4, 0x8
-gUnknown_82500AC:: @ 82500AC
+gStatusConditionString_BurnJpn:: @ 82500AC
.incbin "baserom.gba", 0x2500AC, 0x8
-gUnknown_82500B4:: @ 82500B4
+gStatusConditionString_IceJpn:: @ 82500B4
.incbin "baserom.gba", 0x2500B4, 0x8
-gUnknown_82500BC:: @ 82500BC
+gStatusConditionString_ConfusionJpn:: @ 82500BC
.incbin "baserom.gba", 0x2500BC, 0x8
-gUnknown_82500C4:: @ 82500C4
+gStatusConditionString_LoveJpn:: @ 82500C4
.incbin "baserom.gba", 0x2500C4, 0x8
gUnknown_82500CC:: @ 82500CC
.incbin "baserom.gba", 0x2500CC, 0x38
-gUnknown_8250104:: @ 8250104
- .incbin "baserom.gba", 0x250104, 0x18
+ .section .rodata.825011C
-gUnknown_825011C:: @ 825011C
+ .balign 4
+gBattleScriptingCommandsTable:: @ 825011C
.incbin "baserom.gba", 0x25011C, 0x3E0
gUnknown_82504FC:: @ 82504FC
@@ -344,47 +344,21 @@ gUnknown_8250994:: @ 8250994
gUnknown_82509F4:: @ 82509F4
.incbin "baserom.gba", 0x2509F4, 0x18
-gUnknown_8250A0C:: @ 8250A0C
+gSpriteSheet_EnemyShadow:: @ 8250A0C
.incbin "baserom.gba", 0x250A0C, 0x10
-gUnknown_8250A1C:: @ 8250A1C
+gSpriteTemplate_EnemyShadow:: @ 8250A1C
.incbin "baserom.gba", 0x250A1C, 0x18
-gUnknown_8250A34:: @ 8250A34
- .incbin "baserom.gba", 0x250A34, 0xEC
+ .section .rodata.8250B20
gUnknown_8250B20:: @ 8250B20
.incbin "baserom.gba", 0x250B20, 0xE4
- .section .rodata.825EF0C
+ .section .rodata.8260270
- .align 2
-gUnknown_8260208:: @ 8260208
- .incbin "baserom.gba", 0x260208, 0x8
-
-gUnknown_8260210:: @ 8260210
- .incbin "baserom.gba", 0x260210, 0x8
-
-gUnknown_8260218:: @ 8260218
- .incbin "baserom.gba", 0x260218, 0x8
-
-gUnknown_8260220:: @ 8260220
- .incbin "baserom.gba", 0x260220, 0x8
-
-gUnknown_8260228:: @ 8260228
- .incbin "baserom.gba", 0x260228, 0x8
-
-gUnknown_8260230:: @ 8260230
- .incbin "baserom.gba", 0x260230, 0x8
-
-gUnknown_8260238:: @ 8260238
- .incbin "baserom.gba", 0x260238, 0x8
-
-gUnknown_8260240:: @ 8260240
- .incbin "baserom.gba", 0x260240, 0x20
-
-gUnknown_8260260:: @ 8260260
- .incbin "baserom.gba", 0x260260, 0x18
+gUnknown_8260270:: @ 8260270
+ .incbin "baserom.gba", 0x260270, 0x8
gUnknown_8260278:: @ 8260278
.incbin "baserom.gba", 0x260278, 0x30
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index 6aade55b6..196468ace 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -24,8 +24,10 @@ gUnknown_83FECF4:: @ 83FECF4
gUnknown_83FECFA:: @ 83FECFA
.incbin "baserom.gba", 0x3FECFA, 0x6
-gUnknown_83FED00:: @ 83FED00
- .incbin "baserom.gba", 0x3FED00, 0x380
+ .section .rodata.83FEDE4
+
+gUnknown_83FEDE4:: @ 83FEDE4
+ .incbin "baserom.gba", 0x3FEDE4, 0x29C
gUnknown_83FF080:: @ 83FF080
.incbin "baserom.gba", 0x3FF080, 0xB0
diff --git a/data/graphics.s b/data/graphics.s
index 4b00c1c4b..fee86e011 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -146,7 +146,7 @@ gFile_graphics_interface_ball_Open_sheet:: @ 8D022E8
.incbin "graphics/interface/ball_open.4bpp.lz"
.align 2
-gFile_graphics_interface_blank_sheet:: @ 8D02364
+gBlankGfxCompressed:: @ 8D02364
.incbin "graphics/interface/blank.4bpp.lz"
.align 2
@@ -1062,8 +1062,11 @@ gFile_graphics_unused_basic_frame_tilemap:: @ 8D11A78
.incbin "graphics/unused/basic_frame.bin.lz"
.align 2
-gUnknown_8D11B84:: @ 8D11B84
- .incbin "baserom.gba", 0xD11B84, 0x40
+gBattleInterface_BallStatusBarPal:: @ 8D11B84
+ .incbin "baserom.gba", 0xD11B84, 0x20
+
+gBattleInterface_BallDisplayPal:: @ 8D11BA4
+ .incbin "baserom.gba", 0xD11BA4, 0x20
gUnknown_8D11BC4:: @ 8D11BC4
.incbin "baserom.gba", 0xD11BC4, 0xF00
@@ -1761,23 +1764,23 @@ gFile_graphics_battle_anims_sprites_186_palette:: @ 8D1F31C
.incbin "graphics/battle_anims/sprites/186.gbapal.lz"
.align 2
-gUnknown_8D1F340:: @ 8D1F340
+gHealthboxSinglesPlayerGfx:: @ 8D1F340
.incbin "baserom.gba", 0xD1F340, 0x2C4
.align 2
-gUnknown_8D1F604:: @ 8D1F604
+gHealthboxSinglesOpponentGfx:: @ 8D1F604
.incbin "baserom.gba", 0xD1F604, 0x190
.align 2
-gUnknown_8D1F794:: @ 8D1F794
+gHealthboxDoublesPlayerGfx:: @ 8D1F794
.incbin "baserom.gba", 0xD1F794, 0x194
.align 2
-gUnknown_8D1F928:: @ 8D1F928
+gHealthboxDoublesOpponentGfx:: @ 8D1F928
.incbin "baserom.gba", 0xD1F928, 0x194
.align 2
-gFile_graphics_battle_interface_healthbox_safari_sheet:: @ 8D1FABC
+gHealthboxSafariGfx:: @ 8D1FABC
.incbin "graphics/battle_interface/healthbox_safari.4bpp.lz"
.align 2
@@ -2365,15 +2368,15 @@ gFile_graphics_battle_anims_sprites_240_palette:: @ 8D2D068
.incbin "graphics/battle_anims/sprites/240.gbapal.lz"
.align 2
-gFile_graphics_battle_anims_sprites_substitute_palette:: @ 8D2D090
+gSubstituteDollPal:: @ 8D2D090
.incbin "graphics/battle_anims/sprites/substitute.gbapal.lz"
.align 2
-gFile_graphics_battle_anims_sprites_substitute_sheet:: @ 8D2D0B4
+gSubstituteDollGfx:: @ 8D2D0B4
.incbin "graphics/battle_anims/sprites/substitute.4bpp.lz"
.align 2
-gFile_graphics_battle_anims_sprites_substitute_tilemap:: @ 8D2D2F4
+gSubstituteDollTilemap:: @ 8D2D2F4
.incbin "graphics/battle_anims/sprites/substitute.bin.lz"
.align 2
@@ -15923,10 +15926,10 @@ gFile_graphics_battle_anims_sprites_271_sheet:: @ 8E93AB4
.incbin "graphics/battle_anims/sprites/271.4bpp.lz"
.align 2
-gUnknown_8E93B14:: @ 8E93B14
+gGhostPalette:: @ 8E93B14
.incbin "baserom.gba", 0xE93B14, 0x24
-gUnknown_8E93B38:: @ 8E93B38
+gGhostFrontPic:: @ 8E93B38
.incbin "baserom.gba", 0xE93B38, 0x368
gUnknown_8E93EA0:: @ 8E93EA0
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 17:26:57 +0000