diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/audio.asm | 6 | ||||
| -rwxr-xr-x | src/engine/home.asm | 30 | ||||
| -rw-r--r-- | src/gfx.asm | 62 | ||||
| -rwxr-xr-x | src/main.asm | 28 | ||||
| -rwxr-xr-x | src/sram.asm | 2 | ||||
| -rwxr-xr-x | src/text.asm | 30 | ||||
| -rw-r--r-- | src/vram.asm | 2 | ||||
| -rwxr-xr-x | src/wram.asm | 28 |
8 files changed, 91 insertions, 97 deletions
diff --git a/src/audio.asm b/src/audio.asm index f3649f0..2c0d4e5 100755 --- a/src/audio.asm +++ b/src/audio.asm @@ -1,11 +1,11 @@ INCLUDE "constants.asm" INCLUDE "macros.asm" -SECTION "bank3D",ROMX,BANK[$3D] +SECTION "bank3D", ROMX INCLUDE "audio/music1.asm" -SECTION "bank3E",ROMX,BANK[$3E] +SECTION "bank3E", ROMX INCLUDE "audio/music2.asm" -SECTION "bank3F",ROMX,BANK[$3F] +SECTION "bank3F", ROMX INCLUDE "audio/sfx.asm" diff --git a/src/engine/home.asm b/src/engine/home.asm index 2724a66..b3d89f1 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -1,39 +1,39 @@ ; rst vectors -SECTION "rst00",ROM0[0] +SECTION "rst00", ROM0 ret -SECTION "rst08",ROM0[8] +SECTION "rst08", ROM0 ret -SECTION "rst10",ROM0[$10] +SECTION "rst10", ROM0 ret -SECTION "rst18",ROM0[$18] +SECTION "rst18", ROM0 jp RST18 -SECTION "rst20",ROM0[$20] +SECTION "rst20", ROM0 jp RST20 -SECTION "rst28",ROM0[$28] +SECTION "rst28", ROM0 jp RST28 -SECTION "rst30",ROM0[$30] +SECTION "rst30", ROM0 ret -SECTION "rst38",ROM0[$38] +SECTION "rst38", ROM0 ret ; interrupts -SECTION "vblank",ROM0[$40] +SECTION "vblank", ROM0 jp VBlankHandler -SECTION "lcdc",ROM0[$48] +SECTION "lcdc", ROM0 call wLCDCFunctiontrampoline reti -SECTION "timer",ROM0[$50] +SECTION "timer", ROM0 jp TimerHandler -SECTION "serial",ROM0[$58] +SECTION "serial", ROM0 jp SerialHandler -SECTION "joypad",ROM0[$60] +SECTION "joypad", ROM0 reti -SECTION "romheader",ROM0[$100] +SECTION "romheader", ROM0 nop jp Start -SECTION "start",ROM0[$150] +SECTION "start", ROM0 Start: ; 0150 (0:0150) di ld sp, $fffe diff --git a/src/gfx.asm b/src/gfx.asm index 8004951..6195a67 100644 --- a/src/gfx.asm +++ b/src/gfx.asm @@ -1,6 +1,6 @@ INCLUDE "macros.asm" -SECTION "bank1D",ROMX,BANK[$1D] +SECTION "bank1D", ROMX Fonts:: ; 74000 (1d:4000) INCBIN "gfx/fonts.t3.1bpp" @@ -10,7 +10,7 @@ INCBIN "gfx/vwf.1bpp" DuelGraphics:: ; 76968 (1d:6968) INCBIN "gfx/duel/duel1.t5.2bpp",$0,$1698 -SECTION "bank1E",ROMX,BANK[$1E] +SECTION "bank1E", ROMX INCBIN "gfx/duel/duel1.t5.2bpp",$1698,$318 INCBIN "gfx/duel/duel2.2bpp" @@ -18,10 +18,10 @@ rept $2b68 db $ff endr -SECTION "bank1F",ROMX,BANK[$1F] +SECTION "bank1F", ROMX emptybank -SECTION "bank21",ROMX,BANK[$21] +SECTION "bank21", ROMX INCROM $84000, $87828 IshiharaTilesetGfx: ; 87828 (21:7828) @@ -50,7 +50,7 @@ Unnamed2Gfx: ; 87fe2 (21:7fe2) INCROM $87ff4, $88000 -SECTION "bank22",ROMX,BANK[$22] +SECTION "bank22", ROMX OverworldMapTiles: ; 88000 (22:4000) dw $c1 INCBIN "gfx/overworld_map.t15.2bpp" @@ -93,7 +93,7 @@ Unnamed3Gfx: ; 8bfd2 (22:7fd2) INCROM $8bfe4, $8C000 -SECTION "bank23",ROMX,BANK[$23] +SECTION "bank23", ROMX LightningClubTilesetGfx: ; 8c000 (23:4000) dw $83 INCBIN "gfx/tilesets/lightningclub.t13.2bpp" @@ -157,7 +157,7 @@ PoisonGfx: ; 8ffa4 (23:7fa4) INCROM $8ffe6, $90000 -SECTION "bank24",ROMX,BANK[$24] +SECTION "bank24", ROMX CardPop1Gfx: ; 90000 (24:4000) dw $bd INCBIN "gfx/cardpop1.t3.2bpp" @@ -218,7 +218,7 @@ rept $4 db $ff endr -SECTION "bank25",ROMX,BANK[$25] +SECTION "bank25", ROMX Laboratory1Gfx: ; 94000 (25:4000) dw $60 INCBIN "gfx/boosterpacks/laboratory1.2bpp" @@ -269,7 +269,7 @@ RonaldOWGfx: ; 97ea6 (25:7ea6) INCROM $97fe8, $98000 -SECTION "bank26",ROMX,BANK[$26] +SECTION "bank26", ROMX Titlescreen3Gfx: ; 98000 (26:4000) dw $f4 INCBIN "gfx/titlescreen/titlescreen3.t12.2bpp" @@ -302,7 +302,7 @@ Unnamed7Gfx: ; 9bfee (26:7fee) dw $1 INCBIN "gfx/unnamed/7.2bpp" -SECTION "bank27",ROMX,BANK[$27] +SECTION "bank27", ROMX SamGfx: ; 9c000 (27:4000) dw $24 INCBIN "gfx/duelists/sam.2bpp" @@ -427,7 +427,7 @@ rept $4 db $ff endr -SECTION "bank28",ROMX,BANK[$28] +SECTION "bank28", ROMX DanielGfx: ; a0000 (28:4000) dw $24 INCBIN "gfx/duelists/daniel.2bpp" @@ -602,7 +602,7 @@ Unnamed11Gfx: ; a3fb4 (28:7fb4) INCROM $a3ff6, $a4000 -SECTION "bank29",ROMX,BANK[$29] +SECTION "bank29", ROMX OWSprite30: ; a4000 (29:4000) dw $14 INCBIN "gfx/ow/sprite30.2bpp" @@ -801,7 +801,7 @@ Duel45Gfx: ; a7fb0 (29:7fb0) INCROM $a7fe2, $a8000 -SECTION "bank2A",ROMX,BANK[$2A] +SECTION "bank2A", ROMX Duel46Gfx: ; a8000 (2a:4000) dw $08 INCBIN "gfx/duel/46.2bpp" @@ -876,25 +876,25 @@ FightingGfx: ; a8e12 (2a:4e12) INCROM $a8e54, $ac000 -SECTION "bank2B",ROMX,BANK[$2B] +SECTION "bank2B", ROMX INCBIN "baserom.gbc",$AC000,$4000 -SECTION "bank2C",ROMX,BANK[$2C] +SECTION "bank2C", ROMX INCBIN "baserom.gbc",$B0000,$4000 -SECTION "bank2D",ROMX,BANK[$2D] +SECTION "bank2D", ROMX INCBIN "baserom.gbc",$B4000,$4000 -SECTION "bank2E",ROMX,BANK[$2E] +SECTION "bank2E", ROMX INCBIN "baserom.gbc",$B8000,$4000 -SECTION "bank2F",ROMX,BANK[$2F] +SECTION "bank2F", ROMX emptybank -SECTION "bank30",ROMX,BANK[$30] +SECTION "bank30", ROMX emptybank -SECTION "bank31",ROMX,BANK[$31] +SECTION "bank31", ROMX CardGraphics:: ; c4000 (31:4000) GrassEnergyCardGfx:: ; c4000 (31:4000) @@ -981,7 +981,7 @@ NidorinaCardGfx:: ; c7ca0 (31:7ca0) INCBIN "gfx/cards/nidorina.8x6.2bpp" INCBIN "gfx/cards/nidorina.pal" -SECTION "bank32",ROMX,BANK[$32] +SECTION "bank32", ROMX NidoqueenCardGfx:: ; c8000 (32:4000) INCBIN "gfx/cards/nidoqueen.8x6.2bpp" INCBIN "gfx/cards/nidoqueen.pal" @@ -1066,7 +1066,7 @@ KoffingCardGfx:: ; cbca0 (32:7ca0) INCBIN "gfx/cards/koffing.8x6.2bpp" INCBIN "gfx/cards/koffing.pal" -SECTION "bank33",ROMX,BANK[$33] +SECTION "bank33", ROMX WeezingCardGfx:: ; cc000 (33:4000) INCBIN "gfx/cards/weezing.8x6.2bpp" INCBIN "gfx/cards/weezing.pal" @@ -1151,7 +1151,7 @@ Moltres1CardGfx:: ; cfca0 (33:7ca0) INCBIN "gfx/cards/moltres1.8x6.2bpp" INCBIN "gfx/cards/moltres1.pal" -SECTION "bank34",ROMX,BANK[$34] +SECTION "bank34", ROMX Moltres2CardGfx:: ; d0000 (34:4000) INCBIN "gfx/cards/moltres2.8x6.2bpp" INCBIN "gfx/cards/moltres2.pal" @@ -1236,7 +1236,7 @@ SeakingCardGfx:: ; d3ca0 (34:7ca0) INCBIN "gfx/cards/seaking.8x6.2bpp" INCBIN "gfx/cards/seaking.pal" -SECTION "bank35",ROMX,BANK[$35] +SECTION "bank35", ROMX StaryuCardGfx:: ; d4000 (35:4000) INCBIN "gfx/cards/staryu.8x6.2bpp" INCBIN "gfx/cards/staryu.pal" @@ -1321,7 +1321,7 @@ Magnemite1CardGfx:: ; d7ca0 (35:7ca0) INCBIN "gfx/cards/magnemite1.8x6.2bpp" INCBIN "gfx/cards/magnemite1.pal" -SECTION "bank36",ROMX,BANK[$36] +SECTION "bank36", ROMX Magnemite2CardGfx:: ; d8000 (36:4000) INCBIN "gfx/cards/magnemite2.8x6.2bpp" INCBIN "gfx/cards/magnemite2.pal" @@ -1406,7 +1406,7 @@ MachokeCardGfx:: ; dbca0 (36:7ca0) INCBIN "gfx/cards/machoke.8x6.2bpp" INCBIN "gfx/cards/machoke.pal" -SECTION "bank37",ROMX,BANK[$37] +SECTION "bank37", ROMX MachampCardGfx:: ; dc000 (37:4000) INCBIN "gfx/cards/machamp.8x6.2bpp" INCBIN "gfx/cards/machamp.pal" @@ -1491,7 +1491,7 @@ SlowbroCardGfx:: ; dfca0 (37:7ca0) INCBIN "gfx/cards/slowbro.8x6.2bpp" INCBIN "gfx/cards/slowbro.pal" -SECTION "bank38",ROMX,BANK[$38] +SECTION "bank38", ROMX Gastly1CardGfx:: ; e0000 (38:4000) INCBIN "gfx/cards/gastly1.8x6.2bpp" INCBIN "gfx/cards/gastly1.pal" @@ -1576,7 +1576,7 @@ RaticateCardGfx:: ; e3ca0 (38:7ca0) INCBIN "gfx/cards/raticate.8x6.2bpp" INCBIN "gfx/cards/raticate.pal" -SECTION "bank39",ROMX,BANK[$39] +SECTION "bank39", ROMX SpearowCardGfx:: ; e4000 (39:4000) INCBIN "gfx/cards/spearow.8x6.2bpp" INCBIN "gfx/cards/spearow.pal" @@ -1661,7 +1661,7 @@ PorygonCardGfx:: ; e7ca0 (39:7ca0) INCBIN "gfx/cards/porygon.8x6.2bpp" INCBIN "gfx/cards/porygon.pal" -SECTION "bank3A",ROMX,BANK[$3A] +SECTION "bank3A", ROMX SnorlaxCardGfx:: ; e8000 (3a:4000) INCBIN "gfx/cards/snorlax.8x6.2bpp" INCBIN "gfx/cards/snorlax.pal" @@ -1746,7 +1746,7 @@ SwitchCardGfx:: ; ebca0 (3a:7ca0) INCBIN "gfx/cards/switch.8x6.2bpp" INCBIN "gfx/cards/switch.pal" -SECTION "bank3B",ROMX,BANK[$3B] +SECTION "bank3B", ROMX PokemonCenterCardGfx:: ; ec000 (3b:4000) INCBIN "gfx/cards/pokemoncenter.8x6.2bpp" INCBIN "gfx/cards/pokemoncenter.pal" @@ -1823,5 +1823,5 @@ rept $970 db $ff endr -SECTION "bank3C",ROMX,BANK[$3C] +SECTION "bank3C", ROMX emptybank diff --git a/src/main.asm b/src/main.asm index 3f294cb..19aefae 100755 --- a/src/main.asm +++ b/src/main.asm @@ -3,46 +3,46 @@ INCLUDE "macros.asm" INCLUDE "engine/home.asm" -SECTION "bank1",ROMX,BANK[$1] +SECTION "bank1", ROMX INCLUDE "engine/bank1.asm" -SECTION "bank2",ROMX,BANK[$2] +SECTION "bank2", ROMX INCLUDE "engine/bank2.asm" -SECTION "bank3",ROMX,BANK[$3] +SECTION "bank3", ROMX INCLUDE "engine/bank3.asm" -SECTION "bank4",ROMX,BANK[$4] +SECTION "bank4", ROMX INCLUDE "engine/bank4.asm" -SECTION "bank5",ROMX,BANK[$5] +SECTION "bank5", ROMX INCLUDE "engine/bank5.asm" -SECTION "bank6",ROMX,BANK[$6] +SECTION "bank6", ROMX INCLUDE "engine/bank6.asm" -SECTION "bank7",ROMX,BANK[$7] +SECTION "bank7", ROMX INCLUDE "engine/bank7.asm" INCLUDE "engine/boosters.asm" -SECTION "bank8",ROMX,BANK[$8] +SECTION "bank8", ROMX INCLUDE "engine/bank8.asm" -SECTION "bank9",ROMX,BANK[$9] +SECTION "bank9", ROMX emptybank -SECTION "bankA",ROMX,BANK[$A] +SECTION "bankA", ROMX emptybank -SECTION "bankB",ROMX,BANK[$B] +SECTION "bankB", ROMX INCLUDE "engine/effect_functions.asm" -SECTION "bankC",ROMX,BANK[$C] +SECTION "bankC", ROMX INCLUDE "data/decks.asm" INCLUDE "data/cards.asm" -SECTION "bank1C",ROMX,BANK[$1C] +SECTION "bank1C", ROMX INCLUDE "engine/bank1c.asm" -SECTION "bank20",ROMX,BANK[$20] +SECTION "bank20", ROMX INCLUDE "engine/bank20.asm" diff --git a/src/sram.asm b/src/sram.asm index bd095fc..40e1f93 100755 --- a/src/sram.asm +++ b/src/sram.asm @@ -1,4 +1,4 @@ -SECTION "Working Cards", SRAM, BANK[0] +SECTION "Working Cards", SRAM ds $100 diff --git a/src/text.asm b/src/text.asm index 3bb3aee..933e27a 100755 --- a/src/text.asm +++ b/src/text.asm @@ -1,48 +1,48 @@ INCLUDE "constants.asm" INCLUDE "macros.asm" -SECTION "bankD",ROMX,BANK[$D] +SECTION "bankD", ROMX INCLUDE "text/text_offsets.asm" INCLUDE "text/text1.asm" -SECTION "bankE",ROMX,BANK[$E] +SECTION "bankE", ROMX INCLUDE "text/text2.asm" -SECTION "bankF",ROMX,BANK[$F] +SECTION "bankF", ROMX INCLUDE "text/text3.asm" -SECTION "bank10",ROMX,BANK[$10] +SECTION "bank10", ROMX INCLUDE "text/text4.asm" -SECTION "bank11",ROMX,BANK[$11] +SECTION "bank11", ROMX INCLUDE "text/text5.asm" -SECTION "bank12",ROMX,BANK[$12] +SECTION "bank12", ROMX INCLUDE "text/text6.asm" -SECTION "bank13",ROMX,BANK[$13] +SECTION "bank13", ROMX INCLUDE "text/text7.asm" -SECTION "bank14",ROMX,BANK[$14] +SECTION "bank14", ROMX INCLUDE "text/text8.asm" -SECTION "bank15",ROMX,BANK[$15] +SECTION "bank15", ROMX INCLUDE "text/text9.asm" -SECTION "bank16",ROMX,BANK[$16] +SECTION "bank16", ROMX INCLUDE "text/texta.asm" -SECTION "bank17",ROMX,BANK[$17] +SECTION "bank17", ROMX INCLUDE "text/textb.asm" -SECTION "bank18",ROMX,BANK[$18] +SECTION "bank18", ROMX INCLUDE "text/textc.asm" -SECTION "bank19",ROMX,BANK[$19] +SECTION "bank19", ROMX INCLUDE "text/textd.asm" -SECTION "bank1A",ROMX,BANK[$1A] +SECTION "bank1A", ROMX emptybank -SECTION "bank1B",ROMX,BANK[$1B] +SECTION "bank1B", ROMX emptybank diff --git a/src/vram.asm b/src/vram.asm index 07972de..b4a34b2 100644 --- a/src/vram.asm +++ b/src/vram.asm @@ -1,4 +1,4 @@ -SECTION "VRAM", VRAM, BANK[0] +SECTION "VRAM", VRAM vTiles0:: ds $800 ; 8000 vTiles1:: ds $800 ; 8800 diff --git a/src/wram.asm b/src/wram.asm index b6e5c3e..be66a68 100755 --- a/src/wram.asm +++ b/src/wram.asm @@ -3,17 +3,13 @@ INCLUDE "macros.asm" INCLUDE "vram.asm" -;---------------------------------------------------------- -;--- Bank 0: $Cxxx ---------------------------------------- -;---------------------------------------------------------- - -SECTION "WRAM0", WRAM0 +SECTION "WRAM Temp Card Collection", WRAM0 wTempCardCollection:: ; c000 ds $100 ds $100 -;--- Duel variables ---------------------------------------------- +SECTION "WRAM Duel Variables", WRAM0 wPlayerDuelVariables:: ; c200 @@ -205,7 +201,7 @@ wDuelCardOrAttackList:: ; c510 wc590:: ; c590 ds $70 -;--- Text engine ------------------------------------------ +SECTION "WRAM Text Engine", WRAM0 wc600:: ; c600 ds $100 @@ -219,7 +215,7 @@ wc800:: ; c800 wc900:: ; c900 ds $100 -;--- Engine ----------------------------------------------- +SECTION "WRAM Engine 1", WRAM0 wBufOAM:: ; ca00 ds $a0 @@ -280,8 +276,8 @@ wFlushPaletteFlags:: ; cabf wVBlankOAMCopyToggle:: ; cac0 ds $1 - -wcac1:: ; cac1 + +wcac1:: ; cac1 ds $1 wcac2:: ; cac2 @@ -337,7 +333,7 @@ wBufPalette:: ; caf0 ds $80 ds $4 -;--- Serial transfer bytes (cb74-cbc4) -------------------- +SECTION "WRAM Serial transfer bytes", WRAM0 wSerialOp:: ; cb74 ds $1 @@ -386,7 +382,7 @@ wSerialRecvBuf:: ; cba5 - cbc4 ds $20 ds $1 -;--- Engine ---------------------------------------------- +SECTION "WRAM Duels", WRAM0 ; In a duel, the main menu current or last selected menu item ; From 0 to 5: Hand, Attack, Check, Pkmn Power, Retreat, Done @@ -595,6 +591,8 @@ wccf1:: ; ccf1 wccf2:: ; ccf2 ds $1 +SECTION "WRAM Engine 2", WRAM0 + ; color/pattern of the text box border. Values between 0-7?. Interpreted differently depending on console type ; Note that this doesn't appear to be a selectable option, just changes with the situation. ; For example the value 4 seems to be used a lot during duels. @@ -785,11 +783,7 @@ wcfb9:: ; cfb9 wcfe3:: ; cfe3 -;---------------------------------------------------------- -;--- Bank 1: $Dxxx ---------------------------------------- -;---------------------------------------------------------- - -SECTION "WRAM1", WRAMX, BANK[1] +SECTION "WRAM1", WRAMX ds $a9 wd0a9:: ; d0a9 |