foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Identify some .asm_* labels

Browse source
This commit is contained in:
Rangi 2022-07-10 21:11:03 -04:00
parent cc98f28227
commit 8f81e71f19
20 changed files with 93 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
audio/low_health_alarm.asm
View file

@ -7,25 +7,25 @@ Music_DoLowHealthAlarm::
ret z ;nope ret z ;nope
and $7f ;low 7 bits are the timer. and $7f ;low 7 bits are the timer.
jr nz, .asm_21383 ;if timer > 0, play low tone. jr nz, .notToneHi ;if timer > 0, play low tone.
call .playToneHi call .playToneHi
ld a, 30 ;keep this tone for 30 frames. ld a, 30 ;keep this tone for 30 frames.
jr .asm_21395 ;reset the timer. jr .resetTimer
.asm_21383 .notToneHi
cp 20 cp 20
jr nz, .asm_2138a ;if timer == 20, jr nz, .noTone ;if timer == 20,
call .playToneLo ;actually set the sound registers. call .playToneLo ;actually set the sound registers.
.asm_2138a .noTone
ld a, $86 ld a, $86
ld [wChannelSoundIDs + Ch5], a ;disable sound channel? ld [wChannelSoundIDs + Ch5], a ;disable sound channel?
ld a, [wLowHealthAlarm] ld a, [wLowHealthAlarm]
and $7f ;decrement alarm timer. and $7f ;decrement alarm timer.
dec a dec a
.asm_21395 .resetTimer
; reset the timer and enable flag. ; reset the timer and enable flag.
set 7, a set 7, a
ld [wLowHealthAlarm], a ld [wLowHealthAlarm], a

16
data/sgb/sgb_packets.asm
View file

@ -241,14 +241,14 @@ MaskEnCancelPacket: MASK_EN 0
; This set of packets is found in several Japanese SGB-compatible titles. ; This set of packets is found in several Japanese SGB-compatible titles.
; It appears to be part of NCL's SGB devkit. ; It appears to be part of NCL's SGB devkit.
DataSnd_72548: DataSndPacket1:
DATA_SND $85d, $0, 11 DATA_SND $85d, $0, 11
db $8C ; cpx #$8c (2) db $8C ; cpx #$8c (2)
db $D0, $F4 ; bne -$0c db $D0, $F4 ; bne -$0c
db $60 ; rts db $60 ; rts
ds 7, 0 ds 7, 0
DataSnd_72558: DataSndPacket2:
DATA_SND $852, $0, 11 DATA_SND $852, $0, 11
db $A9, $E7 ; lda #$e7 db $A9, $E7 ; lda #$e7
db $9F, $01, $C0, $7E ; sta $7ec001, x db $9F, $01, $C0, $7E ; sta $7ec001, x
@ -258,7 +258,7 @@ DataSnd_72558:
db $E8 ; inx db $E8 ; inx
db $E0 ; cpx #$8c (1) db $E0 ; cpx #$8c (1)
DataSnd_72568: DataSndPacket3:
DATA_SND $847, $0, 11 DATA_SND $847, $0, 11
db $C4 ; cmp #$c4 (2) db $C4 ; cmp #$c4 (2)
db $D0, $16 ; bne +$16 db $D0, $16 ; bne +$16
@ -268,7 +268,7 @@ DataSnd_72568:
db $D0, $10 ; bne +$10 db $D0, $10 ; bne +$10
db $A2, $28 ; ldx #$28 db $A2, $28 ; ldx #$28
DataSnd_72578: DataSndPacket4:
DATA_SND $83c, $0, 11 DATA_SND $83c, $0, 11
db $F0, $12 ; beq +$12 db $F0, $12 ; beq +$12
db $A5 ; lda dp db $A5 ; lda dp
@ -279,7 +279,7 @@ DataSnd_72578:
db $CA ; dex db $CA ; dex
db $C9 ; cmp #$c4 (1) db $C9 ; cmp #$c4 (1)
DataSnd_72588: DataSndPacket5:
DATA_SND $831, $0, 11 DATA_SND $831, $0, 11
dbw $0C, $CAA5 ; tsb $caa5 dbw $0C, $CAA5 ; tsb $caa5
db $C9, $7E ; cmp #$7e db $C9, $7E ; cmp #$7e
@ -288,7 +288,7 @@ DataSnd_72588:
db $CB ; wai db $CB ; wai
db $C9, $7E ; cmp #$7e db $C9, $7E ; cmp #$7e
DataSnd_72598: DataSndPacket6:
DATA_SND $826, $0, 11 DATA_SND $826, $0, 11
db $39 ; bne +$39 (2) db $39 ; bne +$39 (2)
dbw $CD, $C48 ; cmp $c48 dbw $CD, $C48 ; cmp $c48
@ -297,7 +297,7 @@ DataSnd_72598:
db $C9, $C9 ; cmp #$c9 db $C9, $C9 ; cmp #$c9
db $80, $D0 ; bra -$30 db $80, $D0 ; bra -$30
DataSnd_725a8: DataSndPacket7:
DATA_SND $81b, $0, 11 DATA_SND $81b, $0, 11
db $EA ; nop db $EA ; nop
db $EA ; nop db $EA ; nop
@ -309,7 +309,7 @@ DataSnd_725a8:
dbw $CD,$C4F ; cmp $c4f dbw $CD,$C4F ; cmp $c4f
db $D0 ; bne +$39 (1) db $D0 ; bne +$39 (1)
DataSnd_725b8: DataSndPacket8:
DATA_SND $810, $0, 11 DATA_SND $810, $0, 11
dbw $4C, $820 ; jmp $820 dbw $4C, $820 ; jmp $820
db $EA ; nop db $EA ; nop

4
engine/battle/core.asm
View file

@ -6768,11 +6768,11 @@ InitOpponent:
DetermineWildOpponent: DetermineWildOpponent:
ld a, [wd732] ld a, [wd732]
bit 1, a bit 1, a
jr z, .asm_3ef2f jr z, .notDebug
ldh a, [hJoyHeld] ldh a, [hJoyHeld]
bit BIT_B_BUTTON, a bit BIT_B_BUTTON, a
ret nz ret nz
.asm_3ef2f .notDebug
ld a, [wNumberOfNoRandomBattleStepsLeft] ld a, [wNumberOfNoRandomBattleStepsLeft]
and a and a
ret nz ret nz

5
engine/events/diploma.asm
View file

@ -17,9 +17,10 @@ DisplayDiploma::
hlcoord 0, 0 hlcoord 0, 0
lb bc, 16, 18 lb bc, 16, 18
predef Diploma_TextBoxBorder predef Diploma_TextBoxBorder
ld hl, DiplomaTextPointersAndCoords ld hl, DiplomaTextPointersAndCoords
ld c, $5 ld c, $5
.asm_56715 .placeTextLoop
push bc push bc
ld a, [hli] ld a, [hli]
ld e, a ld e, a
@ -34,7 +35,7 @@ DisplayDiploma::
inc hl inc hl
pop bc pop bc
dec c dec c
jr nz, .asm_56715 jr nz, .placeTextLoop
hlcoord 10, 4 hlcoord 10, 4
ld de, wPlayerName ld de, wPlayerName
call PlaceString call PlaceString

4
engine/events/hidden_objects/bench_guys.asm
View file

@ -79,9 +79,9 @@ SaffronCityPokecenterBenchGuyText::
text_asm text_asm
CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
ld hl, SaffronCityPokecenterBenchGuyText2 ld hl, SaffronCityPokecenterBenchGuyText2
jr nz, .asm_624f2 jr nz, .printText
ld hl, SaffronCityPokecenterBenchGuyText1 ld hl, SaffronCityPokecenterBenchGuyText1
.asm_624f2 .printText
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd

4
engine/events/hidden_objects/cinnabar_gym_quiz.asm
View file

@ -32,7 +32,7 @@ CinnabarGymQuiz::
call PrintText call PrintText
ld a, 1 ld a, 1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld [wDoNotWaitForButtonPressAfterDisplayingText], a
call CinnabarGymQuiz_1ea92 call CinnabarGymQuiz_AskQuestion
jp TextScriptEnd jp TextScriptEnd
CinnabarGymQuizIntroText: CinnabarGymQuizIntroText:
@ -75,7 +75,7 @@ CinnabarGymGateFlagAction:
EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED EventFlagAddress hl, EVENT_CINNABAR_GYM_GATE0_UNLOCKED
predef_jump FlagActionPredef predef_jump FlagActionPredef
CinnabarGymQuiz_1ea92: CinnabarGymQuiz_AskQuestion:
call YesNoChoice call YesNoChoice
ldh a, [hGymGateAnswer] ldh a, [hGymGateAnswer]
ld c, a ld c, a

4
engine/events/pewter_guys.asm
View file

@ -8,7 +8,7 @@ PewterGuys:
add hl, de add hl, de
ld d, h ld d, h
ld e, l ld e, l
ld hl, PointerTable_37ce6 ld hl, PewterGuysCoordsTable
ld a, [wWhichPewterGuy] ld a, [wWhichPewterGuy]
add a add a
ld b, 0 ld b, 0
@ -48,7 +48,7 @@ PewterGuys:
inc hl inc hl
jr .findMatchingCoordsLoop jr .findMatchingCoordsLoop
PointerTable_37ce6: PewterGuysCoordsTable:
dw PewterMuseumGuyCoords dw PewterMuseumGuyCoords
dw PewterGymGuyCoords dw PewterGymGuyCoords

4
engine/gfx/hp_bar.asm
View file

@ -215,10 +215,10 @@ UpdateHPBar_PrintHPNumber:
push hl push hl
ldh a, [hUILayoutFlags] ldh a, [hUILayoutFlags]
bit 0, a bit 0, a
jr z, .asm_fb15 jr z, .hpBelowBar
ld de, $9 ld de, $9
jr .next jr .next
.asm_fb15 .hpBelowBar
ld de, $15 ld de, $15
.next .next
add hl, de add hl, de

16
engine/gfx/palettes.asm
View file

@ -443,14 +443,14 @@ PrepareSuperNintendoVRAMTransfer:
.packetPointers .packetPointers
; Only the first packet is needed. ; Only the first packet is needed.
dw MaskEnFreezePacket dw MaskEnFreezePacket
dw DataSnd_72548 dw DataSndPacket1
dw DataSnd_72558 dw DataSndPacket2
dw DataSnd_72568 dw DataSndPacket3
dw DataSnd_72578 dw DataSndPacket4
dw DataSnd_72588 dw DataSndPacket5
dw DataSnd_72598 dw DataSndPacket6
dw DataSnd_725a8 dw DataSndPacket7
dw DataSnd_725b8 dw DataSndPacket8
CheckSGB: CheckSGB:
; Returns whether the game is running on an SGB in carry. ; Returns whether the game is running on an SGB in carry.

36
engine/items/item_effects.asm
View file

@ -2646,7 +2646,7 @@ SendNewMonToBox:
ld a, [wcf91] ld a, [wcf91]
ld [wd0b5], a ld [wd0b5], a
ld c, a ld c, a
.asm_e7b1 .loop
inc de inc de
ld a, [de] ld a, [de]
ld b, a ld b, a
@ -2654,13 +2654,13 @@ SendNewMonToBox:
ld c, b ld c, b
ld [de], a ld [de], a
cp $ff cp $ff
jr nz, .asm_e7b1 jr nz, .loop
call GetMonHeader call GetMonHeader
ld hl, wBoxMonOT ld hl, wBoxMonOT
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
ld a, [wBoxCount] ld a, [wBoxCount]
dec a dec a
jr z, .asm_e7ee jr z, .skip
dec a dec a
call AddNTimes call AddNTimes
push hl push hl
@ -2672,7 +2672,7 @@ SendNewMonToBox:
ld a, [wBoxCount] ld a, [wBoxCount]
dec a dec a
ld b, a ld b, a
.asm_e7db .loop2
push bc push bc
push hl push hl
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
@ -2684,15 +2684,15 @@ SendNewMonToBox:
add hl, bc add hl, bc
pop bc pop bc
dec b dec b
jr nz, .asm_e7db jr nz, .loop2
.asm_e7ee .skip
ld hl, wPlayerName ld hl, wPlayerName
ld de, wBoxMonOT ld de, wBoxMonOT
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyData call CopyData
ld a, [wBoxCount] ld a, [wBoxCount]
dec a dec a
jr z, .asm_e82a jr z, .skip2
ld hl, wBoxMonNicks ld hl, wBoxMonNicks
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
dec a dec a
@ -2706,7 +2706,7 @@ SendNewMonToBox:
ld a, [wBoxCount] ld a, [wBoxCount]
dec a dec a
ld b, a ld b, a
.asm_e817 .loop3
push bc push bc
push hl push hl
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
@ -2718,15 +2718,15 @@ SendNewMonToBox:
add hl, bc add hl, bc
pop bc pop bc
dec b dec b
jr nz, .asm_e817 jr nz, .loop3
.asm_e82a .skip2
ld hl, wBoxMonNicks ld hl, wBoxMonNicks
ld a, NAME_MON_SCREEN ld a, NAME_MON_SCREEN
ld [wNamingScreenType], a ld [wNamingScreenType], a
predef AskName predef AskName
ld a, [wBoxCount] ld a, [wBoxCount]
dec a dec a
jr z, .asm_e867 jr z, .skip3
ld hl, wBoxMons ld hl, wBoxMons
ld bc, wBoxMon2 - wBoxMon1 ld bc, wBoxMon2 - wBoxMon1
dec a dec a
@ -2740,7 +2740,7 @@ SendNewMonToBox:
ld a, [wBoxCount] ld a, [wBoxCount]
dec a dec a
ld b, a ld b, a
.asm_e854 .loop4
push bc push bc
push hl push hl
ld bc, wBoxMon2 - wBoxMon1 ld bc, wBoxMon2 - wBoxMon1
@ -2752,8 +2752,8 @@ SendNewMonToBox:
add hl, bc add hl, bc
pop bc pop bc
dec b dec b
jr nz, .asm_e854 jr nz, .loop4
.asm_e867 .skip3
ld a, [wEnemyMonLevel] ld a, [wEnemyMonLevel]
ld [wEnemyMonBoxLevel], a ld [wEnemyMonBoxLevel], a
ld hl, wEnemyMon ld hl, wEnemyMon
@ -2783,11 +2783,11 @@ SendNewMonToBox:
inc de inc de
xor a xor a
ld b, NUM_STATS * 2 ld b, NUM_STATS * 2
.asm_e89f .loop5
ld [de], a ld [de], a
inc de inc de
dec b dec b
jr nz, .asm_e89f jr nz, .loop5
ld hl, wEnemyMonDVs ld hl, wEnemyMonDVs
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
@ -2796,12 +2796,12 @@ SendNewMonToBox:
ld [de], a ld [de], a
ld hl, wEnemyMonPP ld hl, wEnemyMonPP
ld b, NUM_MOVES ld b, NUM_MOVES
.asm_e8b1 .loop6
ld a, [hli] ld a, [hli]
inc de inc de
ld [de], a ld [de], a
dec b dec b
jr nz, .asm_e8b1 jr nz, .loop6
ret ret
; checks if the tile in front of the player is a shore or water tile ; checks if the tile in front of the player is a shore or water tile

22
engine/math/multiply_divide.asm
View file

@ -68,7 +68,7 @@ _Divide::
ldh [hDivideBuffer+4], a ldh [hDivideBuffer+4], a
ld a, $9 ld a, $9
ld e, a ld e, a
.asm_37db3 .loop
ldh a, [hDivideBuffer] ldh a, [hDivideBuffer]
ld c, a ld c, a
ldh a, [hDividend+1] ; (aliases: hMultiplicand) ldh a, [hDividend+1] ; (aliases: hMultiplicand)
@ -78,18 +78,18 @@ _Divide::
ld c, a ld c, a
ldh a, [hDividend] ; (aliases: hProduct, hPastLeadingZeros, hQuotient) ldh a, [hDividend] ; (aliases: hProduct, hPastLeadingZeros, hQuotient)
sbc c sbc c
jr c, .asm_37dce jr c, .next
ldh [hDividend], a ; (aliases: hProduct, hPastLeadingZeros, hQuotient) ldh [hDividend], a ; (aliases: hProduct, hPastLeadingZeros, hQuotient)
ld a, d ld a, d
ldh [hDividend+1], a ; (aliases: hMultiplicand) ldh [hDividend+1], a ; (aliases: hMultiplicand)
ldh a, [hDivideBuffer+4] ldh a, [hDivideBuffer+4]
inc a inc a
ldh [hDivideBuffer+4], a ldh [hDivideBuffer+4], a
jr .asm_37db3 jr .loop
.asm_37dce .next
ld a, b ld a, b
cp $1 cp $1
jr z, .asm_37e18 jr z, .done
ldh a, [hDivideBuffer+4] ldh a, [hDivideBuffer+4]
sla a sla a
ldh [hDivideBuffer+4], a ldh [hDivideBuffer+4], a
@ -103,7 +103,7 @@ _Divide::
rl a rl a
ldh [hDivideBuffer+1], a ldh [hDivideBuffer+1], a
dec e dec e
jr nz, .asm_37e04 jr nz, .next2
ld a, $8 ld a, $8
ld e, a ld e, a
ldh a, [hDivideBuffer] ldh a, [hDivideBuffer]
@ -116,20 +116,20 @@ _Divide::
ldh [hDividend+1], a ; (aliases: hMultiplicand) ldh [hDividend+1], a ; (aliases: hMultiplicand)
ldh a, [hDividend+3] ldh a, [hDividend+3]
ldh [hDividend+2], a ldh [hDividend+2], a
.asm_37e04 .next2
ld a, e ld a, e
cp $1 cp $1
jr nz, .asm_37e0a jr nz, .okay
dec b dec b
.asm_37e0a .okay
ldh a, [hDivisor] ; (aliases: hDivisor, hMultiplier, hPowerOf10) ldh a, [hDivisor] ; (aliases: hDivisor, hMultiplier, hPowerOf10)
srl a srl a
ldh [hDivisor], a ; (aliases: hDivisor, hMultiplier, hPowerOf10) ldh [hDivisor], a ; (aliases: hDivisor, hMultiplier, hPowerOf10)
ldh a, [hDivideBuffer] ldh a, [hDivideBuffer]
rr a rr a
ldh [hDivideBuffer], a ldh [hDivideBuffer], a
jr .asm_37db3 jr .loop
.asm_37e18 .done
ldh a, [hDividend+1] ; (aliases: hMultiplicand) ldh a, [hDividend+1] ; (aliases: hMultiplicand)
ldh [hRemainder], a ; (aliases: hDivisor, hMultiplier, hPowerOf10) ldh [hRemainder], a ; (aliases: hDivisor, hMultiplier, hPowerOf10)
ldh a, [hDivideBuffer+4] ldh a, [hDivideBuffer+4]

4
engine/menus/main_menu.asm
View file

@ -184,13 +184,13 @@ LinkMenu:
ld b, a ld b, a
and $f0 and $f0
cp $d0 cp $d0
jr z, .asm_5c7d jr z, .checkEnemyMenuSelection
ld a, [wLinkMenuSelectionReceiveBuffer + 1] ld a, [wLinkMenuSelectionReceiveBuffer + 1]
ld b, a ld b, a
and $f0 and $f0
cp $d0 cp $d0
jr nz, .exchangeMenuSelectionLoop jr nz, .exchangeMenuSelectionLoop
.asm_5c7d .checkEnemyMenuSelection
ld a, b ld a, b
and $c ; did the enemy press A or B? and $c ; did the enemy press A or B?
jr nz, .enemyPressedAOrB jr nz, .enemyPressedAOrB

4
engine/overworld/field_move_messages.asm
View file

@ -32,7 +32,7 @@ IsSurfingAllowed:
ret nz ret nz
CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
ret z ret z
ld hl, CoordsData_cdf7 ld hl, SeafoamIslandsB4FStairsCoords
call ArePlayerCoordsInArray call ArePlayerCoordsInArray
ret nc ret nc
ld hl, wd728 ld hl, wd728
@ -45,7 +45,7 @@ IsSurfingAllowed:
ld hl, CyclingIsFunText ld hl, CyclingIsFunText
jp PrintText jp PrintText
CoordsData_cdf7: SeafoamIslandsB4FStairsCoords:
dbmapcoord 7, 11 dbmapcoord 7, 11
db -1 ; end db -1 ; end

4
engine/overworld/missable_objects.asm
View file

@ -23,9 +23,9 @@ LoadMissableObjects:
ld de, MissableObjects ; calculate difference between out pointer and the base pointer ld de, MissableObjects ; calculate difference between out pointer and the base pointer
ld a, l ld a, l
sub e sub e
jr nc, .asm_f13c jr nc, .noCarry
dec h dec h
.asm_f13c .noCarry
ld l, a ld l, a
ld a, h ld a, h
sub d sub d

8
engine/overworld/pathfinding.asm
View file

@ -14,22 +14,22 @@ FindPathToPlayer:
call CalcDifference call CalcDifference
ld d, a ld d, a
and a and a
jr nz, .asm_f8da jr nz, .stillHasYProgress
ldh a, [hFindPathFlags] ldh a, [hFindPathFlags]
set 0, a ; current end of path matches the player's Y coordinate set 0, a ; current end of path matches the player's Y coordinate
ldh [hFindPathFlags], a ldh [hFindPathFlags], a
.asm_f8da .stillHasYProgress
ldh a, [hFindPathXProgress] ldh a, [hFindPathXProgress]
ld b, a ld b, a
ldh a, [hNPCPlayerXDistance] ; X distance in steps ldh a, [hNPCPlayerXDistance] ; X distance in steps
call CalcDifference call CalcDifference
ld e, a ld e, a
and a and a
jr nz, .asm_f8ec jr nz, .stillHasXProgress
ldh a, [hFindPathFlags] ldh a, [hFindPathFlags]
set 1, a ; current end of path matches the player's X coordinate set 1, a ; current end of path matches the player's X coordinate
ldh [hFindPathFlags], a ldh [hFindPathFlags], a
.asm_f8ec .stillHasXProgress
ldh a, [hFindPathFlags] ldh a, [hFindPathFlags]
cp $3 ; has the end of the path reached the player's position? cp $3 ; has the end of the path reached the player's position?
jr z, .done jr z, .done

8
engine/overworld/player_state.asm
View file

@ -101,10 +101,10 @@ IsPlayerFacingEdgeOfMap::
ld b, a ld b, a
ld a, [wXCoord] ld a, [wXCoord]
ld c, a ld c, a
ld de, .asm_c41e ld de, .return
push de push de
jp hl jp hl
.asm_c41e .return
pop bc pop bc
pop de pop de
pop hl pop hl
@ -239,11 +239,11 @@ PrintSafariZoneSteps::
call PlaceString call PlaceString
ld a, [wNumSafariBalls] ld a, [wNumSafariBalls]
cp 10 cp 10
jr nc, .asm_c56d jr nc, .tenOrMore
hlcoord 5, 3 hlcoord 5, 3
ld a, " " ld a, " "
ld [hl], a ld [hl], a
.asm_c56d .tenOrMore
hlcoord 6, 3 hlcoord 6, 3
ld de, wNumSafariBalls ld de, wNumSafariBalls
lb bc, 1, 2 lb bc, 1, 2

14
engine/overworld/spinners.asm
View file

@ -11,18 +11,18 @@ LoadSpinnerArrowTiles::
ld a, [wCurMapTileset] ld a, [wCurMapTileset]
cp FACILITY cp FACILITY
ld hl, FacilitySpinnerArrows ld hl, FacilitySpinnerArrows
jr z, .asm_44ff6 jr z, .gotSpinnerArrows
ld hl, GymSpinnerArrows ld hl, GymSpinnerArrows
.asm_44ff6 .gotSpinnerArrows
ld a, [wSimulatedJoypadStatesIndex] ld a, [wSimulatedJoypadStatesIndex]
bit 0, a bit 0, a
jr nz, .asm_45001 jr nz, .alternateGraphics
ld de, $18 ld de, 6 * 4
add hl, de add hl, de
.asm_45001 .alternateGraphics
ld a, $4 ld a, $4
ld bc, $0 ld bc, $0
.asm_45006 .loop
push af push af
push hl push hl
push bc push bc
@ -46,7 +46,7 @@ LoadSpinnerArrowTiles::
pop hl pop hl
pop af pop af
dec a dec a
jr nz, .asm_45006 jr nz, .loop
ret ret
INCLUDE "data/tilesets/spinner_tiles.asm" INCLUDE "data/tilesets/spinner_tiles.asm"

4
engine/overworld/tilesets.asm
View file

@ -35,13 +35,13 @@ LoadTilesetHeader:
call IsInArray call IsInArray
pop de pop de
pop hl pop hl
jr c, .asm_c797 jr c, .dungeon
ld a, [wCurMapTileset] ld a, [wCurMapTileset]
ld b, a ld b, a
ldh a, [hPreviousTileset] ldh a, [hPreviousTileset]
cp b cp b
jr z, .done jr z, .done
.asm_c797 .dungeon
ld a, [wDestinationWarpID] ld a, [wDestinationWarpID]
cp $ff cp $ff
jr z, .done jr z, .done

8
engine/play_time.asm
View file

@ -39,12 +39,12 @@ TrackPlayTime::
CountDownIgnoreInputBitReset: CountDownIgnoreInputBitReset:
ld a, [wIgnoreInputCounter] ld a, [wIgnoreInputCounter]
and a and a
jr nz, .asm_18e40 jr nz, .decrement
ld a, $ff ld a, $ff
jr .asm_18e41 jr .continue
.asm_18e40 .decrement
dec a dec a
.asm_18e41 .continue
ld [wIgnoreInputCounter], a ld [wIgnoreInputCounter], a
and a and a
ret nz ret nz

2
home/yes_no.asm
View file

@ -5,7 +5,7 @@ YesNoChoice::
call InitYesNoTextBoxParameters call InitYesNoTextBoxParameters
jr DisplayYesNoChoice jr DisplayYesNoChoice
Func_35f4:: TwoOptionMenu:: ; unreferenced
ld a, TWO_OPTION_MENU ld a, TWO_OPTION_MENU
ld [wTextBoxID], a ld [wTextBoxID], a
call InitYesNoTextBoxParameters call InitYesNoTextBoxParameters