shithub: pokered

Download patch

ref: 678b3c9e6c7de83ad09c00b181497f942bf86e62
parent: 6697d9e7f1721bdbc9c996413a5e733e050f3d9e
parent: 52adb844def5bffa9cd402e886cf24ea17fc00ab
author: yenatch <yenatch@gmail.com>
date: Mon Apr 24 18:08:48 EDT 2017 

Merge commit '52adb84'

Revert "Fix floating sections"

This reverts commit cec6e6e.


--- a/audio.asm
+++ b/audio.asm
@@ -6,29 +6,29 @@
 INCLUDE "constants.asm"
 
 
-SECTION "Sound Effect Headers 1", ROMX[$4000], BANK[AUDIO_1]
+SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1]
 INCLUDE "audio/headers/sfxheaders1.asm"
 
-SECTION "Sound Effect Headers 2", ROMX[$4000], BANK[AUDIO_2]
+SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2]
 INCLUDE "audio/headers/sfxheaders2.asm"
 
-SECTION "Sound Effect Headers 3", ROMX[$4000], BANK[AUDIO_3]
+SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3]
 INCLUDE "audio/headers/sfxheaders3.asm"
 
 
 
-SECTION "Music Headers 1", ROMX[$422E], BANK[AUDIO_1]
+SECTION "Music Headers 1", ROMX, BANK[AUDIO_1]
 INCLUDE "audio/headers/musicheaders1.asm"
 
-SECTION "Music Headers 2", ROMX[$42BE], BANK[AUDIO_2]
+SECTION "Music Headers 2", ROMX, BANK[AUDIO_2]
 INCLUDE "audio/headers/musicheaders2.asm"
 
-SECTION "Music Headers 3", ROMX[$4249], BANK[AUDIO_3]
+SECTION "Music Headers 3", ROMX, BANK[AUDIO_3]
 INCLUDE "audio/headers/musicheaders3.asm"
 
 
 
-SECTION "Sound Effects 1", ROMX[$42FD], BANK[AUDIO_1]
+SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1]
 
 INCLUDE "audio/sfx/snare1_1.asm"
 INCLUDE "audio/sfx/snare2_1.asm"
@@ -127,7 +127,7 @@
 INCLUDE "audio/sfx/cry22_1.asm"
 
 
-SECTION "Sound Effects 2", ROMX[$42FD], BANK[AUDIO_2]
+SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2]
 
 INCLUDE "audio/sfx/snare1_2.asm"
 INCLUDE "audio/sfx/snare2_2.asm"
@@ -252,7 +252,7 @@
 INCLUDE "audio/sfx/cry22_2.asm"
 
 
-SECTION "Sound Effects 3", ROMX[$42FD], BANK[AUDIO_3]
+SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3]
 
 INCLUDE "audio/sfx/snare1_3.asm"
 INCLUDE "audio/sfx/snare2_3.asm"
@@ -360,7 +360,7 @@
 
 
 
-SECTION "Audio Engine 1", ROMX[$50C6], BANK[AUDIO_1]
+SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1]
 
 PlayBattleMusic::
 	xor a
@@ -453,7 +453,7 @@
 	jp Audio1_OverwriteChannelPointer
 
 
-SECTION "Audio Engine 2", ROMX[$536E], BANK[AUDIO_2]
+SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
 
 Music_DoLowHealthAlarm::
 	ld a, [wLowHealthAlarm]
@@ -557,7 +557,7 @@
 	ret
 
 
-SECTION "Audio Engine 3", ROMX[$513B], BANK[AUDIO_3]
+SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3]
 
 PlayPokedexRatingSfx::
 	ld a, [$ffdc]
@@ -601,7 +601,7 @@
 
 
 
-SECTION "Music 1", ROMX[$5BA3], BANK[AUDIO_1]
+SECTION "Music 1", ROMX, BANK[AUDIO_1]
 
 INCLUDE "audio/music/pkmnhealed.asm"
 INCLUDE "audio/music/routes1.asm"
@@ -630,7 +630,7 @@
 INCLUDE "audio/music/pokecenter.asm"
 
 
-SECTION "Music 2", ROMX[$6322], BANK[AUDIO_2]
+SECTION "Music 2", ROMX, BANK[AUDIO_2]
 
 INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm"
 INCLUDE "audio/sfx/unused2_2.asm"
@@ -646,7 +646,7 @@
 INCLUDE "audio/music/defeatedgymleader.asm"
 
 
-SECTION "Music 3", ROMX[$5BBB], BANK[AUDIO_3]
+SECTION "Music 3", ROMX, BANK[AUDIO_3]
 
 INCLUDE "audio/music/bikeriding.asm"
 INCLUDE "audio/music/dungeon1.asm"
--- a/home.asm
+++ b/home.asm
@@ -30,7 +30,7 @@
 	reti
 
 
-SECTION "Home", ROM0 [$61]
+SECTION "Home", ROM0
 
 DisableLCD::
 	xor a
@@ -99,7 +99,7 @@
 
 
 
-SECTION "Main", ROM0 [$150]
+SECTION "Main", ROM0
 
 Start::
 	cp GBC
--- a/main.asm
+++ b/main.asm
@@ -14,7 +14,7 @@
 INCLUDE "home.asm"
 
 
-SECTION "bank1",ROMX[$4000],BANK[$1]
+SECTION "bank1",ROMX,BANK[$1]
 
 INCLUDE "data/facing.asm"
 
@@ -86,7 +86,7 @@
 
 INCLUDE "engine/display_pokedex.asm"
 
-SECTION "bank3",ROMX[$4000],BANK[$3]
+SECTION "bank3",ROMX,BANK[$3]
 
 INCLUDE "engine/joypad.asm"
 
@@ -127,7 +127,7 @@
 INCLUDE "engine/hp_bar.asm"
 INCLUDE "engine/hidden_object_functions3.asm"
 
-SECTION "NPC Sprites 1", ROMX[$4000], BANK[NPC_SPRITES_1]
+SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1]
 
 OakAideSprite:         INCBIN "gfx/sprites/oak_aide.2bpp"
 RockerSprite:          INCBIN "gfx/sprites/rocker.2bpp"
@@ -158,7 +158,7 @@
 LyingOldManSprite:     INCBIN "gfx/sprites/lying_old_man.2bpp"
 
 
-SECTION "Graphics", ROMX[$5380], BANK[GFX]
+SECTION "Graphics", ROMX, BANK[GFX]
 
 PokemonLogoGraphics:            INCBIN "gfx/pokemon_logo.2bpp"
 FontGraphics:                   INCBIN "gfx/font.1bpp"
@@ -184,7 +184,7 @@
 PlayerCharacterTitleGraphicsEnd:
 
 
-SECTION "Battle (bank 4)", ROMX[$68D8], BANK[$4]
+SECTION "Battle (bank 4)", ROMX, BANK[$4]
 
 INCLUDE "engine/overworld/is_player_just_outside_map.asm"
 INCLUDE "engine/menu/status_screen.asm"
@@ -206,7 +206,7 @@
 INCLUDE "engine/random.asm"
 
 
-SECTION "NPC Sprites 2", ROMX[$4000], BANK[NPC_SPRITES_2]
+SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2]
 
 RedCyclingSprite:     INCBIN "gfx/sprites/cycling.2bpp"
 RedSprite:            INCBIN "gfx/sprites/red.2bpp"
@@ -250,7 +250,7 @@
 SeelSprite:           INCBIN "gfx/sprites/seel.2bpp"
 
 
-SECTION "Battle (bank 5)", ROMX[$7840], BANK[$5]
+SECTION "Battle (bank 5)", ROMX, BANK[$5]
 
 INCLUDE "engine/load_pokedex_tiles.asm"
 INCLUDE "engine/overworld/map_sprites.asm"
@@ -260,7 +260,7 @@
 INCLUDE "engine/menu/pc.asm"
 
 
-SECTION "bank6",ROMX[$4000],BANK[$6]
+SECTION "bank6",ROMX,BANK[$6]
 
 INCLUDE "data/mapHeaders/celadoncity.asm"
 INCLUDE "data/mapObjects/celadoncity.asm"
@@ -335,7 +335,7 @@
 INCLUDE "engine/overworld/ledges.asm"
 
 
-SECTION "bank7",ROMX[$4000],BANK[$7]
+SECTION "bank7",ROMX,BANK[$7]
 
 INCLUDE "data/mapHeaders/cinnabarisland.asm"
 INCLUDE "data/mapObjects/cinnabarisland.asm"
@@ -516,7 +516,7 @@
 INCLUDE "engine/hidden_object_functions7.asm"
 
 
-SECTION "Pics 1", ROMX[$4000], BANK[PICS_1]
+SECTION "Pics 1", ROMX, BANK[PICS_1]
 
 RhydonPicFront::      INCBIN "pic/bmon/rhydon.pic"
 RhydonPicBack::       INCBIN "pic/monback/rhydonb.pic"
@@ -578,13 +578,13 @@
 TangelaPicBack::      INCBIN "pic/monback/tangelab.pic"
 
 
-SECTION "Battle (bank 9)", ROMX[$7D6B], BANK[$9]
+SECTION "Battle (bank 9)", ROMX, 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[$4000], BANK[PICS_2]
+SECTION "Pics 2", ROMX, BANK[PICS_2]
 
 GrowlithePicFront::   INCBIN "pic/bmon/growlithe.pic"
 GrowlithePicBack::    INCBIN "pic/monback/growlitheb.pic"
@@ -652,11 +652,11 @@
 MoltresPicBack::      INCBIN "pic/monback/moltresb.pic"
 
 
-SECTION "Battle (bank A)", ROMX[$7EA9], BANK[$A]
+SECTION "Battle (bank A)", ROMX, BANK[$A]
 INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm"
 
 
-SECTION "Pics 3", ROMX[$4000], BANK[PICS_3]
+SECTION "Pics 3", ROMX, BANK[PICS_3]
 
 ArticunoPicFront::    INCBIN "pic/bmon/articuno.pic"
 ArticunoPicBack::     INCBIN "pic/monback/articunob.pic"
@@ -730,7 +730,7 @@
 FossilKabutopsPic::   INCBIN "pic/bmon/fossilkabutops.pic"
 
 
-SECTION "Battle (bank B)", ROMX[$7B7B], BANK[$B]
+SECTION "Battle (bank B)", ROMX, BANK[$B]
 
 INCLUDE "engine/battle/display_effectiveness.asm"
 
@@ -746,7 +746,7 @@
 INCLUDE "engine/game_corner_slots2.asm"
 
 
-SECTION "Pics 4", ROMX[$4000], BANK[PICS_4]
+SECTION "Pics 4", ROMX, BANK[PICS_4]
 
 DodrioPicFront::       INCBIN "pic/bmon/dodrio.pic"
 DodrioPicBack::        INCBIN "pic/monback/dodriob.pic"
@@ -811,12 +811,12 @@
 OldManPic::            INCBIN "pic/trainer/oldman.pic"
 
 
-SECTION "Battle (bank C)", ROMX[$7F2B], BANK[$C]
+SECTION "Battle (bank C)", ROMX, BANK[$C]
 INCLUDE "engine/battle/moveEffects/mist_effect.asm"
 INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm"
 
 
-SECTION "Pics 5", ROMX[$4000], BANK[PICS_5]
+SECTION "Pics 5", ROMX, BANK[PICS_5]
 
 BulbasaurPicFront::    INCBIN "pic/bmon/bulbasaur.pic"
 BulbasaurPicBack::     INCBIN "pic/monback/bulbasaurb.pic"
@@ -874,7 +874,7 @@
 VictreebelPicBack::    INCBIN "pic/monback/victreebelb.pic"
 
 
-SECTION "Battle (bank D)", ROMX[$7244], BANK[$D]
+SECTION "Battle (bank D)", ROMX, BANK[$D]
 
 INCLUDE "engine/titlescreen2.asm"
 INCLUDE "engine/battle/link_battle_versus_text.asm"
@@ -884,7 +884,7 @@
 INCLUDE "engine/game_corner_slots.asm"
 
 
-SECTION "bankE",ROMX[$4000],BANK[$E]
+SECTION "bankE",ROMX,BANK[$E]
 
 INCLUDE "data/moves.asm"
 BaseStats: INCLUDE "data/base_stats.asm"
@@ -910,12 +910,12 @@
 INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm"
 
 
-SECTION "bankF",ROMX[$4000],BANK[$F]
+SECTION "bankF",ROMX,BANK[$F]
 
 INCLUDE "engine/battle/core.asm"
 
 
-SECTION "bank10",ROMX[$4000],BANK[$10]
+SECTION "bank10",ROMX,BANK[$10]
 
 INCLUDE "engine/menu/pokedex.asm"
 INCLUDE "engine/trade.asm"
@@ -923,7 +923,7 @@
 INCLUDE "engine/trade2.asm"
 
 
-SECTION "bank11",ROMX[$4000],BANK[$11]
+SECTION "bank11",ROMX,BANK[$11]
 
 INCLUDE "data/mapHeaders/lavendertown.asm"
 INCLUDE "data/mapObjects/lavendertown.asm"
@@ -1068,7 +1068,7 @@
 INCLUDE "engine/overworld/hidden_objects.asm"
 
 
-SECTION "bank12",ROMX[$4000],BANK[$12]
+SECTION "bank12",ROMX,BANK[$12]
 
 INCLUDE "data/mapHeaders/route7.asm"
 INCLUDE "data/mapObjects/route7.asm"
@@ -1247,7 +1247,7 @@
 SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk"
 
 
-SECTION "bank13",ROMX[$4000],BANK[$13]
+SECTION "bank13",ROMX,BANK[$13]
 
 TrainerPics::
 YoungsterPic::     INCBIN "pic/trainer/youngster.pic"
@@ -1312,7 +1312,7 @@
 INCLUDE "engine/predefs.asm"
 
 
-SECTION "bank14",ROMX[$4000],BANK[$14]
+SECTION "bank14",ROMX,BANK[$14]
 
 INCLUDE "data/mapHeaders/route22.asm"
 INCLUDE "data/mapObjects/route22.asm"
@@ -1390,7 +1390,7 @@
 INCLUDE "engine/hidden_object_functions14.asm"
 
 
-SECTION "bank15",ROMX[$4000],BANK[$15]
+SECTION "bank15",ROMX,BANK[$15]
 
 INCLUDE "data/mapHeaders/route2.asm"
 INCLUDE "data/mapObjects/route2.asm"
@@ -1482,7 +1482,7 @@
 INCLUDE "engine/overworld/trainers.asm"
 
 
-SECTION "bank16",ROMX[$4000],BANK[$16]
+SECTION "bank16",ROMX,BANK[$16]
 
 INCLUDE "data/mapHeaders/route6.asm"
 INCLUDE "data/mapObjects/route6.asm"
@@ -1572,7 +1572,7 @@
 INCLUDE "engine/overworld/saffron_guards.asm"
 
 
-SECTION "bank17",ROMX[$4000],BANK[$17]
+SECTION "bank17",ROMX,BANK[$17]
 
 SaffronMartBlocks:
 LavenderMartBlocks:
@@ -1728,7 +1728,7 @@
 INCLUDE "engine/hidden_object_functions17.asm"
 
 
-SECTION "bank18",ROMX[$4000],BANK[$18]
+SECTION "bank18",ROMX,BANK[$18]
 
 ViridianForestBlocks:    INCBIN "maps/viridianforest.blk"
 UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk"
@@ -1851,7 +1851,7 @@
 INCLUDE "engine/hidden_object_functions18.asm"
 
 
-SECTION "bank19",ROMX[$4000],BANK[$19]
+SECTION "bank19",ROMX,BANK[$19]
 
 Overworld_GFX:     INCBIN "gfx/tilesets/overworld.t2.2bpp"
 Overworld_Block:   INCBIN "gfx/blocksets/overworld.bst"
@@ -1873,7 +1873,7 @@
 Plateau_Block:     INCBIN "gfx/blocksets/plateau.bst"
 
 
-SECTION "bank1A",ROMX[$4000],BANK[$1A]
+SECTION "bank1A",ROMX,BANK[$1A]
 
 INCLUDE "engine/battle/decrement_pp.asm"
 
@@ -1909,7 +1909,7 @@
 Facility_Block:    INCBIN "gfx/blocksets/facility.bst"
 
 
-SECTION "bank1B",ROMX[$4000],BANK[$1B]
+SECTION "bank1B",ROMX,BANK[$1B]
 
 Cemetery_GFX:      INCBIN "gfx/tilesets/cemetery.t4.2bpp"
 Cemetery_Block:    INCBIN "gfx/blocksets/cemetery.bst"
@@ -1927,7 +1927,7 @@
 Underground_Block: INCBIN "gfx/blocksets/underground.bst"
 
 
-SECTION "bank1C",ROMX[$4000],BANK[$1C]
+SECTION "bank1C",ROMX,BANK[$1C]
 
 INCLUDE "engine/gamefreak.asm"
 INCLUDE "engine/hall_of_fame.asm"
@@ -1942,7 +1942,7 @@
 INCLUDE "engine/save.asm"
 
 
-SECTION "bank1D",ROMX[$4000],BANK[$1D]
+SECTION "bank1D",ROMX,BANK[$1D]
 
 CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk"
 
@@ -2074,7 +2074,7 @@
 INCLUDE "engine/overworld/hidden_items.asm"
 
 
-SECTION "bank1E",ROMX[$4000],BANK[$1E]
+SECTION "bank1E",ROMX,BANK[$1E]
 
 INCLUDE "engine/battle/animations.asm"
 
--- a/sram.asm
+++ b/sram.asm
@@ -1,4 +1,4 @@
-SECTION "Sprite Buffers", SRAM[$a000], BANK[0]
+SECTION "Sprite Buffers", SRAM, BANK[0]
 
 sSpriteBuffer0:: ds SPRITEBUFFERSIZE ; a000
 sSpriteBuffer1:: ds SPRITEBUFFERSIZE ; a188
@@ -9,7 +9,7 @@
 sHallOfFame:: ds HOF_TEAM * HOF_TEAM_CAPACITY ; a598
 
 
-SECTION "Save Data", SRAM[$a000], BANK[1]
+SECTION "Save Data", SRAM, BANK[1]
 	ds $598
 
 sPlayerName::  ds NAME_LENGTH ; a598
@@ -21,7 +21,7 @@
 sMainDataCheckSum:: ds 1 ; b523
 
 
-SECTION "Saved Boxes 1", SRAM[$a000], BANK[2]
+SECTION "Saved Boxes 1", SRAM, BANK[2]
 
 sBox1:: ds wBoxDataEnd - wBoxDataStart ; a000
 sBox2:: ds wBoxDataEnd - wBoxDataStart ; a462
@@ -33,7 +33,7 @@
 sBank2IndividualBoxChecksums:: ds 6 ; ba4d
 
 
-SECTION "Saved Boxes 2", SRAM[$a000], BANK[3]
+SECTION "Saved Boxes 2", SRAM, BANK[3]
 
 sBox7::  ds wBoxDataEnd - wBoxDataStart ; a000
 sBox8::  ds wBoxDataEnd - wBoxDataStart ; a462
--- a/text.asm
+++ b/text.asm
@@ -19,7 +19,7 @@
 INCLUDE "hram.asm"
 
 
-SECTION "Text 1", ROMX[$4000], BANK[TEXT_1]
+SECTION "Text 1", ROMX, BANK[TEXT_1]
 
 _CardKeySuccessText1::
 	text "Bingo!@@"
@@ -192,7 +192,7 @@
 INCLUDE "text/maps/silph_co_5f_1.asm"
 
 
-SECTION "Text 2", ROMX[$4000], BANK[TEXT_2]
+SECTION "Text 2", ROMX, BANK[TEXT_2]
 
 INCLUDE "text/maps/silph_co_5f_2.asm"
 INCLUDE "text/maps/silph_co_6f.asm"
@@ -224,7 +224,7 @@
 INCLUDE "text/maps/rock_tunnel_b2f_1.asm"
 
 
-SECTION "Text 3", ROMX[$4000], BANK[TEXT_3]
+SECTION "Text 3", ROMX, BANK[TEXT_3]
 
 INCLUDE "text/maps/rock_tunnel_b2f_2.asm"
 INCLUDE "text/maps/seafoam_islands_b4f.asm"
@@ -1939,7 +1939,7 @@
 INCLUDE "text/maps/daycare_1.asm"
 
 
-SECTION "Text 4", ROMX[$4000], BANK[TEXT_4]
+SECTION "Text 4", ROMX, BANK[TEXT_4]
 
 INCLUDE "text/maps/daycare_2.asm"
 INCLUDE "text/maps/underground_path_route_6_entrance.asm"
@@ -1978,7 +1978,7 @@
 INCLUDE "text/maps/route_11_1.asm"
 
 
-SECTION "Text 5", ROMX[$4000], BANK[TEXT_5]
+SECTION "Text 5", ROMX, BANK[TEXT_5]
 
 INCLUDE "text/maps/route_11_2.asm"
 INCLUDE "text/maps/route_12.asm"
@@ -1996,7 +1996,7 @@
 INCLUDE "text/maps/route_24_1.asm"
 
 
-SECTION "Text 6", ROMX[$4000], BANK[TEXT_6]
+SECTION "Text 6", ROMX, BANK[TEXT_6]
 
 INCLUDE "text/maps/route_24_2.asm"
 INCLUDE "text/maps/route_25.asm"
@@ -2339,7 +2339,7 @@
 INCLUDE "text/maps/pewter_gym_1.asm"
 
 
-SECTION "Text 7", ROMX[$4000], BANK[TEXT_7]
+SECTION "Text 7", ROMX, BANK[TEXT_7]
 
 INCLUDE "text/maps/pewter_gym_2.asm"
 INCLUDE "text/maps/pewter_house_1.asm"
@@ -2371,7 +2371,7 @@
 INCLUDE "text/maps/vermilion_gym_1.asm"
 
 
-SECTION "Text 8", ROMX[$4000], BANK[TEXT_8]
+SECTION "Text 8", ROMX, BANK[TEXT_8]
 
 INCLUDE "text/maps/vermilion_gym_2.asm"
 INCLUDE "text/maps/vermilion_house.asm"
@@ -2403,7 +2403,7 @@
 INCLUDE "text/maps/fuchsia_gym_1.asm"
 
 
-SECTION "Text 9", ROMX[$4000], BANK[TEXT_9]
+SECTION "Text 9", ROMX, BANK[TEXT_9]
 
 INCLUDE "text/maps/fuchsia_gym_2.asm"
 INCLUDE "text/maps/fuchsia_meeting_room.asm"
@@ -2646,7 +2646,7 @@
 	done
 
 
-SECTION "Text 10", ROMX[$4000], BANK[TEXT_10]
+SECTION "Text 10", ROMX, BANK[TEXT_10]
 
 _CableClubNPCPleaseComeAgainText::
 	text "Please come again!"
@@ -2992,7 +2992,7 @@
 	prompt
 
 
-SECTION "Text 11", ROMX[$4000], BANK[TEXT_11]
+SECTION "Text 11", ROMX, BANK[TEXT_11]
 
 _ItemUseText001::
 	text "<PLAYER> used@@"
@@ -3192,11 +3192,11 @@
 	prompt
 
 
-SECTION "Pokedex Text", ROMX[$4000], BANK[POKEDEX_TEXT]
+SECTION "Pokedex Text", ROMX, BANK[POKEDEX_TEXT]
 
 INCLUDE "text/pokedex.asm"
 
 
-SECTION "Move Names", ROMX[$4000], BANK[MOVE_NAMES]
+SECTION "Move Names", ROMX, BANK[MOVE_NAMES]
 
 INCLUDE "text/move_names.asm"
--- a/wram.asm
+++ b/wram.asm
@@ -60,7 +60,7 @@
 ENDM
 
 
-SECTION "WRAM Bank 0", WRAM0 [$c000]
+SECTION "WRAM Bank 0", WRAM0
 
 wUnusedC000:: ; c000
 	ds 1
@@ -1610,7 +1610,7 @@
 wEnemyMonSpeed::     dw
 wEnemyMonSpecial::   dw
 wEnemyMonPP::        ds 2 ; NUM_MOVES - 2
-SECTION "WRAM Bank 1", WRAMX[$d000], BANK[1]
+SECTION "WRAM Bank 1", WRAMX, BANK[1]
                      ds 2 ; NUM_MOVES - 2
 
 wEnemyMonBaseStats:: ds 5