diff options
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 85 |
1 files changed, 37 insertions, 48 deletions
@@ -1,21 +1,10 @@ INCLUDE "charmap.asm" INCLUDE "constants.asm" -NPC_SPRITES_1 EQU $4 -NPC_SPRITES_2 EQU $5 - -GFX EQU $4 - -PICS_1 EQU $9 -PICS_2 EQU $A -PICS_3 EQU $B -PICS_4 EQU $C -PICS_5 EQU $D - INCLUDE "home.asm" -SECTION "bank01",ROMX,BANK[$01] +SECTION "bank01", ROMX INCLUDE "data/facing.asm" @@ -67,7 +56,7 @@ INCLUDE "engine/remove_pokemon.asm" INCLUDE "engine/display_pokedex.asm" -SECTION "bank03",ROMX,BANK[$03] +SECTION "bank03", ROMX INCLUDE "engine/joypad.asm" @@ -109,7 +98,7 @@ INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" -SECTION "Graphics", ROMX, BANK[GFX] +SECTION "Graphics", ROMX PokemonLogoJapanGraphics: INCBIN "gfx/pokemon_logo_japan.2bpp" FontGraphics: INCBIN "gfx/font.1bpp" @@ -145,7 +134,7 @@ INCLUDE "engine/menu/start_sub_menus.asm" INCLUDE "engine/items/tms.asm" -SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1] +SECTION "NPC Sprites 1", ROMX OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" RockerSprite: INCBIN "gfx/sprites/rocker.2bpp" @@ -183,7 +172,7 @@ INCLUDE "engine/battle/moveEffects/conversion_effect.asm" INCLUDE "engine/battle/moveEffects/haze_effect.asm" -SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] +SECTION "NPC Sprites 2", ROMX INCLUDE "engine/load_pokedex_tiles.asm" INCLUDE "engine/overworld/map_sprites.asm" @@ -233,7 +222,7 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" -SECTION "bank06",ROMX,BANK[$06] +SECTION "bank06", ROMX INCLUDE "data/mapHeaders/celadoncity.asm" INCLUDE "data/mapObjects/celadoncity.asm" @@ -306,7 +295,7 @@ INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" -SECTION "bank07",ROMX,BANK[$07] +SECTION "bank07", ROMX INCLUDE "data/mapHeaders/cinnabarisland.asm" INCLUDE "data/mapObjects/cinnabarisland.asm" @@ -479,7 +468,7 @@ INCLUDE "engine/menu/oaks_pc.asm" INCLUDE "engine/hidden_object_functions7.asm" -SECTION "Pics 1", ROMX, BANK[PICS_1] +SECTION "Pics 1", ROMX RhydonPicFront: INCBIN "pic/ymon/rhydon.pic" RhydonPicBack: INCBIN "pic/monback/rhydonb.pic" @@ -546,7 +535,7 @@ INCLUDE "engine/battle/print_type.asm" INCLUDE "engine/battle/save_trainer_name.asm" -SECTION "Pics 2", ROMX, BANK[PICS_2] +SECTION "Pics 2", ROMX GrowlithePicFront: INCBIN "pic/ymon/growlithe.pic" GrowlithePicBack: INCBIN "pic/monback/growlitheb.pic" @@ -617,7 +606,7 @@ INCLUDE "engine/predefsA.asm" INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" -SECTION "Pics 3", ROMX, BANK[PICS_3] +SECTION "Pics 3", ROMX ArticunoPicFront: INCBIN "pic/ymon/articuno.pic" ArticunoPicBack: INCBIN "pic/monback/articunob.pic" @@ -704,7 +693,7 @@ INCLUDE "engine/battle/scale_sprites.asm" INCLUDE "engine/game_corner_slots2.asm" -SECTION "Pics 4", ROMX, BANK[PICS_4] +SECTION "Pics 4", ROMX DodrioPicFront: INCBIN "pic/ymon/dodrio.pic" DodrioPicBack: INCBIN "pic/monback/dodriob.pic" @@ -766,7 +755,7 @@ StarmiePicFront: INCBIN "pic/ymon/starmie.pic" StarmiePicBack: INCBIN "pic/monback/starmieb.pic" -SECTION "Pics 5", ROMX, BANK[PICS_5] +SECTION "Pics 5", ROMX BulbasaurPicFront: INCBIN "pic/ymon/bulbasaur.pic" BulbasaurPicBack: INCBIN "pic/monback/bulbasaurb.pic" @@ -828,7 +817,7 @@ INCLUDE "engine/slot_machine.asm" INCLUDE "engine/game_corner_slots.asm" -SECTION "bank0E",ROMX,BANK[$0E] +SECTION "bank0E", ROMX INCLUDE "data/moves.asm" BaseStats: INCLUDE "data/base_stats.asm" @@ -848,12 +837,12 @@ TradingAnimationGraphics2End: INCLUDE "engine/evos_moves.asm" -SECTION "bank0F",ROMX,BANK[$0F] +SECTION "bank0F", ROMX INCLUDE "engine/battle/core.asm" -SECTION "bank10",ROMX,BANK[$10] +SECTION "bank10", ROMX INCLUDE "engine/menu/pokedex.asm" INCLUDE "engine/overworld/emotion_bubbles.asm" @@ -863,7 +852,7 @@ INCLUDE "engine/trade2.asm" INCLUDE "engine/menu/options.asm" -SECTION "bank11",ROMX,BANK[$11] +SECTION "bank11", ROMX INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" @@ -1011,7 +1000,7 @@ SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" INCLUDE "engine/overworld/dungeon_warps.asm" -SECTION "bank12",ROMX,BANK[$12] +SECTION "bank12", ROMX INCLUDE "data/mapHeaders/route7.asm" INCLUDE "data/mapObjects/route7.asm" @@ -1185,7 +1174,7 @@ INCLUDE "data/mapObjects/safarizonesecrethouse.asm" SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" -SECTION "bank13",ROMX,BANK[$13] +SECTION "bank13", ROMX TrainerPics: YoungsterPic: INCBIN "pic/trainer/youngster.pic" @@ -1247,7 +1236,7 @@ INCLUDE "data/mapObjects/colosseum.asm" ColosseumBlocks: INCBIN "maps/colosseum.blk" -SECTION "bank14",ROMX,BANK[$14] +SECTION "bank14", ROMX INCLUDE "data/mapHeaders/route22.asm" INCLUDE "data/mapObjects/route22.asm" @@ -1321,7 +1310,7 @@ INCLUDE "engine/menu/prize_menu.asm" INCLUDE "engine/hidden_object_functions14.asm" -SECTION "bank15",ROMX,BANK[$15] +SECTION "bank15", ROMX INCLUDE "data/mapHeaders/route2.asm" INCLUDE "data/mapObjects/route2.asm" @@ -1412,7 +1401,7 @@ INCLUDE "engine/menu/diploma_1.asm" INCLUDE "engine/overworld/trainers.asm" -SECTION "bank16",ROMX,BANK[$16] +SECTION "bank16", ROMX INCLUDE "data/mapHeaders/route6.asm" INCLUDE "data/mapObjects/route6.asm" @@ -1496,7 +1485,7 @@ HallofFameRoomBlocks: INCBIN "maps/halloffameroom.blk" INCLUDE "engine/overworld/saffron_guards.asm" -SECTION "bank17",ROMX,BANK[$17] +SECTION "bank17", ROMX CeruleanMartBlocks: VermilionMartBlocks: @@ -1648,7 +1637,7 @@ INCLUDE "engine/predefs17_2.asm" INCLUDE "engine/hidden_object_functions17.asm" -SECTION "bank18",ROMX,BANK[$18] +SECTION "bank18", ROMX ViridianForestBlocks: INCBIN "maps/viridianforest.blk" UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" @@ -1766,7 +1755,7 @@ SilphCo11Blocks: INCBIN "maps/silphco11.blk" INCLUDE "engine/hidden_object_functions18.asm" -SECTION "bank19",ROMX,BANK[$19] +SECTION "bank19", ROMX Overworld_GFX: INCBIN "gfx/tilesets/overworld.2bpp" Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" @@ -1786,7 +1775,7 @@ Plateau_GFX: INCBIN "gfx/tilesets/plateau.t10.2bpp" Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" -SECTION "bank1A",ROMX,BANK[$1A] +SECTION "bank1A", ROMX INCBIN "gfx/blueversion.1bpp" ; unused @@ -1810,7 +1799,7 @@ Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" Facility_Block: INCBIN "gfx/blocksets/facility.bst" -SECTION "bank1B",ROMX,BANK[$1B] +SECTION "bank1B", ROMX Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp" Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst" @@ -1828,7 +1817,7 @@ Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp" Underground_Block: INCBIN "gfx/blocksets/underground.bst" -SECTION "bank1C",ROMX,BANK[$1C] +SECTION "bank1C", ROMX INCLUDE "engine/gamefreak.asm" INCLUDE "engine/hall_of_fame.asm" @@ -1843,7 +1832,7 @@ INCLUDE "engine/palettes.asm" INCLUDE "engine/save.asm" -SECTION "bank1D",ROMX,BANK[$1D] +SECTION "bank1D", ROMX CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk" PewterMartBlocks: @@ -1969,7 +1958,7 @@ INCLUDE "engine/overworld/elevator.asm" INCLUDE "engine/overworld/hidden_items.asm" -SECTION "bank1E",ROMX,BANK[$1E] +SECTION "bank1E", ROMX INCLUDE "engine/battle/animations.asm" @@ -1985,18 +1974,18 @@ RedFishingRodTiles: INCBIN "gfx/red_fishingrod_tiles.2bpp" INCLUDE "data/animations.asm" -SECTION "bank2f",ROMX[$5000],BANK[$2F] +SECTION "bank2f", ROMX INCLUDE "engine/bg_map_attributes.asm" -SECTION "bank30",ROMX,BANK[$30] +SECTION "bank30", ROMX ; This whole bank is garbage data. INCBIN "engine/bank30.bin" -SECTION "bank39",ROMX,BANK[$39] +SECTION "bank39", ROMX Pic_e4000: INCBIN "gfx/pikachu/unknown_e4000.pic" @@ -2114,7 +2103,7 @@ GFX_e7d13: INCBIN "gfx/pikachu/unknown_e7d13.2bpp" -SECTION "bank3A",ROMX,BANK[$3A] +SECTION "bank3A", ROMX INCLUDE "text/monster_names.asm" @@ -2130,21 +2119,21 @@ INCLUDE "engine/unknown_ea3ea.asm" INCLUDE "engine/overworld/npc_movement_2.asm" -SECTION "bank3C",ROMX,BANK[$3C] +SECTION "bank3C", ROMX INCLUDE "engine/bank3c.asm" -SECTION "bank3D",ROMX,BANK[$3D] +SECTION "bank3D", ROMX INCLUDE "engine/bank3d.asm" -SECTION "bank3E",ROMX,BANK[$3E] +SECTION "bank3E", ROMX INCLUDE "engine/bank3e.asm" -SECTION "bank3F",ROMX,BANK[$3F] +SECTION "bank3F", ROMX INCLUDE "engine/bank3f.asm" |