pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #245 from yenatch/master

Browse Source 
Picking off small incbins and static labels.
This commit is contained in:
Bryan Bishop 2014-04-13 11:36:28 -05:00
commit 27ec064056
15 changed files with 3688 additions and 681 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
constants/misc_constants.asm
View File

@ -3,6 +3,9 @@
PLAYER_NAME_LENGTH EQU 8 PLAYER_NAME_LENGTH EQU 8
PKMN_NAME_LENGTH EQU 11 PKMN_NAME_LENGTH EQU 11
; boxes
NUM_BOXES EQU 14
; predefs ; predefs
PREDEF_FLAG EQU $03 PREDEF_FLAG EQU $03

2
constants/trainer_constants.asm
View File

@ -1,3 +1,5 @@
NUM_TRAINER_CLASSES EQU $44
; trainer groups ; trainer groups
FALKNER EQU $01 FALKNER EQU $01
WHITNEY EQU $02 WHITNEY EQU $02

11
engine/color.asm
View File

@ -1927,16 +1927,9 @@ Palettes_a8be: ; a8be
Palettes_a8ca: ; a8ca Palettes_a8ca: ; a8ca
RGB 30, 26, 15 RGB 30, 26, 15
RGB 04, 17, 31 RGB 04, 17, 31
; a8ce
Palettes_a8ce: ; a8ce ; a8ce
RGB 30, 22, 17
RGB 16, 14, 19
RGB 30, 22, 17
RGB 16, 14, 19
; a8d6
; a8d6
INCLUDE "gfx/pics/palette_pointers.asm" INCLUDE "gfx/pics/palette_pointers.asm"
; b0ce ; b0ce

6
engine/scripting.asm
View File

@ -519,7 +519,7 @@ Script_interpretmenu2: ; 0x96f30
; script command 0x59 ; script command 0x59
ld a, [ScriptBank] ld a, [ScriptBank]
ld hl, $1d81 ld hl, Function1d81
rst FarCall rst FarCall
ld a, [$cfa9] ld a, [$cfa9]
jr nc, .asm_96f3d ; 0x96f3a $1 jr nc, .asm_96f3d ; 0x96f3a $1
@ -533,7 +533,7 @@ Script_interpretmenu: ; 0x96f41
; script command 0x58 ; script command 0x58
ld a, [ScriptBank] ld a, [ScriptBank]
ld hl, $202a ld hl, Function202a
rst FarCall rst FarCall
ld a, [$cf88] ld a, [$cf88]
jr nc, .asm_96f4e ; 0x96f4b $1 jr nc, .asm_96f4e ; 0x96f4b $1
@ -2284,7 +2284,7 @@ Script_stringtotext: ; 0x9777d
call GetScriptByte call GetScriptByte
ld d, a ld d, a
ld a, [ScriptBank] ld a, [ScriptBank]
ld hl, $30d6 ld hl, CopyName1
rst FarCall rst FarCall
ld de, StringBuffer2 ld de, StringBuffer2
jp Unknown_976c0 jp Unknown_976c0

BIN
gfx/pc.2bpp.lz Normal file
View File

Binary file not shown.

BIN
gfx/pc_mail.2bpp Normal file
View File

Binary file not shown.

6
gfx/pics.asm
View File

@ -3,19 +3,19 @@ INCLUDE "includes.asm"
SECTION "Pic Pointers", ROMX, BANK[PIC_POINTERS] SECTION "Pic Pointers", ROMX, BANK[PIC_POINTERS]
PicPointers: PicPointers::
INCLUDE "gfx/pics/pic_pointers.asm" INCLUDE "gfx/pics/pic_pointers.asm"
SECTION "Unown Pic Pointers", ROMX, BANK[UNOWN_PIC_POINTERS] SECTION "Unown Pic Pointers", ROMX, BANK[UNOWN_PIC_POINTERS]
UnownPicPointers: UnownPicPointers::
INCLUDE "gfx/pics/unown_pic_pointers.asm" INCLUDE "gfx/pics/unown_pic_pointers.asm"
SECTION "Trainer Pic Pointers", ROMX, BANK[TRAINER_PIC_POINTERS] SECTION "Trainer Pic Pointers", ROMX, BANK[TRAINER_PIC_POINTERS]
TrainerPicPointers: TrainerPicPointers::
INCLUDE "gfx/pics/trainer_pic_pointers.asm" INCLUDE "gfx/pics/trainer_pic_pointers.asm"

9
gfx/pics/palette_pointers.asm
View File

@ -1,4 +1,11 @@
PokemonPalettes: ; a8d6 PokemonPalettes: ; a8ce
; 000
RGB 30, 22, 17
RGB 16, 14, 19
; 000 shiny
RGB 30, 22, 17
RGB 16, 14, 19
BulbasaurPalette: INCLUDE "gfx/pics/bulbasaur/normal.pal" BulbasaurPalette: INCLUDE "gfx/pics/bulbasaur/normal.pal"
BulbasaurShinyPalette: INCLUDE "gfx/pics/bulbasaur/shiny.pal" BulbasaurShinyPalette: INCLUDE "gfx/pics/bulbasaur/shiny.pal"

BIN
gfx/slots.tilemap Normal file
View File

Binary file not shown.

BIN
gfx/slots_1.2bpp.lz Normal file
View File

Binary file not shown.

BIN
gfx/slots_2.2bpp.lz Normal file
View File

Binary file not shown.

BIN
gfx/slots_3.2bpp.lz Normal file
View File

Binary file not shown.

4322
main.asm
View File

File diff suppressed because it is too large Load Diff

2
predef/sgb.asm
View File

@ -464,7 +464,7 @@ Function8969: ; 8969
add hl, hl add hl, hl
add hl, hl add hl, hl
add hl, hl add hl, hl
ld de, Palettes_a8ce ld de, PokemonPalettes
add hl, de add hl, de
ld a, [$cf65] ld a, [$cf65]
and 3 and 3

8
wram.asm
View File

@ -1880,7 +1880,13 @@ EventFlags:: ; da72
ds 250 ds 250
; db6c ; db6c
SECTION "BoxNames",WRAMX[$db75],BANK[1] SECTION "Boxes",WRAMX[$db72],BANK[1]
wCurBox:: ; db72
ds 1
ds 2
; 8 chars + $50 ; 8 chars + $50
Box1Name:: ; db75 Box1Name:: ; db75
ds 9 ds 9