diff options
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 704 |
1 files changed, 392 insertions, 312 deletions
@@ -1,16 +1,5 @@ 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" @@ -18,12 +7,6 @@ SECTION "bank1", ROMX INCLUDE "data/facing.asm" -INCLUDE "engine/black_out.asm" - -MewPicFront:: INCBIN "pic/bmon/mew.pic" -MewPicBack:: INCBIN "pic/monback/mewb.pic" -INCLUDE "data/baseStats/mew.asm" - INCLUDE "engine/battle/safari_zone.asm" INCLUDE "engine/titlescreen.asm" @@ -34,14 +17,11 @@ INCLUDE "text/item_names.asm" INCLUDE "text/unused_names.asm" INCLUDE "engine/overworld/oam.asm" -INCLUDE "engine/oam_dma.asm" INCLUDE "engine/print_waiting_text.asm" INCLUDE "engine/overworld/map_sprite_functions1.asm" -INCLUDE "engine/test_battle.asm" - INCLUDE "engine/overworld/item.asm" INCLUDE "engine/overworld/movement.asm" @@ -91,10 +71,6 @@ SECTION "bank3", ROMX INCLUDE "engine/joypad.asm" -INCLUDE "data/map_songs.asm" - -INCLUDE "data/map_header_banks.asm" - INCLUDE "engine/overworld/clear_variables.asm" INCLUDE "engine/overworld/player_state.asm" INCLUDE "engine/overworld/poison.asm" @@ -103,10 +79,6 @@ INCLUDE "engine/overworld/daycare_exp.asm" INCLUDE "data/hide_show_data.asm" -INCLUDE "engine/overworld/field_move_messages.asm" - -INCLUDE "engine/items/inventory.asm" - INCLUDE "engine/overworld/wild_mons.asm" INCLUDE "engine/items/items.asm" @@ -129,6 +101,42 @@ INCLUDE "engine/hp_bar.asm" INCLUDE "engine/hidden_object_functions3.asm" +SECTION "Graphics (BANK 4)", ROMX + +PokemonLogoJapanGraphics: INCBIN "gfx/pokemon_logo_japan.2bpp" +FontGraphics: INCBIN "gfx/font.1bpp" +FontGraphicsEnd: +ABTiles: INCBIN "gfx/AB.2bpp" +HpBarAndStatusGraphics: INCBIN "gfx/hp_bar_and_status.2bpp" +HpBarAndStatusGraphicsEnd: +BattleHudTiles1: INCBIN "gfx/battle_hud1.1bpp" +BattleHudTiles1End: +BattleHudTiles2: INCBIN "gfx/battle_hud2.1bpp" +BattleHudTiles3: INCBIN "gfx/battle_hud3.1bpp" +BattleHudTiles3End: +NintendoCopyrightLogoGraphics: INCBIN "gfx/copyright.2bpp" +GamefreakLogoGraphics: INCBIN "gfx/gamefreak.2bpp" +GamefreakLogoGraphicsEnd: +NineTile: INCBIN "gfx/9_tile.2bpp" +TextBoxGraphics: INCBIN "gfx/text_box.2bpp" +TextBoxGraphicsEnd: +PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp" +PokedexTileGraphicsEnd: +WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp" +WorldMapTileGraphicsEnd: +PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" + +INCLUDE "engine/menu/status_screen.asm" +INCLUDE "engine/menu/party_menu.asm" + +RedPicFront: INCBIN "pic/ytrainer/red.pic" +ShrinkPic1: INCBIN "pic/trainer/shrink1.pic" +ShrinkPic2: INCBIN "pic/trainer/shrink2.pic" + +INCLUDE "engine/menu/start_sub_menus.asm" +INCLUDE "engine/items/tms.asm" + + SECTION "NPC Sprites 1", ROMX ; BANK $04 OakAideSprite: INCBIN "gfx/sprites/oak_aide.2bpp" @@ -158,58 +166,20 @@ ClipboardSprite: INCBIN "gfx/sprites/clipboard.2bpp" SnorlaxSprite: INCBIN "gfx/sprites/snorlax.2bpp" OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp" LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp" +QuestionMarkSprite: INCBIN "gfx/sprites/question_mark.2bpp" - -SECTION "Graphics (BANK 4)", ROMX - -PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" -FontGraphics: INCBIN "gfx/font.1bpp" -FontGraphicsEnd: -ABTiles: INCBIN "gfx/AB.2bpp" -HpBarAndStatusGraphics: INCBIN "gfx/hp_bar_and_status.2bpp" -HpBarAndStatusGraphicsEnd: -BattleHudTiles1: INCBIN "gfx/battle_hud1.1bpp" -BattleHudTiles1End: -BattleHudTiles2: INCBIN "gfx/battle_hud2.1bpp" -BattleHudTiles3: INCBIN "gfx/battle_hud3.1bpp" -BattleHudTiles3End: -NintendoCopyrightLogoGraphics: INCBIN "gfx/copyright.2bpp" -GamefreakLogoGraphics: INCBIN "gfx/gamefreak.2bpp" -GamefreakLogoGraphicsEnd: -TextBoxGraphics: INCBIN "gfx/text_box.2bpp" -TextBoxGraphicsEnd: -PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp" -PokedexTileGraphicsEnd: -WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp" -WorldMapTileGraphicsEnd: -PlayerCharacterTitleGraphics: INCBIN "gfx/player_title.2bpp" -PlayerCharacterTitleGraphicsEnd: - - -SECTION "Battle (BANK 4)", ROMX - -INCLUDE "engine/overworld/is_player_just_outside_map.asm" -INCLUDE "engine/menu/status_screen.asm" -INCLUDE "engine/menu/party_menu.asm" - -RedPicFront:: INCBIN "pic/trainer/red.pic" -ShrinkPic1:: INCBIN "pic/trainer/shrink1.pic" -ShrinkPic2:: INCBIN "pic/trainer/shrink2.pic" - -INCLUDE "engine/turn_sprite.asm" -INCLUDE "engine/menu/start_sub_menus.asm" -INCLUDE "engine/items/tms.asm" INCLUDE "engine/battle/end_of_battle.asm" INCLUDE "engine/battle/wild_encounters.asm" INCLUDE "engine/battle/moveEffects/recoil_effect.asm" INCLUDE "engine/battle/moveEffects/conversion_effect.asm" INCLUDE "engine/battle/moveEffects/haze_effect.asm" -INCLUDE "engine/battle/get_trainer_name.asm" -INCLUDE "engine/random.asm" SECTION "NPC Sprites 2", ROMX ; BANK $05 +INCLUDE "engine/load_pokedex_tiles.asm" +INCLUDE "engine/overworld/map_sprites.asm" + RedCyclingSprite: INCBIN "gfx/sprites/cycling.2bpp" RedSprite: INCBIN "gfx/sprites/red.2bpp" BlueSprite: INCBIN "gfx/sprites/blue.2bpp" @@ -251,13 +221,6 @@ BrunoSprite: INCBIN "gfx/sprites/bruno.2bpp" LoreleiSprite: INCBIN "gfx/sprites/lorelei.2bpp" SeelSprite: INCBIN "gfx/sprites/seel.2bpp" - -SECTION "Battle (BANK 5)", ROMX - -INCLUDE "engine/load_pokedex_tiles.asm" -INCLUDE "engine/overworld/map_sprites.asm" -INCLUDE "engine/overworld/emotion_bubbles.asm" -INCLUDE "engine/evolve_trade.asm" INCLUDE "engine/battle/moveEffects/substitute_effect.asm" INCLUDE "engine/menu/pc.asm" @@ -293,8 +256,6 @@ INCLUDE "data/mapHeaders/FuchsiaCity.asm" INCLUDE "data/mapObjects/FuchsiaCity.asm" FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk" -INCLUDE "engine/play_time.asm" - INCLUDE "scripts/PalletTown.asm" INCLUDE "scripts/ViridianCity.asm" INCLUDE "scripts/PewterCity.asm" @@ -373,8 +334,6 @@ CeruleanTrashedHouse_Blocks: INCBIN "maps/CeruleanTrashedHouse.blk" DiglettsCaveRoute11_Blocks: DiglettsCaveRoute2_Blocks: INCBIN "maps/DiglettsCaveRoute2.blk" -INCLUDE "text/monster_names.asm" - INCLUDE "engine/clear_save.asm" INCLUDE "engine/predefs7.asm" @@ -522,372 +481,350 @@ INCLUDE "engine/hidden_object_functions7.asm" SECTION "Pics 1", ROMX ; BANK $09 -RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic" +RhydonPicFront:: INCBIN "pic/ymon/rhydon.pic" RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" -KangaskhanPicFront:: INCBIN "pic/bmon/kangaskhan.pic" +KangaskhanPicFront:: INCBIN "pic/ymon/kangaskhan.pic" KangaskhanPicBack:: INCBIN "pic/monback/kangaskhanb.pic" -NidoranMPicFront:: INCBIN "pic/bmon/nidoranm.pic" +NidoranMPicFront:: INCBIN "pic/ymon/nidoranm.pic" NidoranMPicBack:: INCBIN "pic/monback/nidoranmb.pic" -ClefairyPicFront:: INCBIN "pic/bmon/clefairy.pic" +ClefairyPicFront:: INCBIN "pic/ymon/clefairy.pic" ClefairyPicBack:: INCBIN "pic/monback/clefairyb.pic" -SpearowPicFront:: INCBIN "pic/bmon/spearow.pic" +SpearowPicFront:: INCBIN "pic/ymon/spearow.pic" SpearowPicBack:: INCBIN "pic/monback/spearowb.pic" -VoltorbPicFront:: INCBIN "pic/bmon/voltorb.pic" +VoltorbPicFront:: INCBIN "pic/ymon/voltorb.pic" VoltorbPicBack:: INCBIN "pic/monback/voltorbb.pic" -NidokingPicFront:: INCBIN "pic/bmon/nidoking.pic" +NidokingPicFront:: INCBIN "pic/ymon/nidoking.pic" NidokingPicBack:: INCBIN "pic/monback/nidokingb.pic" -SlowbroPicFront:: INCBIN "pic/bmon/slowbro.pic" +SlowbroPicFront:: INCBIN "pic/ymon/slowbro.pic" SlowbroPicBack:: INCBIN "pic/monback/slowbrob.pic" -IvysaurPicFront:: INCBIN "pic/bmon/ivysaur.pic" +IvysaurPicFront:: INCBIN "pic/ymon/ivysaur.pic" IvysaurPicBack:: INCBIN "pic/monback/ivysaurb.pic" -ExeggutorPicFront:: INCBIN "pic/bmon/exeggutor.pic" +ExeggutorPicFront:: INCBIN "pic/ymon/exeggutor.pic" ExeggutorPicBack:: INCBIN "pic/monback/exeggutorb.pic" -LickitungPicFront:: INCBIN "pic/bmon/lickitung.pic" +LickitungPicFront:: INCBIN "pic/ymon/lickitung.pic" LickitungPicBack:: INCBIN "pic/monback/lickitungb.pic" -ExeggcutePicFront:: INCBIN "pic/bmon/exeggcute.pic" +ExeggcutePicFront:: INCBIN "pic/ymon/exeggcute.pic" ExeggcutePicBack:: INCBIN "pic/monback/exeggcuteb.pic" -GrimerPicFront:: INCBIN "pic/bmon/grimer.pic" +GrimerPicFront:: INCBIN "pic/ymon/grimer.pic" GrimerPicBack:: INCBIN "pic/monback/grimerb.pic" -GengarPicFront:: INCBIN "pic/bmon/gengar.pic" +GengarPicFront:: INCBIN "pic/ymon/gengar.pic" GengarPicBack:: INCBIN "pic/monback/gengarb.pic" -NidoranFPicFront:: INCBIN "pic/bmon/nidoranf.pic" +NidoranFPicFront:: INCBIN "pic/ymon/nidoranf.pic" NidoranFPicBack:: INCBIN "pic/monback/nidoranfb.pic" -NidoqueenPicFront:: INCBIN "pic/bmon/nidoqueen.pic" +NidoqueenPicFront:: INCBIN "pic/ymon/nidoqueen.pic" NidoqueenPicBack:: INCBIN "pic/monback/nidoqueenb.pic" -CubonePicFront:: INCBIN "pic/bmon/cubone.pic" +CubonePicFront:: INCBIN "pic/ymon/cubone.pic" CubonePicBack:: INCBIN "pic/monback/cuboneb.pic" -RhyhornPicFront:: INCBIN "pic/bmon/rhyhorn.pic" +RhyhornPicFront:: INCBIN "pic/ymon/rhyhorn.pic" RhyhornPicBack:: INCBIN "pic/monback/rhyhornb.pic" -LaprasPicFront:: INCBIN "pic/bmon/lapras.pic" +LaprasPicFront:: INCBIN "pic/ymon/lapras.pic" LaprasPicBack:: INCBIN "pic/monback/laprasb.pic" -ArcaninePicFront:: INCBIN "pic/bmon/arcanine.pic" +ArcaninePicFront:: INCBIN "pic/ymon/arcanine.pic" ArcaninePicBack:: INCBIN "pic/monback/arcanineb.pic" -GyaradosPicFront:: INCBIN "pic/bmon/gyarados.pic" +MewPicFront:: INCBIN "pic/ymon/mew.pic" +MewPicBack:: INCBIN "pic/monback/mewb.pic" +GyaradosPicFront:: INCBIN "pic/ymon/gyarados.pic" GyaradosPicBack:: INCBIN "pic/monback/gyaradosb.pic" -ShellderPicFront:: INCBIN "pic/bmon/shellder.pic" +ShellderPicFront:: INCBIN "pic/ymon/shellder.pic" ShellderPicBack:: INCBIN "pic/monback/shellderb.pic" -TentacoolPicFront:: INCBIN "pic/bmon/tentacool.pic" +TentacoolPicFront:: INCBIN "pic/ymon/tentacool.pic" TentacoolPicBack:: INCBIN "pic/monback/tentacoolb.pic" -GastlyPicFront:: INCBIN "pic/bmon/gastly.pic" +GastlyPicFront:: INCBIN "pic/ymon/gastly.pic" GastlyPicBack:: INCBIN "pic/monback/gastlyb.pic" -ScytherPicFront:: INCBIN "pic/bmon/scyther.pic" +ScytherPicFront:: INCBIN "pic/ymon/scyther.pic" ScytherPicBack:: INCBIN "pic/monback/scytherb.pic" -StaryuPicFront:: INCBIN "pic/bmon/staryu.pic" +StaryuPicFront:: INCBIN "pic/ymon/staryu.pic" StaryuPicBack:: INCBIN "pic/monback/staryub.pic" -BlastoisePicFront:: INCBIN "pic/bmon/blastoise.pic" +BlastoisePicFront:: INCBIN "pic/ymon/blastoise.pic" BlastoisePicBack:: INCBIN "pic/monback/blastoiseb.pic" -PinsirPicFront:: INCBIN "pic/bmon/pinsir.pic" +PinsirPicFront:: INCBIN "pic/ymon/pinsir.pic" PinsirPicBack:: INCBIN "pic/monback/pinsirb.pic" -TangelaPicFront:: INCBIN "pic/bmon/tangela.pic" +TangelaPicFront:: INCBIN "pic/ymon/tangela.pic" TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" - -SECTION "Battle (BANK 9)", ROMX - 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 $0A -GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic" +GrowlithePicFront:: INCBIN "pic/ymon/growlithe.pic" GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" -OnixPicFront:: INCBIN "pic/bmon/onix.pic" +OnixPicFront:: INCBIN "pic/ymon/onix.pic" OnixPicBack:: INCBIN "pic/monback/onixb.pic" -FearowPicFront:: INCBIN "pic/bmon/fearow.pic" +FearowPicFront:: INCBIN "pic/ymon/fearow.pic" FearowPicBack:: INCBIN "pic/monback/fearowb.pic" -PidgeyPicFront:: INCBIN "pic/bmon/pidgey.pic" +PidgeyPicFront:: INCBIN "pic/ymon/pidgey.pic" PidgeyPicBack:: INCBIN "pic/monback/pidgeyb.pic" -SlowpokePicFront:: INCBIN "pic/bmon/slowpoke.pic" +SlowpokePicFront:: INCBIN "pic/ymon/slowpoke.pic" SlowpokePicBack:: INCBIN "pic/monback/slowpokeb.pic" -KadabraPicFront:: INCBIN "pic/bmon/kadabra.pic" +KadabraPicFront:: INCBIN "pic/ymon/kadabra.pic" KadabraPicBack:: INCBIN "pic/monback/kadabrab.pic" -GravelerPicFront:: INCBIN "pic/bmon/graveler.pic" +GravelerPicFront:: INCBIN "pic/ymon/graveler.pic" GravelerPicBack:: INCBIN "pic/monback/gravelerb.pic" -ChanseyPicFront:: INCBIN "pic/bmon/chansey.pic" +ChanseyPicFront:: INCBIN "pic/ymon/chansey.pic" ChanseyPicBack:: INCBIN "pic/monback/chanseyb.pic" -MachokePicFront:: INCBIN "pic/bmon/machoke.pic" +MachokePicFront:: INCBIN "pic/ymon/machoke.pic" MachokePicBack:: INCBIN "pic/monback/machokeb.pic" -MrMimePicFront:: INCBIN "pic/bmon/mr.mime.pic" +MrMimePicFront:: INCBIN "pic/ymon/mr.mime.pic" MrMimePicBack:: INCBIN "pic/monback/mr.mimeb.pic" -HitmonleePicFront:: INCBIN "pic/bmon/hitmonlee.pic" +HitmonleePicFront:: INCBIN "pic/ymon/hitmonlee.pic" HitmonleePicBack:: INCBIN "pic/monback/hitmonleeb.pic" -HitmonchanPicFront:: INCBIN "pic/bmon/hitmonchan.pic" +HitmonchanPicFront:: INCBIN "pic/ymon/hitmonchan.pic" HitmonchanPicBack:: INCBIN "pic/monback/hitmonchanb.pic" -ArbokPicFront:: INCBIN "pic/bmon/arbok.pic" +ArbokPicFront:: INCBIN "pic/ymon/arbok.pic" ArbokPicBack:: INCBIN "pic/monback/arbokb.pic" -ParasectPicFront:: INCBIN "pic/bmon/parasect.pic" +ParasectPicFront:: INCBIN "pic/ymon/parasect.pic" ParasectPicBack:: INCBIN "pic/monback/parasectb.pic" -PsyduckPicFront:: INCBIN "pic/bmon/psyduck.pic" +PsyduckPicFront:: INCBIN "pic/ymon/psyduck.pic" PsyduckPicBack:: INCBIN "pic/monback/psyduckb.pic" -DrowzeePicFront:: INCBIN "pic/bmon/drowzee.pic" +DrowzeePicFront:: INCBIN "pic/ymon/drowzee.pic" DrowzeePicBack:: INCBIN "pic/monback/drowzeeb.pic" -GolemPicFront:: INCBIN "pic/bmon/golem.pic" +GolemPicFront:: INCBIN "pic/ymon/golem.pic" GolemPicBack:: INCBIN "pic/monback/golemb.pic" -MagmarPicFront:: INCBIN "pic/bmon/magmar.pic" +MagmarPicFront:: INCBIN "pic/ymon/magmar.pic" MagmarPicBack:: INCBIN "pic/monback/magmarb.pic" -ElectabuzzPicFront:: INCBIN "pic/bmon/electabuzz.pic" +ElectabuzzPicFront:: INCBIN "pic/ymon/electabuzz.pic" ElectabuzzPicBack:: INCBIN "pic/monback/electabuzzb.pic" -MagnetonPicFront:: INCBIN "pic/bmon/magneton.pic" +MagnetonPicFront:: INCBIN "pic/ymon/magneton.pic" MagnetonPicBack:: INCBIN "pic/monback/magnetonb.pic" -KoffingPicFront:: INCBIN "pic/bmon/koffing.pic" +KoffingPicFront:: INCBIN "pic/ymon/koffing.pic" KoffingPicBack:: INCBIN "pic/monback/koffingb.pic" -MankeyPicFront:: INCBIN "pic/bmon/mankey.pic" +MankeyPicFront:: INCBIN "pic/ymon/mankey.pic" MankeyPicBack:: INCBIN "pic/monback/mankeyb.pic" -SeelPicFront:: INCBIN "pic/bmon/seel.pic" +SeelPicFront:: INCBIN "pic/ymon/seel.pic" SeelPicBack:: INCBIN "pic/monback/seelb.pic" -DiglettPicFront:: INCBIN "pic/bmon/diglett.pic" +DiglettPicFront:: INCBIN "pic/ymon/diglett.pic" DiglettPicBack:: INCBIN "pic/monback/diglettb.pic" -TaurosPicFront:: INCBIN "pic/bmon/tauros.pic" +TaurosPicFront:: INCBIN "pic/ymon/tauros.pic" TaurosPicBack:: INCBIN "pic/monback/taurosb.pic" -FarfetchdPicFront:: INCBIN "pic/bmon/farfetchd.pic" +FarfetchdPicFront:: INCBIN "pic/ymon/farfetchd.pic" FarfetchdPicBack:: INCBIN "pic/monback/farfetchdb.pic" -VenonatPicFront:: INCBIN "pic/bmon/venonat.pic" +VenonatPicFront:: INCBIN "pic/ymon/venonat.pic" VenonatPicBack:: INCBIN "pic/monback/venonatb.pic" -DragonitePicFront:: INCBIN "pic/bmon/dragonite.pic" +DragonitePicFront:: INCBIN "pic/ymon/dragonite.pic" DragonitePicBack:: INCBIN "pic/monback/dragoniteb.pic" -DoduoPicFront:: INCBIN "pic/bmon/doduo.pic" +DoduoPicFront:: INCBIN "pic/ymon/doduo.pic" DoduoPicBack:: INCBIN "pic/monback/doduob.pic" -PoliwagPicFront:: INCBIN "pic/bmon/poliwag.pic" +PoliwagPicFront:: INCBIN "pic/ymon/poliwag.pic" PoliwagPicBack:: INCBIN "pic/monback/poliwagb.pic" -JynxPicFront:: INCBIN "pic/bmon/jynx.pic" +JynxPicFront:: INCBIN "pic/ymon/jynx.pic" JynxPicBack:: INCBIN "pic/monback/jynxb.pic" -MoltresPicFront:: INCBIN "pic/bmon/moltres.pic" +MoltresPicFront:: INCBIN "pic/ymon/moltres.pic" MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" - -SECTION "Battle (BANK A)", ROMX - +INCLUDE "engine/predefsA.asm" INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" SECTION "Pics 3", ROMX ; BANK $0B -ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic" +ArticunoPicFront:: INCBIN "pic/ymon/articuno.pic" ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" -ZapdosPicFront:: INCBIN "pic/bmon/zapdos.pic" +ZapdosPicFront:: INCBIN "pic/ymon/zapdos.pic" ZapdosPicBack:: INCBIN "pic/monback/zapdosb.pic" -DittoPicFront:: INCBIN "pic/bmon/ditto.pic" +DittoPicFront:: INCBIN "pic/ymon/ditto.pic" DittoPicBack:: INCBIN "pic/monback/dittob.pic" -MeowthPicFront:: INCBIN "pic/bmon/meowth.pic" +MeowthPicFront:: INCBIN "pic/ymon/meowth.pic" MeowthPicBack:: INCBIN "pic/monback/meowthb.pic" -KrabbyPicFront:: INCBIN "pic/bmon/krabby.pic" +KrabbyPicFront:: INCBIN "pic/ymon/krabby.pic" KrabbyPicBack:: INCBIN "pic/monback/krabbyb.pic" -VulpixPicFront:: INCBIN "pic/bmon/vulpix.pic" +VulpixPicFront:: INCBIN "pic/ymon/vulpix.pic" VulpixPicBack:: INCBIN "pic/monback/vulpixb.pic" -NinetalesPicFront:: INCBIN "pic/bmon/ninetales.pic" +NinetalesPicFront:: INCBIN "pic/ymon/ninetales.pic" NinetalesPicBack:: INCBIN "pic/monback/ninetalesb.pic" -PikachuPicFront:: INCBIN "pic/bmon/pikachu.pic" +PikachuPicFront:: INCBIN "pic/ymon/pikachu.pic" PikachuPicBack:: INCBIN "pic/monback/pikachub.pic" -RaichuPicFront:: INCBIN "pic/bmon/raichu.pic" +RaichuPicFront:: INCBIN "pic/ymon/raichu.pic" RaichuPicBack:: INCBIN "pic/monback/raichub.pic" -DratiniPicFront:: INCBIN "pic/bmon/dratini.pic" +DratiniPicFront:: INCBIN "pic/ymon/dratini.pic" DratiniPicBack:: INCBIN "pic/monback/dratinib.pic" -DragonairPicFront:: INCBIN "pic/bmon/dragonair.pic" +DragonairPicFront:: INCBIN "pic/ymon/dragonair.pic" DragonairPicBack:: INCBIN "pic/monback/dragonairb.pic" -KabutoPicFront:: INCBIN "pic/bmon/kabuto.pic" +KabutoPicFront:: INCBIN "pic/ymon/kabuto.pic" KabutoPicBack:: INCBIN "pic/monback/kabutob.pic" -KabutopsPicFront:: INCBIN "pic/bmon/kabutops.pic" +KabutopsPicFront:: INCBIN "pic/ymon/kabutops.pic" KabutopsPicBack:: INCBIN "pic/monback/kabutopsb.pic" -HorseaPicFront:: INCBIN "pic/bmon/horsea.pic" +HorseaPicFront:: INCBIN "pic/ymon/horsea.pic" HorseaPicBack:: INCBIN "pic/monback/horseab.pic" -SeadraPicFront:: INCBIN "pic/bmon/seadra.pic" +SeadraPicFront:: INCBIN "pic/ymon/seadra.pic" SeadraPicBack:: INCBIN "pic/monback/seadrab.pic" -SandshrewPicFront:: INCBIN "pic/bmon/sandshrew.pic" +SandshrewPicFront:: INCBIN "pic/ymon/sandshrew.pic" SandshrewPicBack:: INCBIN "pic/monback/sandshrewb.pic" -SandslashPicFront:: INCBIN "pic/bmon/sandslash.pic" +SandslashPicFront:: INCBIN "pic/ymon/sandslash.pic" SandslashPicBack:: INCBIN "pic/monback/sandslashb.pic" -OmanytePicFront:: INCBIN "pic/bmon/omanyte.pic" +OmanytePicFront:: INCBIN "pic/ymon/omanyte.pic" OmanytePicBack:: INCBIN "pic/monback/omanyteb.pic" -OmastarPicFront:: INCBIN "pic/bmon/omastar.pic" +OmastarPicFront:: INCBIN "pic/ymon/omastar.pic" OmastarPicBack:: INCBIN "pic/monback/omastarb.pic" -JigglypuffPicFront:: INCBIN "pic/bmon/jigglypuff.pic" +JigglypuffPicFront:: INCBIN "pic/ymon/jigglypuff.pic" JigglypuffPicBack:: INCBIN "pic/monback/jigglypuffb.pic" -WigglytuffPicFront:: INCBIN "pic/bmon/wigglytuff.pic" +WigglytuffPicFront:: INCBIN "pic/ymon/wigglytuff.pic" WigglytuffPicBack:: INCBIN "pic/monback/wigglytuffb.pic" -EeveePicFront:: INCBIN "pic/bmon/eevee.pic" +EeveePicFront:: INCBIN "pic/ymon/eevee.pic" EeveePicBack:: INCBIN "pic/monback/eeveeb.pic" -FlareonPicFront:: INCBIN "pic/bmon/flareon.pic" +FlareonPicFront:: INCBIN "pic/ymon/flareon.pic" FlareonPicBack:: INCBIN "pic/monback/flareonb.pic" -JolteonPicFront:: INCBIN "pic/bmon/jolteon.pic" +JolteonPicFront:: INCBIN "pic/ymon/jolteon.pic" JolteonPicBack:: INCBIN "pic/monback/jolteonb.pic" -VaporeonPicFront:: INCBIN "pic/bmon/vaporeon.pic" +VaporeonPicFront:: INCBIN "pic/ymon/vaporeon.pic" VaporeonPicBack:: INCBIN "pic/monback/vaporeonb.pic" -MachopPicFront:: INCBIN "pic/bmon/machop.pic" +MachopPicFront:: INCBIN "pic/ymon/machop.pic" MachopPicBack:: INCBIN "pic/monback/machopb.pic" -ZubatPicFront:: INCBIN "pic/bmon/zubat.pic" +ZubatPicFront:: INCBIN "pic/ymon/zubat.pic" ZubatPicBack:: INCBIN "pic/monback/zubatb.pic" -EkansPicFront:: INCBIN "pic/bmon/ekans.pic" +EkansPicFront:: INCBIN "pic/ymon/ekans.pic" EkansPicBack:: INCBIN "pic/monback/ekansb.pic" -ParasPicFront:: INCBIN "pic/bmon/paras.pic" +ParasPicFront:: INCBIN "pic/ymon/paras.pic" ParasPicBack:: INCBIN "pic/monback/parasb.pic" -PoliwhirlPicFront:: INCBIN "pic/bmon/poliwhirl.pic" +PoliwhirlPicFront:: INCBIN "pic/ymon/poliwhirl.pic" PoliwhirlPicBack:: INCBIN "pic/monback/poliwhirlb.pic" -PoliwrathPicFront:: INCBIN "pic/bmon/poliwrath.pic" +PoliwrathPicFront:: INCBIN "pic/ymon/poliwrath.pic" PoliwrathPicBack:: INCBIN "pic/monback/poliwrathb.pic" -WeedlePicFront:: INCBIN "pic/bmon/weedle.pic" +WeedlePicFront:: INCBIN "pic/ymon/weedle.pic" WeedlePicBack:: INCBIN "pic/monback/weedleb.pic" -KakunaPicFront:: INCBIN "pic/bmon/kakuna.pic" +KakunaPicFront:: INCBIN "pic/ymon/kakuna.pic" KakunaPicBack:: INCBIN "pic/monback/kakunab.pic" -BeedrillPicFront:: INCBIN "pic/bmon/beedrill.pic" +BeedrillPicFront:: INCBIN "pic/ymon/beedrill.pic" BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" -FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" - - -SECTION "Battle (BANK B)", ROMX +FossilKabutopsPic:: INCBIN "pic/ymon/fossilkabutops.pic" INCLUDE "engine/battle/display_effectiveness.asm" +INCLUDE "engine/items/tmhm.asm" -TrainerInfoTextBoxTileGraphics: INCBIN "gfx/trainer_info.2bpp" -TrainerInfoTextBoxTileGraphicsEnd: -BlankLeaderNames: INCBIN "gfx/blank_leader_names.2bpp" -CircleTile: INCBIN "gfx/circle_tile.2bpp" -BadgeNumbersTileGraphics: INCBIN "gfx/badge_numbers.2bpp" +Func_2fd6a: + callab IsThisPartymonStarterPikachu_Party + ret nc + ld a, $3 + ld [wPikachuSpawnState], a + ret -INCLUDE "engine/items/tmhm.asm" INCLUDE "engine/battle/scale_sprites.asm" -INCLUDE "engine/battle/moveEffects/pay_day_effect.asm" INCLUDE "engine/game_corner_slots2.asm" SECTION "Pics 4", ROMX ; BANK $0C -DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic" +DodrioPicFront:: INCBIN "pic/ymon/dodrio.pic" DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" -PrimeapePicFront:: INCBIN "pic/bmon/primeape.pic" +PrimeapePicFront:: INCBIN "pic/ymon/primeape.pic" PrimeapePicBack:: INCBIN "pic/monback/primeapeb.pic" -DugtrioPicFront:: INCBIN "pic/bmon/dugtrio.pic" +DugtrioPicFront:: INCBIN "pic/ymon/dugtrio.pic" DugtrioPicBack:: INCBIN "pic/monback/dugtriob.pic" -VenomothPicFront:: INCBIN "pic/bmon/venomoth.pic" +VenomothPicFront:: INCBIN "pic/ymon/venomoth.pic" VenomothPicBack:: INCBIN "pic/monback/venomothb.pic" -DewgongPicFront:: INCBIN "pic/bmon/dewgong.pic" +DewgongPicFront:: INCBIN "pic/ymon/dewgong.pic" DewgongPicBack:: INCBIN "pic/monback/dewgongb.pic" -CaterpiePicFront:: INCBIN "pic/bmon/caterpie.pic" +CaterpiePicFront:: INCBIN "pic/ymon/caterpie.pic" CaterpiePicBack:: INCBIN "pic/monback/caterpieb.pic" -MetapodPicFront:: INCBIN "pic/bmon/metapod.pic" +MetapodPicFront:: INCBIN "pic/ymon/metapod.pic" MetapodPicBack:: INCBIN "pic/monback/metapodb.pic" -ButterfreePicFront:: INCBIN "pic/bmon/butterfree.pic" +ButterfreePicFront:: INCBIN "pic/ymon/butterfree.pic" ButterfreePicBack:: INCBIN "pic/monback/butterfreeb.pic" -MachampPicFront:: INCBIN "pic/bmon/machamp.pic" +MachampPicFront:: INCBIN "pic/ymon/machamp.pic" MachampPicBack:: INCBIN "pic/monback/machampb.pic" -GolduckPicFront:: INCBIN "pic/bmon/golduck.pic" +GolduckPicFront:: INCBIN "pic/ymon/golduck.pic" GolduckPicBack:: INCBIN "pic/monback/golduckb.pic" -HypnoPicFront:: INCBIN "pic/bmon/hypno.pic" +HypnoPicFront:: INCBIN "pic/ymon/hypno.pic" HypnoPicBack:: INCBIN "pic/monback/hypnob.pic" -GolbatPicFront:: INCBIN "pic/bmon/golbat.pic" +GolbatPicFront:: INCBIN "pic/ymon/golbat.pic" GolbatPicBack:: INCBIN "pic/monback/golbatb.pic" -MewtwoPicFront:: INCBIN "pic/bmon/mewtwo.pic" +MewtwoPicFront:: INCBIN "pic/ymon/mewtwo.pic" MewtwoPicBack:: INCBIN "pic/monback/mewtwob.pic" -SnorlaxPicFront:: INCBIN "pic/bmon/snorlax.pic" +SnorlaxPicFront:: INCBIN "pic/ymon/snorlax.pic" SnorlaxPicBack:: INCBIN "pic/monback/snorlaxb.pic" -MagikarpPicFront:: INCBIN "pic/bmon/magikarp.pic" +MagikarpPicFront:: INCBIN "pic/ymon/magikarp.pic" MagikarpPicBack:: INCBIN "pic/monback/magikarpb.pic" -MukPicFront:: INCBIN "pic/bmon/muk.pic" +MukPicFront:: INCBIN "pic/ymon/muk.pic" MukPicBack:: INCBIN "pic/monback/mukb.pic" -KinglerPicFront:: INCBIN "pic/bmon/kingler.pic" +KinglerPicFront:: INCBIN "pic/ymon/kingler.pic" KinglerPicBack:: INCBIN "pic/monback/kinglerb.pic" -CloysterPicFront:: INCBIN "pic/bmon/cloyster.pic" +CloysterPicFront:: INCBIN "pic/ymon/cloyster.pic" CloysterPicBack:: INCBIN "pic/monback/cloysterb.pic" -ElectrodePicFront:: INCBIN "pic/bmon/electrode.pic" +ElectrodePicFront:: INCBIN "pic/ymon/electrode.pic" ElectrodePicBack:: INCBIN "pic/monback/electrodeb.pic" -ClefablePicFront:: INCBIN "pic/bmon/clefable.pic" +ClefablePicFront:: INCBIN "pic/ymon/clefable.pic" ClefablePicBack:: INCBIN "pic/monback/clefableb.pic" -WeezingPicFront:: INCBIN "pic/bmon/weezing.pic" +WeezingPicFront:: INCBIN "pic/ymon/weezing.pic" WeezingPicBack:: INCBIN "pic/monback/weezingb.pic" -PersianPicFront:: INCBIN "pic/bmon/persian.pic" +PersianPicFront:: INCBIN "pic/ymon/persian.pic" PersianPicBack:: INCBIN "pic/monback/persianb.pic" -MarowakPicFront:: INCBIN "pic/bmon/marowak.pic" +MarowakPicFront:: INCBIN "pic/ymon/marowak.pic" MarowakPicBack:: INCBIN "pic/monback/marowakb.pic" -HaunterPicFront:: INCBIN "pic/bmon/haunter.pic" +HaunterPicFront:: INCBIN "pic/ymon/haunter.pic" HaunterPicBack:: INCBIN "pic/monback/haunterb.pic" -AbraPicFront:: INCBIN "pic/bmon/abra.pic" +AbraPicFront:: INCBIN "pic/ymon/abra.pic" AbraPicBack:: INCBIN "pic/monback/abrab.pic" -AlakazamPicFront:: INCBIN "pic/bmon/alakazam.pic" +AlakazamPicFront:: INCBIN "pic/ymon/alakazam.pic" AlakazamPicBack:: INCBIN "pic/monback/alakazamb.pic" -PidgeottoPicFront:: INCBIN "pic/bmon/pidgeotto.pic" +PidgeottoPicFront:: INCBIN "pic/ymon/pidgeotto.pic" PidgeottoPicBack:: INCBIN "pic/monback/pidgeottob.pic" -PidgeotPicFront:: INCBIN "pic/bmon/pidgeot.pic" +PidgeotPicFront:: INCBIN "pic/ymon/pidgeot.pic" PidgeotPicBack:: INCBIN "pic/monback/pidgeotb.pic" -StarmiePicFront:: INCBIN "pic/bmon/starmie.pic" +StarmiePicFront:: INCBIN "pic/ymon/starmie.pic" StarmiePicBack:: INCBIN "pic/monback/starmieb.pic" -RedPicBack:: INCBIN "pic/trainer/redb.pic" -OldManPic:: INCBIN "pic/trainer/oldman.pic" - - -SECTION "Battle (BANK C)", ROMX - -INCLUDE "engine/battle/moveEffects/mist_effect.asm" -INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm" - SECTION "Pics 5", ROMX ; BANK $0D -BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic" +BulbasaurPicFront:: INCBIN "pic/ymon/bulbasaur.pic" BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" -VenusaurPicFront:: INCBIN "pic/bmon/venusaur.pic" +VenusaurPicFront:: INCBIN "pic/ymon/venusaur.pic" VenusaurPicBack:: INCBIN "pic/monback/venusaurb.pic" -TentacruelPicFront:: INCBIN "pic/bmon/tentacruel.pic" +TentacruelPicFront:: INCBIN "pic/ymon/tentacruel.pic" TentacruelPicBack:: INCBIN "pic/monback/tentacruelb.pic" -GoldeenPicFront:: INCBIN "pic/bmon/goldeen.pic" +GoldeenPicFront:: INCBIN "pic/ymon/goldeen.pic" GoldeenPicBack:: INCBIN "pic/monback/goldeenb.pic" -SeakingPicFront:: INCBIN "pic/bmon/seaking.pic" +SeakingPicFront:: INCBIN "pic/ymon/seaking.pic" SeakingPicBack:: INCBIN "pic/monback/seakingb.pic" -PonytaPicFront:: INCBIN "pic/bmon/ponyta.pic" -RapidashPicFront:: INCBIN "pic/bmon/rapidash.pic" +PonytaPicFront:: INCBIN "pic/ymon/ponyta.pic" +RapidashPicFront:: INCBIN "pic/ymon/rapidash.pic" PonytaPicBack:: INCBIN "pic/monback/ponytab.pic" RapidashPicBack:: INCBIN "pic/monback/rapidashb.pic" -RattataPicFront:: INCBIN "pic/bmon/rattata.pic" +RattataPicFront:: INCBIN "pic/ymon/rattata.pic" RattataPicBack:: INCBIN "pic/monback/rattatab.pic" -RaticatePicFront:: INCBIN "pic/bmon/raticate.pic" +RaticatePicFront:: INCBIN "pic/ymon/raticate.pic" RaticatePicBack:: INCBIN "pic/monback/raticateb.pic" -NidorinoPicFront:: INCBIN "pic/bmon/nidorino.pic" +NidorinoPicFront:: INCBIN "pic/ymon/nidorino.pic" NidorinoPicBack:: INCBIN "pic/monback/nidorinob.pic" -NidorinaPicFront:: INCBIN "pic/bmon/nidorina.pic" +NidorinaPicFront:: INCBIN "pic/ymon/nidorina.pic" NidorinaPicBack:: INCBIN "pic/monback/nidorinab.pic" -GeodudePicFront:: INCBIN "pic/bmon/geodude.pic" +GeodudePicFront:: INCBIN "pic/ymon/geodude.pic" GeodudePicBack:: INCBIN "pic/monback/geodudeb.pic" -PorygonPicFront:: INCBIN "pic/bmon/porygon.pic" +PorygonPicFront:: INCBIN "pic/ymon/porygon.pic" PorygonPicBack:: INCBIN "pic/monback/porygonb.pic" -AerodactylPicFront:: INCBIN "pic/bmon/aerodactyl.pic" +AerodactylPicFront:: INCBIN "pic/ymon/aerodactyl.pic" AerodactylPicBack:: INCBIN "pic/monback/aerodactylb.pic" -MagnemitePicFront:: INCBIN "pic/bmon/magnemite.pic" +MagnemitePicFront:: INCBIN "pic/ymon/magnemite.pic" MagnemitePicBack:: INCBIN "pic/monback/magnemiteb.pic" -CharmanderPicFront:: INCBIN "pic/bmon/charmander.pic" +CharmanderPicFront:: INCBIN "pic/ymon/charmander.pic" CharmanderPicBack:: INCBIN "pic/monback/charmanderb.pic" -SquirtlePicFront:: INCBIN "pic/bmon/squirtle.pic" +SquirtlePicFront:: INCBIN "pic/ymon/squirtle.pic" SquirtlePicBack:: INCBIN "pic/monback/squirtleb.pic" -CharmeleonPicFront:: INCBIN "pic/bmon/charmeleon.pic" +CharmeleonPicFront:: INCBIN "pic/ymon/charmeleon.pic" CharmeleonPicBack:: INCBIN "pic/monback/charmeleonb.pic" -WartortlePicFront:: INCBIN "pic/bmon/wartortle.pic" +WartortlePicFront:: INCBIN "pic/ymon/wartortle.pic" WartortlePicBack:: INCBIN "pic/monback/wartortleb.pic" -CharizardPicFront:: INCBIN "pic/bmon/charizard.pic" +CharizardPicFront:: INCBIN "pic/ymon/charizard.pic" CharizardPicBack:: INCBIN "pic/monback/charizardb.pic" -FossilAerodactylPic:: INCBIN "pic/bmon/fossilaerodactyl.pic" +FossilAerodactylPic:: INCBIN "pic/ymon/fossilaerodactyl.pic" GhostPic:: INCBIN "pic/other/ghost.pic" -OddishPicFront:: INCBIN "pic/bmon/oddish.pic" +OddishPicFront:: INCBIN "pic/ymon/oddish.pic" OddishPicBack:: INCBIN "pic/monback/oddishb.pic" -GloomPicFront:: INCBIN "pic/bmon/gloom.pic" +GloomPicFront:: INCBIN "pic/ymon/gloom.pic" GloomPicBack:: INCBIN "pic/monback/gloomb.pic" -VileplumePicFront:: INCBIN "pic/bmon/vileplume.pic" +VileplumePicFront:: INCBIN "pic/ymon/vileplume.pic" VileplumePicBack:: INCBIN "pic/monback/vileplumeb.pic" -BellsproutPicFront:: INCBIN "pic/bmon/bellsprout.pic" +BellsproutPicFront:: INCBIN "pic/ymon/bellsprout.pic" BellsproutPicBack:: INCBIN "pic/monback/bellsproutb.pic" -WeepinbellPicFront:: INCBIN "pic/bmon/weepinbell.pic" +WeepinbellPicFront:: INCBIN "pic/ymon/weepinbell.pic" WeepinbellPicBack:: INCBIN "pic/monback/weepinbellb.pic" -VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic" +VictreebelPicFront:: INCBIN "pic/ymon/victreebel.pic" VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" - -SECTION "Battle (BANK D)", ROMX - INCLUDE "engine/titlescreen2.asm" -INCLUDE "engine/battle/link_battle_versus_text.asm" INCLUDE "engine/slot_machine.asm" -INCLUDE "engine/overworld/pewter_guys.asm" -INCLUDE "engine/multiply_divide.asm" INCLUDE "engine/game_corner_slots.asm" @@ -896,8 +833,6 @@ SECTION "bankE", ROMX INCLUDE "data/moves.asm" BaseStats: INCLUDE "data/base_stats.asm" INCLUDE "data/cries.asm" -INCLUDE "engine/battle/unused_stats_functions.asm" -INCLUDE "engine/battle/scroll_draw_trainer_pic.asm" INCLUDE "engine/battle/trainer_ai.asm" INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" @@ -911,9 +846,6 @@ TradingAnimationGraphics2: INCBIN "gfx/trade2.2bpp" TradingAnimationGraphics2End: INCLUDE "engine/evos_moves.asm" -INCLUDE "engine/battle/moveEffects/heal_effect.asm" -INCLUDE "engine/battle/moveEffects/transform_effect.asm" -INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm" SECTION "bankF", ROMX @@ -924,9 +856,11 @@ INCLUDE "engine/battle/core.asm" SECTION "bank10", ROMX INCLUDE "engine/menu/pokedex.asm" +INCLUDE "engine/overworld/emotion_bubbles.asm" INCLUDE "engine/trade.asm" INCLUDE "engine/intro.asm" INCLUDE "engine/trade2.asm" +INCLUDE "engine/menu/options.asm" SECTION "bank11", ROMX @@ -950,6 +884,11 @@ INCLUDE "data/mapHeaders/ViridianPokecenter.asm" INCLUDE "scripts/ViridianPokecenter.asm" INCLUDE "data/mapObjects/ViridianPokecenter.asm" +INCLUDE "data/mapHeaders/CeladonMart1F.asm" +INCLUDE "scripts/CeladonMart1F.asm" +INCLUDE "data/mapObjects/CeladonMart1F.asm" +CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk" + INCLUDE "data/mapHeaders/PokemonMansion1F.asm" INCLUDE "scripts/PokemonMansion1F.asm" INCLUDE "data/mapObjects/PokemonMansion1F.asm" @@ -1071,7 +1010,7 @@ INCLUDE "scripts/SeafoamIslandsB4F.asm" INCLUDE "data/mapObjects/SeafoamIslandsB4F.asm" SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk" -INCLUDE "engine/overworld/hidden_objects.asm" +INCLUDE "engine/overworld/dungeon_warps.asm" SECTION "bank12", ROMX @@ -1094,8 +1033,6 @@ Route15Gate2F_Blocks: Route12Gate2F_Blocks: Route11Gate2F_Blocks: INCBIN "maps/Route11Gate2F.blk" -INCLUDE "engine/predefs12.asm" - INCLUDE "scripts/Route7.asm" INCLUDE "data/mapHeaders/RedsHouse1F.asm" @@ -1241,6 +1178,7 @@ INCLUDE "data/mapHeaders/MtMoonB2F.asm" INCLUDE "scripts/MtMoonB2F.asm" INCLUDE "data/mapObjects/MtMoonB2F.asm" MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk" +INCLUDE "scripts/MtMoonB2F_2.asm" INCLUDE "data/mapHeaders/SafariZoneWest.asm" INCLUDE "scripts/SafariZoneWest.asm" @@ -1279,7 +1217,7 @@ JugglerPic:: INCBIN "pic/trainer/juggler.pic" TamerPic:: INCBIN "pic/trainer/tamer.pic" BirdKeeperPic:: INCBIN "pic/trainer/birdkeeper.pic" BlackbeltPic:: INCBIN "pic/trainer/blackbelt.pic" -Rival1Pic:: INCBIN "pic/trainer/rival1.pic" +Rival1Pic:: INCBIN "pic/ytrainer/rival1.pic" ProfOakPic:: INCBIN "pic/trainer/prof.oak.pic" ChiefPic:: ScientistPic:: INCBIN "pic/trainer/scientist.pic" @@ -1288,20 +1226,21 @@ RocketPic:: INCBIN "pic/trainer/rocket.pic" CooltrainerMPic:: INCBIN "pic/trainer/cooltrainerm.pic" CooltrainerFPic:: INCBIN "pic/trainer/cooltrainerf.pic" BrunoPic:: INCBIN "pic/trainer/bruno.pic" -BrockPic:: INCBIN "pic/trainer/brock.pic" -MistyPic:: INCBIN "pic/trainer/misty.pic" +BrockPic:: INCBIN "pic/ytrainer/brock.pic" +MistyPic:: INCBIN "pic/ytrainer/misty.pic" LtSurgePic:: INCBIN "pic/trainer/lt.surge.pic" -ErikaPic:: INCBIN "pic/trainer/erika.pic" +ErikaPic:: INCBIN "pic/ytrainer/erika.pic" KogaPic:: INCBIN "pic/trainer/koga.pic" BlainePic:: INCBIN "pic/trainer/blaine.pic" SabrinaPic:: INCBIN "pic/trainer/sabrina.pic" GentlemanPic:: INCBIN "pic/trainer/gentleman.pic" -Rival2Pic:: INCBIN "pic/trainer/rival2.pic" -Rival3Pic:: INCBIN "pic/trainer/rival3.pic" +Rival2Pic:: INCBIN "pic/ytrainer/rival2.pic" +Rival3Pic:: INCBIN "pic/ytrainer/rival3.pic" LoreleiPic:: INCBIN "pic/trainer/lorelei.pic" ChannelerPic:: INCBIN "pic/trainer/channeler.pic" AgathaPic:: INCBIN "pic/trainer/agatha.pic" LancePic:: INCBIN "pic/trainer/lance.pic" +JessieJamesPic:: INCBIN "pic/ytrainer/jessiejames.pic" INCLUDE "data/mapHeaders/TradeCenter.asm" INCLUDE "scripts/TradeCenter.asm" @@ -1313,10 +1252,6 @@ INCLUDE "scripts/Colosseum.asm" INCLUDE "data/mapObjects/Colosseum.asm" Colosseum_Blocks: INCBIN "maps/Colosseum.blk" -INCLUDE "engine/give_pokemon.asm" - -INCLUDE "engine/predefs.asm" - SECTION "bank14", ROMX @@ -1386,9 +1321,6 @@ INCLUDE "scripts/PokemonMansionB1F.asm" INCLUDE "data/mapObjects/PokemonMansionB1F.asm" PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk" -INCLUDE "engine/battle/init_battle_variables.asm" -INCLUDE "engine/battle/moveEffects/paralyze_effect.asm" - INCLUDE "engine/overworld/card_key.asm" INCLUDE "engine/menu/prize_menu.asm" @@ -1524,10 +1456,10 @@ Route18_Blocks: INCBIN "maps/Route18.blk" INCBIN "maps/UnusedPokecenterCopy.blk" -INCLUDE "engine/battle/common_text.asm" - INCLUDE "engine/experience.asm" +INCLUDE "engine/status_ailments.asm" + INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/Route6.asm" @@ -1723,6 +1655,8 @@ INCLUDE "scripts/VictoryRoad1F.asm" INCLUDE "data/mapObjects/VictoryRoad1F.asm" VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk" +INCLUDE "engine/evolution.asm" + INCLUDE "engine/predefs17_2.asm" INCLUDE "engine/hidden_object_functions17.asm" @@ -1776,11 +1710,6 @@ INCLUDE "scripts/PokemonTower7F.asm" INCLUDE "data/mapObjects/PokemonTower7F.asm" PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk" -INCLUDE "data/mapHeaders/CeladonMart1F.asm" -INCLUDE "scripts/CeladonMart1F.asm" -INCLUDE "data/mapObjects/CeladonMart1F.asm" -CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk" - INCLUDE "engine/overworld/cinnabar_lab.asm" INCLUDE "data/mapHeaders/ViridianForest.asm" @@ -1854,6 +1783,7 @@ INCLUDE "engine/hidden_object_functions18.asm" SECTION "bank19", ROMX Overworld_GFX: INCBIN "gfx/tilesets/overworld.2bpp" + ds 32 Overworld_Block: INCBIN "gfx/blocksets/overworld.bst" RedsHouse1_GFX: @@ -1876,16 +1806,7 @@ Plateau_Block: INCBIN "gfx/blocksets/plateau.bst" SECTION "bank1A", ROMX -INCLUDE "engine/battle/decrement_pp.asm" - -Version_GFX: -IF DEF(_RED) - INCBIN "gfx/red/redgreenversion.1bpp" ; 10 tiles -ENDC -IF DEF(_BLUE) - INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles -ENDC -Version_GFXEnd: +INCBIN "gfx/blueversion.1bpp" ; unused Dojo_GFX: Gym_GFX: INCBIN "gfx/tilesets/gym.2bpp" @@ -1908,7 +1829,6 @@ Forest_GFX: INCBIN "gfx/tilesets/forest.2bpp" Forest_Block: INCBIN "gfx/blocksets/forest.bst" Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp" Facility_Block: INCBIN "gfx/blocksets/facility.bst" - ds 1 SECTION "bank1B", ROMX @@ -1958,10 +1878,6 @@ FuchsiaPokecenter_Blocks: INCBIN "maps/FuchsiaPokecenter.blk" CeruleanBadgeHouse_Blocks: INCBIN "maps/CeruleanBadgeHouse.blk" -INCLUDE "engine/HoF_room_pc.asm" - -INCLUDE "engine/status_ailments.asm" - INCLUDE "engine/items/itemfinder.asm" INCLUDE "scripts/CeruleanCity_2.asm" @@ -2000,9 +1916,9 @@ INCLUDE "data/mapObjects/WardensHouse.asm" WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk" INCLUDE "data/mapHeaders/SafariZoneGate.asm" -INCLUDE "scripts/SafariZoneGate.asm" INCLUDE "data/mapObjects/SafariZoneGate.asm" SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk" +INCLUDE "scripts/SafariZoneGate.asm" INCLUDE "data/mapHeaders/FuchsiaGym.asm" INCLUDE "scripts/FuchsiaGym.asm" @@ -2018,6 +1934,7 @@ INCLUDE "data/mapHeaders/CinnabarGym.asm" INCLUDE "scripts/CinnabarGym.asm" INCLUDE "data/mapObjects/CinnabarGym.asm" CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk" +INCLUDE "scripts/CinnabarGym_2.asm" INCLUDE "data/mapHeaders/CinnabarLab.asm" INCLUDE "scripts/CinnabarLab.asm" @@ -2073,6 +1990,8 @@ AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk" INCLUDE "engine/menu/league_pc.asm" +INCLUDE "engine/overworld/elevator.asm" + INCLUDE "engine/overworld/hidden_items.asm" @@ -2091,8 +2010,169 @@ RedFishingRodTiles: INCBIN "gfx/red_fishingrod_tiles.2bpp" INCLUDE "data/animations.asm" -INCLUDE "engine/evolution.asm" -INCLUDE "engine/overworld/elevator.asm" +SECTION "bank2f", ROMX + +INCLUDE "engine/bg_map_attributes.asm" + + +SECTION "bank30", ROMX + +; This whole bank is garbage data. +INCBIN "engine/bank30.bin" + + +SECTION "bank39", ROMX + +Pic_e4000: +INCBIN "gfx/pikachu/unknown_e4000.pic" +GFX_e40cc: +INCBIN "gfx/pikachu/unknown_e40cc.2bpp" +Pic_e411c: +INCBIN "gfx/pikachu/unknown_e411c.pic" +GFX_e41d2: +INCBIN "gfx/pikachu/unknown_e41d2.2bpp" +Pic_e4272: +INCBIN "gfx/pikachu/unknown_e4272.pic" +GFX_e4323: +INCBIN "gfx/pikachu/unknown_e4323.2bpp" +Pic_e4383: +INCBIN "gfx/pikachu/unknown_e4383.pic" +GFX_e444b: +INCBIN "gfx/pikachu/unknown_e444b.2bpp" +Pic_e458b: +INCBIN "gfx/pikachu/unknown_e458b.pic" +GFX_e463b: +INCBIN "gfx/pikachu/unknown_e463b.2bpp" +Pic_e467b: +INCBIN "gfx/pikachu/unknown_e467b.pic" +GFX_e472e: +INCBIN "gfx/pikachu/unknown_e472e.2bpp" +Pic_e476e: +INCBIN "gfx/pikachu/unknown_e476e.pic" +GFX_e4841: +INCBIN "gfx/pikachu/unknown_e4841.2bpp" +Pic_e49d1: +INCBIN "gfx/pikachu/unknown_e49d1.pic" +GFX_e4a99: +INCBIN "gfx/pikachu/unknown_e4a99.2bpp" +Pic_e4b39: +INCBIN "gfx/pikachu/unknown_e4b39.pic" +GFX_e4bde: +INCBIN "gfx/pikachu/unknown_e4bde.2bpp" +Pic_e4c3e: +INCBIN "gfx/pikachu/unknown_e4c3e.pic" +GFX_e4ce0: +INCBIN "gfx/pikachu/unknown_e4ce0.2bpp" +GFX_e4e70: +INCBIN "gfx/pikachu/unknown_e4e70.2bpp" +Pic_e5000: +INCBIN "gfx/pikachu/unknown_e5000.pic" +GFX_e50af: +INCBIN "gfx/pikachu/unknown_e50af.2bpp" +Pic_e523f: +INCBIN "gfx/pikachu/unknown_e523f.pic" +GFX_e52fe: +INCBIN "gfx/pikachu/unknown_e52fe.2bpp" +Pic_e548e: +INCBIN "gfx/pikachu/unknown_e548e.pic" +GFX_e5541: +INCBIN "gfx/pikachu/unknown_e5541.2bpp" +Pic_e56d1: +INCBIN "gfx/pikachu/unknown_e56d1.pic" +GFX_e5794: +INCBIN "gfx/pikachu/unknown_e5794.2bpp" +Pic_e5924: +INCBIN "gfx/pikachu/unknown_e5924.pic" +GFX_e59ed: +INCBIN "gfx/pikachu/unknown_e59ed.2bpp" +Pic_e5b7d: +INCBIN "gfx/pikachu/unknown_e5b7d.pic" +GFX_e5c4d: +INCBIN "gfx/pikachu/unknown_e5c4d.2bpp" +Pic_e5ddd: +INCBIN "gfx/pikachu/unknown_e5ddd.pic" +GFX_e5e90: +INCBIN "gfx/pikachu/unknown_e5e90.2bpp" +GFX_e6020: +INCBIN "gfx/pikachu/unknown_e6020.2bpp" +GFX_e61b0: +INCBIN "gfx/pikachu/unknown_e61b0.2bpp" +Pic_e6340: +INCBIN "gfx/pikachu/unknown_e6340.pic" +GFX_e63f7: +INCBIN "gfx/pikachu/unknown_e63f7.2bpp" +Pic_e6587: +INCBIN "gfx/pikachu/unknown_e6587.pic" +GFX_e6646: +INCBIN "gfx/pikachu/unknown_e6646.2bpp" +Pic_e67d6: +INCBIN "gfx/pikachu/unknown_e67d6.pic" +GFX_e682f: +INCBIN "gfx/pikachu/unknown_e682f.2bpp" +GFX_e69bf: +INCBIN "gfx/pikachu/unknown_e69bf.2bpp" +GFX_e6b4f: +INCBIN "gfx/pikachu/unknown_e6b4f.2bpp" +GFX_e6cdf: +INCBIN "gfx/pikachu/unknown_e6cdf.2bpp" +GFX_e6e6f: +INCBIN "gfx/pikachu/unknown_e6e6f.2bpp" +GFX_e6fff: +INCBIN "gfx/pikachu/unknown_e6fff.2bpp" +GFX_e718f: +INCBIN "gfx/pikachu/unknown_e718f.2bpp" +GFX_e731f: +INCBIN "gfx/pikachu/unknown_e731f.2bpp" +GFX_e74af: +INCBIN "gfx/pikachu/unknown_e74af.2bpp" +GFX_e763f: +INCBIN "gfx/pikachu/unknown_e763f.2bpp" +Pic_e77cf: +INCBIN "gfx/pikachu/unknown_e77cf.pic" +GFX_e7863: +INCBIN "gfx/pikachu/unknown_e7863.2bpp" +GFX_e79f3: +INCBIN "gfx/pikachu/unknown_e79f3.2bpp" +GFX_e7b83: +INCBIN "gfx/pikachu/unknown_e7b83.2bpp" +GFX_e7d13: +INCBIN "gfx/pikachu/unknown_e7d13.2bpp" + + +SECTION "bank3A", ROMX + +INCLUDE "text/monster_names.asm" + +INCLUDE "engine/overworld/is_player_just_outside_map.asm" + +INCLUDE "engine/printer.asm" +INCLUDE "engine/diploma_3a.asm" + +SurfingPikachu3Graphics: INCBIN "gfx/surfing_pikachu_3.2bpp" +SurfingPikachu3GraphicsEnd: + +INCLUDE "engine/unknown_ea3ea.asm" + +INCLUDE "engine/overworld/npc_movement_2.asm" + +; bank $3b is empty + +SECTION "bank3C", ROMX + +INCLUDE "engine/bank3c.asm" + + +SECTION "bank3D", ROMX + +INCLUDE "engine/bank3d.asm" + + +SECTION "bank3E", ROMX + +INCLUDE "engine/bank3e.asm" + + +SECTION "bank3F", ROMX -INCLUDE "engine/items/tm_prices.asm" +INCLUDE "engine/bank3f.asm" |