thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some formatting changes

Browse source
This commit is contained in:
Rangi 2020-10-19 20:26:35 -04:00
parent 5ebae4747b
commit bc287b9b80
8 changed files with 83 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

79
engine/battle/battle_transitions.asm
View file

@ -335,7 +335,18 @@ BattleTransition_FlashScreen_:
ret
BattleTransition_FlashScreenPalettes:
db $F9,$FE,$FF,$FE,$F9,$E4,$90,$40,$00,$40,$90,$E4
db %11111001
db %11111110
db %11111111
db %11111110
db %11111001
db %11100100
db %10010000
db %01000000
db %00000000
db %01000000
db %10010000
db %11100100
db 1 ; end
; used for low level trainer dungeon battles
@ -646,6 +657,11 @@ BattleTransition_Circle_Sub2:
ld l, a
jp BattleTransition_Circle_Sub3
; halves
const_def
const CIRCLE_LEFT
const CIRCLE_RIGHT
half_circle: MACRO
; quadrant x, circle data, target coord
db \1
@ -654,28 +670,28 @@ half_circle: MACRO
ENDM
BattleTransition_HalfCircle1:
half_circle $01, BattleTransition_CircleData1, 18, 6
half_circle $01, BattleTransition_CircleData2, 19, 3
half_circle $01, BattleTransition_CircleData3, 18, 0
half_circle $01, BattleTransition_CircleData4, 14, 0
half_circle $01, BattleTransition_CircleData5, 10, 0
half_circle $00, BattleTransition_CircleData5, 9, 0
half_circle $00, BattleTransition_CircleData4, 5, 0
half_circle $00, BattleTransition_CircleData3, 1, 0
half_circle $00, BattleTransition_CircleData2, 0, 3
half_circle $00, BattleTransition_CircleData1, 1, 6
half_circle CIRCLE_RIGHT, BattleTransition_CircleData1, 18, 6
half_circle CIRCLE_RIGHT, BattleTransition_CircleData2, 19, 3
half_circle CIRCLE_RIGHT, BattleTransition_CircleData3, 18, 0
half_circle CIRCLE_RIGHT, BattleTransition_CircleData4, 14, 0
half_circle CIRCLE_RIGHT, BattleTransition_CircleData5, 10, 0
half_circle CIRCLE_LEFT, BattleTransition_CircleData5, 9, 0
half_circle CIRCLE_LEFT, BattleTransition_CircleData4, 5, 0
half_circle CIRCLE_LEFT, BattleTransition_CircleData3, 1, 0
half_circle CIRCLE_LEFT, BattleTransition_CircleData2, 0, 3
half_circle CIRCLE_LEFT, BattleTransition_CircleData1, 1, 6
BattleTransition_HalfCircle2:
half_circle $00, BattleTransition_CircleData1, 1, 11
half_circle $00, BattleTransition_CircleData2, 0, 14
half_circle $00, BattleTransition_CircleData3, 1, 17
half_circle $00, BattleTransition_CircleData4, 5, 17
half_circle $00, BattleTransition_CircleData5, 9, 17
half_circle $01, BattleTransition_CircleData5, 10, 17
half_circle $01, BattleTransition_CircleData4, 14, 17
half_circle $01, BattleTransition_CircleData3, 18, 17
half_circle $01, BattleTransition_CircleData2, 19, 14
half_circle $01, BattleTransition_CircleData1, 18, 11
half_circle CIRCLE_LEFT, BattleTransition_CircleData1, 1, 11
half_circle CIRCLE_LEFT, BattleTransition_CircleData2, 0, 14
half_circle CIRCLE_LEFT, BattleTransition_CircleData3, 1, 17
half_circle CIRCLE_LEFT, BattleTransition_CircleData4, 5, 17
half_circle CIRCLE_LEFT, BattleTransition_CircleData5, 9, 17
half_circle CIRCLE_RIGHT, BattleTransition_CircleData5, 10, 17
half_circle CIRCLE_RIGHT, BattleTransition_CircleData4, 14, 17
half_circle CIRCLE_RIGHT, BattleTransition_CircleData3, 18, 17
half_circle CIRCLE_RIGHT, BattleTransition_CircleData2, 19, 14
half_circle CIRCLE_RIGHT, BattleTransition_CircleData1, 18, 11
BattleTransition_Circle_Sub3:
push hl
@ -704,7 +720,7 @@ BattleTransition_Circle_Sub3:
add hl, bc
ld a, [de]
inc de
cp $ff
cp -1
ret z
and a
jr z, BattleTransition_Circle_Sub3
@ -722,17 +738,8 @@ BattleTransition_Circle_Sub3:
jr nz, .loop2
jr BattleTransition_Circle_Sub3
BattleTransition_CircleData1:
db $02,$03,$05,$04,$09,$FF
BattleTransition_CircleData2:
db $01,$01,$02,$02,$04,$02,$04,$02,$03,$FF
BattleTransition_CircleData3:
db $02,$01,$03,$01,$04,$01,$04,$01,$04,$01,$03,$01,$02,$01,$01,$01,$01,$FF
BattleTransition_CircleData4:
db $04,$01,$04,$00,$03,$01,$03,$00,$02,$01,$02,$00,$01,$FF
BattleTransition_CircleData5:
db $04,$00,$03,$00,$03,$00,$02,$00,$02,$00,$01,$00,$01,$00,$01,$FF
BattleTransition_CircleData1: db 2, 3, 5, 4, 9, -1
BattleTransition_CircleData2: db 1, 1, 2, 2, 4, 2, 4, 2, 3, -1
BattleTransition_CircleData3: db 2, 1, 3, 1, 4, 1, 4, 1, 4, 1, 3, 1, 2, 1, 1, 1, 1, -1
BattleTransition_CircleData4: db 4, 1, 4, 0, 3, 1, 3, 0, 2, 1, 2, 0, 1, -1
BattleTransition_CircleData5: db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1

4
engine/battle/trainer_ai.asm
View file

@ -146,11 +146,11 @@ AIMoveChoiceModification1:
jr .nextMove
StatusAilmentMoveEffects:
db $01 ; unused sleep effect
db EFFECT_01 ; unused sleep effect
db SLEEP_EFFECT
db POISON_EFFECT
db PARALYZE_EFFECT
db $FF
db -1 ; end
; slightly encourage moves with specific effects.
; in particular, stat-modifying moves and other move effects

8
engine/movie/splash.asm
View file

@ -110,7 +110,7 @@ AnimateShootingStar:
ld c, 4
.smallStarsInnerLoop ; introduce new wave of 4 small stars OAM entries
ld a, [de]
cp $ff
cp -1
jr z, .next2
ld [hli], a ; Y
inc de
@ -165,27 +165,23 @@ SmallStarsWave1Coords:
db $68, $40
db $68, $58
db $68, $78
SmallStarsWave2Coords:
db $68, $38
db $68, $48
db $68, $60
db $68, $70
SmallStarsWave3Coords:
db $68, $34
db $68, $4C
db $68, $54
db $68, $64
SmallStarsWave4Coords:
db $68, $3C
db $68, $5C
db $68, $6C
db $68, $74
SmallStarsEmptyWave:
db $FF
db -1 ; end
MoveDownSmallStars:
ld b, 8

3
engine/overworld/field_move_messages.asm
View file

@ -46,7 +46,8 @@ IsSurfingAllowed:
jp PrintText
CoordsData_cdf7:
db $0B,$07,$FF
dbmapcoord 7, 11
db -1 ; end
CurrentTooFastText:
text_far _CurrentTooFastText

12
engine/overworld/push_boulder.asm
View file

@ -71,16 +71,20 @@ TryPushingBoulder::
ret
PushBoulderUpMovementData:
db NPC_MOVEMENT_UP,$FF
db NPC_MOVEMENT_UP
db -1 ; end
PushBoulderDownMovementData:
db NPC_MOVEMENT_DOWN,$FF
db NPC_MOVEMENT_DOWN
db -1 ; end
PushBoulderLeftMovementData:
db NPC_MOVEMENT_LEFT,$FF
db NPC_MOVEMENT_LEFT
db -1 ; end
PushBoulderRightMovementData:
db NPC_MOVEMENT_RIGHT,$FF
db NPC_MOVEMENT_RIGHT
db -1 ; end
DoBoulderDustAnimation::
ld a, [wd730]