summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rw-r--r--src/audio/music1.asm4
-rw-r--r--src/audio/music2.asm4
-rw-r--r--src/audio/sfx.asm4
-rw-r--r--src/data/cards.asm4
-rw-r--r--src/engine/bank01.asm4
-rw-r--r--src/engine/bank03.asm4
-rw-r--r--src/engine/bank04.asm4
-rw-r--r--src/engine/bank06.asm4
-rw-r--r--src/engine/bank08.asm4
-rw-r--r--src/engine/bank20.asm4
-rw-r--r--src/engine/booster_packs.asm2
-rw-r--r--src/engine/effect_functions.asm4
-rw-r--r--src/engine/home.asm23
-rw-r--r--src/gfx.asm60
-rw-r--r--src/layout.link18
-rw-r--r--src/macros/data.asm6
-rw-r--r--src/main.asm24
-rw-r--r--src/text/text1.asm2
-rw-r--r--src/text/text10.asm2
-rw-r--r--src/text/text11.asm2
-rw-r--r--src/text/text12.asm2
-rw-r--r--src/text/text13.asm4
-rw-r--r--src/text/text2.asm2
-rw-r--r--src/text/text3.asm2
-rw-r--r--src/text/text4.asm2
-rw-r--r--src/text/text5.asm2
-rw-r--r--src/text/text6.asm2
-rw-r--r--src/text/text7.asm2
-rw-r--r--src/text/text8.asm2
-rw-r--r--src/text/text9.asm2
31 files changed, 64 insertions, 145 deletions
diff --git a/Makefile b/Makefile
index c5b5265..8921be5 100644
--- a/Makefile
+++ b/Makefile
@@ -81,10 +81,10 @@ endif
%.asm: ;
-opts = -cjsv -k 01 -l 0x33 -m 0x1b -p 0 -r 03 -t POKECARD -i AXQE
+opts = -cjsv -k 01 -l 0x33 -m 0x1b -p 0xff -r 03 -t POKECARD -i AXQE
$(rom): $(rom_obj) src/layout.link
- $(RGBLINK) -m $(rom:.gbc=.map) -n $(rom:.gbc=.sym) -l src/layout.link -o $@ $(filter %.o,$^)
+ $(RGBLINK) -p 0xff -m $(rom:.gbc=.map) -n $(rom:.gbc=.sym) -l src/layout.link -o $@ $(filter %.o,$^)
$(RGBFIX) $(opts) $@
diff --git a/src/audio/music1.asm b/src/audio/music1.asm
index 6cc4fed..53c3918 100644
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -1987,7 +1987,3 @@ INCLUDE "audio/music/matchloss.asm"
INCLUDE "audio/music/matchdraw.asm"
INCLUDE "audio/music/boosterpack.asm"
INCLUDE "audio/music/medal.asm"
-
-rept $138
- db $ff
-endr
diff --git a/src/audio/music2.asm b/src/audio/music2.asm
index 13638d4..1b0a2b7 100644
--- a/src/audio/music2.asm
+++ b/src/audio/music2.asm
@@ -1981,7 +1981,3 @@ INCLUDE "audio/music/ronald.asm"
INCLUDE "audio/music/imakuni.asm"
INCLUDE "audio/music/hallofhonor.asm"
INCLUDE "audio/music/credits.asm"
-
-rept $109
- db $ff
-endr
diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm
index 7e87930..9d3818c 100644
--- a/src/audio/sfx.asm
+++ b/src/audio/sfx.asm
@@ -593,7 +593,3 @@ INCLUDE "audio/sfx/sfx_5c.asm"
INCLUDE "audio/sfx/sfx_5d.asm"
INCLUDE "audio/sfx/sfx_5e.asm"
INCLUDE "audio/sfx/sfx_5f.asm"
-
-rept $c1
- db $ff
-endr
diff --git a/src/data/cards.asm b/src/data/cards.asm
index c6f480c..c66702b 100644
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -10220,7 +10220,3 @@ RecycleCard: ; 33fd3 (c:7fd3)
dw RecycleEffectCommands ; effect commands
tx RecycleDescription ; description
dw NONE ; description (cont)
-
-rept $1f
- db $ff
-endr
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index b7fb896..2d0ca69 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -8439,7 +8439,3 @@ Func_7594: ; 7594 (1:7594)
OpenBoosterPack: ; 7599 (1:7599)
farcall _OpenBoosterPack
ret
-
-rept $a62
- db $ff
-endr
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index 1b4207b..3657fb5 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -9395,7 +9395,3 @@ NPCMovement_fce3: ; fce3 (3:7ce3)
db NORTH | NO_MOVE
db $ff
; 0xfce5
-
-rept $31b
- db $ff
-endr
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index 63681e7..ccde0ac 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -3573,7 +3573,3 @@ Func_13485: ; 13485 (4:7485)
INCLUDE "data/npc_map_data.asm"
INCLUDE "data/map_objects.asm"
-
-rept $119
- db $ff
-endr
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 1413aed..539c858 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -3340,7 +3340,3 @@ Func_1bae4: ; 1bae4 (6:7ae4)
pop af
scf
ret
-
-rept $508
- db $ff
-endr
diff --git a/src/engine/bank08.asm b/src/engine/bank08.asm
index 22c5199..4b4444c 100644
--- a/src/engine/bank08.asm
+++ b/src/engine/bank08.asm
@@ -8317,7 +8317,3 @@ Func_22bad: ; 22bad (8:6bad)
call CheckLoadedAttackFlag
ccf
ret
-
-rept $143a
- db $ff
-endr
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 18f4d59..0d79171 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -2342,7 +2342,3 @@ AnimData1:: ; 83c4c (20:7c4c)
Palette110:: ; 83c5b (20:7c5b)
db $00, $00
-
-rept $3a3
- db $ff
-endr
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index af207de..581cba4 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -595,5 +595,3 @@ LoadRarityAmountsToWram: ; 1e4ba (7:64ba)
ret
INCLUDE "data/booster_packs.asm"
-
- INCROM $1e640, $20000
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index f102910..cfed469 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -11815,7 +11815,3 @@ HealPlayAreaCardHP: ; 2febc (b:7ebc)
ld [hl], a
ret
; 0x2ff03
-
-rept $fd
- db $ff
-endr
diff --git a/src/engine/home.asm b/src/engine/home.asm
index f12f24d..c23b544 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -1,38 +1,53 @@
; rst vectors
SECTION "rst00", ROM0
ret
+ ds 7
SECTION "rst08", ROM0
ret
+ ds 7
SECTION "rst10", ROM0
ret
+ ds 7
SECTION "rst18", ROM0
jp Bank1Call
+ ds 5
SECTION "rst20", ROM0
jp RST20
+ ds 5
SECTION "rst28", ROM0
jp FarCall
+ ds 5
SECTION "rst30", ROM0
ret
+ ds 7
SECTION "rst38", ROM0
ret
+ ds 7
; interrupts
SECTION "vblank", ROM0
jp VBlankHandler
+ ds 5
SECTION "lcdc", ROM0
call wLCDCFunctionTrampoline
reti
+ ds 4
SECTION "timer", ROM0
jp TimerHandler
+ ds 5
SECTION "serial", ROM0
jp SerialHandler
+ ds 5
SECTION "joypad", ROM0
reti
+ ds $9f
SECTION "romheader", ROM0
nop
jp Start
+ ds $4c
+
SECTION "start", ROM0
Start: ; 0150 (0:0150)
di
@@ -11865,9 +11880,7 @@ DisableInt_LYCoincidence: ; 3f68 (0:3f68)
pop hl
ret
-rept $6a
- db $ff
-endr
+SECTION "Bankswitch 3D To 3F", ROM0
; jumps to 3f:hl, then switches to bank 3d
Bankswitch3dTo3f:: ; 3fe0 (0:3fe0)
@@ -11884,7 +11897,3 @@ Bankswitch3dTo3f:: ; 3fe0 (0:3fe0)
ldh [hBankROM], a
ld [MBC3RomBank], a
ret
-
-rept $a
- db $ff
-endr
diff --git a/src/gfx.asm b/src/gfx.asm
index 32548ce..903cbad 100644
--- a/src/gfx.asm
+++ b/src/gfx.asm
@@ -41,10 +41,6 @@ INCBIN "gfx/duel/other.2bpp"
DuelBoxMessages:: ; 78318 (1e:4318)
INCBIN "gfx/duel/box_messages.2bpp"
-rept $2b68
- db $ff
-endr
-
SECTION "Gfx 3", ROMX
WaterClubTilemap:: ; 84000 (21:4000)
@@ -597,8 +593,6 @@ AnimData12:: ; 87ff4 (21:7ff4)
frame_data 2, 8, 0, 0
frame_data 0, 0, 0, 0
- db $ff
-
SECTION "Gfx 4", ROMX
OverworldMapTiles:: ; 88000 (22:4000)
@@ -653,10 +647,6 @@ Palette109:: ; 8bffb (22:7ffb)
db 1, %11100100
db 0
-rept $2
- db $ff
-endr
-
SECTION "Gfx 5", ROMX
LightningClubTilesetGfx:: ; 8c000 (23:4000)
@@ -789,10 +779,6 @@ Duel60Gfx:: ; 93fda (24:7fda)
dw $2
INCBIN "gfx/duel/anims/60.2bpp"
-rept $4
- db $ff
-endr
-
SECTION "Gfx 7", ROMX
Laboratory1Gfx:: ; 94000 (25:4000)
@@ -849,10 +835,6 @@ AnimData5:: ; 97fe8 (25:7fe8)
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-rept $9
- db $ff
-endr
-
SECTION "Gfx 8", ROMX
Titlescreen3Gfx:: ; 98000 (26:4000)
@@ -1009,10 +991,6 @@ Duel64Gfx:: ; 9ffda (27:7fda)
dw $2
INCBIN "gfx/duel/anims/64.2bpp"
-rept $4
- db $ff
-endr
-
SECTION "Gfx 10", ROMX
DanielGfx:: ; a0000 (28:4000)
@@ -1402,10 +1380,6 @@ AnimData6:: ; a7fe2 (29:7fe2)
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-rept $7
- db $ff
-endr
-
SECTION "Gfx 12", ROMX
Duel46Gfx:: ; a8000 (2a:4000)
@@ -1483,15 +1457,9 @@ FightingGfx:: ; a8e12 (2a:4e12)
SECTION "Anims 1", ROMX
INCLUDE "data/anims1.asm"
- db $ff
-
SECTION "Anims 2", ROMX
INCLUDE "data/anims2.asm"
-rept $2
- db $ff
-endr
-
SECTION "Anims 3", ROMX
INCLUDE "data/anims3.asm"
@@ -1522,10 +1490,6 @@ SECTION "Palettes1", ROMX
SECTION "Palettes2", ROMX
INCLUDE "data/palettes2.asm"
-rept $3b61
- db $ff
-endr
-
SECTION "Card Gfx 1", ROMX
CardGraphics:: ; c4000 (31:4000)
@@ -1614,6 +1578,8 @@ NidorinaCardGfx:: ; c7ca0 (31:7ca0)
INCBIN "gfx/cards/nidorina.2bpp"
INCBIN "gfx/cards/nidorina.pal"
+ ds $58
+
SECTION "Card Gfx 2", ROMX
NidoqueenCardGfx:: ; c8000 (32:4000)
@@ -1700,6 +1666,8 @@ KoffingCardGfx:: ; cbca0 (32:7ca0)
INCBIN "gfx/cards/koffing.2bpp"
INCBIN "gfx/cards/koffing.pal"
+ ds $58
+
SECTION "Card Gfx 3", ROMX
WeezingCardGfx:: ; cc000 (33:4000)
@@ -1786,6 +1754,8 @@ Moltres1CardGfx:: ; cfca0 (33:7ca0)
INCBIN "gfx/cards/moltres1.2bpp"
INCBIN "gfx/cards/moltres1.pal"
+ ds $58
+
SECTION "Card Gfx 4", ROMX
Moltres2CardGfx:: ; d0000 (34:4000)
@@ -1872,6 +1842,8 @@ SeakingCardGfx:: ; d3ca0 (34:7ca0)
INCBIN "gfx/cards/seaking.2bpp"
INCBIN "gfx/cards/seaking.pal"
+ ds $58
+
SECTION "Card Gfx 5", ROMX
StaryuCardGfx:: ; d4000 (35:4000)
@@ -1958,6 +1930,8 @@ Magnemite1CardGfx:: ; d7ca0 (35:7ca0)
INCBIN "gfx/cards/magnemite1.2bpp"
INCBIN "gfx/cards/magnemite1.pal"
+ ds $58
+
SECTION "Card Gfx 6", ROMX
Magnemite2CardGfx:: ; d8000 (36:4000)
@@ -2044,6 +2018,8 @@ MachokeCardGfx:: ; dbca0 (36:7ca0)
INCBIN "gfx/cards/machoke.2bpp"
INCBIN "gfx/cards/machoke.pal"
+ ds $58
+
SECTION "Card Gfx 7", ROMX
MachampCardGfx:: ; dc000 (37:4000)
@@ -2130,6 +2106,8 @@ SlowbroCardGfx:: ; dfca0 (37:7ca0)
INCBIN "gfx/cards/slowbro.2bpp"
INCBIN "gfx/cards/slowbro.pal"
+ ds $58
+
SECTION "Card Gfx 8", ROMX
Gastly1CardGfx:: ; e0000 (38:4000)
@@ -2216,6 +2194,8 @@ RaticateCardGfx:: ; e3ca0 (38:7ca0)
INCBIN "gfx/cards/raticate.2bpp"
INCBIN "gfx/cards/raticate.pal"
+ ds $58
+
SECTION "Card Gfx 9", ROMX
SpearowCardGfx:: ; e4000 (39:4000)
@@ -2302,6 +2282,8 @@ PorygonCardGfx:: ; e7ca0 (39:7ca0)
INCBIN "gfx/cards/porygon.2bpp"
INCBIN "gfx/cards/porygon.pal"
+ ds $58
+
SECTION "Card Gfx 10", ROMX
SnorlaxCardGfx:: ; e8000 (3a:4000)
@@ -2388,6 +2370,8 @@ SwitchCardGfx:: ; ebca0 (3a:7ca0)
INCBIN "gfx/cards/switch.2bpp"
INCBIN "gfx/cards/switch.pal"
+ ds $58
+
SECTION "Card Gfx 11", ROMX
PokemonCenterCardGfx:: ; ec000 (3b:4000)
@@ -2461,7 +2445,3 @@ GamblerCardGfx:: ; ef080 (3b:7080)
RecycleCardGfx:: ; ef388 (3b:7388)
INCBIN "gfx/cards/recycle.2bpp"
INCBIN "gfx/cards/recycle.pal"
-
-rept $970
- db $ff
-endr
diff --git a/src/layout.link b/src/layout.link
index eae9c4e..8fc3f61 100644
--- a/src/layout.link
+++ b/src/layout.link
@@ -29,6 +29,8 @@ ROM0
"romheader"
org $0150
"start"
+ org $3fe0
+ "Bankswitch 3D To 3F"
ROMX $01
"Bank 1"
ROMX $02
@@ -44,10 +46,6 @@ ROMX $07
"Booster Packs"
ROMX $08
"Bank 8"
-ROMX $09
- "Empty Bank 9"
-ROMX $0a
- "Empty Bank A"
ROMX $0b
"Effect Functions"
ROMX $0c
@@ -79,18 +77,12 @@ ROMX $18
"Text 12"
ROMX $19
"Text 13"
-ROMX $1a
- "Empty Bank 1A"
-ROMX $1b
- "Empty Bank 1B"
ROMX $1c
"Bank 1C"
ROMX $1d
"Gfx 1"
ROMX $1e
"Gfx 2"
-ROMX $1f
- "Empty Bank 1F"
ROMX $20
"Bank 20"
ROMX $21
@@ -123,10 +115,6 @@ ROMX $2d
"Palettes1"
ROMX $2e
"Palettes2"
-ROMX $2f
- "Empty Bank 2F"
-ROMX $30
- "Empty Bank 30"
ROMX $31
"Card Gfx 1"
ROMX $32
@@ -149,8 +137,6 @@ ROMX $3a
"Card Gfx 10"
ROMX $3b
"Card Gfx 11"
-ROMX $3c
- "Empty Bank 3C"
ROMX $3d
"Audio 1"
ROMX $3e
diff --git a/src/macros/data.asm b/src/macros/data.asm
index 519468f..b6aeb58 100644
--- a/src/macros/data.asm
+++ b/src/macros/data.asm
@@ -44,12 +44,6 @@ rgb: MACRO
dw (\3 << 10 | \2 << 5 | \1)
ENDM
-emptybank: MACRO
- rept $4000
- db $ff
- endr
-ENDM
-
; poketcg specific macros below
textpointer: MACRO
diff --git a/src/main.asm b/src/main.asm
index 1533d0d..407ea58 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -30,12 +30,6 @@ INCLUDE "engine/booster_packs.asm"
SECTION "Bank 8", ROMX
INCLUDE "engine/bank08.asm"
-SECTION "Empty Bank 9", ROMX
- emptybank
-
-SECTION "Empty Bank A", ROMX
- emptybank
-
SECTION "Effect Functions", ROMX
INCLUDE "engine/effect_functions.asm"
@@ -45,26 +39,8 @@ INCLUDE "data/decks.asm"
SECTION "Cards", ROMX
INCLUDE "data/cards.asm"
-SECTION "Empty Bank 1A", ROMX
- emptybank
-
-SECTION "Empty Bank 1B", ROMX
- emptybank
-
SECTION "Bank 1C", ROMX
INCLUDE "engine/bank1c.asm"
-SECTION "Empty Bank 1F", ROMX
- emptybank
-
SECTION "Bank 20", ROMX
INCLUDE "engine/bank20.asm"
-
-SECTION "Empty Bank 2F", ROMX
- emptybank
-
-SECTION "Empty Bank 30", ROMX
- emptybank
-
-SECTION "Empty Bank 3C", ROMX
- emptybank
diff --git a/src/text/text1.asm b/src/text/text1.asm
index 931a98d..bdc5fa9 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -1151,3 +1151,5 @@ DamageCheckIfHeadsXDamageText: ; 37fcd (d:7fcd)
text "Damage check!"
line "If Heads, x <RAMNUM> damage!!"
done
+
+ ds $d
diff --git a/src/text/text10.asm b/src/text/text10.asm
index 49fb302..4a79b12 100644
--- a/src/text/text10.asm
+++ b/src/text/text10.asm
@@ -1591,3 +1591,5 @@ OpponentAttackMayDoNothingDescription: ; 5bf4b (16:7f4b)
DragonName: ; 5bfd7 (16:7fd7)
text "Dragon"
done
+
+ ds $21
diff --git a/src/text/text11.asm b/src/text/text11.asm
index 5304dfa..0a38b1b 100644
--- a/src/text/text11.asm
+++ b/src/text/text11.asm
@@ -1428,3 +1428,5 @@ AlakazamName: ; 5ffb8 (17:7fb8)
DamageSwapName: ; 5ffc2 (17:7fc2)
text "Damage Swap"
done
+
+ ds $31
diff --git a/src/text/text12.asm b/src/text/text12.asm
index cb4f50a..1ebe4cf 100644
--- a/src/text/text12.asm
+++ b/src/text/text12.asm
@@ -1411,3 +1411,5 @@ PokeBallDescription: ; 63f39 (18:7f39)
ScoopUpName: ; 63fed (18:7fed)
text "Scoop Up"
done
+
+ ds $9
diff --git a/src/text/text13.asm b/src/text/text13.asm
index bb48917..7c36e16 100644
--- a/src/text/text13.asm
+++ b/src/text/text13.asm
@@ -183,7 +183,3 @@ RecycleDescription: ; 6495e (19:495e)
line "in your discard pile on top of your"
line "deck."
done
-
-rept $3655
- db $ff
-endr
diff --git a/src/text/text2.asm b/src/text/text2.asm
index d85eda7..3da7115 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -1909,3 +1909,5 @@ Text026c: ; 3bf9e (e:7f9e)
text "This Deck can only be built if"
line "you dismantle another Deck."
done
+
+ ds $26
diff --git a/src/text/text3.asm b/src/text/text3.asm
index a05ca19..96e039a 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -2030,3 +2030,5 @@ Text0404: ; 3ff4d (f:7f4d)
line "Mason Laboratory"
line " Doctor Mason ;)"
done
+
+ ds $57
diff --git a/src/text/text4.asm b/src/text/text4.asm
index b597fb6..d344459 100644
--- a/src/text/text4.asm
+++ b/src/text/text4.asm
@@ -1058,3 +1058,5 @@ Text048a: ; 43f61 (10:7f61)
Text048b: ; 43fd9 (10:7fd9)
text "Would you like to duel Chris?"
done
+
+ ds $8
diff --git a/src/text/text5.asm b/src/text/text5.asm
index 809cb63..4bee1d2 100644
--- a/src/text/text5.asm
+++ b/src/text/text5.asm
@@ -1020,3 +1020,5 @@ Text0523: ; 47f08 (11:7f08)
text "Hey, <RAMNAME>!"
line "What are you doing here?"
done
+
+ ds $d6
diff --git a/src/text/text6.asm b/src/text/text6.asm
index eb045ea..b1a9ada 100644
--- a/src/text/text6.asm
+++ b/src/text/text6.asm
@@ -1185,3 +1185,5 @@ Text05da: ; 4be3e (12:7e3e)
line "Powers, so read each card's text"
line "carefully."
done
+
+ ds $bc
diff --git a/src/text/text7.asm b/src/text/text7.asm
index 8c2e855..9581369 100644
--- a/src/text/text7.asm
+++ b/src/text/text7.asm
@@ -1132,3 +1132,5 @@ Text0683: ; 4ffa9 (13:7fa9)
text "And here, take this"
line "LABORATORY Booster Pack!"
done
+
+ ds $29
diff --git a/src/text/text8.asm b/src/text/text8.asm
index 6bd0fe6..73b32b9 100644
--- a/src/text/text8.asm
+++ b/src/text/text8.asm
@@ -1233,3 +1233,5 @@ Text073e: ; 53d5b (14:7d5b)
line "Duels are worthy of"
line "the Legendary Pokémon Cards."
done
+
+ ds $17a
diff --git a/src/text/text9.asm b/src/text/text9.asm
index 295d7c1..9bd93af 100644
--- a/src/text/text9.asm
+++ b/src/text/text9.asm
@@ -1485,3 +1485,5 @@ KakunasStiffenDescription: ; 57f57 (15:7f57)
line "opponent's next turn. (Any other"
line "effects of attacks still happen.)"
done
+
+ ds $20
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 11:53:11 +0000