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

More label updates, moved predefs to new file

Browse Source 
Also named most of the engine and event flag constants.
This commit is contained in:
PikalaxALT
2015-07-20 03:51:52 -04:00
parent 94129b6b45
commit bef792f2d2
90 changed files with 1926 additions and 1899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
misc/crystal_misc.asm
View File

@@ -249,7 +249,7 @@ Function17a81a: ; 17a81a (5e:681a)
ld a, [hJoyPressed] ; $ff00+$a7
and $3
ret z
call Function1c07
call ExitMenu
call Function17ac1d
call Function17ac2a
ld hl, $d088

30
misc/mobile_40.asm
View File

@@ -308,7 +308,7 @@ Function10016f: ; 10016f
Function10020b: ; 10020b
xor a
ld [wc303], a
callba Function8c084
callba FadeBlackBGMap
callba Function106464
call HideSprites
call DelayFrame
@@ -903,7 +903,7 @@ Function100597: ; 100597
ld [wcfa9], a
.asm_1005a6
call Function1c07
call ExitMenu
ld a, [wcd26]
set 7, a
ld [wcd26], a
@@ -954,7 +954,7 @@ Function1005e1: ; 1005e1
xor a
ld [wcfa9], a
.asm_1005f0
call Function1c07
call ExitMenu
ld a, [wcd26]
set 7, a
ld [wcd26], a
@@ -1792,7 +1792,7 @@ Function100b12: ; 100b12
call Function100ed4
ld a, [wcf88]
ld [wd0d2], a
call Function1c07
call ExitMenu
ret
; 100b45
@@ -4494,7 +4494,7 @@ Function101d95: ; 101d95
Function101db2: ; 101db2
callba Function103302
call Function1c07
call ExitMenu
ld hl, wcd29
set 5, [hl]
jr c, .asm_101dca
@@ -4976,12 +4976,12 @@ Function102142: ; 102142
ld de, SFX_LEVEL_UP
call PlaySFX
call Functiona36
call Function1c07
call ExitMenu
call Function10219f
ld hl, UnknownText_0x1021d6
call MenuTextBox
call YesNoBox
call Function1c07
call ExitMenu
jr c, .asm_10217c
call Function1021b8
jr c, .asm_10217c
@@ -5053,7 +5053,7 @@ UnknownText_0x1021db: ; 1021d1
Function1021e0: ; 1021e0
call MenuTextBox
call Functiona36
call Function1c07
call ExitMenu
ret
; 1021ea
@@ -6207,7 +6207,7 @@ Function102984: ; 102984
Function102996: ; 102996
call Function1029af
call Function1c07
call ExitMenu
scf
ret
; 10299e
@@ -6281,7 +6281,7 @@ Function1029fe: ; 1029fe
and [hl]
ret z
push af
call Function1c07
call ExitMenu
pop af
ld a, [wcfa9]
cp $1
@@ -7774,7 +7774,7 @@ Mobile_SelectThreeMons: ; 10366e
ld hl, MenuDataHeader_103747
call LoadMenuDataHeader
call InterpretMenu2
call Function1c07
call ExitMenu
jr c, .asm_1036f4
ld a, [wcfa9]
cp $1
@@ -7815,7 +7815,7 @@ Function1036f9: ; 1036f9
Function103700: ; 103700
ld c, $a
ld hl, wdc20
ld hl, SwarmFlags
bit 4, [hl]
jr z, .asm_10370f
callba Function1008a6
@@ -7913,11 +7913,11 @@ Function103780: ; 103780
Function10378c: ; 10378c
ld c, $0
ld hl, wdc20
ld hl, SwarmFlags
bit 4, [hl]
jr nz, .asm_10379c
ld c, $1
ld hl, wdc20
ld hl, SwarmFlags
set 4, [hl]
.asm_10379c
@@ -7939,7 +7939,7 @@ Function10378c: ; 10378c
ld a, c
and a
ret z
ld hl, wdc20
ld hl, SwarmFlags
res 4, [hl]
ret
; 1037c2

96
misc/mobile_45.asm
View File

@@ -4330,7 +4330,7 @@ Function11581e: ; 11581e
Function1158c2: ; 1158c2
ld a, e
ld [wdc20], a
ld [SwarmFlags], a
ld a, d
ld [wdc21], a
xor a
@@ -4351,7 +4351,7 @@ Function1158c2: ; 1158c2
ld l, c
ld h, b
xor a
ld [wdc1f], a
ld [WeeklyFlags], a
.asm_1158e5
ld b, $3
@@ -4376,7 +4376,7 @@ Function1158c2: ; 1158c2
push hl
dec hl
ld a, c
ld [wdc1f], a
ld [WeeklyFlags], a
.asm_115908
xor a
ld [hld], a
@@ -4397,7 +4397,7 @@ Function1158c2: ; 1158c2
ld [wdc1a], a
push de
push hl
ld hl, wdc20
ld hl, SwarmFlags
ld a, [hli]
ld h, [hl]
ld l, a
@@ -4492,7 +4492,7 @@ Function1158c2: ; 1158c2
ld a, $a
ld [hli], a
push hl
ld hl, wdc20
ld hl, SwarmFlags
ld a, [hli]
ld h, [hl]
ld l, a
@@ -4517,7 +4517,7 @@ Function1158c2: ; 1158c2
jp nz, .asm_1158e5
.asm_1159c4
ld a, [wdc1f]
ld a, [WeeklyFlags]
cp $0
jr z, .asm_1159d8
push hl
@@ -4984,9 +4984,9 @@ Function115bc8: ; 115bc8
Function115c49: ; 115c49
ld a, e
ld [wdc1f], a
ld [WeeklyFlags], a
ld a, d
ld [wdc20], a
ld [SwarmFlags], a
xor a
ld [de], a
inc de
@@ -5055,7 +5055,7 @@ Function115c49: ; 115c49
ld [wdc1a], a
push de
push hl
ld hl, wdc1f
ld hl, WeeklyFlags
ld a, [hli]
ld h, [hl]
ld l, a
@@ -5166,9 +5166,9 @@ Function115cfd: ; 115cfd
.asm_115d38
push de
push hl
ld a, [wdc1f]
ld a, [WeeklyFlags]
ld l, a
ld a, [wdc20]
ld a, [SwarmFlags]
ld h, a
ld e, [hl]
inc hl
@@ -8021,13 +8021,13 @@ Function1178e8: ; 1178e8 (45:78e8)
ld a, [wcd4e]
and a
jr nz, .asm_117939
call Function1c07
call ExitMenu
ld a, $1
ld [wcd4f], a
jp Function117a0a
.asm_117939
call Function1c07
call Function1c07
call ExitMenu
call ExitMenu
jp Function117a0a
Function117942: ; 117942 (45:7942)
@@ -8055,7 +8055,7 @@ Function117976: ; 117976 (45:7976)
ld hl, wcd4e
dec [hl]
ret nz
call Function1c07
call ExitMenu
asm_11797e: ; 11797e (45:797e)
ld a, $80
ld [wcd49], a
@@ -8078,7 +8078,7 @@ Function1179a7: ; 1179a7 (45:79a7)
ld hl, wcd4e
dec [hl]
ret nz
call Function1c07
call ExitMenu
ld a, $1
ld [wcd49], a
ret
@@ -8285,13 +8285,13 @@ Function117b4f:
ld a, [wcf64]
and a
jr nz, .asm_117ba4 ; 0x117b93 $f
call Function1c07
call Function1c07
call ExitMenu
call ExitMenu
callba Function104061
jp Function117cdd
.asm_117ba4
call Function1c07
call Function1c07
call ExitMenu
call ExitMenu
callba Function104061
ld a, $80
ld [wcf63], a
@@ -8395,7 +8395,7 @@ Function117c4a:
add hl, de
dec c
jr nz, .asm_117c71 ; 0x117c7b $f4
call Function4b6
call FadeToWhite
pop af
ld [rSVBK], a
ld a, $80
@@ -12896,7 +12896,7 @@ Function119f98: ; 119f98
ld a, [wcd44]
and a
jr nz, .asm_119fef
call Function1c07
call ExitMenu
call Function11a63c
xor a
ld [ScriptVar], a
@@ -12904,7 +12904,7 @@ Function119f98: ; 119f98
ld a, [ScriptVar]
and a
jr z, .asm_119fd4
call Function1c07
call ExitMenu
callba Function104061
callba Function115dc3
ld a, [wcd33]
@@ -12927,8 +12927,8 @@ Function119f98: ; 119f98
ret
.asm_119fef
call Function1c07
call Function1c07
call ExitMenu
call ExitMenu
callba Function104061
ld a, [wcd45]
ld [wcf66], a
@@ -13003,7 +13003,7 @@ Function11a00e: ; 11a00e
callba Function117ab4
callba Function106462
callba Function106464
call Function1c07
call ExitMenu
callba Function104061
callba Function115d99
ld c, $0
@@ -13026,7 +13026,7 @@ Function11a0ca: ; 11a0ca
callba Function17d3f6
callba Function106462
callba Function106464
call Function1c07
call ExitMenu
callba Function104061
callba Function115d99
ld c, $0
@@ -13118,7 +13118,7 @@ Function11a192: ; 11a192
ld a, [wcd44]
and a
jr nz, .asm_11a1b6
call Function1c07
call ExitMenu
callba Function104061
call Function11a63c
hlcoord 4, 2
@@ -13128,7 +13128,7 @@ Function11a192: ; 11a192
ret
.asm_11a1b6
call Function1c07
call ExitMenu
callba Function104061
ld a, [wcd45]
ld [wcf66], a
@@ -13259,7 +13259,7 @@ Function11a235: ; 11a235
ld a, [wcd44]
and a
jr nz, .asm_11a2c4
call Function1c07
call ExitMenu
callba Function104061
ld a, [wcd46]
cp $0
@@ -13281,7 +13281,7 @@ Function11a235: ; 11a235
call PlayClickSFX
.asm_11a2c4
call Function1c07
call ExitMenu
callba Function104061
and a
ret
@@ -13360,7 +13360,7 @@ Function11a33a: ; 11a33a
ret
.asm_11a346
call Function1c07
call ExitMenu
callba Function104061
callba Function115dc3
and a
@@ -13404,7 +13404,7 @@ Function11a38d: ; 11a38d
ld a, [wcd44]
and a
jr nz, .asm_11a3b1
call Function1c07
call ExitMenu
callba Function104061
call Function11a63c
hlcoord 4, 2
@@ -13414,7 +13414,7 @@ Function11a38d: ; 11a38d
ret
.asm_11a3b1
call Function1c07
call ExitMenu
callba Function104061
ld a, [wcd45]
ld [wcf66], a
@@ -13479,7 +13479,7 @@ Function11a41b: ; 11a41b
ld a, [wcd44]
and a
jr nz, .asm_11a43f
call Function1c07
call ExitMenu
callba Function104061
call Function11a63c
hlcoord 4, 2
@@ -13489,7 +13489,7 @@ Function11a41b: ; 11a41b
ret
.asm_11a43f
call Function1c07
call ExitMenu
callba Function104061
ld a, $1c
ld [wcf66], a
@@ -13550,7 +13550,7 @@ Function11a49e: ; 11a49e
ld a, [wcd44]
and a
jr nz, .asm_11a4c7
call Function1c07
call ExitMenu
callba Function104061
call Function11a63c
hlcoord 4, 2
@@ -13562,7 +13562,7 @@ Function11a49e: ; 11a49e
ret
.asm_11a4c7
call Function1c07
call ExitMenu
callba Function104061
ld a, [wcd46]
ld [wcf66], a
@@ -13597,7 +13597,7 @@ Function11a4fe: ; 11a4fe
ld a, [wcd44]
and a
jr nz, .asm_11a522
call Function1c07
call ExitMenu
callba Function104061
call Function11a63c
hlcoord 4, 2
@@ -13607,7 +13607,7 @@ Function11a4fe: ; 11a4fe
ret
.asm_11a522
call Function1c07
call ExitMenu
callba Function104061
ld a, [wcd45]
ld [wcf66], a
@@ -13636,7 +13636,7 @@ Function11a536: ; 11a536
jr z, .asm_11a562
call Function11a9f0
jr nz, .asm_11a562
call Function1c07
call ExitMenu
callba Function104061
.asm_11a562
@@ -14544,7 +14544,7 @@ Function11adc4:
call Function11ad8a
.asm_11ae2e
call Function1c07
call ExitMenu
callba Function104061
ret
; 11ae38
@@ -14649,8 +14649,8 @@ Function11ae98:
call Function11ad8a
.asm_11aef7
call Function1c07
call Function1c07
call ExitMenu
call ExitMenu
callba Function104061
ret
; 11af04
@@ -14740,8 +14740,8 @@ Function11af4e:
ld [ScriptVar], a
.asm_11afaa
call Function1c07
call Function1c07
call ExitMenu
call ExitMenu
callba Function104061
ret
; 11afb7
@@ -23522,7 +23522,7 @@ Function170729: ; 170729 (5c:4729)
ret
Function170737: ; 170737 (5c:4737)
callba Function14dbb
callba SaveOptionsSelection
ret
Function17073e: ; 17073e (5c:473e)
@@ -24729,7 +24729,7 @@ Function171c2c: ; 171c2c (5c:5c2c)
ld hl, wcd4c
dec [hl]
ret nz
call Function1c07
call ExitMenu
call WhiteBGMap
jr asm_171c60

2
misc/mobile_5f.asm
View File

@@ -1975,7 +1975,7 @@ Function17dcaf:
add hl, de
dec c
jr nz, .asm_17dcbb
call Function4b6
call FadeToWhite
ld a, $4
ld [rSVBK], a
ret