diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
| commit | e25a7148d0a78549de4f33fa72d519dcaf660e97 (patch) | |
| tree | 5fcc95934c26b1fc86345b10f2a5c80fa740d083 /engine/menu/diploma.asm | |
| parent | b509b48a7f5a9a80225b9c030d7334b26b521c62 (diff) | |
| parent | 5d3b958763d48e6049e13b068d2f2d5382cdcad2 (diff) | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/town_map.asm
Diffstat (limited to 'engine/menu/diploma.asm')
| -rwxr-xr-x | engine/menu/diploma.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index a1a0e526..a90abdb5 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -56,7 +56,7 @@ DisplayDiploma: ; 566e2 (15:66e2) call Delay3 call GBPalNormal ld a, $90 - ld [$ff48], a + ld [rOBP0], a call WaitForTextScrollButtonPress ld hl, wd730 res 6, [hl] |