diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-11-26 23:00:37 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-26 23:00:37 -0600 |
| commit | 0793afb9e8eeb508375344ca683f97bbc797771a (patch) | |
| tree | 1d0c1c802eea1fc5d29e86908b2de3b018d86e9b /asm/contest.s | |
| parent | 4e7e4cf467e6243994d19971d7cbee33c2f7bd25 (diff) | |
| parent | 10704a135e3738b49d9175531d32bfde877f3b6b (diff) | |
Merge pull request #478 from huderlem/pokemon_summary_screen
Decompile pokemon_summary_screen
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 ad3b4fba9..2d24f5bb0 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -7157,7 +7157,7 @@ _080AEC34: ldr r6, _080AEC78 @ =gContestMoves lsls r5, r4, 3 ldr r7, _080AEC80 @ =gContestEffects - ldr r0, _080AEC84 @ =gUnknown_083CADD4 + ldr r0, _080AEC84 @ =gContestEffectStrings mov r9, r0 ldr r4, _080AEC88 @ =0x0600c816 ldr r3, _080AEC8C @ =0x0600c7d6 @@ -7189,7 +7189,7 @@ _080AEC74: .4byte gUnknown_03004210 _080AEC78: .4byte gContestMoves _080AEC7C: .4byte 0x00004040 _080AEC80: .4byte gContestEffects -_080AEC84: .4byte gUnknown_083CADD4 +_080AEC84: .4byte gContestEffectStrings _080AEC88: .4byte 0x0600c816 _080AEC8C: .4byte 0x0600c7d6 _080AEC90: |