pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

More accurate constant/label names

Browse Source
This commit is contained in:
Remy Oukaour
2018-01-18 15:06:43 -05:00
parent 69ace7f48d
commit 3bf8325edd
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
constants/scgb_constants.asm
View File

@@ -96,9 +96,9 @@ SCGB_RAM EQU -1
const PREDEFPAL_37 const PREDEFPAL_37
const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
const PREDEFPAL_GS_INTRO_CHARIZARD_OB const PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
const PREDEFPAL_3B const PREDEFPAL_3B
const PREDEFPAL_GS_INTRO_CHARIZARD_BG const PREDEFPAL_PACK ; GS_INTRO_CHARIZARD
const PREDEFPAL_SLOT_MACHINE_0 const PREDEFPAL_SLOT_MACHINE_0
const PREDEFPAL_SLOT_MACHINE_1 const PREDEFPAL_SLOT_MACHINE_1
const PREDEFPAL_SLOT_MACHINE_2 const PREDEFPAL_SLOT_MACHINE_2

4
engine/cgb_layouts.asm
View File

@@ -444,7 +444,7 @@ _CGB06: ; 90f8
call CopyFourPalettes call CopyFourPalettes
call WipeAttrMap call WipeAttrMap
ld de, wOBPals1 ld de, wOBPals1
ld a, PREDEFPAL_GS_INTRO_CHARIZARD_BG ld a, PREDEFPAL_PACK
call GetPredefPal call GetPredefPal
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
hlcoord 0, 6, AttrMap hlcoord 0, 6, AttrMap
@@ -524,7 +524,7 @@ _CGB_GSIntro: ; 9122
ld hl, PalPacket_Pack + 1 ld hl, PalPacket_Pack + 1
call CopyFourPalettes call CopyFourPalettes
ld de, wOBPals1 ld de, wOBPals1
ld a, PREDEFPAL_GS_INTRO_CHARIZARD_OB ld a, PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
call GetPredefPal call GetPredefPal
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
call WipeAttrMap call WipeAttrMap

2
engine/color.asm
View File

@@ -202,7 +202,7 @@ Unreferenced_Function8b67:
.cgb .cgb
ld de, wOBPals1 ld de, wOBPals1
ld a, PREDEFPAL_GS_INTRO_CHARIZARD_BG ld a, PREDEFPAL_PACK
call GetPredefPal call GetPredefPal
jp LoadHLPaletteIntoDE jp LoadHLPaletteIntoDE

2
engine/sgb_layouts.asm
View File

@@ -329,7 +329,7 @@ endr
.BlkPacketTable_GSIntro: ; 8878 .BlkPacketTable_GSIntro: ; 8878
dw BlkPacket_9a86, PalPacket_GSIntroShellderLapras dw BlkPacket_9a86, PalPacket_GSIntroShellderLapras
dw BlkPacket_GSIntroJigglypuffPikachu, PalPacket_GSIntroJigglypuffPikachu dw BlkPacket_GSIntroJigglypuffPikachu, PalPacket_GSIntroJigglypuffPikachu
dw BlkPacket_9a86, PalPacket_GSIntroCharizard dw BlkPacket_9a86, PalPacket_GSIntroStartersTransition
; 8884 ; 8884
.SGB_GSTitleScreen: ; 8884 .SGB_GSTitleScreen: ; 8884

8
gfx/sgb/pal_packets.asm
View File

@@ -41,14 +41,14 @@ UnreferencedPalPacket_9bf6:
PalPacket_GSIntroJigglypuffPikachu: PalPacket_GSIntroJigglypuffPikachu:
sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00 sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00
PalPacket_GSIntroCharizard: PalPacket_GSIntroStartersTransition:
sgb_pal_set GS_INTRO_CHARIZARD_OB, 00, 00, 00 sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00
PalPacket_Function8b4d: PalPacket_Function8b4d:
sgb_pal_set 3B, 00, 00, 00 sgb_pal_set 3B, 00, 00, 00
PalPacket_Pack: PalPacket_Pack:
sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00 sgb_pal_set PACK, 00, 00, 00
PalPacket_SCGB_0F: PalPacket_SCGB_0F:
sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00 sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00
@@ -63,7 +63,7 @@ PalPacket_Pokegear:
sgb_pal_set POKEGEAR, 00, 00, 00 sgb_pal_set POKEGEAR, 00, 00, 00
UnreferencedPalPacket_9c86: UnreferencedPalPacket_9c86:
sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00 sgb_pal_set PACK, 00, 00, 00
PalPacket_SlotMachine: PalPacket_SlotMachine:
sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3 sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3

4
gfx/sgb/predef.pal
View File

@@ -56,9 +56,9 @@
RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_37 RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_37
RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_OB RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B
RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_BG (PACK) RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD (PACK)
RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0 RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0
RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1 RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1
RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2 RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2