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

more joypad function cleanup

Browse Source
This commit is contained in:
yenatch 2013-08-29 19:08:25 -04:00
parent 0a829301ae
commit dd11c22b31
1 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
main.asm
View File

@ -851,7 +851,7 @@ Functiona1b: ; a1b
jr z, .asm_a34 jr z, .asm_a34
ld a, [$ffa9] ld a, [$ffa9]
and $9 and START | BUTTON_A
jr nz, .asm_a34 jr nz, .asm_a34
dec c dec c
@ -919,14 +919,14 @@ Functiona57: ; a57
; a80 ; a80
Functiona80: ; a80 Functiona80: ; a80
ld a, [hConnectionStripLength] ld a, [$ffaf]
push af push af
ld a, [hConnectedMapWidth] ld a, [$ffb0]
push af push af
xor a xor a
ld [hConnectionStripLength], a ld [$ffaf], a
ld a, $6 ld a, $6
ld [hConnectedMapWidth], a ld [$ffb0], a
.asm_a8d .asm_a8d
push hl push hl
ld hl, $c606 ld hl, $c606
@ -937,23 +937,20 @@ Functiona80: ; a80
and $3 and $3
jr z, .asm_a8d jr z, .asm_a8d
pop af pop af
ld [hConnectedMapWidth], a ld [$ffb0], a
pop af pop af
ld [hConnectionStripLength], a ld [$ffaf], a
ret ret
; aa5 ; aa5
Functionaa5: ; aa5 Functionaa5: ; aa5
.asm_aa5
call Functiona57 call Functiona57
ld a, [$ffa9] ld a, [$ffa9]
and $3 and BUTTON_A | BUTTON_B
jr z, .asm_aa5 jr z, Functionaa5
ret ret
; aaf ; aaf
Functionaaf: ; aaf Functionaaf: ; aaf
ld a, [InLinkBattle] ld a, [InLinkBattle]
and a and a
@ -966,7 +963,7 @@ Functionaaf: ; aaf
ret ret
.asm_ac1 .asm_ac1
ld c, $41 ld c, 65
jp DelayFrames jp DelayFrames
; ac6 ; ac6
@ -978,10 +975,7 @@ Functionac6: ; ac6
ld a, [InputType] ld a, [InputType]
or a or a
jr z, .asm_ad9 jr z, .asm_ad9
ld a, $77 callba Function1de28a
ld hl, $628a
rst FarCall
.asm_ad9 .asm_ad9
call Functionaf5 call Functionaf5
call Functiona57 call Functiona57
@ -1023,37 +1017,37 @@ Functionb06: ; b06
cp b cp b
pop bc pop bc
jr nz, .asm_b27 jr nz, .asm_b27
ld a, [hConnectionStripLength] ld a, [$ffaf]
dec a dec a
ld [hConnectionStripLength], a ld [$ffaf], a
ret nz ret nz
ld a, [hConnectedMapWidth] ld a, [$ffb0]
dec a dec a
ld [hConnectedMapWidth], a ld [$ffb0], a
ret nz ret nz
ld a, $7a ld a, $7a
ld [hl], a ld [hl], a
ld a, $ff ld a, $ff
ld [hConnectionStripLength], a ld [$ffaf], a
ld a, $6 ld a, $6
ld [hConnectedMapWidth], a ld [$ffb0], a
ret ret
.asm_b27 .asm_b27
ld a, [hConnectionStripLength] ld a, [$ffaf]
and a and a
ret z ret z
dec a dec a
ld [hConnectionStripLength], a ld [$ffaf], a
ret nz ret nz
dec a dec a
ld [hConnectionStripLength], a ld [$ffaf], a
ld a, [hConnectedMapWidth] ld a, [$ffb0]
dec a dec a
ld [hConnectedMapWidth], a ld [$ffb0], a
ret nz ret nz
ld a, $6 ld a, $6
ld [hConnectedMapWidth], a ld [$ffb0], a
ld a, $ee ld a, $ee
ld [hl], a ld [hl], a
ret ret
@ -24665,9 +24659,7 @@ Function107bb: ; 107bb
ld a, [InputType] ld a, [InputType]
or a or a
jr z, .asm_107ca jr z, .asm_107ca
ld a, $77 callba Function1de28f
ld hl, $628f
rst FarCall
.asm_107ca .asm_107ca
call Function107d7 call Function107d7
@ -43088,10 +43080,7 @@ Function3e139: ; 3e139
ld a, [InputType] ld a, [InputType]
or a or a
jr z, .asm_3e171 jr z, .asm_3e171
ld a, $77 callba Function1de294
ld hl, $6294
rst FarCall
.asm_3e171 .asm_3e171
call Function3e19b call Function3e19b
ret c ret c
@ -74326,22 +74315,26 @@ Function1de27f: ; 1de27f
Function1de28a: ; 1de28a Function1de28a: ; 1de28a
ld hl, DudeAutoInput_A ld hl, DudeAutoInput_A
jr .asm_1de299 jr Function1de299
; 1de28f
Function1de28f: ; 1de28f
ld hl, DudeAutoInput_RightA ld hl, DudeAutoInput_RightA
jr .asm_1de299 jr Function1de299
; 1de294
Function1de294: ; 1de294
ld hl, DudeAutoInput_DownA ld hl, DudeAutoInput_DownA
jr .asm_1de299 jr Function1de299
; 1de299
.asm_1de299 Function1de299: ; 1de299
ld a, $77 ld a, $77
call StartAutoInput call StartAutoInput
ret ret
; 1de29f ; 1de29f
DudeAutoInput_A: ; 1de29f DudeAutoInput_A: ; 1de29f
db NO_INPUT, $50 db NO_INPUT, $50
db BUTTON_A, $00 db BUTTON_A, $00