diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | home.asm | 4 | ||||
| -rwxr-xr-x | interrupts.asm | 10 | ||||
| -rw-r--r-- | rst.asm | 16 | ||||
| -rwxr-xr-x | sram.asm | 14 | ||||
| -rw-r--r-- | wram.asm | 24 |
6 files changed, 36 insertions, 36 deletions
@@ -41,11 +41,11 @@ compare: pokegold.gbc pokesilver.gbc rgbasm -D SILVER -o $@ $< pokegold.gbc: $(gold_obj) - rgblink -n pokegold.sym -m pokegold.map -o $@ $^ + rgblink -n pokegold.sym -m pokegold.map -l pokegold.ld -o $@ $^ rgbfix -cjsv -i AAUE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t "POKEMON_GLD" $@ pokesilver.gbc: $(silver_obj) - rgblink -n pokesilver.sym -m pokesilver.map -o $@ $^ + rgblink -n pokesilver.sym -m pokesilver.map -l pokegold.ld -o $@ $^ rgbfix -cjsv -i AAXE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t "POKEMON_SLV" $@ pngs: @@ -4,12 +4,12 @@ INCLUDE "includes.asm" INCLUDE "rst.asm" INCLUDE "interrupts.asm" -SECTION "start", ROM0[$100] +SECTION "start", ROM0 Start:: nop jp _Start -SECTION "bank0", ROM0[$150] +SECTION "bank0", ROM0 INCLUDE "home/vblank.asm" INCLUDE "home/delay.asm" INCLUDE "home/rtc.asm" diff --git a/interrupts.asm b/interrupts.asm index 3467f9b6..2b0d9e0f 100755 --- a/interrupts.asm +++ b/interrupts.asm @@ -1,16 +1,16 @@ ; Game Boy hardware interrupts -SECTION "vblank",ROM0[$40] +SECTION "vblank",ROM0 jp VBlank -SECTION "lcd",ROM0[$48] +SECTION "lcd",ROM0 jp LCD -SECTION "timer",ROM0[$50] +SECTION "timer",ROM0 reti -SECTION "serial",ROM0[$58] +SECTION "serial",ROM0 jp Serial -SECTION "joypad",ROM0[$60] +SECTION "joypad",ROM0 jp JoypadInt @@ -1,24 +1,24 @@ ; rst vectors -SECTION "rst0",ROM0[0] +SECTION "rst0",ROM0 di jp Start -SECTION "rst8",ROM0[FarCall] +SECTION "rst8",ROM0 jp FarCall_hl -SECTION "rst10",ROM0[Bankswitch] +SECTION "rst10",ROM0 ld [hROMBank], a ld [MBC3RomBank], a ret -SECTION "rst18",ROM0[$18] +SECTION "rst18",ROM0 rst $38 -SECTION "rst20",ROM0[$20] +SECTION "rst20",ROM0 rst $38 -SECTION "rst28",ROM0[JumpTable] +SECTION "rst28",ROM0 push de ld e, a ld d, 0 @@ -30,8 +30,8 @@ SECTION "rst28",ROM0[JumpTable] pop de jp hl -; SECTION "rst30",ROM0[$30] +; SECTION "rst30",ROM0 ; rst30 is midst rst28 -SECTION "rst38",ROM0[$38] +SECTION "rst38",ROM0 rst $38 @@ -1,10 +1,10 @@ -SECTION "Scratch", SRAM[$a000], BANK[0] +SECTION "Scratch", SRAM, BANK[0] sScratch:: ds $188 ; a000 -SECTION "Decompress Buffer", SRAM[$a188], BANK[0] +SECTION "Decompress Buffer", SRAM, BANK[0] sDecompressBuffer:: ds 7 * 7 * $10 ; a188 -SECTION "SRAM0", SRAM[$a498], BANK[$0] +SECTION "SRAM0", SRAM, BANK[$0] s0_a498:: ds 1 ; 0:a498 s0_a499:: ds 1 ; 0:a499 s0_a49a:: ds 1 ; 0:a49a @@ -7021,7 +7021,7 @@ s0_bffd:: ds 1 ; 0:bffd s0_bffe:: ds 1 ; 0:bffe sWindowStackTop:: ds 1 ; 0:bfff -SECTION "SRAM1", SRAM[$a000], BANK[$1] +SECTION "SRAM1", SRAM, BANK[$1] s1_a000:: ds 1 ; 1:a000 s1_a001:: ds 1 ; 1:a001 s1_a002:: ds 1 ; 1:a002 @@ -10459,7 +10459,7 @@ s1_ad69:: ds 1 ; 1:ad69 s1_ad6a:: ds 1 ; 1:ad6a s1_ad6b:: ds 1 ; 1:ad6b -SECTION "Active Box", SRAM[$ad6c], BANK[1] +SECTION "Active Box", SRAM, BANK[1] ; 1:ad6c box sBox ; 1:b1bc @@ -14117,7 +14117,7 @@ s1_bffd:: ds 1 ; 1:bffd s1_bffe:: ds 1 ; 1:bffe s1_bfff:: ds 1 ; 1:bfff -SECTION "SRAM2", SRAM[$a000], BANK[$2] +SECTION "SRAM2", SRAM, BANK[$2] box sBox1 box sBox2 box sBox3 @@ -14126,7 +14126,7 @@ SECTION "SRAM2", SRAM[$a000], BANK[$2] box sBox6 box sBox7 -SECTION "SRAM3", SRAM[$a000], BANK[$3] +SECTION "SRAM3", SRAM, BANK[$3] box sBox8 box sBox9 box sBox10 @@ -1,7 +1,7 @@ INCLUDE "includes.asm" INCLUDE "macros/wram.asm" -SECTION "Audio", WRAM0[$c000] +SECTION "Audio", WRAM0 wc000:: wMusic:: wMusicPlaying:: ; c000 @@ -123,7 +123,7 @@ wMapMusic:: ; c1c0 wDontPlayMapMusicOnReload:: ds 1 wMusicEnd:: -SECTION "WRAM", WRAM0[$c1c2] +SECTION "WRAM", WRAM0 wLZAddress:: dw ; c1c2 wLZBank:: ds 1 ; c1c4 wc1c5:: ds 1 ; c1c5 @@ -185,7 +185,7 @@ wc1fd:: ds 1 ; c1fd wc1fe:: ds 1 ; c1fe wc1ff:: ds 1 ; c1ff -SECTION "GBC Palettes", WRAM0[$c200] +SECTION "GBC Palettes", WRAM0 palbuffer: MACRO \1Pal0:: ds 8 \1Pal1:: ds 8 @@ -202,16 +202,16 @@ wTempOBPals:: palbuffer wTempOB ; c240 wBGPals:: palbuffer wBG ; c280 wOBPals:: palbuffer wOB ; c2c0 -SECTION "OAM Buffer", WRAM0[$c300] +SECTION "OAM Buffer", WRAM0 wOAMBuffer:: ; c300 ds 4 * 40 -SECTION "TileMap", WRAM0[$c3a0] +SECTION "TileMap", WRAM0 wTileMap:: ; c3a0 ds SCREEN_HEIGHT * SCREEN_WIDTH wTileMapEnd:: ; c508 -SECTION "Animated Objects", WRAM0[$c508] +SECTION "Animated Objects", WRAM0 wMisc:: ; c508 wTileMapBackup:: ; c508 ; ds SCREEN_HEIGHT * SCREEN_WIDTH @@ -1812,7 +1812,7 @@ wcc1d:: ds 1 ; cc1d wcc1e:: ds 1 ; cc1e wcc1f:: ds 1 ; cc1f -SECTION "Video", WRAM0[$cc20] +SECTION "Video", WRAM0 wBGMapBuffer:: ds 1 ; cc20 wcc21:: ds 1 ; cc21 wcc22:: ds 1 ; cc22 @@ -2387,7 +2387,7 @@ wcffd:: ds 1 ; cffd wcffe:: ds 1 ; cffe wcfff:: ds 1 ; cfff -SECTION "WRAM1", WRAMX[$d000], BANK[$1] +SECTION "WRAM1", WRAMX, BANK[$1] wd000:: ds 1 ; d000 wd001:: ds 1 ; d001 wd002:: ds 1 ; d002 @@ -2726,7 +2726,7 @@ wd19e:: ds 1 ; d19e wd19f:: ds 1 ; d19f wd1a0:: ds 1 ; d1a0 -SECTION "Game Data", WRAMX[$d1a1], BANK[1] +SECTION "Game Data", WRAMX, BANK[1] wGameData:: wPlayerID:: dw ; d1a1 @@ -3632,7 +3632,7 @@ wda1f:: ds 1 ; da1f wda20:: ds 1 ; da20 wda21:: ds 1 ; da21 -SECTION "Party", WRAMX[$da22], BANK[1] +SECTION "Party", WRAMX, BANK[1] wPokemonData:: wPartyCount:: ds 1 ; da22 @@ -3867,7 +3867,7 @@ wdd52:: ds 1 ; dd52 wdd53:: ds 1 ; dd53 wdd54:: ds 1 ; dd54 -SECTION "OT Party", WRAMX[$dd55], BANK[1] +SECTION "OT Party", WRAMX, BANK[1] wOTPartyCount:: ds 1 ; dd55 wOTPartySpecies:: ds PARTY_LENGTH ; dd56 @@ -3920,7 +3920,7 @@ ENDU wGameDataEnd:: -SECTION "Stack", WRAMX[$dfff], BANK[1] +SECTION "Stack", WRAMX, BANK[1] wStackTop:: ds 1 |