Merge remote-tracking branch 'refs/remotes/pret/master'

sym_ewram.txt

@@ -1,4 +1,4 @@
-gUnknown_02020000: @ 2020000
+gTrainerId: @ 2020000
 	.space 0x4
 
 gUnknown_02020004: @ 2020004
@@ -64,20 +64,19 @@ gUnknown_02021BC0: @ 2021BC0
 gUnknown_02021CC0: @ 2021CC0
 	.space 0x4
 
-gUnknown_02021CC4: @ 2021CC4
+gStringVar1: @ 2021CC4
 	.space 0x100
 
-gUnknown_02021DC4: @ 2021DC4
+gStringVar2: @ 2021DC4
 	.space 0x100
 
-gUnknown_02021EC4: @ 2021EC4
+gStringVar3: @ 2021EC4
 	.space 0x100
 
-gUnknown_02021FC4: @ 2021FC4
+gStringVar4: @ 2021FC4
 	.space 0x3E8
 
-gUnknown_020223AC: @ 20223AC
-	.space 0x10
+	.include "src/string_util.o"
 
 gUnknown_020223BC: @ 20223BC
 	.space 0x1
@@ -325,7 +324,7 @@ gUnknown_02022F78: @ 2022F78
 gUnknown_02022F88: @ 2022F88
 	.space 0x64
 
-gUnknown_02022FEC: @ 2022FEC
+gBattleTypeFlags: @ 2022FEC
 	.space 0x4
 
 gUnknown_02022FF0: @ 2022FF0
@@ -391,7 +390,7 @@ gUnknown_02024082: @ 2024082
 gUnknown_02024083: @ 2024083
 	.space 0x1
 
-gUnknown_02024084: @ 2024084
+gBattleMons: @ 2024084
 	.space 0xC
 
 gUnknown_02024090: @ 2024090
@@ -436,7 +435,7 @@ gUnknown_020241EC: @ 20241EC
 gUnknown_020241EE: @ 20241EE
 	.space 0x2
 
-gUnknown_020241F0: @ 20241F0
+gBattleMoveDamage: @ 20241F0
 	.space 0x4
 
 gUnknown_020241F4: @ 20241F4
@@ -454,7 +453,7 @@ gUnknown_0202420A: @ 202420A
 gUnknown_0202420B: @ 202420B
 	.space 0x1
 
-gUnknown_0202420C: @ 202420C
+gEnemyMonIndex: @ 202420C
 	.space 0x1
 
 gUnknown_0202420D: @ 202420D
@@ -469,7 +468,7 @@ gUnknown_0202420F: @ 202420F
 gUnknown_02024210: @ 2024210
 	.space 0x1
 
-gUnknown_02024211: @ 2024211
+gCritMultiplier: @ 2024211
 	.space 0x1
 
 gUnknown_02024212: @ 2024212
@@ -511,7 +510,7 @@ gUnknown_02024270: @ 2024270
 gUnknown_02024274: @ 2024274
 	.space 0x8
 
-gUnknown_0202427C: @ 202427C
+gBattleMoveFlags: @ 202427C
 	.space 0x4
 
 gUnknown_02024280: @ 2024280
@@ -562,7 +561,7 @@ gUnknown_0202433C: @ 202433C
 gUnknown_0202437C: @ 202437C
 	.space 0x50
 
-gUnknown_020243CC: @ 20243CC
+gBattleWeather: @ 20243CC
 	.space 0x4
 
 gUnknown_020243D0: @ 20243D0
@@ -658,7 +657,7 @@ gUnknown_020244E9: @ 20244E9
 gUnknown_020244EA: @ 20244EA
 	.space 0x2
 
-gUnknown_020244EC: @ 20244EC
+gPlayerParty: @ 20244EC
 	.space 0x64
 
 gUnknown_02024550: @ 2024550
@@ -676,7 +675,7 @@ gUnknown_0202467C: @ 202467C
 gUnknown_020246E0: @ 20246E0
 	.space 0x64
 
-gUnknown_02024744: @ 2024744
+gEnemyParty: @ 2024744
 	.space 0x64
 
 gUnknown_020247A8: @ 20247A8
@@ -700,12 +699,9 @@ gUnknown_0202499C: @ 202499C
 gUnknown_020249B4: @ 20249B4
 	.space 0x8
 
-gUnknown_020249BC: @ 20249BC
-	.space 0x4
-
-gUnknown_020249C0: @ 20249C0
-	.space 0x4
+	.include "src/rng.o"
 
+	.align 2
 gUnknown_020249C4: @ 20249C4
 	.space 0x64
 
@@ -1621,10 +1617,10 @@ gUnknown_0203AB30: @ 203AB30
 gUnknown_0203AB34: @ 203AB34
 	.space 0x4
 
-gUnknown_0203AB38: @ 203AB38
+gAIScriptPtr: @ 203AB38
 	.space 0x4
 
-gUnknown_0203AB3C: @ 203AB3C
+gPlayerMonIndex: @ 203AB3C
 	.space 0x4
 
 gUnknown_0203AB40: @ 203AB40