diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-04-11 13:21:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 13:21:26 -0400 |
| commit | c17af4853c5c5854170702292ebd573bc14b5b0e (patch) | |
| tree | 4b10ee7f38e45cf1c0f74eafb1274afe70405155 /asm/pokemon_storage_system.s | |
| parent | 7f920b887f9a060524347b4cc3a5e3f3abdd3b03 (diff) | |
| parent | 18b20721d91e811595491d70e9512ace654e4f5a (diff) | |
Merge pull request #46 from PikalaxALT/oak_speech
Oak speech
Diffstat (limited to 'asm/pokemon_storage_system.s')
| -rw-r--r-- | asm/pokemon_storage_system.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index c40afefde..d656ad188 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -10686,7 +10686,7 @@ _08090EC6: ldr r0, [r4] ldr r0, [r0] mov r8, r0 - ldr r5, _08090FB8 @ =gUnknown_825E074 + ldr r5, _08090FB8 @ =gSineTable mov r0, r9 adds r1, r3, r0 ldrb r0, [r1] @@ -10803,7 +10803,7 @@ _08090FA0: _08090FAC: .4byte 0x00000c59 _08090FB0: .4byte 0x00000afc _08090FB4: .4byte 0x00000a68 -_08090FB8: .4byte gUnknown_825E074 +_08090FB8: .4byte gSineTable _08090FBC: .4byte sub_80911B0 _08090FC0: .4byte SpriteCallbackDummy thumb_func_end sub_8090E74 @@ -22569,7 +22569,7 @@ _08096AA2: lsls r0, 16 asrs r0, 20 strh r0, [r4, 0x22] - ldr r1, _08096B08 @ =gUnknown_825E074 + ldr r1, _08096B08 @ =gSineTable movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 4 @@ -22605,7 +22605,7 @@ _08096B00: pop {r0} bx r0 .align 2, 0 -_08096B08: .4byte gUnknown_825E074 +_08096B08: .4byte gSineTable _08096B0C: .4byte sub_80969BC thumb_func_end sub_8096A74 @@ -22650,7 +22650,7 @@ _08096B3E: lsls r1, 16 asrs r1, 20 strh r1, [r4, 0x22] - ldr r1, _08096BA4 @ =gUnknown_825E074 + ldr r1, _08096BA4 @ =gSineTable movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 4 @@ -22687,7 +22687,7 @@ _08096B9E: pop {r0} bx r0 .align 2, 0 -_08096BA4: .4byte gUnknown_825E074 +_08096BA4: .4byte gSineTable _08096BA8: .4byte SpriteCallbackDummy thumb_func_end sub_8096B10 |