summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/cgb_layouts.asm28
-rw-r--r--engine/color.asm48
-rw-r--r--engine/sgb_layouts.asm48
3 files changed, 62 insertions, 62 deletions
diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm
index 70429a453..43e0d6e12 100644
--- a/engine/cgb_layouts.asm
+++ b/engine/cgb_layouts.asm
@@ -267,7 +267,7 @@ INCLUDE "gfx/stats/stats.pal"
_CGB_Pokedex: ; 8f70
ld de, wBGPals1
- ld a, $1d
+ ld a, PREDEFPAL_1D
call GetPredefPal
call LoadHLPaletteIntoDE ; dex interface palette
ld a, [CurPartySpecies]
@@ -309,7 +309,7 @@ INCLUDE "gfx/pokedex/cursor.pal"
_CGB_BillsPC: ; 8fca
ld de, wBGPals1
- ld a, $1d
+ ld a, PREDEFPAL_1D
call GetPredefPal
call LoadHLPaletteIntoDE
ld a, [CurPartySpecies]
@@ -366,7 +366,7 @@ INCLUDE "gfx/pc/orange.pal"
_CGB_PokedexUnownMode: ; 903e
ld de, wBGPals1
- ld a, $1d
+ ld a, PREDEFPAL_1D
call GetPredefPal
call LoadHLPaletteIntoDE
ld a, [CurPartySpecies]
@@ -444,7 +444,7 @@ _CGB06: ; 90f8
call CopyFourPalettes
call WipeAttrMap
ld de, wOBPals1
- ld a, $3c
+ ld a, PREDEFPAL_3C
call GetPredefPal
call LoadHLPaletteIntoDE
hlcoord 0, 6, AttrMap
@@ -508,12 +508,12 @@ _CGB07: ; 9122
.Function9166: ; 9166
ld de, wBGPals1
- ld a, $38
+ ld a, PREDEFPAL_38
call GetPredefPal
call LoadHLPaletteIntoDE
ld de, wOBPals1
- ld a, $39
+ ld a, PREDEFPAL_39
call GetPredefPal
call LoadHLPaletteIntoDE
call WipeAttrMap
@@ -524,7 +524,7 @@ _CGB07: ; 9122
ld hl, PalPacket_9c36 + 1
call CopyFourPalettes
ld de, wOBPals1
- ld a, $3a
+ ld a, PREDEFPAL_3A
call GetPredefPal
call LoadHLPaletteIntoDE
call WipeAttrMap
@@ -579,7 +579,7 @@ _CGB_Evolution: ; 91e4
ld a, c
and a
jr z, .pokemon
- ld a, $1a
+ ld a, PREDEFPAL_1A
call GetPredefPal
call LoadHLPaletteIntoDE
jr .got_palette
@@ -640,7 +640,7 @@ _CGB_UnownPuzzle: ; 925e
ld hl, PalPacket_9bc6 + 1
call CopyFourPalettes
ld de, wOBPals1
- ld a, $4c
+ ld a, PREDEFPAL_4C
call GetPredefPal
call LoadHLPaletteIntoDE
ld a, [rSVBK]
@@ -685,7 +685,7 @@ _CGB_TrainerCard: ; 9289
ld a, PRYCE
call GetTrainerPalettePointer
call LoadPalette_White_Col1_Col2_Black
- ld a, $24
+ ld a, PREDEFPAL_24
call GetPredefPal
call LoadHLPaletteIntoDE
@@ -767,7 +767,7 @@ _CGB_TrainerCard: ; 9289
_CGB_MoveList: ; 9373
ld de, wBGPals1
- ld a, $10
+ ld a, PREDEFPAL_10
call GetPredefPal
call LoadHLPaletteIntoDE
ld a, [PlayerHPPal]
@@ -803,7 +803,7 @@ _CGB0f: ; 93a6
_CGB_PokedexSearchOption: ; 93ba
ld de, wBGPals1
- ld a, $1d
+ ld a, PREDEFPAL_1D
call GetPredefPal
call LoadHLPaletteIntoDE
call WipeAttrMap
@@ -927,7 +927,7 @@ _CGB13: ; 94d0
_CGB_GamefreakLogo: ; 94fa
ld de, wBGPals1
- ld a, $4e
+ ld a, PREDEFPAL_4E
call GetPredefPal
call LoadHLPaletteIntoDE
ld hl, .Palette
@@ -977,7 +977,7 @@ _CGB_TradeTube: ; 9555
ld a, BANK(wOBPals1)
call FarCopyWRAM
ld de, wOBPals1 palette 7
- ld a, $1c
+ ld a, PREDEFPAL_1C
call GetPredefPal
call LoadHLPaletteIntoDE
call WipeAttrMap
diff --git a/engine/color.asm b/engine/color.asm
index cc12ffaf8..7a237b6be 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -187,7 +187,7 @@ Unreferenced_Function8b4d:
.cgb
ld de, wOBPals1
- ld a, $3b
+ ld a, PREDEFPAL_3B
call GetPredefPal
jp LoadHLPaletteIntoDE
@@ -202,7 +202,7 @@ Unreferenced_Function8b67:
.cgb
ld de, wOBPals1
- ld a, $3c
+ ld a, PREDEFPAL_3C
call GetPredefPal
jp LoadHLPaletteIntoDE
@@ -765,10 +765,10 @@ Unreferenced_Function97cc:
ret z
ld a, $90
ld [rOBPI], a
- ld a, $1c
+ ld a, PREDEFPAL_1C
call GetPredefPal
call .PushPalette
- ld a, $21
+ ld a, PREDEFPAL_21
call GetPredefPal
call .PushPalette
ret
@@ -878,7 +878,7 @@ InitSGBBorder:
call PushSGBBorder
call SGBDelayCycles
call SGB_ClearVRAM
- ld hl, PalPacket_9d66
+ ld hl, MaskEnCancelPacket
call PushSGBPals
.skip
@@ -943,7 +943,7 @@ InitCGBPals::
ret
_InitSGBBorderPals:
- ld hl, .PalPacketPointerTable
+ ld hl, .PacketPointerTable
ld c, 9
.loop
push bc
@@ -959,27 +959,27 @@ _InitSGBBorderPals:
jr nz, .loop
ret
-.PalPacketPointerTable:
- dw PalPacket_9d56
- dw PalPacket_9d76
- dw PalPacket_9d86
- dw PalPacket_9d96
- dw PalPacket_9da6
- dw PalPacket_9db6
- dw PalPacket_9dc6
- dw PalPacket_9dd6
- dw PalPacket_9de6
+.PacketPointerTable:
+ dw MaskEnFreezePacket
+ dw DataSndPacket1
+ dw DataSndPacket2
+ dw DataSndPacket3
+ dw DataSndPacket4
+ dw DataSndPacket5
+ dw DataSndPacket6
+ dw DataSndPacket7
+ dw DataSndPacket8
Unreferenced_Function9911:
di
xor a
ld [rJOYP], a
- ld hl, PalPacket_9d56
+ ld hl, MaskEnFreezePacket
call PushSGBPals
call PushSGBBorder
call SGBDelayCycles
call SGB_ClearVRAM
- ld hl, PalPacket_9d66
+ ld hl, MaskEnCancelPacket
call PushSGBPals
ei
ret
@@ -1005,7 +1005,7 @@ SGB_ClearVRAM:
ret
PushSGBBorderPalsAndWait:
- ld hl, PalPacket_9d26
+ ld hl, MltReq2Packet
call PushSGBPals
call SGBDelayCycles
ld a, [rJOYP]
@@ -1050,7 +1050,7 @@ endr
ret
.FinalPush:
- ld hl, PalPacket_9d16
+ ld hl, MltReq1Packet
call PushSGBPals
jp SGBDelayCycles
@@ -1065,7 +1065,7 @@ SGBBorder_PushBGPals:
call DrawDefaultTiles
ld a, LCDC_DEFAULT
ld [rLCDC], a
- ld hl, PalPacket_9d06
+ ld hl, PalTrnPacket
call PushSGBPals
xor a
ld [rBGP], a
@@ -1099,7 +1099,7 @@ SGBBorder_MorePalPushing:
call DrawDefaultTiles
ld a, LCDC_DEFAULT
ld [rLCDC], a
- ld hl, PalPacket_9d46
+ ld hl, PctTrnPacket
call PushSGBPals
xor a
ld [rBGP], a
@@ -1123,7 +1123,7 @@ SGBBorder_YetMorePalPushing:
call DrawDefaultTiles
ld a, LCDC_DEFAULT
ld [rLCDC], a
- ld hl, PalPacket_9d36
+ ld hl, ChrTrnPacket
call PushSGBPals
xor a
ld [rBGP], a
@@ -1188,8 +1188,8 @@ SGBDelayCycles:
ret
INCLUDE "gfx/sgb/blk_packets.asm"
-
INCLUDE "gfx/sgb/pal_packets.asm"
+INCLUDE "gfx/sgb/data_snd_packets.asm"
PredefPals:
INCLUDE "gfx/sgb/predef.pal"
diff --git a/engine/sgb_layouts.asm b/engine/sgb_layouts.asm
index ac02b2376..79c2f1aa9 100644
--- a/engine/sgb_layouts.asm
+++ b/engine/sgb_layouts.asm
@@ -113,22 +113,22 @@ LoadSGBLayout: ; 864c
call GetBattlemonBackpicPalettePointer
ld a, [hli]
- ld [wSGBPals + $13], a
+ ld [wSGBPals + 19], a
ld a, [hli]
- ld [wSGBPals + $14], a
+ ld [wSGBPals + 20], a
ld a, [hli]
- ld [wSGBPals + $15], a
+ ld [wSGBPals + 21], a
ld a, [hl]
- ld [wSGBPals + $16], a
+ ld [wSGBPals + 22], a
call GetEnemyFrontpicPalettePointer
ld a, [hli]
- ld [wSGBPals + $19], a
+ ld [wSGBPals + 25], a
ld a, [hli]
- ld [wSGBPals + $1a], a
+ ld [wSGBPals + 26], a
ld a, [hli]
- ld [wSGBPals + $1b], a
+ ld [wSGBPals + 27], a
ld a, [hl]
- ld [wSGBPals + $1c], a
+ ld [wSGBPals + 28], a
ld hl, wSGBPals
ld de, wSGBPals + $10
@@ -210,13 +210,13 @@ LoadSGBLayout: ; 864c
ld bc, $10
call CopyBytes
ld hl, wSGBPals + 3
- ld [hl], $9f
+ ld [hl], LOW(palred 31 + palgreen 20 + palblue 10)
inc hl
- ld [hl], $2a
+ ld [hl], HIGH(palred 31 + palgreen 20 + palblue 10)
inc hl
- ld [hl], $5a
+ ld [hl], LOW(palred 26 + palgreen 10 + palblue 6)
inc hl
- ld [hl], $19
+ ld [hl], HIGH(palred 26 + palgreen 10 + palblue 6)
ld a, [CurPartySpecies]
call GetMonPalettePointer_
ld a, [hli]
@@ -238,13 +238,13 @@ LoadSGBLayout: ; 864c
ld bc, $10
call CopyBytes
ld hl, wSGBPals + 3
- ld [hl], $9f
+ ld [hl], LOW(palred 31 + palgreen 20 + palblue 10)
inc hl
- ld [hl], $2a
+ ld [hl], HIGH(palred 31 + palgreen 20 + palblue 10)
inc hl
- ld [hl], $5a
+ ld [hl], LOW(palred 26 + palgreen 10 + palblue 6)
inc hl
- ld [hl], $19
+ ld [hl], HIGH(palred 26 + palgreen 10 + palblue 6)
ld a, [CurPartySpecies]
ld bc, TempMonDVs
call GetPlayerOrMonPalettePointer
@@ -273,13 +273,13 @@ LoadSGBLayout: ; 864c
ld bc, $10
call CopyBytes
ld hl, wSGBPals + 3
- ld [hl], $9f
+ ld [hl], LOW(palred 31 + palgreen 20 + palblue 10)
inc hl
- ld [hl], $2a
+ ld [hl], HIGH(palred 31 + palgreen 20 + palblue 10)
inc hl
- ld [hl], $5a
+ ld [hl], LOW(palred 26 + palgreen 10 + palblue 6)
inc hl
- ld [hl], $19
+ ld [hl], HIGH(palred 26 + palgreen 10 + palblue 6)
ld hl, wSGBPals
ld de, BlkPacket_9a86
ret
@@ -579,19 +579,19 @@ endr
ret
.route
- ld a, $00
+ ld a, PREDEFPAL_00
ret
.cave
- ld a, $18
+ ld a, PREDEFPAL_18
ret
.perm5
- ld a, $06
+ ld a, PREDEFPAL_06
ret
.gate
- ld a, $03
+ ld a, PREDEFPAL_03
ret
; 8a45
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 14:24:59 +0000