summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/emerald.s94
1 files changed, 47 insertions, 47 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index 212809b24..a54c4f4d2 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -89975,7 +89975,7 @@ sub_8035770: ; 8035770
ands r1, r0
cmp r1, 0
beq @080358C4
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bca
ldrh r1, [r0]
lsls r0, r1, 2
@@ -91121,7 +91121,7 @@ sub_8036154: ; 8036154
ands r1, r0
cmp r1, 0
beq @08036350
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bca
ldrh r1, [r0]
lsls r0, r1, 2
@@ -91267,7 +91267,7 @@ sub_80363C4: ; 80363C4
ands r1, r0
cmp r1, 0
beq @0803648C
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bca
ldrh r1, [r0]
lsls r0, r1, 2
@@ -91389,7 +91389,7 @@ sub_80363C4: ; 80363C4
ands r1, r0
cmp r1, 0
beq @08036598
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bca
ldrh r1, [r0]
lsls r0, r1, 2
@@ -91512,7 +91512,7 @@ sub_80363C4: ; 80363C4
ands r1, r0
cmp r1, 0
beq @080366AC
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bca
ldrh r1, [r0]
lsls r0, r1, 2
@@ -95122,7 +95122,7 @@ sub_80385E8: ; 80385E8
ands r0, r1
cmp r0, 0
beq @08038668
- ldr r0, =gUnknown_08310030
+ ldr r0, =gTrainers
ldr r2, [sp, 0x20]
ldr r3, [sp, 0x14]
adds r1, r2, r3
@@ -95142,7 +95142,7 @@ sub_80385E8: ; 80385E8
.align 2, 0
.pool
@08038668:
- ldr r1, =gUnknown_08310030
+ ldr r1, =gTrainers
ldr r2, [sp, 0x20]
ldr r3, [sp, 0x14]
adds r0, r2, r3
@@ -95569,7 +95569,7 @@ sub_80385E8: ; 80385E8
@080389AC:
ldr r4, [sp, 0x24]
str r4, [sp, 0x18]
- ldr r4, =gUnknown_08310030
+ ldr r4, =gTrainers
ldr r0, [sp, 0x18]
@080389B4:
ldr r1, [sp, 0x1C]
@@ -95578,7 +95578,7 @@ sub_80385E8: ; 80385E8
b @08038688
@080389BC:
ldr r2, =0x02022fec
- ldr r1, =gUnknown_08310030
+ ldr r1, =gTrainers
ldr r3, [sp, 0x20]
ldr r4, [sp, 0x14]
adds r0, r3, r4
@@ -95589,7 +95589,7 @@ sub_80385E8: ; 80385E8
orrs r0, r1
str r0, [r2]
@080389D2:
- ldr r0, =gUnknown_08310030
+ ldr r0, =gTrainers
ldr r2, [sp, 0x20]
ldr r3, [sp, 0x14]
adds r1, r2, r3
@@ -104847,7 +104847,7 @@ sub_803D8C0: ; 803D8C0
ldr r1, =0x02024214
ldr r0, =gUnknown_082DA92D
str r0, [r1]
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bca
ldrh r1, [r0]
lsls r0, r1, 2
@@ -135662,7 +135662,7 @@ sub_804E598: ; 804E598
.align 2, 0
.pool
@0804E5D8:
- ldr r0, =gUnknown_08310030
+ ldr r0, =gTrainers
lsls r2, r6, 2
adds r1, r2, r6
lsls r1, 3
@@ -171498,14 +171498,14 @@ sub_8061690: ; 8061690
ldrb r0, [r0]
cmp r0, 0x1
beq @08061788
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bcc
ldrh r1, [r0]
b @0806178C
.align 2, 0
.pool
@08061788:
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldrh r1, [r3]
@0806178C:
lsls r0, r1, 2
@@ -171754,14 +171754,14 @@ sub_80618D8: ; 80618D8
ldrb r0, [r0]
cmp r0, 0x1
beq @080619D0
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bcc
ldrh r1, [r0]
b @080619D4
.align 2, 0
.pool
@080619D0:
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldrh r1, [r3]
@080619D4:
lsls r0, r1, 2
@@ -195159,7 +195159,7 @@ sub_806D888: ; 806D888
lsls r0, 24
cmp r0, 0
bne @0806D8C4
- ldr r1, =gUnknown_08310030
+ ldr r1, =gTrainers
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -195339,7 +195339,7 @@ happiness_algorithm: ; 806D934
ands r0, r1
cmp r0, 0
beq @0806DAC2
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bca
ldrh r1, [r0]
lsls r0, r1, 2
@@ -196761,7 +196761,7 @@ song_id_for_battle: ; 806E42C
movs r0, 0xA
b @0806E4B2
@0806E4A2:
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bca
ldrh r1, [r0]
lsls r0, r1, 2
@@ -196883,7 +196883,7 @@ song_id_for_battle: ; 806E42C
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
- ldr r1, =gUnknown_08310034
+ ldr r1, =gTrainers + 0x4 ; name offset
adds r0, r1
ldr r1, =gUnknown_085CCB98
bl sub_8008C44
@@ -197664,7 +197664,7 @@ sub_806EBF8: ; 806EBF8
ldr r0, =0x00000c03
cmp r1, r0
bne @0806EC28
- ldr r0, =gUnknown_08317DD4
+ ldr r0, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name
b @0806EC64
.align 2, 0
.pool
@@ -198252,7 +198252,7 @@ sub_806F07C: ; 806F07C
bls @0806F08A
movs r2, 0
@0806F08A:
- ldr r1, =gUnknown_08310030
+ ldr r1, =gTrainers
lsls r0, r2, 2
adds r0, r2
lsls r0, 3
@@ -198281,7 +198281,7 @@ sub_806F0B0: ; 806F0B0
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
- ldr r1, =gUnknown_08310034
+ ldr r1, =gTrainers + 0x4 ; name offset
adds r0, r1
pop {r1}
bx r1
@@ -332583,7 +332583,7 @@ sub_80B0DE8: ; 80B0DE8
lsrs r0, 16
lsls r1, 24
lsrs r4, r1, 24
- ldr r5, =gUnknown_08310030
+ ldr r5, =gTrainers
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
@@ -332766,7 +332766,7 @@ sub_80B0F34: ; 80B0F34
lsls r0, 3
cmp r1, r0
beq @080B0F98
- ldr r1, =gUnknown_08310030
+ ldr r1, =gTrainers
ldrh r2, [r4]
lsls r0, r2, 2
adds r0, r2
@@ -585865,7 +585865,7 @@ sub_81308C8: ; 81308C8
bne @0813092E
movs r4, 0
ldr r6, =0x02038bca
- ldr r5, =gUnknown_08310040
+ ldr r5, =gTrainers + 0x10 ; items offset
@081308F6:
lsls r2, r4, 1
ldrh r1, [r6]
@@ -586127,7 +586127,7 @@ sub_8130950: ; 8130950
ldr r0, =0x020244a8
ldr r0, [r0]
ldr r4, [r0, 0x14]
- ldr r3, =gUnknown_08310030
+ ldr r3, =gTrainers
ldr r0, =0x02038bca
ldrh r0, [r0]
lsls r1, r0, 2
@@ -586152,7 +586152,7 @@ sub_8130950: ; 8130950
ldr r0, =0x020244a8
ldr r0, [r0]
ldr r3, [r0, 0x14]
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bca
ldrh r1, [r0]
lsls r0, r1, 2
@@ -644994,7 +644994,7 @@ sub_814E764: ; 814E764
bl sub_8165264
b @0814F59C
@0814F14E:
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldrh r1, [r3]
lsls r0, r1, 2
adds r0, r1
@@ -645094,7 +645094,7 @@ sub_814E764: ; 814E764
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
- ldr r0, =gUnknown_08310034
+ ldr r0, =gTrainers + 0x4 ; name offset
adds r4, r1, r0
b @0814F5C0
.align 2, 0
@@ -645393,7 +645393,7 @@ sub_814E764: ; 814E764
.align 2, 0
.pool
@0814F49C:
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r0, =0x02038bcc
ldrh r1, [r0]
lsls r0, r1, 2
@@ -645435,7 +645435,7 @@ sub_814E764: ; 814E764
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
- ldr r1, =gUnknown_08310034
+ ldr r1, =gTrainers + 0x4 ; name offset
adds r4, r0, r1
b @0814F5C0
.align 2, 0
@@ -684749,7 +684749,7 @@ sub_8162BD8: ; 8162BD8
ldr r0, =0x00000c03
cmp r4, r0
bne @08162C38
- ldr r0, =gUnknown_08310030
+ ldr r0, =gTrainers
ldr r1, =0x00007da1
@08162C26:
adds r0, r1
@@ -685011,7 +685011,7 @@ sub_8162E20: ; 8162E20
ldr r0, =0x00000c03
cmp r5, r0
bne @08162E88
- ldr r2, =gUnknown_08317DD4
+ ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name
@08162E70:
adds r0, r6, r4
adds r1, r4, r2
@@ -689574,7 +689574,7 @@ sub_8165404: ; 8165404
adds r4, r0
adds r0, r4, 0
movs r1, 0x7
- ldr r2, =gUnknown_08317DD4
+ ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name
bl pokemon_setattr
movs r0, 0
str r0, [sp, 0x44]
@@ -782486,7 +782486,7 @@ sub_8195898: ; 8195898
thumb_func_start sub_8195910
sub_8195910: ; 8195910
- ldr r0, =gUnknown_08310030
+ ldr r0, =gTrainers
ldr r1, =0x00007df3
adds r0, r1
ldrb r0, [r0]
@@ -782497,7 +782497,7 @@ sub_8195910: ; 8195910
thumb_func_start sub_8195924
sub_8195924: ; 8195924
- ldr r0, =gUnknown_08310030
+ ldr r0, =gTrainers
ldr r1, =0x00007df1
adds r0, r1
ldrb r0, [r0]
@@ -782511,7 +782511,7 @@ sub_8195938: ; 8195938
push {r4,lr}
adds r3, r0, 0
movs r2, 0
- ldr r4, =gUnknown_08317E24
+ ldr r4, =gTrainers + TRAINER_TUCKER * 0x28 + 0x4 ; Tucker's name
@08195940:
adds r0, r3, r2
adds r1, r2, r4
@@ -784681,7 +784681,7 @@ sub_8196A44: ; 8196A44
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
- ldr r0, =gUnknown_08310034
+ ldr r0, =gTrainers + 0x4 ; name offset
adds r1, r0
adds r0, r5, 0
bl gf_strcpy
@@ -784961,7 +784961,7 @@ sub_8196C70: ; 8196C70
bl sub_80B2250
lsls r0, 16
lsrs r0, 16
- ldr r5, =gUnknown_08310030
+ ldr r5, =gTrainers
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
@@ -812711,7 +812711,7 @@ sub_81A4CB0: ; 81A4CB0
lsls r0, 16
lsrs r0, 16
@081A4CDA:
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r1, =gUnknown_08611D30
lsls r0, 1
adds r0, r1
@@ -812749,7 +812749,7 @@ sub_81A4D00: ; 81A4D00
lsls r0, 16
lsrs r0, 16
@081A4D2A:
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r1, =gUnknown_08611D30
lsls r0, 1
adds r0, r1
@@ -812790,7 +812790,7 @@ sub_81A4D50: ; 81A4D50
@081A4D7A:
movs r3, 0
lsls r0, 1
- ldr r2, =gUnknown_08310030
+ ldr r2, =gTrainers
ldr r1, =gUnknown_08611D30
adds r0, r1
ldrh r1, [r0]
@@ -887040,7 +887040,7 @@ sub_81CAF04: ; 81CAF04
ldrh r0, [r1, 0x1E]
bl sub_81D15BC
adds r4, r0, 0
- ldr r1, =gUnknown_08310030
+ ldr r1, =gTrainers
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
@@ -887069,7 +887069,7 @@ sub_81CAF04: ; 81CAF04
adds r0, r4, 0
bl sub_81D15BC
adds r4, r0, 0
- ldr r0, =gUnknown_08310030
+ ldr r0, =gTrainers
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
@@ -887215,7 +887215,7 @@ sub_81CB050: ; 81CB050
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
- ldr r0, =gUnknown_08310030
+ ldr r0, =gTrainers
adds r1, r0
ldrb r2, [r1, 0x1]
movs r0, 0xD
@@ -901015,7 +901015,7 @@ sub_81D1B0C: ; 81D1B0C
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
- ldr r0, =gUnknown_08310030
+ ldr r0, =gTrainers
adds r1, r0
ldrb r2, [r1, 0x1]
movs r0, 0xD
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 22:22:42 +0000