summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-09 12:00:42 -0700
committerYamaArashi <shadow962@live.com>2016-10-09 12:00:42 -0700
commit26eeff291a2c38395f928897d36c74257b752d8c (patch)
tree540b2c0dcb14b0781bf7905539f1c7e7e9d73285
parentb2acbe1d80d2cd7dad81bb15c499234d66fb9720 (diff)
name variable as gCritMultiplier
-rw-r--r--asm/rom3.s16
-rw-r--r--asm/rom5.s10
-rw-r--r--asm/rom_803BA2C.s4
-rw-r--r--sym_ewram.txt2
4 files changed, 16 insertions, 16 deletions
diff --git a/asm/rom3.s b/asm/rom3.s
index 8eae899e1..cced0538f 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -17005,7 +17005,7 @@ _08014044:
adds r1, r2
b _08014200
.align 2, 0
-_080140B8: .4byte gXXX_CritRelated
+_080140B8: .4byte gCritMultiplier
_080140BC: .4byte 0x0001601f
_080140C0: .4byte 0x000160e7
_080140C4: .4byte gUnknown_02024C68
@@ -33547,7 +33547,7 @@ _0801C9BC: .4byte gUnknown_02024C08
_0801C9C0: .4byte gUnknown_02024C98
_0801C9C4: .4byte gUnknown_020239F8
_0801C9C8: .4byte gCriticalHitChance
-_0801C9CC: .4byte gXXX_CritRelated
+_0801C9CC: .4byte gCritMultiplier
_0801C9D0:
ldr r1, _0801C9E4
movs r0, 0x1
@@ -33561,7 +33561,7 @@ _0801C9D4:
pop {r0}
bx r0
.align 2, 0
-_0801C9E4: .4byte gXXX_CritRelated
+_0801C9E4: .4byte gCritMultiplier
_0801C9E8: .4byte gUnknown_02024C10
thumb_func_end atk04_critcalc
@@ -33679,7 +33679,7 @@ _0801CAD0: .4byte gUnknown_02024DEC
_0801CAD4: .4byte 0x02000000
_0801CAD8: .4byte 0x0001601c
_0801CADC: .4byte gUnknown_02024BEC
-_0801CAE0: .4byte gXXX_CritRelated
+_0801CAE0: .4byte gCritMultiplier
_0801CAE4: .4byte 0x0001601f
_0801CAE8: .4byte gUnknown_02024C98
_0801CAEC: .4byte gBattleMoves
@@ -33793,7 +33793,7 @@ _0801CBC8: .4byte gUnknown_02024DEC
_0801CBCC: .4byte 0x02000000
_0801CBD0: .4byte 0x0001601c
_0801CBD4: .4byte gUnknown_02024BEC
-_0801CBD8: .4byte gXXX_CritRelated
+_0801CBD8: .4byte gCritMultiplier
_0801CBDC: .4byte 0x0001601f
_0801CBE0: .4byte gUnknown_02024C98
_0801CBE4: .4byte gBattleMoves
@@ -36280,7 +36280,7 @@ _0801DF7E:
bx r0
.align 2, 0
_0801DF84: .4byte gUnknown_02024A64
-_0801DF88: .4byte gXXX_CritRelated
+_0801DF88: .4byte gCritMultiplier
_0801DF8C: .4byte gUnknown_02024C68
_0801DF90: .4byte gUnknown_02024C07
_0801DF94: .4byte gUnknown_02024D1E
@@ -41636,7 +41636,7 @@ sub_8020B54: @ 8020B54
_08020B80: .4byte gUnknown_02024C68
_08020B84: .4byte 0x02000000
_08020B88: .4byte 0x0001601f
-_08020B8C: .4byte gXXX_CritRelated
+_08020B8C: .4byte gCritMultiplier
_08020B90: .4byte gUnknown_02024D1E
_08020B94: .4byte gUnknown_02024C6C
_08020B98: .4byte 0xffffbfff
@@ -85882,7 +85882,7 @@ _08037004: .4byte 0x02000000
_08037008: .4byte 0x0001601c
_0803700C: .4byte 0x0001601f
_08037010: .4byte gUnknown_02024C68
-_08037014: .4byte gXXX_CritRelated
+_08037014: .4byte gCritMultiplier
_08037018: .4byte gEnemyParty
_0803701C: .4byte gUnknown_02024A6A
_08037020: .4byte 0x00016068
diff --git a/asm/rom5.s b/asm/rom5.s
index b1ebc4e1c..d747afbc5 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -290992,7 +290992,7 @@ _08108334: .4byte 0x02016800
_08108338: .4byte gUnknown_02024DEC
_0810833C: .4byte 0xfffff81c
_08108340: .4byte gUnknown_02024C68
-_08108344: .4byte gXXX_CritRelated
+_08108344: .4byte gCritMultiplier
_08108348: .4byte gBattleMons
_0810834C: .4byte gUnknown_02024C07
_08108350: .4byte gUnknown_02024BE6
@@ -291677,7 +291677,7 @@ _0810885C: .4byte gUnknown_02024DEC
_08108860: .4byte 0x02000000
_08108864: .4byte 0x0001601c
_08108868: .4byte gUnknown_02024C68
-_0810886C: .4byte gXXX_CritRelated
+_0810886C: .4byte gCritMultiplier
_08108870: .4byte gUnknown_02024BEC
_08108874: .4byte gUnknown_02024BE6
_08108878: .4byte gUnknown_02024A8C
@@ -291775,7 +291775,7 @@ _08108928: .4byte gUnknown_02024DEC
_0810892C: .4byte 0x02000000
_08108930: .4byte 0x0001601c
_08108934: .4byte gUnknown_02024C68
-_08108938: .4byte gXXX_CritRelated
+_08108938: .4byte gCritMultiplier
_0810893C: .4byte gUnknown_02024BEC
_08108940: .4byte gUnknown_02024BE6
_08108944: .4byte gUnknown_02024C07
@@ -292450,7 +292450,7 @@ _08108E20: .4byte 0x02016800
_08108E24: .4byte gUnknown_02024DEC
_08108E28: .4byte 0xfffff81c
_08108E2C: .4byte gUnknown_02024C68
-_08108E30: .4byte gXXX_CritRelated
+_08108E30: .4byte gCritMultiplier
_08108E34: .4byte gUnknown_02024BE6
_08108E38: .4byte gUnknown_02024C07
_08108E3C: .4byte gUnknown_02024C08
@@ -292550,7 +292550,7 @@ _08108EFC: .4byte 0x02016800
_08108F00: .4byte gUnknown_02024DEC
_08108F04: .4byte 0xfffff81c
_08108F08: .4byte gUnknown_02024C68
-_08108F0C: .4byte gXXX_CritRelated
+_08108F0C: .4byte gCritMultiplier
_08108F10: .4byte gUnknown_02024BE6
_08108F14: .4byte gUnknown_02024C07
_08108F18: .4byte gUnknown_02024C08
diff --git a/asm/rom_803BA2C.s b/asm/rom_803BA2C.s
index cd5ad380d..68c57f8a3 100644
--- a/asm/rom_803BA2C.s
+++ b/asm/rom_803BA2C.s
@@ -736,7 +736,7 @@ _0803BFE4: .4byte 0x00000175
_0803BFE8: .4byte gBattleMovePower
_0803BFEC: .4byte gBattleMoves
_0803BFF0: .4byte gUnknown_02024BE6
-_0803BFF4: .4byte gXXX_CritRelated
+_0803BFF4: .4byte gCritMultiplier
_0803BFF8: .4byte gStatStageRatios
_0803BFFC:
adds r5, r6, 0
@@ -912,7 +912,7 @@ _0803C132:
.align 2, 0
_0803C148: .4byte gUnknown_020239F8
_0803C14C: .4byte gBattleMoves
-_0803C150: .4byte gXXX_CritRelated
+_0803C150: .4byte gCritMultiplier
_0803C154: .4byte gStatStageRatios
_0803C158:
mov r5, r8
diff --git a/sym_ewram.txt b/sym_ewram.txt
index f57774309..7b5b57589 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -154,7 +154,7 @@ gUnknown_02024C0B: @ 2024C0B
gUnknown_02024C0C: @ 2024C0C
.space 0x1
-gXXX_CritRelated: @ 2024C0D
+gCritMultiplier: @ 2024C0D
.space 0x1
gUnknown_02024C0E: @ 2024C0E