diff options
Diffstat (limited to 'engine/menu/diploma.asm')
| -rwxr-xr-x | engine/menu/diploma.asm | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 3b9413a2..023c6177 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -3,19 +3,18 @@ DisplayDiploma: ; 566e2 (15:66e2) call GBPalWhiteOutWithDelay3 call ClearScreen xor a - ld [$cfcb], a - ld hl, $d730 + ld [wcfcb], a + ld hl, wd730 set 6, [hl] call DisableLCD ld hl, CircleTile ; $7d88 - ld de, $9700 + ld de, vChars2 + $700 ld bc, $0010 ld a, BANK(CircleTile) call FarCopyData2 ld hl, wTileMap ld bc, $1012 - ld a, $27 - call Predef + predef Func_5ab0 ld hl, DiplomaTextPointersAndCoords ; $6784 ld c, $5 .asm_56715 @@ -34,12 +33,11 @@ DisplayDiploma: ; 566e2 (15:66e2) pop bc dec c jr nz, .asm_56715 ; 0x56725 $ee - FuncCoord 10, 4 ; $c3fa - ld hl, Coord - ld de, W_PLAYERNAME + hlCoord 10, 4 + ld de, wPlayerName call PlaceString callba Func_44dd - ld hl, $c301 + ld hl, wOAMBuffer + $01 ld bc, $8028 .asm_5673e ld a, [hl] @@ -60,7 +58,7 @@ DisplayDiploma: ; 566e2 (15:66e2) ld a, $90 ld [$ff48], a call WaitForTextScrollButtonPress - ld hl, $d730 + ld hl, wd730 res 6, [hl] call GBPalWhiteOutWithDelay3 call Func_3dbe @@ -68,7 +66,7 @@ DisplayDiploma: ; 566e2 (15:66e2) jp GBPalNormal Func_56777: ; 56777 (15:6777) - ld hl, W_PLAYERNAME + ld hl, wPlayerName ld bc, $ff00 .asm_5677d ld a, [hli] @@ -79,15 +77,15 @@ Func_56777: ; 56777 (15:6777) DiplomaTextPointersAndCoords: ; 56784 (15:6784) dw DiplomaText - dw $c3cd + dw wTileMap + $2d dw DiplomaPlayer - dw $c3f3 + dw wTileMap + $53 dw DiplomaEmptyText - dw $c3ff + dw wTileMap + $5f dw DiplomaCongrats - dw $c41a + dw wTileMap + $7a dw DiplomaGameFreak - dw $c4e9 + dw wTileMap + $149 DiplomaText: db $70,"Diploma",$70,"@" |