pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #390 from yenatch/remove-contents

Browse Source 
Remove contents.asm
This commit is contained in:
yenatch 2017-09-25 17:21:40 -04:00 committed by GitHub
commit 77a98f2f44
9 changed files with 41 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -59,13 +59,13 @@ tools:
%.o: %.asm $$(dep) %.o: %.asm $$(dep)
rgbasm -o $@ $< rgbasm -o $@ $<
pokecrystal11.gbc: $(crystal11_obj) pokecrystal11.gbc: $(crystal11_obj) pokecrystal.ld
rgblink -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.ld -o $@ $^ rgblink -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.ld -o $@ $(crystal11_obj)
rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@
sort pokecrystal11.sym -o pokecrystal11.sym sort pokecrystal11.sym -o pokecrystal11.sym
pokecrystal.gbc: $(crystal_obj) pokecrystal.gbc: $(crystal_obj) pokecrystal.ld
rgblink -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.ld -o $@ $^ rgblink -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.ld -o $@ $(crystal_obj)
rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
sort pokecrystal.sym -o pokecrystal.sym sort pokecrystal.sym -o pokecrystal.sym

130
contents.asm
View File

@ -1,130 +0,0 @@
; Doubles as bank constants.
; main.o
ROOFS EQU $7
TILESETS_1 EQU $6
TILESETS_2 EQU $7
TILESETS_3 EQU $8
TILESETS_4 EQU $C
TILESETS_5 EQU $2D
TILESETS_6 EQU $37
TILESETS_7 EQU $77
TILESETS_8 EQU $78
; data/egg_moves.o
EGG_MOVES EQU $8
; data/evos_attacks.o
EVOS_ATTACKS EQU $10
; data/pokedex/entries.o
POKEDEX_ENTRIES_1 EQU $60
POKEDEX_ENTRIES_2 EQU $6E
POKEDEX_ENTRIES_3 EQU $73
POKEDEX_ENTRIES_4 EQU $74
; engine/events.o
; engine/scripting.o
; engine/events_2.o
EVENTS EQU $25
; engine/credits.o
CREDITS EQU $42
; gfx/pics.o
PIC_POINTERS EQU $48
UNOWN_PIC_POINTERS EQU $49
TRAINER_PIC_POINTERS EQU $4A
PICS_FIX EQU $36
PICS_1 EQU $48
PICS_2 EQU $49
PICS_3 EQU $4A
PICS_4 EQU $4B
PICS_5 EQU $4C
PICS_6 EQU $4D
PICS_7 EQU $4E
PICS_8 EQU $4F
PICS_9 EQU $50
PICS_10 EQU $51
PICS_11 EQU $52
PICS_12 EQU $53
PICS_13 EQU $54
PICS_14 EQU $55
PICS_15 EQU $56
PICS_16 EQU $57
PICS_17 EQU $58
PICS_18 EQU $59
PICS_19 EQU $5A
; maps.o
MAP_HEADERS EQU $25
MAPS_1 EQU $2A
MAPS_2 EQU $2B
MAPS_3 EQU $2C
MAP_SCRIPTS_1 EQU $15
MAP_SCRIPTS_2 EQU $16
MAP_SCRIPTS_3 EQU $17
MAP_SCRIPTS_4 EQU $18
MAP_SCRIPTS_5 EQU $1A
MAP_SCRIPTS_6 EQU $1B
MAP_SCRIPTS_7 EQU $1C
MAP_SCRIPTS_8 EQU $1D
MAP_SCRIPTS_9 EQU $1E
MAP_SCRIPTS_10 EQU $1F
MAP_SCRIPTS_11 EQU $26
MAP_SCRIPTS_12 EQU $27
MAP_SCRIPTS_13 EQU $60
MAP_SCRIPTS_14 EQU $61
MAP_SCRIPTS_15 EQU $62
MAP_SCRIPTS_16 EQU $63
MAP_SCRIPTS_17 EQU $64
MAP_SCRIPTS_18 EQU $65
MAP_SCRIPTS_19 EQU $66
MAP_SCRIPTS_20 EQU $67
MAP_SCRIPTS_21 EQU $68
MAP_SCRIPTS_22 EQU $69
MAP_SCRIPTS_23 EQU $6A
MAP_SCRIPTS_24 EQU $6B
MAP_SCRIPTS_25 EQU $6C
; audio.o
AUDIO EQU $3A
SONGS_1 EQU $3A
SONGS_2 EQU $3B
SONGS_3 EQU $3C
SONGS_4 EQU $3D
SONGS_5 EQU $5E
EXTRA_SONGS_1 EQU $7
EXTRA_SONGS_2 EQU $33
SOUND_EFFECTS EQU $3C
CRYSTAL_SOUND_EFFECTS EQU $5E
CRIES EQU $3C
; misc.o
MISC_CRYSTAL EQU $5E

54
gfx/load_pics.asm
View File

@ -250,9 +250,13 @@ GetBackpic: ; 5116c
FixPicBank: ; 511c5 FixPicBank: ; 511c5
; This is a thing for some reason. ; This is a thing for some reason.
PICS_FIX EQU $36
GLOBAL PICS_FIX
push hl push hl
push bc push bc
sub PICS_1 - PICS_FIX sub BANK(Pics_1) - PICS_FIX
ld c, a ld c, a
ld b, 0 ld b, 0
ld hl, .PicsBanks ld hl, .PicsBanks
@ -263,30 +267,30 @@ FixPicBank: ; 511c5
ret ret
.PicsBanks: ; 511d4 .PicsBanks: ; 511d4
db PICS_1 db BANK(Pics_1) + 0
db PICS_2 db BANK(Pics_1) + 1
db PICS_3 db BANK(Pics_1) + 2
db PICS_4 db BANK(Pics_1) + 3
db PICS_5 db BANK(Pics_1) + 4
db PICS_6 db BANK(Pics_1) + 5
db PICS_7 db BANK(Pics_1) + 6
db PICS_8 db BANK(Pics_1) + 7
db PICS_9 db BANK(Pics_1) + 8
db PICS_10 db BANK(Pics_1) + 9
db PICS_11 db BANK(Pics_1) + 10
db PICS_12 db BANK(Pics_1) + 11
db PICS_13 db BANK(Pics_1) + 12
db PICS_14 db BANK(Pics_1) + 13
db PICS_15 db BANK(Pics_1) + 14
db PICS_16 db BANK(Pics_1) + 15
db PICS_17 db BANK(Pics_1) + 16
db PICS_18 db BANK(Pics_1) + 17
db PICS_19 db BANK(Pics_1) + 18
db PICS_19 + 1 db BANK(Pics_1) + 19
db PICS_19 + 2 db BANK(Pics_1) + 20
db PICS_19 + 3 db BANK(Pics_1) + 21
db PICS_19 + 4 db BANK(Pics_1) + 22
db PICS_19 + 5 db BANK(Pics_1) + 23
Function511ec: ; 511ec Function511ec: ; 511ec
ld a, c ld a, c

1
gfx/pics.asm
View File

@ -16,6 +16,7 @@ TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm"
SECTION "Pics 1", ROMX SECTION "Pics 1", ROMX
Pics_1::
HoOhFrontpic: INCBIN "gfx/pics/ho_oh/front.animated.2bpp.lz" HoOhFrontpic: INCBIN "gfx/pics/ho_oh/front.animated.2bpp.lz"
MachampFrontpic: INCBIN "gfx/pics/machamp/front.animated.2bpp.lz" MachampFrontpic: INCBIN "gfx/pics/machamp/front.animated.2bpp.lz"

1
includes.asm
View File

@ -1,3 +1,2 @@
INCLUDE "version.asm" INCLUDE "version.asm"
INCLUDE "contents.asm"
INCLUDE "constants.asm" INCLUDE "constants.asm"

2
macros/pic.asm
View File

@ -1,4 +1,4 @@
add_pic: MACRO add_pic: MACRO
db BANK(\1) - $36 db BANK(\1) - PICS_FIX
dw \1 dw \1
ENDM ENDM

1
pokecrystal.ld
View File

@ -311,6 +311,7 @@ WRAM0
"Audio RAM" "Audio RAM"
"WRAM" "WRAM"
"wSpriteAnims" "wSpriteAnims"
align 8
"Sprites" "Sprites"
"Tilemap" "Tilemap"
"Battle" "Battle"

2
tools/Makefile
View File

@ -1,7 +1,7 @@
.PHONY: all clean .PHONY: all clean
CC := gcc CC := gcc
CFLAGS := -std=c99 -Wall -Wextra CFLAGS := -O3 -std=c99 -Wall -Wextra
tools := \ tools := \
lzcomp \ lzcomp \

5
wram.asm
View File

@ -299,6 +299,7 @@ wGlobalAnimXOffset:: ds 1
wSpriteAnimsEnd:: wSpriteAnimsEnd::
ds 11 ds 11
wc3cc:: ds 1 wc3cc:: ds 1
wc3cd:: ds 31 wc3cd:: ds 31
wc3ec:: ds 1 wc3ec:: ds 1
@ -317,7 +318,9 @@ wc3f8:: ds 1
wc3f9:: ds 1 wc3f9:: ds 1
wc3fa:: ds 1 wc3fa:: ds 1
wc3fb:: ds 1 wc3fb:: ds 1
wc3fc:: ds 4 wc3fc:: ds 1
ds 3
SECTION "Sprites", WRAM0 SECTION "Sprites", WRAM0