summaryrefslogtreecommitdiff
path: root/Colored-trainer-card-badges.md
diff options
context:
space:
mode:
Diffstat (limited to 'Colored-trainer-card-badges.md')
-rw-r--r--Colored-trainer-card-badges.md66
1 files changed, 33 insertions, 33 deletions
diff --git a/Colored-trainer-card-badges.md b/Colored-trainer-card-badges.md
index b175e5b..f3df062 100644
--- a/Colored-trainer-card-badges.md
+++ b/Colored-trainer-card-badges.md
@@ -30,8 +30,8 @@ Create **gfx/trainer_card/badges.pal**:
Edit [engine/cgb_layouts.asm](../blob/master/engine/cgb_layouts.asm):
```diff
-_CGB_TrainerCard: ; 9289
- ...
+ _CGB_TrainerCard: ; 9289
+ ...
- ld a, PREDEFPAL_CGB_BADGE
- call GetPredefPal
- call LoadHLPaletteIntoDE
@@ -39,11 +39,11 @@ _CGB_TrainerCard: ; 9289
+ ld bc, 8 palettes
+ ld a, BANK(wOBPals1)
+ call FarCopyWRAM
-
- ...
- ret
-; 9373
-
+
+ ...
+ ret
+ ; 9373
+
+.BadgePalettes:
+INCLUDE "gfx/trainer_card/badges.pal"
```
@@ -54,55 +54,55 @@ _CGB_TrainerCard: ; 9289
Edit [engine/trainer_card.asm](../blob/master/engine/trainer_card.asm):
```diff
-TrainerCard_JohtoBadgesOAM: ; 254c9
-; Template OAM data for each badge on the trainer card.
-; Format:
- ; y, x, palette
- ; cycle 1: face tile, in1 tile, in2 tile, in3 tile
- ; cycle 2: face tile, in1 tile, in2 tile, in3 tile
+ TrainerCard_JohtoBadgesOAM: ; 254c9
+ ; Template OAM data for each badge on the trainer card.
+ ; Format:
+ ; y, x, palette
+ ; cycle 1: face tile, in1 tile, in2 tile, in3 tile
+ ; cycle 2: face tile, in1 tile, in2 tile, in3 tile
- dw wJohtoBadges
+ dw wJohtoBadges
- ; Zephyrbadge
- db $68, $18, 0
- db $00, $20, $24, $20 | (1 << 7)
- db $00, $20, $24, $20 | (1 << 7)
+ ; Zephyrbadge
+ db $68, $18, 0
+ db $00, $20, $24, $20 | (1 << 7)
+ db $00, $20, $24, $20 | (1 << 7)
- ; Hivebadge
+ ; Hivebadge
- db $68, $38, 0
+ db $68, $38, 1
- ...
+ ...
- ; Plainbadge
+ ; Plainbadge
- db $68, $58, 0
+ db $68, $58, 2
- ...
+ ...
- ; Fogbadge
+ ; Fogbadge
- db $68, $78, 0
+ db $68, $78, 3
- ...
+ ...
- ; Mineralbadge
+ ; Mineralbadge
- db $80, $38, 0
+ db $80, $38, 5
- ...
+ ...
- ; Stormbadge
+ ; Stormbadge
- db $80, $18, 0
+ db $80, $18, 4
- ...
+ ...
- ; Glacierbadge
+ ; Glacierbadge
- db $80, $58, 0
+ db $80, $58, 6
- ...
+ ...
- ; Risingbadge
- ; X-flips on alternate cycles.
+ ; Risingbadge
+ ; X-flips on alternate cycles.
- db $80, $78, 0
+ db $80, $78, 7
- ...
+ ...
```