From 24f0e7d04501ddb000dfc1d06e716efca387bce8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 12:50:32 -0500 Subject: Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers --- main.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index cb57726da..6fd426e8a 100644 --- a/main.asm +++ b/main.asm @@ -232,7 +232,7 @@ INCBIN "gfx/shrink/shrink2.2bpp.lz" INCLUDE "engine/link_2.asm" INCLUDE "engine/delete_save_change_clock.asm" -INCLUDE "tilesets/tileset_headers.asm" +INCLUDE "tilesets/tilesets.asm" INCLUDE "engine/routines/flagpredef.asm" INCLUDE "engine/routines/trademonfrontpic.asm" INCLUDE "engine/pokerus/check_pokerus.asm" -- cgit v1.2.3 From 4d18bb2eda4c1886a6aafa9c49ed285ca9245b91 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 12:55:02 -0500 Subject: =?UTF-8?q?Rename:=20gfx/pics=20=E2=86=92=20gfx/pokemon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.asm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 6fd426e8a..8aa861f26 100644 --- a/main.asm +++ b/main.asm @@ -406,25 +406,25 @@ INCLUDE "battle/anim_objects.asm" SECTION "Pic Animations 1", ROMX -INCLUDE "gfx/pics/animation.asm" -INCLUDE "gfx/pics/anim_pointers.asm" -INCLUDE "gfx/pics/anims.asm" -INCLUDE "gfx/pics/extra_pointers.asm" -INCLUDE "gfx/pics/extras.asm" -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" -INCLUDE "gfx/pics/bitmask_pointers.asm" -INCLUDE "gfx/pics/bitmasks.asm" -INCLUDE "gfx/pics/unown_bitmask_pointers.asm" -INCLUDE "gfx/pics/unown_bitmasks.asm" +INCLUDE "gfx/pokemon/animation.asm" +INCLUDE "gfx/pokemon/anim_pointers.asm" +INCLUDE "gfx/pokemon/anims.asm" +INCLUDE "gfx/pokemon/extra_pointers.asm" +INCLUDE "gfx/pokemon/extras.asm" +INCLUDE "gfx/pokemon/unown_anim_pointers.asm" +INCLUDE "gfx/pokemon/unown_anims.asm" +INCLUDE "gfx/pokemon/unown_extra_pointers.asm" +INCLUDE "gfx/pokemon/unown_extras.asm" +INCLUDE "gfx/pokemon/bitmask_pointers.asm" +INCLUDE "gfx/pokemon/bitmasks.asm" +INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm" +INCLUDE "gfx/pokemon/unown_bitmasks.asm" SECTION "Pic Animations 2", ROMX -INCLUDE "gfx/pics/frame_pointers.asm" -INCLUDE "gfx/pics/kanto_frames.asm" +INCLUDE "gfx/pokemon/frame_pointers.asm" +INCLUDE "gfx/pokemon/kanto_frames.asm" SECTION "Font Inversed", ROMX @@ -435,9 +435,9 @@ INCBIN "gfx/font/font_inversed.1bpp" SECTION "Pic Animations 3", ROMX -INCLUDE "gfx/pics/johto_frames.asm" -INCLUDE "gfx/pics/unown_frame_pointers.asm" -INCLUDE "gfx/pics/unown_frames.asm" +INCLUDE "gfx/pokemon/johto_frames.asm" +INCLUDE "gfx/pokemon/unown_frame_pointers.asm" +INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "bank38", ROMX -- cgit v1.2.3 From b5417fafec7dd37cb4be391f3bd3d4541a2a381e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 17:47:05 -0500 Subject: Split battle/ into data/ and engine/ components --- main.asm | 70 +++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 32 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 8aa861f26..b64b37da7 100644 --- a/main.asm +++ b/main.asm @@ -34,7 +34,7 @@ INCLUDE "engine/health.asm" INCLUDE "event/overworld.asm" INCLUDE "engine/items.asm" INCLUDE "engine/player_step.asm" -INCLUDE "engine/anim_hp_bar.asm" +INCLUDE "engine/battle/anim_hp_bar.asm" INCLUDE "engine/move_mon.asm" INCLUDE "engine/billspctop.asm" INCLUDE "engine/routines/getbreedmonlevelgrowth.asm" @@ -111,7 +111,7 @@ INCLUDE "engine/scrolling_menu.asm" INCLUDE "engine/switch_items.asm" INCLUDE "engine/menu_2.asm" INCLUDE "engine/mon_menu.asm" -INCLUDE "battle/menu.asm" +INCLUDE "engine/battle/menu.asm" INCLUDE "engine/buy_sell_toss.asm" INCLUDE "engine/trainer_card.asm" INCLUDE "engine/prof_oaks_pc.asm" @@ -120,8 +120,8 @@ INCLUDE "engine/routines/leveluphappinessmod.asm" INCLUDE "data/trainers/trainer_dvs.asm" INCLUDE "engine/routines/returntobattle_useball.asm" INCLUDE "engine/routines/consumehelditem.asm" -INCLUDE "battle/moves/move_effects_pointers.asm" -INCLUDE "battle/moves/move_effects.asm" +INCLUDE "data/moves/move_effects_pointers.asm" +INCLUDE "data/moves/move_effects.asm" INCLUDE "engine/routines/kurt_selectquantity_interpretjoypad.asm" @@ -129,7 +129,7 @@ SECTION "bankA", ROMX INCLUDE "engine/link.asm" INCLUDE "engine/wildmons.asm" -INCLUDE "battle/link_result.asm" +INCLUDE "engine/battle/link_result.asm" ChrisBackpic: ; 2ba1a INCBIN "gfx/player/chris_back.2bpp.lz" @@ -140,51 +140,51 @@ INCBIN "gfx/battle/dude.2bpp.lz" SECTION "bankB", ROMX -INCLUDE "battle/trainer_huds.asm" +INCLUDE "engine/battle/trainer_huds.asm" INCLUDE "data/trainers/trainer_class_names.asm" -INCLUDE "battle/ai/redundant.asm" +INCLUDE "engine/battle/ai/redundant.asm" INCLUDE "event/move_deleter.asm" INCLUDE "engine/mystery_gift_2.asm" INCLUDE "engine/tmhm2.asm" -INCLUDE "battle/moves/move_descriptions.asm" +INCLUDE "data/moves/move_descriptions.asm" INCLUDE "engine/pokerus/pokerus.asm" -INCLUDE "engine/start_battle.asm" +INCLUDE "engine/battle/start_battle.asm" INCLUDE "engine/routines/placegraphic.asm" SECTION "Effect Commands", ROMX -INCLUDE "battle/effect_commands.asm" +INCLUDE "engine/battle/effect_commands.asm" SECTION "Enemy Trainers", ROMX -INCLUDE "battle/ai/items.asm" -INCLUDE "battle/ai/scoring.asm" -INCLUDE "engine/read_trainer_attributes.asm" +INCLUDE "engine/battle/ai/items.asm" +INCLUDE "engine/battle/ai/scoring.asm" +INCLUDE "engine/battle/read_trainer_attributes.asm" INCLUDE "data/trainers/trainer_attributes.asm" -INCLUDE "engine/read_trainer_party.asm" +INCLUDE "engine/battle/read_trainer_party.asm" INCLUDE "data/trainers/party_pointers.asm" INCLUDE "data/trainers/parties.asm" SECTION "Battle Core", ROMX -INCLUDE "battle/core.asm" -INCLUDE "battle/effect_command_pointers.asm" +INCLUDE "engine/battle/core.asm" +INCLUDE "data/moves/effect_command_pointers.asm" SECTION "bank10", ROMX INCLUDE "engine/pokedex.asm" -INCLUDE "battle/moves/moves.asm" +INCLUDE "data/moves/moves.asm" INCLUDE "engine/evolve.asm" SECTION "bank11", ROMX INCLUDE "engine/fruit_trees.asm" -INCLUDE "battle/ai/move.asm" +INCLUDE "engine/battle/ai/move.asm" INCLUDE "engine/pokedex_2.asm" INCLUDE "data/pokemon/dex_entry_pointers.asm" INCLUDE "engine/mail.asm" @@ -244,7 +244,7 @@ INCLUDE "event/catch_tutorial.asm" INCLUDE "engine/evolution_animation.asm" INCLUDE "engine/init_hof_credits.asm" INCLUDE "mobile/get_trainer_class.asm" -INCLUDE "battle/sliding_intro.asm" +INCLUDE "engine/battle/sliding_intro.asm" INCLUDE "mobile/print_opp_message.asm" INCLUDE "engine/routines/checkbattlescene.asm" INCLUDE "engine/gbc_only.asm" @@ -261,7 +261,7 @@ INCLUDE "event/card_key.asm" INCLUDE "event/basement_key.asm" INCLUDE "event/sacred_ash.asm" INCLUDE "engine/tempmon.asm" -INCLUDE "text/types.asm" +INCLUDE "engine/types.asm" INCLUDE "text/unused_gen_1_trainers.asm" INCLUDE "engine/mon_stats.asm" INCLUDE "engine/routines/initlist.asm" @@ -308,7 +308,7 @@ INCLUDE "engine/debug.asm" SECTION "bank21", ROMX INCLUDE "engine/printer.asm" -INCLUDE "battle/anim_gfx.asm" +INCLUDE "gfx/anims.asm" INCLUDE "event/halloffame.asm" @@ -327,7 +327,7 @@ INCLUDE "mobile/mobile_22_2.asm" SECTION "bank23", ROMX INCLUDE "engine/timeofdaypals.asm" -INCLUDE "engine/battle_transition.asm" +INCLUDE "engine/battle/battle_transition.asm" INCLUDE "event/field_moves.asm" INCLUDE "event/magnet_train.asm" INCLUDE "engine/routines/battlestart_copytilemapatonce.asm" @@ -384,24 +384,30 @@ SECTION "bank2F", ROMX INCLUDE "engine/std_scripts.asm" INCLUDE "engine/phone/phone_scripts.asm" INCLUDE "engine/phone/generic_calls.asm" -INCLUDE "engine/trainer_scripts.asm" +INCLUDE "engine/battle/trainer_scripts.asm" SECTION "bank32", ROMX -INCLUDE "battle/bg_effects.asm" -INCLUDE "battle/anims.asm" +INCLUDE "engine/anims/bg_effects.asm" +INCLUDE "data/moves/move_anims.asm" INCLUDE "event/poisonstep_pals.asm" TheEndGFX:: ; cbd2e INCBIN "gfx/credits/theend.2bpp" -SECTION "bank33", ROMX +SECTION "Move Animations", ROMX INCLUDE "event/bug_contest/display_stats.asm" -INCLUDE "battle/anim_commands.asm" -INCLUDE "battle/anim_objects.asm" +INCLUDE "engine/anims/anim_commands.asm" +INCLUDE "engine/anims/engine.asm" +INCLUDE "data/anims/objects.asm" +INCLUDE "engine/anims/functions.asm" +INCLUDE "engine/anims/helpers.asm" +INCLUDE "data/anims/framesets.asm" +INCLUDE "data/anims/oam.asm" +INCLUDE "data/anims/object_gfx.asm" SECTION "Pic Animations 1", ROMX @@ -477,8 +483,8 @@ INCLUDE "engine/routines/newpokedexentry.asm" INCLUDE "engine/time_capsule_2.asm" INCLUDE "engine/unown_dex.asm" INCLUDE "event/magikarp.asm" -INCLUDE "battle/hidden_power.asm" -INCLUDE "battle/misc.asm" +INCLUDE "engine/battle/hidden_power.asm" +INCLUDE "engine/battle/misc.asm" SECTION "bank3F", ROMX @@ -497,7 +503,7 @@ INCLUDE "engine/dma_transfer.asm" INCLUDE "gfx/emotes.asm" INCLUDE "engine/warp_connection.asm" INCLUDE "engine/mystery_gift.asm" -INCLUDE "battle/used_move_text.asm" +INCLUDE "engine/battle/used_move_text.asm" INCLUDE "mobile/mobile_41.asm" INCLUDE "gfx/overworld_font.asm" @@ -589,7 +595,7 @@ SECTION "bank72", ROMX INCLUDE "data/items/item_names.asm" INCLUDE "data/items/item_descriptions.asm" -INCLUDE "battle/move_names.asm" +INCLUDE "data/moves/move_names.asm" INCLUDE "engine/landmarks.asm" -- cgit v1.2.3 From 35a3a19fda87d95e829aa99bf1b6cf18a839c1a6 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 18:45:04 -0500 Subject: Use "battle_anims" and "sprite_anims" for clarity, not just "anims" --- main.asm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index b64b37da7..56ff32931 100644 --- a/main.asm +++ b/main.asm @@ -40,7 +40,7 @@ INCLUDE "engine/billspctop.asm" INCLUDE "engine/routines/getbreedmonlevelgrowth.asm" INCLUDE "event/bug_contest/caught_mon.asm" INCLUDE "engine/item_effects.asm" -INCLUDE "engine/routines/getpokeballwobble.asm" +INCLUDE "engine/battle_anims/getpokeballwobble.asm" INCLUDE "engine/routines/knowsmove.asm" @@ -118,11 +118,11 @@ INCLUDE "engine/prof_oaks_pc.asm" INCLUDE "engine/decorations.asm" INCLUDE "engine/routines/leveluphappinessmod.asm" INCLUDE "data/trainers/trainer_dvs.asm" -INCLUDE "engine/routines/returntobattle_useball.asm" -INCLUDE "engine/routines/consumehelditem.asm" +INCLUDE "engine/battle/returntobattle_useball.asm" +INCLUDE "engine/battle/consumehelditem.asm" INCLUDE "data/moves/move_effects_pointers.asm" INCLUDE "data/moves/move_effects.asm" -INCLUDE "engine/routines/kurt_selectquantity_interpretjoypad.asm" +INCLUDE "event/kurt_selectquantity_interpretjoypad.asm" SECTION "bankA", ROMX @@ -246,7 +246,7 @@ INCLUDE "engine/init_hof_credits.asm" INCLUDE "mobile/get_trainer_class.asm" INCLUDE "engine/battle/sliding_intro.asm" INCLUDE "mobile/print_opp_message.asm" -INCLUDE "engine/routines/checkbattlescene.asm" +INCLUDE "engine/battle/checkbattlescene.asm" INCLUDE "engine/gbc_only.asm" INCLUDE "event/poke_seer.asm" @@ -308,7 +308,7 @@ INCLUDE "engine/debug.asm" SECTION "bank21", ROMX INCLUDE "engine/printer.asm" -INCLUDE "gfx/anims.asm" +INCLUDE "gfx/battle_anims.asm" INCLUDE "event/halloffame.asm" @@ -330,7 +330,7 @@ INCLUDE "engine/timeofdaypals.asm" INCLUDE "engine/battle/battle_transition.asm" INCLUDE "event/field_moves.asm" INCLUDE "event/magnet_train.asm" -INCLUDE "engine/routines/battlestart_copytilemapatonce.asm" +INCLUDE "engine/battle/battlestart_copytilemapatonce.asm" INCLUDE "engine/sprites.asm" INCLUDE "engine/mon_icons.asm" @@ -389,7 +389,7 @@ INCLUDE "engine/battle/trainer_scripts.asm" SECTION "bank32", ROMX -INCLUDE "engine/anims/bg_effects.asm" +INCLUDE "engine/battle_anims/bg_effects.asm" INCLUDE "data/moves/move_anims.asm" INCLUDE "event/poisonstep_pals.asm" @@ -400,14 +400,14 @@ INCBIN "gfx/credits/theend.2bpp" SECTION "Move Animations", ROMX INCLUDE "event/bug_contest/display_stats.asm" -INCLUDE "engine/anims/anim_commands.asm" -INCLUDE "engine/anims/engine.asm" -INCLUDE "data/anims/objects.asm" -INCLUDE "engine/anims/functions.asm" -INCLUDE "engine/anims/helpers.asm" -INCLUDE "data/anims/framesets.asm" -INCLUDE "data/anims/oam.asm" -INCLUDE "data/anims/object_gfx.asm" +INCLUDE "engine/battle_anims/anim_commands.asm" +INCLUDE "engine/battle_anims/engine.asm" +INCLUDE "data/battle_anims/objects.asm" +INCLUDE "engine/battle_anims/functions.asm" +INCLUDE "engine/battle_anims/helpers.asm" +INCLUDE "data/battle_anims/framesets.asm" +INCLUDE "data/battle_anims/oam.asm" +INCLUDE "data/battle_anims/object_gfx.asm" SECTION "Pic Animations 1", ROMX @@ -554,7 +554,7 @@ INCLUDE "text/phone/extra2.asm" SECTION "bank5E", ROMX -INCLUDE "engine/routines/updatebattlehuds.asm" +INCLUDE "engine/battle/updatebattlehuds.asm" SECTION "mobile_5e", ROMX -- cgit v1.2.3 From 82591369114ea1d7723e433c7b9e49a639b4919b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 20:02:00 -0500 Subject: Name mail graphics --- main.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 56ff32931..cf9add7cc 100644 --- a/main.asm +++ b/main.asm @@ -376,7 +376,7 @@ SECTION "bank2E", ROMX INCLUDE "engine/events_3.asm" INCLUDE "engine/radio.asm" -INCLUDE "gfx/mail.asm" +INCLUDE "engine/mail_2.asm" SECTION "bank2F", ROMX -- cgit v1.2.3 From dae16acd6f4e2e2c177e3776be6ed549af070c4f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 21:55:57 -0500 Subject: =?UTF-8?q?event/=20=E2=86=92=20events/,=20and=20move=20some=20app?= =?UTF-8?q?ropriate=20engine/=20files=20there?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.asm | 116 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index cf9add7cc..3cb765aae 100644 --- a/main.asm +++ b/main.asm @@ -13,8 +13,8 @@ INCLUDE "engine/routines/checknickerrors.asm" INCLUDE "engine/math.asm" INCLUDE "data/items/item_attributes.asm" INCLUDE "engine/npc_movement.asm" -INCLUDE "event/happiness_egg.asm" -INCLUDE "event/special.asm" +INCLUDE "events/happiness_egg.asm" +INCLUDE "events/special.asm" SECTION "bank2", ROMX @@ -31,14 +31,14 @@ INCLUDE "engine/routines/checktime.asm" INCLUDE "engine/specials.asm" INCLUDE "engine/printnum.asm" INCLUDE "engine/health.asm" -INCLUDE "event/overworld.asm" +INCLUDE "events/overworld.asm" INCLUDE "engine/items.asm" INCLUDE "engine/player_step.asm" INCLUDE "engine/battle/anim_hp_bar.asm" INCLUDE "engine/move_mon.asm" INCLUDE "engine/billspctop.asm" INCLUDE "engine/routines/getbreedmonlevelgrowth.asm" -INCLUDE "event/bug_contest/caught_mon.asm" +INCLUDE "events/bug_contest/caught_mon.asm" INCLUDE "engine/item_effects.asm" INCLUDE "engine/battle_anims/getpokeballwobble.asm" INCLUDE "engine/routines/knowsmove.asm" @@ -50,20 +50,20 @@ INCLUDE "engine/pack.asm" INCLUDE "engine/time.asm" INCLUDE "engine/tmhm.asm" INCLUDE "engine/namingscreen.asm" -INCLUDE "event/misc_scripts.asm" -INCLUDE "event/heal_machine_anim.asm" -INCLUDE "event/whiteout.asm" -INCLUDE "event/forced_movement.asm" -INCLUDE "event/itemfinder.asm" +INCLUDE "events/misc_scripts.asm" +INCLUDE "events/heal_machine_anim.asm" +INCLUDE "events/whiteout.asm" +INCLUDE "events/forced_movement.asm" +INCLUDE "events/itemfinder.asm" INCLUDE "engine/start_menu.asm" INCLUDE "engine/select_menu.asm" -INCLUDE "event/elevator.asm" -INCLUDE "event/bug_contest/contest.asm" -INCLUDE "event/misc_scripts_2.asm" -INCLUDE "event/std_collision.asm" -INCLUDE "event/bug_contest/judging.asm" -INCLUDE "engine/pokerus/apply_pokerus_tick.asm" -INCLUDE "event/bug_contest/contest_2.asm" +INCLUDE "events/elevator.asm" +INCLUDE "events/bug_contest/contest.asm" +INCLUDE "events/misc_scripts_2.asm" +INCLUDE "events/std_collision.asm" +INCLUDE "events/bug_contest/judging.asm" +INCLUDE "events/pokerus/apply_pokerus_tick.asm" +INCLUDE "events/bug_contest/contest_2.asm" INCLUDE "engine/routines/correcterrorsinplayerparty.asm" INCLUDE "engine/routines/getsquareroot.asm" @@ -76,14 +76,14 @@ INCLUDE "engine/tile_events.asm" INCLUDE "engine/save.asm" INCLUDE "engine/spawn_points.asm" INCLUDE "engine/map_setup.asm" -INCLUDE "engine/pokecenter_pc.asm" +INCLUDE "events/pokecenter_pc.asm" INCLUDE "engine/mart.asm" INCLUDE "engine/money.asm" INCLUDE "data/items/marts.asm" -INCLUDE "event/mom.asm" -INCLUDE "event/daycare.asm" -INCLUDE "event/print_unown.asm" -INCLUDE "event/print_photo.asm" +INCLUDE "events/mom.asm" +INCLUDE "events/daycare.asm" +INCLUDE "events/print_unown.asm" +INCLUDE "events/print_photo.asm" INCLUDE "engine/breeding.asm" @@ -105,7 +105,7 @@ SECTION "bank9", ROMX INCLUDE "data/text_buffers.asm" INCLUDE "engine/menu.asm" INCLUDE "engine/routines/updateitemdescription.asm" -INCLUDE "engine/pokepic.asm" +INCLUDE "events/pokepic.asm" INCLUDE "engine/map_objects_2.asm" INCLUDE "engine/scrolling_menu.asm" INCLUDE "engine/switch_items.asm" @@ -114,7 +114,7 @@ INCLUDE "engine/mon_menu.asm" INCLUDE "engine/battle/menu.asm" INCLUDE "engine/buy_sell_toss.asm" INCLUDE "engine/trainer_card.asm" -INCLUDE "engine/prof_oaks_pc.asm" +INCLUDE "events/prof_oaks_pc.asm" INCLUDE "engine/decorations.asm" INCLUDE "engine/routines/leveluphappinessmod.asm" INCLUDE "data/trainers/trainer_dvs.asm" @@ -122,7 +122,7 @@ INCLUDE "engine/battle/returntobattle_useball.asm" INCLUDE "engine/battle/consumehelditem.asm" INCLUDE "data/moves/move_effects_pointers.asm" INCLUDE "data/moves/move_effects.asm" -INCLUDE "event/kurt_selectquantity_interpretjoypad.asm" +INCLUDE "events/kurt_selectquantity_interpretjoypad.asm" SECTION "bankA", ROMX @@ -143,11 +143,11 @@ SECTION "bankB", ROMX INCLUDE "engine/battle/trainer_huds.asm" INCLUDE "data/trainers/trainer_class_names.asm" INCLUDE "engine/battle/ai/redundant.asm" -INCLUDE "event/move_deleter.asm" +INCLUDE "events/move_deleter.asm" INCLUDE "engine/mystery_gift_2.asm" INCLUDE "engine/tmhm2.asm" INCLUDE "data/moves/move_descriptions.asm" -INCLUDE "engine/pokerus/pokerus.asm" +INCLUDE "events/pokerus/pokerus.asm" INCLUDE "engine/battle/start_battle.asm" INCLUDE "engine/routines/placegraphic.asm" @@ -183,7 +183,7 @@ INCLUDE "engine/evolve.asm" SECTION "bank11", ROMX -INCLUDE "engine/fruit_trees.asm" +INCLUDE "events/fruit_trees.asm" INCLUDE "engine/battle/ai/move.asm" INCLUDE "engine/pokedex_2.asm" INCLUDE "data/pokemon/dex_entry_pointers.asm" @@ -194,14 +194,14 @@ SECTION "Crystal Unique", ROMX INCLUDE "engine/init_gender.asm" INCLUDE "engine/routines/drawkrispackgfx.asm" -INCLUDE "event/move_tutor.asm" +INCLUDE "events/move_tutor.asm" INCLUDE "engine/crystal_colors.asm" -INCLUDE "event/celebi.asm" +INCLUDE "events/celebi.asm" INCLUDE "engine/main_menu.asm" INCLUDE "mobile/mobile_menu.asm" INCLUDE "engine/search.asm" INCLUDE "mobile/mobile_12_2.asm" -INCLUDE "event/buena_menu.asm" +INCLUDE "events/buena_menu.asm" SECTION "bank13", ROMX @@ -235,12 +235,12 @@ INCLUDE "engine/delete_save_change_clock.asm" INCLUDE "tilesets/tilesets.asm" INCLUDE "engine/routines/flagpredef.asm" INCLUDE "engine/routines/trademonfrontpic.asm" -INCLUDE "engine/pokerus/check_pokerus.asm" -INCLUDE "event/lucky_number.asm" +INCLUDE "events/pokerus/check_pokerus.asm" +INCLUDE "events/lucky_number.asm" INCLUDE "engine/caught_data.asm" INCLUDE "engine/search2.asm" INCLUDE "engine/stats_screen.asm" -INCLUDE "event/catch_tutorial.asm" +INCLUDE "events/catch_tutorial.asm" INCLUDE "engine/evolution_animation.asm" INCLUDE "engine/init_hof_credits.asm" INCLUDE "mobile/get_trainer_class.asm" @@ -248,18 +248,18 @@ INCLUDE "engine/battle/sliding_intro.asm" INCLUDE "mobile/print_opp_message.asm" INCLUDE "engine/battle/checkbattlescene.asm" INCLUDE "engine/gbc_only.asm" -INCLUDE "event/poke_seer.asm" +INCLUDE "events/poke_seer.asm" SECTION "bank14", ROMX INCLUDE "engine/party_menu.asm" -INCLUDE "event/poisonstep.asm" -INCLUDE "event/sweet_scent.asm" -INCLUDE "event/squirtbottle.asm" -INCLUDE "event/card_key.asm" -INCLUDE "event/basement_key.asm" -INCLUDE "event/sacred_ash.asm" +INCLUDE "events/poisonstep.asm" +INCLUDE "events/sweet_scent.asm" +INCLUDE "events/squirtbottle.asm" +INCLUDE "events/card_key.asm" +INCLUDE "events/basement_key.asm" +INCLUDE "events/sacred_ash.asm" INCLUDE "engine/tempmon.asm" INCLUDE "engine/types.asm" INCLUDE "text/unused_gen_1_trainers.asm" @@ -309,18 +309,18 @@ SECTION "bank21", ROMX INCLUDE "engine/printer.asm" INCLUDE "gfx/battle_anims.asm" -INCLUDE "event/halloffame.asm" +INCLUDE "events/halloffame.asm" SECTION "bank22", ROMX -INCLUDE "event/kurt.asm" +INCLUDE "events/kurt.asm" INCLUDE "engine/player_gfx.asm" INCLUDE "mobile/mobile_22.asm" -INCLUDE "event/unown.asm" -INCLUDE "event/buena.asm" -INCLUDE "event/dratini.asm" -INCLUDE "event/battle_tower.asm" +INCLUDE "events/crystal_unown.asm" +INCLUDE "events/buena.asm" +INCLUDE "events/dratini.asm" +INCLUDE "events/battle_tower.asm" INCLUDE "mobile/mobile_22_2.asm" @@ -328,8 +328,8 @@ SECTION "bank23", ROMX INCLUDE "engine/timeofdaypals.asm" INCLUDE "engine/battle/battle_transition.asm" -INCLUDE "event/field_moves.asm" -INCLUDE "event/magnet_train.asm" +INCLUDE "events/field_moves.asm" +INCLUDE "events/magnet_train.asm" INCLUDE "engine/battle/battlestart_copytilemapatonce.asm" INCLUDE "engine/sprites.asm" INCLUDE "engine/mon_icons.asm" @@ -340,7 +340,7 @@ SECTION "bank24", ROMX INCLUDE "engine/phone/phone.asm" INCLUDE "engine/timeset.asm" INCLUDE "engine/pokegear.asm" -INCLUDE "engine/fish.asm" +INCLUDE "events/fish.asm" INCLUDE "engine/slot_machine.asm" @@ -381,17 +381,17 @@ INCLUDE "engine/mail_2.asm" SECTION "bank2F", ROMX -INCLUDE "engine/std_scripts.asm" +INCLUDE "events/std_scripts.asm" INCLUDE "engine/phone/phone_scripts.asm" INCLUDE "engine/phone/generic_calls.asm" -INCLUDE "engine/battle/trainer_scripts.asm" +INCLUDE "events/trainer_scripts.asm" SECTION "bank32", ROMX INCLUDE "engine/battle_anims/bg_effects.asm" INCLUDE "data/moves/move_anims.asm" -INCLUDE "event/poisonstep_pals.asm" +INCLUDE "events/poisonstep_pals.asm" TheEndGFX:: ; cbd2e INCBIN "gfx/credits/theend.2bpp" @@ -399,7 +399,7 @@ INCBIN "gfx/credits/theend.2bpp" SECTION "Move Animations", ROMX -INCLUDE "event/bug_contest/display_stats.asm" +INCLUDE "events/bug_contest/display_stats.asm" INCLUDE "engine/battle_anims/anim_commands.asm" INCLUDE "engine/battle_anims/engine.asm" INCLUDE "data/battle_anims/objects.asm" @@ -448,7 +448,7 @@ INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "bank38", ROMX -INCLUDE "event/print_unown_2.asm" +INCLUDE "events/print_unown_2.asm" Unknown_e00ed: ; Graphics for an unused Game Corner @@ -477,12 +477,12 @@ SECTION "bank3E", ROMX INCLUDE "gfx/font.asm" INCLUDE "engine/time_capsule.asm" -INCLUDE "event/name_rater.asm" +INCLUDE "events/name_rater.asm" INCLUDE "engine/routines/playslowcry.asm" INCLUDE "engine/routines/newpokedexentry.asm" INCLUDE "engine/time_capsule_2.asm" INCLUDE "engine/unown_dex.asm" -INCLUDE "event/magikarp.asm" +INCLUDE "events/magikarp.asm" INCLUDE "engine/battle/hidden_power.asm" INCLUDE "engine/battle/misc.asm" @@ -491,7 +491,7 @@ SECTION "bank3F", ROMX INCLUDE "tilesets/animations.asm" INCLUDE "engine/npctrade.asm" -INCLUDE "event/mom_phone.asm" +INCLUDE "events/mom_phone.asm" INCLUDE "mobile/mobile_40.asm" @@ -612,7 +612,7 @@ SECTION "bank77_2", ROMX INCLUDE "engine/routines/printhoursmins.asm" INCLUDE "engine/diploma.asm" INCLUDE "engine/pokedex_3.asm" -INCLUDE "event/catch_tutorial_input.asm" +INCLUDE "events/catch_tutorial_input.asm" INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm" PokegearGFX: ; 1de2e4 -- cgit v1.2.3 From 172dba3c0b38eeea09342efe297ccc7ea9b4d3d3 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 26 Dec 2017 22:57:19 -0500 Subject: Rename some sections engine/battle_tower.asm fits better in events/ --- main.asm | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 3cb765aae..adfd263b4 100644 --- a/main.asm +++ b/main.asm @@ -190,7 +190,7 @@ INCLUDE "data/pokemon/dex_entry_pointers.asm" INCLUDE "engine/mail.asm" -SECTION "Crystal Unique", ROMX +SECTION "Crystal Features 1", ROMX INCLUDE "engine/init_gender.asm" INCLUDE "engine/routines/drawkrispackgfx.asm" @@ -312,7 +312,7 @@ INCLUDE "gfx/battle_anims.asm" INCLUDE "events/halloffame.asm" -SECTION "bank22", ROMX +SECTION "Crystal Features 2", ROMX INCLUDE "events/kurt.asm" INCLUDE "engine/player_gfx.asm" @@ -320,7 +320,7 @@ INCLUDE "mobile/mobile_22.asm" INCLUDE "events/crystal_unown.asm" INCLUDE "events/buena.asm" INCLUDE "events/dratini.asm" -INCLUDE "events/battle_tower.asm" +INCLUDE "events/battle_tower_rules.asm" INCLUDE "mobile/mobile_22_2.asm" @@ -508,7 +508,7 @@ INCLUDE "mobile/mobile_41.asm" INCLUDE "gfx/overworld_font.asm" -SECTION "mobile_42", ROMX +SECTION "Mobile 42", ROMX INCLUDE "mobile/mobile_42.asm" @@ -519,7 +519,7 @@ IntroLogoGFX: ; 109407 INCBIN "gfx/intro/logo.2bpp.lz" -SECTION "bank43", ROMX +SECTION "Title", ROMX INCLUDE "engine/unused_title.asm" INCLUDE "engine/title.asm" @@ -531,7 +531,7 @@ INCLUDE "mobile/mobile_45.asm" INCLUDE "mobile/mobile_46.asm" -SECTION "battle_tower_47", ROMX +SECTION "Battle Tower", ROMX INCLUDE "mobile/battle_tower_47.asm" @@ -542,7 +542,7 @@ INCLUDE "mobile/mobile_5b.asm" INCLUDE "engine/link_trade.asm" -SECTION "mobile_5c", ROMX +SECTION "Mobile 5C", ROMX INCLUDE "mobile/mobile_5c.asm" @@ -552,17 +552,17 @@ SECTION "Crystal Phone Text 2", ROMX INCLUDE "text/phone/extra2.asm" -SECTION "bank5E", ROMX +SECTION "UpdateBattleHUDs", ROMX INCLUDE "engine/battle/updatebattlehuds.asm" -SECTION "mobile_5e", ROMX +SECTION "Mobile 5E", ROMX INCLUDE "mobile/mobile_5e.asm" -SECTION "bank5F", ROMX +SECTION "Mobile 5F", ROMX INCLUDE "mobile/mobile_5f.asm" @@ -591,7 +591,7 @@ INCLUDE "text/phone/elm.asm" INCLUDE "text/phone/trainers1.asm" -SECTION "bank72", ROMX +SECTION "Miscellaneous Text", ROMX INCLUDE "data/items/item_names.asm" INCLUDE "data/items/item_descriptions.asm" @@ -636,13 +636,10 @@ SECTION "Mobile News Data", ROMX INCLUDE "mobile/news/news.asm" -SECTION "bank7E", ROMX - -INCLUDE "engine/battle_tower.asm" -INCLUDE "engine/odd_eggs.asm" +SECTION "Crystal Events", ROMX - -SECTION "bank7F", ROMX +INCLUDE "events/battle_tower.asm" +INCLUDE "events/odd_egg.asm" SECTION "Mobile Stadium 2", ROMX -- cgit v1.2.3 From 86fd37af164110c9b85c5e132c02be0368c9c779 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 27 Dec 2017 00:09:12 -0500 Subject: Move events/ to engine/events/ --- main.asm | 120 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index adfd263b4..d3d0b5460 100644 --- a/main.asm +++ b/main.asm @@ -13,8 +13,8 @@ INCLUDE "engine/routines/checknickerrors.asm" INCLUDE "engine/math.asm" INCLUDE "data/items/item_attributes.asm" INCLUDE "engine/npc_movement.asm" -INCLUDE "events/happiness_egg.asm" -INCLUDE "events/special.asm" +INCLUDE "engine/events/happiness_egg.asm" +INCLUDE "engine/events/special.asm" SECTION "bank2", ROMX @@ -31,14 +31,14 @@ INCLUDE "engine/routines/checktime.asm" INCLUDE "engine/specials.asm" INCLUDE "engine/printnum.asm" INCLUDE "engine/health.asm" -INCLUDE "events/overworld.asm" +INCLUDE "engine/events/overworld.asm" INCLUDE "engine/items.asm" INCLUDE "engine/player_step.asm" INCLUDE "engine/battle/anim_hp_bar.asm" INCLUDE "engine/move_mon.asm" INCLUDE "engine/billspctop.asm" INCLUDE "engine/routines/getbreedmonlevelgrowth.asm" -INCLUDE "events/bug_contest/caught_mon.asm" +INCLUDE "engine/events/bug_contest/caught_mon.asm" INCLUDE "engine/item_effects.asm" INCLUDE "engine/battle_anims/getpokeballwobble.asm" INCLUDE "engine/routines/knowsmove.asm" @@ -50,20 +50,20 @@ INCLUDE "engine/pack.asm" INCLUDE "engine/time.asm" INCLUDE "engine/tmhm.asm" INCLUDE "engine/namingscreen.asm" -INCLUDE "events/misc_scripts.asm" -INCLUDE "events/heal_machine_anim.asm" -INCLUDE "events/whiteout.asm" -INCLUDE "events/forced_movement.asm" -INCLUDE "events/itemfinder.asm" +INCLUDE "engine/events/misc_scripts.asm" +INCLUDE "engine/events/heal_machine_anim.asm" +INCLUDE "engine/events/whiteout.asm" +INCLUDE "engine/events/forced_movement.asm" +INCLUDE "engine/events/itemfinder.asm" INCLUDE "engine/start_menu.asm" INCLUDE "engine/select_menu.asm" -INCLUDE "events/elevator.asm" -INCLUDE "events/bug_contest/contest.asm" -INCLUDE "events/misc_scripts_2.asm" -INCLUDE "events/std_collision.asm" -INCLUDE "events/bug_contest/judging.asm" -INCLUDE "events/pokerus/apply_pokerus_tick.asm" -INCLUDE "events/bug_contest/contest_2.asm" +INCLUDE "engine/events/elevator.asm" +INCLUDE "engine/events/bug_contest/contest.asm" +INCLUDE "engine/events/misc_scripts_2.asm" +INCLUDE "engine/events/std_collision.asm" +INCLUDE "engine/events/bug_contest/judging.asm" +INCLUDE "engine/events/pokerus/apply_pokerus_tick.asm" +INCLUDE "engine/events/bug_contest/contest_2.asm" INCLUDE "engine/routines/correcterrorsinplayerparty.asm" INCLUDE "engine/routines/getsquareroot.asm" @@ -76,14 +76,14 @@ INCLUDE "engine/tile_events.asm" INCLUDE "engine/save.asm" INCLUDE "engine/spawn_points.asm" INCLUDE "engine/map_setup.asm" -INCLUDE "events/pokecenter_pc.asm" +INCLUDE "engine/events/pokecenter_pc.asm" INCLUDE "engine/mart.asm" INCLUDE "engine/money.asm" INCLUDE "data/items/marts.asm" -INCLUDE "events/mom.asm" -INCLUDE "events/daycare.asm" -INCLUDE "events/print_unown.asm" -INCLUDE "events/print_photo.asm" +INCLUDE "engine/events/mom.asm" +INCLUDE "engine/events/daycare.asm" +INCLUDE "engine/events/print_unown.asm" +INCLUDE "engine/events/print_photo.asm" INCLUDE "engine/breeding.asm" @@ -105,7 +105,7 @@ SECTION "bank9", ROMX INCLUDE "data/text_buffers.asm" INCLUDE "engine/menu.asm" INCLUDE "engine/routines/updateitemdescription.asm" -INCLUDE "events/pokepic.asm" +INCLUDE "engine/events/pokepic.asm" INCLUDE "engine/map_objects_2.asm" INCLUDE "engine/scrolling_menu.asm" INCLUDE "engine/switch_items.asm" @@ -114,7 +114,7 @@ INCLUDE "engine/mon_menu.asm" INCLUDE "engine/battle/menu.asm" INCLUDE "engine/buy_sell_toss.asm" INCLUDE "engine/trainer_card.asm" -INCLUDE "events/prof_oaks_pc.asm" +INCLUDE "engine/events/prof_oaks_pc.asm" INCLUDE "engine/decorations.asm" INCLUDE "engine/routines/leveluphappinessmod.asm" INCLUDE "data/trainers/trainer_dvs.asm" @@ -122,7 +122,7 @@ INCLUDE "engine/battle/returntobattle_useball.asm" INCLUDE "engine/battle/consumehelditem.asm" INCLUDE "data/moves/move_effects_pointers.asm" INCLUDE "data/moves/move_effects.asm" -INCLUDE "events/kurt_selectquantity_interpretjoypad.asm" +INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm" SECTION "bankA", ROMX @@ -143,11 +143,11 @@ SECTION "bankB", ROMX INCLUDE "engine/battle/trainer_huds.asm" INCLUDE "data/trainers/trainer_class_names.asm" INCLUDE "engine/battle/ai/redundant.asm" -INCLUDE "events/move_deleter.asm" +INCLUDE "engine/events/move_deleter.asm" INCLUDE "engine/mystery_gift_2.asm" INCLUDE "engine/tmhm2.asm" INCLUDE "data/moves/move_descriptions.asm" -INCLUDE "events/pokerus/pokerus.asm" +INCLUDE "engine/events/pokerus/pokerus.asm" INCLUDE "engine/battle/start_battle.asm" INCLUDE "engine/routines/placegraphic.asm" @@ -183,7 +183,7 @@ INCLUDE "engine/evolve.asm" SECTION "bank11", ROMX -INCLUDE "events/fruit_trees.asm" +INCLUDE "engine/events/fruit_trees.asm" INCLUDE "engine/battle/ai/move.asm" INCLUDE "engine/pokedex_2.asm" INCLUDE "data/pokemon/dex_entry_pointers.asm" @@ -194,14 +194,14 @@ SECTION "Crystal Features 1", ROMX INCLUDE "engine/init_gender.asm" INCLUDE "engine/routines/drawkrispackgfx.asm" -INCLUDE "events/move_tutor.asm" +INCLUDE "engine/events/move_tutor.asm" INCLUDE "engine/crystal_colors.asm" -INCLUDE "events/celebi.asm" +INCLUDE "engine/events/celebi.asm" INCLUDE "engine/main_menu.asm" INCLUDE "mobile/mobile_menu.asm" INCLUDE "engine/search.asm" INCLUDE "mobile/mobile_12_2.asm" -INCLUDE "events/buena_menu.asm" +INCLUDE "engine/events/buena_menu.asm" SECTION "bank13", ROMX @@ -235,12 +235,12 @@ INCLUDE "engine/delete_save_change_clock.asm" INCLUDE "tilesets/tilesets.asm" INCLUDE "engine/routines/flagpredef.asm" INCLUDE "engine/routines/trademonfrontpic.asm" -INCLUDE "events/pokerus/check_pokerus.asm" -INCLUDE "events/lucky_number.asm" +INCLUDE "engine/events/pokerus/check_pokerus.asm" +INCLUDE "engine/events/lucky_number.asm" INCLUDE "engine/caught_data.asm" INCLUDE "engine/search2.asm" INCLUDE "engine/stats_screen.asm" -INCLUDE "events/catch_tutorial.asm" +INCLUDE "engine/events/catch_tutorial.asm" INCLUDE "engine/evolution_animation.asm" INCLUDE "engine/init_hof_credits.asm" INCLUDE "mobile/get_trainer_class.asm" @@ -248,18 +248,18 @@ INCLUDE "engine/battle/sliding_intro.asm" INCLUDE "mobile/print_opp_message.asm" INCLUDE "engine/battle/checkbattlescene.asm" INCLUDE "engine/gbc_only.asm" -INCLUDE "events/poke_seer.asm" +INCLUDE "engine/events/poke_seer.asm" SECTION "bank14", ROMX INCLUDE "engine/party_menu.asm" -INCLUDE "events/poisonstep.asm" -INCLUDE "events/sweet_scent.asm" -INCLUDE "events/squirtbottle.asm" -INCLUDE "events/card_key.asm" -INCLUDE "events/basement_key.asm" -INCLUDE "events/sacred_ash.asm" +INCLUDE "engine/events/poisonstep.asm" +INCLUDE "engine/events/sweet_scent.asm" +INCLUDE "engine/events/squirtbottle.asm" +INCLUDE "engine/events/card_key.asm" +INCLUDE "engine/events/basement_key.asm" +INCLUDE "engine/events/sacred_ash.asm" INCLUDE "engine/tempmon.asm" INCLUDE "engine/types.asm" INCLUDE "text/unused_gen_1_trainers.asm" @@ -309,18 +309,18 @@ SECTION "bank21", ROMX INCLUDE "engine/printer.asm" INCLUDE "gfx/battle_anims.asm" -INCLUDE "events/halloffame.asm" +INCLUDE "engine/events/halloffame.asm" SECTION "Crystal Features 2", ROMX -INCLUDE "events/kurt.asm" +INCLUDE "engine/events/kurt.asm" INCLUDE "engine/player_gfx.asm" INCLUDE "mobile/mobile_22.asm" -INCLUDE "events/crystal_unown.asm" -INCLUDE "events/buena.asm" -INCLUDE "events/dratini.asm" -INCLUDE "events/battle_tower_rules.asm" +INCLUDE "engine/events/crystal_unown.asm" +INCLUDE "engine/events/buena.asm" +INCLUDE "engine/events/dratini.asm" +INCLUDE "engine/events/battle_tower_rules.asm" INCLUDE "mobile/mobile_22_2.asm" @@ -328,8 +328,8 @@ SECTION "bank23", ROMX INCLUDE "engine/timeofdaypals.asm" INCLUDE "engine/battle/battle_transition.asm" -INCLUDE "events/field_moves.asm" -INCLUDE "events/magnet_train.asm" +INCLUDE "engine/events/field_moves.asm" +INCLUDE "engine/events/magnet_train.asm" INCLUDE "engine/battle/battlestart_copytilemapatonce.asm" INCLUDE "engine/sprites.asm" INCLUDE "engine/mon_icons.asm" @@ -340,7 +340,7 @@ SECTION "bank24", ROMX INCLUDE "engine/phone/phone.asm" INCLUDE "engine/timeset.asm" INCLUDE "engine/pokegear.asm" -INCLUDE "events/fish.asm" +INCLUDE "engine/events/fish.asm" INCLUDE "engine/slot_machine.asm" @@ -381,17 +381,17 @@ INCLUDE "engine/mail_2.asm" SECTION "bank2F", ROMX -INCLUDE "events/std_scripts.asm" +INCLUDE "engine/events/std_scripts.asm" INCLUDE "engine/phone/phone_scripts.asm" INCLUDE "engine/phone/generic_calls.asm" -INCLUDE "events/trainer_scripts.asm" +INCLUDE "engine/events/trainer_scripts.asm" SECTION "bank32", ROMX INCLUDE "engine/battle_anims/bg_effects.asm" INCLUDE "data/moves/move_anims.asm" -INCLUDE "events/poisonstep_pals.asm" +INCLUDE "engine/events/poisonstep_pals.asm" TheEndGFX:: ; cbd2e INCBIN "gfx/credits/theend.2bpp" @@ -399,7 +399,7 @@ INCBIN "gfx/credits/theend.2bpp" SECTION "Move Animations", ROMX -INCLUDE "events/bug_contest/display_stats.asm" +INCLUDE "engine/events/bug_contest/display_stats.asm" INCLUDE "engine/battle_anims/anim_commands.asm" INCLUDE "engine/battle_anims/engine.asm" INCLUDE "data/battle_anims/objects.asm" @@ -448,7 +448,7 @@ INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "bank38", ROMX -INCLUDE "events/print_unown_2.asm" +INCLUDE "engine/events/print_unown_2.asm" Unknown_e00ed: ; Graphics for an unused Game Corner @@ -477,12 +477,12 @@ SECTION "bank3E", ROMX INCLUDE "gfx/font.asm" INCLUDE "engine/time_capsule.asm" -INCLUDE "events/name_rater.asm" +INCLUDE "engine/events/name_rater.asm" INCLUDE "engine/routines/playslowcry.asm" INCLUDE "engine/routines/newpokedexentry.asm" INCLUDE "engine/time_capsule_2.asm" INCLUDE "engine/unown_dex.asm" -INCLUDE "events/magikarp.asm" +INCLUDE "engine/events/magikarp.asm" INCLUDE "engine/battle/hidden_power.asm" INCLUDE "engine/battle/misc.asm" @@ -491,7 +491,7 @@ SECTION "bank3F", ROMX INCLUDE "tilesets/animations.asm" INCLUDE "engine/npctrade.asm" -INCLUDE "events/mom_phone.asm" +INCLUDE "engine/events/mom_phone.asm" INCLUDE "mobile/mobile_40.asm" @@ -612,7 +612,7 @@ SECTION "bank77_2", ROMX INCLUDE "engine/routines/printhoursmins.asm" INCLUDE "engine/diploma.asm" INCLUDE "engine/pokedex_3.asm" -INCLUDE "events/catch_tutorial_input.asm" +INCLUDE "engine/events/catch_tutorial_input.asm" INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm" PokegearGFX: ; 1de2e4 @@ -638,8 +638,8 @@ INCLUDE "mobile/news/news.asm" SECTION "Crystal Events", ROMX -INCLUDE "events/battle_tower.asm" -INCLUDE "events/odd_egg.asm" +INCLUDE "engine/events/battle_tower.asm" +INCLUDE "engine/events/odd_egg.asm" SECTION "Mobile Stadium 2", ROMX -- cgit v1.2.3 From 7a4d64125176d9bd946682a3f9440de0f71324af Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 27 Dec 2017 01:29:15 -0500 Subject: Remove redundant data/ filename prefixes --- main.asm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index d3d0b5460..098edb7d1 100644 --- a/main.asm +++ b/main.asm @@ -11,7 +11,7 @@ INCLUDE "engine/init_map.asm" INCLUDE "engine/learn.asm" INCLUDE "engine/routines/checknickerrors.asm" INCLUDE "engine/math.asm" -INCLUDE "data/items/item_attributes.asm" +INCLUDE "data/items/attributes.asm" INCLUDE "engine/npc_movement.asm" INCLUDE "engine/events/happiness_egg.asm" INCLUDE "engine/events/special.asm" @@ -117,11 +117,12 @@ INCLUDE "engine/trainer_card.asm" INCLUDE "engine/events/prof_oaks_pc.asm" INCLUDE "engine/decorations.asm" INCLUDE "engine/routines/leveluphappinessmod.asm" -INCLUDE "data/trainers/trainer_dvs.asm" +INCLUDE "engine/battle/read_trainer_dvs.asm" +INCLUDE "data/trainers/dvs.asm" INCLUDE "engine/battle/returntobattle_useball.asm" INCLUDE "engine/battle/consumehelditem.asm" -INCLUDE "data/moves/move_effects_pointers.asm" -INCLUDE "data/moves/move_effects.asm" +INCLUDE "data/moves/effects_pointers.asm" +INCLUDE "data/moves/effects.asm" INCLUDE "engine/events/kurt_selectquantity_interpretjoypad.asm" @@ -141,12 +142,12 @@ INCBIN "gfx/battle/dude.2bpp.lz" SECTION "bankB", ROMX INCLUDE "engine/battle/trainer_huds.asm" -INCLUDE "data/trainers/trainer_class_names.asm" +INCLUDE "data/trainers/class_names.asm" INCLUDE "engine/battle/ai/redundant.asm" INCLUDE "engine/events/move_deleter.asm" INCLUDE "engine/mystery_gift_2.asm" INCLUDE "engine/tmhm2.asm" -INCLUDE "data/moves/move_descriptions.asm" +INCLUDE "data/moves/descriptions.asm" INCLUDE "engine/events/pokerus/pokerus.asm" INCLUDE "engine/battle/start_battle.asm" INCLUDE "engine/routines/placegraphic.asm" @@ -162,7 +163,7 @@ SECTION "Enemy Trainers", ROMX INCLUDE "engine/battle/ai/items.asm" INCLUDE "engine/battle/ai/scoring.asm" INCLUDE "engine/battle/read_trainer_attributes.asm" -INCLUDE "data/trainers/trainer_attributes.asm" +INCLUDE "data/trainers/attributes.asm" INCLUDE "engine/battle/read_trainer_party.asm" INCLUDE "data/trainers/party_pointers.asm" INCLUDE "data/trainers/parties.asm" @@ -171,7 +172,7 @@ INCLUDE "data/trainers/parties.asm" SECTION "Battle Core", ROMX INCLUDE "engine/battle/core.asm" -INCLUDE "data/moves/effect_command_pointers.asm" +INCLUDE "data/battle_command_pointers.asm" SECTION "bank10", ROMX @@ -220,7 +221,7 @@ INCLUDE "data/collision_permissions.asm" INCLUDE "engine/routines/emptyallsrambanks.asm" INCLUDE "engine/routines/savemenu_copytilemapatonce.asm" INCLUDE "engine/routines/checksave.asm" -INCLUDE "data/maps/map_scenes.asm" +INCLUDE "data/maps/scenes.asm" INCLUDE "engine/routines/loadmappart.asm" INCLUDE "engine/routines/phonering_copytilemapatonce.asm" @@ -270,7 +271,7 @@ INCLUDE "engine/routines/switchpartymons.asm" INCLUDE "gfx/load_pics.asm" INCLUDE "engine/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" -INCLUDE "data/pokemon/pokemon_names.asm" +INCLUDE "data/pokemon/names.asm" Unknown_53d84: ; unreferenced db $1a, $15 @@ -390,7 +391,7 @@ INCLUDE "engine/events/trainer_scripts.asm" SECTION "bank32", ROMX INCLUDE "engine/battle_anims/bg_effects.asm" -INCLUDE "data/moves/move_anims.asm" +INCLUDE "data/moves/animations.asm" INCLUDE "engine/events/poisonstep_pals.asm" TheEndGFX:: ; cbd2e @@ -593,9 +594,9 @@ INCLUDE "text/phone/trainers1.asm" SECTION "Miscellaneous Text", ROMX -INCLUDE "data/items/item_names.asm" -INCLUDE "data/items/item_descriptions.asm" -INCLUDE "data/moves/move_names.asm" +INCLUDE "data/items/names.asm" +INCLUDE "data/items/descriptions.asm" +INCLUDE "data/moves/names.asm" INCLUDE "engine/landmarks.asm" -- cgit v1.2.3 From e614dd1278c9dbdfa546cba77757f76541378c13 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 27 Dec 2017 01:58:36 -0500 Subject: =?UTF-8?q?gfx/pokemon/animation.asm=20=E2=86=92=20engine/pic=5Fan?= =?UTF-8?q?imation.asm=20Correct=20comment=20in=20constants/pokemon=5Fcons?= =?UTF-8?q?tants.asm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 098edb7d1..727453db8 100644 --- a/main.asm +++ b/main.asm @@ -413,7 +413,7 @@ INCLUDE "data/battle_anims/object_gfx.asm" SECTION "Pic Animations 1", ROMX -INCLUDE "gfx/pokemon/animation.asm" +INCLUDE "engine/pic_animation.asm" INCLUDE "gfx/pokemon/anim_pointers.asm" INCLUDE "gfx/pokemon/anims.asm" INCLUDE "gfx/pokemon/extra_pointers.asm" -- cgit v1.2.3