mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Move predef/ files into engine/
Get rid of single-file engine/ subdirectories Move tilesets/ palettes unrelated to individual tilesets into data/palettes/ (more from engine/colors.asm can be moved here too)
This commit is contained in:
parent
2b6dd505c1
commit
94722aa8f0
@ -1,4 +1,4 @@
|
||||
; GetSGBLayout arguments (see predef/cgb.asm and predef/sgb.asm)
|
||||
; GetSGBLayout arguments (see engine/cgb_layouts.asm and engine/sgb_layouts.asm)
|
||||
const_def
|
||||
const SCGB_BATTLE_GRAYSCALE
|
||||
const SCGB_BATTLE_COLORS
|
||||
|
@ -19,3 +19,6 @@ HP_BAR_LENGTH EQU 6 ; tiles
|
||||
HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels
|
||||
EXP_BAR_LENGTH EQU 8 ; tiles
|
||||
EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels
|
||||
|
||||
|
||||
PALPACKET_LENGTH EQU $10
|
||||
|
@ -1,5 +1,4 @@
|
||||
PALPACKET_LENGTH EQU $10
|
||||
INCLUDE "predef/sgb.asm"
|
||||
INCLUDE "engine/sgb_layouts.asm"
|
||||
|
||||
SHINY_ATK_BIT EQU 5
|
||||
SHINY_DEF_VAL EQU 10
|
||||
@ -500,7 +499,7 @@ LoadMailPalettes:
|
||||
RGB 00, 21, 00
|
||||
RGB 00, 00, 00
|
||||
|
||||
INCLUDE "predef/cgb.asm"
|
||||
INCLUDE "engine/cgb_layouts.asm"
|
||||
|
||||
Function95f0:
|
||||
; XXX
|
||||
@ -2027,13 +2026,13 @@ Palette_b311: ; b311 not mobile
|
||||
RGB 00, 00, 00
|
||||
|
||||
TilesetBGPalette:
|
||||
INCLUDE "tilesets/bg.pal"
|
||||
INCLUDE "data/palettes/bg.pal"
|
||||
|
||||
MapObjectPals::
|
||||
INCLUDE "tilesets/ob.pal"
|
||||
INCLUDE "data/palettes/ob.pal"
|
||||
|
||||
RoofPals:
|
||||
INCLUDE "tilesets/roof.pal"
|
||||
INCLUDE "data/palettes/roof.pal"
|
||||
|
||||
DiplomaPalettes:
|
||||
RGB 27, 31, 27
|
||||
|
@ -295,7 +295,7 @@ LoadPokeComPalette: ; 494f2
|
||||
; 49501
|
||||
|
||||
PokeComPalette: ; 49501
|
||||
INCLUDE "tilesets/pokecom.pal"
|
||||
INCLUDE "tilesets/pokecom_center.pal"
|
||||
; 49541
|
||||
|
||||
LoadBattleTowerPalette: ; 49541
|
||||
@ -334,7 +334,7 @@ LoadHousePalette: ; 495df
|
||||
; 495ee
|
||||
|
||||
HousePalette: ; 495ee
|
||||
INCLUDE "tilesets/house.pal"
|
||||
INCLUDE "tilesets/house_1.pal"
|
||||
; 4962e
|
||||
|
||||
LoadRadioTowerPalette: ; 4962e
|
@ -2034,7 +2034,7 @@ Function28f09: ; 28f09
|
||||
ret
|
||||
; 28f24
|
||||
|
||||
INCLUDE "engine/trade/animation.asm"
|
||||
INCLUDE "engine/trade_animation.asm"
|
||||
|
||||
Special_CheckTimeCapsuleCompatibility: ; 29bfb
|
||||
; Checks to see if your Party is compatible with the generation 1 games. Returns the following in ScriptVar:
|
||||
|
@ -1,4 +1,4 @@
|
||||
INCLUDE "engine/printer/serial.asm"
|
||||
INCLUDE "engine/printer_serial.asm"
|
||||
|
||||
SendScreenToPrinter: ; 843f0
|
||||
.loop
|
||||
|
@ -22,5 +22,5 @@ INCLUDE "macros/scripts/gfx_anim.asm"
|
||||
|
||||
percent EQUS "* $ff / 100"
|
||||
|
||||
tiles EQUS "* $10"
|
||||
tile EQUS "+ $10 *"
|
||||
tiles EQUS "* LEN_2BPP_TILE"
|
||||
tile EQUS "+ LEN_2BPP_TILE *"
|
||||
|
6
main.asm
6
main.asm
@ -612,7 +612,7 @@ INCLUDE "data/items/marts.asm"
|
||||
INCLUDE "event/mom.asm"
|
||||
INCLUDE "event/daycare.asm"
|
||||
INCLUDE "event/photo.asm"
|
||||
INCLUDE "engine/breeding/egg.asm"
|
||||
INCLUDE "engine/breeding.asm"
|
||||
|
||||
|
||||
INCLUDE "tilesets/data.asm"
|
||||
@ -1771,7 +1771,7 @@ CheckCanLearnMoveTutorMove: ; 492b9
|
||||
db 12, 00 ; start coords
|
||||
db 17, 19 ; end coords
|
||||
|
||||
INCLUDE "predef/crystal.asm"
|
||||
INCLUDE "engine/crystal_colors.asm"
|
||||
|
||||
Unknown_4985a: ; unreferenced
|
||||
db $ab, $03, $57, $24, $ac, $0e, $13, $32
|
||||
@ -5073,7 +5073,7 @@ INCLUDE "engine/crystal_intro.asm"
|
||||
SECTION "bank3E", ROMX
|
||||
|
||||
INCLUDE "gfx/font.asm"
|
||||
INCLUDE "engine/time_capsule/conversion.asm"
|
||||
INCLUDE "engine/time_capsule.asm"
|
||||
INCLUDE "engine/unowndex.asm"
|
||||
INCLUDE "event/magikarp.asm"
|
||||
INCLUDE "battle/hidden_power.asm"
|
||||
|
Loading…
Reference in New Issue
Block a user