diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2020-12-31 18:30:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-31 18:30:16 -0600 |
| commit | 87cd9885a9f8b38a76ab6add4a634e2a8a4837ee (patch) | |
| tree | 9e7e3352cc63bf5665d192c8ebbdfd6032641f74 /asm/pokemon.s | |
| parent | 01ec8edb40c0662863e2fd14395a057be852e060 (diff) | |
Friend Area Decomp Work (#15)
split out and work on friend area stuff
Diffstat (limited to 'asm/pokemon.s')
| -rw-r--r-- | asm/pokemon.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/pokemon.s b/asm/pokemon.s index 587e47c..2030fcf 100644 --- a/asm/pokemon.s +++ b/asm/pokemon.s @@ -170,7 +170,7 @@ _0808CF36: bl sub_80980B4 b _0808CFB8 .align 2, 0 -_0808CF58: .4byte gUnknown_203B468 +_0808CF58: .4byte gFriendAreas _0808CF5C: movs r2, 0 lsls r4, r7, 3 @@ -522,7 +522,7 @@ sub_808D1DC: b _0808D268 .align 2, 0 _0808D204: .4byte gMonsterParameters -_0808D208: .4byte gUnknown_203B468 +_0808D208: .4byte gFriendAreas _0808D20C: ldr r0, [r7] adds r0, r5 @@ -603,7 +603,7 @@ sub_808D278: b _0808D2DA .align 2, 0 _0808D29C: .4byte gMonsterParameters -_0808D2A0: .4byte gUnknown_203B468 +_0808D2A0: .4byte gFriendAreas _0808D2A4: ldr r0, [r7] adds r0, r5 |