pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)

Browse Source 
# Conflicts:
#	engine/battle/core.asm
#	engine/save.asm
This commit is contained in:
Remy Oukaour
2018-01-14 23:00:22 -05:00
parent 5c28d05bb4 6c5cd7a963
commit dfcca93b45
54 changed files with 298 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/mobile_46.asm
View File

@@ -7213,7 +7213,7 @@ Function11b483: ; 11b483
jr .loop8
.okay4
ld a, $0 ; BANK(sPartyMail)
ld a, BANK(sPartyMail)
call GetSRAMBank
ld a, MAIL_STRUCT_LENGTH
.loop9

249
mobile/mobile_5f.asm
View File

File diff suppressed because it is too large Load Diff

2
mobile/print_opp_message.asm
View File

@@ -10,7 +10,7 @@ Mobile_PrintOpponentBattleMessage: ; 4ea0a
call AddNTimes
ld de, wMobileOpponentBattleMessage
ld bc, $c
ld a, $5 ; BANK(w5_MobileOpponentBattleMessages)
ld a, BANK(w5_MobileOpponentBattleMessages)
call FarCopyWRAM
ld a, [rSVBK]