summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/emerald.s172
-rw-r--r--asm/macros.s13
2 files changed, 101 insertions, 84 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index bd3578b01..f95026054 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -1,6 +1,10 @@
.include "constants/gba_constants.s"
.include "constants/misc_constants.s"
.include "constants/species_constants.s"
+ .include "constants/ability_constants.s"
+ .include "constants/item_constants.s"
+ .include "constants/type_constants.s"
+ .include "constants/pokemon_data_constants.s"
.include "asm/macros.s"
.include "asm/charmap.s"
@@ -29914,7 +29918,7 @@ sub_8017D04: ; 8017D04
ldrb r0, [r0]
cmp r4, r0
bge @08017D8E
- ldr r6, =gUnknown_083203CC
+ ldr r6, =gBaseStats
@08017D50:
movs r0, 0x64
muls r0, r4
@@ -98360,7 +98364,7 @@ sub_8039F40: ; 8039F40
bl pokemon_getattr
ldr r6, [r5]
adds r6, 0x7C
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -99562,7 +99566,7 @@ sub_803A75C: ; 803A75C
.pool
@0803AB6C:
adds r2, r4
- ldr r5, =gUnknown_083203CC
+ ldr r5, =gBaseStats
ldrh r1, [r2]
lsls r0, r1, 3
subs r0, r1
@@ -99750,7 +99754,7 @@ sub_803AC84: ; 803AC84
mov r2, r8
adds r3, r0, r2
movs r2, 0
- ldr r6, =gUnknown_083203CC
+ ldr r6, =gBaseStats
ldr r5, =0x02023864
ldr r4, =0x02024064
@0803AD0E:
@@ -122765,7 +122769,7 @@ ai_rate_move: ; 80477BC
movs r7, 0
mov r0, sp
strb r7, [r0]
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
@@ -127909,7 +127913,7 @@ sub_804A32C: ; 804A32C
adds r7, 0x1
cmp r7, 0x5
ble @0804A418
- ldr r3, =gUnknown_083203CC
+ ldr r3, =gBaseStats
ldr r2, =0x02024084
ldr r0, =0x0202420d
ldrb r1, [r0]
@@ -132385,7 +132389,7 @@ sub_804C904: ; 804C904
adds r2, r0, 0
muls r2, r7
adds r2, r4
- ldr r3, =gUnknown_083203CC
+ ldr r3, =gBaseStats
ldrh r1, [r2]
lsls r0, r1, 3
subs r0, r1
@@ -147246,7 +147250,7 @@ atkC4_802B910: ; 80546E4
str r0, [r1]
ldr r2, =0x020241f0
mov r8, r2
- ldr r5, =gUnknown_083203CC
+ ldr r5, =gBaseStats
mov r1, r9
ldrb r0, [r1]
movs r4, 0x64
@@ -149686,7 +149690,7 @@ sub_8055C00: ; 8055C00
beq @08055CC4
movs r6, 0
mov r7, sp
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
mov r8, r0
@08055C2A:
movs r0, 0x64
@@ -149786,7 +149790,7 @@ sub_8055C00: ; 8055C00
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
adds r0, r1
ldrb r0, [r0, 0x17]
b @08055D3C
@@ -149811,7 +149815,7 @@ sub_8055C00: ; 8055C00
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
adds r0, r1
ldrb r0, [r0, 0x16]
@08055D3C:
@@ -150569,7 +150573,7 @@ sub_8056300: ; 8056300
.align 2, 0
.pool
@080563B0:
- ldr r3, =gUnknown_083203CC
+ ldr r3, =gBaseStats
ldr r2, =0x02024084
ldrb r1, [r6]
movs r0, 0x58
@@ -155910,7 +155914,7 @@ sub_80591B8: ; 80591B8
ldr r3, =gExperienceTables
adds r4, 0x1
lsls r4, 2
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
@@ -156070,7 +156074,7 @@ sub_8059330: ; 8059330
adds r3, r0, 0
ldr r6, =gExperienceTables
lsls r1, r4, 2
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
@@ -156189,7 +156193,7 @@ sub_8059400: ; 8059400
ldr r3, =gExperienceTables
adds r4, 0x1
lsls r4, 2
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -174415,7 +174419,7 @@ sub_8062E54: ; 8062E54
adds r5, r4, 0
cmp r5, r10
bge @080630AC
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
mov r9, r0
@08062FF0:
movs r0, 0x64
@@ -175058,7 +175062,7 @@ ai_switchout_something: ; 8063364
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
adds r0, r1
ldrb r2, [r0, 0x17]
b @08063564
@@ -175068,7 +175072,7 @@ ai_switchout_something: ; 8063364
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
adds r0, r2
ldrb r2, [r0, 0x16]
@08063564:
@@ -175925,7 +175929,7 @@ sub_8063A90: ; 8063A90
ldrb r0, [r0]
cmp r7, r0
beq @08063CD8
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
@@ -183569,7 +183573,7 @@ create_pokemon: ; 8067BBC
mov r2, sp
adds r2, 0xE
bl pokemon_setattr_encrypted
- ldr r4, =gUnknown_083203CC
+ ldr r4, =gBaseStats
mov r2, sp
ldrh r1, [r2, 0xE]
lsls r0, r1, 3
@@ -183725,7 +183729,7 @@ create_pokemon: ; 8067BBC
adds r2, r4, 0
bl pokemon_setattr_encrypted
@08067E50:
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
mov r3, sp
ldrh r1, [r3, 0xE]
lsls r0, r1, 3
@@ -185629,7 +185633,7 @@ pokemon_calc_effective_stats: ; 8068D0C
.align 2, 0
.pool
@08068DF8:
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r2, r7, 3
subs r0, r2, r7
lsls r0, 2
@@ -185669,7 +185673,7 @@ pokemon_calc_effective_stats: ; 8068D0C
adds r0, r5, 0
movs r1, 0x3A
bl pokemon_setattr
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
subs r1, r6, r7
lsls r1, 2
adds r6, r1, r0
@@ -185933,7 +185937,7 @@ level_by_exp: ; 8069054
adds r3, r0, 0
movs r2, 0x1
ldr r6, =gExperienceTables
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
@@ -185988,7 +185992,7 @@ sub_80690C0: ; 80690C0
adds r3, r0, 0
movs r2, 0x1
ldr r6, =gExperienceTables
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
@@ -187899,7 +187903,7 @@ pokemon_roll_gender: ; 8069FC4
movs r2, 0
bl pokemon_getattr_encrypted
adds r2, r0, 0
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
@@ -187914,7 +187918,7 @@ pokemon_roll_gender: ; 8069FC4
cmp r0, 0xFE
bge @0806A01A
@08069FFC:
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
@@ -187942,7 +187946,7 @@ pokemon_species_get_gender_info: ; 806A020
adds r3, r1, 0
lsls r0, 16
lsrs r2, r0, 16
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
@@ -190884,7 +190888,7 @@ sub_806B694: ; 806B694
cmp r1, 0
beq @0806B6B8
ldr r2, =0x0202420a
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r3, 3
subs r0, r3
lsls r0, 2
@@ -190895,7 +190899,7 @@ sub_806B694: ; 806B694
.pool
@0806B6B8:
ldr r2, =0x0202420a
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r3, 3
subs r0, r3
lsls r0, 2
@@ -191593,7 +191597,7 @@ battle_data_fill: ; 806B9FC
adds r1, 0x48
adds r1, r5, r1
str r0, [r1]
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
ldrh r1, [r7]
lsls r0, r1, 3
subs r0, r1
@@ -192237,7 +192241,7 @@ sub_806BD28: ; 806BD28
bl pokemon_getattr
adds r4, 0x1
lsls r4, 2
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -195505,7 +195509,7 @@ sub_806DADC: ; 806DADC
.4byte @0806DBA0
.4byte @0806DBB4
@0806DB50:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
@@ -195516,7 +195520,7 @@ sub_806DADC: ; 806DADC
.align 2, 0
.pool
@0806DB64:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
@@ -195526,7 +195530,7 @@ sub_806DADC: ; 806DADC
.align 2, 0
.pool
@0806DB78:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
@@ -195537,7 +195541,7 @@ sub_806DADC: ; 806DADC
.align 2, 0
.pool
@0806DB8C:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
@@ -195548,7 +195552,7 @@ sub_806DADC: ; 806DADC
.align 2, 0
.pool
@0806DBA0:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
@@ -195559,7 +195563,7 @@ sub_806DADC: ; 806DADC
.align 2, 0
.pool
@0806DBB4:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
@@ -196085,7 +196089,7 @@ sub_806DF74: ; 806DF74
bl pokemon_getattr
str r0, [sp, 0x4]
ldr r6, =gExperienceTables
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r1, r4, 3
subs r1, r4
lsls r1, 2
@@ -197180,7 +197184,7 @@ sub_806E804: ; 806E804
sub_806E840: ; 806E840
lsls r0, 16
lsrs r0, 16
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -197542,12 +197546,12 @@ sub_806EA68: ; 806EA68
lsls r2, r4, 3
subs r2, r4
lsls r2, 2
- ldr r1, =gUnknown_083203DA
+ ldr r1, =gBaseStats + 0xe ; item 2 offset
b @0806EB6C
.align 2, 0
.pool
@0806EB2C:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
mov r12, r0
lsls r0, r4, 3
subs r1, r0, r4
@@ -197577,7 +197581,7 @@ sub_806EA68: ; 806EA68
@0806EB66:
subs r2, r4
lsls r2, 2
- ldr r1, =gUnknown_083203D8
+ ldr r1, =gBaseStats + 0xc ; item 1 offset
@0806EB6C:
adds r2, r1
@0806EB6E:
@@ -197590,7 +197594,7 @@ sub_806EA68: ; 806EA68
ldr r0, =0x02024744
subs r2, r4
lsls r2, 2
- ldr r1, =gUnknown_083203DA
+ ldr r1, =gBaseStats + 0xe ; item 2 offset
adds r2, r1
movs r1, 0xC
bl pokemon_setattr
@@ -201595,7 +201599,7 @@ sub_8070954: ; 8070954
lsls r2, r5, 3
subs r2, r5
lsls r2, 2
- ldr r0, =gUnknown_083203DD
+ ldr r0, =gBaseStats + 0x11 ; egg cycles offset
adds r2, r0
adds r0, r7, 0
movs r1, 0x20
@@ -201684,7 +201688,7 @@ sub_8070A0C: ; 8070A0C
lsls r2, r5, 3
subs r2, r5
lsls r2, 2
- ldr r0, =gUnknown_083203DD
+ ldr r0, =gBaseStats + 0x11 ; egg cycles offset
adds r2, r0
adds r0, r6, 0
movs r1, 0x20
@@ -202075,7 +202079,7 @@ daycare_relationship_score: ; 8070D4C
adds r2, 0x14
str r2, [sp, 0x24]
subs r0, 0x6
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
mov r10, r1
ldr r5, [sp, 0x20]
mov r8, r0
@@ -209349,7 +209353,7 @@ healthbar_draw_field_maybe: ; 8074860
ldr r0, =gExperienceTables
mov r12, r0
lsls r1, r4, 2
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
@@ -220980,7 +220984,7 @@ sub_807A7E0: ; 807A7E0
movs r0, 0x2
b @0807A8C0
@0807A84E:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r7, 3
subs r1, r7
lsls r1, 2
@@ -340734,7 +340738,7 @@ sub_80B4E68: ; 80B4E68
lsrs r7, r1, 24
bl zero_enemy_party_data
movs r2, 0x1
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r6, 3
subs r0, r6
lsls r0, 2
@@ -342157,7 +342161,7 @@ sub_80B5990: ; 80B5990
movs r3, 0
cmp r4, r2
bcs @080B5A12
- ldr r6, =gUnknown_083203CC
+ ldr r6, =gBaseStats
mov r10, r6
@080B59DE:
lsls r0, r3, 2
@@ -364312,7 +364316,7 @@ sub_80C0F30: ; 80C0F30
cmp r6, r0
bcs @080C10A2
adds r7, r1, 0
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
mov r8, r0
@080C105A:
ldr r0, [r7]
@@ -364399,7 +364403,7 @@ sub_80C0F30: ; 80C0F30
bl NationalPokedexNumToSpecies
lsls r0, 16
lsrs r2, r0, 16
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
@@ -364462,7 +364466,7 @@ sub_80C0F30: ; 80C0F30
bl NationalPokedexNumToSpecies
lsls r0, 16
lsrs r2, r0, 16
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
@@ -422592,7 +422596,7 @@ sub_80DE864: ; 80DE864
beq @080DE920
b @080DE9A2
@080DE8FA:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r6, 3
subs r1, r6
lsls r1, 2
@@ -589463,7 +589467,7 @@ tai2F_unk: ; 8132400
.align 2, 0
.pool
@08132480:
- ldr r6, =gUnknown_083203CC
+ ldr r6, =gBaseStats
ldrh r0, [r4]
lsls r1, r0, 3
subs r1, r0
@@ -589598,7 +589602,7 @@ tai60_unk: ; 813251C
.align 2, 0
.pool
@08132588:
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
ldrh r1, [r4]
lsls r0, r1, 3
subs r0, r1
@@ -602779,7 +602783,7 @@ sub_81390B4: ; 81390B4
sub_81390E0: ; 81390E0
push {r4-r6,lr}
movs r5, 0
- ldr r6, =gUnknown_083203CC
+ ldr r6, =gBaseStats
@081390E6:
movs r0, 0x64
adds r1, r5, 0
@@ -691171,7 +691175,7 @@ sub_8166188: ; 8166188
bl sub_8165C40
lsls r0, 24
movs r5, 0
- ldr r7, =gUnknown_083203CC
+ ldr r7, =gBaseStats
lsrs r0, 22
ldr r1, =gExperienceTables
adds r6, r0, r1
@@ -770332,7 +770336,7 @@ sub_818F02C: ; 818F02C
movs r3, 0
mov r10, r3
ldr r6, =gUnknown_0832A328
- ldr r5, =gUnknown_083203CC
+ ldr r5, =gBaseStats
@0818F38A:
ldr r0, =0x03005d90
ldr r0, [r0]
@@ -770532,7 +770536,7 @@ sub_818F02C: ; 818F02C
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
- ldr r3, =gUnknown_083203CC
+ ldr r3, =gBaseStats
adds r1, r3
ldrb r0, [r1, 0x6]
lsls r0, 2
@@ -770825,7 +770829,7 @@ sub_818F720: ; 818F720
mov r2, r10
subs r0, r2, r6
lsls r0, 2
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
adds r0, r1
ldrb r0, [r0]
lsls r0, 1
@@ -770849,7 +770853,7 @@ sub_818F720: ; 818F720
mov r2, r10
subs r0, r2, r6
lsls r0, 2
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
adds r4, r0, r1
ldrb r0, [r4, 0x1]
lsls r0, 1
@@ -771870,7 +771874,7 @@ sub_818FFC0: ; 818FFC0
.align 2, 0
.pool
@0818FFFC:
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
@@ -779551,7 +779555,7 @@ sub_8193ED0: ; 8193ED0
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
- ldr r5, =gUnknown_083203CC
+ ldr r5, =gBaseStats
adds r0, r5
ldrb r2, [r0, 0x17]
b @08194074
@@ -779561,7 +779565,7 @@ sub_8193ED0: ; 8193ED0
lsls r0, r1, 3
subs r0, r1
lsls r0, 2
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
adds r0, r2
ldrb r2, [r0, 0x16]
@08194074:
@@ -781616,7 +781620,7 @@ sub_8194F58: ; 8194F58
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
- ldr r3, =gUnknown_083203CC
+ ldr r3, =gBaseStats
adds r1, r3
ldrb r0, [r1, 0x6]
lsls r0, 2
@@ -782107,7 +782111,7 @@ sub_8195438: ; 8195438
lsls r0, 4
adds r0, r1
ldrh r2, [r0]
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
@@ -782216,7 +782220,7 @@ sub_8195438: ; 8195438
lsls r0, 4
adds r0, r1
ldrh r2, [r0]
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
@@ -816237,7 +816241,7 @@ sub_81A6A08: ; 81A6A08
mov r8, r0
ldr r0, =0x0203bc8c
ldr r6, [r0]
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
mov r12, r1
@081A6A3C:
lsls r0, r4, 1
@@ -817818,7 +817822,7 @@ sub_81A767C: ; 81A767C
beq @081A76E0
cmp r1, 0x80
bne @081A771C
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
@@ -817837,7 +817841,7 @@ sub_81A767C: ; 81A767C
.align 2, 0
.pool
@081A76C4:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
@@ -817852,7 +817856,7 @@ sub_81A767C: ; 81A767C
.align 2, 0
.pool
@081A76E0:
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
lsls r0, r2, 3
subs r0, r2
lsls r0, 2
@@ -817871,7 +817875,7 @@ sub_81A767C: ; 81A767C
.align 2, 0
.pool
@081A7704:
- ldr r0, =gUnknown_083203CC
+ ldr r0, =gBaseStats
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
@@ -818557,7 +818561,7 @@ sub_81A7B90: ; 81A7B90
b @081A7CE2
@081A7C4A:
ldr r0, =0x02024744
- ldr r1, =gUnknown_083203CC
+ ldr r1, =gBaseStats
mov r8, r1
lsls r6, 2
mov r9, r6
@@ -822647,7 +822651,7 @@ sub_81A9C04: ; 81A9C04
adds r5, r4, r0
@081A9CF6:
ldr r4, =0x02024744
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
ldr r1, [sp, 0x10]
lsls r0, r1, 1
adds r0, r1
@@ -822685,7 +822689,7 @@ sub_81A9C04: ; 81A9C04
.align 2, 0
.pool
@081A9D4C:
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
ldr r1, [sp, 0x10]
lsls r0, r1, 1
adds r0, r1
@@ -856586,7 +856590,7 @@ sub_81BB29C: ; 81BB29C
ldr r3, =gExperienceTables
adds r4, 0x1
lsls r4, 2
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r1, r5, 3
subs r1, r5
lsls r1, 2
@@ -856746,7 +856750,7 @@ sub_81BB414: ; 81BB414
adds r3, r0, 0
ldr r6, =gExperienceTables
lsls r1, r4, 2
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r0, r5, 3
subs r0, r5
lsls r0, 2
@@ -856865,7 +856869,7 @@ sub_81BB4E4: ; 81BB4E4
ldr r3, =gExperienceTables
adds r4, 0x1
lsls r4, 2
- ldr r2, =gUnknown_083203CC
+ ldr r2, =gBaseStats
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -869613,7 +869617,7 @@ sub_81C22CC: ; 81C22CC
adds r2, r1, 0
adds r1, r2, 0x1
lsls r1, 2
- ldr r4, =gUnknown_083203CC
+ ldr r4, =gBaseStats
ldrh r3, [r6]
lsls r0, r3, 3
subs r0, r3
@@ -872192,7 +872196,7 @@ sub_81C38C0: ; 81C38C0
adds r1, r0, 0
adds r1, 0x1
lsls r1, 2
- ldr r3, =gUnknown_083203CC
+ ldr r3, =gBaseStats
ldrh r2, [r5]
lsls r0, r2, 3
subs r0, r2
@@ -873449,7 +873453,7 @@ sub_81C43A0: ; 81C43A0
.align 2, 0
.pool
@081C43CC:
- ldr r4, =gUnknown_083203CC
+ ldr r4, =gBaseStats
ldrh r1, [r5]
lsls r0, r1, 3
subs r0, r1
@@ -910355,7 +910359,7 @@ sub_81D642C: ; 81D642C
mov r1, sp
ldrb r2, [r1]
lsls r2, 2
- ldr r3, =gUnknown_083203CC
+ ldr r3, =gBaseStats
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
diff --git a/asm/macros.s b/asm/macros.s
index c97c6f177..f2ef81a4f 100644
--- a/asm/macros.s
+++ b/asm/macros.s
@@ -76,3 +76,16 @@
.2byte \trainer_offset
.2byte 0 ; padding
.endm
+
+ .macro base_stats hp, attack, defense, speed, sp_attack, sp_defense
+ .byte \hp
+ .byte \attack
+ .byte \defense
+ .byte \speed
+ .byte \sp_attack
+ .byte \sp_defense
+ .endm
+
+ .macro ev_yield hp, attack, defense, speed, sp_attack, sp_defense
+ .2byte (\sp_defense << 10) | (\sp_attack << 8) | (\speed << 6) | (\defense << 4) | (\attack << 2) | \hp
+ .endm
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 07:52:33 +0000