Game-Decompilation/LADX-Disassembly
1
0
Fork 0
mirror of https://github.com/zladx/LADX-Disassembly.git synced 2024-11-27 06:40:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #568 from EpochFlame/buttonLabel

Browse Source 
label A button checks
This commit is contained in:
Pierre de La Morinerie 2024-07-23 06:08:06 +02:00 committed by GitHub
commit 59d24c1e26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/code/bank0.asm
View File

@ -3704,13 +3704,13 @@ ENDC
ld a, [wInventoryItems.BButtonSlot] ; $20CF: $FA $00 $DB
cp INVENTORY_POWER_BRACELET ; $20D2: $FE $03
jr nz, .jr_20DD ; $20D4: $20 $07
jr nz, .checkAButtonSlot ; $20D4: $20 $07
ldh a, [hPressedButtonsMask] ; $20D6: $F0 $CB
and J_B ; $20D8: $E6 $20
jr nz, .jr_20EC ; $20DA: $20 $10
ret ; $20DC: $C9
.jr_20DD
.checkAButtonSlot
ld a, [wInventoryItems.AButtonSlot] ; $20DD: $FA $01 $DB
cp INVENTORY_POWER_BRACELET ; $20E0: $FE $03
IF __OPTIMIZATIONS_1__

6
src/code/bank14.asm
View File

@ -1165,12 +1165,12 @@ jr_014_5360:
ld e, J_A ; $537D: $1E $10
ld a, [wInventoryItems.BButtonSlot] ; $537F: $FA $00 $DB
cp d ; $5382: $BA
jr nz, .jr_5389 ; $5383: $20 $04
jr nz, .checkAButtonSlot ; $5383: $20 $04
sla e ; J_B ; $5385: $CB $23
sla e ; J_B ; $5385: $CB $23
jr jr_014_5391 ; $5387: $18 $08
.jr_5389
.checkAButtonSlot
ld a, [wInventoryItems.AButtonSlot] ; $5389: $FA $01 $DB
cp d ; $538C: $BA
jr z, jr_014_5391 ; $538D: $28 $02

4
src/code/entities/03_bomb.asm
View File

@ -43,7 +43,7 @@ BombEntityHandler::
ld a, [wInventoryItems.BButtonSlot] ; $66DB: $FA $00 $DB
cp INVENTORY_BOMBS ; $66DE: $FE $02
jr nz, .jr_66EA ; $66E0: $20 $08
jr nz, .checkAButtonSlot ; $66E0: $20 $08
ldh a, [hJoypadState] ; $66E2: $F0 $CC
and J_B ; $66E4: $E6 $20
@ -51,7 +51,7 @@ BombEntityHandler::
jr jr_003_66FA ; $66E8: $18 $10
.jr_66EA
.checkAButtonSlot
ld a, [wInventoryItems.AButtonSlot] ; $66EA: $FA $01 $DB
cp INVENTORY_BOMBS ; $66ED: $FE $02
jr nz, jr_003_66FA ; $66EF: $20 $09

4
src/code/entities/04_genie.asm
View File

@ -301,7 +301,7 @@ jr_004_41AC:
call ResetPegasusBoots ; $41CD: $CD $B6 $0C
ld a, [wInventoryItems.BButtonSlot] ; $41D0: $FA $00 $DB
cp INVENTORY_POWER_BRACELET ; $41D3: $FE $03
jr nz, .jr_41DF ; $41D5: $20 $08
jr nz, .checkAButtonSlot ; $41D5: $20 $08
ldh a, [hPressedButtonsMask] ; $41D7: $F0 $CB
and J_B ; $41D9: $E6 $20
@ -309,7 +309,7 @@ jr_004_41AC:
jr jr_004_4210 ; $41DD: $18 $31
.jr_41DF
.checkAButtonSlot
ld a, [wInventoryItems.AButtonSlot] ; $41DF: $FA $01 $DB
cp INVENTORY_POWER_BRACELET ; $41E2: $FE $03
jr nz, jr_004_4210 ; $41E4: $20 $2A

4
src/code/entities/05_cucco.asm
View File

@ -131,7 +131,7 @@ jr_005_45BF:
ld a, [wInventoryItems.BButtonSlot] ; $45D0: $FA $00 $DB
cp INVENTORY_POWER_BRACELET ; $45D3: $FE $03
jr nz, .jr_45DF ; $45D5: $20 $08
jr nz, .checkAButtonSlot ; $45D5: $20 $08
ldh a, [hJoypadState] ; $45D7: $F0 $CC
and J_B ; $45D9: $E6 $20
@ -139,7 +139,7 @@ jr_005_45BF:
jr jr_005_4611 ; $45DD: $18 $32
.jr_45DF
.checkAButtonSlot
ld a, [wInventoryItems.AButtonSlot] ; $45DF: $FA $01 $DB
cp INVENTORY_POWER_BRACELET ; $45E2: $FE $03
jr nz, jr_005_4611 ; $45E4: $20 $2B

6
src/code/entities/05_witch.asm
View File

@ -92,7 +92,7 @@ func_005_4815::
ld hl, wInventoryItems.BButtonSlot ; $4826: $21 $00 $DB
ld a, [hl] ; $4829: $7E
cp INVENTORY_MAGIC_POWDER ; $482A: $FE $0C
jr nz, .checkASlot ; $482C: $20 $0E
jr nz, .checkAButtonSlot ; $482C: $20 $0E
ldh a, [hJoypadState] ; $482E: $F0 $CC
and J_B ; $4830: $E6 $20
@ -103,8 +103,8 @@ func_005_4815::
ld [wC1A8], a ; $4837: $EA $A8 $C1
jr jr_005_4847 ; $483A: $18 $0B
.checkASlot:
; check A slot
.checkAButtonSlot:
; check A Button slot
; improvement: could be done in one command
inc hl ; $483C: $23
ld a, [hl] ; $483D: $7E

4
src/code/entities/06_smasher.asm
View File

@ -458,7 +458,7 @@ jr_006_4806:
ld a, [wInventoryItems.BButtonSlot] ; $4811: $FA $00 $DB
cp INVENTORY_POWER_BRACELET ; $4814: $FE $03
jr nz, .jr_4820 ; $4816: $20 $08
jr nz, .checkAButtonSlot ; $4816: $20 $08
ldh a, [hJoypadState] ; $4818: $F0 $CC
and J_B ; $481A: $E6 $20
@ -466,7 +466,7 @@ jr_006_4806:
jr ret_006_4852 ; $481E: $18 $32
.jr_4820
.checkAButtonSlot
ld a, [wInventoryItems.AButtonSlot] ; $4820: $FA $01 $DB
cp INVENTORY_POWER_BRACELET ; $4823: $FE $03
jr nz, ret_006_4852 ; $4825: $20 $2B

4
src/code/entities/07_bushcrawler.asm
View File

@ -205,7 +205,7 @@ jr_007_4128:
ld a, [wInventoryItems.BButtonSlot] ; $4140: $FA $00 $DB
cp INVENTORY_POWER_BRACELET ; $4143: $FE $03
jr nz, .jr_414E ; $4145: $20 $07
jr nz, .checkAButtonSlot ; $4145: $20 $07
ldh a, [hJoypadState] ; $4147: $F0 $CC
and J_B ; $4149: $E6 $20
@ -213,7 +213,7 @@ jr_007_4128:
ret ; $414D: $C9
.jr_414E
.checkAButtonSlot
ld a, [wInventoryItems.AButtonSlot] ; $414E: $FA $01 $DB
cp INVENTORY_POWER_BRACELET ; $4151: $FE $03
ret nz ; $4153: $C0

4
src/code/entities/07_wingedoctorok.asm
View File

@ -185,7 +185,7 @@ label_007_5721:
ld a, [wInventoryItems.BButtonSlot] ; $573B: $FA $00 $DB
cp INVENTORY_SWORD ; $573E: $FE $01
jr nz, .jr_574A ; $5740: $20 $08
jr nz, .checkAButtonSlot ; $5740: $20 $08
ldh a, [hJoypadState] ; $5742: $F0 $CC
and J_B ; $5744: $E6 $20
@ -193,7 +193,7 @@ label_007_5721:
jr jr_007_5777 ; $5748: $18 $2D
.jr_574A
.checkAButtonSlot
ld a, [wInventoryItems.AButtonSlot] ; $574A: $FA $01 $DB
cp INVENTORY_SWORD ; $574D: $FE $01
jr nz, jr_007_5777 ; $574F: $20 $26

4
src/code/entities/07_wreckingball.asm
View File

@ -174,7 +174,7 @@ jr_007_60DD:
ld a, [wInventoryItems.BButtonSlot] ; $60E8: $FA $00 $DB
cp INVENTORY_POWER_BRACELET ; $60EB: $FE $03
jr nz, .jr_60F7 ; $60ED: $20 $08
jr nz, .checkAButtonSlot ; $60ED: $20 $08
ldh a, [hJoypadState] ; $60EF: $F0 $CC
and J_B ; $60F1: $E6 $20
@ -182,7 +182,7 @@ jr_007_60DD:
jr ret_007_6133 ; $60F5: $18 $3C
.jr_60F7
.checkAButtonSlot
ld a, [wInventoryItems.AButtonSlot] ; $60F7: $FA $01 $DB
cp INVENTORY_POWER_BRACELET ; $60FA: $FE $03
jr nz, ret_007_6133 ; $60FC: $20 $35

4
src/code/entities/15_final_nightmare.asm
View File

@ -650,7 +650,7 @@ func_015_5435::
ld a, [wInventoryItems.BButtonSlot] ; $543B: $FA $00 $DB
cp INVENTORY_MAGIC_POWDER ; $543E: $FE $0C
jr nz, .jr_5450 ; $5440: $20 $0E
jr nz, .noPowderB ; $5440: $20 $0E
ldh a, [hJoypadState] ; $5442: $F0 $CC
and J_B ; $5444: $E6 $20
@ -660,7 +660,7 @@ func_015_5435::
ld [wD220], a ; $544A: $EA $20 $D2
jp label_015_54A2 ; $544D: $C3 $A2 $54
.jr_5450
.noPowderB
ld a, [wInventoryItems.AButtonSlot] ; $5450: $FA $01 $DB
cp INVENTORY_MAGIC_POWDER ; $5453: $FE $0C
jr nz, jr_015_5465 ; $5455: $20 $0E

4
src/code/entities/19_rooster.asm
View File

@ -171,7 +171,7 @@ jr_019_5A9F:
ld a, [wInventoryItems.BButtonSlot] ; $5AAB: $FA $00 $DB
cp INVENTORY_POWER_BRACELET ; $5AAE: $FE $03
jr nz, .jr_5AB9 ; $5AB0: $20 $07
jr nz, .noBraceletB ; $5AB0: $20 $07
ldh a, [hJoypadState] ; $5AB2: $F0 $CC
and J_B ; $5AB4: $E6 $20
@ -179,7 +179,7 @@ jr_019_5A9F:
ret ; $5AB8: $C9
.jr_5AB9
.noBraceletB
ld a, [wInventoryItems.AButtonSlot] ; $5AB9: $FA $01 $DB
cp INVENTORY_POWER_BRACELET ; $5ABC: $FE $03
ret nz ; $5ABE: $C0

4
src/code/entities/19_side_view_pot.asm
View File

@ -63,7 +63,7 @@ jr_019_5922:
ld a, [wInventoryItems.BButtonSlot] ; $5937: $FA $00 $DB
cp INVENTORY_POWER_BRACELET ; $593A: $FE $03
jr nz, .jr_5945 ; $593C: $20 $07
jr nz, .noBraceletB ; $593C: $20 $07
ldh a, [hJoypadState] ; $593E: $F0 $CC
and J_B ; $5940: $E6 $20
@ -71,7 +71,7 @@ jr_019_5922:
ret ; $5944: $C9
.jr_5945
.noBraceletB
ld a, [wInventoryItems.AButtonSlot] ; $5945: $FA $01 $DB
cp INVENTORY_POWER_BRACELET ; $5948: $FE $03
ret nz ; $594A: $C0

4
src/code/entities/bank3.asm
View File

@ -1216,7 +1216,7 @@ EntityStunnedHandler::
call func_003_6E2B ; $4E16: $CD $2B $6E
ld a, [wInventoryItems.BButtonSlot] ; $4E19: $FA $00 $DB
cp INVENTORY_POWER_BRACELET ; $4E1C: $FE $03
jr nz, .jr_4E28 ; $4E1E: $20 $08
jr nz, .noBraceletB ; $4E1E: $20 $08
ldh a, [hJoypadState] ; $4E20: $F0 $CC
and J_B ; $4E22: $E6 $20
@ -1224,7 +1224,7 @@ EntityStunnedHandler::
jr jr_003_4E72 ; $4E26: $18 $4A
.jr_4E28
.noBraceletB
ld a, [wInventoryItems.AButtonSlot] ; $4E28: $FA $01 $DB
cp INVENTORY_POWER_BRACELET ; $4E2B: $FE $03
jr nz, jr_003_4E72 ; $4E2D: $20 $43

4
src/code/entities/bank36.asm
View File

@ -3414,7 +3414,7 @@ func_036_54B0::
ld a, [wInventoryItems.BButtonSlot] ; $54BA: $FA $00 $DB
cp INVENTORY_MAGIC_POWDER ; $54BD: $FE $0C
jr nz, .jr_54C8 ; $54BF: $20 $07
jr nz, .noPowderB ; $54BF: $20 $07
ldh a, [hJoypadState] ; $54C1: $F0 $CC
and J_B ; $54C3: $E6 $20
@ -3422,7 +3422,7 @@ func_036_54B0::
jr jr_036_54D3 ; $54C6: $18 $0B
.jr_54C8
.noPowderB
ld a, [wInventoryItems.AButtonSlot] ; $54C8: $FA $01 $DB
cp INVENTORY_MAGIC_POWDER ; $54CB: $FE $0C
ret nz ; $54CD: $C0