pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Mobile and more battle anims

Browse Source
This commit is contained in:
pikalaxalt
2016-05-05 15:07:37 -04:00
parent a613ed915c
commit 8c26547645
28 changed files with 901 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
battle/anim_commands.asm
View File

@@ -382,7 +382,7 @@ BattleAnimCommands:: ; cc2a4 (33:42a4)
dw BattleAnimCmd_EB ; dummy dw BattleAnimCmd_EB ; dummy
dw BattleAnimCmd_EC ; dummy dw BattleAnimCmd_EC ; dummy
dw BattleAnimCmd_ED ; dummy dw BattleAnimCmd_ED ; dummy
dw BattleAnimCmd_JumpAnd dw BattleAnimCmd_IfParamAnd
dw BattleAnimCmd_JumpUntil dw BattleAnimCmd_JumpUntil
dw BattleAnimCmd_BGEffect dw BattleAnimCmd_BGEffect
dw BattleAnimCmd_BGP dw BattleAnimCmd_BGP
@@ -392,10 +392,10 @@ BattleAnimCommands:: ; cc2a4 (33:42a4)
dw BattleAnimCmd_F5 dw BattleAnimCmd_F5
dw BattleAnimCmd_F6 dw BattleAnimCmd_F6
dw BattleAnimCmd_F7 dw BattleAnimCmd_F7
dw BattleAnimCmd_JumpIf dw BattleAnimCmd_IfParamEqual
dw BattleAnimCmd_SetVar dw BattleAnimCmd_SetVar
dw BattleAnimCmd_IncVar dw BattleAnimCmd_IncVar
dw BattleAnimCmd_JumpVar dw BattleAnimCmd_IfVarEqual
dw BattleAnimCmd_Jump dw BattleAnimCmd_Jump
dw BattleAnimCmd_Loop dw BattleAnimCmd_Loop
dw BattleAnimCmd_Call dw BattleAnimCmd_Call
@@ -535,7 +535,7 @@ BattleAnimCmd_IncVar: ; cc3ad (33:43ad)
inc [hl] inc [hl]
ret ret
BattleAnimCmd_JumpVar: ; cc3b2 (33:43b2) BattleAnimCmd_IfVarEqual: ; cc3b2 (33:43b2)
call GetBattleAnimByte call GetBattleAnimByte
ld hl, BattleAnimVar ld hl, BattleAnimVar
cp [hl] cp [hl]
@@ -563,7 +563,7 @@ BattleAnimCmd_JumpVar: ; cc3b2 (33:43b2)
ld [hl], d ld [hl], d
ret ret
BattleAnimCmd_JumpIf: ; cc3d6 (33:43d6) BattleAnimCmd_IfParamEqual: ; cc3d6 (33:43d6)
call GetBattleAnimByte call GetBattleAnimByte
ld hl, wBattleAnimParam ld hl, wBattleAnimParam
cp [hl] cp [hl]
@@ -591,7 +591,7 @@ BattleAnimCmd_JumpIf: ; cc3d6 (33:43d6)
ld [hl], d ld [hl], d
ret ret
BattleAnimCmd_JumpAnd: ; cc3fa (33:43fa) BattleAnimCmd_IfParamAnd: ; cc3fa (33:43fa)
call GetBattleAnimByte call GetBattleAnimByte
ld e, a ld e, a
ld a, [wBattleAnimParam] ld a, [wBattleAnimParam]
@@ -608,6 +608,7 @@ BattleAnimCmd_JumpAnd: ; cc3fa (33:43fa)
dec hl dec hl
ld [hl], e ld [hl], e
ret ret
.jump .jump
call GetBattleAnimByte call GetBattleAnimByte
ld e, a ld e, a

236
battle/anims.asm
View File

File diff suppressed because it is too large Load Diff

197
battle/bg_effects.asm
View File

File diff suppressed because it is too large Load Diff

52
battle/objects/data.asm
View File

@@ -57,22 +57,22 @@ endm
; ANIM_OBJ_BURNED ; ANIM_OBJ_BURNED
battleanimobj $01, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_03, $04, $03 battleanimobj $01, $90, BATTLEANIMFRAMESET_11, BATTLEANIMFUNC_03, $04, $03
; ANIM_OBJ_11 ; ANIM_OBJ_BLIZZARD
battleanimobj $01, $90, BATTLEANIMFRAMESET_12, BATTLEANIMFUNC_08, $06, $0a battleanimobj $01, $90, BATTLEANIMFRAMESET_12, BATTLEANIMFUNC_08, $06, $0a
; ANIM_OBJ_12 ; ANIM_OBJ_12
battleanimobj $01, $90, BATTLEANIMFRAMESET_13, BATTLEANIMFUNC_00, $06, $0a battleanimobj $01, $90, BATTLEANIMFRAMESET_13, BATTLEANIMFUNC_00, $06, $0a
; ANIM_OBJ_13 ; ANIM_OBJ_ICE_BEAM
battleanimobj $01, $90, BATTLEANIMFRAMESET_14, BATTLEANIMFUNC_01, $06, $0a battleanimobj $01, $90, BATTLEANIMFRAMESET_14, BATTLEANIMFUNC_01, $06, $0a
; ANIM_OBJ_14 ; ANIM_OBJ_RAZOR_LEAF
battleanimobj $21, $78, BATTLEANIMFRAMESET_16, BATTLEANIMFUNC_0B, $05, $06 battleanimobj $21, $78, BATTLEANIMFRAMESET_16, BATTLEANIMFUNC_RAZOR_LEAF, $05, $06
; ANIM_OBJ_POKE_BALL ; ANIM_OBJ_POKE_BALL
battleanimobj $00, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_12, $04, $0b battleanimobj $00, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_12, $04, $0b
; ANIM_OBJ_16 ; ANIM_OBJ_POKE_BALL_BLOCKED
battleanimobj $00, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_13, $04, $0b battleanimobj $00, $00, BATTLEANIMFRAMESET_09, BATTLEANIMFUNC_13, $04, $0b
; ANIM_OBJ_17 ; ANIM_OBJ_17
@@ -90,7 +90,7 @@ endm
; ANIM_OBJ_1B ; ANIM_OBJ_1B
battleanimobj $01, $90, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, $02, $07 battleanimobj $01, $90, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, $02, $07
; ANIM_OBJ_1C ; ANIM_OBJ_BALL_POOF
battleanimobj $01, $a0, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, $02, $07 battleanimobj $01, $a0, BATTLEANIMFRAMESET_08, BATTLEANIMFUNC_00, $02, $07
; ANIM_OBJ_1D ; ANIM_OBJ_1D
@@ -105,7 +105,7 @@ endm
; ANIM_OBJ_20 ; ANIM_OBJ_20
battleanimobj $01, $b0, BATTLEANIMFRAMESET_84, BATTLEANIMFUNC_36, $06, $21 battleanimobj $01, $b0, BATTLEANIMFRAMESET_84, BATTLEANIMFUNC_36, $06, $21
; ANIM_OBJ_21 ; ANIM_OBJ_BUBBLE
battleanimobj $01, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_0C, $06, $0d battleanimobj $01, $90, BATTLEANIMFRAMESET_21, BATTLEANIMFUNC_0C, $06, $0d
; ANIM_OBJ_22 ; ANIM_OBJ_22
@@ -129,13 +129,13 @@ endm
; ANIM_OBJ_28 ; ANIM_OBJ_28
battleanimobj $61, $98, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, $03, $10 battleanimobj $61, $98, BATTLEANIMFRAMESET_2D, BATTLEANIMFUNC_09, $03, $10
; ANIM_OBJ_29 ; ANIM_OBJ_ICE_BUILDUP
battleanimobj $01, $b8, BATTLEANIMFRAMESET_2E, BATTLEANIMFUNC_00, $06, $0a battleanimobj $01, $b8, BATTLEANIMFRAMESET_2E, BATTLEANIMFUNC_00, $06, $0a
; ANIM_OBJ_FROZEN ; ANIM_OBJ_FROZEN
battleanimobj $01, $b8, BATTLEANIMFRAMESET_2F, BATTLEANIMFUNC_00, $06, $0a battleanimobj $01, $b8, BATTLEANIMFRAMESET_2F, BATTLEANIMFUNC_00, $06, $0a
; ANIM_OBJ_2B ; ANIM_OBJ_MASTER_BALL_SPARKLE
battleanimobj $01, $b8, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_14, $07, $11 battleanimobj $01, $b8, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_14, $07, $11
; ANIM_OBJ_2C ; ANIM_OBJ_2C
@@ -213,7 +213,7 @@ endm
; ANIM_OBJ_44 ; ANIM_OBJ_44
battleanimobj $21, $80, BATTLEANIMFRAMESET_4B, BATTLEANIMFUNC_00, $03, $11 battleanimobj $21, $80, BATTLEANIMFRAMESET_4B, BATTLEANIMFUNC_00, $03, $11
; ANIM_OBJ_45 ; ANIM_OBJ_ABSORB
battleanimobj $01, $88, BATTLEANIMFRAMESET_4C, BATTLEANIMFUNC_1C, $05, $12 battleanimobj $01, $88, BATTLEANIMFRAMESET_4C, BATTLEANIMFUNC_1C, $05, $12
; ANIM_OBJ_46 ; ANIM_OBJ_46
@@ -228,8 +228,8 @@ endm
; ANIM_OBJ_49 ; ANIM_OBJ_49
battleanimobj $21, $ff, BATTLEANIMFRAMESET_54, BATTLEANIMFUNC_1F, $05, $16 battleanimobj $21, $ff, BATTLEANIMFRAMESET_54, BATTLEANIMFUNC_1F, $05, $16
; ANIM_OBJ_4A ; ANIM_OBJ_LEECH_SEED
battleanimobj $21, $68, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_20, $05, $06 battleanimobj $21, $68, BATTLEANIMFRAMESET_56, BATTLEANIMFUNC_LEECH_SEED, $05, $06
; ANIM_OBJ_4B ; ANIM_OBJ_4B
battleanimobj $21, $90, BATTLEANIMFRAMESET_59, BATTLEANIMFUNC_21, $02, $0e battleanimobj $21, $90, BATTLEANIMFRAMESET_59, BATTLEANIMFUNC_21, $02, $0e
@@ -279,20 +279,20 @@ endm
; ANIM_OBJ_5A ; ANIM_OBJ_5A
battleanimobj $21, $90, BATTLEANIMFRAMESET_6A, BATTLEANIMFUNC_27, $02, $1b battleanimobj $21, $90, BATTLEANIMFRAMESET_6A, BATTLEANIMFUNC_27, $02, $1b
; ANIM_OBJ_5B ; ANIM_OBJ_HAZE
battleanimobj $00, $00, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_29, $02, $1c battleanimobj $00, $00, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, $02, $1c
; ANIM_OBJ_5C ; ANIM_OBJ_MIST
battleanimobj $21, $48, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_29, $02, $1c battleanimobj $21, $48, BATTLEANIMFRAMESET_70, BATTLEANIMFUNC_SPRIAL_DESCENT, $02, $1c
; ANIM_OBJ_5D ; ANIM_OBJ_SMOG
battleanimobj $21, $48, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_29, $02, $1c battleanimobj $21, $48, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_SPRIAL_DESCENT, $02, $1c
; ANIM_OBJ_5E ; ANIM_OBJ_POISON_GAS
battleanimobj $21, $78, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_2A, $02, $1c battleanimobj $21, $78, BATTLEANIMFRAMESET_6F, BATTLEANIMFUNC_POISON_GAS, $02, $1c
; ANIM_OBJ_5F ; ANIM_OBJ_HORN
battleanimobj $61, $90, BATTLEANIMFRAMESET_71, BATTLEANIMFUNC_2B, $02, $1d battleanimobj $61, $90, BATTLEANIMFRAMESET_71, BATTLEANIMFUNC_HORN, $02, $1d
; ANIM_OBJ_60 ; ANIM_OBJ_60
battleanimobj $61, $90, BATTLEANIMFRAMESET_72, BATTLEANIMFUNC_2C, $02, $1d battleanimobj $61, $90, BATTLEANIMFRAMESET_72, BATTLEANIMFUNC_2C, $02, $1d
@@ -313,7 +313,7 @@ endm
battleanimobj $01, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_2F, $02, $11 battleanimobj $01, $80, BATTLEANIMFRAMESET_30, BATTLEANIMFUNC_2F, $02, $11
; ANIM_OBJ_66 ; ANIM_OBJ_66
battleanimobj $01, $78, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_2A, $04, $23 battleanimobj $01, $78, BATTLEANIMFRAMESET_76, BATTLEANIMFUNC_POISON_GAS, $04, $23
; ANIM_OBJ_67 ; ANIM_OBJ_67
battleanimobj $01, $80, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_30, $02, $1f battleanimobj $01, $80, BATTLEANIMFRAMESET_77, BATTLEANIMFUNC_30, $02, $1f
@@ -342,7 +342,7 @@ endm
; ANIM_OBJ_LICK ; ANIM_OBJ_LICK
battleanimobj $21, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, $02, $04 battleanimobj $21, $98, BATTLEANIMFRAMESET_7C, BATTLEANIMFUNC_00, $02, $04
; ANIM_OBJ_70 ; ANIM_OBJ_WITHDRAW
battleanimobj $21, $80, BATTLEANIMFRAMESET_7D, BATTLEANIMFUNC_00, $02, $18 battleanimobj $21, $80, BATTLEANIMFRAMESET_7D, BATTLEANIMFUNC_00, $02, $18
; ANIM_OBJ_71 ; ANIM_OBJ_71
@@ -393,8 +393,8 @@ endm
; ANIM_OBJ_80 ; ANIM_OBJ_80
battleanimobj $01, $a8, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_3C, $04, $03 battleanimobj $01, $a8, BATTLEANIMFRAMESET_0F, BATTLEANIMFUNC_3C, $04, $03
; ANIM_OBJ_81 ; ANIM_OBJ_COTTON_SPORE
battleanimobj $21, $68, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_29, $02, $1f battleanimobj $21, $68, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_SPRIAL_DESCENT, $02, $1f
; ANIM_OBJ_82 ; ANIM_OBJ_82
battleanimobj $21, $b0, BATTLEANIMFRAMESET_8A, BATTLEANIMFUNC_00, $02, $1f battleanimobj $21, $b0, BATTLEANIMFRAMESET_8A, BATTLEANIMFUNC_00, $02, $1f

206
battle/objects/functions.asm
View File

File diff suppressed because it is too large Load Diff

46
constants/animation_constants.asm
View File

@@ -43,23 +43,23 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_0E const ANIM_OBJ_0E
const ANIM_OBJ_0F const ANIM_OBJ_0F
const ANIM_OBJ_BURNED const ANIM_OBJ_BURNED
const ANIM_OBJ_11 const ANIM_OBJ_BLIZZARD
const ANIM_OBJ_12 const ANIM_OBJ_12
const ANIM_OBJ_13 const ANIM_OBJ_ICE_BEAM
const ANIM_OBJ_14 const ANIM_OBJ_RAZOR_LEAF
const ANIM_OBJ_POKE_BALL const ANIM_OBJ_POKE_BALL
const ANIM_OBJ_16 const ANIM_OBJ_POKE_BALL_BLOCKED
const ANIM_OBJ_17 const ANIM_OBJ_17
const ANIM_OBJ_18 const ANIM_OBJ_18
const ANIM_OBJ_19 const ANIM_OBJ_19
const ANIM_OBJ_1A const ANIM_OBJ_1A
const ANIM_OBJ_1B const ANIM_OBJ_1B
const ANIM_OBJ_1C const ANIM_OBJ_BALL_POOF
const ANIM_OBJ_1D const ANIM_OBJ_1D
const ANIM_OBJ_1E const ANIM_OBJ_1E
const ANIM_OBJ_1F const ANIM_OBJ_1F
const ANIM_OBJ_20 const ANIM_OBJ_20
const ANIM_OBJ_21 const ANIM_OBJ_BUBBLE
const ANIM_OBJ_22 const ANIM_OBJ_22
const ANIM_OBJ_23 const ANIM_OBJ_23
const ANIM_OBJ_24 const ANIM_OBJ_24
@@ -67,9 +67,9 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_26 const ANIM_OBJ_26
const ANIM_OBJ_27 const ANIM_OBJ_27
const ANIM_OBJ_28 const ANIM_OBJ_28
const ANIM_OBJ_29 const ANIM_OBJ_ICE_BUILDUP
const ANIM_OBJ_FROZEN const ANIM_OBJ_FROZEN
const ANIM_OBJ_2B const ANIM_OBJ_MASTER_BALL_SPARKLE
const ANIM_OBJ_2C const ANIM_OBJ_2C
const ANIM_OBJ_2D const ANIM_OBJ_2D
const ANIM_OBJ_2E const ANIM_OBJ_2E
@@ -95,12 +95,12 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_42 const ANIM_OBJ_42
const ANIM_OBJ_43 const ANIM_OBJ_43
const ANIM_OBJ_44 const ANIM_OBJ_44
const ANIM_OBJ_45 const ANIM_OBJ_ABSORB
const ANIM_OBJ_46 const ANIM_OBJ_46
const ANIM_OBJ_47 const ANIM_OBJ_47
const ANIM_OBJ_48 const ANIM_OBJ_48
const ANIM_OBJ_49 const ANIM_OBJ_49
const ANIM_OBJ_4A const ANIM_OBJ_LEECH_SEED
const ANIM_OBJ_4B const ANIM_OBJ_4B
const ANIM_OBJ_4C const ANIM_OBJ_4C
const ANIM_OBJ_4D const ANIM_OBJ_4D
@@ -117,11 +117,11 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_58 const ANIM_OBJ_58
const ANIM_OBJ_PARALYZED const ANIM_OBJ_PARALYZED
const ANIM_OBJ_5A const ANIM_OBJ_5A
const ANIM_OBJ_5B const ANIM_OBJ_HAZE
const ANIM_OBJ_5C const ANIM_OBJ_MIST
const ANIM_OBJ_5D const ANIM_OBJ_SMOG
const ANIM_OBJ_5E const ANIM_OBJ_POISON_GAS
const ANIM_OBJ_5F const ANIM_OBJ_HORN
const ANIM_OBJ_60 const ANIM_OBJ_60
const ANIM_OBJ_61 const ANIM_OBJ_61
const ANIM_OBJ_62 const ANIM_OBJ_62
@@ -138,7 +138,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_6D const ANIM_OBJ_6D
const ANIM_OBJ_SKY_ATTACK_FEAROW const ANIM_OBJ_SKY_ATTACK_FEAROW
const ANIM_OBJ_LICK const ANIM_OBJ_LICK
const ANIM_OBJ_70 const ANIM_OBJ_WITHDRAW
const ANIM_OBJ_71 const ANIM_OBJ_71
const ANIM_OBJ_72 const ANIM_OBJ_72
const ANIM_OBJ_73 const ANIM_OBJ_73
@@ -155,7 +155,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_HEART const ANIM_OBJ_HEART
const ANIM_OBJ_7F const ANIM_OBJ_7F
const ANIM_OBJ_80 const ANIM_OBJ_80
const ANIM_OBJ_81 const ANIM_OBJ_COTTON_SPORE
const ANIM_OBJ_82 const ANIM_OBJ_82
const ANIM_OBJ_83 const ANIM_OBJ_83
const ANIM_OBJ_84 const ANIM_OBJ_84
@@ -227,7 +227,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const BATTLEANIMFUNC_08 const BATTLEANIMFUNC_08
const BATTLEANIMFUNC_09 const BATTLEANIMFUNC_09
const BATTLEANIMFUNC_0A const BATTLEANIMFUNC_0A
const BATTLEANIMFUNC_0B const BATTLEANIMFUNC_RAZOR_LEAF
const BATTLEANIMFUNC_0C const BATTLEANIMFUNC_0C
const BATTLEANIMFUNC_0D const BATTLEANIMFUNC_0D
const BATTLEANIMFUNC_0E const BATTLEANIMFUNC_0E
@@ -248,7 +248,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const BATTLEANIMFUNC_1D const BATTLEANIMFUNC_1D
const BATTLEANIMFUNC_1E const BATTLEANIMFUNC_1E
const BATTLEANIMFUNC_1F const BATTLEANIMFUNC_1F
const BATTLEANIMFUNC_20 const BATTLEANIMFUNC_LEECH_SEED
const BATTLEANIMFUNC_21 const BATTLEANIMFUNC_21
const BATTLEANIMFUNC_22 const BATTLEANIMFUNC_22
const BATTLEANIMFUNC_23 const BATTLEANIMFUNC_23
@@ -257,9 +257,9 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const BATTLEANIMFUNC_26 const BATTLEANIMFUNC_26
const BATTLEANIMFUNC_27 const BATTLEANIMFUNC_27
const BATTLEANIMFUNC_28 const BATTLEANIMFUNC_28
const BATTLEANIMFUNC_29 const BATTLEANIMFUNC_SPRIAL_DESCENT
const BATTLEANIMFUNC_2A const BATTLEANIMFUNC_POISON_GAS
const BATTLEANIMFUNC_2B const BATTLEANIMFUNC_HORN
const BATTLEANIMFUNC_2C const BATTLEANIMFUNC_2C
const BATTLEANIMFUNC_2D const BATTLEANIMFUNC_2D
const BATTLEANIMFUNC_2E const BATTLEANIMFUNC_2E
@@ -735,7 +735,7 @@ const_value SET 1
const ANIM_BG_1E const ANIM_BG_1E
const ANIM_BG_1F const ANIM_BG_1F
const ANIM_BG_20 const ANIM_BG_20
const ANIM_BG_21 const ANIM_BG_WITHDRAW
const ANIM_BG_BOUNCE_DOWN const ANIM_BG_BOUNCE_DOWN
const ANIM_BG_DIG const ANIM_BG_DIG
const ANIM_BG_TACKLE const ANIM_BG_TACKLE

8
engine/battle_start.asm
View File

@@ -40,8 +40,8 @@ Predef_StartBattle: ; 8c20f
call DelayFrame call DelayFrame
xor a xor a
ld [hFFC6], a ld [hFFC6], a
ld [hFFC7], a ld [hLYOverrideStart], a
ld [hFFC8], a ld [hLYOverrideEnd], a
ld [hSCY], a ld [hSCY], a
ld a, $1 ld a, $1
@@ -305,9 +305,9 @@ StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
ld a, $43 ld a, $43
ld [hFFC6], a ld [hFFC6], a
xor a xor a
ld [hFFC7], a ld [hLYOverrideStart], a
ld a, $90 ld a, $90
ld [hFFC8], a ld [hLYOverrideEnd], a
xor a xor a
ld [wcf64], a ld [wcf64], a
ld [wcf65], a ld [wcf65], a

23
engine/color.asm
View File

@@ -138,6 +138,7 @@ Function8b07:
; Unreferenced ; Unreferenced
call CheckCGB call CheckCGB
ret z ret z
; CGB only
ld hl, .BGPal ld hl, .BGPal
ld de, UnknBGPals ld de, UnknBGPals
ld bc, 1 palettes ld bc, 1 palettes
@@ -534,9 +535,9 @@ CopyPalettes:
GetPredefPal: GetPredefPal:
ld l, a ld l, a
ld h, $0 ld h, $0
rept 3 ; multiply by 8
add hl, hl add hl, hl
endr add hl, hl
add hl, hl
ld bc, Palettes_9df6 ld bc, Palettes_9df6
add hl, bc add hl, bc
ret ret
@@ -924,9 +925,10 @@ PushSGBPals:
jr nz, .loop jr nz, .loop
ret ret
Function9853: InitSGBBorder:
call CheckCGB call CheckCGB
ret nz ret nz
; SGB/DMG only
di di
ld a, [wcfbe] ld a, [wcfbe]
push af push af
@@ -936,7 +938,7 @@ Function9853:
ld [rJOYP], a ld [rJOYP], a
ld [hSGB], a ld [hSGB], a
call Function994a call Function994a
jr nc, .asm_988a jr nc, .skip
ld a, $1 ld a, $1
ld [hSGB], a ld [hSGB], a
call Function98eb call Function98eb
@@ -949,15 +951,16 @@ Function9853:
ld hl, PalPacket_9d66 ld hl, PalPacket_9d66
call PushSGBPals call PushSGBPals
.asm_988a .skip
pop af pop af
ld [wcfbe], a ld [wcfbe], a
ei ei
ret ret
Function9890:: InitCGBPals::
call CheckCGB call CheckCGB
ret z ret z
; CGB only
ld a, $1 ld a, $1
ld [rVBK], a ld [rVBK], a
ld hl, VTiles0 ld hl, VTiles0
@@ -1123,7 +1126,7 @@ Function99ab:
Function99b4: Function99b4:
call DisableLCD call DisableLCD
ld a, $e4 ld a, %11100100
ld [rBGP], a ld [rBGP], a
ld hl, Palettes_9df6 ld hl, Palettes_9df6
ld de, VTiles1 ld de, VTiles1
@@ -1198,25 +1201,27 @@ Function9a24:
CopyData: ; 0x9a52 CopyData: ; 0x9a52
; copy bc bytes of data from hl to de ; copy bc bytes of data from hl to de
.loop
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de
dec bc dec bc
ld a, c ld a, c
or b or b
jr nz, CopyData jr nz, .loop
ret ret
; 0x9a5b ; 0x9a5b
ClearBytes: ; 0x9a5b ClearBytes: ; 0x9a5b
; clear bc bytes of data starting from de ; clear bc bytes of data starting from de
.loop
xor a xor a
ld [de], a ld [de], a
inc de inc de
dec bc dec bc
ld a, c ld a, c
or b or b
jr nz, ClearBytes jr nz, .loop
ret ret
; 0x9a64 ; 0x9a64

12
engine/link.asm
View File

@@ -431,10 +431,12 @@ Gen2ToGen2LinkComms: ; 28177
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
call ReturnToMapFromSubmenu call ReturnToMapFromSubmenu
ld a, [wc2d7]
; LET'S DO THIS
ld a, [wDisableTextAcceleration]
push af push af
ld a, $1 ld a, 1
ld [wc2d7], a ld [wDisableTextAcceleration], a
ld a, [rIE] ld a, [rIE]
push af push af
ld a, [rIF] ld a, [rIF]
@@ -446,7 +448,9 @@ Gen2ToGen2LinkComms: ; 28177
ld [rIE], a ld [rIE], a
pop af pop af
ld [rIF], a ld [rIF], a
predef StartBattle predef StartBattle
ld a, [rIF] ld a, [rIF]
ld h, a ld h, a
xor a xor a
@@ -456,7 +460,7 @@ Gen2ToGen2LinkComms: ; 28177
ld a, h ld a, h
ld [rIF], a ld [rIF], a
pop af pop af
ld [wc2d7], a ld [wDisableTextAcceleration], a
pop af pop af
ld [Options], a ld [Options], a
callba LoadPokemonData callba LoadPokemonData

2
engine/main_menu.asm
View File

@@ -4,7 +4,7 @@ INCBIN "gfx/unknown/049c0c.2bpp"
MainMenu: ; 49cdc MainMenu: ; 49cdc
xor a xor a
ld [wc2d7], a ld [wDisableTextAcceleration], a
call Function49ed0 call Function49ed0
ld b, SCGB_08 ld b, SCGB_08
call GetSGBLayout call GetSGBLayout

2
engine/map_setup.asm
View File

@@ -289,7 +289,7 @@ MapSetupCommands: ; 15440
DontScrollText: ; 154ca DontScrollText: ; 154ca
xor a xor a
ld [wc2d7], a ld [wDisableTextAcceleration], a
ret ret
; 154cf ; 154cf

2
engine/predef.asm
View File

@@ -78,7 +78,7 @@ PredefPointers:: ; 856b
add_predef GetUnownLetter add_predef GetUnownLetter
add_predef LoadPoisonBGPals add_predef LoadPoisonBGPals
add_predef Predef2F add_predef Predef2F
add_predef Function9853 ; $30 add_predef InitSGBBorder ; $30
add_predef Predef_LoadSGBLayout add_predef Predef_LoadSGBLayout
add_predef _Area add_predef _Area
add_predef CheckContestMon add_predef CheckContestMon

4
event/magnet_train.asm
View File

@@ -62,8 +62,8 @@ Special_MagnetTrain: ; 8cc04
call ClearBGPalettes call ClearBGPalettes
xor a xor a
ld [hFFC6], a ld [hFFC6], a
ld [hFFC7], a ld [hLYOverrideStart], a
ld [hFFC8], a ld [hLYOverrideEnd], a
ld [hSCX], a ld [hSCX], a
ld [Requested2bppSource], a ld [Requested2bppSource], a
ld [Requested2bppSource + 1], a ld [Requested2bppSource + 1], a

2
home.asm
View File

@@ -342,7 +342,7 @@ PrintLetterDelay:: ; 313d
call GetJoypad call GetJoypad
; input override ; input override
ld a, [wc2d7] ld a, [wDisableTextAcceleration]
and a and a
jr nz, .wait jr nz, .wait

8
home/init.asm
View File

@@ -139,7 +139,7 @@ Init:: ; 17d
ld a, -1 ld a, -1
ld [hLinkPlayerNumber], a ld [hLinkPlayerNumber], a
callba Function9890 callba InitCGBPals
ld a, VBGMap1 / $100 ld a, VBGMap1 / $100
ld [hBGMapAddress + 1], a ld [hBGMapAddress + 1], a
@@ -154,9 +154,9 @@ Init:: ; 17d
ld a, [hCGB] ld a, [hCGB]
and a and a
jr z, .asm_22b jr z, .no_double_speed
call NormalSpeed call NormalSpeed
.asm_22b .no_double_speed
xor a xor a
ld [rIF], a ld [rIF], a
@@ -166,7 +166,7 @@ Init:: ; 17d
call DelayFrame call DelayFrame
predef Function9853 predef InitSGBBorder ; SGB init
call MapSetup_Sound_Off call MapSetup_Sound_Off
xor a xor a

5
home/mobile.asm
View File

@@ -6,7 +6,7 @@ Function3e32:: ; 3e32
ld [$c986], a ld [$c986], a
ld a, h ld a, h
ld [$c987], a ld [$c987], a
jr nz, .asm_3e4f jr nz, .okay
ld [$c982], a ld [$c982], a
ld a, l ld a, l
@@ -17,7 +17,7 @@ Function3e32:: ; 3e32
ld a, b ld a, b
ld [hl], a ld [hl], a
.asm_3e4f .okay
ld hl, $c822 ld hl, $c822
set 6, [hl] set 6, [hl]
ld a, [hROMBank] ld a, [hROMBank]
@@ -30,6 +30,7 @@ Function3e32:: ; 3e32
; 3e60 ; 3e60
Function3e60:: ; 3e60 Function3e60:: ; 3e60
; Return from Function110030
ld [$c986], a ld [$c986], a
ld a, l ld a, l
ld [$c987], a ld [$c987], a

4
hram.asm
View File

@@ -78,8 +78,8 @@ hFFC2 EQU $ffc2
hMoneyTemp EQU $ffc3 hMoneyTemp EQU $ffc3
hFFC6 EQU $ffc6 hFFC6 EQU $ffc6
hFFC7 EQU $ffc7 hLYOverrideStart EQU $ffc7
hFFC8 EQU $ffc8 hLYOverrideEnd EQU $ffc8
hMobileReceive EQU $ffc9 hMobileReceive EQU $ffc9
hFFCA EQU $ffca hFFCA EQU $ffca
hLinkPlayerNumber EQU $ffcb hLinkPlayerNumber EQU $ffcb

15
lib/mobile/main.asm
View File

@@ -75,7 +75,7 @@ Function110029: ; 110029 (44:4029)
Function110030:: ; 110030 (44:4030) Function110030:: ; 110030 (44:4030)
; Use the byte at $c988 as a parameter ; Use the byte at $c988 as a parameter
; for a dw. ; for a dw.
; If [$c988] in {12, 14, 16}, ; If [$c988] not in {12, 14, 16},
; clear [$c835]. ; clear [$c835].
push de push de
ld a, [$c988] ld a, [$c988]
@@ -89,24 +89,29 @@ Function110030:: ; 110030 (44:4030)
ld [$c835], a ld [$c835], a
ld a, [$c988] ld a, [$c988]
.noreset .noreset
ld d, $0 ; Get the pointer
ld d, 0
ld e, a ld e, a
ld hl, .dw ld hl, .dw
add hl, de add hl, de
; Store the low byte in [$c988]
ld a, [hli] ld a, [hli]
ld [$c988], a ld [$c988], a
ld a, [hl] ld a, [hl]
; restore de
pop de pop de
ld hl, Function3e60 ld hl, Function3e60 ; return here
push hl push hl
; If the destination function is not Function110236,
; call Function1100b4.
ld h, a ld h, a
ld a, [$c988] ld a, [$c988]
ld l, a ld l, a
push hl push hl
ld a, $36 ld a, Function110236 % $100
cp l cp l
jr nz, .okay jr nz, .okay
ld a, $42 ld a, Function110236 / $100
cp h cp h
.okay .okay
call nz, Function1100b4 call nz, Function1100b4

18
macros/move_anim.asm
View File

@@ -183,9 +183,9 @@ anim_0xed: macro
db anim_0xed_command db anim_0xed_command
endm endm
enum anim_jumpand_command ; ee enum anim_if_param_and_command ; ee
anim_jumpand: macro anim_if_param_and: macro
db anim_jumpand_command db anim_if_param_and_command
db \1 ; value db \1 ; value
dw \2 ; address dw \2 ; address
endm endm
@@ -243,9 +243,9 @@ anim_0xf7: macro
db anim_0xf7_command db anim_0xf7_command
endm endm
enum anim_jumpif_command ; f8 enum anim_if_param_equal_command ; f8
anim_jumpif: macro anim_if_param_equal: macro
db anim_jumpif_command db anim_if_param_equal_command
db \1 ; value db \1 ; value
dw \2 ; address dw \2 ; address
endm endm
@@ -261,9 +261,9 @@ anim_incvar: macro
db anim_incvar_command db anim_incvar_command
endm endm
enum anim_jumpvar_command ; fb enum anim_if_var_equal_command ; fb
anim_jumpvar: macro anim_if_var_equal: macro
db anim_jumpvar_command db anim_if_var_equal_command
db \1 ; value db \1 ; value
dw \2 ; address dw \2 ; address
endm endm

6
main.asm
View File

@@ -3367,14 +3367,14 @@ Function4e906: ; 4e906
ld [rSVBK], a ld [rSVBK], a
ret ret
Function4e929: ; mobile function GetMobileOTTrainerClass: ; mobile function
ld h, b ld h, b
ld l, c ld l, c
call Function4e930 call .GetMobileOTTrainerClass
ld c, a ld c, a
ret ret
Function4e930: ; 4e930 .GetMobileOTTrainerClass: ; 4e930
ld a, [hli] ld a, [hli]
xor [hl] xor [hl]
ld c, a ld c, a

Some files were not shown because too many files have changed in this diff Show More