Remove old junk from the main macros file

This commit is contained in:
Háčky 2014-11-21 11:01:29 +00:00
parent 2375d2c8db
commit b9edbfa98b

View File

@ -20,29 +20,6 @@ LD_A_IND: MACRO
dw \1
ENDM
; ld b, [hl]
;LD_B_HL_IND: MACRO
; db $46
; ENDM
; ld c, [hl]
;LD_C_HL_IND: MACRO
; db $4E
; ENDM
; ld l, [hl]
;LD_L_HL_IND: MACRO
; db $6E
; ENDM
; ld [hl], b
;LD_IND_HL_B: MACRO
; db $70
; ENDM
; ld [hl], c
;LD_IND_HL_C: MACRO
; db $71
; ENDM
waita: MACRO
ld a, \1
db $76
@ -247,118 +224,4 @@ API_121: MACRO
ld de, $0000
ld hl, $0000
API $121
ENDM
CommonFunction1: MACRO ; Beauty Ellie 1A31, Eon Ticket 1B38
ret c
nop
wait 32
ld l, $02
push hl
ld bc, $B9A0
ld de, $0076
ld a, $08
API $0C4
pop bc
.asm_1b64
API $0DB
cp $01
jr z, .asm_1b6f
API $0DB
or a
jr nz, .asm_1b76
.asm_1b6f
waita $01
API $0C5
jr .asm_1b64
.asm_1b76
waita $01
LD_HL_IND $00C2
ld a, l
and $02
jr z, .asm_1b90
IS_SOUND_PLAYING 2 ; exit
.asm_1b90
API $0CA
cp $02
jr c, .asm_1b76
ENDM
CommonFunction2: MACRO ; Beauty Ellie 1AA6, Eon Ticket 1BAF
.asm_1baf
waita $01
API $0DB
ld l, a
ld h, $00
LD_IND_HL \1 ; Eon Ticket 1914
API $0CA
cp $02
jr nc, .asm_1bd4
ld hl, \2 ; Eon Ticket 0078
SOUND_PAUSE
IS_SOUND_PLAYING 1 ; return
.asm_1bd4
LD_HL_IND \1
ld a, l
sub $04
or h
jr z, .asm_1be6
LD_HL_IND \1
ld a, l
sub $03
or h
jr nz, .asm_1baf
.asm_1be6
ENDM
CommonFunction3: MACRO ; Beauty Ellie 1AE0, Eon Ticket 1BE6
DRAW_TEXT \1, \2, 8, 4
ld de, $0040
ld hl, \9
API $106
.asm_1bfe
waita $01
ld hl, \3
API $0C8
or a
jr nz, .asm_1c18
IS_SOUND_PLAYING 1 ; return
.asm_1c18
LD_HL_IND \3
LD_IND_HL \4
ld a, l
cp $22
jr nz, .asm_1bfe
ld a, h
cp $22
jr nz, .asm_1bfe
ld de, $003c
ld hl, \5
call \7
ld de, $1800
ld hl, \6
call \7
ld hl, $5fff
LD_IND_HL \8
API_0C7 \8
ENDM