diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-15 22:20:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 22:20:16 -0400 |
| commit | dda361afb7e2abafc15a498968580be6d1a83cfe (patch) | |
| tree | 46e7d19c2aec0e65ab446c7916e5d8aeb38bfe48 /asm/contest.s | |
| parent | c8213423cefc83310bc62ca8bcc17d7b6b42e442 (diff) | |
| parent | 0a779312c8a5911620ef43eaefbecdbac9fa7b33 (diff) | |
Merge pull request #326 from ProjectRevoTPP/master
move player_pc data to C file and restructure/label the file
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/contest.s b/asm/contest.s index 1f92f6fad..00c4013a3 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -5585,7 +5585,7 @@ sub_80ADFD8: @ 80ADFD8 bne _080ADFFC adds r0, r2, 0 bl DestroyTask - ldr r0, _080AE004 @ =gUnknown_0300485C + ldr r0, _080AE004 @ =gFieldCallback ldr r1, _080AE008 @ =sub_80AE010 str r1, [r0] ldr r0, _080AE00C @ =c2_exit_to_overworld_2_switch @@ -5595,7 +5595,7 @@ _080ADFFC: bx r0 .align 2, 0 _080AE000: .4byte gPaletteFade -_080AE004: .4byte gUnknown_0300485C +_080AE004: .4byte gFieldCallback _080AE008: .4byte sub_80AE010 _080AE00C: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80ADFD8 |