Skip to content

Commit

Permalink
Merge pull request #119 from pclalv/new-wram-labels
Browse files Browse the repository at this point in the history 
New wram labels
  • Loading branch information
@kemenaran
kemenaran committed Sep 29, 2019
2 parents 45aeed6 + 70fffe2 commit e1a9b02
Show file tree
Hide file tree
Showing 12 changed files with 53 additions and 37 deletions.
6 changes: 3 additions & 3 deletions src/code/bank0.asm
View file
Expand Up @@ -2062,7 +2062,7 @@ UseMagicPowder::
ld a, [$C19B]
and a
ret nz
ld a, [$DB4B]
ld a, [wHasToadstool]
and a
jr z, label_14A7
ldh a, [$FFA2]
Expand Down Expand Up @@ -3409,7 +3409,7 @@ label_2049::
ld [MBC3SelectBank], a
ld hl, $5118
add hl, de
ld a, [$DB49]
ld a, [wOcarinaSongFlags]
ld e, a
ld a, [hl]
cp $A9
Expand Down Expand Up @@ -4566,7 +4566,7 @@ label_2CF5::
call CopyData

label_2CFE::
ld a, [$DB4B]
ld a, [wHasToadstool]
and a
jr z, label_2D07
call label_1E2B
Expand Down
4 changes: 2 additions & 2 deletions src/code/bank2.asm
View file
Expand Up @@ -45,7 +45,7 @@ UseOcarina::
ld [$C5A4], a ; $4208: $EA $A4 $C5
ld [$C5A5], a ; $420B: $EA $A5 $C5
call CopyLinkFinalPositionToPosition ; $420E: $CD $BE $0C
ld a, [$DB49] ; $4211: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $4211: $FA $49 $DB
and $07 ; $4214: $E6 $07
jr z, jr_002_4241 ; $4216: $28 $29

Expand Down Expand Up @@ -1230,7 +1230,7 @@ jr_002_4A7C:
jr jr_002_4AB2 ; $4AA0: $18 $10

jr_002_4AA2:
ld a, [$DB49] ; $4AA2: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $4AA2: $FA $49 $DB
and a ; $4AA5: $A7
jr nz, jr_002_4AB2 ; $4AA6: $20 $0A

Expand Down
16 changes: 8 additions & 8 deletions src/code/bank20.asm
View file
Expand Up @@ -5340,15 +5340,15 @@ jr_020_5B76:
ret ; $5B7F: $C9

jr_020_5B80:
ld a, [$DB4B] ; $5B80: $FA $4B $DB
ld a, [wHasToadstool] ; $5B80: $FA $4B $DB
and a ; $5B83: $A7
jr nz, jr_020_5B62 ; $5B84: $20 $DC

ld a, [wMagicPowderCount] ; $5B86: $FA $4C $DB
jr jr_020_5BA8 ; $5B89: $18 $1D

jr_020_5B8B:
ld a, [$DB49] ; $5B8B: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $5B8B: $FA $49 $DB
and a ; $5B8E: $A7
jp z, label_020_5B62 ; $5B8F: $CA $62 $5B

Expand Down Expand Up @@ -5431,7 +5431,7 @@ jr_020_5BF9:
cp $18 ; $5BF9: $FE $18
jr nz, jr_020_5C0B ; $5BFB: $20 $0E

ld a, [$DB4B] ; $5BFD: $FA $4B $DB
ld a, [wHasToadstool] ; $5BFD: $FA $4B $DB
and a ; $5C00: $A7
jr z, jr_020_5C0B ; $5C01: $28 $08

Expand Down Expand Up @@ -6164,7 +6164,7 @@ jr_020_5F85:
cp $09 ; $5F9B: $FE $09
jr nz, jr_020_5FB2 ; $5F9D: $20 $13

ld a, [$DB49] ; $5F9F: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $5F9F: $FA $49 $DB
and a ; $5FA2: $A7
jr z, jr_020_5FB2 ; $5FA3: $28 $0D

Expand Down Expand Up @@ -6239,7 +6239,7 @@ jr_020_600D:
cp $09 ; $600D: $FE $09
jr nz, jr_020_6027 ; $600F: $20 $16

ld a, [$DB49] ; $6011: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $6011: $FA $49 $DB
and a ; $6014: $A7
jr z, jr_020_6027 ; $6015: $28 $10

Expand Down Expand Up @@ -6552,7 +6552,7 @@ jr_020_618D:
ld b, $01 ; $618D: $06 $01

jr_020_618F:
ld a, [$DB49] ; $618F: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $618F: $FA $49 $DB
and b ; $6192: $A0
jr nz, jr_020_619A ; $6193: $20 $05

Expand Down Expand Up @@ -6591,7 +6591,7 @@ jr_020_61B7:
ld d, $00 ; $61B9: $16 $00
ld hl, $610E ; $61BB: $21 $0E $61
add hl, de ; $61BE: $19
ld a, [$DB49] ; $61BF: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $61BF: $FA $49 $DB
and [hl] ; $61C2: $A6
jr z, jr_020_61AD ; $61C3: $28 $E8

Expand All @@ -6615,7 +6615,7 @@ jr_020_61D6:
ld d, $00 ; $61D8: $16 $00
ld hl, $610E ; $61DA: $21 $0E $61
add hl, de ; $61DD: $19
ld a, [$DB49] ; $61DE: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $61DE: $FA $49 $DB
and [hl] ; $61E1: $A6
jr z, jr_020_61CB ; $61E2: $28 $E7

Expand Down
2 changes: 1 addition & 1 deletion src/code/entities/bank15.asm
View file
Expand Up @@ -3513,7 +3513,7 @@ func_015_542E:
jp label_015_5383 ; $5432: $C3 $83 $53

func_015_5435:
ld a, [$DB4B] ; $5435: $FA $4B $DB
ld a, [wHasToadstool] ; $5435: $FA $4B $DB
and a ; $5438: $A7
jr z, jr_015_5465 ; $5439: $28 $2A

Expand Down
10 changes: 5 additions & 5 deletions src/code/entities/bank18.asm
View file
Expand Up @@ -35,7 +35,7 @@ jr_018_400F:
ld b, d ; $402C: $42
xor a ; $402D: $AF
ld [$D201], a ; $402E: $EA $01 $D2
ld a, [$DB49] ; $4031: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $4031: $FA $49 $DB
and $01 ; $4034: $E6 $01
jr z, jr_018_404A ; $4036: $28 $12

Expand Down Expand Up @@ -293,7 +293,7 @@ jr_018_4268:

ld a, $02 ; $4270: $3E $02
ld [$DB4A], a ; $4272: $EA $4A $DB
ld hl, $DB49 ; $4275: $21 $49 $DB
ld hl, wOcarinaSongFlags ; $4275: $21 $49 $DB
set 0, [hl] ; $4278: $CB $C6
jp IncrementEntityWalkingAttr ; $427A: $C3 $12 $3B

Expand Down Expand Up @@ -752,7 +752,7 @@ jr_018_4521:
ld b, a ; $4533: $47
ld c, a ; $4534: $4F
ld b, a ; $4535: $47
ld a, [$DB49] ; $4536: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $4536: $FA $49 $DB
and $02 ; $4539: $E6 $02
jr z, jr_018_4547 ; $453B: $28 $0A

Expand Down Expand Up @@ -1133,7 +1133,7 @@ jr_018_4746:

ld a, $01 ; $4757: $3E $01
ld [$DB4A], a ; $4759: $EA $4A $DB
ld hl, $DB49 ; $475C: $21 $49 $DB
ld hl, wOcarinaSongFlags ; $475C: $21 $49 $DB
set 1, [hl] ; $475F: $CB $CE
xor a ; $4761: $AF
ld [wC167], a ; $4762: $EA $67 $C1
Expand Down Expand Up @@ -2630,7 +2630,7 @@ jr_018_5001:
ld d, $0C ; $5036: $16 $0C
call label_3E6B ; $5038: $CD $6B $3E
xor a ; $503B: $AF
ld [$DB4B], a ; $503C: $EA $4B $DB
ld [wHasToadstool], a ; $503C: $EA $4B $DB
ld a, $0B ; $503F: $3E $0B
ldh [hFFA5], a ; $5041: $E0 $A5
ret ; $5043: $C9
Expand Down
4 changes: 2 additions & 2 deletions src/code/entities/bank19.asm
View file
Expand Up @@ -1831,7 +1831,7 @@ jr_019_4AEA:

jr_019_4AEB:
ld c, e ; $4AEB: $4B
ld a, [$DB49] ; $4AEC: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $4AEC: $FA $49 $DB
and $04 ; $4AEF: $E6 $04
ret z ; $4AF1: $C8

Expand Down Expand Up @@ -2291,7 +2291,7 @@ label_019_4D9B:
add hl, bc ; $4DC3: $09
ld [hl], $50 ; $4DC4: $36 $50
call func_019_4E00 ; $4DC6: $CD $00 $4E
ld a, [$DB49] ; $4DC9: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $4DC9: $FA $49 $DB
and $01 ; $4DCC: $E6 $01
ret z ; $4DCE: $C8

Expand Down
8 changes: 4 additions & 4 deletions src/code/entities/bank3.asm
View file
Expand Up @@ -483,7 +483,7 @@ jr_003_499C:
cp $01 ; $4A07: $FE $01
jr nz, jr_003_4A12 ; $4A09: $20 $07

ld a, [$DB4B] ; $4A0B: $FA $4B $DB
ld a, [wHasToadstool] ; $4A0B: $FA $4B $DB
and a ; $4A0E: $A7
jp nz, ClearEntityType ; $4A0F: $C2 $8D $3F

Expand Down Expand Up @@ -3822,7 +3822,7 @@ jr_003_5D34:
ld [bc], a ; $5D48: $02
ld e, [hl] ; $5D49: $5E
ld [hl+], a ; $5D4A: $22
ld hl, $DB4B ; $5D4B: $21 $4B $DB
ld hl, wHasToadstool ; $5D4B: $21 $4B $DB
ld a, [wMagicPowderCount] ; $5D4E: $FA $4C $DB
or [hl] ; $5D51: $B6
jp nz, ClearEntityType ; $5D52: $C2 $8D $3F
Expand All @@ -3849,7 +3849,7 @@ jr_003_5D6C:
ld d, $0C ; $5D73: $16 $0C
call func_003_6472 ; $5D75: $CD $72 $64
ld a, $01 ; $5D78: $3E $01
ld [$DB4B], a ; $5D7A: $EA $4B $DB
ld [wHasToadstool], a ; $5D7A: $EA $4B $DB
jp ClearEntityType ; $5D7D: $C3 $8D $3F

jr_003_5D80:
Expand Down Expand Up @@ -4357,7 +4357,7 @@ jr_003_6052:
jr z, jr_003_606A ; $6061: $28 $07

jr_003_6063:
ld a, [$DB4B] ; $6063: $FA $4B $DB
ld a, [wHasToadstool] ; $6063: $FA $4B $DB
and a ; $6066: $A7
jp nz, ClearEntityType ; $6067: $C2 $8D $3F

Expand Down
4 changes: 2 additions & 2 deletions src/code/entities/bank36.asm
View file
Expand Up @@ -3577,7 +3577,7 @@ jr_036_542F:
ret ; $545C: $C9

func_036_545D:
ld a, [$DB4B] ; $545D: $FA $4B $DB
ld a, [wHasToadstool] ; $545D: $FA $4B $DB
and a ; $5460: $A7
ret nz ; $5461: $C0

Expand Down Expand Up @@ -3643,7 +3643,7 @@ func_036_54B0:
and a ; $54B3: $A7
ret nz ; $54B4: $C0

ld a, [$DB4B] ; $54B5: $FA $4B $DB
ld a, [wHasToadstool] ; $54B5: $FA $4B $DB
and a ; $54B8: $A7
ret z ; $54B9: $C8

Expand Down
2 changes: 1 addition & 1 deletion src/code/entities/bank4.asm
View file
Expand Up @@ -8141,7 +8141,7 @@ jr_004_74F1:
cp $03 ; $74F1: $FE $03
jr nz, jr_004_74FE ; $74F3: $20 $09

ld a, [$DB4B] ; $74F5: $FA $4B $DB
ld a, [wHasToadstool] ; $74F5: $FA $4B $DB
and a ; $74F8: $A7
jp nz, label_004_6D7A ; $74F9: $C2 $7A $6D

Expand Down
12 changes: 6 additions & 6 deletions src/code/entities/bank5.asm
View file
Expand Up @@ -1503,7 +1503,7 @@ func_005_47C0:
and a ; $4818: $A7
ret nz ; $4819: $C0

ld a, [$DB4B] ; $481A: $FA $4B $DB
ld a, [wHasToadstool] ; $481A: $FA $4B $DB
and a ; $481D: $A7
jr z, jr_005_484A ; $481E: $28 $2A

Expand Down Expand Up @@ -1549,7 +1549,7 @@ jr_005_484A:

jr_005_4853:
xor a ; $4853: $AF
ld [$DB4B], a ; $4854: $EA $4B $DB
ld [wHasToadstool], a ; $4854: $EA $4B $DB
call GetEntityTransitionCountdown ; $4857: $CD $05 $0C
ld [hl], $08 ; $485A: $36 $08
jp IncrementEntityWalkingAttr ; $485C: $C3 $12 $3B
Expand Down Expand Up @@ -2791,7 +2791,7 @@ jr_005_4F6F:
jp OpenDialogInTable1 ; $4F86: $C3 $73 $23

jr_005_4F89:
ld a, [$DB49] ; $4F89: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $4F89: $FA $49 $DB
and $04 ; $4F8C: $E6 $04
jr z, jr_005_4F95 ; $4F8E: $28 $05

Expand Down Expand Up @@ -2855,7 +2855,7 @@ jr_005_4FD6:

ld e, $04 ; $4FDB: $1E $04
ld d, $4A ; $4FDD: $16 $4A
ld a, [$DB49] ; $4FDF: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $4FDF: $FA $49 $DB
and $04 ; $4FE2: $E6 $04
jr z, jr_005_4FFA ; $4FE4: $28 $14

Expand Down Expand Up @@ -2928,7 +2928,7 @@ jr_005_503E:
cp $4A ; $503E: $FE $4A
jr nz, jr_005_5054 ; $5040: $20 $12

ld a, [$DB49] ; $5042: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $5042: $FA $49 $DB
and $04 ; $5045: $E6 $04
jr nz, jr_005_5054 ; $5047: $20 $0B

Expand Down Expand Up @@ -3118,7 +3118,7 @@ jr_005_515E:
and a ; $516E: $A7
ret nz ; $516F: $C0

ld hl, $DB49 ; $5170: $21 $49 $DB
ld hl, wOcarinaSongFlags ; $5170: $21 $49 $DB
set 2, [hl] ; $5173: $CB $D6
xor a ; $5175: $AF
ld [$DB4A], a ; $5176: $EA $4A $DB
Expand Down
4 changes: 2 additions & 2 deletions src/code/entities/bank6.asm
View file
Expand Up @@ -7364,7 +7364,7 @@ jr_006_6B3F:
jr z, jr_006_6BAD ; $6B46: $28 $65

ld e, $45 ; $6B48: $1E $45
ld a, [$DB49] ; $6B4A: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $6B4A: $FA $49 $DB
and $01 ; $6B4D: $E6 $01
jp z, label_006_6BB3 ; $6B4F: $CA $B3 $6B

Expand Down Expand Up @@ -8791,7 +8791,7 @@ label_006_7372:
cp $01 ; $737E: $FE $01
jr nz, jr_006_73AD ; $7380: $20 $2B

ld a, [$DB49] ; $7382: $FA $49 $DB
ld a, [wOcarinaSongFlags] ; $7382: $FA $49 $DB
and $04 ; $7385: $E6 $04
jr z, jr_006_73AD ; $7387: $28 $24

Expand Down
18 changes: 17 additions & 1 deletion src/constants/wram.asm
View file
Expand Up @@ -929,7 +929,23 @@ wArrowCount:: ; DB45

; Unlabeled
wDB46 equ $DB46
ds 6
ds 3

; $0111 means that the player has every song.
; byte 0: has Ballad of the Wind Fish?
; byte 1: has Manbo's Mambo?
; byte 2: has Frog's Song of the Soul?
wOcarinaSongFlags:: ; DB49
ds 1

; Unlabeled
wDB4A equ $DB4A
ds 1

; 0 means that the player does not have the Toadstool
; 1 means that the player has the Toadstool
wHasToadstool:: ; DB4B
ds 1

wMagicPowderCount:: ; DB4C
ds 1
Expand Down

0 comments on commit e1a9b02

Please sign in to comment.