Merge pull request #28 from DizzyEggg/decomp_pokemon

decompile pokemon1/2/3

data/battle_message.s

@@ -249,7 +249,7 @@ gUnknown_085CA459:: @ 85CA459
 .string "{STRING 19} transformed!$"
 .string "{STRING 16}’s {STRING 25}\ntook the attack!$"
 
-gUnknown_085CB2A1:: @ 85CB2A1
+BattleText_PreventedSwitch:: @ 85CB2A1
 
 .string "{STRING 0}’s {STRING 23}\nprevents switching!\p$"
 .string "{STRING 16}’s {STRING 25}\nprevented {STRING 19}’s\l{STRING 0} from working!$"
@@ -548,7 +548,7 @@ gUnknown_085CBDBD:: @ 85CBDBD
 gUnknown_085CBDBF:: @ 85CBDBF
 	.incbin "baserom.gba", 0x5cbdbf, 0x41
 
-gUnknown_085CBE00:: @ 85CBE00
+gStatNamesTable:: @ 85CBE00
 	.incbin "baserom.gba", 0x5cbe00, 0x6c
 
 gUnknown_085CBE6C:: @ 85CBE6C
@@ -679,10 +679,10 @@ gUnknown_085CCB88:: @ 85CCB88
 gUnknown_085CCB8C:: @ 85CCB8C
 	.incbin "baserom.gba", 0x5ccb8c, 0x4
 
-gUnknown_085CCB90:: @ 85CCB90
+gBadEggNickname:: @ 85CCB90
 	.incbin "baserom.gba", 0x5ccb90, 0x8
 
-gUnknown_085CCB98:: @ 85CCB98
+BattleText_Wally:: @ 85CCB98
 	.incbin "baserom.gba", 0x5ccb98, 0x6
 
 gUnknown_085CCB9E:: @ 85CCB9E

data/data2c.s

@@ -53,10 +53,10 @@
 @ 832937C
 	.include "data/level_up_learnset_pointers.inc"
 
-gUnknown_083299EC:: @ 83299EC
+gMonFrontAnimIdsTable:: @ 83299EC
 	.incbin "baserom.gba", 0x3299ec, 0x19b
 
-gUnknown_08329B87:: @ 8329B87
+gMonAnimationDelayTable:: @ 8329B87
 	.incbin "baserom.gba", 0x329b87, 0x19b
 
 gUnknown_08329D22:: @ 8329D22
@@ -101,11 +101,8 @@ gUnknown_08329ECE:: @ 8329ECE
 gHMMoves:: @ 8329EEA
 	.incbin "baserom.gba", 0x329eea, 0x12
 
-gUnknown_08329EFC:: @ 8329EFC
-	.incbin "baserom.gba", 0x329efc, 0x2
-
-gAlteringCaveWildMonHeldItems:: @ 8329EFE
-	.incbin "baserom.gba", 0x329efe, 0x2a
+gAlteringCaveWildMonHeldItems:: @ 8329EFC
+	.incbin "baserom.gba", 0x329efc, 0x2c
 
 gUnknown_08329F28:: @ 8329F28
 	.incbin "baserom.gba", 0x329f28, 0x18

data/strings.s

@@ -45,7 +45,7 @@ gExpandedPlaceholder_Brendan:: @ 85E8258
 gExpandedPlaceholder_May:: @ 85E8260
 	.string "MAY$"
 
-gUnknown_085E8264:: @ 85E8264
+gEggNickname:: @ 85E8264
 
 .string "EGG$"
 

data/trainer_class_name_indices.inc

@@ -1,4 +1,4 @@
-gTrainerClassNameIndices:: @ 831F5CA
+gTrainerClassToNameIndex:: @ 831F5CA
 	.byte TRAINER_CLASS_NAME_HIKER
 	.byte TRAINER_CLASS_NAME_TEAM_AQUA
 	.byte TRAINER_CLASS_NAME_PKMN_BREEDER

data/trainer_pic_indices.inc

@@ -1,5 +1,5 @@
 	.align 2
-gTrainerPicIndices:: @ 831F578
+gUnknown_0831F578:: @ 831F578
 	.byte TRAINER_PIC_HIKER
 	.byte TRAINER_PIC_AQUA_GRUNT_M
 	.byte TRAINER_PIC_POKEMON_BREEDER_F