diff options
Diffstat (limited to 'asm/emerald.s')
| -rw-r--r-- | asm/emerald.s | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index 1232c5b67..bd3578b01 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -155907,7 +155907,7 @@ sub_80591B8: ; 80591B8 movs r1, 0x19 bl pokemon_getattr str r0, [sp, 0x4] - ldr r3, =gUnknown_0831F72C + ldr r3, =gExperienceTables adds r4, 0x1 lsls r4, 2 ldr r2, =gUnknown_083203CC @@ -156068,7 +156068,7 @@ sub_8059330: ; 8059330 movs r1, 0x19 bl pokemon_getattr adds r3, r0, 0 - ldr r6, =gUnknown_0831F72C + ldr r6, =gExperienceTables lsls r1, r4, 2 ldr r2, =gUnknown_083203CC lsls r0, r5, 3 @@ -156186,7 +156186,7 @@ sub_8059400: ; 8059400 bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r3, =gUnknown_0831F72C + ldr r3, =gExperienceTables adds r4, 0x1 lsls r4, 2 ldr r2, =gUnknown_083203CC @@ -183584,7 +183584,7 @@ create_pokemon: ; 8067BBC mov r3, sp ldrb r0, [r3, 0x10] lsls r0, 2 - ldr r1, =gUnknown_0831F72C + ldr r1, =gExperienceTables adds r0, r1 adds r2, r0 adds r0, r7, 0 @@ -185932,7 +185932,7 @@ level_by_exp: ; 8069054 bl pokemon_getattr adds r3, r0, 0 movs r2, 0x1 - ldr r6, =gUnknown_0831F72C + ldr r6, =gExperienceTables ldr r1, =gUnknown_083203CC lsls r0, r4, 3 subs r0, r4 @@ -185987,7 +185987,7 @@ sub_80690C0: ; 80690C0 bl pokemon_getattr_encrypted adds r3, r0, 0 movs r2, 0x1 - ldr r6, =gUnknown_0831F72C + ldr r6, =gExperienceTables ldr r1, =gUnknown_083203CC lsls r0, r4, 3 subs r0, r4 @@ -192225,7 +192225,7 @@ sub_806BD28: ; 806BD28 bl pokemon_getattr cmp r0, 0x64 beq @0806C1CA - ldr r5, =gUnknown_0831F72C + ldr r5, =gExperienceTables mov r0, r8 movs r1, 0x38 movs r2, 0 @@ -196084,7 +196084,7 @@ sub_806DF74: ; 806DF74 movs r2, 0 bl pokemon_getattr str r0, [sp, 0x4] - ldr r6, =gUnknown_0831F72C + ldr r6, =gExperienceTables ldr r2, =gUnknown_083203CC lsls r1, r4, 3 subs r1, r4 @@ -209346,7 +209346,7 @@ healthbar_draw_field_maybe: ; 8074860 movs r1, 0x19 bl pokemon_getattr adds r3, r0, 0 - ldr r0, =gUnknown_0831F72C + ldr r0, =gExperienceTables mov r12, r0 lsls r1, r4, 2 ldr r2, =gUnknown_083203CC @@ -691173,7 +691173,7 @@ sub_8166188: ; 8166188 movs r5, 0 ldr r7, =gUnknown_083203CC lsrs r0, 22 - ldr r1, =gUnknown_0831F72C + ldr r1, =gExperienceTables adds r6, r0, r1 @081661A6: movs r0, 0x64 @@ -818579,7 +818579,7 @@ sub_81A7B90: ; 81A7B90 lsls r1, 1 muls r2, r1 lsls r1, r7, 2 - ldr r3, =gUnknown_0831F72C + ldr r3, =gExperienceTables adds r1, r3 adds r2, r1 movs r1, 0x19 @@ -822664,7 +822664,7 @@ sub_81A9C04: ; 81A9C04 adds r2, r1, 0 muls r2, r0 lsls r0, r5, 2 - ldr r1, =gUnknown_0831F72C + ldr r1, =gExperienceTables adds r0, r1 adds r2, r0 adds r0, r4, 0 @@ -856583,7 +856583,7 @@ sub_81BB29C: ; 81BB29C movs r1, 0x19 bl pokemon_getattr str r0, [sp, 0x4] - ldr r3, =gUnknown_0831F72C + ldr r3, =gExperienceTables adds r4, 0x1 lsls r4, 2 ldr r2, =gUnknown_083203CC @@ -856744,7 +856744,7 @@ sub_81BB414: ; 81BB414 movs r1, 0x19 bl pokemon_getattr adds r3, r0, 0 - ldr r6, =gUnknown_0831F72C + ldr r6, =gExperienceTables lsls r1, r4, 2 ldr r2, =gUnknown_083203CC lsls r0, r5, 3 @@ -856862,7 +856862,7 @@ sub_81BB4E4: ; 81BB4E4 bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r3, =gUnknown_0831F72C + ldr r3, =gExperienceTables adds r4, 0x1 lsls r4, 2 ldr r2, =gUnknown_083203CC @@ -869609,7 +869609,7 @@ sub_81C22CC: ; 81C22CC mov r8, r0 cmp r1, 0x63 bhi @081C2340 - ldr r5, =gUnknown_0831F72C + ldr r5, =gExperienceTables adds r2, r1, 0 adds r1, r2, 0x1 lsls r1, 2 @@ -872188,7 +872188,7 @@ sub_81C38C0: ; 81C38C0 ldrb r0, [r5, 0x5] cmp r0, 0x63 bhi @081C3948 - ldr r4, =gUnknown_0831F72C + ldr r4, =gExperienceTables adds r1, r0, 0 adds r1, 0x1 lsls r1, 2 @@ -910351,7 +910351,7 @@ sub_81D642C: ; 81D642C bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r5, =gUnknown_0831F72C + ldr r5, =gExperienceTables mov r1, sp ldrb r2, [r1] lsls r2, 2 |