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

Move effects; no more reloadmapmusic, returnafterbattle

Browse Source
This commit is contained in:
PikalaxALT
2015-12-26 18:11:55 -05:00
parent f485a45cda
commit 2bd45ca574
96 changed files with 1281 additions and 1078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
misc/fixed_words.asm
View File

@@ -1281,7 +1281,7 @@ Function11c86e: ; 11c86e (47:486e)
and a
jr z, .asm_11c88a
hlcoord 2, 17
ld de, String_11c8f0
ld de, MobileString_Prev
call PlaceString
hlcoord 6, 17
ld c, $3
@@ -1308,7 +1308,7 @@ Function11c86e: ; 11c86e (47:486e)
cp [hl]
jr nc, .asm_11c8b7
hlcoord 16, 17
ld de, String_11c8f3
ld de, MobileString_Next
call PlaceString
hlcoord 11, 17
ld a, $3
@@ -1332,7 +1332,7 @@ Function11c86e: ; 11c86e (47:486e)
ret
; 11c8c7 (47:48c7)
Function11c8c7: ; 11c8c7
BCD2String: ; 11c8c7
inc a
push af
and $f
@@ -1340,30 +1340,30 @@ Function11c8c7: ; 11c8c7
pop af
and $f0
swap a
ld [hQuotient], a
ld [hDividend + 1], a
xor a
ld [$ffb5], a
ld [hDividend + 2], a
push hl
callba Function11a80c
pop hl
ld a, [wcd63]
add $f6
add "0"
ld [hli], a
ld a, [wcd62]
add $f6
add "0"
ld [hli], a
ret
; 11c8ec
String_11c8ec: ; 11c8ec
MobileString_Page: ; 11c8ec
db "ぺージ@"
; 11c8f0
String_11c8f0: ; 11c8f0
MobileString_Prev: ; 11c8f0
db "まえ@"
; 11c8f3
String_11c8f3: ; 11c8f3
MobileString_Next: ; 11c8f3
db "つぎ@"
; 11c8f6

4
misc/mobile_12.asm
View File

@@ -49,8 +49,8 @@ InitMobileProfile: ; 4802f (12:402f)
call GetMysteryGift_MobileAdapterLayout
call ClearBGPalettes
hlcoord 0, 0
ld b, $2
ld c, $14
ld b, 2
ld c, 20
call ClearBox
hlcoord 0, 1
ld a, $c

2
misc/mobile_22_2.asm
View File

@@ -48,7 +48,7 @@ Function8b35d: ; 8b35d
Function8b363: ; 8b363
push bc
callba Function10632f
callba Mobile_AlwaysReturnNotCarry
pop bc
ret
; 8b36c

20
misc/mobile_40.asm
View File

@@ -1808,7 +1808,7 @@ Function100b12: ; 100b12
ld [wMenuCursorBuffer], a
call Function100e72
call Function100b45
callba Function8e85
callba InitBattlePartyMenuPals
call Function100ed4
ld a, [wMenuCursorBuffer]
ld [wd0d2], a
@@ -1866,7 +1866,7 @@ MobileMoveSelectionScreen: ; 100b9f
call Function100e72
call Function100bc2
push af
callba Function8e85
callba InitBattlePartyMenuPals
call Function100ed4
pop af
ret
@@ -2159,14 +2159,14 @@ Function100db0: ; 100db0
Function100dc0: ; 100dc0
ld a, [wLinkMode]
cp LINK_MOBILE
jr nz, .asm_100dd0
jr nz, .mobile
ld hl, wcd2a
bit 3, [hl]
jr z, .asm_100dd0
jr z, .mobile
scf
ret
.asm_100dd0
.mobile
xor a
ret
; 100dd2
@@ -2597,7 +2597,7 @@ Function10107d: ; 10107d
ld bc, NAME_LENGTH
call .CopyAllFromOT
ld hl, OTPartyMonOT
ld de, wc656 + 1
ld de, OTName + 1
ld bc, NAME_LENGTH
call .CopyAllFromOT
ld hl, OTPartyMon1Species
@@ -7784,7 +7784,7 @@ MenuData2_103648: ; 103648
; 103654
Function103654: ; 103654
callba Function10632f
callba Mobile_AlwaysReturnNotCarry
bit 7, c
jr nz, .asm_103666
ld hl, wcd2a
@@ -7800,7 +7800,7 @@ Function103654: ; 103654
; 10366e
Mobile_SelectThreeMons: ; 10366e
callba Function10632f
callba Mobile_AlwaysReturnNotCarry
bit 7, c
jr z, .asm_10369b
ld hl, UnknownText_0x10375d
@@ -8074,7 +8074,7 @@ UnknownText_0x10381e: ; 0x10381e
; 0x103823
Function103823: ; 103823
callba Function10632f
callba Mobile_AlwaysReturnNotCarry
bit 7, c
jr nz, .asm_103838
callba Function1008a6
@@ -8126,7 +8126,7 @@ UnknownText_0x103876: ; 0x103876
; 0x10387b
Function10387b: ; 10387b
callba Function10632f
callba Mobile_AlwaysReturnNotCarry
bit 7, c
ret nz
callba Function1008a6

6
misc/mobile_41.asm
View File

@@ -766,7 +766,7 @@ MobileFn_106314: mobile ; 106314
ret
; 10632f
Function10632f: ; 10632f
Mobile_AlwaysReturnNotCarry: ; 10632f
or a
ret
@@ -851,7 +851,7 @@ Function106392: ; 106392
ret
.asm_1063a2
call Function10632f
call Mobile_AlwaysReturnNotCarry
ld a, c
and a
jr nz, .asm_1063b4
@@ -937,7 +937,7 @@ Function106403: ; 106403
ret
.asm_106426
call Function10632f
call Mobile_AlwaysReturnNotCarry
ld a, c
and a
jr z, .asm_106435

260
misc/mobile_45.asm
View File

File diff suppressed because it is too large Load Diff

14
misc/mobile_46.asm
View File

@@ -5453,7 +5453,7 @@ Function11a80c: ; 11a80c
ld bc, hQuotient
ld hl, Unknown_11a8ba
call Function11a88c
ld bc, $ffb5
ld bc, hPrintNum3
ld hl, Unknown_11a8da
call Function11a88c
xor a
@@ -5461,11 +5461,11 @@ Function11a80c: ; 11a80c
ld a, [hDivisor]
and $f
ld e, a
ld a, [$ffb9]
ld a, [hPrintNum7]
and $f
call Function11a884
ld e, a
ld a, [$ffbb]
ld a, [hPrintNum9]
and $f
call Function11a884
ld [wcd62], a
@@ -5477,12 +5477,12 @@ Function11a80c: ; 11a80c
swap a
call Function11a884
ld e, a
ld a, [$ffb9]
ld a, [hPrintNum7]
and $f0
swap a
call Function11a884
ld e, a
ld a, [$ffbb]
ld a, [hPrintNum9]
and $f0
swap a
call Function11a884
@@ -5494,11 +5494,11 @@ Function11a80c: ; 11a80c
and $f
call Function11a884
ld e, a
ld a, [$ffba]
ld a, [hPrintNum8]
and $f
call Function11a884
ld e, a
ld a, [$ffbc]
ld a, [hPrintNum10]
and $f
call Function11a884
ld [wcd64], a

4
misc/mobile_5b.asm
View File

@@ -2,7 +2,7 @@ Function16c000: ; 16c000
ld a, [hCGB]
and a
ret z
ld a, [$ffea]
ld a, [hFFEA]
and a
ret z
ld a, [wcfbe]
@@ -15,7 +15,7 @@ Function16c000: ; 16c000
call Function16c031
callba Function1000a4
xor a
ld [$ffea], a
ld [hFFEA], a
pop af
ld [wcfbe], a
ret