pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #389 from yenatch/rgbds-3

Browse Source 
rgbds 0.3.3
This commit is contained in:
yenatch
2017-09-24 01:23:34 -04:00
committed by GitHub
parent 1de1bdbce7 46bc3e4c88
commit 17448c51a5
27 changed files with 672 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@@ -2,9 +2,8 @@ language: c
install:
- |-
path="$(pwd)"; cd;
wget https://github.com/rednex/rgbds/archive/v0.2.5.tar.gz -O rgbds.tar.gz &&
tar xf rgbds.tar.gz &&
cd rgbds-0.2.5 &&
git clone https://github.com/rednex/rgbds &&
cd rgbds &&
sudo make install &&
cd - &&
rm -rf rgbds &&

6
Makefile
View File

@@ -62,12 +62,14 @@ tools:
rgbasm -o $@ $<
pokecrystal11.gbc: $(crystal11_obj)
rgblink -n pokecrystal11.sym -m pokecrystal11.map -o $@ $^
rgblink -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.ld -o $@ $^
rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@
sort pokecrystal11.sym -o pokecrystal11.sym
pokecrystal.gbc: $(crystal_obj)
rgblink -n pokecrystal.sym -m pokecrystal.map -o $@ $^
rgblink -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.ld -o $@ $^
rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
sort pokecrystal.sym -o pokecrystal.sym
# For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file.

22
audio.asm
View File

@@ -1,7 +1,7 @@
INCLUDE "includes.asm"
SECTION "Audio", ROMX, BANK[AUDIO]
SECTION "Audio", ROMX
INCLUDE "audio/engine.asm"
@@ -21,7 +21,7 @@ INCLUDE "audio/sfx_pointers.asm"
SECTION "Songs 1", ROMX, BANK[SONGS_1]
SECTION "Songs 1", ROMX
INCLUDE "audio/music/route36.asm"
INCLUDE "audio/music/rivalbattle.asm"
@@ -40,7 +40,7 @@ INCLUDE "audio/music/lookpokemaniac.asm"
INCLUDE "audio/music/trainervictory.asm"
SECTION "Songs 2", ROMX, BANK[SONGS_2]
SECTION "Songs 2", ROMX
INCLUDE "audio/music/route1.asm"
INCLUDE "audio/music/route3.asm"
@@ -76,7 +76,7 @@ INCLUDE "audio/music/contestresults.asm"
INCLUDE "audio/music/route30.asm"
SECTION "Songs 3", ROMX, BANK[SONGS_3]
SECTION "Songs 3", ROMX
INCLUDE "audio/music/violetcity.asm"
INCLUDE "audio/music/route29.asm"
@@ -86,7 +86,7 @@ INCLUDE "audio/music/evolution.asm"
INCLUDE "audio/music/printer.asm"
SECTION "Songs 4", ROMX, BANK[SONGS_4]
SECTION "Songs 4", ROMX
INCLUDE "audio/music/viridiancity.asm"
INCLUDE "audio/music/celadoncity.asm"
@@ -127,7 +127,7 @@ INCLUDE "audio/music/pokeflutechannel.asm"
INCLUDE "audio/music/bugcatchingcontest.asm"
SECTION "Songs 5", ROMX, BANK[SONGS_5]
SECTION "Songs 5", ROMX
INCLUDE "audio/music/mobileadaptermenu.asm"
INCLUDE "audio/music/buenaspassword.asm"
@@ -140,31 +140,31 @@ INCLUDE "audio/music/mobilecenter.asm"
SECTION "Extra Songs 1", ROMX, BANK[EXTRA_SONGS_1]
SECTION "Extra Songs 1", ROMX
INCLUDE "audio/music/credits.asm"
INCLUDE "audio/music/clair.asm"
INCLUDE "audio/music/mobileadapter.asm"
SECTION "Extra Songs 2", ROMX, BANK[EXTRA_SONGS_2]
SECTION "Extra Songs 2", ROMX
INCLUDE "audio/music/postcredits.asm"
SECTION "Sound Effects", ROMX, BANK[SOUND_EFFECTS]
SECTION "Sound Effects", ROMX
INCLUDE "audio/sfx.asm"
SECTION "Crystal Sound Effects", ROMX, BANK[CRYSTAL_SOUND_EFFECTS]
SECTION "Crystal Sound Effects", ROMX
INCLUDE "audio/sfx_crystal.asm"
SECTION "Cries", ROMX, BANK[CRIES]
SECTION "Cries", ROMX
CryHeaders:: INCLUDE "audio/cry_headers.asm"

2
data/egg_moves.asm
View File

@@ -1,7 +1,7 @@
INCLUDE "includes.asm"
SECTION "Egg Moves", ROMX, BANK[EGG_MOVES]
SECTION "Egg Moves", ROMX
; All instances of Charm, Steel Wing, Sweet Scent, and Lovely Kiss were
; removed from egg move lists in Crystal, because they are also TMs.

2
data/evos_attacks.asm
View File

@@ -1,7 +1,7 @@
INCLUDE "includes.asm"
SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS]
SECTION "Evolutions and Attacks", ROMX
INCLUDE "data/evos_attacks_pointers.asm"

8
data/pokedex/entries.asm
View File

@@ -1,25 +1,25 @@
INCLUDE "includes.asm"
SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1]
SECTION "Pokedex Entries 001-064", ROMX
PokedexEntries1::
INCLUDE "data/pokedex/entries_1.asm"
SECTION "Pokedex Entries 065-128", ROMX, BANK[POKEDEX_ENTRIES_2]
SECTION "Pokedex Entries 065-128", ROMX
PokedexEntries2::
INCLUDE "data/pokedex/entries_2.asm"
SECTION "Pokedex Entries 129-192", ROMX, BANK[POKEDEX_ENTRIES_3]
SECTION "Pokedex Entries 129-192", ROMX
PokedexEntries3::
INCLUDE "data/pokedex/entries_3.asm"
SECTION "Pokedex Entries 193-251", ROMX, BANK[POKEDEX_ENTRIES_4]
SECTION "Pokedex Entries 193-251", ROMX
PokedexEntries4::
INCLUDE "data/pokedex/entries_4.asm"

2
engine/credits.asm
View File

@@ -1,6 +1,6 @@
INCLUDE "includes.asm"
SECTION "Credits", ROMX, BANK[CREDITS]
SECTION "Credits", ROMX
const_def
const SATOSHI_TAJIRI

2
engine/events.asm
View File

@@ -1,6 +1,6 @@
INCLUDE "includes.asm"
SECTION "Events", ROMX, BANK[EVENTS]
SECTION "Events", ROMX
OverworldLoop:: ; 966b0
xor a

2
engine/sprite_anims.asm
View File

@@ -855,7 +855,7 @@ DoAnimFrame: ; 8d24b
ret
.AnonymousJumptable: ; 8d6c5 (23:56c5)
ld hl, [sp+$0]
ld hl, sp+$0
ld e, [hl]
inc hl
ld d, [hl]

44
gfx/pics.asm
View File

@@ -3,19 +3,19 @@ INCLUDE "includes.asm"
; Unown pic pointers are assumed to start at the same address in a different bank.
SECTION "Pic Pointers", ROMX[$4000], BANK[PIC_POINTERS]
SECTION "Pic Pointers", ROMX
PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm"
SECTION "Unown Pic Pointers", ROMX[$4000], BANK[UNOWN_PIC_POINTERS]
SECTION "Unown Pic Pointers", ROMX
UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm"
SECTION "Trainer Pic Pointers", ROMX, BANK[TRAINER_PIC_POINTERS]
SECTION "Trainer Pic Pointers", ROMX
TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm"
SECTION "Pics 1", ROMX, BANK[PICS_1]
SECTION "Pics 1", ROMX
HoOhFrontpic: INCBIN "gfx/pics/ho_oh/front.animated.2bpp.lz"
MachampFrontpic: INCBIN "gfx/pics/machamp/front.animated.2bpp.lz"
@@ -33,7 +33,7 @@ TyphlosionFrontpic: INCBIN "gfx/pics/typhlosion/front.animated.2bpp.lz"
; 123ffa
SECTION "Pics 2", ROMX, BANK[PICS_2]
SECTION "Pics 2", ROMX
BlastoiseFrontpic: INCBIN "gfx/pics/blastoise/front.animated.2bpp.lz"
RapidashFrontpic: INCBIN "gfx/pics/rapidash/front.animated.2bpp.lz"
@@ -54,7 +54,7 @@ QuilavaFrontpic: INCBIN "gfx/pics/quilava/front.animated.2bpp.lz"
; 127ffe
SECTION "Pics 3", ROMX, BANK[PICS_3]
SECTION "Pics 3", ROMX
SteelixFrontpic: INCBIN "gfx/pics/steelix/front.animated.2bpp.lz"
AlakazamFrontpic: INCBIN "gfx/pics/alakazam/front.animated.2bpp.lz"
@@ -77,7 +77,7 @@ OmastarBackpic: INCBIN "gfx/pics/omastar/back.2bpp.lz"
; 12bffe
SECTION "Pics 4", ROMX, BANK[PICS_4]
SECTION "Pics 4", ROMX
DodrioFrontpic: INCBIN "gfx/pics/dodrio/front.animated.2bpp.lz"
SlowkingFrontpic: INCBIN "gfx/pics/slowking/front.animated.2bpp.lz"
@@ -102,7 +102,7 @@ UnownEFrontpic: INCBIN "gfx/pics/unown_e/front.animated.2bpp.lz"
; 130000
SECTION "Pics 5", ROMX, BANK[PICS_5]
SECTION "Pics 5", ROMX
GolbatFrontpic: INCBIN "gfx/pics/golbat/front.animated.2bpp.lz"
KinglerFrontpic: INCBIN "gfx/pics/kingler/front.animated.2bpp.lz"
@@ -128,7 +128,7 @@ HeracrossFrontpic: INCBIN "gfx/pics/heracross/front.animated.2bpp.lz"
; 133fff
SECTION "Pics 6", ROMX, BANK[PICS_6]
SECTION "Pics 6", ROMX
AriadosFrontpic: INCBIN "gfx/pics/ariados/front.animated.2bpp.lz"
NoctowlFrontpic: INCBIN "gfx/pics/noctowl/front.animated.2bpp.lz"
@@ -156,7 +156,7 @@ DunsparceFrontpic: INCBIN "gfx/pics/dunsparce/front.animated.2bpp.lz"
; 137fff
SECTION "Pics 7", ROMX, BANK[PICS_7]
SECTION "Pics 7", ROMX
VaporeonFrontpic: INCBIN "gfx/pics/vaporeon/front.animated.2bpp.lz"
GirafarigFrontpic: INCBIN "gfx/pics/girafarig/front.animated.2bpp.lz"
@@ -186,7 +186,7 @@ KangaskhanBackpic: INCBIN "gfx/pics/kangaskhan/back.2bpp.lz"
; 13c000
SECTION "Pics 8", ROMX, BANK[PICS_8]
SECTION "Pics 8", ROMX
SeelFrontpic: INCBIN "gfx/pics/seel/front.animated.2bpp.lz"
CrobatFrontpic: INCBIN "gfx/pics/crobat/front.animated.2bpp.lz"
@@ -218,7 +218,7 @@ QuagsireFrontpic: INCBIN "gfx/pics/quagsire/front.animated.2bpp.lz"
; 13fff7
SECTION "Pics 9", ROMX, BANK[PICS_9]
SECTION "Pics 9", ROMX
EkansFrontpic: INCBIN "gfx/pics/ekans/front.animated.2bpp.lz"
SudowoodoFrontpic: INCBIN "gfx/pics/sudowoodo/front.animated.2bpp.lz"
@@ -254,7 +254,7 @@ ParasectBackpic: INCBIN "gfx/pics/parasect/back.2bpp.lz"
; 144000
SECTION "Pics 10", ROMX, BANK[PICS_10]
SECTION "Pics 10", ROMX
MisdreavusFrontpic: INCBIN "gfx/pics/misdreavus/front.animated.2bpp.lz"
HoundourFrontpic: INCBIN "gfx/pics/houndour/front.animated.2bpp.lz"
@@ -294,7 +294,7 @@ UnownFBackpic: INCBIN "gfx/pics/unown_f/back.2bpp.lz"
; 148000
SECTION "Pics 11", ROMX, BANK[PICS_11]
SECTION "Pics 11", ROMX
DodrioBackpic: INCBIN "gfx/pics/dodrio/back.2bpp.lz"
ClefairyFrontpic: INCBIN "gfx/pics/clefairy/front.animated.2bpp.lz"
@@ -337,7 +337,7 @@ SnorlaxBackpic: INCBIN "gfx/pics/snorlax/back.2bpp.lz"
; 14bffb
SECTION "Pics 12", ROMX, BANK[PICS_12]
SECTION "Pics 12", ROMX
VenusaurBackpic: INCBIN "gfx/pics/venusaur/back.2bpp.lz"
MoltresBackpic: INCBIN "gfx/pics/moltres/back.2bpp.lz"
@@ -383,7 +383,7 @@ StarmieBackpic: INCBIN "gfx/pics/starmie/back.2bpp.lz"
; 150000
SECTION "Pics 13", ROMX, BANK[PICS_13]
SECTION "Pics 13", ROMX
OmanyteBackpic: INCBIN "gfx/pics/omanyte/back.2bpp.lz"
PidgeyBackpic: INCBIN "gfx/pics/pidgey/back.2bpp.lz"
@@ -431,7 +431,7 @@ ElectrodeFrontpic: INCBIN "gfx/pics/electrode/front.animated.2bpp.lz"
; 153fe3
SECTION "Pics 14", ROMX, BANK[PICS_14]
SECTION "Pics 14", ROMX
SudowoodoBackpic: INCBIN "gfx/pics/sudowoodo/back.2bpp.lz"
FlaaffyBackpic: INCBIN "gfx/pics/flaaffy/back.2bpp.lz"
@@ -482,7 +482,7 @@ SwinubBackpic: INCBIN "gfx/pics/swinub/back.2bpp.lz"
; 158000
SECTION "Pics 15", ROMX, BANK[PICS_15]
SECTION "Pics 15", ROMX
MewtwoBackpic: INCBIN "gfx/pics/mewtwo/back.2bpp.lz"
PokemonProfPic: INCBIN "gfx/trainers/oak.2bpp.lz"
@@ -536,7 +536,7 @@ MagnemiteBackpic: INCBIN "gfx/pics/magnemite/back.2bpp.lz"
; 15bffa
SECTION "Pics 16", ROMX, BANK[PICS_16]
SECTION "Pics 16", ROMX
HoothootBackpic: INCBIN "gfx/pics/hoothoot/back.2bpp.lz"
NoctowlBackpic: INCBIN "gfx/pics/noctowl/back.2bpp.lz"
@@ -594,7 +594,7 @@ UnownHBackpic: INCBIN "gfx/pics/unown_h/back.2bpp.lz"
; 15ffff
SECTION "Pics 17", ROMX, BANK[PICS_17]
SECTION "Pics 17", ROMX
ParasBackpic: INCBIN "gfx/pics/paras/back.2bpp.lz"
VaporeonBackpic: INCBIN "gfx/pics/vaporeon/back.2bpp.lz"
@@ -660,7 +660,7 @@ UnownDBackpic: INCBIN "gfx/pics/unown_d/back.2bpp.lz"
; 163ffc
SECTION "Pics 18", ROMX, BANK[PICS_18]
SECTION "Pics 18", ROMX
SpinarakBackpic: INCBIN "gfx/pics/spinarak/back.2bpp.lz"
RaikouBackpic: INCBIN "gfx/pics/raikou/back.2bpp.lz"
@@ -725,7 +725,7 @@ UnownRBackpic: INCBIN "gfx/pics/unown_r/back.2bpp.lz"
; 1669d3
SECTION "Pics 19", ROMX, BANK[PICS_19]
SECTION "Pics 19", ROMX
; Seems to be an accidental copy of the previous bank

6
home.asm
View File

@@ -1,18 +1,18 @@
INCLUDE "includes.asm"
SECTION "NULL", ROM0[0]
SECTION "NULL", ROM0
NULL::
INCLUDE "rst.asm"
INCLUDE "interrupts.asm"
SECTION "Header", ROM0[$100]
SECTION "Header", ROM0
Start::
nop
jp _Start
SECTION "Home", ROM0[$150]
SECTION "Home", ROM0
INCLUDE "home/init.asm"
INCLUDE "home/vblank.asm"

10
interrupts.asm
View File

@@ -1,16 +1,16 @@
; Game Boy hardware interrupts
SECTION "vblank",ROM0[$40]
SECTION "vblank",ROM0
jp VBlank
SECTION "lcd",ROM0[$48]
SECTION "lcd",ROM0
jp LCD
SECTION "timer",ROM0[$50]
SECTION "timer",ROM0
jp Timer
SECTION "serial",ROM0[$58]
SECTION "serial",ROM0
jp Serial
SECTION "joypad",ROM0[$60]
SECTION "joypad",ROM0
jp JoypadInt

146
main.asm
View File

File diff suppressed because it is too large Load Diff

58
maps.asm
View File

@@ -1,30 +1,30 @@
INCLUDE "includes.asm"
SECTION "Map Headers", ROMX, BANK[MAP_HEADERS]
SECTION "Map Headers", ROMX
INCLUDE "maps/map_headers.asm"
INCLUDE "maps/second_map_headers.asm"
SECTION "Map Blockdata 1", ROMX, BANK[MAPS_1]
SECTION "Map Blockdata 1", ROMX
INCLUDE "maps/blockdata_1.asm"
SECTION "Map Blockdata 2", ROMX, BANK[MAPS_2]
SECTION "Map Blockdata 2", ROMX
INCLUDE "maps/blockdata_2.asm"
SECTION "Map Blockdata 3", ROMX, BANK[MAPS_3]
SECTION "Map Blockdata 3", ROMX
INCLUDE "maps/blockdata_3.asm"
SECTION "Map Scripts 1", ROMX, BANK[MAP_SCRIPTS_1]
SECTION "Map Scripts 1", ROMX
INCLUDE "maps/GoldenrodGym.asm"
INCLUDE "maps/GoldenrodBikeShop.asm"
@@ -45,7 +45,7 @@ INCLUDE "maps/GoldenrodDeptStoreRoof.asm"
INCLUDE "maps/GoldenrodGameCorner.asm"
SECTION "Map Scripts 2", ROMX, BANK[MAP_SCRIPTS_2]
SECTION "Map Scripts 2", ROMX
INCLUDE "maps/RuinsofAlphOutside.asm"
INCLUDE "maps/RuinsofAlphHoOhChamber.asm"
@@ -73,7 +73,7 @@ INCLUDE "maps/OlivineLighthouse3F.asm"
INCLUDE "maps/OlivineLighthouse4F.asm"
SECTION "Map Scripts 3", ROMX, BANK[MAP_SCRIPTS_3]
SECTION "Map Scripts 3", ROMX
INCLUDE "maps/NationalPark.asm"
INCLUDE "maps/NationalParkBugContest.asm"
@@ -83,7 +83,7 @@ INCLUDE "maps/RadioTower3F.asm"
INCLUDE "maps/RadioTower4F.asm"
SECTION "Map Scripts 4", ROMX, BANK[MAP_SCRIPTS_4]
SECTION "Map Scripts 4", ROMX
INCLUDE "maps/RadioTower5F.asm"
INCLUDE "maps/OlivineLighthouse5F.asm"
@@ -95,7 +95,7 @@ INCLUDE "maps/Route34IlexForestGate.asm"
INCLUDE "maps/DayCare.asm"
SECTION "Map Scripts 5", ROMX, BANK[MAP_SCRIPTS_5]
SECTION "Map Scripts 5", ROMX
INCLUDE "maps/Route11.asm"
INCLUDE "maps/VioletMart.asm"
@@ -112,7 +112,7 @@ INCLUDE "maps/Route36RuinsofAlphgate.asm"
INCLUDE "maps/Route36NationalParkgate.asm"
SECTION "Map Scripts 6", ROMX, BANK[MAP_SCRIPTS_6]
SECTION "Map Scripts 6", ROMX
INCLUDE "maps/Route8.asm"
INCLUDE "maps/MahoganyMart1F.asm"
@@ -122,7 +122,7 @@ INCLUDE "maps/TeamRocketBaseB3F.asm"
INCLUDE "maps/IlexForest.asm"
SECTION "Map Scripts 7", ROMX, BANK[MAP_SCRIPTS_7]
SECTION "Map Scripts 7", ROMX
INCLUDE "maps/LakeofRage.asm"
INCLUDE "maps/CeladonDeptStore1F.asm"
@@ -149,7 +149,7 @@ INCLUDE "maps/Route7SaffronGate.asm"
INCLUDE "maps/Route1718Gate.asm"
SECTION "Map Scripts 8", ROMX, BANK[MAP_SCRIPTS_8]
SECTION "Map Scripts 8", ROMX
INCLUDE "maps/DiglettsCave.asm"
INCLUDE "maps/MountMoon.asm"
@@ -173,7 +173,7 @@ INCLUDE "maps/MountMoonGiftShop.asm"
INCLUDE "maps/TinTowerRoof.asm"
SECTION "Map Scripts 9", ROMX, BANK[MAP_SCRIPTS_9]
SECTION "Map Scripts 9", ROMX
INCLUDE "maps/Route34.asm"
INCLUDE "maps/ElmsLab.asm"
@@ -187,7 +187,7 @@ INCLUDE "maps/Route27SandstormHouse.asm"
INCLUDE "maps/Route2946Gate.asm"
SECTION "Map Scripts 10", ROMX, BANK[MAP_SCRIPTS_10]
SECTION "Map Scripts 10", ROMX
INCLUDE "maps/Route22.asm"
INCLUDE "maps/WarehouseEntrance.asm"
@@ -215,7 +215,7 @@ INCLUDE "maps/Route8SaffronGate.asm"
INCLUDE "maps/Route12SuperRodHouse.asm"
SECTION "Map Scripts 11", ROMX, BANK[MAP_SCRIPTS_11]
SECTION "Map Scripts 11", ROMX
INCLUDE "maps/EcruteakHouse.asm"
INCLUDE "maps/WiseTriosRoom.asm"
@@ -237,7 +237,7 @@ INCLUDE "maps/Route2Gate.asm"
INCLUDE "maps/VictoryRoadGate.asm"
SECTION "Map Scripts 12", ROMX, BANK[MAP_SCRIPTS_12]
SECTION "Map Scripts 12", ROMX
INCLUDE "maps/OlivinePokeCenter1F.asm"
INCLUDE "maps/OlivineGym.asm"
@@ -265,7 +265,7 @@ INCLUDE "maps/Route40BattleTowerGate.asm"
INCLUDE "maps/BattleTowerOutside.asm"
SECTION "Map Scripts 13", ROMX, BANK[MAP_SCRIPTS_13]
SECTION "Map Scripts 13", ROMX
INCLUDE "maps/IndigoPlateauPokeCenter1F.asm"
INCLUDE "maps/WillsRoom.asm"
@@ -276,7 +276,7 @@ INCLUDE "maps/LancesRoom.asm"
INCLUDE "maps/HallOfFame.asm"
SECTION "Map Scripts 14", ROMX, BANK[MAP_SCRIPTS_14]
SECTION "Map Scripts 14", ROMX
INCLUDE "maps/CeruleanCity.asm"
INCLUDE "maps/SproutTower1F.asm"
@@ -295,7 +295,7 @@ INCLUDE "maps/BurnedTower1F.asm"
INCLUDE "maps/BurnedTowerB1F.asm"
SECTION "Map Scripts 15", ROMX, BANK[MAP_SCRIPTS_15]
SECTION "Map Scripts 15", ROMX
INCLUDE "maps/CeruleanGymBadgeSpeechHouse.asm"
INCLUDE "maps/CeruleanPoliceStation.asm"
@@ -323,7 +323,7 @@ INCLUDE "maps/Route5SaffronCityGate.asm"
INCLUDE "maps/Route5CleanseTagSpeechHouse.asm"
SECTION "Map Scripts 16", ROMX, BANK[MAP_SCRIPTS_16]
SECTION "Map Scripts 16", ROMX
INCLUDE "maps/PewterCity.asm"
INCLUDE "maps/WhirlIslandNW.asm"
@@ -351,7 +351,7 @@ INCLUDE "maps/KurtsHouse.asm"
INCLUDE "maps/AzaleaGym.asm"
SECTION "Map Scripts 17", ROMX, BANK[MAP_SCRIPTS_17]
SECTION "Map Scripts 17", ROMX
INCLUDE "maps/MahoganyTown.asm"
INCLUDE "maps/Route32.asm"
@@ -373,7 +373,7 @@ INCLUDE "maps/MobileTradeRoomMobile.asm"
INCLUDE "maps/MobileBattleRoom.asm"
SECTION "Map Scripts 18", ROMX, BANK[MAP_SCRIPTS_18]
SECTION "Map Scripts 18", ROMX
INCLUDE "maps/Route36.asm"
INCLUDE "maps/FuchsiaCity.asm"
@@ -402,7 +402,7 @@ INCLUDE "maps/MrPokemonsHouse.asm"
INCLUDE "maps/Route31VioletGate.asm"
SECTION "Map Scripts 19", ROMX, BANK[MAP_SCRIPTS_19]
SECTION "Map Scripts 19", ROMX
INCLUDE "maps/AzaleaTown.asm"
INCLUDE "maps/GoldenrodCity.asm"
@@ -421,7 +421,7 @@ INCLUDE "maps/BluesHouse.asm"
INCLUDE "maps/OaksLab.asm"
SECTION "Map Scripts 20", ROMX, BANK[MAP_SCRIPTS_20]
SECTION "Map Scripts 20", ROMX
INCLUDE "maps/CherrygroveCity.asm"
INCLUDE "maps/Route35.asm"
@@ -432,7 +432,7 @@ INCLUDE "maps/Route19.asm"
INCLUDE "maps/Route25.asm"
SECTION "Map Scripts 21", ROMX, BANK[MAP_SCRIPTS_21]
SECTION "Map Scripts 21", ROMX
INCLUDE "maps/CianwoodCity.asm"
INCLUDE "maps/Route27.asm"
@@ -448,7 +448,7 @@ INCLUDE "maps/PewterPokeCEnter2FBeta.asm"
INCLUDE "maps/PewterSnoozeSpeechHouse.asm"
SECTION "Map Scripts 22", ROMX, BANK[MAP_SCRIPTS_22]
SECTION "Map Scripts 22", ROMX
INCLUDE "maps/EcruteakCity.asm"
INCLUDE "maps/BlackthornCity.asm"
@@ -461,7 +461,7 @@ INCLUDE "maps/Route41.asm"
INCLUDE "maps/Route12.asm"
SECTION "Map Scripts 23", ROMX, BANK[MAP_SCRIPTS_23]
SECTION "Map Scripts 23", ROMX
INCLUDE "maps/NewBarkTown.asm"
INCLUDE "maps/VioletCity.asm"
@@ -480,7 +480,7 @@ INCLUDE "maps/Route19FuchsiaGate.asm"
INCLUDE "maps/SeafoamGym.asm"
SECTION "Map Scripts 24", ROMX, BANK[MAP_SCRIPTS_24]
SECTION "Map Scripts 24", ROMX
INCLUDE "maps/Route33.asm"
INCLUDE "maps/Route2.asm"
@@ -506,7 +506,7 @@ INCLUDE "maps/SilverCavePokeCenter1F.asm"
INCLUDE "maps/Route28FamousSpeechHouse.asm"
SECTION "Map Scripts 25", ROMX, BANK[MAP_SCRIPTS_25]
SECTION "Map Scripts 25", ROMX
INCLUDE "maps/SilverCaveOutside.asm"
INCLUDE "maps/Route10North.asm"

2
misc/crystal_misc.asm
View File

@@ -1,7 +1,7 @@
INCLUDE "includes.asm"
SECTION "Misc Crystal", ROMX, BANK[MISC_CRYSTAL]
SECTION "Misc Crystal", ROMX
MobileAdapterGFX::
INCBIN "gfx/misc/mobile_adapter.2bpp"

8
misc/mobile_40.asm
View File

@@ -1784,7 +1784,7 @@ Function100ae7: ; 100ae7
; 100b0a
SECTION "tetsuji", ROMX, BANK[$40]
SECTION "tetsuji", ROMX
charmap " ", $20 ; revert to ascii
@@ -1793,7 +1793,7 @@ Unknown_100b0a: ; 100b0a
; 100b12
SECTION "bank40_2", ROMX, BANK[$40]
SECTION "bank40_2", ROMX
Function100b12: ; 100b12
call Function100dd8
@@ -3831,7 +3831,7 @@ Function101826: ; 101826
; 10186f
SECTION "ascii 10186f", ROMX, BANK[$40]
SECTION "ascii 10186f", ROMX
charmap " ", $20 ; revert to ascii
@@ -3852,7 +3852,7 @@ Unknown_101895:
; 1018a8
SECTION "bank40_3", ROMX, BANK[$40]
SECTION "bank40_3", ROMX
Function1018a8: ; 1018a8
ld hl, wccb5

2
misc/mobile_41.asm
View File

@@ -1,4 +1,4 @@
SECTION "bank41_2", ROMX, BANK[$41]
SECTION "bank41_2", ROMX
; These functions deal with miscellaneous statistics
; which were used for Trainer Rankings in Pokémon News.

4
misc/mobile_45.asm
View File

@@ -1,5 +1,5 @@
SECTION "bank45", ROMX, BANK[$45]
SECTION "bank45", ROMX
charmap " ", $20 ; revert to ascii
@@ -6835,7 +6835,7 @@ Unknown_117356: ; 117356
; 117656
SECTION "Mobile Stadium", ROMX, BANK[$45]
SECTION "Mobile Stadium", ROMX
Special_GiveOddEgg: ; 117656
callba GiveOddEgg

4
misc/mobile_46.asm
View File

@@ -1,4 +1,4 @@
SECTION "bank46", ROMX, BANK[$46]
SECTION "bank46", ROMX
Function118000: ; 118000
ld a, $1
@@ -3014,7 +3014,7 @@ Unknown_1196b8: ; 1196b8
db "Sun"
; 1196cd
SECTION "bank46_2", ROMX, BANK[$46]
SECTION "bank46_2", ROMX
; A hack to use ascii above.
Function1196cd: ; 1196cd (46:56cd)

2
misc/mobile_5f.asm
View File

@@ -1,5 +1,5 @@
SECTION "bank5F", ROMX, BANK[$5F]
SECTION "bank5F", ROMX
Function17c000: ; 17c000

Some files were not shown because too many files have changed in this diff Show More