diff options
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 556 |
1 files changed, 87 insertions, 469 deletions
@@ -1,5 +1,6 @@ INCLUDE "includes.asm" + SECTION "bank1", ROMX PlaceWaitingText:: ; 4000 @@ -246,6 +247,7 @@ Predef1: ; 747a ; not used ret + SECTION "bank2", ROMX INCLUDE "engine/player_object.asm" @@ -253,6 +255,7 @@ INCLUDE "engine/sine.asm" INCLUDE "engine/predef.asm" INCLUDE "engine/color.asm" + SECTION "bank3", ROMX CheckTime:: ; c000 @@ -269,10 +272,10 @@ CheckTime:: ; c000 ret TimeOfDayTable: ; c012 - db MORN, 1 << MORN - db DAY, 1 << DAY - db NITE, 1 << NITE - db NITE, 1 << NITE + db MORN_F, MORN + db DAY_F, DAY + db NITE_F, NITE + db NITE_F, NITE db -1 INCLUDE "engine/specials.asm" @@ -380,6 +383,7 @@ KnowsMove: ; f9ea text_jump UnknownText_0x1c5ea8 db "@" + SECTION "bank4", ROMX INCLUDE "engine/pack.asm" @@ -603,6 +607,7 @@ root set 1 root set root+1 endr + SECTION "bank5", ROMX INCLUDE "engine/rtc.asm" @@ -620,25 +625,14 @@ INCLUDE "event/daycare.asm" INCLUDE "event/photo.asm" INCLUDE "engine/breeding/egg.asm" -SECTION "Tileset Data 1", ROMX -INCLUDE "tilesets/data_1.asm" +INCLUDE "tilesets/data.asm" -SECTION "Roofs", ROMX -INCLUDE "tilesets/roofs.asm" - -SECTION "Tileset Data 2", ROMX - -INCLUDE "tilesets/data_2.asm" - -SECTION "bank8", ROMX +SECTION "Clock Reset", ROMX INCLUDE "engine/clock_reset.asm" -SECTION "Tileset Data 3", ROMX - -INCLUDE "tilesets/data_3.asm" SECTION "bank9", ROMX @@ -1159,6 +1153,7 @@ Kurt_SelectQuantity_InterpretJoypad: ; 27a28 ld b, a ret + SECTION "bankA", ROMX INCLUDE "engine/link.asm" @@ -1183,6 +1178,7 @@ INCBIN "gfx/player/chris_back.2bpp.lz" DudeBackpic: ; 2bbaa INCBIN "gfx/battle/dude.2bpp.lz" + SECTION "bankB", ROMX INCLUDE "battle/trainer_huds.asm" @@ -1442,7 +1438,7 @@ PlayBattleMusic: ; 2ee6c ld de, MUSIC_JOHTO_WILD_BATTLE ld a, [TimeOfDay] - cp NITE + cp NITE_F jr nz, .done ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT jr .done @@ -1618,334 +1614,45 @@ PlaceGraphic: ; 2ef6e jr nz, .x2 ret -SECTION "Tileset Data 4", ROMX - -INCLUDE "tilesets/data_4.asm" SECTION "Effect Commands", ROMX INCLUDE "battle/effect_commands.asm" + SECTION "Enemy Trainers", ROMX INCLUDE "battle/ai/items.asm" - -AIScoring: ; 38591 INCLUDE "battle/ai/scoring.asm" - -GetTrainerClassName: ; 3952d - ld hl, RivalName - ld a, c - cp RIVAL1 - jr z, .rival - - ld [CurSpecies], a - ld a, TRAINER_NAME - ld [wNamedObjectTypeBuffer], a - call GetName - ld de, StringBuffer1 - ret - -.rival - ld de, StringBuffer1 - push de - ld bc, NAME_LENGTH - call CopyBytes - pop de - ret - -GetOTName: ; 39550 - ld hl, OTPlayerName - ld a, [wLinkMode] - and a - jr nz, .ok - - ld hl, RivalName - ld a, c - cp RIVAL1 - jr z, .ok - - ld [CurSpecies], a - ld a, TRAINER_NAME - ld [wNamedObjectTypeBuffer], a - call GetName - ld hl, StringBuffer1 - -.ok - ld bc, TRAINER_CLASS_NAME_LENGTH - ld de, OTClassName - push de - call CopyBytes - pop de - ret - -GetTrainerAttributes: ; 3957b - ld a, [TrainerClass] - ld c, a - call GetOTName - ld a, [TrainerClass] - dec a - ld hl, TrainerClassAttributes + TRNATTR_ITEM1 - ld bc, NUM_TRAINER_ATTRIBUTES - call AddNTimes - ld de, wEnemyTrainerItem1 - ld a, [hli] - ld [de], a - inc de - ld a, [hli] - ld [de], a - ld a, [hl] - ld [wEnemyTrainerBaseReward], a - ret - +INCLUDE "trainers/read_attributes.asm" INCLUDE "trainers/attributes.asm" - INCLUDE "trainers/read_party.asm" - INCLUDE "trainers/trainer_pointers.asm" - INCLUDE "trainers/trainers.asm" + SECTION "Battle Core", ROMX INCLUDE "battle/core.asm" - INCLUDE "battle/effect_command_pointers.asm" + SECTION "bank10", ROMX INCLUDE "engine/pokedex.asm" - INCLUDE "battle/moves/moves.asm" - INCLUDE "engine/evolve.asm" + SECTION "bank11", ROMX INCLUDE "engine/fruit_trees.asm" - INCLUDE "battle/ai/move.asm" - -AnimateDexSearchSlowpoke: ; 441cf - ld hl, .FrameIDs - ld b, 25 -.loop - ld a, [hli] - - ; Wrap around - cp $fe - jr nz, .ok - ld hl, .FrameIDs - ld a, [hli] -.ok - - ld [wDexSearchSlowpokeFrame], a - ld a, [hli] - ld c, a - push bc - push hl - call DoDexSearchSlowpokeFrame - pop hl - pop bc - call DelayFrames - dec b - jr nz, .loop - xor a - ld [wDexSearchSlowpokeFrame], a - call DoDexSearchSlowpokeFrame - ld c, 32 - call DelayFrames - ret - -.FrameIDs: ; 441fc - ; frame ID, duration - db 0, 7 - db 1, 7 - db 2, 7 - db 3, 7 - db 4, 7 - db -2 - -DoDexSearchSlowpokeFrame: ; 44207 - ld a, [wDexSearchSlowpokeFrame] - ld hl, .SpriteData - ld de, Sprites -.loop - ld a, [hli] - cp -1 - ret z - ld [de], a - inc de - ld a, [hli] - ld [de], a - inc de - ld a, [wDexSearchSlowpokeFrame] - ld b, a - add a - add b - add [hl] - inc hl - ld [de], a - inc de - ld a, [hli] - ld [de], a - inc de - jr .loop - -.SpriteData: ; 44228 - dsprite 11, 0, 9, 0, $00, $00 - dsprite 11, 0, 10, 0, $01, $00 - dsprite 11, 0, 11, 0, $02, $00 - dsprite 12, 0, 9, 0, $10, $00 - dsprite 12, 0, 10, 0, $11, $00 - dsprite 12, 0, 11, 0, $12, $00 - dsprite 13, 0, 9, 0, $20, $00 - dsprite 13, 0, 10, 0, $21, $00 - dsprite 13, 0, 11, 0, $22, $00 - db -1 - -DisplayDexEntry: ; 4424d - call GetPokemonName - hlcoord 9, 3 - call PlaceString ; mon species - ld a, [wd265] - ld b, a - call GetDexEntryPointer - ld a, b - push af - hlcoord 9, 5 - call FarString ; dex species - ld h, b - ld l, c - push de -; Print dex number - hlcoord 2, 8 - ld a, $5c ; No - ld [hli], a - ld a, $5d ; . - ld [hli], a - ld de, wd265 - lb bc, PRINTNUM_LEADINGZEROS | 1, 3 - call PrintNum -; Check to see if we caught it. Get out of here if we haven't. - ld a, [wd265] - dec a - call CheckCaughtMon - pop hl - pop bc - ret z -; Get the height of the Pokemon. - ld a, [CurPartySpecies] - ld [CurSpecies], a - inc hl - ld a, b - push af - push hl - call GetFarHalfword - ld d, l - ld e, h - pop hl - inc hl - inc hl - ld a, d - or e - jr z, .skip_height - push hl - push de - ld hl, sp+$0 - ld d, h - ld e, l - hlcoord 12, 7 - lb bc, 2, PRINTNUM_MONEY | 4 - call PrintNum - hlcoord 14, 7 - ld [hl], $5e ; ft symbol - pop af - pop hl - -.skip_height - pop af - push af - inc hl - push hl - dec hl - call GetFarHalfword - ld d, l - ld e, h - ld a, e - or d - jr z, .skip_weight - push de - ld hl, sp+$0 - ld d, h - ld e, l - hlcoord 11, 9 - lb bc, 2, PRINTNUM_RIGHTALIGN | 5 - call PrintNum - pop de - -.skip_weight -; Page 1 - lb bc, 5, SCREEN_WIDTH - 2 - hlcoord 2, 11 - call ClearBox - hlcoord 1, 10 - ld bc, SCREEN_WIDTH - 1 - ld a, $61 ; horizontal divider - call ByteFill - ; page number - hlcoord 1, 9 - ld [hl], $55 - inc hl - ld [hl], $55 - hlcoord 1, 10 - ld [hl], $56 ; P. - inc hl - ld [hl], $57 ; 1 - pop de - inc de - pop af - hlcoord 2, 11 - push af - call FarString - pop bc - ld a, [wPokedexStatus] - or a - ret z - -; Page 2 - push bc - push de - lb bc, 5, SCREEN_WIDTH - 2 - hlcoord 2, 11 - call ClearBox - hlcoord 1, 10 - ld bc, SCREEN_WIDTH - 1 - ld a, $61 - call ByteFill - ; page number - hlcoord 1, 9 - ld [hl], $55 - inc hl - ld [hl], $55 - hlcoord 1, 10 - ld [hl], $56 ; P. - inc hl - ld [hl], $58 ; 2 - pop de - inc de - pop af - hlcoord 2, 11 - call FarString - ret - -String_44331: ; 44331 - db "#@" - +INCLUDE "engine/pokedex_2.asm" INCLUDE "data/pokedex/entry_pointers.asm" - INCLUDE "engine/mail.asm" + SECTION "Crystal Unique", ROMX INCLUDE "engine/init_gender.asm" @@ -2153,6 +1860,7 @@ Buena_ExitMenu: ; 4ae5e ld [hOAMUpdate], a ret + SECTION "bank13", ROMX SwapTextboxPalettes:: ; 4c000 @@ -2244,7 +1952,6 @@ ScrollBGMapPalettes:: ; 4c03f INCLUDE "tilesets/palette_maps.asm" -TileCollisionTable:: ; 4ce1f INCLUDE "tilesets/collision.asm" EmptyAllSRAMBanks: ; 4cf1f @@ -2366,7 +2073,7 @@ CheckSave:: ; 4cffe ld c, $0 ret -INCLUDE "engine/map_triggers.asm" +INCLUDE "data/map_triggers.asm" _LoadMapPart:: ; 4d15b ld hl, wMisc @@ -2586,7 +2293,6 @@ LinkTextbox2: ; 4d35b INCLUDE "engine/delete_save_change_clock.asm" -Tilesets:: INCLUDE "tilesets/tileset_headers.asm" FlagPredef: ; 4d7c1 @@ -3134,17 +2840,17 @@ SetBoxmonOrEggmonCaughtData: ; 4db53 ld a, [MapNumber] ld c, a cp MAP_POKECENTER_2F - jr nz, .NotPokeCenter2F + jr nz, .NotPokecenter2F ld a, b cp GROUP_POKECENTER_2F - jr nz, .NotPokeCenter2F + jr nz, .NotPokecenter2F ld a, [BackupMapGroup] ld b, a ld a, [BackupMapNumber] ld c, a -.NotPokeCenter2F: +.NotPokecenter2F: call GetWorldMapLocation ld b, a ld a, [PlayerGender] @@ -3201,6 +2907,7 @@ SetEggMonCaughtData: ; 4dbb8 (13:5bb8) ret INCLUDE "engine/search2.asm" + INCLUDE "engine/stats_screen.asm" CatchTutorial:: ; 4e554 @@ -3412,46 +3119,7 @@ GetMobileOTTrainerClass: ; mobile function ld a, [hl] ret -MaleTrainers: ; 4e95d - db BURGLAR - db YOUNGSTER - db SCHOOLBOY - db BIRD_KEEPER - db POKEMANIAC - db GENTLEMAN - db BUG_CATCHER - db FISHER - db SWIMMERM - db SAILOR - db SUPER_NERD - db GUITARIST - db HIKER - db FIREBREATHER - db BLACKBELT_T - db PSYCHIC_T - db CAMPER - db COOLTRAINERM - db BOARDER - db JUGGLER - db POKEFANM - db OFFICER - db SAGE - db BIKER - db SCIENTIST -MaleTrainersEnd: - -FemaleTrainers: ; 4e976 - db MEDIUM - db LASS - db BEAUTY - db SKIER - db TEACHER - db SWIMMERF - db PICNICKER - db KIMONO_GIRL - db POKEFANF - db COOLTRAINERF -FemaleTrainersEnd: +INCLUDE "trainers/gendered_trainers.asm" INCLUDE "battle/sliding_intro.asm" @@ -3538,6 +3206,7 @@ INCLUDE "misc/gbc_only.asm" INCLUDE "event/poke_seer.asm" + SECTION "bank14", ROMX INCLUDE "engine/party_menu.asm" @@ -3972,8 +3641,8 @@ GetGender: ; 50bdd push bc ld a, [CurPartySpecies] dec a - ld hl, BaseData + BaseGender - CurBaseData - ld bc, BaseData1 - BaseData + ld hl, BaseData + BASE_GENDER + ld bc, BASE_DATA_SIZE call AddNTimes pop bc @@ -4474,25 +4143,7 @@ CalcExpAtLevel: ; 50e47 ld [hMultiplier], a jp Multiply -GrowthRates: ; 50efa - -growth_rate: MACRO -; [1]/[2]*n**3 + [3]*n**2 + [4]*n - [5] - dn \1, \2 - if \3 & $80 ; signed - db -\3 | $80 - else - db \3 - endc - db \4, \5 -ENDM - - growth_rate 1, 1, 0, 0, 0 ; Medium Fast - growth_rate 3, 4, 10, 0, 30 ; Slightly Fast - growth_rate 3, 4, 20, 0, 70 ; Slightly Slow - growth_rate 6, 5, -15, 100, 140 ; Medium Slow - growth_rate 4, 5, 0, 0, 0 ; Fast - growth_rate 5, 4, 0, 0, 0 ; Slow +INCLUDE "data/growth_rates.asm" _SwitchPartyMons: ld a, [wd0e3] @@ -4641,11 +4292,11 @@ _SwitchPartyMons: ret INCLUDE "gfx/load_pics.asm" + INCLUDE "engine/move_mon_wo_mail.asm" -BaseData:: + INCLUDE "data/base_stats.asm" -PokemonNames:: INCLUDE "data/pokemon_names.asm" Unknown_53d84: ; unreferenced @@ -4664,33 +4315,30 @@ Unknown_53d84: ; unreferenced UnknownEggPic:: ; 53d9c ; Another egg pic. This is shifted up a few pixels. -INCBIN "gfx/misc/unknown_egg.2bpp.lz" +INCBIN "gfx/unknown/unknown_egg.2bpp.lz" -SECTION "bank19", ROMX + +SECTION "Crystal Phone Text", ROMX INCLUDE "text/phone/extra.asm" + SECTION "bank20", ROMX INCLUDE "engine/player_movement.asm" - INCLUDE "engine/engine_flags.asm" - INCLUDE "engine/variables.asm" - -BattleText:: INCLUDE "text/battle.asm" - INCLUDE "engine/debug.asm" + SECTION "bank21", ROMX INCLUDE "engine/printer.asm" - INCLUDE "battle/anim_gfx.asm" - INCLUDE "event/halloffame.asm" + SECTION "bank22", ROMX INCLUDE "event/kurt.asm" @@ -4969,6 +4617,7 @@ INCLUDE "event/dratini.asm" INCLUDE "event/battle_tower.asm" INCLUDE "misc/mobile_22_2.asm" + SECTION "bank23", ROMX Predef35: ; 8c000 @@ -4995,23 +4644,24 @@ BattleStart_LoadEDTile: ; 8cf4f ret INCLUDE "engine/sprites.asm" - INCLUDE "engine/mon_icons.asm" + SECTION "bank24", ROMX INCLUDE "engine/phone.asm" INCLUDE "engine/timeset.asm" INCLUDE "engine/pokegear.asm" - INCLUDE "engine/fish.asm" INCLUDE "engine/slot_machine.asm" + SECTION "Phone Engine", ROMX INCLUDE "engine/more_phone_scripts.asm" INCLUDE "engine/buena_phone_scripts.asm" + SECTION "Phone Text", ROMX INCLUDE "text/phone/anthony_overworld.asm" @@ -5032,22 +4682,17 @@ INCLUDE "text/phone/kenji_overworld.asm" INCLUDE "text/phone/parry_overworld.asm" INCLUDE "text/phone/erin_overworld.asm" -SECTION "Tileset Data 5", ROMX - -INCLUDE "tilesets/data_5.asm" SECTION "bank2E", ROMX INCLUDE "engine/events_3.asm" - INCLUDE "engine/radio.asm" - INCLUDE "gfx/mail.asm" + SECTION "bank2F", ROMX INCLUDE "engine/std_scripts.asm" - INCLUDE "engine/phone_scripts.asm" TalkToTrainerScript:: ; 0xbe66a @@ -5082,18 +4727,12 @@ StartBattleWithMapTrainerScript: ; 0xbe68a AlreadyBeatenTrainerScript: scripttalkafter -SECTION "bank30", ROMX +INCLUDE "gfx/sprites.asm" -INCLUDE "gfx/overworld/sprites_1.asm" - -SECTION "bank31", ROMX - -INCLUDE "gfx/overworld/sprites_2.asm" SECTION "bank32", ROMX INCLUDE "battle/bg_effects.asm" - INCLUDE "battle/anims.asm" LoadPoisonBGPals: ; cbcdd @@ -5148,10 +4787,10 @@ LoadPoisonBGPals: ; cbcdd TheEndGFX:: ; cbd2e INCBIN "gfx/credits/theend.2bpp" + SECTION "bank33", ROMX DisplayCaughtContestMonStats: ; cc000 - call ClearBGPalettes call ClearTileMap call ClearSprites @@ -5260,57 +4899,37 @@ Predef39: ; cc0d5 ret INCLUDE "battle/anim_commands.asm" - INCLUDE "battle/anim_objects.asm" + SECTION "Pic Animations 1", ROMX INCLUDE "gfx/pics/animation.asm" - -; Pic animations are assembled in 3 parts: - -; Top-level animations: -; frame #, duration: Frame 0 is the original pic (no change) -; setrepeat #: Sets the number of times to repeat -; dorepeat #: Repeats from command # (starting from 0) -; end - -; Bitmasks: -; Layered over the pic to designate affected tiles - -; Frame definitions: -; first byte is the bitmask used for this frame -; following bytes are tile ids mapped to each bit in the mask - -; Main animations (played everywhere) INCLUDE "gfx/pics/anim_pointers.asm" INCLUDE "gfx/pics/anims.asm" - -; Extra animations, appended to the main animation -; Used in the status screen (blinking, tail wags etc.) INCLUDE "gfx/pics/extra_pointers.asm" INCLUDE "gfx/pics/extras.asm" - -; Unown has its own animation data despite having an entry in the main tables INCLUDE "gfx/pics/unown_anim_pointers.asm" INCLUDE "gfx/pics/unown_anims.asm" INCLUDE "gfx/pics/unown_extra_pointers.asm" INCLUDE "gfx/pics/unown_extras.asm" - -; Bitmasks INCLUDE "gfx/pics/bitmask_pointers.asm" INCLUDE "gfx/pics/bitmasks.asm" INCLUDE "gfx/pics/unown_bitmask_pointers.asm" INCLUDE "gfx/pics/unown_bitmasks.asm" + SECTION "Pic Animations 2", ROMX INCLUDE "gfx/pics/frame_pointers.asm" INCLUDE "gfx/pics/kanto_frames.asm" -SECTION "bank36", ROMX -FontInversed: INCBIN "gfx/font/font_inversed.1bpp" +SECTION "Font Inversed", ROMX + +FontInversed: +INCBIN "gfx/font/font_inversed.1bpp" + SECTION "Pic Animations 3", ROMX @@ -5318,9 +4937,6 @@ INCLUDE "gfx/pics/johto_frames.asm" INCLUDE "gfx/pics/unown_frame_pointers.asm" INCLUDE "gfx/pics/unown_frames.asm" -SECTION "Tileset Data 6", ROMX - -INCLUDE "tilesets/data_6.asm" SECTION "bank38", ROMX @@ -5449,6 +5065,7 @@ INCLUDE "engine/unown_puzzle.asm" INCLUDE "engine/dummy_game.asm" INCLUDE "engine/billspc.asm" + SECTION "bank39", ROMX CopyrightGFX:: ; e4000 @@ -5457,39 +5074,36 @@ INCBIN "gfx/splash/copyright.2bpp" INCLUDE "engine/options_menu.asm" INCLUDE "engine/crystal_intro.asm" + SECTION "bank3E", ROMX INCLUDE "gfx/font.asm" INCLUDE "engine/time_capsule/conversion.asm" INCLUDE "engine/unowndex.asm" INCLUDE "event/magikarp.asm" - INCLUDE "battle/hidden_power.asm" - INCLUDE "battle/misc.asm" + SECTION "bank3F", ROMX INCLUDE "tilesets/animations.asm" - INCLUDE "engine/npctrade.asm" - INCLUDE "event/mom_phone.asm" -SECTION "bank40", ROMX + +SECTION "mobile_40", ROMX INCLUDE "misc/mobile_40.asm" + SECTION "bank41", ROMX INCLUDE "misc/gfx_41.asm" INCLUDE "engine/warp_connection.asm" - INCLUDE "engine/mysterygift.asm" - INCLUDE "battle/used_move_text.asm" - INCLUDE "misc/mobile_41.asm" LoadOverworldFont:: ; 106594 @@ -5509,40 +5123,46 @@ INCBIN "gfx/font/overworld.2bpp" .space INCBIN "gfx/font/space.2bpp" -SECTION "bank42", ROMX + +SECTION "mobile_42", ROMX INCLUDE "misc/mobile_42.asm" + SECTION "Intro Logo", ROMX IntroLogoGFX: ; 109407 INCBIN "gfx/intro/logo.2bpp.lz" + SECTION "bank43", ROMX INCLUDE "misc/unused_title.asm" - INCLUDE "engine/title.asm" - INCLUDE "misc/mobile_45.asm" INCLUDE "misc/mobile_46.asm" -SECTION "bank47", ROMX + +SECTION "battle_tower_47", ROMX INCLUDE "misc/battle_tower_47.asm" + SECTION "bank5B", ROMX INCLUDE "misc/mobile_5b.asm" INCLUDE "engine/link_trade.asm" -SECTION "bank5C", ROMX + +SECTION "mobile_5c", ROMX INCLUDE "misc/mobile_5c.asm" -SECTION "bank5D", ROMX -INCLUDE "text/phone/extra3.asm" +SECTION "Crystal Phone Text 2", ROMX + +INCLUDE "text/phone/extra2.asm" + SECTION "bank5E", ROMX @@ -5558,6 +5178,7 @@ _UpdateBattleHUDs: INCLUDE "misc/mobile_5f.asm" + SECTION "Common Text 1", ROMX INCLUDE "text/stdtext.asm" @@ -5573,25 +5194,23 @@ INCLUDE "text/phone/wade_overworld.asm" INCLUDE "text/phone/ralph_overworld.asm" INCLUDE "text/phone/liz_overworld.asm" -SECTION "bank6D", ROMX + +SECTION "Special Phone Text", ROMX INCLUDE "text/phone/mom.asm" INCLUDE "text/phone/bill.asm" INCLUDE "text/phone/elm.asm" INCLUDE "text/phone/trainers1.asm" + SECTION "bank72", ROMX -ItemNames:: INCLUDE "items/item_names.asm" - INCLUDE "items/item_descriptions.asm" - -MoveNames:: INCLUDE "battle/move_names.asm" - INCLUDE "engine/landmarks.asm" + SECTION "bank77", ROMX UnownFont: ; 1dc000 @@ -5605,9 +5224,6 @@ INCBIN "gfx/mobile/hp.1bpp" MobileLvIcon: ; 1dc599 INCBIN "gfx/mobile/lv.1bpp" -SECTION "Tileset Data 7", ROMX - -INCLUDE "tilesets/data_7.asm" SECTION "bank77_2", ROMX @@ -6040,18 +5656,17 @@ LeggiPostaInglese: jr nz, .loop ret -SECTION "Tileset Data 8", ROMX -INCLUDE "tilesets/data_8.asm" - -SECTION "bank7B", ROMX +SECTION "Battle Tower Text", ROMX INCLUDE "text/battle_tower.asm" -SECTION "bank7C", ROMX + +SECTION "Battle Tower Trainer Data", ROMX INCLUDE "data/battle_tower_2.asm" + SECTION "bank7D", ROMX db $cc, $6b, $1e ; XXX @@ -6097,13 +5712,16 @@ Function1f5d9f: ; 1f5d9f .unknown_data INCBIN "unknown/1f5db4.bin" + SECTION "bank7E", ROMX -INCLUDE "data/battle_tower.asm" -INCLUDE "data/odd_eggs.asm" +INCLUDE "engine/battle_tower.asm" +INCLUDE "engine/odd_eggs.asm" + SECTION "bank7F", ROMX + SECTION "stadium2", ROMX IF DEF(CRYSTAL11) |