diff options
Diffstat (limited to 'asm/emerald.s')
| -rw-r--r-- | asm/emerald.s | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index 9193aa8c5..83cadc241 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -168965,13 +168965,13 @@ sub_8066748: ; 8066748 cmp r0, 0 beq @080668BC @080668AA: - ldr r0, =gUnknown_0831F578 + ldr r0, =gTrainerPicIndices adds r0, 0x4F ldrb r0, [r0] b @0806694C .pool @080668BC: - ldr r0, =gUnknown_0831F578 + ldr r0, =gTrainerPicIndices adds r0, 0x4E ldrb r0, [r0] b @0806694C @@ -169015,13 +169015,13 @@ sub_8066748: ; 8066748 cmp r0, 0 beq @08066924 @08066916: - ldr r0, =gUnknown_0831F578 + ldr r0, =gTrainerPicIndices adds r0, 0x51 ldrb r0, [r0] b @0806694C .pool @08066924: - ldr r0, =gUnknown_0831F578 + ldr r0, =gTrainerPicIndices adds r0, 0x50 ldrb r0, [r0] b @0806694C @@ -178777,7 +178777,7 @@ sub_806B830: ; 806B830 adds r0, r1 adds r0, r5 ldrb r0, [r0] - ldr r1, =gUnknown_0831F578 + ldr r1, =gTrainerPicIndices adds r0, r1 ldrb r0, [r0] pop {r4,r5} @@ -185710,7 +185710,7 @@ sub_806EF84: ; 806EF84 sub_806EFF0: ; 806EFF0 lsls r0, 16 lsrs r0, 16 - ldr r1, =gUnknown_0831F578 + ldr r1, =gTrainerPicIndices adds r0, r1 ldrb r0, [r0] bx lr @@ -658297,7 +658297,7 @@ sub_8162AA0: ; 8162AA0 lsls r0, 1 cmp r4, r0 bne @08162AD0 - ldr r1, =gUnknown_0831F578 + ldr r1, =gTrainerPicIndices ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000bed @@ -658319,7 +658319,7 @@ sub_8162AA0: ; 8162AA0 ldr r0, =0x0000012b cmp r4, r0 bhi @08162B08 - ldr r2, =gUnknown_0831F578 + ldr r2, =gTrainerPicIndices ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 @@ -658340,7 +658340,7 @@ sub_8162AA0: ; 8162AA0 ands r0, r1 cmp r0, 0 beq @08162B38 - ldr r4, =gUnknown_0831F578 + ldr r4, =gTrainerPicIndices bl sub_818649C lsls r0, 24 lsrs r0, 24 @@ -658348,7 +658348,7 @@ sub_8162AA0: ; 8162AA0 b @08162BC8 .pool @08162B38: - ldr r3, =gUnknown_0831F578 + ldr r3, =gTrainerPicIndices ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -658370,7 +658370,7 @@ sub_8162AA0: ; 8162AA0 ands r0, r1 cmp r0, 0 bne @08162BB0 - ldr r4, =gUnknown_0831F578 + ldr r4, =gTrainerPicIndices ldr r3, =gUnknown_08610970 ldr r0, =0x03005d90 ldr r1, [r0] @@ -658393,7 +658393,7 @@ sub_8162AA0: ; 8162AA0 b @08162BC8 .pool @08162BB0: - ldr r5, =gUnknown_0831F578 + ldr r5, =gTrainerPicIndices ldr r4, =gUnknown_08610970 bl sub_81864A8 lsls r0, 24 @@ -662802,7 +662802,7 @@ sub_816515C: ; 816515C thumb_func_start sub_8165244 sub_8165244: ; 8165244 - ldr r1, =gUnknown_0831F578 + ldr r1, =gTrainerPicIndices ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000bed @@ -738952,13 +738952,13 @@ sub_818D97C: ; 818D97C bne @0818D9A2 cmp r0, 0 beq @0818D99C - ldr r0, =gUnknown_0831F578 + ldr r0, =gTrainerPicIndices adds r0, 0x3F ldrb r0, [r0] b @0818D9A2 .pool @0818D99C: - ldr r0, =gUnknown_0831F578 + ldr r0, =gTrainerPicIndices adds r0, 0x3C ldrb r0, [r0] @0818D9A2: @@ -854836,7 +854836,7 @@ sub_81CAF04: ; 81CAF04 adds r0, r5, 0 bl sub_81D1BD0 adds r4, r0, 0 - ldr r0, =gUnknown_0831F578 + ldr r0, =gTrainerPicIndices adds r0, r4, r0 ldrb r0, [r0] b @081CAF6C @@ -875893,7 +875893,7 @@ sub_81D5588: ; 81D5588 adds r3, r0 ldrb r4, [r3, 0x1B] bl sub_81D5710 - ldr r0, =gUnknown_0831F578 + ldr r0, =gTrainerPicIndices adds r4, r0 ldrb r0, [r4] pop {r4} |