diff --git a/.gitignore b/.gitignore index 502cab285..3a35100af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # precompiled python *.pyc +# precompiled jython +*$py.class + # compiled object file *.o @@ -37,5 +40,3 @@ pokecrystal.rtc # some users are dumping png.py into extras/ extras/png.py - -*$py.class diff --git a/Makefile b/Makefile index f44b4eb89..06de33b56 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ pngs: lzs: $(LZ_GFX) $(TWOBPP_GFX) @: -gfx/pics/%/front.lz: gfx/pics/%/front.png gfx/pics/%/tiles.2bpp +gfx/pics/%/front.lz: gfx/pics/%/tiles.2bpp gfx/pics/%/front.png python extras/gfx.py png-to-lz --front $^ gfx/pics/%/tiles.2bpp: gfx/pics/%/tiles.png python extras/gfx.py png-to-2bpp $< diff --git a/README.md b/README.md index 6adb65625..f191cd917 100644 --- a/README.md +++ b/README.md @@ -31,4 +31,3 @@ Eventually this will not be necessary. * Hang out with us on irc: **[nucleus.kafuka.org #skeetendo](https://kiwiirc.com/client/irc.nolimitzone.com/?#skeetendo)** * Disassembly of **[Pokémon Red](http://bitbucket.org/iimarckus/pokered)**. - diff --git a/main.asm b/main.asm index 97fe6ae30..05bc133c6 100644 --- a/main.asm +++ b/main.asm @@ -1,23 +1,23 @@ -SECTION "bank0",HOME -SECTION "rst0",HOME[$0] +SECTION "bank0",ROM0 +SECTION "rst0",ROM0[$0] di jp Start -SECTION "rst8",HOME[$8] ; FarCall +SECTION "rst8",ROM0[$8] ; FarCall jp FarJpHl -SECTION "rst10",HOME[$10] ; Bankswitch +SECTION "rst10",ROM0[$10] ; Bankswitch ld [hROMBank], a ld [MBC3RomBank], a ret -SECTION "rst18",HOME[$18] ; Unused +SECTION "rst18",ROM0[$18] ; Unused rst $38 -SECTION "rst20",HOME[$20] ; Unused +SECTION "rst20",ROM0[$20] ; Unused rst $38 -SECTION "rst28",HOME[$28] ; JumpTable +SECTION "rst28",ROM0[$28] ; JumpTable push de ld e, a ld d, 0 @@ -31,30 +31,30 @@ SECTION "rst28",HOME[$28] ; JumpTable ; rst30 is midst rst28 -SECTION "rst38",HOME[$38] ; Unused +SECTION "rst38",ROM0[$38] ; Unused rst $38 -SECTION "vblank",HOME[$40] ; vblank interrupt +SECTION "vblank",ROM0[$40] ; vblank interrupt jp VBlank -SECTION "lcd",HOME[$48] ; lcd interrupt +SECTION "lcd",ROM0[$48] ; lcd interrupt jp Function552 -SECTION "timer",HOME[$50] ; timer interrupt +SECTION "timer",ROM0[$50] ; timer interrupt jp Function3e93 -SECTION "serial",HOME[$58] ; serial interrupt +SECTION "serial",ROM0[$58] ; serial interrupt jp Function6ef -SECTION "joypad",HOME[$60] ; joypad interrupt +SECTION "joypad",ROM0[$60] ; joypad interrupt jp JoypadInt -SECTION "romheader",HOME[$100] +SECTION "romheader",ROM0[$100] Start: nop jp _Start -SECTION "start",HOME[$150] +SECTION "start",ROM0[$150] Reset: ; 150 di @@ -13047,7 +13047,7 @@ Function3f9f: ; 3f9f ; 3fb5 -SECTION "bank1",DATA,BANK[$1] +SECTION "bank1",ROMX,BANK[$1] Function4000: ; 4000 @@ -20044,7 +20044,7 @@ Function747a: ; 747a ; 747b -SECTION "bank2",DATA,BANK[$2] +SECTION "bank2",ROMX,BANK[$2] Function8000: ; 8000 call Function2ed3 @@ -21991,7 +21991,7 @@ INCBIN "tilesets/dark.pal" INCBIN "baserom.gbc", $b419, $b825 - $b419 -SECTION "bank3",DATA,BANK[$3] +SECTION "bank3",ROMX,BANK[$3] Functionc000: ; c000 ld a, [TimeOfDay] @@ -25802,7 +25802,7 @@ Functionf9ea: ; f9ea INCBIN "baserom.gbc", $fa06, $fa0b - $fa06 -SECTION "bank4",DATA,BANK[$4] +SECTION "bank4",ROMX,BANK[$4] Function10000: ; 10000 ld hl, Options @@ -28911,7 +28911,7 @@ root set root+1 ; 13d96 -SECTION "bank5",DATA,BANK[$5] +SECTION "bank5",ROMX,BANK[$5] Function14000: ; 14000 @@ -33310,7 +33310,7 @@ Function16f3e: ; 16f3e INCBIN "baserom.gbc", $16f5e, $174ba - $16f5e -SECTION "bank6",DATA,BANK[$6] +SECTION "bank6",ROMX,BANK[$6] Tileset03GFX: ; 0x18000 INCBIN "gfx/tilesets/03.lz" @@ -33389,7 +33389,7 @@ INCBIN "tilesets/20_collision.bin" ; 0x1bdfe -SECTION "bank7",DATA,BANK[$7] +SECTION "bank7",ROMX,BANK[$7] Function1c000: ; 1c000 ld a, [MapGroup] @@ -33512,7 +33512,7 @@ Music_Clair: INCLUDE "audio/music/clair.asm" Music_MobileAdapter: INCLUDE "audio/music/mobileadapter.asm" -SECTION "bank8",DATA,BANK[$8] +SECTION "bank8",ROMX,BANK[$8] INCBIN "baserom.gbc", $20000, $20181 - $20000 @@ -33633,7 +33633,7 @@ INCLUDE "stats/egg_move_pointers.asm" INCLUDE "stats/egg_moves.asm" -SECTION "bank9",DATA,BANK[$9] +SECTION "bank9",ROMX,BANK[$9] INCBIN "baserom.gbc", $24000, $2400e - $24000 @@ -36672,7 +36672,7 @@ INCLUDE "battle/moves/move_effects.asm" INCBIN "baserom.gbc", $27a28, $27a2d - $27a28 -SECTION "bankA",DATA,BANK[$A] +SECTION "bankA",ROMX,BANK[$A] INCBIN "baserom.gbc", $28000, $2a111 - $28000 @@ -37371,7 +37371,7 @@ INCBIN "gfx/misc/dude.lz" ; 2bce1 -SECTION "bankB",DATA,BANK[$B] +SECTION "bankB",ROMX,BANK[$B] Function2c000: ; 2c000 ld a, $e4 @@ -38226,7 +38226,7 @@ FillBox: ; 2ef6e -SECTION "bankC",DATA,BANK[$C] +SECTION "bankC",ROMX,BANK[$C] Tileset15GFX: ; 0x30000 INCBIN "gfx/tilesets/15.lz" @@ -38318,12 +38318,12 @@ INCBIN "gfx/tilesets/30.lz" INCBIN "baserom.gbc", $329ed, $333f0 - $329ed -SECTION "bankD",DATA,BANK[$D] +SECTION "bankD",ROMX,BANK[$D] INCLUDE "battle/effect_commands.asm" -SECTION "bankE",DATA,BANK[$E] +SECTION "bankE",ROMX,BANK[$E] Function38000: ; 38000 and a @@ -39088,7 +39088,7 @@ INCLUDE "trainers/trainer_pointers.asm" INCLUDE "trainers/trainers.asm" -SECTION "bankF",DATA,BANK[$F] +SECTION "bankF",ROMX,BANK[$F] Function3c000: ; 3c000 xor a @@ -48647,7 +48647,7 @@ INCLUDE "battle/effect_command_pointers.asm" -SECTION "bank10",DATA,BANK[$10] +SECTION "bank10",ROMX,BANK[$10] Function40000: ; 40000 ld a, [hWX] @@ -49677,7 +49677,7 @@ INCLUDE "stats/evos_attacks_pointers.asm" INCLUDE "stats/evos_attacks.asm" -SECTION "bank11",DATA,BANK[$11] +SECTION "bank11",ROMX,BANK[$11] FruitTreeScript: ; 44000 3callasm BANK(GetCurTreeFruit), GetCurTreeFruit @@ -50602,7 +50602,7 @@ MenuData44964: ; 0x44964 db "ATTACH MAIL@" db "CANCEL@" -SECTION "bank12",DATA,BANK[$12] +SECTION "bank12",ROMX,BANK[$12] Function48000: ; 48000 ld a, $1 @@ -51567,7 +51567,7 @@ UpdateOTPointer: ; 0x4a83a INCBIN "baserom.gbc", $4a843, $4ae78 - $4a843 -SECTION "bank13",DATA,BANK[$13] +SECTION "bank13",ROMX,BANK[$13] Function4c000: ; 4c000 ld hl, TileMap @@ -53783,7 +53783,7 @@ Function4f301: ; 4f301 -SECTION "bank14",DATA,BANK[$14] +SECTION "bank14",ROMX,BANK[$14] Function50000: ; 50000 call Function2ed3 @@ -55837,7 +55837,7 @@ INCLUDE "stats/pokemon_names.asm" INCBIN "baserom.gbc", $53D84, $53e2e - $53D84 -SECTION "bank15",DATA,BANK[$15] +SECTION "bank15",ROMX,BANK[$15] ; Map Scripts I @@ -55860,7 +55860,7 @@ INCLUDE "maps/GoldenrodDeptStoreRoof.asm" INCLUDE "maps/GoldenrodGameCorner.asm" -SECTION "bank16",DATA,BANK[$16] +SECTION "bank16",ROMX,BANK[$16] ; Map Scripts II @@ -55890,7 +55890,7 @@ INCLUDE "maps/OlivineLighthouse3F.asm" INCLUDE "maps/OlivineLighthouse4F.asm" -SECTION "bank17",DATA,BANK[$17] +SECTION "bank17",ROMX,BANK[$17] ; Map Scripts III @@ -55902,7 +55902,7 @@ INCLUDE "maps/RadioTower3F.asm" INCLUDE "maps/RadioTower4F.asm" -SECTION "bank18",DATA,BANK[$18] +SECTION "bank18",ROMX,BANK[$18] ; Map Scripts IV @@ -55916,12 +55916,12 @@ INCLUDE "maps/Route34IlexForestGate.asm" INCLUDE "maps/DayCare.asm" -SECTION "bank19",DATA,BANK[$19] +SECTION "bank19",ROMX,BANK[$19] INCLUDE "text/phone/extra.asm" -SECTION "bank1A",DATA,BANK[$1A] +SECTION "bank1A",ROMX,BANK[$1A] ; Map Scripts V @@ -55940,7 +55940,7 @@ INCLUDE "maps/Route36RuinsofAlphgate.asm" INCLUDE "maps/Route36NationalParkgate.asm" -SECTION "bank1B",DATA,BANK[$1B] +SECTION "bank1B",ROMX,BANK[$1B] ; Map Scripts VI @@ -55952,7 +55952,7 @@ INCLUDE "maps/TeamRocketBaseB3F.asm" INCLUDE "maps/IlexForest.asm" -SECTION "bank1C",DATA,BANK[$1C] +SECTION "bank1C",ROMX,BANK[$1C] ; Map Scripts VII @@ -55981,7 +55981,7 @@ INCLUDE "maps/Route7SaffronGate.asm" INCLUDE "maps/Route1718Gate.asm" -SECTION "bank1D",DATA,BANK[$1D] +SECTION "bank1D",ROMX,BANK[$1D] ; Map Scripts VIII @@ -56007,7 +56007,7 @@ INCLUDE "maps/MountMoonGiftShop.asm" INCLUDE "maps/TinTowerRoof.asm" -SECTION "bank1E",DATA,BANK[$1E] +SECTION "bank1E",ROMX,BANK[$1E] ; Map Scripts IX @@ -56023,7 +56023,7 @@ INCLUDE "maps/Route27SandstormHouse.asm" INCLUDE "maps/Route2946Gate.asm" -SECTION "bank1F",DATA,BANK[$1F] +SECTION "bank1F",ROMX,BANK[$1F] ; Map Scripts X @@ -56053,7 +56053,7 @@ INCLUDE "maps/Route8SaffronGate.asm" INCLUDE "maps/Route12SuperRodHouse.asm" -SECTION "bank20",DATA,BANK[$20] +SECTION "bank20",ROMX,BANK[$20] DoPlayerMovement: ; 80000 @@ -57002,7 +57002,7 @@ INCBIN "gfx/debug/color_test.2bpp" INCBIN "baserom.gbc", $82153, $823c8-$82153 -SECTION "bank21",DATA,BANK[$21] +SECTION "bank21",ROMX,BANK[$21] Function84000: ; 84000 ld hl, OverworldMap @@ -58057,7 +58057,7 @@ Function86810: ; 86810 INCBIN "baserom.gbc", $868ed, $88000 - $868ed -SECTION "bank22",DATA,BANK[$22] +SECTION "bank22",ROMX,BANK[$22] INCBIN "baserom.gbc", $88000, $88258 - $88000 @@ -58522,7 +58522,7 @@ Function8b35c: ; 8b35c INCBIN "baserom.gbc", $8b35d, $8ba24 - $8b35d -SECTION "bank23",DATA,BANK[$23] +SECTION "bank23",ROMX,BANK[$23] INCBIN "baserom.gbc", $8c000, $8c001 - $8c000 @@ -60085,7 +60085,7 @@ SudowoodoIcon: INCBIN "gfx/icon/sudowoodo.2bpp" ; 0x8fe0d BigmonIcon: INCBIN "gfx/icon/bigmon.2bpp" ; 0x8fe8d -SECTION "bank24",DATA,BANK[$24] +SECTION "bank24",ROMX,BANK[$24] INCBIN "baserom.gbc", $90000, $9000f - $90000 @@ -60962,7 +60962,7 @@ INCLUDE "stats/wild/fish.asm" INCBIN "baserom.gbc", $926c7, $93a31 - $926c7 -SECTION "bank25",DATA,BANK[$25] +SECTION "bank25",ROMX,BANK[$25] MapGroupPointers: ; 0x94000 ; pointers to the first map header of each map group @@ -62859,7 +62859,7 @@ Function97f42: ; 97f42 -SECTION "bank26",DATA,BANK[$26] +SECTION "bank26",ROMX,BANK[$26] ; Map Scripts XI @@ -62883,7 +62883,7 @@ INCLUDE "maps/Route2Gate.asm" INCLUDE "maps/VictoryRoadGate.asm" -SECTION "bank27",DATA,BANK[$27] +SECTION "bank27",ROMX,BANK[$27] ; Map Scripts XII @@ -62913,17 +62913,17 @@ INCLUDE "maps/Route40BattleTowerGate.asm" INCLUDE "maps/BattleTowerOutside.asm" -SECTION "bank28",DATA,BANK[$28] +SECTION "bank28",ROMX,BANK[$28] INCBIN "baserom.gbc", $a0000, $a1eca - $a0000 -SECTION "bank29",DATA,BANK[$29] +SECTION "bank29",ROMX,BANK[$29] INCLUDE "text/phone/extra2.asm" -SECTION "bank2A",DATA,BANK[$2A] +SECTION "bank2A",ROMX,BANK[$2A] Route32_BlockData: ; 0xa8000 INCBIN "maps/Route32.blk" @@ -63234,7 +63234,7 @@ Route22_BlockData: ; 0xabef7 ; 0xabfab -SECTION "bank2B",DATA,BANK[$2B] +SECTION "bank2B",ROMX,BANK[$2B] Route14_BlockData: ; 0xac000 INCBIN "maps/Route14.blk" @@ -63789,7 +63789,7 @@ OlivineLighthouse6F_BlockData: ; 0xaff00 ; 0xaff5a -SECTION "bank2C",DATA,BANK[$2C] +SECTION "bank2C",ROMX,BANK[$2C] BetaCave2_BlockData: ; 0xb0000 INCBIN "maps/BetaCave2.blk" @@ -64140,7 +64140,7 @@ GoldenrodDeptStoreRoof_BlockData: ; 0xb1b22 ; 0xb1b42 -SECTION "bank2D",DATA,BANK[$2D] +SECTION "bank2D",ROMX,BANK[$2D] Tileset21GFX: ; 0xb4000 INCBIN "gfx/tilesets/21.lz" @@ -64257,7 +64257,7 @@ INCBIN "tilesets/16_collision.bin" ; 0xb7ea8 -SECTION "bank2E",DATA,BANK[$2E] +SECTION "bank2E",ROMX,BANK[$2E] Functionb8000: ; b8000 xor a @@ -64906,7 +64906,7 @@ Functionb9e76: ; b9e76 INCBIN "baserom.gbc", $b9e80, $b9e8b - $b9e80 -SECTION "bank2F",DATA,BANK[$2F] +SECTION "bank2F",ROMX,BANK[$2F] INCBIN "baserom.gbc", $bc000, $bc09c - $bc000 @@ -65335,20 +65335,20 @@ ElmPhoneScript2: ; 0xbd081 INCBIN "baserom.gbc", $bd0d0, $be699-$bd0d0 -SECTION "bank30",DATA,BANK[$30] +SECTION "bank30",ROMX,BANK[$30] INCLUDE "gfx/overworld/sprites_1.asm" -SECTION "bank31",DATA,BANK[$31] +SECTION "bank31",ROMX,BANK[$31] INCLUDE "gfx/overworld/sprites_2.asm" -SECTION "bank32",DATA,BANK[$32] +SECTION "bank32",ROMX,BANK[$32] INCBIN "baserom.gbc", $c8000, $cbe2b - $c8000 -SECTION "bank33",DATA,BANK[$33] +SECTION "bank33",ROMX,BANK[$33] Functioncc000: ; cc000 call WhiteBGMap @@ -66237,7 +66237,7 @@ Music_PostCredits: INCLUDE "audio/music/postcredits.asm" ; Pic animations I -SECTION "bank34",DATA,BANK[$34] +SECTION "bank34",ROMX,BANK[$34] ; Pic animations asm INCBIN "baserom.gbc", $d0000, $d0695 - $d0000 @@ -66281,7 +66281,7 @@ INCLUDE "gfx/pics/unown_bitmasks.asm" ; Pic animations II -SECTION "bank35",DATA,BANK[$35] +SECTION "bank35",ROMX,BANK[$35] ; Frame definitions FramesPointers: INCLUDE "gfx/pics/frame_pointers.asm" @@ -66291,7 +66291,7 @@ INCLUDE "gfx/pics/kanto_frames.asm" ; Pic animations III -SECTION "bank36",DATA,BANK[$36] +SECTION "bank36",ROMX,BANK[$36] FontInversed: INCBIN "gfx/misc/font_inversed.1bpp" @@ -66303,7 +66303,7 @@ UnownFramesPointers: INCLUDE "gfx/pics/unown_frame_pointers.asm" INCLUDE "gfx/pics/unown_frames.asm" -SECTION "bank37",DATA,BANK[$37] +SECTION "bank37",ROMX,BANK[$37] Tileset31GFX: ; 0xdc000 INCBIN "gfx/tilesets/31.lz" @@ -66417,12 +66417,12 @@ INCBIN "tilesets/36_collision.bin" ; 0xdfd90 -SECTION "bank38",DATA,BANK[$38] +SECTION "bank38",ROMX,BANK[$38] INCBIN "baserom.gbc", $e0000, $e37f9 - $e0000 -SECTION "bank39",DATA,BANK[$39] +SECTION "bank39",ROMX,BANK[$39] CopyrightGFX: ; e4000 INCBIN "gfx/misc/copyright.2bpp" @@ -67375,7 +67375,7 @@ INCBIN "baserom.gbc", $e799a, $e7a70 - $e799a ; ================================================================ ; Sound engine and music/sound effect pointers -SECTION "bank3A",DATA,BANK[$3A] +SECTION "bank3A",ROMX,BANK[$3A] ; The sound engine. Interfaces are in bank 0 @@ -67416,7 +67416,7 @@ Music_LookPokemaniac: INCLUDE "audio/music/lookpokemaniac.asm" Music_TrainerVictory: INCLUDE "audio/music/trainervictory.asm" -SECTION "bank3B",DATA,BANK[$3B] +SECTION "bank3B",ROMX,BANK[$3B] ; Songs II @@ -67453,7 +67453,7 @@ Music_DancingHall: INCLUDE "audio/music/dancinghall.asm" Music_ContestResults: INCLUDE "audio/music/bugcatchingcontestresults.asm" Music_Route30: INCLUDE "audio/music/route30.asm" -SECTION "bank3C",DATA,BANK[$3C] +SECTION "bank3C",ROMX,BANK[$3C] ; Songs III @@ -67472,7 +67472,7 @@ INCLUDE "audio/cry_headers.asm" INCBIN "baserom.gbc", $f2d69, $f3fb6 - $f2d69 -SECTION "bank3D",DATA,BANK[$3D] +SECTION "bank3D",ROMX,BANK[$3D] ; Songs IV @@ -67514,7 +67514,7 @@ Music_LookKimonoGirl: INCLUDE "audio/music/lookkimonogirl.asm" Music_PokeFluteChannel: INCLUDE "audio/music/pokeflutechannel.asm" Music_BugCatchingContest: INCLUDE "audio/music/bugcatchingcontest.asm" -SECTION "bank3E",DATA,BANK[$3E] +SECTION "bank3E",ROMX,BANK[$3E] FontExtra: INCBIN "gfx/misc/font_extra.2bpp" @@ -67916,7 +67916,7 @@ DoBadgeTypeBoosts: ; fbe24 ; fbe91 -SECTION "bank3F",DATA,BANK[$3F] +SECTION "bank3F",ROMX,BANK[$3F] DoTileAnimation: ; fc000 ; Iterate over a given pointer array of animation functions @@ -69466,7 +69466,7 @@ Functionfd117: ; fd117 INCBIN "baserom.gbc", $fd136, $fd1d2 - $fd136 -SECTION "bank40",DATA,BANK[$40] +SECTION "bank40",ROMX,BANK[$40] INCBIN "baserom.gbc", $100000, $10032e - $100000 @@ -70864,7 +70864,7 @@ Function100ed4: ; 100ed4 INCBIN "baserom.gbc", $100edf, $10389d - $100edf -SECTION "bank41",DATA,BANK[$41] +SECTION "bank41",ROMX,BANK[$41] Function104000: ; 104000 ld hl, $4006 @@ -72009,7 +72009,7 @@ Function106594: ; 106594 INCBIN "baserom.gbc", $1065ad, $106dbc - $1065ad -SECTION "bank42",DATA,BANK[$42] +SECTION "bank42",ROMX,BANK[$42] INCBIN "baserom.gbc", $108000, $109407 - $108000 @@ -72162,7 +72162,7 @@ INCBIN "baserom.gbc", $109937, $1099aa - $109937 INCLUDE "engine/credits.asm" -SECTION "bank43",DATA,BANK[$43] +SECTION "bank43",ROMX,BANK[$43] INCBIN "baserom.gbc", $10c000, $10ed67 - $10c000 @@ -72645,7 +72645,7 @@ TitleScreenPalettes: RGB 00, 00, 00 RGB 00, 00, 00 -SECTION "bank44",DATA,BANK[$44] +SECTION "bank44",ROMX,BANK[$44] INCBIN "baserom.gbc", $110000, $110fad - $110000 @@ -72662,7 +72662,7 @@ HTTPRankingURL: ; 0x111020 INCBIN "baserom.gbc", $111044, $113f84 - $111044 -SECTION "bank45",DATA,BANK[$45] +SECTION "bank45",ROMX,BANK[$45] INCBIN "baserom.gbc", $114000, $114243 - $114000 @@ -73035,7 +73035,7 @@ Function117cdd: ; 0x117cdd ret -SECTION "bank46",DATA,BANK[$46] +SECTION "bank46",ROMX,BANK[$46] INCBIN "baserom.gbc", $118000, $118ba5 - $118000 @@ -73167,7 +73167,7 @@ UnknownText_0x11ac1f: ; 0x11ac1f INCBIN "baserom.gbc", $11ac3e, $11bc9e - $11ac3e -SECTION "bank47",DATA,BANK[$47] +SECTION "bank47",ROMX,BANK[$47] Function11c000: ; 11c000 ld a, [rSVBK] @@ -73401,7 +73401,7 @@ Function11c156: ; 11c156 INCBIN "baserom.gbc", $11c1ab, $11f686 - $11c1ab -SECTION "bank48",DATA,BANK[$48] +SECTION "bank48",ROMX,BANK[$48] PicPointers: INCLUDE "gfx/pics/pic_pointers.asm" @@ -73424,7 +73424,7 @@ TyphlosionFrontpic: INCBIN "gfx/pics/157/front.lz" ; 123ffa -SECTION "bank49",DATA,BANK[$49] +SECTION "bank49",ROMX,BANK[$49] UnownPicPointers: INCLUDE "gfx/pics/unown_pic_pointers.asm" @@ -73450,7 +73450,7 @@ QuilavaFrontpic: INCBIN "gfx/pics/156/front.lz" ; 127ffe -SECTION "bank4a",DATA,BANK[$4a] +SECTION "bank4a",ROMX,BANK[$4a] TrainerPicPointers: INCLUDE "gfx/pics/trainer_pic_pointers.asm" @@ -73478,7 +73478,7 @@ OmastarBackpic: INCBIN "gfx/pics/139/back.lz" ; 12bffe -SECTION "bank4b",DATA,BANK[$4b] +SECTION "bank4b",ROMX,BANK[$4b] ; Pics IV @@ -73505,7 +73505,7 @@ UnownEFrontpic: INCBIN "gfx/pics/201e/front.lz" ; 130000 -SECTION "bank4C",DATA,BANK[$4C] +SECTION "bank4C",ROMX,BANK[$4C] ; Pics V @@ -73533,7 +73533,7 @@ HeracrossFrontpic: INCBIN "gfx/pics/214/front.lz" ; 133fff -SECTION "bank4d",DATA,BANK[$4d] +SECTION "bank4d",ROMX,BANK[$4d] ; Pics VI @@ -73563,7 +73563,7 @@ DunsparceFrontpic: INCBIN "gfx/pics/206/front.lz" ; 137fff -SECTION "bank4E",DATA,BANK[$4E] +SECTION "bank4E",ROMX,BANK[$4E] ; Pics VII @@ -73595,7 +73595,7 @@ KangaskhanBackpic: INCBIN "gfx/pics/115/back.lz" ; 13c000 -SECTION "bank4f",DATA,BANK[$4f] +SECTION "bank4f",ROMX,BANK[$4f] ; Pics VIII @@ -73629,7 +73629,7 @@ QuagsireFrontpic: INCBIN "gfx/pics/195/front.lz" ; 13fff7 -SECTION "bank50",DATA,BANK[$50] +SECTION "bank50",ROMX,BANK[$50] ; Pics IX @@ -73667,7 +73667,7 @@ ParasectBackpic: INCBIN "gfx/pics/047/back.lz" ; 144000 -SECTION "bank51",DATA,BANK[$51] +SECTION "bank51",ROMX,BANK[$51] ; Pics X @@ -73709,7 +73709,7 @@ UnownFBackpic: INCBIN "gfx/pics/201f/back.lz" ; 148000 -SECTION "bank52",DATA,BANK[$52] +SECTION "bank52",ROMX,BANK[$52] ; Pics XI @@ -73754,7 +73754,7 @@ SnorlaxBackpic: INCBIN "gfx/pics/143/back.lz" ; 14bffb -SECTION "bank53",DATA,BANK[$53] +SECTION "bank53",ROMX,BANK[$53] ; Pics XII @@ -73802,7 +73802,7 @@ StarmieBackpic: INCBIN "gfx/pics/121/back.lz" ; 150000 -SECTION "bank54",DATA,BANK[$54] +SECTION "bank54",ROMX,BANK[$54] ; Pics XIII @@ -73852,7 +73852,7 @@ ElectrodeFrontpic: INCBIN "gfx/pics/101/front.lz" ; 153fe3 -SECTION "bank55",DATA,BANK[$55] +SECTION "bank55",ROMX,BANK[$55] ; Pics XIV @@ -73905,7 +73905,7 @@ SwinubBackpic: INCBIN "gfx/pics/220/back.lz" ; 158000 -SECTION "bank56",DATA,BANK[$56] +SECTION "bank56",ROMX,BANK[$56] ; Pics XV @@ -73961,7 +73961,7 @@ MagnemiteBackpic: INCBIN "gfx/pics/081/back.lz" ; 15bffa -SECTION "bank57",DATA,BANK[$57] +SECTION "bank57",ROMX,BANK[$57] ; Pics XVI @@ -74021,7 +74021,7 @@ UnownHBackpic: INCBIN "gfx/pics/201h/back.lz" ; 15ffff -SECTION "bank58",DATA,BANK[$58] +SECTION "bank58",ROMX,BANK[$58] ; Pics XVII @@ -74089,7 +74089,7 @@ UnownDBackpic: INCBIN "gfx/pics/201d/back.lz" ; 163ffc -SECTION "bank59",DATA,BANK[$59] +SECTION "bank59",ROMX,BANK[$59] ; Pics XVIII @@ -74156,7 +74156,7 @@ UnownRBackpic: INCBIN "gfx/pics/201r/back.lz" ; 1669d3 -SECTION "bank5A",DATA,BANK[$5A] +SECTION "bank5A",ROMX,BANK[$5A] ; This bank is identical to bank 59! ; It's also unreferenced, so it's a free bank @@ -74223,7 +74223,7 @@ INCBIN "gfx/pics/201i/back.lz" INCBIN "gfx/pics/201r/back.lz" -SECTION "bank5B",DATA,BANK[$5B] +SECTION "bank5B",ROMX,BANK[$5B] INCBIN "baserom.gbc", $16c000, $16d69a - $16c000 @@ -74239,7 +74239,7 @@ Function16d69a: ; 16d69a INCBIN "baserom.gbc", $16d6a7, $16d7fe - $16d6a7 -SECTION "bank5C",DATA,BANK[$5C] +SECTION "bank5C",ROMX,BANK[$5C] INCBIN "baserom.gbc", $170000, $170923 - $170000 @@ -74260,12 +74260,12 @@ Function170923: ; 170923 INCBIN "baserom.gbc", $17093c, $17367f - $17093c -SECTION "bank5D",DATA,BANK[$5D] +SECTION "bank5D",ROMX,BANK[$5D] INCLUDE "text/phone/extra3.asm" -SECTION "bank5E",DATA,BANK[$5E] +SECTION "bank5E",ROMX,BANK[$5E] INCBIN "baserom.gbc", $178000, $1f @@ -74288,7 +74288,7 @@ INCBIN "gfx/misc/mobile_adapter.2bpp" INCBIN "baserom.gbc", $17a68f, $17b629 - $17a68f -SECTION "bank5F",DATA,BANK[$5F] +SECTION "bank5F",ROMX,BANK[$5F] Function17c000: ; 17c000 call DisableLCD @@ -74402,7 +74402,7 @@ Function17f047: ; 17f047 INCBIN "baserom.gbc", $17f061, $17ff6c - $17f061 -SECTION "bank60",DATA,BANK[$60] +SECTION "bank60",ROMX,BANK[$60] ; Map Scripts XIII @@ -74421,7 +74421,7 @@ PokedexEntries1: INCLUDE "stats/pokedex/entries_1.asm" -SECTION "bank61",DATA,BANK[$61] +SECTION "bank61",ROMX,BANK[$61] ; Map Scripts XIV @@ -74442,7 +74442,7 @@ INCLUDE "maps/BurnedTower1F.asm" INCLUDE "maps/BurnedTowerB1F.asm" -SECTION "bank62",DATA,BANK[$62] +SECTION "bank62",ROMX,BANK[$62] ; Map Scripts XV @@ -74472,7 +74472,7 @@ INCLUDE "maps/Route5SaffronCityGate.asm" INCLUDE "maps/Route5CleanseTagSpeechHouse.asm" -SECTION "bank63",DATA,BANK[$63] +SECTION "bank63",ROMX,BANK[$63] ; Map Scripts XVI @@ -74502,7 +74502,7 @@ INCLUDE "maps/KurtsHouse.asm" INCLUDE "maps/AzaleaGym.asm" -SECTION "bank64",DATA,BANK[$64] +SECTION "bank64",ROMX,BANK[$64] ; Map Scripts XVII @@ -74526,7 +74526,7 @@ INCLUDE "maps/MobileTradeRoomMobile.asm" INCLUDE "maps/MobileBattleRoom.asm" -SECTION "bank65",DATA,BANK[$65] +SECTION "bank65",ROMX,BANK[$65] ; Map Scripts XVIII @@ -74557,7 +74557,7 @@ INCLUDE "maps/MrPokemonsHouse.asm" INCLUDE "maps/Route31VioletGate.asm" -SECTION "bank66",DATA,BANK[$66] +SECTION "bank66",ROMX,BANK[$66] ; Map Scripts XIX @@ -74578,7 +74578,7 @@ INCLUDE "maps/BluesHouse.asm" INCLUDE "maps/OaksLab.asm" -SECTION "bank67",DATA,BANK[$67] +SECTION "bank67",ROMX,BANK[$67] ; Map Scripts XX @@ -74591,7 +74591,7 @@ INCLUDE "maps/Route19.asm" INCLUDE "maps/Route25.asm" -SECTION "bank68",DATA,BANK[$68] +SECTION "bank68",ROMX,BANK[$68] ; Map Scripts XXI @@ -74609,7 +74609,7 @@ INCLUDE "maps/PewterPokeCEnter2FBeta.asm" INCLUDE "maps/PewterSnoozeSpeechHouse.asm" -SECTION "bank69",DATA,BANK[$69] +SECTION "bank69",ROMX,BANK[$69] ; Map Scripts XXII @@ -74624,7 +74624,7 @@ INCLUDE "maps/Route41.asm" INCLUDE "maps/Route12.asm" -SECTION "bank6A",DATA,BANK[$6A] +SECTION "bank6A",ROMX,BANK[$6A] ; Map Scripts XXIII @@ -74645,7 +74645,7 @@ INCLUDE "maps/Route19FuchsiaGate.asm" INCLUDE "maps/SeafoamGym.asm" -SECTION "bank6B",DATA,BANK[$6B] +SECTION "bank6B",ROMX,BANK[$6B] ; Map Scripts XXIV @@ -74673,7 +74673,7 @@ INCLUDE "maps/SilverCavePokeCenter1F.asm" INCLUDE "maps/Route28FamousSpeechHouse.asm" -SECTION "bank6C",DATA,BANK[$6C] +SECTION "bank6C",ROMX,BANK[$6C] ; Common text I @@ -74685,7 +74685,7 @@ INCLUDE "maps/SilverCaveOutside.asm" INCLUDE "maps/Route10North.asm" -SECTION "bank6D",DATA,BANK[$6D] +SECTION "bank6D",ROMX,BANK[$6D] INCLUDE "text/phone/mom.tx" INCLUDE "text/phone/bill.tx" @@ -74693,7 +74693,7 @@ INCLUDE "text/phone/elm.tx" INCLUDE "text/phone/trainers1.tx" -SECTION "bank6E",DATA,BANK[$6E] +SECTION "bank6E",ROMX,BANK[$6E] ; Pokedex entries II ; 065-128 @@ -74701,28 +74701,28 @@ PokedexEntries2: INCLUDE "stats/pokedex/entries_2.asm" -SECTION "bank6F",DATA,BANK[$6F] +SECTION "bank6F",ROMX,BANK[$6F] ; Common text II INCLUDE "text/common_2.tx" -SECTION "bank70",DATA,BANK[$70] +SECTION "bank70",ROMX,BANK[$70] ; Common text III INCLUDE "text/common_3.tx" -SECTION "bank71",DATA,BANK[$71] +SECTION "bank71",ROMX,BANK[$71] ; Common text IV INCLUDE "text/common_4.tx" -SECTION "bank72",DATA,BANK[$72] +SECTION "bank72",ROMX,BANK[$72] ; Item names & descriptions @@ -74772,7 +74772,7 @@ RegionCheck: ; 0x1caea1 ret -SECTION "bank73",DATA,BANK[$73] +SECTION "bank73",ROMX,BANK[$73] ; Pokedex entries III ; 129-192 @@ -74780,7 +74780,7 @@ PokedexEntries3: INCLUDE "stats/pokedex/entries_3.asm" -SECTION "bank74",DATA,BANK[$74] +SECTION "bank74",ROMX,BANK[$74] ; Pokedex entries IV ; 193-251 @@ -74788,13 +74788,13 @@ PokedexEntries4: INCLUDE "stats/pokedex/entries_4.asm" -SECTION "bank75",DATA,BANK[$75] +SECTION "bank75",ROMX,BANK[$75] -SECTION "bank76",DATA,BANK[$76] +SECTION "bank76",ROMX,BANK[$76] -SECTION "bank77",DATA,BANK[$77] +SECTION "bank77",ROMX,BANK[$77] UnownFont: ; 1dc000 INCBIN "gfx/misc/unown_font.2bpp" @@ -74973,7 +74973,7 @@ Function1de5c8: ; 1de5c8 INCBIN "baserom.gbc", $1de5e6, $1df238 - $1de5e6 -SECTION "bank78",DATA,BANK[$78] +SECTION "bank78",ROMX,BANK[$78] Tileset33Meta: ; 0x1e0000 INCBIN "tilesets/33_metatiles.bin" @@ -74992,23 +74992,23 @@ INCBIN "tilesets/36_metatiles.bin" ; 0x1e1000 -SECTION "bank79",DATA,BANK[$79] +SECTION "bank79",ROMX,BANK[$79] -SECTION "bank7A",DATA,BANK[$7A] +SECTION "bank7A",ROMX,BANK[$7A] -SECTION "bank7B",DATA,BANK[$7B] +SECTION "bank7B",ROMX,BANK[$7B] INCLUDE "text/battle_tower.asm" -SECTION "bank7C",DATA,BANK[$7C] +SECTION "bank7C",ROMX,BANK[$7C] INCBIN "baserom.gbc", $1f0000, $1f09d8 - $1f0000 -SECTION "bank7D",DATA,BANK[$7D] +SECTION "bank7D",ROMX,BANK[$7D] INCBIN "baserom.gbc", $1f4000, $1f4003 - $1f4000 @@ -75026,7 +75026,7 @@ Function1f4003: ; 1f4003 INCBIN "baserom.gbc", $1f4018, $1f636a - $1f4018 -SECTION "bank7E",DATA,BANK[$7E] +SECTION "bank7E",ROMX,BANK[$7E] Function1f8000: ; 1f8000 ld a, [rSVBK] @@ -75284,8 +75284,8 @@ BattleTowerMons: ; 1f8450 INCBIN "baserom.gbc", $1fb4b6, $1fb8a8 - $1fb4b6 -SECTION "bank7F",DATA,BANK[$7F] +SECTION "bank7F",ROMX,BANK[$7F] -SECTION "stadium2",DATA[$8000-$220],BANK[$7F] +SECTION "stadium2",ROMX[$8000-$220],BANK[$7F] INCBIN "baserom.gbc", $1ffde0, $220 diff --git a/wram.asm b/wram.asm index a2a0e61d0..014a86f6b 100644 --- a/wram.asm +++ b/wram.asm @@ -1,27 +1,24 @@ -SECTION "tiles0",VRAM[$8000] +SECTION "tiles0",VRAM[$8000],BANK[0] VTiles0: -SECTION "tiles1",VRAM[$8800] +SECTION "tiles1",VRAM[$8800],BANK[0] VTiles1: -SECTION "tiles2",VRAM[$9000] +SECTION "tiles2",VRAM[$9000],BANK[0] VTiles2: -SECTION "bgmap0",VRAM[$9800] +SECTION "bgmap0",VRAM[$9800],BANK[0] VBGMap0: -SECTION "bgmap1",VRAM[$9C00] +SECTION "bgmap1",VRAM[$9C00],BANK[0] VBGMap1: -; WRAM banks 0 and 1 are included as BSS labels. -; Other WRAM banks (2-7) are constants for now. +SECTION "WRAMBank0",WRAM0[$c000] -SECTION "WRAMBank0",BSS[$c000] - -SECTION "stack",BSS[$c000] +SECTION "stack",WRAM0[$c000] ds $100 Stack: ; c100 -SECTION "audio",BSS[$c100] +SECTION "audio",WRAM0[$c100] MusicPlaying: ; c100 ; nonzero if playing ds 1 @@ -309,7 +306,7 @@ CurMusic: ; c2c0 ; id of music currently playing ds 1 -SECTION "auto",BSS[$c2c7] +SECTION "auto",WRAM0[$c2c7] InputType: ; c2c7 AUTO_INPUT EQU $ff ds 1 @@ -320,19 +317,19 @@ AutoInputBank: ; c2ca AutoInputLength: ; c2cb ds 1 -SECTION "linkbattle",BSS[$c2dc] +SECTION "linkbattle",WRAM0[$c2dc] InLinkBattle: ; c2dc ; 0 not in link battle ; 1 link battle ; 4 mobile battle ds 1 -SECTION "scriptengine",BSS[$c2dd] +SECTION "scriptengine",WRAM0[$c2dd] ScriptVar: ; c2dd ds 1 -SECTION "tiles",BSS[$c2fa] +SECTION "tiles",WRAM0[$c2fa] TileDown: ; c2fa ds 1 TileUp: ; c2fb @@ -351,12 +348,12 @@ TilePermissions: ; c2fe ; bit 0: right ds 1 -SECTION "icons",BSS[$c3b6] +SECTION "icons",WRAM0[$c3b6] CurIcon: ; c3b6 ds 1 -SECTION "gfx",BSS[$c400] +SECTION "gfx",WRAM0[$c400] Sprites: ; c400 ; 4 bytes per sprite @@ -380,7 +377,7 @@ TileMap: ; c4a0 ds 360 -SECTION "BattleMons",BSS[$c608] +SECTION "BattleMons",WRAM0[$c608] EnemyMoveStruct: EnemyMoveAnimation: ; c608 @@ -777,19 +774,19 @@ LastEnemyMove: ; c71c ds 1 -SECTION "battle",BSS[$c734] +SECTION "battle",WRAM0[$c734] BattleEnded: ; c734 ds 1 -SECTION "overworldmap",BSS[$c800] +SECTION "overworldmap",WRAM0[$c800] OverworldMap: ; c800 ds 1300 OverworldMapEnd: ds 12 -SECTION "gfx2",BSS[$cd20] +SECTION "gfx2",WRAM0[$cd20] CreditsPos: BGMapBuffer: ; cd20 ds 2 @@ -839,7 +836,7 @@ MenuSelection:; cf74 -SECTION "VBlank",BSS[$cfb1] +SECTION "VBlank",WRAM0[$cfb1] OverworldDelay: ; cfb1 ds 1 TextDelayFrames: ; cfb2 @@ -853,7 +850,7 @@ GameTimerPause: ; cfbc ; bit 0 ds 1 -SECTION "Engine",BSS[$cfc2] +SECTION "Engine",WRAM0[$cfc2] FXAnimID: FXAnimIDLo: ; cfc2 ds 1 @@ -901,7 +898,7 @@ Options2: ; cfd1 ds 46 -SECTION "WRAMBank1",BSS[$d000] +SECTION "WRAMBank1",WRAMX[$d000],BANK[1] ds 2 @@ -1085,11 +1082,11 @@ CurPartyLevel: ; d143 ds 1 -SECTION "UsedSprites",BSS[$d154] +SECTION "UsedSprites",WRAMX[$d154],BANK[1] UsedSprites: ; d154 ds 32 -SECTION "map",BSS[$d1a3] +SECTION "map",WRAMX[$d1a3],BANK[1] MapEventBank: ; d1a3 ds 1 @@ -1213,7 +1210,7 @@ MovementType: Buffer2: ; d1eb ds 1 -SECTION "BattleMons2",BSS[$d1fa] +SECTION "BattleMons2",WRAMX[$d1fa],BANK[1] LinkBattleRNs: ; d1fa ds 10 @@ -1399,7 +1396,7 @@ CurDamage: ; d256 ds 2 -SECTION "TimeOfDay",BSS[$d269] +SECTION "TimeOfDay",WRAMX[$d269],BANK[1] TimeOfDay: ; d269 MORN EQU 0 @@ -1408,7 +1405,7 @@ NITE EQU 2 DARKNESS EQU 3 ds 1 -SECTION "OTParty",BSS[$d280] +SECTION "OTParty",WRAMX[$d280],BANK[1] OTPartyCount: ; d280 ds 1 ; number of Pokémon in party @@ -1538,7 +1535,7 @@ OTPartyMon5Nickname: ; d416 OTPartyMon6Nickname: ; d421 ds 11 -SECTION "Scripting",BSS[$d434] +SECTION "Scripting",WRAMX[$d434],BANK[1] ScriptFlags: ; d434 SCRIPT_RUNNING EQU 2 ds 1 @@ -1565,7 +1562,7 @@ ScriptPos: ; d43a ScriptDelay: ; d44d ds 1 -SECTION "Player",BSS[$d472] +SECTION "Player",WRAMX[$d472],BANK[1] PlayerGender: ; d472 ; bit 0: ; 0 male @@ -1641,7 +1638,7 @@ PlayerDirection: ; d4de ds 1 -SECTION "MapEngine",BSS[$d4e4] +SECTION "MapEngine",WRAMX[$d4e4],BANK[1] StandingTile: ; d4e4 ds 1 StandingTile2: ; d4e5 @@ -1666,7 +1663,7 @@ PlayerSpriteY: ; d4ee ds 1 -SECTION "Objects",BSS[$d71e] +SECTION "Objects",WRAMX[$d71e],BANK[1] MapObjects: ; d71e PLAYER_OBJECT EQU 0 @@ -1676,12 +1673,12 @@ OBJECT_LENGTH EQU $10 ds OBJECT_LENGTH * NUM_OBJECTS -SECTION "VariableSprites",BSS[$d82e] +SECTION "VariableSprites",WRAMX[$d82e],BANK[1] VariableSprites: ; d82e ds $10 -SECTION "Status",BSS[$d841] +SECTION "Status",WRAMX[$d841],BANK[1] TimeOfDayPal: ; d841 ds 1 ds 4 @@ -1709,7 +1706,7 @@ JohtoBadges: ; d857 KantoBadges: ; d858 ds 1 -SECTION "Items",BSS[$d859] +SECTION "Items",WRAMX[$d859],BANK[1] TMsHMs: ; d859 ds 57 TMsHMsEnd @@ -1732,7 +1729,7 @@ Balls: ; d8d8 ds 25 BallsEnd -SECTION "overworld",BSS[$d95b] +SECTION "overworld",WRAMX[$d95b],BANK[1] WhichRegisteredItem: ; d95b REGISTERED_POCKET EQU %11000000 REGISTERED_NUMBER EQU %00111111 @@ -1748,7 +1745,7 @@ PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 ds 1 -SECTION "scriptram",BSS[$d962] +SECTION "scriptram",WRAMX[$d962],BANK[1] MooMooBerries: ; d962 ds 1 ; how many berries fed to MooMoo UndergroundSwitchPositions: ; d963 @@ -1756,7 +1753,7 @@ UndergroundSwitchPositions: ; d963 FarfetchdPosition: ; d964 ds 1 ; which position the ilex farfetch'd is in -SECTION "Events",BSS[$dad4] +SECTION "Events",WRAMX[$dad4],BANK[1] ;RoomDecorations: ; dac6 ; db 7 @@ -1774,7 +1771,7 @@ LugiaEvent: ; dad5 ;SalesmanMahoganyTownEvent: ; db5c ;RedGyaradosEvent: ; db5c -SECTION "BoxNames",BSS[$db75] +SECTION "BoxNames",WRAMX[$db75],BANK[1] ; 8 chars + $50 Box1Name: ; db75 ds 9 @@ -1805,13 +1802,13 @@ Box13Name: ; dbe1 Box14Name: ; dbea ds 9 -SECTION "bike", BSS[$dbf5] +SECTION "bike", WRAMX[$dbf5],BANK[1] BikeFlags: ; dbf5 ; bit 1: always on bike ; bit 2: downhill ds 1 -SECTION "decorations", BSS[$dc0f] +SECTION "decorations", WRAMX[$dc0f],BANK[1] ; Sprite id of each decoration Bed: ; dc0f ds 1 @@ -1830,21 +1827,21 @@ RightOrnament: ; dc15 BigDoll: ; dc16 ds 1 -SECTION "fruittrees", BSS[$dc27] +SECTION "fruittrees", WRAMX[$dc27],BANK[1] FruitTreeFlags: ; dc27 ds 1 -SECTION "steps", BSS[$dc73] +SECTION "steps", WRAMX[$dc73],BANK[1] StepCount: ; dc73 ds 1 PoisonStepCount: ; dc74 ds 1 -SECTION "FlypointPermissions", BSS[$dca5] +SECTION "FlypointPermissions", WRAMX[$dca5],BANK[1] FlypointPerms: ; dca5 ds 4 -SECTION "BackupMapInfo", BSS[$dcad] +SECTION "BackupMapInfo", WRAMX[$dcad],BANK[1] ; used on maps like second floor pokécenter, which are reused, so we know which ; map to return to @@ -1853,7 +1850,7 @@ BackupMapGroup: ; dcad BackupMapNumber: ; dcae ds 1 -SECTION "PlayerMapInfo", BSS[$dcb4] +SECTION "PlayerMapInfo", WRAMX[$dcb4],BANK[1] WarpNumber: ; dcb4 ds 1 @@ -1866,7 +1863,7 @@ YCoord: ; dcb7 XCoord: ; dcb8 ds 1 ; current x coordinate relative to top-left corner of current map -SECTION "PlayerParty",BSS[$dcd7] +SECTION "PlayerParty",WRAMX[$dcd7],BANK[1] PartyCount: ; dcd7 ds 1 ; number of Pokémon in party @@ -1986,7 +1983,7 @@ PartyMon5Nickname: ; de6d PartyMon6Nickname: ; de78 ds 11 -SECTION "Pokedex",BSS[$de99] +SECTION "Pokedex",WRAMX[$de99],BANK[1] PokedexSeen: ; de99 ds 32 EndPokedexSeen: @@ -1998,7 +1995,7 @@ UnownDex: ; ded9 UnlockedUnowns: ; def3 ds 1 -SECTION "Breeding",BSS[$def5] +SECTION "Breeding",WRAMX[$def5],BANK[1] DaycareMan: ; def5 ; bit 7: active ; bit 6: monsters are compatible @@ -2048,7 +2045,7 @@ EggSpecies: ; df7b ds 1 ds 31 -SECTION "RoamMons",BSS[$dfcf] +SECTION "RoamMons",WRAMX[$dfcf],BANK[1] RoamMon1Species: ; dfcf ds 1 RoamMon1Level: ; dfd0 @@ -2090,14 +2087,15 @@ RoamMon3DVs: ; dfe2 -; SECTION "WRAMBank5",BSS[$d000] +SECTION "WRAMBank5",WRAMX[$d000],BANK[5] ; 8 4-color palettes -Unkn1Pals EQU $d000 -Unkn2Pals EQU $d040 -BGPals EQU $d080 -OBPals EQU $d0c0 - - - +Unkn1Pals: + ds $40 +Unkn2Pals: + ds $40 +BGPals: + ds $40 +OBPals: + ds $40