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

merge conflicts resolved

Browse Source
This commit is contained in:
JimB16
2015-10-19 16:25:15 +02:00
parent 3ef626d378 f399315a48
commit 3b9a3cc3be
49 changed files with 3435 additions and 3173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
misc/mobile_40.asm
View File

@@ -407,10 +407,10 @@ Function1002c9: ; 1002c9
Function1002dc: ; 1002dc
ld a, $f8
ld [$ff9f], a
ld [hMapEntryMethod], a
callba RunMapSetupScript
xor a
ld [$ff9f], a
ld [hMapEntryMethod], a
call Functione51
ret
; 1002ed
@@ -1097,7 +1097,7 @@ Function100697: ; 100697
ret
.asm_1006b4
ld bc, $8102
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
ret
@@ -1484,7 +1484,7 @@ Function100902: ; 100902
hlcoord 4, 11
call PlaceString
hlcoord 8, 11
ld bc, $0102
lb bc, 1, 2
ld de, StringBuffer2
call PrintNum
ld de, SFX_TWO_PC_BEEPS
@@ -1844,7 +1844,7 @@ Function100b9f: ; 100b9f
callba Function3e786
ret z
call Function100dd8
jp c, Function2ec8
jp c, xor_a_dec_a
call Function100e72
call Function100bc2
push af
@@ -7558,7 +7558,7 @@ Function1034e0: ; 1034e0
add hl, bc
pop bc
ld a, $6
call Functionfb8
call FillBoxWithByte
ret
; 1034f1

4
misc/mobile_42.asm
View File

@@ -1343,7 +1343,7 @@ Function108a87: ; 108a87
Function108a92: ; 108a92
hlcoord 9, 0
ld bc, $8103
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
call PrintNum
ret
; 108a9c
@@ -1380,7 +1380,7 @@ Unknown_108abb: ; 108abb
Function108abe: ; 108abe
hlcoord 8, 6
ld bc, $8205
lb bc, PRINTNUM_LEADINGZEROS | 2, 5
call PrintNum
ret
; 108ac8

8
misc/mobile_45.asm
View File

@@ -8345,7 +8345,7 @@ Function117bb6:
ld a, [wd001]
cp $f
jr nz, .asm_117c16 ; 0x117c01 $13
ld hl, wdfec
ld hl, $e000 - 20
ld de, wcd69
ld c, $10
.asm_117c0b
@@ -13368,11 +13368,11 @@ Function11a302: ; 11a302
call PlaceString
hlcoord 9, 4
ld de, wcd68
ld bc, $8102
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
hlcoord 14, 4
ld de, wcd67
ld bc, $8102
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
ld a, $80
ld [wcd44], a
@@ -15254,7 +15254,7 @@ Function11b22a: ; 11b22a
; 11b236
Function11b236: ; 11b236
jp Functionfb8
jp FillBoxWithByte
; 11b239
Function11b239: ; 11b239

8
misc/mobile_5f.asm
View File

@@ -2359,7 +2359,7 @@ Function17ded9: ; 17ded9
ld [MonType], a
push hl
push bc
predef AddPkmnToParty
predef TryAddMonToParty
callba Function4db49
pop bc
pop hl
@@ -4359,9 +4359,9 @@ Function17f382: ; 17f382
ld de, $b2f4
.asm_17f3ab
ld a, $82
ld a, PRINTNUM_LEADINGZEROS | 2
ld b, a
ld a, $3
ld a, 3
ld c, a
call PrintNum
call CloseSRAM
@@ -5347,7 +5347,7 @@ Function17ff3c: ; 17ff3c
ld [wc300], a
hlcoord 14, 2
ld de, wc300
ld bc, $8103
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
call PrintNum
pop af
ld [wc300], a