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

Restructured functions in main.asm to resemble the home functions they clone

Browse Source
This commit is contained in:
PikalaxALT
2015-10-17 12:58:26 -04:00
parent 4fa6c6daa4
commit da7849d800
25 changed files with 689 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
misc/crystal_misc.asm
View File

@@ -155,7 +155,7 @@ Function17a781: ; 17a781 (5e:6781)
push af
ld a, $1
ld [hInMenu], a
call Functiona57
call JoyTextDelay
pop af
ld [hInMenu], a
ret

12
misc/mobile_22.asm
View File

@@ -194,7 +194,7 @@ Function8921f: ; 8921f (22:521f)
ret
Function89235: ; 89235 (22:5235)
call Functiona36
call JoyWaitAorB
call PlayClickSFX
ret
@@ -3655,7 +3655,7 @@ Function8a78c: ; 8a78c (22:678c)
call InitName
call CloseSRAM
call DelayFrame
call Functiona57
call JoyTextDelay
call Function891de
call WhiteBGMap
call Function893cc
@@ -3731,7 +3731,7 @@ Function8a818: ; 8a818 (22:6818)
ld de, .string_8a868
call PlaceString
call WaitBGMap
call Functiona36
call JoyWaitAorB
.asm_8a863
call CloseSRAM
scf
@@ -3750,7 +3750,7 @@ Function8a818: ; 8a818 (22:6818)
hlcoord 1, 13
call PlaceString
call WaitBGMap
call Functiona36
call JoyWaitAorB
and a
ret
; 8a88b (22:688b)
@@ -3805,7 +3805,7 @@ Function8a8c3: ; 8a8c3 (22:68c3)
ld de, String_8a926
call PlaceString
call WaitBGMap
call Functiona36
call JoyWaitAorB
.asm_8a90f
call Function89448
call Function891fe
@@ -4057,7 +4057,7 @@ Function8aab6: ; 8aab6 (22:6ab6)
ld de, String_8aaf0
call PlaceString
call WaitBGMap
call Functiona36
call JoyWaitAorB
.asm_8aaeb
call CloseSRAM
scf

28
misc/mobile_40.asm
View File

@@ -332,7 +332,7 @@ Function100232: ; 100232
pop de
call PlaceString
call Function100320
call Functiona36
call JoyWaitAorB
ret
; 10024d
@@ -432,7 +432,7 @@ Function100301: ; 100301
callba Function10202c
callba Function115dd3
call Function100320
call Functiona36
call JoyWaitAorB
ret
; 100320
@@ -4979,7 +4979,7 @@ Function102142: ; 102142
call MenuTextBox
ld de, SFX_LEVEL_UP
call PlaySFX
call Functiona36
call JoyWaitAorB
call ExitMenu
call Function10219f
ld hl, UnknownText_0x1021d6
@@ -5022,7 +5022,7 @@ Function10219f: ; 10219f
call Function10218d
ld de, $c608 + 1
callba Function8ac4e
call Functiona36
call JoyWaitAorB
call PlayClickSFX
call Function1013aa
ret
@@ -5056,7 +5056,7 @@ UnknownText_0x1021db: ; 1021d1
Function1021e0: ; 1021e0
call MenuTextBox
call Functiona36
call JoyWaitAorB
call ExitMenu
ret
; 1021ea
@@ -7749,7 +7749,7 @@ Mobile_SelectThreeMons: ; 10366e
jr c, .asm_103696
callba Function8b1e1
jr nc, .asm_103690
call Functiona36
call JoyWaitAorB
jr .asm_103696
.asm_103690
@@ -7772,7 +7772,7 @@ Mobile_SelectThreeMons: ; 10366e
call YesNoBox
jr c, .asm_1036b5
call Function1036f9
call Functiona36
call JoyWaitAorB
.asm_1036b5
call Function103700
@@ -7794,7 +7794,7 @@ Mobile_SelectThreeMons: ; 10366e
.asm_1036d9
callba Function8b1e1
jr nc, .asm_1036e6
call Functiona36
call JoyWaitAorB
jr .asm_1036f4
.asm_1036e6
@@ -7804,7 +7804,7 @@ Mobile_SelectThreeMons: ; 10366e
.asm_1036ec
call Function1036f9
call Functiona36
call JoyWaitAorB
jr .asm_1036b5
.asm_1036f4
@@ -7859,7 +7859,7 @@ Function103700: ; 103700
.asm_10373c
ld hl, UnknownText_0x10377b
call PrintText
call Functiona36
call JoyWaitAorB
scf
ret
; 103747
@@ -7981,10 +7981,10 @@ Function1037eb: ; 1037eb
jr nc, .asm_103807
ld hl, UnknownText_0x103819
call PrintText
call Functiona36
call JoyWaitAorB
ld hl, UnknownText_0x10381e
call PrintText
call Functiona36
call JoyWaitAorB
xor a
ld [ScriptVar], a
ret
@@ -8042,7 +8042,7 @@ endr
ld [hl], a
ld hl, UnknownText_0x103876
call PrintText
call Functiona36
call JoyWaitAorB
callba Script_reloadmappart
callba Function4a94e
jr c, .asm_103870
@@ -8074,7 +8074,7 @@ Function10387b: ; 10387b
ld [StringBuffer2], a
ld hl, UnknownText_0x103898
call PrintText
call Functiona36
call JoyWaitAorB
ret
; 103898

36
misc/mobile_45.asm
View File

@@ -7716,7 +7716,7 @@ Function117699: ; 117699 (45:7699)
ret
Function1176ee: ; 1176ee (45:76ee)
call Functiona57
call JoyTextDelay
ld a, [wcd49]
bit 7, a
jr nz, .asm_117709
@@ -8189,7 +8189,7 @@ Function117ab4: ; 0x117ab4
; 0x117acd
Function117acd: ; 0x117acd
call Functiona57
call JoyTextDelay
ld a, [wcf63]
bit 7, a
jr nz, .asm_117ae2 ; 0x117ad5 $b
@@ -8493,7 +8493,7 @@ asm_11800b
ld a, $3
ld [rSVBK], a
.asm_118024
call Functiona57
call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $1b
@@ -8534,7 +8534,7 @@ Function11805f: ; 11805f
ld a, $3
ld [rSVBK], a
.asm_11807d
call Functiona57
call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $1b
@@ -8572,7 +8572,7 @@ Function1180b8: ; 1180b8
ld a, $3
ld [rSVBK], a
.asm_1180d1
call Functiona57
call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $28
@@ -8627,7 +8627,7 @@ Function118125: ; 118125
ld a, $3
ld [rSVBK], a
.asm_11813e
call Functiona57
call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $f
@@ -8712,7 +8712,7 @@ Function1181da: ; 1181da
ld a, $3
ld [rSVBK], a
.asm_1181f8
call Functiona57
call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $28
@@ -8750,7 +8750,7 @@ Function118233: ; 118233
ld a, $3
ld [rSVBK], a
.asm_11824c
call Functiona57
call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $1e
@@ -8787,7 +8787,7 @@ Function118284: ; 118284
ld a, $3
ld [rSVBK], a ; $ff00+$70
.asm_11829d
call Functiona57
call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $20
@@ -8824,7 +8824,7 @@ Function1182d5: ; 1182d5
ld a, $3
ld [rSVBK], a
.asm_1182ee
call Functiona57
call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $1b
@@ -8862,7 +8862,7 @@ Function118329: ; 118329
ld a, $3
ld [rSVBK], a
.asm_118342
call Functiona57
call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $18
@@ -8899,7 +8899,7 @@ Function11837a: ; 11837a
ld a, $3
ld [rSVBK], a
.asm_118393
call Functiona57
call JoyTextDelay
call Function118473
ld a, [wcf66]
cp $19
@@ -14342,7 +14342,7 @@ Function11ac51: ; 11ac51
call Function11ad1b
call DelayFrame
.asm_11ac82
call Functiona57
call JoyTextDelay
ld a, [wcf63]
bit 7, a
jr nz, .asm_11aca8
@@ -16935,7 +16935,7 @@ Function11c277: ; 11c277 (47:4277)
Function11c283: ; 11c283
.asm_11c283
call Functiona57
call JoyTextDelay
ld a, [hJoyPressed]
ld [hJoypadPressed], a
ld a, [wcf63]
@@ -22187,7 +22187,7 @@ Function16d43b: ; 16d43b
call GetSGBLayout
call Function32f9
call WaitBGMap
call Functiona36
call JoyWaitAorB
call Function1d7d
ret
; 16d465
@@ -22518,7 +22518,7 @@ Function16d7e7: ; 16d7e7
callba Function8cf62
.asm_16d7f4
call Functiona57
call JoyTextDelay
call Function16d713
and a
ret z
@@ -23228,7 +23228,7 @@ Function1704f1: ; 1704f1
call ClearSprites
call ClearScreen
.asm_1704fa
call Functiona57
call JoyTextDelay
ld a, [wcf63]
bit 7, a
jr nz, .asm_17050f
@@ -24539,7 +24539,7 @@ Function1719ed: ; 1719ed (5c:59ed)
ret
Function171a11: ; 171a11 (5c:5a11)
call Functiona57
call JoyTextDelay
ld a, [wcd49]
bit 7, a
jr nz, .asm_171a2c

6
misc/mobile_5f.asm
View File

@@ -714,7 +714,7 @@ Function17d405:
Function17d45a: ; 17d45a
.asm_17d45a
call Functiona57
call JoyTextDelay
ld a, [wcd77]
bit 7, a
jr nz, .asm_17d46f
@@ -3144,7 +3144,7 @@ Function17e3f0: ; 17e3f0
call Function17e415
call Function17e41e
.asm_17e3f6
call Functiona57
call JoyTextDelay
ld hl, hJoyPressed
ld a, [hl]
and $1
@@ -4678,7 +4678,7 @@ Function17f53d: ; 17f53d
Function17f555: ; 17f555
.asm_17f555
call Functiona57
call JoyTextDelay
call Function17f5ae
ld a, [wc303]
bit 7, a

2
misc/unused_title.asm
View File

@@ -546,7 +546,7 @@ UnusedTitleFG_OAM: ; 10ecb1
Function10ed51: ; 10ed51
call _TitleScreen
.loop
call Functiona57
call JoyTextDelay
ld a, [hJoyLast]
ld b, a
and 1