diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-22 22:19:33 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-22 22:19:33 -0500 |
| commit | 30b37da3870217da1eaecca82bb77ca4343ada49 (patch) | |
| tree | 838dae239bf68174d3d3358738939aaabe287a31 /predef | |
| parent | d08199c79d8168368aeac0381427d533e09f073d (diff) | |
More stats screen shenanigans
Diffstat (limited to 'predef')
| -rw-r--r-- | predef/cgb.asm | 6 | ||||
| -rw-r--r-- | predef/sgb.asm | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm index c235816c0..ab96ba8d3 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -12,8 +12,8 @@ Predef_LoadSGBLayoutCGB: ; 8d59 jr nz, .not_ram ld a, [SGBPredef] .not_ram - cp SCGB_FC - jp z, Function96f3 + cp SCGB_PARTY_MENU_HP_PALS + jp z, CGB_ApplyPartyMenuHPPals call Function9673 ld l, a ld h, 0 @@ -277,7 +277,7 @@ Palette8f52: ; 8f52 RGB 00, 00, 00 ; 8f6a -Unknown_8f6a: ; 8f6a +StatsScreenPals: ; 8f6a RGB 31, 19, 31 RGB 21, 31, 14 diff --git a/predef/sgb.asm b/predef/sgb.asm index aad463052..2de9c9359 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -8,8 +8,8 @@ Predef_LoadSGBLayout: ; 864c jr nz, .not_ram ld a, [SGBPredef] .not_ram - cp SCGB_FC - jp z, Function8ade + cp SCGB_PARTY_MENU_HP_PALS + jp z, SGB_ApplyPartyMenuHPPals ld l, a ld h, 0 add hl, hl @@ -390,7 +390,7 @@ endr pop bc ld a, c and a - jr z, .asm_88ef + jr z, .partymon ld hl, wSGBPals + 3 ld [hl], $e7 inc hl @@ -399,11 +399,11 @@ endr ld [hl], $62 inc hl ld [hl], $c - jr .asm_8913 + jr .done -.asm_88ef +.partymon ld hl, PartyMon1DVs - ld bc, $30 + ld bc, PARTYMON_STRUCT_LENGTH ld a, [CurPartyMon] call AddNTimes ld c, l @@ -419,7 +419,7 @@ endr ld a, [hl] ld [wSGBPals + 6], a -.asm_8913 +.done ld hl, wSGBPals ld de, BlkPacket_9a86 ret |