thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Field06 fixed!

Browse source 
Also added a new palette for Brunswick, just trying to figure out a way to display it (possibly because Brunswick isn't listed as a Route map?)
This commit is contained in:
MementoMartha 2023-04-25 01:20:59 +01:00
parent 2f82c377fe
commit 6a693a931b
6 changed files with 54 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
constants/palette_constants.asm
View file

@ -73,5 +73,6 @@ DEF SET_PAL_DEFAULT EQU $ff
const PAL_CAVE ; $25 const PAL_CAVE ; $25
const PAL_GAMEFREAK ; $26 const PAL_GAMEFREAK ; $26
const PAL_CELESTE ; $27 const PAL_CELESTE ; $27
const PAL_CITRINECAVE ; $28 const PAL_GARNET ; $28
const PAL_BRUNSWICK ; $29
DEF NUM_SGB_PALS EQU const_value DEF NUM_SGB_PALS EQU const_value

71
crysaudio/music/RBY/field06.asm
View file

@ -3,7 +3,7 @@
Music_Field06:: Music_Field06::
channel_count 3 channel_count 4
channel 1, Music_Field06_Ch1 channel 1, Music_Field06_Ch1
channel 2, Music_Field06_Ch2 channel 2, Music_Field06_Ch2
channel 3, Music_Field06_Ch3 channel 3, Music_Field06_Ch3
@ -186,6 +186,7 @@ Music_Field06_Ch3:
Music_Field06_Ch4: Music_Field06_Ch4:
;;---------------------------------------- ;;----------------------------------------
toggle_noise 1
drum_speed 6 drum_speed 6
.loop40 .loop40
@ -205,45 +206,45 @@ Music_Field06_Ch4:
.sub41 .sub41
drum_note 17, 4 drum_note 10, 4
drum_note 18, 4 drum_note 11, 4
drum_note 19, 4 drum_note 12, 4
drum_note 18, 4 drum_note 11, 4
drum_note 17, 4 drum_note 10, 4
drum_note 18, 4 drum_note 11, 4
drum_note 19, 4 drum_note 12, 4
drum_note 19, 2 drum_note 12, 2
drum_note 18, 2 drum_note 11, 2
sound_ret sound_ret
.sub42 .sub42
drum_note 17, 4 drum_note 10, 4
drum_note 18, 4 drum_note 11, 4
drum_note 19, 4 drum_note 12, 4
drum_note 18, 4 drum_note 11, 4
drum_note 17, 4 drum_note 10, 4
drum_note 18, 4 drum_note 11, 4
drum_note 19, 4 drum_note 12, 4
drum_note 19, 1 drum_note 12, 1
drum_note 19, 1 drum_note 12, 1
drum_note 18, 1 drum_note 11, 1
drum_note 18, 1 drum_note 11, 1
sound_ret sound_ret
.sub43 .sub43
drum_note 17, 4 drum_note 10, 4
drum_note 18, 4 drum_note 11, 4
drum_note 17, 4 drum_note 10, 4
drum_note 18, 4 drum_note 11, 4
drum_note 17, 4 drum_note 10, 4
drum_note 17, 4 drum_note 10, 4
drum_note 19, 1 drum_note 12, 1
drum_note 19, 1 drum_note 12, 1
drum_note 19, 1 drum_note 12, 1
drum_note 19, 1 drum_note 12, 1
drum_note 18, 1 drum_note 11, 1
drum_note 18, 1 drum_note 11, 1
drum_note 18, 1 drum_note 11, 1
drum_note 18, 1 drum_note 11, 1
sound_ret sound_ret

3
data/sgb/sgb_palettes.asm
View file

@ -41,5 +41,6 @@ SuperPalettes:
RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE
RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK
RGB 31,31,31, 01,30,31, 11,23,31, 03,03,03 ; PAL_CELESTE RGB 31,31,31, 01,30,31, 11,23,31, 03,03,03 ; PAL_CELESTE
RGB 31,31,31, 31,04,04, 06,06,26, 03,03,03 ; PAL_CITRINECAVE RGB 31,31,31, 31,06,08, 18,04,06, 03,03,03 ; PAL_GARNET
RGB 31,31,31, 01,20,03, 11,23,31, 03,03,03 ; PAL_BRUNSWICK
assert_table_length NUM_SGB_PALS assert_table_length NUM_SGB_PALS

5
engine/gfx/palettes.asm
View file

@ -155,6 +155,8 @@ SetPal_Overworld:
jr z, .Lorelei jr z, .Lorelei
cp CELESTE_HILL cp CELESTE_HILL
jr z, .celeste jr z, .celeste
cp BRUNSWICK_TRAIL
jr z, .brunswick
cp BRUNOS_ROOM cp BRUNOS_ROOM
jr z, .caveOrBruno jr z, .caveOrBruno
.normalDungeonOrBuilding .normalDungeonOrBuilding
@ -171,6 +173,9 @@ SetPal_Overworld:
ld a, SET_PAL_OVERWORLD ld a, SET_PAL_OVERWORLD
ld [wDefaultPaletteCommand], a ld [wDefaultPaletteCommand], a
ret ret
.brunswick
ld a, PAL_BRUNSWICK - 1
jr .town
.PokemonTowerOrAgatha .PokemonTowerOrAgatha
ld a, PAL_GREYMON - 1 ld a, PAL_GREYMON - 1
jr .town jr .town

BIN
maps/BrunswickTrail.blk
View file

Binary file not shown.

13
maps/CitrineCity.blk
View file

@ -20,12 +20,17 @@ t
eC<Fd eC<Fd
' &###H111eC<Fd'=s'_11'.C<Fd ' &###H
D#####"T.CCCC<Fd
eC<Fd'=s'
'.C<Fd
D#####"
T.CCCC<Fd
n'meCTTTTTF-1eCxxxxxxc>>>>>>>1>>>>>>>>
'eCCTTTTTF-T.CCxxxxxxc>>>>>>>>gTG>>>>>>>>>