From ebf3bfb6b289bf684941a86cafe1286d8ce212fe Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 15 Dec 2017 12:53:33 -0500 Subject: [PATCH] Move some misc/ files into meaningful directories --- constants/mobile_constants.asm | 4 +- constants/pokemon_constants.asm | 2 +- misc/gfx_41.asm => engine/dma_transfer.asm | 13 ------ {misc => engine}/gbc_only.asm | 0 engine/init_gender.asm | 2 +- misc/printer_77.asm => engine/print_party.asm | 14 ++++-- {misc => engine}/unused_title.asm | 0 gfx/emotes.asm | 12 ++++++ gfx/{mobile => printer}/hp.png | Bin gfx/{mobile => printer}/lv.png | Bin main.asm | 40 ++++++++---------- misc/battle_tower_47.asm | 2 +- {misc => mobile}/fixed_words.asm | 0 {misc => mobile}/mobile_12.asm | 0 {misc => mobile}/mobile_12_2.asm | 0 {misc => mobile}/mobile_22.asm | 0 {misc => mobile}/mobile_22_2.asm | 0 {misc => mobile}/mobile_40.asm | 0 {misc => mobile}/mobile_41.asm | 0 {misc => mobile}/mobile_42.asm | 0 {misc => mobile}/mobile_45.asm | 2 +- {misc => mobile}/mobile_45_sprite_engine.asm | 0 {misc => mobile}/mobile_46.asm | 0 {misc => mobile}/mobile_5b.asm | 0 {misc => mobile}/mobile_5c.asm | 0 {misc => mobile}/mobile_5f.asm | 0 {misc => mobile}/mobile_menu.asm | 0 27 files changed, 45 insertions(+), 46 deletions(-) rename misc/gfx_41.asm => engine/dma_transfer.asm (94%) rename {misc => engine}/gbc_only.asm (100%) rename misc/printer_77.asm => engine/print_party.asm (96%) rename {misc => engine}/unused_title.asm (100%) create mode 100644 gfx/emotes.asm rename gfx/{mobile => printer}/hp.png (100%) rename gfx/{mobile => printer}/lv.png (100%) rename {misc => mobile}/fixed_words.asm (100%) rename {misc => mobile}/mobile_12.asm (100%) rename {misc => mobile}/mobile_12_2.asm (100%) rename {misc => mobile}/mobile_22.asm (100%) rename {misc => mobile}/mobile_22_2.asm (100%) rename {misc => mobile}/mobile_40.asm (100%) rename {misc => mobile}/mobile_41.asm (100%) rename {misc => mobile}/mobile_42.asm (100%) rename {misc => mobile}/mobile_45.asm (99%) rename {misc => mobile}/mobile_45_sprite_engine.asm (100%) rename {misc => mobile}/mobile_46.asm (100%) rename {misc => mobile}/mobile_5b.asm (100%) rename {misc => mobile}/mobile_5c.asm (100%) rename {misc => mobile}/mobile_5f.asm (100%) rename {misc => mobile}/mobile_menu.asm (100%) diff --git a/constants/mobile_constants.asm b/constants/mobile_constants.asm index 0ac28c94b..b5894b8e9 100644 --- a/constants/mobile_constants.asm +++ b/constants/mobile_constants.asm @@ -1,4 +1,4 @@ -; MobileEZChatCategoryPointers indexes (see misc/fixed_words.asm) +; MobileEZChatCategoryPointers indexes (see mobile/fixed_words.asm) const_def const EZCHAT_POKEMON const EZCHAT_TYPES @@ -16,6 +16,6 @@ const EZCHAT_FAREWELLS const EZCHAT_THISANDTHAT -NUM_KANA EQU 45 ; length of SortedPokemon table (see misc/fixed_words.asm) +NUM_KANA EQU 45 ; length of SortedPokemon table (see mobile/fixed_words.asm) MOBILE_LOGIN_PASSWORD_LENGTH EQU 17 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 7af42d3d6..13cb577bb 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -16,7 +16,7 @@ ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) ; - MonMenuIcons (see data/pokemon/menu_icons.asm) ; - Pokered_MonIndices (see data/time_capsule/mon_order.asm) -; - SortedPokemon (see misc/fixed_words.asm) +; - SortedPokemon (see mobile/fixed_words.asm) const_value set 1 const BULBASAUR ; 01 const IVYSAUR ; 02 diff --git a/misc/gfx_41.asm b/engine/dma_transfer.asm similarity index 94% rename from misc/gfx_41.asm rename to engine/dma_transfer.asm index f627c85ff..a0dad0dde 100755 --- a/misc/gfx_41.asm +++ b/engine/dma_transfer.asm @@ -623,16 +623,3 @@ HDMATransfer_OnlyTopFourRows: ; 104303 jr nz, .outer_loop ret ; 104350 - -ShockEmote: INCBIN "gfx/emotes/shock.2bpp" -QuestionEmote: INCBIN "gfx/emotes/question.2bpp" -HappyEmote: INCBIN "gfx/emotes/happy.2bpp" -SadEmote: INCBIN "gfx/emotes/sad.2bpp" -HeartEmote: INCBIN "gfx/emotes/heart.2bpp" -BoltEmote: INCBIN "gfx/emotes/bolt.2bpp" -SleepEmote: INCBIN "gfx/emotes/sleep.2bpp" -FishEmote: INCBIN "gfx/emotes/fish.2bpp" -JumpShadowGFX: INCBIN "gfx/overworld/shadow.2bpp" -FishingRodGFX: INCBIN "gfx/overworld/fishing_rod.2bpp" -BoulderDustGFX: INCBIN "gfx/overworld/boulder_dust.2bpp" -GrassRustleGFX: INCBIN "gfx/overworld/grass_rustle.2bpp" diff --git a/misc/gbc_only.asm b/engine/gbc_only.asm similarity index 100% rename from misc/gbc_only.asm rename to engine/gbc_only.asm diff --git a/engine/init_gender.asm b/engine/init_gender.asm index 3ae856029..dfb3fbdd4 100755 --- a/engine/init_gender.asm +++ b/engine/init_gender.asm @@ -20,7 +20,7 @@ InitCrystalData: ; 48000 ret ; 4802f -INCLUDE "misc/mobile_12.asm" +INCLUDE "mobile/mobile_12.asm" InitGender: ; 48dcb (12:4dcb) call InitGenderScreen diff --git a/misc/printer_77.asm b/engine/print_party.asm similarity index 96% rename from misc/printer_77.asm rename to engine/print_party.asm index 4f67909b0..9bf98767b 100755 --- a/misc/printer_77.asm +++ b/engine/print_party.asm @@ -140,14 +140,14 @@ PrintPartyMonPage1: ; 1dc381 ld [hBGMapMode], a call LoadFontsBattleExtra - ld de, MobileHPIcon + ld de, GBPrinterHPIcon ld hl, VTiles2 tile $71 - lb bc, BANK(MobileHPIcon), 1 + lb bc, BANK(GBPrinterHPIcon), 1 call Request1bpp - ld de, MobileLvIcon + ld de, GBPrinterLvIcon ld hl, VTiles2 tile $6e - lb bc, BANK(MobileLvIcon), 1 + lb bc, BANK(GBPrinterLvIcon), 1 call Request1bpp ld de, ShinyIconGFX @@ -354,3 +354,9 @@ String1dc55d: ; 1dc55d String1dc584: ; 1dc584 db "------------@" ; 1dc591 + +GBPrinterHPIcon: ; 1dc591 +INCBIN "gfx/printer/hp.1bpp" + +GBPrinterLvIcon: ; 1dc599 +INCBIN "gfx/printer/lv.1bpp" diff --git a/misc/unused_title.asm b/engine/unused_title.asm similarity index 100% rename from misc/unused_title.asm rename to engine/unused_title.asm diff --git a/gfx/emotes.asm b/gfx/emotes.asm new file mode 100644 index 000000000..1de06de2c --- /dev/null +++ b/gfx/emotes.asm @@ -0,0 +1,12 @@ +ShockEmote: INCBIN "gfx/emotes/shock.2bpp" +QuestionEmote: INCBIN "gfx/emotes/question.2bpp" +HappyEmote: INCBIN "gfx/emotes/happy.2bpp" +SadEmote: INCBIN "gfx/emotes/sad.2bpp" +HeartEmote: INCBIN "gfx/emotes/heart.2bpp" +BoltEmote: INCBIN "gfx/emotes/bolt.2bpp" +SleepEmote: INCBIN "gfx/emotes/sleep.2bpp" +FishEmote: INCBIN "gfx/emotes/fish.2bpp" +JumpShadowGFX: INCBIN "gfx/overworld/shadow.2bpp" +FishingRodGFX: INCBIN "gfx/overworld/fishing_rod.2bpp" +BoulderDustGFX: INCBIN "gfx/overworld/boulder_dust.2bpp" +GrassRustleGFX: INCBIN "gfx/overworld/grass_rustle.2bpp" diff --git a/gfx/mobile/hp.png b/gfx/printer/hp.png similarity index 100% rename from gfx/mobile/hp.png rename to gfx/printer/hp.png diff --git a/gfx/mobile/lv.png b/gfx/printer/lv.png similarity index 100% rename from gfx/mobile/lv.png rename to gfx/printer/lv.png diff --git a/main.asm b/main.asm index f46b579c5..629e34968 100644 --- a/main.asm +++ b/main.asm @@ -1784,9 +1784,9 @@ Unknown_4985a: ; unreferenced INCLUDE "event/celebi.asm" INCLUDE "engine/main_menu.asm" -INCLUDE "misc/mobile_menu.asm" +INCLUDE "mobile/mobile_menu.asm" INCLUDE "engine/search.asm" -INCLUDE "misc/mobile_12_2.asm" +INCLUDE "mobile/mobile_12_2.asm" ; mobile battle selection AskRememberPassword: ; 4ae12 @@ -3196,7 +3196,7 @@ CheckBattleScene: ; 4ea44 scf ret -INCLUDE "misc/gbc_only.asm" +INCLUDE "engine/gbc_only.asm" INCLUDE "event/poke_seer.asm" @@ -4604,12 +4604,12 @@ INCBIN "gfx/player/kris_back.2bpp" String_89116: db "-----@" -INCLUDE "misc/mobile_22.asm" +INCLUDE "mobile/mobile_22.asm" INCLUDE "event/unown.asm" INCLUDE "event/buena.asm" INCLUDE "event/dratini.asm" INCLUDE "event/battle_tower.asm" -INCLUDE "misc/mobile_22_2.asm" +INCLUDE "mobile/mobile_22_2.asm" SECTION "bank23", ROMX @@ -5088,17 +5088,17 @@ INCLUDE "event/mom_phone.asm" SECTION "mobile_40", ROMX -INCLUDE "misc/mobile_40.asm" +INCLUDE "mobile/mobile_40.asm" SECTION "bank41", ROMX -INCLUDE "misc/gfx_41.asm" - +INCLUDE "engine/dma_transfer.asm" +INCLUDE "gfx/emotes.asm" INCLUDE "engine/warp_connection.asm" INCLUDE "engine/mysterygift.asm" INCLUDE "battle/used_move_text.asm" -INCLUDE "misc/mobile_41.asm" +INCLUDE "mobile/mobile_41.asm" LoadOverworldFont:: ; 106594 ld de, .font @@ -5120,7 +5120,7 @@ INCBIN "gfx/font/space.2bpp" SECTION "mobile_42", ROMX -INCLUDE "misc/mobile_42.asm" +INCLUDE "mobile/mobile_42.asm" SECTION "Intro Logo", ROMX @@ -5131,10 +5131,10 @@ INCBIN "gfx/intro/logo.2bpp.lz" SECTION "bank43", ROMX -INCLUDE "misc/unused_title.asm" +INCLUDE "engine/unused_title.asm" INCLUDE "engine/title.asm" -INCLUDE "misc/mobile_45.asm" -INCLUDE "misc/mobile_46.asm" +INCLUDE "mobile/mobile_45.asm" +INCLUDE "mobile/mobile_46.asm" SECTION "battle_tower_47", ROMX @@ -5144,13 +5144,13 @@ INCLUDE "misc/battle_tower_47.asm" SECTION "bank5B", ROMX -INCLUDE "misc/mobile_5b.asm" +INCLUDE "mobile/mobile_5b.asm" INCLUDE "engine/link_trade.asm" SECTION "mobile_5c", ROMX -INCLUDE "misc/mobile_5c.asm" +INCLUDE "mobile/mobile_5c.asm" SECTION "Crystal Phone Text 2", ROMX @@ -5170,7 +5170,7 @@ _UpdateBattleHUDs: callba FinishBattleAnim ret -INCLUDE "misc/mobile_5f.asm" +INCLUDE "mobile/mobile_5f.asm" SECTION "Common Text 1", ROMX @@ -5210,13 +5210,7 @@ SECTION "bank77", ROMX UnownFont: ; 1dc000 INCBIN "gfx/font/unown_font.2bpp" -INCLUDE "misc/printer_77.asm" - -MobileHPIcon: ; 1dc591 -INCBIN "gfx/mobile/hp.1bpp" - -MobileLvIcon: ; 1dc599 -INCBIN "gfx/mobile/lv.1bpp" +INCLUDE "engine/print_party.asm" SECTION "bank77_2", ROMX diff --git a/misc/battle_tower_47.asm b/misc/battle_tower_47.asm index f9e2ac0ea..d0ca6edd8 100755 --- a/misc/battle_tower_47.asm +++ b/misc/battle_tower_47.asm @@ -85,7 +85,7 @@ ENDC ret ; 11c05d -INCLUDE "misc/fixed_words.asm" +INCLUDE "mobile/fixed_words.asm" BTTrainerClassGenders: ; 11f2f0 db MALE ; FALKNER diff --git a/misc/fixed_words.asm b/mobile/fixed_words.asm similarity index 100% rename from misc/fixed_words.asm rename to mobile/fixed_words.asm diff --git a/misc/mobile_12.asm b/mobile/mobile_12.asm similarity index 100% rename from misc/mobile_12.asm rename to mobile/mobile_12.asm diff --git a/misc/mobile_12_2.asm b/mobile/mobile_12_2.asm similarity index 100% rename from misc/mobile_12_2.asm rename to mobile/mobile_12_2.asm diff --git a/misc/mobile_22.asm b/mobile/mobile_22.asm similarity index 100% rename from misc/mobile_22.asm rename to mobile/mobile_22.asm diff --git a/misc/mobile_22_2.asm b/mobile/mobile_22_2.asm similarity index 100% rename from misc/mobile_22_2.asm rename to mobile/mobile_22_2.asm diff --git a/misc/mobile_40.asm b/mobile/mobile_40.asm similarity index 100% rename from misc/mobile_40.asm rename to mobile/mobile_40.asm diff --git a/misc/mobile_41.asm b/mobile/mobile_41.asm similarity index 100% rename from misc/mobile_41.asm rename to mobile/mobile_41.asm diff --git a/misc/mobile_42.asm b/mobile/mobile_42.asm similarity index 100% rename from misc/mobile_42.asm rename to mobile/mobile_42.asm diff --git a/misc/mobile_45.asm b/mobile/mobile_45.asm similarity index 99% rename from misc/mobile_45.asm rename to mobile/mobile_45.asm index d6743acc2..d300a0373 100644 --- a/misc/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -5342,7 +5342,7 @@ Function115d80: ; 115d80 ; 115d99 -INCLUDE "misc/mobile_45_sprite_engine.asm" +INCLUDE "mobile/mobile_45_sprite_engine.asm" ; 116567 diff --git a/misc/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm similarity index 100% rename from misc/mobile_45_sprite_engine.asm rename to mobile/mobile_45_sprite_engine.asm diff --git a/misc/mobile_46.asm b/mobile/mobile_46.asm similarity index 100% rename from misc/mobile_46.asm rename to mobile/mobile_46.asm diff --git a/misc/mobile_5b.asm b/mobile/mobile_5b.asm similarity index 100% rename from misc/mobile_5b.asm rename to mobile/mobile_5b.asm diff --git a/misc/mobile_5c.asm b/mobile/mobile_5c.asm similarity index 100% rename from misc/mobile_5c.asm rename to mobile/mobile_5c.asm diff --git a/misc/mobile_5f.asm b/mobile/mobile_5f.asm similarity index 100% rename from misc/mobile_5f.asm rename to mobile/mobile_5f.asm diff --git a/misc/mobile_menu.asm b/mobile/mobile_menu.asm similarity index 100% rename from misc/mobile_menu.asm rename to mobile/mobile_menu.asm