Skip to content

Commit

Permalink
Revert "Fix floating sections"
Browse files Browse the repository at this point in the history
This reverts commit e28b88f.
  • Loading branch information
Ben10do committed Mar 24, 2017
1 parent 30ccec7 commit 2889021
Show file tree
Hide file tree
Showing 21 changed files with 176 additions and 176 deletions.
22 changes: 11 additions & 11 deletions audio.asm
@@ -1,7 +1,7 @@
INCLUDE "includes.asm"


SECTION "Audio", ROMX[$4000], BANK[AUDIO]
SECTION "Audio", ROMX, BANK[AUDIO]

INCLUDE "audio/engine.asm"

Expand All @@ -21,7 +21,7 @@ INCLUDE "audio/sfx_pointers.asm"



SECTION "Songs 1", ROMX[$54e9], BANK[SONGS_1]
SECTION "Songs 1", ROMX, BANK[SONGS_1]

INCLUDE "audio/music/route36.asm"
INCLUDE "audio/music/rivalbattle.asm"
Expand All @@ -40,7 +40,7 @@ INCLUDE "audio/music/lookpokemaniac.asm"
INCLUDE "audio/music/trainervictory.asm"


SECTION "Songs 2", ROMX[$4000], BANK[SONGS_2]
SECTION "Songs 2", ROMX, BANK[SONGS_2]

INCLUDE "audio/music/route1.asm"
INCLUDE "audio/music/route3.asm"
Expand Down Expand Up @@ -76,7 +76,7 @@ INCLUDE "audio/music/contestresults.asm"
INCLUDE "audio/music/route30.asm"


SECTION "Songs 3", ROMX[$4000], BANK[SONGS_3]
SECTION "Songs 3", ROMX, BANK[SONGS_3]

INCLUDE "audio/music/violetcity.asm"
INCLUDE "audio/music/route29.asm"
Expand All @@ -86,7 +86,7 @@ INCLUDE "audio/music/evolution.asm"
INCLUDE "audio/music/printer.asm"


SECTION "Songs 4", ROMX[$4000], BANK[SONGS_4]
SECTION "Songs 4", ROMX, BANK[SONGS_4]

INCLUDE "audio/music/viridiancity.asm"
INCLUDE "audio/music/celadoncity.asm"
Expand Down Expand Up @@ -127,7 +127,7 @@ INCLUDE "audio/music/pokeflutechannel.asm"
INCLUDE "audio/music/bugcatchingcontest.asm"


SECTION "Songs 5", ROMX[$401f], BANK[SONGS_5]
SECTION "Songs 5", ROMX, BANK[SONGS_5]

INCLUDE "audio/music/mobileadaptermenu.asm"
INCLUDE "audio/music/buenaspassword.asm"
Expand All @@ -140,31 +140,31 @@ INCLUDE "audio/music/mobilecenter.asm"



SECTION "Extra Songs 1", ROMX[$731c], BANK[EXTRA_SONGS_1]
SECTION "Extra Songs 1", ROMX, BANK[EXTRA_SONGS_1]

INCLUDE "audio/music/credits.asm"
INCLUDE "audio/music/clair.asm"
INCLUDE "audio/music/mobileadapter.asm"


SECTION "Extra Songs 2", ROMX[$7d9e], BANK[EXTRA_SONGS_2]
SECTION "Extra Songs 2", ROMX, BANK[EXTRA_SONGS_2]

INCLUDE "audio/music/postcredits.asm"



SECTION "Sound Effects", ROMX[$4941], BANK[SOUND_EFFECTS]
SECTION "Sound Effects", ROMX, BANK[SOUND_EFFECTS]

INCLUDE "audio/sfx.asm"


SECTION "Crystal Sound Effects", ROMX[$582D], BANK[CRYSTAL_SOUND_EFFECTS]
SECTION "Crystal Sound Effects", ROMX, BANK[CRYSTAL_SOUND_EFFECTS]

INCLUDE "audio/sfx_crystal.asm"



SECTION "Cries", ROMX[$6787], BANK[CRIES]
SECTION "Cries", ROMX, BANK[CRIES]

CryHeaders:: INCLUDE "audio/cry_headers.asm"

Expand Down
2 changes: 1 addition & 1 deletion data/egg_moves.asm
@@ -1,7 +1,7 @@
INCLUDE "includes.asm"


SECTION "Egg Moves", ROMX[$7b11], BANK[EGG_MOVES]
SECTION "Egg Moves", ROMX, BANK[EGG_MOVES]

; All instances of Charm, Steel Wing, Sweet Scent, and Lovely Kiss were
; removed from egg move lists in Crystal, because they are also TMs.
Expand Down
2 changes: 1 addition & 1 deletion data/evos_attacks.asm
@@ -1,7 +1,7 @@
INCLUDE "includes.asm"


SECTION "Evolutions and Attacks", ROMX[$65b1], BANK[EVOS_ATTACKS]
SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS]


INCLUDE "data/evos_attacks_pointers.asm"
Expand Down
8 changes: 4 additions & 4 deletions data/pokedex/entries.asm
@@ -1,25 +1,25 @@
INCLUDE "includes.asm"


SECTION "Pokedex Entries 001-064", ROMX[$5695], BANK[POKEDEX_ENTRIES_1]
SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1]

PokedexEntries1::
INCLUDE "data/pokedex/entries_1.asm"


SECTION "Pokedex Entries 065-128", ROMX[$4000], BANK[POKEDEX_ENTRIES_2]
SECTION "Pokedex Entries 065-128", ROMX, BANK[POKEDEX_ENTRIES_2]

PokedexEntries2::
INCLUDE "data/pokedex/entries_2.asm"


SECTION "Pokedex Entries 129-192", ROMX[$4000], BANK[POKEDEX_ENTRIES_3]
SECTION "Pokedex Entries 129-192", ROMX, BANK[POKEDEX_ENTRIES_3]

PokedexEntries3::
INCLUDE "data/pokedex/entries_3.asm"


SECTION "Pokedex Entries 193-251", ROMX[$4000], BANK[POKEDEX_ENTRIES_4]
SECTION "Pokedex Entries 193-251", ROMX, BANK[POKEDEX_ENTRIES_4]

PokedexEntries4::
INCLUDE "data/pokedex/entries_4.asm"
2 changes: 1 addition & 1 deletion engine/credits.asm
@@ -1,6 +1,6 @@
INCLUDE "includes.asm"

SECTION "Credits", ROMX[$5847], BANK[CREDITS]
SECTION "Credits", ROMX, BANK[CREDITS]

const_def
const SATOSHI_TAJIRI
Expand Down
2 changes: 1 addition & 1 deletion engine/events.asm
@@ -1,6 +1,6 @@
INCLUDE "includes.asm"

SECTION "Events", ROMX[$66b0], BANK[EVENTS]
SECTION "Events", ROMX, BANK[EVENTS]

OverworldLoop:: ; 966b0
xor a
Expand Down
40 changes: 20 additions & 20 deletions gfx/pics.asm
Expand Up @@ -10,12 +10,12 @@ SECTION "Unown Pic Pointers", ROMX[$4000], BANK[UNOWN_PIC_POINTERS]
UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm"


SECTION "Trainer Pic Pointers", ROMX[$4000], BANK[TRAINER_PIC_POINTERS]
SECTION "Trainer Pic Pointers", ROMX, BANK[TRAINER_PIC_POINTERS]
TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm"



SECTION "Pics 1", ROMX[$45ee], BANK[PICS_1]
SECTION "Pics 1", ROMX, BANK[PICS_1]

HoOhFrontpic: INCBIN "gfx/pics/ho_oh/front.2bpp.lz"
MachampFrontpic: INCBIN "gfx/pics/machamp/front.2bpp.lz"
Expand All @@ -33,7 +33,7 @@ TyphlosionFrontpic: INCBIN "gfx/pics/typhlosion/front.2bpp.lz"
; 123ffa


SECTION "Pics 2", ROMX[$409c], BANK[PICS_2]
SECTION "Pics 2", ROMX, BANK[PICS_2]

BlastoiseFrontpic: INCBIN "gfx/pics/blastoise/front.2bpp.lz"
RapidashFrontpic: INCBIN "gfx/pics/rapidash/front.2bpp.lz"
Expand All @@ -54,7 +54,7 @@ QuilavaFrontpic: INCBIN "gfx/pics/quilava/front.2bpp.lz"
; 127ffe


SECTION "Pics 3", ROMX[$40c9], BANK[PICS_3]
SECTION "Pics 3", ROMX, BANK[PICS_3]

SteelixFrontpic: INCBIN "gfx/pics/steelix/front.2bpp.lz"
AlakazamFrontpic: INCBIN "gfx/pics/alakazam/front.2bpp.lz"
Expand All @@ -77,7 +77,7 @@ OmastarBackpic: INCBIN "gfx/pics/omastar/back.2bpp.lz"
; 12bffe


SECTION "Pics 4", ROMX[$4000], BANK[PICS_4]
SECTION "Pics 4", ROMX, BANK[PICS_4]

DodrioFrontpic: INCBIN "gfx/pics/dodrio/front.2bpp.lz"
SlowkingFrontpic: INCBIN "gfx/pics/slowking/front.2bpp.lz"
Expand All @@ -102,7 +102,7 @@ UnownEFrontpic: INCBIN "gfx/pics/unown_e/front.2bpp.lz"
; 130000


SECTION "Pics 5", ROMX[$4000], BANK[PICS_5]
SECTION "Pics 5", ROMX, BANK[PICS_5]

GolbatFrontpic: INCBIN "gfx/pics/golbat/front.2bpp.lz"
KinglerFrontpic: INCBIN "gfx/pics/kingler/front.2bpp.lz"
Expand All @@ -128,7 +128,7 @@ HeracrossFrontpic: INCBIN "gfx/pics/heracross/front.2bpp.lz"
; 133fff


SECTION "Pics 6", ROMX[$4000], BANK[PICS_6]
SECTION "Pics 6", ROMX, BANK[PICS_6]

AriadosFrontpic: INCBIN "gfx/pics/ariados/front.2bpp.lz"
NoctowlFrontpic: INCBIN "gfx/pics/noctowl/front.2bpp.lz"
Expand Down Expand Up @@ -156,7 +156,7 @@ DunsparceFrontpic: INCBIN "gfx/pics/dunsparce/front.2bpp.lz"
; 137fff


SECTION "Pics 7", ROMX[$4000], BANK[PICS_7]
SECTION "Pics 7", ROMX, BANK[PICS_7]

VaporeonFrontpic: INCBIN "gfx/pics/vaporeon/front.2bpp.lz"
GirafarigFrontpic: INCBIN "gfx/pics/girafarig/front.2bpp.lz"
Expand Down Expand Up @@ -186,7 +186,7 @@ KangaskhanBackpic: INCBIN "gfx/pics/kangaskhan/back.2bpp.lz"
; 13c000


SECTION "Pics 8", ROMX[$4000], BANK[PICS_8]
SECTION "Pics 8", ROMX, BANK[PICS_8]

SeelFrontpic: INCBIN "gfx/pics/seel/front.2bpp.lz"
CrobatFrontpic: INCBIN "gfx/pics/crobat/front.2bpp.lz"
Expand Down Expand Up @@ -218,7 +218,7 @@ QuagsireFrontpic: INCBIN "gfx/pics/quagsire/front.2bpp.lz"
; 13fff7


SECTION "Pics 9", ROMX[$4000], BANK[PICS_9]
SECTION "Pics 9", ROMX, BANK[PICS_9]

EkansFrontpic: INCBIN "gfx/pics/ekans/front.2bpp.lz"
SudowoodoFrontpic: INCBIN "gfx/pics/sudowoodo/front.2bpp.lz"
Expand Down Expand Up @@ -254,7 +254,7 @@ ParasectBackpic: INCBIN "gfx/pics/parasect/back.2bpp.lz"
; 144000


SECTION "Pics 10", ROMX[$4000], BANK[PICS_10]
SECTION "Pics 10", ROMX, BANK[PICS_10]

MisdreavusFrontpic: INCBIN "gfx/pics/misdreavus/front.2bpp.lz"
HoundourFrontpic: INCBIN "gfx/pics/houndour/front.2bpp.lz"
Expand Down Expand Up @@ -294,7 +294,7 @@ UnownFBackpic: INCBIN "gfx/pics/unown_f/back.2bpp.lz"
; 148000


SECTION "Pics 11", ROMX[$4000], BANK[PICS_11]
SECTION "Pics 11", ROMX, BANK[PICS_11]

DodrioBackpic: INCBIN "gfx/pics/dodrio/back.2bpp.lz"
ClefairyFrontpic: INCBIN "gfx/pics/clefairy/front.2bpp.lz"
Expand Down Expand Up @@ -337,7 +337,7 @@ SnorlaxBackpic: INCBIN "gfx/pics/snorlax/back.2bpp.lz"
; 14bffb


SECTION "Pics 12", ROMX[$4000], BANK[PICS_12]
SECTION "Pics 12", ROMX, BANK[PICS_12]

VenusaurBackpic: INCBIN "gfx/pics/venusaur/back.2bpp.lz"
MoltresBackpic: INCBIN "gfx/pics/moltres/back.2bpp.lz"
Expand Down Expand Up @@ -383,7 +383,7 @@ StarmieBackpic: INCBIN "gfx/pics/starmie/back.2bpp.lz"
; 150000


SECTION "Pics 13", ROMX[$4000], BANK[PICS_13]
SECTION "Pics 13", ROMX, BANK[PICS_13]

OmanyteBackpic: INCBIN "gfx/pics/omanyte/back.2bpp.lz"
PidgeyBackpic: INCBIN "gfx/pics/pidgey/back.2bpp.lz"
Expand Down Expand Up @@ -431,7 +431,7 @@ ElectrodeFrontpic: INCBIN "gfx/pics/electrode/front.2bpp.lz"
; 153fe3


SECTION "Pics 14", ROMX[$4000], BANK[PICS_14]
SECTION "Pics 14", ROMX, BANK[PICS_14]

SudowoodoBackpic: INCBIN "gfx/pics/sudowoodo/back.2bpp.lz"
FlaaffyBackpic: INCBIN "gfx/pics/flaaffy/back.2bpp.lz"
Expand Down Expand Up @@ -482,7 +482,7 @@ SwinubBackpic: INCBIN "gfx/pics/swinub/back.2bpp.lz"
; 158000


SECTION "Pics 15", ROMX[$4000], BANK[PICS_15]
SECTION "Pics 15", ROMX, BANK[PICS_15]

MewtwoBackpic: INCBIN "gfx/pics/mewtwo/back.2bpp.lz"
PokemonProfPic: INCBIN "gfx/trainers/oak.2bpp.lz"
Expand Down Expand Up @@ -536,7 +536,7 @@ MagnemiteBackpic: INCBIN "gfx/pics/magnemite/back.2bpp.lz"
; 15bffa


SECTION "Pics 16", ROMX[$4000], BANK[PICS_16]
SECTION "Pics 16", ROMX, BANK[PICS_16]

HoothootBackpic: INCBIN "gfx/pics/hoothoot/back.2bpp.lz"
NoctowlBackpic: INCBIN "gfx/pics/noctowl/back.2bpp.lz"
Expand Down Expand Up @@ -594,7 +594,7 @@ UnownHBackpic: INCBIN "gfx/pics/unown_h/back.2bpp.lz"
; 15ffff


SECTION "Pics 17", ROMX[$4000], BANK[PICS_17]
SECTION "Pics 17", ROMX, BANK[PICS_17]

ParasBackpic: INCBIN "gfx/pics/paras/back.2bpp.lz"
VaporeonBackpic: INCBIN "gfx/pics/vaporeon/back.2bpp.lz"
Expand Down Expand Up @@ -660,7 +660,7 @@ UnownDBackpic: INCBIN "gfx/pics/unown_d/back.2bpp.lz"
; 163ffc


SECTION "Pics 18", ROMX[$4000], BANK[PICS_18]
SECTION "Pics 18", ROMX, BANK[PICS_18]

SpinarakBackpic: INCBIN "gfx/pics/spinarak/back.2bpp.lz"
RaikouBackpic: INCBIN "gfx/pics/raikou/back.2bpp.lz"
Expand Down Expand Up @@ -725,7 +725,7 @@ UnownRBackpic: INCBIN "gfx/pics/unown_r/back.2bpp.lz"
; 1669d3


SECTION "Pics 19", ROMX[$4000], BANK[PICS_19]
SECTION "Pics 19", ROMX, BANK[PICS_19]

; Seems to be an accidental copy of the previous bank

Expand Down
2 changes: 1 addition & 1 deletion lib/mobile/main.asm
Expand Up @@ -4,7 +4,7 @@ charmap "<CR>", $d

INCLUDE "gbhw.asm"

SECTION "Main", ROMX[$4000], BANK[$44]
SECTION "Main", ROMX

Function110000: ; 110000 (44:4000)
; Copy b bytes from hl to de
Expand Down

0 comments on commit 2889021

Please sign in to comment.