summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--constants/mobile_constants.asm4
-rw-r--r--constants/pokemon_constants.asm2
-rwxr-xr-xengine/dma_transfer.asm (renamed from misc/gfx_41.asm)13
-rw-r--r--engine/gbc_only.asm (renamed from misc/gbc_only.asm)0
-rwxr-xr-xengine/init_gender.asm2
-rwxr-xr-xengine/print_party.asm (renamed from misc/printer_77.asm)14
-rw-r--r--engine/unused_title.asm (renamed from misc/unused_title.asm)0
-rw-r--r--gfx/emotes.asm12
-rw-r--r--gfx/printer/hp.png (renamed from gfx/mobile/hp.png)bin84 -> 84 bytes
-rw-r--r--gfx/printer/lv.png (renamed from gfx/mobile/lv.png)bin79 -> 79 bytes
-rw-r--r--main.asm40
-rwxr-xr-xmisc/battle_tower_47.asm2
-rwxr-xr-xmobile/fixed_words.asm (renamed from misc/fixed_words.asm)0
-rwxr-xr-xmobile/mobile_12.asm (renamed from misc/mobile_12.asm)0
-rwxr-xr-xmobile/mobile_12_2.asm (renamed from misc/mobile_12_2.asm)0
-rw-r--r--mobile/mobile_22.asm (renamed from misc/mobile_22.asm)0
-rw-r--r--mobile/mobile_22_2.asm (renamed from misc/mobile_22_2.asm)0
-rw-r--r--mobile/mobile_40.asm (renamed from misc/mobile_40.asm)0
-rwxr-xr-xmobile/mobile_41.asm (renamed from misc/mobile_41.asm)0
-rw-r--r--mobile/mobile_42.asm (renamed from misc/mobile_42.asm)0
-rw-r--r--mobile/mobile_45.asm (renamed from misc/mobile_45.asm)2
-rwxr-xr-xmobile/mobile_45_sprite_engine.asm (renamed from misc/mobile_45_sprite_engine.asm)0
-rwxr-xr-xmobile/mobile_46.asm (renamed from misc/mobile_46.asm)0
-rwxr-xr-xmobile/mobile_5b.asm (renamed from misc/mobile_5b.asm)0
-rwxr-xr-xmobile/mobile_5c.asm (renamed from misc/mobile_5c.asm)0
-rw-r--r--mobile/mobile_5f.asm (renamed from misc/mobile_5f.asm)0
-rwxr-xr-xmobile/mobile_menu.asm (renamed from misc/mobile_menu.asm)0
27 files changed, 45 insertions, 46 deletions
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
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
index a77a44d72..a77a44d72 100644
--- a/misc/gbc_only.asm
+++ b/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
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
index 6cd79237b..6cd79237b 100644
--- a/misc/unused_title.asm
+++ b/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
index 908141634..908141634 100644
--- a/gfx/mobile/hp.png
+++ b/gfx/printer/hp.png
Binary files differ
diff --git a/gfx/mobile/lv.png b/gfx/printer/lv.png
index 5176fc585..5176fc585 100644
--- a/gfx/mobile/lv.png
+++ b/gfx/printer/lv.png
Binary files differ
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
index 56e53da91..56e53da91 100755
--- a/misc/fixed_words.asm
+++ b/mobile/fixed_words.asm
diff --git a/misc/mobile_12.asm b/mobile/mobile_12.asm
index efe138162..efe138162 100755
--- a/misc/mobile_12.asm
+++ b/mobile/mobile_12.asm
diff --git a/misc/mobile_12_2.asm b/mobile/mobile_12_2.asm
index 37179c122..37179c122 100755
--- a/misc/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
diff --git a/misc/mobile_22.asm b/mobile/mobile_22.asm
index 17b526586..17b526586 100644
--- a/misc/mobile_22.asm
+++ b/mobile/mobile_22.asm
diff --git a/misc/mobile_22_2.asm b/mobile/mobile_22_2.asm
index 321998dc7..321998dc7 100644
--- a/misc/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
diff --git a/misc/mobile_40.asm b/mobile/mobile_40.asm
index fa6a39fdf..fa6a39fdf 100644
--- a/misc/mobile_40.asm
+++ b/mobile/mobile_40.asm
diff --git a/misc/mobile_41.asm b/mobile/mobile_41.asm
index 37e10a01e..37e10a01e 100755
--- a/misc/mobile_41.asm
+++ b/mobile/mobile_41.asm
diff --git a/misc/mobile_42.asm b/mobile/mobile_42.asm
index b625d6bcf..b625d6bcf 100644
--- a/misc/mobile_42.asm
+++ b/mobile/mobile_42.asm
diff --git a/misc/mobile_45.asm b/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
index a85e7fce4..a85e7fce4 100755
--- a/misc/mobile_45_sprite_engine.asm
+++ b/mobile/mobile_45_sprite_engine.asm
diff --git a/misc/mobile_46.asm b/mobile/mobile_46.asm
index 48fed0f33..48fed0f33 100755
--- a/misc/mobile_46.asm
+++ b/mobile/mobile_46.asm
diff --git a/misc/mobile_5b.asm b/mobile/mobile_5b.asm
index 679f04342..679f04342 100755
--- a/misc/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
diff --git a/misc/mobile_5c.asm b/mobile/mobile_5c.asm
index 5b7418a0f..5b7418a0f 100755
--- a/misc/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
diff --git a/misc/mobile_5f.asm b/mobile/mobile_5f.asm
index 816e23394..816e23394 100644
--- a/misc/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
diff --git a/misc/mobile_menu.asm b/mobile/mobile_menu.asm
index 1bee0cced..1bee0cced 100755
--- a/misc/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 16:10:49 +0000