pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Group some mutually edited files in data/sprites/

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-10 18:10:01 -05:00
parent e0088adb3f
commit d91e42ca5e
13 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/map_data_constants.asm
View File

@ -202,7 +202,7 @@ NUM_SPAWNS EQU const_value
const OBJECTTYPE_6 const OBJECTTYPE_6
; Emotes indexes (see data/emotes.asm) ; Emotes indexes (see data/sprites/emotes.asm)
const_def const_def
const EMOTE_SHOCK ; 0 const EMOTE_SHOCK ; 0
const EMOTE_QUESTION ; 1 const EMOTE_QUESTION ; 1

2
constants/sprite_constants.asm
View File

@ -105,7 +105,7 @@
const SPRITE_RAIKOU ; 65 const SPRITE_RAIKOU ; 65
const SPRITE_STANDING_YOUNGSTER ; 66 const SPRITE_STANDING_YOUNGSTER ; 66
; SpriteMons indexes (see data/sprite_mons.asm) ; SpriteMons indexes (see data/sprites/sprite_mons.asm)
const_value set $80 const_value set $80
SPRITE_POKEMON EQU const_value SPRITE_POKEMON EQU const_value
const SPRITE_UNOWN ; 80 const SPRITE_UNOWN ; 80

4
constants/sprite_data_constants.asm
View File

@ -36,7 +36,7 @@ const_value set (1 << 3)
const PAL_NPC_TREE ; e const PAL_NPC_TREE ; e
const PAL_NPC_ROCK ; f const PAL_NPC_ROCK ; f
; SpriteMovementData indexes (see data/map_objects.asm) ; SpriteMovementData indexes (see data/sprites/map_objects.asm)
const_def const_def
const SPRITEMOVEDATA_00 ; 00 const SPRITEMOVEDATA_00 ; 00
const SPRITEMOVEDATA_ITEM_TREE ; 01 const SPRITEMOVEDATA_ITEM_TREE ; 01
@ -158,7 +158,7 @@ SPRITEMOVEDATA_FIELDS EQU 6
const OBJECT_ACTION_GRASS_SHAKE ; 0f const OBJECT_ACTION_GRASS_SHAKE ; 0f
const OBJECT_ACTION_SKYFALL ; 10 const OBJECT_ACTION_SKYFALL ; 10
; Facings indexes (see data/facings.asm) ; Facings indexes (see data/sprites/facings.asm)
const_def const_def
const FACING_STEP_DOWN_0 ; 00 const FACING_STEP_DOWN_0 ; 00
const FACING_STEP_DOWN_1 ; 01 const FACING_STEP_DOWN_1 ; 01

0
data/emotes.asm → data/sprites/emotes.asm
View File

0
data/facings.asm → data/sprites/facings.asm
View File

0
data/map_objects.asm → data/sprites/map_objects.asm
View File

0
data/sprite_mons.asm → data/sprites/sprite_mons.asm
View File

0
data/sprites.asm → data/sprites/sprites.asm
View File

2
engine/color.asm
View File

@ -1341,7 +1341,7 @@ TilesetBGPalette:
INCLUDE "gfx/tilesets/bg_tiles.pal" INCLUDE "gfx/tilesets/bg_tiles.pal"
MapObjectPals:: MapObjectPals::
INCLUDE "gfx/overworld/map_objects.pal" INCLUDE "gfx/overworld/map_sprites.pal"
RoofPals: RoofPals:
INCLUDE "gfx/tilesets/roofs.pal" INCLUDE "gfx/tilesets/roofs.pal"

4
engine/map_objects.asm
View File

@ -1,6 +1,6 @@
INCLUDE "data/facings.asm" INCLUDE "data/sprites/facings.asm"
INCLUDE "data/map_objects.asm" INCLUDE "data/sprites/map_objects.asm"
; 4357 ; 4357

6
engine/overworld.asm
View File

@ -719,10 +719,10 @@ LoadEmote:: ; 1442f
; 1444d ; 1444d
INCLUDE "data/emotes.asm" INCLUDE "data/sprites/emotes.asm"
INCLUDE "data/sprite_mons.asm" INCLUDE "data/sprites/sprite_mons.asm"
INCLUDE "data/maps/outdoor_sprites.asm" INCLUDE "data/maps/outdoor_sprites.asm"
INCLUDE "data/sprites.asm" INCLUDE "data/sprites/sprites.asm"

0
gfx/overworld/map_objects.pal → gfx/overworld/map_sprites.pal
View File

6
home/text.asm
View File

@ -47,10 +47,8 @@ ClearScreen:: ; fdb
TextBox:: ; fe8 TextBox:: ; fe8
; Draw a text box at hl with room for ; Draw a text box at hl with room for b lines of c characters each.
; b lines of c characters each. ; Places a border around the textbox, then switches the palette to the
; Places a border around the textbox,
; then switches the palette to the
; text black-and-white scheme. ; text black-and-white scheme.
push bc push bc
push hl push hl