mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-11-14 00:56:40 +13:00
Use tabs for indentation, not spaces.
hg-commit-id: e5f18384709d
This commit is contained in:
parent
7d7c1732e5
commit
08ea1fa6f1
46
common.asm
46
common.asm
|
|
@ -848,8 +848,7 @@ DelayFrame: ; 20AF
|
||||||
|
|
||||||
; wait for the next Vblank, halting to conserve battery
|
; wait for the next Vblank, halting to conserve battery
|
||||||
.halt\@
|
.halt\@
|
||||||
db $76 ; XXX this is a hack--rgbasm adds a nop after this instr
|
db $76 ; XXX this is a hack--rgbasm adds a nop after this instr even when ints are enabled
|
||||||
; even when ints are enabled
|
|
||||||
ld a,[$FFD6]
|
ld a,[$FFD6]
|
||||||
and a
|
and a
|
||||||
jr nz,.halt\@
|
jr nz,.halt\@
|
||||||
|
|
@ -859,8 +858,8 @@ DelayFrame: ; 20AF
|
||||||
; These routines manage gradual fading
|
; These routines manage gradual fading
|
||||||
; (e.g., entering a doorway)
|
; (e.g., entering a doorway)
|
||||||
LoadGBPal: ; 20BA
|
LoadGBPal: ; 20BA
|
||||||
ld a,[$d35d] ;tells if cur.map is dark
|
ld a,[$d35d] ;tells if cur.map is dark (requires HM5_FLASH?)
|
||||||
ld b,a ;(requires HM5_FLASH?)
|
ld b,a
|
||||||
ld hl,GBPalTable_00 ;16
|
ld hl,GBPalTable_00 ;16
|
||||||
ld a,l
|
ld a,l
|
||||||
sub b
|
sub b
|
||||||
|
|
@ -7901,13 +7900,17 @@ ItemUseBall: ;03:5687
|
||||||
ld a,[hli]
|
ld a,[hli]
|
||||||
ld b,a
|
ld b,a
|
||||||
ld a,[hl]
|
ld a,[hl]
|
||||||
srl b ;explanation:
|
|
||||||
rr a ;we have a 16 bit value
|
; explanation: we have a 16-bit value equal to [b << 8 | a].
|
||||||
srl b ;equal to [b << 8 | a].
|
; This number is divided by 4. The result is 8 bit (reg. a).
|
||||||
rr a ;This number is divided
|
; Always bigger than zero.
|
||||||
and a ;by 4. The result is
|
srl b
|
||||||
jr nz,.next8\@ ;8 bit (reg. a). Always
|
rr a
|
||||||
inc a ;bigger than zero.
|
srl b
|
||||||
|
rr a
|
||||||
|
and a
|
||||||
|
jr nz,.next8\@
|
||||||
|
inc a
|
||||||
.next8\@ ;$5766
|
.next8\@ ;$5766
|
||||||
ld [$ff99],a
|
ld [$ff99],a
|
||||||
ld b,4
|
ld b,4
|
||||||
|
|
@ -17667,19 +17670,13 @@ Green2Data:
|
||||||
db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0
|
db $FF,37,PIDGEOT,38,GROWLITHE,35,EXEGGCUTE,35,ALAKAZAM,40,BLASTOISE,0
|
||||||
db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0
|
db $FF,37,PIDGEOT,38,GYARADOS,35,GROWLITHE,35,ALAKAZAM,40,VENUSAUR,0
|
||||||
db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0
|
db $FF,37,PIDGEOT,38,EXEGGCUTE,35,GYARADOS,35,ALAKAZAM,40,CHARIZARD,0
|
||||||
db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM ;\
|
db $FF,47,PIDGEOT,45,RHYHORN,45,GROWLITHE,47,EXEGGCUTE,50,ALAKAZAM,53,BLASTOISE,0
|
||||||
db 53,BLASTOISE,0
|
db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM,53,VENUSAUR,0
|
||||||
db $FF,47,PIDGEOT,45,RHYHORN,45,GYARADOS,47,GROWLITHE,50,ALAKAZAM ;\
|
db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM,53,CHARIZARD,0
|
||||||
db 53,VENUSAUR,0
|
|
||||||
db $FF,47,PIDGEOT,45,RHYHORN,45,EXEGGCUTE,47,GYARADOS,50,ALAKAZAM ;\
|
|
||||||
db 53,CHARIZARD,0
|
|
||||||
Green3Data:
|
Green3Data:
|
||||||
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR ;\
|
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,ARCANINE,63,EXEGGUTOR,65,BLASTOISE,0
|
||||||
db 65,BLASTOISE,0
|
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE,65,VENUSAUR,0
|
||||||
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,GYARADOS,63,ARCANINE ;\
|
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS,65,CHARIZARD,0
|
||||||
db 65,VENUSAUR,0
|
|
||||||
db $FF,61,PIDGEOT,59,ALAKAZAM,61,RHYDON,61,EXEGGUTOR,63,GYARADOS ;\
|
|
||||||
db 65,CHARIZARD,0
|
|
||||||
LoreleiData:
|
LoreleiData:
|
||||||
db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0
|
db $FF,54,DEWGONG,53,CLOYSTER,54,SLOWBRO,56,JYNX,56,LAPRAS,0
|
||||||
ChannelerData:
|
ChannelerData:
|
||||||
|
|
@ -17710,8 +17707,7 @@ ChannelerData:
|
||||||
AgathaData:
|
AgathaData:
|
||||||
db $FF,56,GENGAR,56,GOLBAT,55,HAUNTER,58,ARBOK,60,GENGAR,0
|
db $FF,56,GENGAR,56,GOLBAT,55,HAUNTER,58,ARBOK,60,GENGAR,0
|
||||||
LanceData:
|
LanceData:
|
||||||
db $FF,58,GYARADOS,56,DRAGONAIR,56,DRAGONAIR,60,AERODACTYL ;\
|
db $FF,58,GYARADOS,56,DRAGONAIR,56,DRAGONAIR,60,AERODACTYL,62,DRAGONITE,0
|
||||||
db 62,DRAGONITE,0
|
|
||||||
|
|
||||||
TrainerAI: ; 652E
|
TrainerAI: ; 652E
|
||||||
;XXX called at 34964, 3c342, 3c398
|
;XXX called at 34964, 3c342, 3c398
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue