mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Move some misc/ files into meaningful directories
This commit is contained in:
parent
253c09949b
commit
ebf3bfb6b2
@ -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
|
||||
|
@ -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
|
||||
|
@ -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"
|
@ -20,7 +20,7 @@ InitCrystalData: ; 48000
|
||||
ret
|
||||
; 4802f
|
||||
|
||||
INCLUDE "misc/mobile_12.asm"
|
||||
INCLUDE "mobile/mobile_12.asm"
|
||||
|
||||
InitGender: ; 48dcb (12:4dcb)
|
||||
call InitGenderScreen
|
||||
|
@ -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"
|
12
gfx/emotes.asm
Normal file
12
gfx/emotes.asm
Normal file
@ -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"
|
Before Width: | Height: | Size: 84 B After Width: | Height: | Size: 84 B |
Before Width: | Height: | Size: 79 B After Width: | Height: | Size: 79 B |
40
main.asm
40
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
|
||||
|
@ -85,7 +85,7 @@ ENDC
|
||||
ret
|
||||
; 11c05d
|
||||
|
||||
INCLUDE "misc/fixed_words.asm"
|
||||
INCLUDE "mobile/fixed_words.asm"
|
||||
|
||||
BTTrainerClassGenders: ; 11f2f0
|
||||
db MALE ; FALKNER
|
||||
|
@ -5342,7 +5342,7 @@ Function115d80: ; 115d80
|
||||
|
||||
; 115d99
|
||||
|
||||
INCLUDE "misc/mobile_45_sprite_engine.asm"
|
||||
INCLUDE "mobile/mobile_45_sprite_engine.asm"
|
||||
|
||||
; 116567
|
||||
|
Loading…
Reference in New Issue
Block a user