From 6f0b81504d6471afe7df6adae83791cc81933ca6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 16:04:21 +0100 Subject: More unreferenced labels cleanup --- main.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 5c036e3d8..7d1d6fb85 100644 --- a/main.asm +++ b/main.asm @@ -210,7 +210,7 @@ SECTION "bank13", ROMX INCLUDE "engine/map_palettes.asm" INCLUDE "tilesets/palette_maps.asm" -; unreferenced +; unused ; 0x4ce05 rept 26 db $06 @@ -273,7 +273,7 @@ INCLUDE "engine/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" -Unknown_53d84: ; unreferenced +Unreferenced_53d84: db $1a, $15 db $33, $16 db $4b, $17 -- cgit v1.2.3 From 7c0e903c4821b3e7ded9b795661ed3608e023cc2 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 16:25:40 +0100 Subject: Clean up leftover code from main.asm --- main.asm | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 7d1d6fb85..368a7afcb 100644 --- a/main.asm +++ b/main.asm @@ -209,14 +209,6 @@ SECTION "bank13", ROMX INCLUDE "engine/map_palettes.asm" INCLUDE "tilesets/palette_maps.asm" - -; unused -; 0x4ce05 -rept 26 - db $06 -endr -; 0x4ce1f - INCLUDE "data/collision_permissions.asm" INCLUDE "engine/routines/emptyallsrambanks.asm" INCLUDE "engine/routines/savemenu_copytilemapatonce.asm" @@ -272,20 +264,7 @@ INCLUDE "gfx/load_pics.asm" INCLUDE "engine/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" - -Unreferenced_53d84: - db $1a, $15 - db $33, $16 - db $4b, $17 - db $62, $18 - db $79, $19 - db $90, $1a - db $a8, $1b - db $c4, $1c - db $e0, $1d - db $f6, $1e - db $ff, $1f - db $ff, $20 +INCLUDE "data/unknown_table.asm" UnknownEggPic:: ; 53d9c ; Another egg pic. This is shifted up a few pixels. @@ -450,15 +429,6 @@ INCLUDE "gfx/pokemon/unown_frames.asm" SECTION "bank38", ROMX INCLUDE "engine/events/print_unown_2.asm" - -Unknown_e00ed: -; Graphics for an unused Game Corner -; game were meant to be here. - -ret_e00ed: ; e00ed (38:40ed) -; How many coins? - ret - INCLUDE "engine/card_flip.asm" INCLUDE "engine/unown_puzzle.asm" INCLUDE "engine/dummy_game.asm" -- cgit v1.2.3 From bdd3a55333d0acd1d764327dcebb4a14d9586f05 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 6 Jan 2018 18:53:30 -0500 Subject: Organize mobile/battle_tower_*.asm data and code --- main.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 5c036e3d8..73b9403f0 100644 --- a/main.asm +++ b/main.asm @@ -244,7 +244,7 @@ INCLUDE "engine/stats_screen.asm" INCLUDE "engine/events/catch_tutorial.asm" INCLUDE "engine/evolution_animation.asm" INCLUDE "engine/init_hof_credits.asm" -INCLUDE "mobile/get_trainer_class.asm" +INCLUDE "engine/events/battle_tower/get_trainer_class.asm" INCLUDE "engine/battle/sliding_intro.asm" INCLUDE "mobile/print_opp_message.asm" INCLUDE "engine/battle/checkbattlescene.asm" @@ -321,7 +321,7 @@ INCLUDE "mobile/mobile_22.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 "engine/events/battle_tower/rules.asm" INCLUDE "mobile/mobile_22_2.asm" @@ -534,7 +534,7 @@ INCLUDE "mobile/mobile_46.asm" SECTION "Battle Tower", ROMX -INCLUDE "mobile/battle_tower_47.asm" +INCLUDE "engine/events/battle_tower/trainer_text.asm" SECTION "bank5B", ROMX @@ -629,7 +629,7 @@ INCLUDE "text/battle_tower.asm" SECTION "Battle Tower Trainer Data", ROMX -INCLUDE "data/battle_tower_2.asm" +INCLUDE "data/battle_tower/unknown.asm" SECTION "Mobile News Data", ROMX @@ -639,7 +639,7 @@ INCLUDE "mobile/news/news.asm" SECTION "Crystal Events", ROMX -INCLUDE "engine/events/battle_tower.asm" +INCLUDE "engine/events/battle_tower/load_trainer.asm" INCLUDE "engine/events/odd_egg.asm" -- cgit v1.2.3 From 31edd7f803a9df47d76469559065af96d78f1c7d Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 00:23:48 -0500 Subject: Move text/ into data/ --- main.asm | 76 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 73b9403f0..af8a87a2f 100644 --- a/main.asm +++ b/main.asm @@ -263,7 +263,7 @@ 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" +INCLUDE "data/unused_text/gen_1_trainers.asm" INCLUDE "engine/mon_stats.asm" INCLUDE "engine/routines/initlist.asm" INCLUDE "engine/experience.asm" @@ -294,7 +294,7 @@ INCBIN "gfx/unknown/unknown_egg.2bpp.lz" SECTION "Crystal Phone Text", ROMX -INCLUDE "text/phone/extra.asm" +INCLUDE "data/phone_text/extra.asm" SECTION "bank20", ROMX @@ -302,7 +302,7 @@ SECTION "bank20", ROMX INCLUDE "engine/player_movement.asm" INCLUDE "engine/engine_flags.asm" INCLUDE "engine/variables.asm" -INCLUDE "text/battle.asm" +INCLUDE "data/battle_text.asm" INCLUDE "engine/debug.asm" @@ -354,23 +354,23 @@ INCLUDE "engine/phone/buenas_password.asm" SECTION "Phone Text", ROMX -INCLUDE "text/phone/anthony_overworld.asm" -INCLUDE "text/phone/todd_overworld.asm" -INCLUDE "text/phone/gina_overworld.asm" -INCLUDE "text/phone/irwin_overworld.asm" -INCLUDE "text/phone/arnie_overworld.asm" -INCLUDE "text/phone/alan_overworld.asm" -INCLUDE "text/phone/dana_overworld.asm" -INCLUDE "text/phone/chad_overworld.asm" -INCLUDE "text/phone/derek_overworld.asm" -INCLUDE "text/phone/tully_overworld.asm" -INCLUDE "text/phone/brent_overworld.asm" -INCLUDE "text/phone/tiffany_overworld.asm" -INCLUDE "text/phone/vance_overworld.asm" -INCLUDE "text/phone/wilton_overworld.asm" -INCLUDE "text/phone/kenji_overworld.asm" -INCLUDE "text/phone/parry_overworld.asm" -INCLUDE "text/phone/erin_overworld.asm" +INCLUDE "data/phone_text/anthony_overworld.asm" +INCLUDE "data/phone_text/todd_overworld.asm" +INCLUDE "data/phone_text/gina_overworld.asm" +INCLUDE "data/phone_text/irwin_overworld.asm" +INCLUDE "data/phone_text/arnie_overworld.asm" +INCLUDE "data/phone_text/alan_overworld.asm" +INCLUDE "data/phone_text/dana_overworld.asm" +INCLUDE "data/phone_text/chad_overworld.asm" +INCLUDE "data/phone_text/derek_overworld.asm" +INCLUDE "data/phone_text/tully_overworld.asm" +INCLUDE "data/phone_text/brent_overworld.asm" +INCLUDE "data/phone_text/tiffany_overworld.asm" +INCLUDE "data/phone_text/vance_overworld.asm" +INCLUDE "data/phone_text/wilton_overworld.asm" +INCLUDE "data/phone_text/kenji_overworld.asm" +INCLUDE "data/phone_text/parry_overworld.asm" +INCLUDE "data/phone_text/erin_overworld.asm" SECTION "bank2E", ROMX @@ -550,7 +550,7 @@ INCLUDE "mobile/mobile_5c.asm" SECTION "Crystal Phone Text 2", ROMX -INCLUDE "text/phone/extra2.asm" +INCLUDE "data/phone_text/extra2.asm" SECTION "UpdateBattleHUDs", ROMX @@ -570,26 +570,26 @@ INCLUDE "mobile/mobile_5f.asm" SECTION "Common Text 1", ROMX -INCLUDE "text/stdtext.asm" -INCLUDE "text/phone/jack_overworld.asm" -INCLUDE "text/phone/beverly_overworld.asm" -INCLUDE "text/phone/huey_overworld.asm" -INCLUDE "text/phone/gaven_overworld.asm" -INCLUDE "text/phone/beth_overworld.asm" -INCLUDE "text/phone/jose_overworld.asm" -INCLUDE "text/phone/reena_overworld.asm" -INCLUDE "text/phone/joey_overworld.asm" -INCLUDE "text/phone/wade_overworld.asm" -INCLUDE "text/phone/ralph_overworld.asm" -INCLUDE "text/phone/liz_overworld.asm" +INCLUDE "data/std_text.asm" +INCLUDE "data/phone_text/jack_overworld.asm" +INCLUDE "data/phone_text/beverly_overworld.asm" +INCLUDE "data/phone_text/huey_overworld.asm" +INCLUDE "data/phone_text/gaven_overworld.asm" +INCLUDE "data/phone_text/beth_overworld.asm" +INCLUDE "data/phone_text/jose_overworld.asm" +INCLUDE "data/phone_text/reena_overworld.asm" +INCLUDE "data/phone_text/joey_overworld.asm" +INCLUDE "data/phone_text/wade_overworld.asm" +INCLUDE "data/phone_text/ralph_overworld.asm" +INCLUDE "data/phone_text/liz_overworld.asm" 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" +INCLUDE "data/phone_text/mom.asm" +INCLUDE "data/phone_text/bill.asm" +INCLUDE "data/phone_text/elm.asm" +INCLUDE "data/phone_text/trainers1.asm" SECTION "Miscellaneous Text", ROMX @@ -624,7 +624,7 @@ INCLUDE "engine/european_mail.asm" SECTION "Battle Tower Text", ROMX -INCLUDE "text/battle_tower.asm" +INCLUDE "data/battle_tower/trainer_text.asm" SECTION "Battle Tower Trainer Data", ROMX -- cgit v1.2.3 From d0a8e8e7441a5ac4eee6e40cfeb6c3e77d6aace4 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 00:36:15 -0500 Subject: =?UTF-8?q?includes.asm=20=E2=86=92=20constants.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 af8a87a2f..26e29ba7e 100644 --- a/main.asm +++ b/main.asm @@ -1,4 +1,4 @@ -INCLUDE "includes.asm" +INCLUDE "constants.asm" SECTION "bank1", ROMX -- cgit v1.2.3 From cc0fd6e12c0afe9b70f55114eb3123014318e107 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 17:26:40 -0500 Subject: =?UTF-8?q?CRYSTAL11=20=E2=86=92=20=5FCRYSTAL11?= 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 26e29ba7e..b935f90d3 100644 --- a/main.asm +++ b/main.asm @@ -645,7 +645,7 @@ INCLUDE "engine/events/odd_egg.asm" SECTION "Mobile Stadium 2", ROMX -if DEF(CRYSTAL11) +if DEF(_CRYSTAL11) INCBIN "mobile/stadium/stadium2_2.bin" else INCBIN "mobile/stadium/stadium2_1.bin" -- cgit v1.2.3 From feb34b49ba23151507332a6354f124f4fe7b1a4b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 19:51:30 -0500 Subject: =?UTF-8?q?data/phone=5Ftext=20=E2=86=92=20data/phone/text?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.asm | 68 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index b935f90d3..4667de12f 100644 --- a/main.asm +++ b/main.asm @@ -294,7 +294,7 @@ INCBIN "gfx/unknown/unknown_egg.2bpp.lz" SECTION "Crystal Phone Text", ROMX -INCLUDE "data/phone_text/extra.asm" +INCLUDE "data/phone/text/extra.asm" SECTION "bank20", ROMX @@ -354,23 +354,23 @@ INCLUDE "engine/phone/buenas_password.asm" SECTION "Phone Text", ROMX -INCLUDE "data/phone_text/anthony_overworld.asm" -INCLUDE "data/phone_text/todd_overworld.asm" -INCLUDE "data/phone_text/gina_overworld.asm" -INCLUDE "data/phone_text/irwin_overworld.asm" -INCLUDE "data/phone_text/arnie_overworld.asm" -INCLUDE "data/phone_text/alan_overworld.asm" -INCLUDE "data/phone_text/dana_overworld.asm" -INCLUDE "data/phone_text/chad_overworld.asm" -INCLUDE "data/phone_text/derek_overworld.asm" -INCLUDE "data/phone_text/tully_overworld.asm" -INCLUDE "data/phone_text/brent_overworld.asm" -INCLUDE "data/phone_text/tiffany_overworld.asm" -INCLUDE "data/phone_text/vance_overworld.asm" -INCLUDE "data/phone_text/wilton_overworld.asm" -INCLUDE "data/phone_text/kenji_overworld.asm" -INCLUDE "data/phone_text/parry_overworld.asm" -INCLUDE "data/phone_text/erin_overworld.asm" +INCLUDE "data/phone/text/anthony_overworld.asm" +INCLUDE "data/phone/text/todd_overworld.asm" +INCLUDE "data/phone/text/gina_overworld.asm" +INCLUDE "data/phone/text/irwin_overworld.asm" +INCLUDE "data/phone/text/arnie_overworld.asm" +INCLUDE "data/phone/text/alan_overworld.asm" +INCLUDE "data/phone/text/dana_overworld.asm" +INCLUDE "data/phone/text/chad_overworld.asm" +INCLUDE "data/phone/text/derek_overworld.asm" +INCLUDE "data/phone/text/tully_overworld.asm" +INCLUDE "data/phone/text/brent_overworld.asm" +INCLUDE "data/phone/text/tiffany_overworld.asm" +INCLUDE "data/phone/text/vance_overworld.asm" +INCLUDE "data/phone/text/wilton_overworld.asm" +INCLUDE "data/phone/text/kenji_overworld.asm" +INCLUDE "data/phone/text/parry_overworld.asm" +INCLUDE "data/phone/text/erin_overworld.asm" SECTION "bank2E", ROMX @@ -550,7 +550,7 @@ INCLUDE "mobile/mobile_5c.asm" SECTION "Crystal Phone Text 2", ROMX -INCLUDE "data/phone_text/extra2.asm" +INCLUDE "data/phone/text/extra2.asm" SECTION "UpdateBattleHUDs", ROMX @@ -571,25 +571,25 @@ INCLUDE "mobile/mobile_5f.asm" SECTION "Common Text 1", ROMX INCLUDE "data/std_text.asm" -INCLUDE "data/phone_text/jack_overworld.asm" -INCLUDE "data/phone_text/beverly_overworld.asm" -INCLUDE "data/phone_text/huey_overworld.asm" -INCLUDE "data/phone_text/gaven_overworld.asm" -INCLUDE "data/phone_text/beth_overworld.asm" -INCLUDE "data/phone_text/jose_overworld.asm" -INCLUDE "data/phone_text/reena_overworld.asm" -INCLUDE "data/phone_text/joey_overworld.asm" -INCLUDE "data/phone_text/wade_overworld.asm" -INCLUDE "data/phone_text/ralph_overworld.asm" -INCLUDE "data/phone_text/liz_overworld.asm" +INCLUDE "data/phone/text/jack_overworld.asm" +INCLUDE "data/phone/text/beverly_overworld.asm" +INCLUDE "data/phone/text/huey_overworld.asm" +INCLUDE "data/phone/text/gaven_overworld.asm" +INCLUDE "data/phone/text/beth_overworld.asm" +INCLUDE "data/phone/text/jose_overworld.asm" +INCLUDE "data/phone/text/reena_overworld.asm" +INCLUDE "data/phone/text/joey_overworld.asm" +INCLUDE "data/phone/text/wade_overworld.asm" +INCLUDE "data/phone/text/ralph_overworld.asm" +INCLUDE "data/phone/text/liz_overworld.asm" SECTION "Special Phone Text", ROMX -INCLUDE "data/phone_text/mom.asm" -INCLUDE "data/phone_text/bill.asm" -INCLUDE "data/phone_text/elm.asm" -INCLUDE "data/phone_text/trainers1.asm" +INCLUDE "data/phone/text/mom.asm" +INCLUDE "data/phone/text/bill.asm" +INCLUDE "data/phone/text/elm.asm" +INCLUDE "data/phone/text/trainers1.asm" SECTION "Miscellaneous Text", ROMX -- cgit v1.2.3 From 9af6d8d0f1cdfe13d5b6b028b7da2965fddaab67 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 23:53:58 -0500 Subject: Split tilesets/ into gfx/tilesets and data/tilesets/ --- main.asm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 4667de12f..b375060f4 100644 --- a/main.asm +++ b/main.asm @@ -85,14 +85,12 @@ INCLUDE "engine/events/daycare.asm" INCLUDE "engine/events/print_unown.asm" INCLUDE "engine/events/print_photo.asm" INCLUDE "engine/breeding.asm" - - -INCLUDE "tilesets/data.asm" +INCLUDE "data/tileset_data.asm" SECTION "Roofs", ROMX -INCLUDE "tilesets/roofs.asm" +INCLUDE "engine/mapgroup_roofs.asm" SECTION "Clock Reset", ROMX @@ -208,7 +206,7 @@ INCLUDE "engine/events/buena_menu.asm" SECTION "bank13", ROMX INCLUDE "engine/map_palettes.asm" -INCLUDE "tilesets/palette_maps.asm" +INCLUDE "gfx/tilesets/palette_maps.asm" ; unreferenced ; 0x4ce05 @@ -233,7 +231,7 @@ INCBIN "gfx/shrink/shrink2.2bpp.lz" INCLUDE "engine/link_2.asm" INCLUDE "engine/delete_save_change_clock.asm" -INCLUDE "tilesets/tilesets.asm" +INCLUDE "data/tilesets.asm" INCLUDE "engine/routines/flagpredef.asm" INCLUDE "engine/routines/trademonfrontpic.asm" INCLUDE "engine/events/pokerus/check_pokerus.asm" @@ -490,7 +488,7 @@ INCLUDE "engine/battle/misc.asm" SECTION "bank3F", ROMX -INCLUDE "tilesets/animations.asm" +INCLUDE "engine/tileset_anims.asm" INCLUDE "engine/npctrade.asm" INCLUDE "engine/events/mom_phone.asm" -- cgit v1.2.3 From 7de7441e72f12ba1518504055acdec741bf4db74 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 02:38:45 -0500 Subject: gfx/*.asm files have INCBINs --- main.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index b375060f4..bd0719561 100644 --- a/main.asm +++ b/main.asm @@ -85,7 +85,7 @@ INCLUDE "engine/events/daycare.asm" INCLUDE "engine/events/print_unown.asm" INCLUDE "engine/events/print_photo.asm" INCLUDE "engine/breeding.asm" -INCLUDE "data/tileset_data.asm" +INCLUDE "gfx/tilesets.asm" SECTION "Roofs", ROMX -- cgit v1.2.3 From 417937cffc2a7c3cfac49f3b00caf1a856d0a925 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 13:47:57 -0500 Subject: Resolve #461 --- main.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index bd0719561..5aedf7bd3 100644 --- a/main.asm +++ b/main.asm @@ -400,7 +400,7 @@ SECTION "Move Animations", ROMX INCLUDE "engine/events/bug_contest/display_stats.asm" INCLUDE "engine/battle_anims/anim_commands.asm" -INCLUDE "engine/battle_anims/engine.asm" +INCLUDE "engine/battle_anims/core.asm" INCLUDE "data/battle_anims/objects.asm" INCLUDE "engine/battle_anims/functions.asm" INCLUDE "engine/battle_anims/helpers.asm" -- cgit v1.2.3 From e0088adb3f692e03e695f912bb0c4bf2e8189e75 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 17:49:19 -0500 Subject: Other files belong in data/battle/ --- main.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 5aedf7bd3..6a6344152 100644 --- a/main.asm +++ b/main.asm @@ -170,7 +170,7 @@ INCLUDE "data/trainers/parties.asm" SECTION "Battle Core", ROMX INCLUDE "engine/battle/core.asm" -INCLUDE "data/battle_command_pointers.asm" +INCLUDE "data/battle/effect_command_pointers.asm" SECTION "bank10", ROMX @@ -300,7 +300,7 @@ SECTION "bank20", ROMX INCLUDE "engine/player_movement.asm" INCLUDE "engine/engine_flags.asm" INCLUDE "engine/variables.asm" -INCLUDE "data/battle_text.asm" +INCLUDE "data/battle/battle_text.asm" INCLUDE "engine/debug.asm" -- cgit v1.2.3 From cc8dac5a22a4f9307dd2f94e4bf29ee5b132c0b7 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 00:25:14 -0500 Subject: Use constants and data for Unown chamber events --- main.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 6a6344152..66d88abbf 100644 --- a/main.asm +++ b/main.asm @@ -316,7 +316,7 @@ SECTION "Crystal Features 2", ROMX INCLUDE "engine/events/kurt.asm" INCLUDE "engine/player_gfx.asm" INCLUDE "mobile/mobile_22.asm" -INCLUDE "engine/events/crystal_unown.asm" +INCLUDE "engine/events/unown_walls.asm" INCLUDE "engine/events/buena.asm" INCLUDE "engine/events/dratini.asm" INCLUDE "engine/events/battle_tower/rules.asm" -- cgit v1.2.3 From af4001132e3ead7da12faaf6e2a09b548fb98490 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 23:50:44 -0500 Subject: Break up engine/events_3.asm --- main.asm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 66d88abbf..da9405cca 100644 --- a/main.asm +++ b/main.asm @@ -373,7 +373,10 @@ INCLUDE "data/phone/text/erin_overworld.asm" SECTION "bank2E", ROMX -INCLUDE "engine/events_3.asm" +INCLUDE "engine/events/map_name_sign.asm" +INCLUDE "engine/events/checkforhiddenitems.asm" +INCLUDE "engine/events/treemons.asm" +INCLUDE "gfx/fishing.asm" INCLUDE "engine/radio.asm" INCLUDE "engine/mail_2.asm" -- cgit v1.2.3 From 0e1148fb2c754c579284b609c4edbfd676c8d044 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 03:15:58 -0500 Subject: Move code out of data/ --- main.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'main.asm') diff --git a/main.asm b/main.asm index da9405cca..c5e49c54a 100644 --- a/main.asm +++ b/main.asm @@ -596,6 +596,7 @@ INCLUDE "data/phone/text/trainers1.asm" SECTION "Miscellaneous Text", ROMX INCLUDE "data/items/names.asm" +INCLUDE "engine/routines/printitemdescription.asm" INCLUDE "data/items/descriptions.asm" INCLUDE "data/moves/names.asm" INCLUDE "engine/landmarks.asm" -- cgit v1.2.3 From fe3ef73a8c2d22da6067bdeab1686a24d527a65e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 00:44:40 -0500 Subject: Group unused data --- main.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index f13481e2c..174063b50 100644 --- a/main.asm +++ b/main.asm @@ -253,7 +253,7 @@ INCLUDE "engine/events/basement_key.asm" INCLUDE "engine/events/sacred_ash.asm" INCLUDE "engine/tempmon.asm" INCLUDE "engine/types.asm" -INCLUDE "data/unused_text/gen_1_trainers.asm" +INCLUDE "data/unused/gen_1_trainer_names.asm" INCLUDE "engine/mon_stats.asm" INCLUDE "engine/routines/initlist.asm" INCLUDE "engine/experience.asm" @@ -262,7 +262,7 @@ INCLUDE "gfx/load_pics.asm" INCLUDE "engine/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" -INCLUDE "data/unknown_table.asm" +INCLUDE "data/unused/unknown_53d84.asm" UnknownEggPic:: ; 53d9c ; Another egg pic. This is shifted up a few pixels. -- cgit v1.2.3 From 9180362211cf465c52798124baa5c5c06ba1d332 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 11:06:17 -0500 Subject: Move code out of gfx/ (close #474) --- main.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 174063b50..a939bd84d 100644 --- a/main.asm +++ b/main.asm @@ -258,7 +258,7 @@ INCLUDE "engine/mon_stats.asm" INCLUDE "engine/routines/initlist.asm" INCLUDE "engine/experience.asm" INCLUDE "engine/routines/switchpartymons.asm" -INCLUDE "gfx/load_pics.asm" +INCLUDE "engine/load_pics.asm" INCLUDE "engine/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" @@ -355,7 +355,7 @@ SECTION "bank2E", ROMX INCLUDE "engine/events/map_name_sign.asm" INCLUDE "engine/events/checkforhiddenitems.asm" INCLUDE "engine/events/treemons.asm" -INCLUDE "gfx/fishing.asm" +INCLUDE "engine/events/loadfishinggfx.asm" INCLUDE "engine/radio.asm" INCLUDE "engine/mail_2.asm" @@ -447,7 +447,7 @@ INCLUDE "engine/crystal_intro.asm" SECTION "bank3E", ROMX -INCLUDE "gfx/font.asm" +INCLUDE "engine/load_font.asm" INCLUDE "engine/time_capsule.asm" INCLUDE "engine/events/name_rater.asm" INCLUDE "engine/routines/playslowcry.asm" @@ -477,7 +477,7 @@ INCLUDE "engine/warp_connection.asm" INCLUDE "engine/mystery_gift.asm" INCLUDE "engine/battle/used_move_text.asm" INCLUDE "mobile/mobile_41.asm" -INCLUDE "gfx/overworld_font.asm" +INCLUDE "engine/routines/loadoverworldfont.asm" SECTION "Mobile 42", ROMX -- cgit v1.2.3 From 01ba6bed889be703dbeaf8fa9be56f1b782606a1 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 18:07:06 -0500 Subject: Move code out of data/ --- main.asm | 1 - 1 file changed, 1 deletion(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index a939bd84d..57d0e17ec 100644 --- a/main.asm +++ b/main.asm @@ -253,7 +253,6 @@ INCLUDE "engine/events/basement_key.asm" INCLUDE "engine/events/sacred_ash.asm" INCLUDE "engine/tempmon.asm" INCLUDE "engine/types.asm" -INCLUDE "data/unused/gen_1_trainer_names.asm" INCLUDE "engine/mon_stats.asm" INCLUDE "engine/routines/initlist.asm" INCLUDE "engine/experience.asm" -- cgit v1.2.3 From a8eb44b6e3b2e376491c68efe4a67e8f1badb0e8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 21 Jan 2018 13:58:16 -0500 Subject: Separate new_game graphics --- main.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 57d0e17ec..367f519cf 100644 --- a/main.asm +++ b/main.asm @@ -49,7 +49,7 @@ SECTION "bank4", ROMX INCLUDE "engine/pack.asm" INCLUDE "engine/time.asm" INCLUDE "engine/tmhm.asm" -INCLUDE "engine/namingscreen.asm" +INCLUDE "engine/naming_screen.asm" INCLUDE "engine/events/misc_scripts.asm" INCLUDE "engine/events/heal_machine_anim.asm" INCLUDE "engine/events/whiteout.asm" @@ -194,7 +194,7 @@ SECTION "Crystal Features 1", ROMX INCLUDE "engine/init_gender.asm" INCLUDE "engine/routines/drawkrispackgfx.asm" INCLUDE "engine/events/move_tutor.asm" -INCLUDE "engine/crystal_colors.asm" +INCLUDE "engine/crystal_cgb.asm" INCLUDE "engine/events/celebi.asm" INCLUDE "engine/main_menu.asm" INCLUDE "mobile/mobile_menu.asm" @@ -216,10 +216,10 @@ INCLUDE "engine/routines/loadmappart.asm" INCLUDE "engine/routines/phonering_copytilemapatonce.asm" Shrink1Pic: ; 4d249 -INCBIN "gfx/shrink/shrink1.2bpp.lz" +INCBIN "gfx/new_game/shrink1.2bpp.lz" Shrink2Pic: ; 4d2d9 -INCBIN "gfx/shrink/shrink2.2bpp.lz" +INCBIN "gfx/new_game/shrink2.2bpp.lz" INCLUDE "engine/link_2.asm" INCLUDE "engine/delete_save_change_clock.asm" -- cgit v1.2.3 From 81ba6c848aaada66cf2026ba765a48c98893431a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 21 Jan 2018 14:05:32 -0500 Subject: cgb layouts --- main.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 367f519cf..fc03bd045 100644 --- a/main.asm +++ b/main.asm @@ -194,7 +194,7 @@ SECTION "Crystal Features 1", ROMX INCLUDE "engine/init_gender.asm" INCLUDE "engine/routines/drawkrispackgfx.asm" INCLUDE "engine/events/move_tutor.asm" -INCLUDE "engine/crystal_cgb.asm" +INCLUDE "engine/crystal_layouts.asm" INCLUDE "engine/events/celebi.asm" INCLUDE "engine/main_menu.asm" INCLUDE "mobile/mobile_menu.asm" -- cgit v1.2.3 From 5e4fa42fa7e2405760efc77f8c2e7167e67990ac Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 21 Jan 2018 17:45:56 -0500 Subject: Unrelated routine gets its own file --- main.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'main.asm') diff --git a/main.asm b/main.asm index fc03bd045..390e85cb9 100644 --- a/main.asm +++ b/main.asm @@ -253,6 +253,7 @@ INCLUDE "engine/events/basement_key.asm" INCLUDE "engine/events/sacred_ash.asm" INCLUDE "engine/tempmon.asm" INCLUDE "engine/types.asm" +INCLUDE "engine/routines/unreferenced_getgen1trainerclassname.asm" INCLUDE "engine/mon_stats.asm" INCLUDE "engine/routines/initlist.asm" INCLUDE "engine/experience.asm" -- cgit v1.2.3 From 7f54df58bfb00564874f8b6b3acef52a9aff7442 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 21 Jan 2018 18:00:23 -0500 Subject: Group engine/pokedex files --- main.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 390e85cb9..11f4fd39e 100644 --- a/main.asm +++ b/main.asm @@ -175,7 +175,7 @@ INCLUDE "data/battle/effect_command_pointers.asm" SECTION "bank10", ROMX -INCLUDE "engine/pokedex.asm" +INCLUDE "engine/pokedex/pokedex.asm" INCLUDE "data/moves/moves.asm" INCLUDE "engine/evolve.asm" @@ -184,7 +184,7 @@ SECTION "bank11", ROMX INCLUDE "engine/events/fruit_trees.asm" INCLUDE "engine/battle/ai/move.asm" -INCLUDE "engine/pokedex_2.asm" +INCLUDE "engine/pokedex/pokedex_2.asm" INCLUDE "data/pokemon/dex_entry_pointers.asm" INCLUDE "engine/mail.asm" @@ -451,9 +451,9 @@ INCLUDE "engine/load_font.asm" INCLUDE "engine/time_capsule.asm" INCLUDE "engine/events/name_rater.asm" INCLUDE "engine/routines/playslowcry.asm" -INCLUDE "engine/routines/newpokedexentry.asm" +INCLUDE "engine/pokedex/newpokedexentry.asm" INCLUDE "engine/time_capsule_2.asm" -INCLUDE "engine/unown_dex.asm" +INCLUDE "engine/pokedex/unown_dex.asm" INCLUDE "engine/events/magikarp.asm" INCLUDE "engine/battle/hidden_power.asm" INCLUDE "engine/battle/misc.asm" @@ -584,7 +584,7 @@ SECTION "bank77_2", ROMX INCLUDE "engine/routines/printhoursmins.asm" INCLUDE "engine/diploma.asm" -INCLUDE "engine/pokedex_3.asm" +INCLUDE "engine/pokedex/pokedex_3.asm" INCLUDE "engine/events/catch_tutorial_input.asm" INCLUDE "engine/routines/townmap_convertlinebreakcharacters.asm" -- cgit v1.2.3