summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorAntonioND <antonio_nd@outlook.com>2017-03-14 20:52:58 +0000
committerAntonioND <antonio_nd@outlook.com>2017-03-14 21:45:45 +0000
commitcec6e6e2fb7886acc85200f921d3913fd2ea8a2b (patch)
tree0a2dc392caea51aa4ec6c94bb3451e54a7232502 /main.asm
parentf40c979a6cab4904219c6b145ba9549c5a56108d (diff)
Fix floating sections
This is needed to prevent rgblink from moving them around in future releases. Signed-off-by: AntonioND <antonio_nd@outlook.com>
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm72
1 files changed, 36 insertions, 36 deletions
diff --git a/main.asm b/main.asm
index da2d3671..7943dc3d 100755
--- a/main.asm
+++ b/main.asm
@@ -14,7 +14,7 @@ PICS_5 EQU $D
INCLUDE "home.asm"
-SECTION "bank1",ROMX,BANK[$1]
+SECTION "bank1",ROMX[$4000],BANK[$1]
INCLUDE "data/facing.asm"
@@ -86,7 +86,7 @@ INCLUDE "engine/remove_pokemon.asm"
INCLUDE "engine/display_pokedex.asm"
-SECTION "bank3",ROMX,BANK[$3]
+SECTION "bank3",ROMX[$4000],BANK[$3]
INCLUDE "engine/joypad.asm"
@@ -127,7 +127,7 @@ INCLUDE "engine/pathfinding.asm"
INCLUDE "engine/hp_bar.asm"
INCLUDE "engine/hidden_object_functions3.asm"
-SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1]
+SECTION "NPC Sprites 1", ROMX[$4000], BANK[NPC_SPRITES_1]
OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp"
RockerSprite: INCBIN "gfx/sprites/rocker.2bpp"
@@ -158,7 +158,7 @@ OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp"
LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp"
-SECTION "Graphics", ROMX, BANK[GFX]
+SECTION "Graphics", ROMX[$5380], BANK[GFX]
PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp"
FontGraphics: INCBIN "gfx/font.1bpp"
@@ -184,7 +184,7 @@ PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp"
PlayerCharacterTitleGraphicsEnd:
-SECTION "Battle (bank 4)", ROMX, BANK[$4]
+SECTION "Battle (bank 4)", ROMX[$68D8], BANK[$4]
INCLUDE "engine/overworld/is_player_just_outside_map.asm"
INCLUDE "engine/menu/status_screen.asm"
@@ -206,7 +206,7 @@ INCLUDE "engine/battle/get_trainer_name.asm"
INCLUDE "engine/random.asm"
-SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2]
+SECTION "NPC Sprites 2", ROMX[$4000], BANK[NPC_SPRITES_2]
RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp"
RedSprite: INCBIN "gfx/sprites/red.2bpp"
@@ -250,7 +250,7 @@ LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp"
SeelSprite: INCBIN "gfx/sprites/seel.2bpp"
-SECTION "Battle (bank 5)", ROMX, BANK[$5]
+SECTION "Battle (bank 5)", ROMX[$7840], BANK[$5]
INCLUDE "engine/load_pokedex_tiles.asm"
INCLUDE "engine/overworld/map_sprites.asm"
@@ -260,7 +260,7 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm"
INCLUDE "engine/menu/pc.asm"
-SECTION "bank6",ROMX,BANK[$6]
+SECTION "bank6",ROMX[$4000],BANK[$6]
INCLUDE "data/mapHeaders/celadoncity.asm"
INCLUDE "data/mapObjects/celadoncity.asm"
@@ -335,7 +335,7 @@ INCLUDE "engine/overworld/doors.asm"
INCLUDE "engine/overworld/ledges.asm"
-SECTION "bank7",ROMX,BANK[$7]
+SECTION "bank7",ROMX[$4000],BANK[$7]
INCLUDE "data/mapHeaders/cinnabarisland.asm"
INCLUDE "data/mapObjects/cinnabarisland.asm"
@@ -516,7 +516,7 @@ INCLUDE "engine/menu/oaks_pc.asm"
INCLUDE "engine/hidden_object_functions7.asm"
-SECTION "Pics 1", ROMX, BANK[PICS_1]
+SECTION "Pics 1", ROMX[$4000], BANK[PICS_1]
RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic"
RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic"
@@ -578,13 +578,13 @@ TangelaPicFront:: INCBIN "pic/bmon/tangela.pic"
TangelaPicBack:: INCBIN "pic/monback/tangelab.pic"
-SECTION "Battle (bank 9)", ROMX, BANK[$9]
+SECTION "Battle (bank 9)", ROMX[$7D6B], BANK[$9]
INCLUDE "engine/battle/print_type.asm"
INCLUDE "engine/battle/save_trainer_name.asm"
INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm"
-SECTION "Pics 2", ROMX, BANK[PICS_2]
+SECTION "Pics 2", ROMX[$4000], BANK[PICS_2]
GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic"
GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic"
@@ -652,11 +652,11 @@ MoltresPicFront:: INCBIN "pic/bmon/moltres.pic"
MoltresPicBack:: INCBIN "pic/monback/moltresb.pic"
-SECTION "Battle (bank A)", ROMX, BANK[$A]
+SECTION "Battle (bank A)", ROMX[$7EA9], BANK[$A]
INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm"
-SECTION "Pics 3", ROMX, BANK[PICS_3]
+SECTION "Pics 3", ROMX[$4000], BANK[PICS_3]
ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic"
ArticunoPicBack:: INCBIN "pic/monback/articunob.pic"
@@ -730,7 +730,7 @@ BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic"
FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic"
-SECTION "Battle (bank B)", ROMX, BANK[$B]
+SECTION "Battle (bank B)", ROMX[$7B7B], BANK[$B]
INCLUDE "engine/battle/display_effectiveness.asm"
@@ -746,7 +746,7 @@ INCLUDE "engine/battle/moveEffects/pay_day_effect.asm"
INCLUDE "engine/game_corner_slots2.asm"
-SECTION "Pics 4", ROMX, BANK[PICS_4]
+SECTION "Pics 4", ROMX[$4000], BANK[PICS_4]
DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic"
DodrioPicBack:: INCBIN "pic/monback/dodriob.pic"
@@ -811,12 +811,12 @@ RedPicBack:: INCBIN "pic/trainer/redb.pic"
OldManPic:: INCBIN "pic/trainer/oldman.pic"
-SECTION "Battle (bank C)", ROMX, BANK[$C]
+SECTION "Battle (bank C)", ROMX[$7F2B], BANK[$C]
INCLUDE "engine/battle/moveEffects/mist_effect.asm"
INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm"
-SECTION "Pics 5", ROMX, BANK[PICS_5]
+SECTION "Pics 5", ROMX[$4000], BANK[PICS_5]
BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic"
BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic"
@@ -874,7 +874,7 @@ VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic"
VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic"
-SECTION "Battle (bank D)", ROMX, BANK[$D]
+SECTION "Battle (bank D)", ROMX[$7244], BANK[$D]
INCLUDE "engine/titlescreen2.asm"
INCLUDE "engine/battle/link_battle_versus_text.asm"
@@ -884,7 +884,7 @@ INCLUDE "engine/multiply_divide.asm"
INCLUDE "engine/game_corner_slots.asm"
-SECTION "bankE",ROMX,BANK[$E]
+SECTION "bankE",ROMX[$4000],BANK[$E]
INCLUDE "data/moves.asm"
BaseStats: INCLUDE "data/base_stats.asm"
@@ -910,12 +910,12 @@ INCLUDE "engine/battle/moveEffects/transform_effect.asm"
INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm"
-SECTION "bankF",ROMX,BANK[$F]
+SECTION "bankF",ROMX[$4000],BANK[$F]
INCLUDE "engine/battle/core.asm"
-SECTION "bank10",ROMX,BANK[$10]
+SECTION "bank10",ROMX[$4000],BANK[$10]
INCLUDE "engine/menu/pokedex.asm"
INCLUDE "engine/trade.asm"
@@ -923,7 +923,7 @@ INCLUDE "engine/intro.asm"
INCLUDE "engine/trade2.asm"
-SECTION "bank11",ROMX,BANK[$11]
+SECTION "bank11",ROMX[$4000],BANK[$11]
INCLUDE "data/mapHeaders/lavendertown.asm"
INCLUDE "data/mapObjects/lavendertown.asm"
@@ -1068,7 +1068,7 @@ SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk"
INCLUDE "engine/overworld/hidden_objects.asm"
-SECTION "bank12",ROMX,BANK[$12]
+SECTION "bank12",ROMX[$4000],BANK[$12]
INCLUDE "data/mapHeaders/route7.asm"
INCLUDE "data/mapObjects/route7.asm"
@@ -1247,7 +1247,7 @@ INCLUDE "data/mapObjects/safarizonesecrethouse.asm"
SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk"
-SECTION "bank13",ROMX,BANK[$13]
+SECTION "bank13",ROMX[$4000],BANK[$13]
TrainerPics::
YoungsterPic:: INCBIN "pic/trainer/youngster.pic"
@@ -1312,7 +1312,7 @@ INCLUDE "engine/give_pokemon.asm"
INCLUDE "engine/predefs.asm"
-SECTION "bank14",ROMX,BANK[$14]
+SECTION "bank14",ROMX[$4000],BANK[$14]
INCLUDE "data/mapHeaders/route22.asm"
INCLUDE "data/mapObjects/route22.asm"
@@ -1390,7 +1390,7 @@ INCLUDE "engine/menu/prize_menu.asm"
INCLUDE "engine/hidden_object_functions14.asm"
-SECTION "bank15",ROMX,BANK[$15]
+SECTION "bank15",ROMX[$4000],BANK[$15]
INCLUDE "data/mapHeaders/route2.asm"
INCLUDE "data/mapObjects/route2.asm"
@@ -1482,7 +1482,7 @@ INCLUDE "engine/menu/diploma.asm"
INCLUDE "engine/overworld/trainers.asm"
-SECTION "bank16",ROMX,BANK[$16]
+SECTION "bank16",ROMX[$4000],BANK[$16]
INCLUDE "data/mapHeaders/route6.asm"
INCLUDE "data/mapObjects/route6.asm"
@@ -1572,7 +1572,7 @@ HallofFameRoomBlocks:
INCLUDE "engine/overworld/saffron_guards.asm"
-SECTION "bank17",ROMX,BANK[$17]
+SECTION "bank17",ROMX[$4000],BANK[$17]
SaffronMartBlocks:
LavenderMartBlocks:
@@ -1728,7 +1728,7 @@ INCLUDE "engine/predefs17_2.asm"
INCLUDE "engine/hidden_object_functions17.asm"
-SECTION "bank18",ROMX,BANK[$18]
+SECTION "bank18",ROMX[$4000],BANK[$18]
ViridianForestBlocks: INCBIN "maps/viridianforest.blk"
UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk"
@@ -1851,7 +1851,7 @@ SilphCo11Blocks: INCBIN "maps/silphco11.blk"
INCLUDE "engine/hidden_object_functions18.asm"
-SECTION "bank19",ROMX,BANK[$19]
+SECTION "bank19",ROMX[$4000],BANK[$19]
Overworld_GFX: INCBIN "gfx/tilesets/overworld.t2.2bpp"
Overworld_Block: INCBIN "gfx/blocksets/overworld.bst"
@@ -1873,7 +1873,7 @@ Plateau_GFX: INCBIN "gfx/tilesets/plateau.t10.2bpp"
Plateau_Block: INCBIN "gfx/blocksets/plateau.bst"
-SECTION "bank1A",ROMX,BANK[$1A]
+SECTION "bank1A",ROMX[$4000],BANK[$1A]
INCLUDE "engine/battle/decrement_pp.asm"
@@ -1909,7 +1909,7 @@ Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp"
Facility_Block: INCBIN "gfx/blocksets/facility.bst"
-SECTION "bank1B",ROMX,BANK[$1B]
+SECTION "bank1B",ROMX[$4000],BANK[$1B]
Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp"
Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst"
@@ -1927,7 +1927,7 @@ Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp"
Underground_Block: INCBIN "gfx/blocksets/underground.bst"
-SECTION "bank1C",ROMX,BANK[$1C]
+SECTION "bank1C",ROMX[$4000],BANK[$1C]
INCLUDE "engine/gamefreak.asm"
INCLUDE "engine/hall_of_fame.asm"
@@ -1942,7 +1942,7 @@ INCLUDE "engine/palettes.asm"
INCLUDE "engine/save.asm"
-SECTION "bank1D",ROMX,BANK[$1D]
+SECTION "bank1D",ROMX[$4000],BANK[$1D]
CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk"
@@ -2074,7 +2074,7 @@ INCLUDE "engine/menu/league_pc.asm"
INCLUDE "engine/overworld/hidden_items.asm"
-SECTION "bank1E",ROMX,BANK[$1E]
+SECTION "bank1E",ROMX[$4000],BANK[$1E]
INCLUDE "engine/battle/animations.asm"