diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /asm/field_effect.s | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'asm/field_effect.s')
| -rw-r--r-- | asm/field_effect.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_effect.s b/asm/field_effect.s index 4bcba42ce..66d89ef09 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -1620,7 +1620,7 @@ task00_8084310: @ 8086604 cmp r0, 0 beq _08086666 ldr r1, _08086670 @ =gUnknown_0202FF84 - ldr r0, _08086674 @ =gUnknown_03005CE0 + ldr r0, _08086674 @ =gLastFieldPokeMenuOpened ldrb r0, [r0] str r0, [r1] cmp r0, 0x5 @@ -1654,7 +1654,7 @@ _08086666: .align 2, 0 _0808666C: .4byte gTasks _08086670: .4byte gUnknown_0202FF84 -_08086674: .4byte gUnknown_03005CE0 +_08086674: .4byte gLastFieldPokeMenuOpened _08086678: .4byte CB2_LoadMap _0808667C: .4byte gUnknown_0300485C _08086680: .4byte mapldr_08084390 |