pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Keep mobile SECTION declarations in main.asm, and name them "mobileXX" like "bankXX"

Browse Source
This commit is contained in:
Rangi
2019-11-23 20:31:30 -05:00
parent 5e104de3f5
commit 008f591a3a
7 changed files with 2247 additions and 2252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main.asm
View File

@ -518,6 +518,8 @@ INCLUDE "engine/events/npc_trade.asm"
INCLUDE "engine/events/mom_phone.asm" INCLUDE "engine/events/mom_phone.asm"
SECTION "mobile40", ROMX
INCLUDE "mobile/mobile_40.asm" INCLUDE "mobile/mobile_40.asm"
@ -532,7 +534,7 @@ INCLUDE "mobile/mobile_41.asm"
INCLUDE "engine/gfx/load_overworld_font.asm" INCLUDE "engine/gfx/load_overworld_font.asm"
SECTION "Mobile 42", ROMX SECTION "mobile42", ROMX
INCLUDE "mobile/mobile_42.asm" INCLUDE "mobile/mobile_42.asm"
@ -549,8 +551,15 @@ INCLUDE "engine/movie/unused_title.asm"
INCLUDE "engine/movie/title.asm" INCLUDE "engine/movie/title.asm"
INCLUDE "mobile/mobile_45.asm" SECTION "mobile45", ROMX
INCLUDE "mobile/mobile_45.asm"
INCLUDE "mobile/mobile_45_sprite_engine.asm"
INCLUDE "mobile/mobile_45_2.asm"
INCLUDE "mobile/mobile_45_stadium.asm"
SECTION "mobile46", ROMX
INCLUDE "mobile/mobile_46.asm" INCLUDE "mobile/mobile_46.asm"
@ -566,7 +575,7 @@ INCLUDE "mobile/mobile_5b.asm"
INCLUDE "engine/link/link_trade.asm" INCLUDE "engine/link/link_trade.asm"
SECTION "Mobile 5C", ROMX SECTION "mobile5C", ROMX
INCLUDE "mobile/mobile_5c.asm" INCLUDE "mobile/mobile_5c.asm"
@ -595,12 +604,12 @@ SECTION "UpdateBattleHUDs", ROMX
INCLUDE "engine/battle/update_battle_huds.asm" INCLUDE "engine/battle/update_battle_huds.asm"
SECTION "Mobile 5E", ROMX SECTION "mobile5E", ROMX
INCLUDE "mobile/mobile_5e.asm" INCLUDE "mobile/mobile_5e.asm"
SECTION "Mobile 5F", ROMX SECTION "mobile5F", ROMX
INCLUDE "mobile/mobile_5f.asm" INCLUDE "mobile/mobile_5f.asm"

2
mobile/mobile_40.asm
View File

@ -1,5 +1,3 @@
SECTION "mobile_40", ROMX
Function100000: Function100000:
; d: 1 or 2 ; d: 1 or 2
; e: bank ; e: bank

2235
mobile/mobile_45.asm
View File

File diff suppressed because it is too large Load Diff

1403
mobile/mobile_45_2.asm Normal file
View File

File diff suppressed because it is too large Load Diff

823
mobile/mobile_45_stadium.asm Normal file
View File

File diff suppressed because it is too large Load Diff

2
mobile/mobile_46.asm
View File

@ -1,5 +1,3 @@
SECTION "Mobile 46", ROMX
Function118000: Function118000:
ld a, $1 ld a, $1
ld [wcd38], a ld [wcd38], a

15
pokecrystal.link
View File

@ -166,11 +166,11 @@ ROMX $3e
ROMX $3f ROMX $3f
"bank3F" "bank3F"
ROMX $40 ROMX $40
"mobile_40" "mobile40"
ROMX $41 ROMX $41
"bank41" "bank41"
ROMX $42 ROMX $42
"Mobile 42" "mobile42"
"Intro Logo" "Intro Logo"
"Credits" "Credits"
ROMX $43 ROMX $43
@ -178,10 +178,9 @@ ROMX $43
ROMX $44 ROMX $44
"Mobile Adapter SDK" "Mobile Adapter SDK"
ROMX $45 ROMX $45
"Mobile 45" "mobile45"
"Mobile Stadium"
ROMX $46 ROMX $46
"Mobile 46" "mobile46"
ROMX $47 ROMX $47
"Battle Tower" "Battle Tower"
ROMX $48 ROMX $48
@ -231,7 +230,7 @@ ROMX $5b
"bank5B" "bank5B"
"Pics 20" "Pics 20"
ROMX $5c ROMX $5c
"Mobile 5C" "mobile5C"
"Pics 21" "Pics 21"
ROMX $5d ROMX $5d
"Crystal Phone Text 2" "Crystal Phone Text 2"
@ -240,10 +239,10 @@ ROMX $5e
"UpdateBattleHUDs" "UpdateBattleHUDs"
"Songs 5" "Songs 5"
"Crystal Sound Effects" "Crystal Sound Effects"
"Mobile 5E" "mobile5E"
"Pics 23" "Pics 23"
ROMX $5f ROMX $5f
"Mobile 5F" "mobile5F"
"Pics 24" "Pics 24"
ROMX $60 ROMX $60
"Map Scripts 13" "Map Scripts 13"