mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
enum macros/move_anim.asm, resolve battle/anims.asm function labels
This commit is contained in:
parent
ba05bfeafe
commit
d13fb46d40
@ -2859,7 +2859,7 @@ endr
|
||||
AI_Smart_Stomp: ; 39200
|
||||
; 80% chance to encourage this move if the player has used Minimize.
|
||||
|
||||
ld a, [wc6fe]
|
||||
ld a, [wPlayerMinimized]
|
||||
and a
|
||||
ret z
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -946,14 +946,14 @@ endr
|
||||
|
||||
Functioncd249: ; cd249 (33:5249)
|
||||
ld hl, Unknown_cd26c
|
||||
ld a, [rSVBK] ; $ff00+$70
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $1
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
ld a, [CurItem] ; CurItem
|
||||
ld e, a
|
||||
pop af
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
.asm_cd25a
|
||||
ld a, [hli]
|
||||
cp $ff
|
||||
@ -1694,7 +1694,7 @@ Jumptable_cd66d: ; cd66d (33:566d)
|
||||
Functioncd677: ; cd677 (33:5677)
|
||||
call Functionce72c
|
||||
ld a, $42
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
ld a, $58
|
||||
ld [hLCDStatCustom + 1], a
|
||||
ld a, $5e
|
||||
@ -1753,7 +1753,7 @@ Functioncd6c6: ; cd6c6 (33:56c6)
|
||||
cp $70
|
||||
jr c, asm_cd6da
|
||||
xor a
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
ld [hLCDStatCustom + 1], a
|
||||
ld [hLCDStatCustom + 2], a
|
||||
|
||||
@ -2839,7 +2839,7 @@ Jumptable_cdcc6: ; cdcc6 (33:5cc6)
|
||||
|
||||
|
||||
Functioncdcca: ; cdcca (33:5cca)
|
||||
ld a, [hBattleTurn] ; $ff00+$e4
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .asm_cdcd9
|
||||
ld hl, $b
|
||||
@ -3842,7 +3842,7 @@ Jumptable_ce258: ; ce258 (33:6258)
|
||||
|
||||
Functionce260: ; ce260 (33:6260)
|
||||
call Functionce72c
|
||||
ld a, [hBattleTurn] ; $ff00+$e4
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr nz, .asm_ce26c
|
||||
ld a, $f0
|
||||
@ -3893,7 +3893,7 @@ Functionce29f: ; ce29f (33:629f)
|
||||
srl a
|
||||
ld e, a
|
||||
ld d, $0
|
||||
ld a, [hSGB] ; $ff00+$e7
|
||||
ld a, [hSGB]
|
||||
and a
|
||||
jr nz, .asm_ce2b6
|
||||
ld hl, Unknown_ce2c4
|
||||
|
@ -303,10 +303,11 @@ BattleAnim_SweetScent2: ; c929c
|
||||
; c92c1
|
||||
|
||||
BattleAnim_ThrowPokeBall: ; c92c1
|
||||
anim_jumpif $0, BattleAnim_ThrowPokeBall_branch_c92f2
|
||||
anim_jumpif $1, BattleAnim_ThrowPokeBall_branch_c9347
|
||||
anim_jumpif $2, BattleAnim_ThrowPokeBall_branch_c9305
|
||||
anim_jumpif $4, BattleAnim_ThrowPokeBall_branch_c9326
|
||||
anim_jumpif NO_ITEM, .TheTrainerBlockedTheBall
|
||||
anim_jumpif MASTER_BALL, .MasterBall
|
||||
anim_jumpif ULTRA_BALL, .UltraBall
|
||||
anim_jumpif GREAT_BALL, .GreatBall
|
||||
; any other ball
|
||||
anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
|
||||
anim_sound $1a, SFX_THROW_BALL
|
||||
anim_obj $15, 68, 92, $40
|
||||
@ -317,10 +318,10 @@ BattleAnim_ThrowPokeBall: ; c92c1
|
||||
anim_sound $1, SFX_BALL_POOF
|
||||
anim_obj $1c, 136, 64, $10
|
||||
anim_wait 16
|
||||
anim_jump BattleAnim_ThrowPokeBall_branch_c9392
|
||||
anim_jump .Shake
|
||||
; c92f2
|
||||
|
||||
BattleAnim_ThrowPokeBall_branch_c92f2: ; c92f2
|
||||
.TheTrainerBlockedTheBall: ; c92f2
|
||||
anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_HIT
|
||||
anim_sound $1a, SFX_THROW_BALL
|
||||
anim_obj $16, 64, 92, $20
|
||||
@ -330,7 +331,7 @@ BattleAnim_ThrowPokeBall_branch_c92f2: ; c92f2
|
||||
anim_ret
|
||||
; c9305
|
||||
|
||||
BattleAnim_ThrowPokeBall_branch_c9305: ; c9305
|
||||
.UltraBall: ; c9305
|
||||
anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
|
||||
anim_sound $1a, SFX_THROW_BALL
|
||||
anim_obj $15, 68, 92, $40
|
||||
@ -341,10 +342,10 @@ BattleAnim_ThrowPokeBall_branch_c9305: ; c9305
|
||||
anim_sound $1, SFX_BALL_POOF
|
||||
anim_obj $1c, 136, 64, $10
|
||||
anim_wait 16
|
||||
anim_jump BattleAnim_ThrowPokeBall_branch_c9392
|
||||
anim_jump .Shake
|
||||
; c9326
|
||||
|
||||
BattleAnim_ThrowPokeBall_branch_c9326: ; c9326
|
||||
.GreatBall: ; c9326
|
||||
anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
|
||||
anim_sound $1a, SFX_THROW_BALL
|
||||
anim_obj $15, 68, 92, $40
|
||||
@ -355,10 +356,10 @@ BattleAnim_ThrowPokeBall_branch_c9326: ; c9326
|
||||
anim_sound $1, SFX_BALL_POOF
|
||||
anim_obj $1c, 136, 64, $10
|
||||
anim_wait 16
|
||||
anim_jump BattleAnim_ThrowPokeBall_branch_c9392
|
||||
anim_jump .Shake
|
||||
; c9347
|
||||
|
||||
BattleAnim_ThrowPokeBall_branch_c9347: ; c9347
|
||||
.MasterBall: ; c9347
|
||||
anim_3gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE, ANIM_GFX_SPEED
|
||||
anim_sound $1a, SFX_THROW_BALL
|
||||
anim_obj $15, 64, 92, $20
|
||||
@ -379,7 +380,7 @@ BattleAnim_ThrowPokeBall_branch_c9347: ; c9347
|
||||
anim_obj $2b, 136, 56, $36
|
||||
anim_obj $2b, 136, 56, $37
|
||||
anim_wait 64
|
||||
BattleAnim_ThrowPokeBall_branch_c9392: ; c9392
|
||||
.Shake: ; c9392
|
||||
anim_bgeffect ANIM_BG_RETURN_MON, $0, $0, $0
|
||||
anim_wait 8
|
||||
anim_incobj $2
|
||||
@ -393,22 +394,22 @@ BattleAnim_ThrowPokeBall_branch_c9392: ; c9392
|
||||
anim_wait 32
|
||||
anim_wait 8
|
||||
anim_setvar $0
|
||||
BattleAnim_ThrowPokeBall_branch_c93aa: ; c93aa
|
||||
.Loop: ; c93aa
|
||||
anim_wait 48
|
||||
anim_checkpokeball
|
||||
anim_jumpvar $1, BattleAnim_ThrowPokeBall_branch_c93bc
|
||||
anim_jumpvar $2, BattleAnim_ThrowPokeBall_branch_c93be
|
||||
anim_jumpvar $1, .Click
|
||||
anim_jumpvar $2, .BreakFree
|
||||
anim_incobj $1
|
||||
anim_sound $1, SFX_BALL_WIGGLE
|
||||
anim_jump BattleAnim_ThrowPokeBall_branch_c93aa
|
||||
anim_jump .Loop
|
||||
; c93bc
|
||||
|
||||
BattleAnim_ThrowPokeBall_branch_c93bc: ; c93bc
|
||||
.Click: ; c93bc
|
||||
anim_clearsprites
|
||||
anim_ret
|
||||
; c93be
|
||||
|
||||
BattleAnim_ThrowPokeBall_branch_c93be: ; c93be
|
||||
.BreakFree: ; c93be
|
||||
anim_setobj $1, $b
|
||||
anim_sound $1, SFX_BALL_POOF
|
||||
anim_obj $1c, 136, 64, $10
|
||||
|
@ -343,14 +343,14 @@ Functionc81c0: ; c81c0 (32:41c0)
|
||||
call ClearBox
|
||||
pop bc
|
||||
xor a
|
||||
ld [hBGMapThird], a ; $ff00+$d5
|
||||
ld [hBGMapThird], a
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ret
|
||||
|
||||
Functionc81e3: ; c81e3 (32:41e3)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call EndBattleBGEffect
|
||||
ret
|
||||
|
||||
@ -441,13 +441,13 @@ Functionc825a: ; c825a (32:425a)
|
||||
.asm_c8271
|
||||
call ClearBox
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
pop bc
|
||||
ret
|
||||
|
||||
Functionc827a: ; c827a (32:427a)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call EndBattleBGEffect
|
||||
ret
|
||||
|
||||
@ -507,13 +507,13 @@ Functionc82c7: ; c82c7 (32:42c7)
|
||||
.asm_c82de
|
||||
call ClearBox
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
pop bc
|
||||
ret
|
||||
|
||||
Functionc82e7: ; c82e7 (32:42e7)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call EndBattleBGEffect
|
||||
ret
|
||||
|
||||
@ -595,9 +595,9 @@ Functionc831d: ; c831d (32:431d)
|
||||
jr nz, .asm_c8344
|
||||
.asm_c8355
|
||||
xor a
|
||||
ld [hBGMapThird], a ; $ff00+$d5
|
||||
ld [hBGMapThird], a
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call Functionc80e5
|
||||
ld hl, $3
|
||||
add hl, bc
|
||||
@ -606,7 +606,7 @@ Functionc831d: ; c831d (32:431d)
|
||||
|
||||
Functionc8365: ; c8365 (32:4365)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld hl, $3
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@ -723,7 +723,7 @@ endr
|
||||
.asm_c841d
|
||||
call Functionc80e5
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ret
|
||||
.asm_c8425
|
||||
call Functionc843b
|
||||
@ -731,7 +731,7 @@ endr
|
||||
|
||||
Functionc842a: ; c842a (32:442a)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld hl, $1
|
||||
add hl, bc
|
||||
ld [hl], $0
|
||||
@ -739,7 +739,7 @@ Functionc842a: ; c842a (32:442a)
|
||||
|
||||
Functionc8434: ; c8434 (32:4434)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call EndBattleBGEffect
|
||||
ret
|
||||
|
||||
@ -902,7 +902,7 @@ Functionc854e: ; c854e (32:454e)
|
||||
call Functionc8f69
|
||||
|
||||
Functionc8557: ; c8557 (32:4557)
|
||||
ld a, [hLCDStatCustom] ; $ff00+$c6
|
||||
ld a, [hLCDStatCustom]
|
||||
and a
|
||||
ret z
|
||||
push bc
|
||||
@ -967,7 +967,7 @@ Functionc85a2: ; c85a2 (32:45a2)
|
||||
call Functionc80e5
|
||||
call Functionc8eca
|
||||
ld a, $42
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
xor a
|
||||
ld [hLCDStatCustom + 1], a
|
||||
ld a, $5e
|
||||
@ -1042,7 +1042,7 @@ Functionc8610: ; c8610 (32:4610)
|
||||
call Functionc80e5
|
||||
call Functionc8eca
|
||||
ld a, $43
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
xor a
|
||||
ld [hLCDStatCustom + 1], a
|
||||
ld a, $5f
|
||||
@ -1530,7 +1530,7 @@ Functionc88a5: ; c88a5 (32:48a5)
|
||||
sub d
|
||||
ld d, a
|
||||
ld h, LYOverridesBackup / $100
|
||||
ld a, [hSCY] ; $ff00+$d0
|
||||
ld a, [hSCY]
|
||||
or a
|
||||
jr nz, .asm_c88d0
|
||||
ld a, [hLCDStatCustom + 1]
|
||||
@ -1546,7 +1546,7 @@ Functionc88a5: ; c88a5 (32:48a5)
|
||||
ld l, a
|
||||
ld [hl], $0
|
||||
.asm_c88d6
|
||||
ld a, [hSCY] ; $ff00+$d0
|
||||
ld a, [hSCY]
|
||||
ld l, a
|
||||
ld a, [hLCDStatCustom + 1]
|
||||
sub l
|
||||
@ -1953,7 +1953,7 @@ Functionc8ae5: ; c8ae5 (32:4ae5)
|
||||
ret
|
||||
|
||||
Functionc8b00: ; c8b00 (32:4b00)
|
||||
ld a, [hCGB] ; $ff00+$e6
|
||||
ld a, [hCGB]
|
||||
and a
|
||||
jr nz, asm_c8b7a
|
||||
call Functionc80d7 ; ; ; call does not return
|
||||
@ -1969,7 +1969,7 @@ Functionc8b0e: ; c8b0e (32:4b0e)
|
||||
ld a, $e4
|
||||
call Functionc8ecb
|
||||
ld a, $47
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
xor a
|
||||
ld [hLCDStatCustom + 1], a
|
||||
ld a, $60
|
||||
@ -2266,7 +2266,7 @@ Functionc8cab: ; c8cab (32:4cab)
|
||||
call Functionc80e5
|
||||
call Functionc8eca
|
||||
ld a, $43
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
xor a
|
||||
ld [hLCDStatCustom + 1], a
|
||||
ld a, $37
|
||||
@ -2307,7 +2307,7 @@ Functionc8ce1: ; c8ce1 (32:4ce1)
|
||||
push af
|
||||
call DelayFrame
|
||||
pop af
|
||||
ld [hSCY], a ; $ff00+$d0
|
||||
ld [hSCY], a
|
||||
xor $ff
|
||||
inc a
|
||||
ld [OTPartyMon3SpclAtk], a
|
||||
@ -2318,7 +2318,7 @@ Functionc8cf9: ; c8cf9 (32:4cf9)
|
||||
jr nc, .asm_c8cff
|
||||
xor a
|
||||
.asm_c8cff
|
||||
ld [hSCX], a ; $ff00+$cf
|
||||
ld [hSCX], a
|
||||
ret
|
||||
|
||||
Functionc8d02: ; c8d02 (32:4d02)
|
||||
@ -2326,7 +2326,7 @@ Functionc8d02: ; c8d02 (32:4d02)
|
||||
jr nc, .asm_c8d08
|
||||
xor a
|
||||
.asm_c8d08
|
||||
ld [hSCY], a ; $ff00+$d0
|
||||
ld [hSCY], a
|
||||
ret
|
||||
|
||||
Functionc8d0b: ; c8d0b (32:4d0b)
|
||||
@ -2373,7 +2373,7 @@ Functionc8d3a: ; c8d3a (32:4d3a)
|
||||
jr nc, .asm_c8d53
|
||||
ld d, $6
|
||||
call Functionc905d
|
||||
ld [hSCX], a ; $ff00+$cf
|
||||
ld [hSCX], a
|
||||
ld hl, $3
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@ -2382,7 +2382,7 @@ Functionc8d3a: ; c8d3a (32:4d3a)
|
||||
ret
|
||||
.asm_c8d53
|
||||
xor a
|
||||
ld [hSCX], a ; $ff00+$cf
|
||||
ld [hSCX], a
|
||||
ret
|
||||
|
||||
Functionc8d57: ; c8d57 (32:4d57)
|
||||
@ -2410,7 +2410,7 @@ Functionc8d57: ; c8d57 (32:4d57)
|
||||
ret
|
||||
|
||||
Functionc8d77: ; c8d77 (32:4d77)
|
||||
ld a, [hCGB] ; $ff00+$e6
|
||||
ld a, [hCGB]
|
||||
and a
|
||||
jr nz, asm_c8dd4
|
||||
push de
|
||||
@ -2469,7 +2469,7 @@ Functionc8daa: ; c8daa (32:4daa)
|
||||
Functionc8dc9: ; c8dc9 (32:4dc9)
|
||||
call Functionc8f19
|
||||
ld a, $e4
|
||||
ld [rBGP], a ; $ff00+$47
|
||||
ld [rBGP], a
|
||||
call EndBattleBGEffect
|
||||
ret
|
||||
asm_c8dd4: ; c8dd4 (32:4dd4)
|
||||
@ -2563,10 +2563,10 @@ Functionc8e49: ; c8e49 (32:4e49)
|
||||
|
||||
Functionc8e52: ; c8e52 (32:4e52)
|
||||
ld h, a
|
||||
ld a, [rSVBK] ; $ff00+$70
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $5
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
ld a, h
|
||||
push bc
|
||||
push af
|
||||
@ -2583,17 +2583,17 @@ Functionc8e52: ; c8e52 (32:4e52)
|
||||
call CopyPals
|
||||
pop bc
|
||||
pop af
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
ld a, $1
|
||||
ld [hCGBPalUpdate], a ; $ff00+$e5
|
||||
ld [hCGBPalUpdate], a
|
||||
ret
|
||||
|
||||
Functionc8e7f: ; c8e7f (32:4e7f)
|
||||
ld h, a
|
||||
ld a, [rSVBK] ; $ff00+$70
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $5
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
ld a, h
|
||||
push bc
|
||||
push af
|
||||
@ -2610,9 +2610,9 @@ Functionc8e7f: ; c8e7f (32:4e7f)
|
||||
call CopyPals
|
||||
pop bc
|
||||
pop af
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
ld a, $1
|
||||
ld [hCGBPalUpdate], a ; $ff00+$e5
|
||||
ld [hCGBPalUpdate], a
|
||||
ret
|
||||
|
||||
Functionc8eac: ; c8eac (32:4eac)
|
||||
@ -2660,7 +2660,7 @@ Functionc8ecb: ; c8ecb (32:4ecb)
|
||||
ret
|
||||
|
||||
Functionc8ede: ; c8ede (32:4ede)
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
call Functionc9038
|
||||
jr nz, .asm_c8eea
|
||||
ld de, $36
|
||||
@ -2675,7 +2675,7 @@ Functionc8ede: ; c8ede (32:4ede)
|
||||
ret
|
||||
|
||||
Functionc8ef4: ; c8ef4 (32:4ef4)
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
call Functionc9038
|
||||
jr nz, .asm_c8f00
|
||||
ld de, $36
|
||||
@ -2695,15 +2695,15 @@ Functionc8f0a: ; c8f0a (32:4f0a)
|
||||
ld [hLCDStatCustom + 2], a
|
||||
call Functionc8eca
|
||||
xor a
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
call EndBattleBGEffect
|
||||
ret
|
||||
|
||||
Functionc8f19: ; c8f19 (32:4f19)
|
||||
xor a
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
ld a, $e4
|
||||
ld [rBGP], a ; $ff00+$47
|
||||
ld [rBGP], a
|
||||
ld [wcfc7], a
|
||||
ld [wcfc9], a
|
||||
ld [hLCDStatCustom + 1], a
|
||||
@ -2902,7 +2902,7 @@ Functionc901b: ; c901b (32:501b)
|
||||
Functionc9038: ; c9038 (32:5038)
|
||||
ld hl, $2
|
||||
add hl, bc
|
||||
ld a, [hBattleTurn] ; $ff00+$e4
|
||||
ld a, [hBattleTurn]
|
||||
and $1
|
||||
xor [hl]
|
||||
ret
|
||||
@ -2910,7 +2910,7 @@ Functionc9038: ; c9038 (32:5038)
|
||||
Functionc9042: ; c9042 (32:5042)
|
||||
ld hl, $2
|
||||
add hl, bc
|
||||
ld a, [hBattleTurn] ; $ff00+$e4
|
||||
ld a, [hBattleTurn]
|
||||
and $1
|
||||
xor [hl]
|
||||
jr nz, .asm_c9053
|
||||
@ -2923,7 +2923,7 @@ Functionc9042: ; c9042 (32:5042)
|
||||
ret
|
||||
|
||||
Functionc9059: ; c9059 (32:5059)
|
||||
ld a, [hSGB] ; $ff00+$e7
|
||||
ld a, [hSGB]
|
||||
and a
|
||||
ret
|
||||
|
||||
|
221
battle/core.asm
221
battle/core.asm
File diff suppressed because it is too large
Load Diff
@ -5361,13 +5361,14 @@ BattleCommand_FreezeTarget: ; 36102
|
||||
|
||||
callba UseHeldStatusHealingItem
|
||||
ret nz
|
||||
|
||||
call OpponentCantMove
|
||||
call EndRechargeOpp
|
||||
ld hl, wc740
|
||||
ld hl, wEnemyJustGotFrozen
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .finish
|
||||
ld hl, wc73f
|
||||
ld hl, wPlayerJustGotFrozen
|
||||
.finish
|
||||
ld [hl], $1
|
||||
ret
|
||||
@ -5582,12 +5583,12 @@ CheckIfStatCanBeRaised: ; 361ef
|
||||
|
||||
|
||||
StatUpAnimation: ; 36281
|
||||
ld bc, wc6fe
|
||||
ld bc, wPlayerMinimized
|
||||
ld hl, Function3f447
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .do_player ; 0x3628a $6
|
||||
ld bc, wc6fa
|
||||
ld bc, wEnemyMinimized
|
||||
ld hl, Function3f486
|
||||
.do_player
|
||||
ld a, BATTLE_VARS_MOVE_ANIM
|
||||
@ -8338,9 +8339,9 @@ endr
|
||||
jr c, .mimic_anims
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
ld a, [wc6fe]
|
||||
ld a, [wPlayerMinimized]
|
||||
jr z, .got_byte
|
||||
ld a, [wc6fa]
|
||||
ld a, [wEnemyMinimized]
|
||||
.got_byte
|
||||
and a
|
||||
jr nz, .mimic_anims
|
||||
@ -9528,11 +9529,11 @@ BattleCommand_MirrorCoat: ; 37c95
|
||||
BattleCommand_DoubleMinimizeDamage: ; 37ce6
|
||||
; doubleminimizedamage
|
||||
|
||||
ld hl, wc6fa
|
||||
ld hl, wEnemyMinimized
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .ok
|
||||
ld hl, wc6fe
|
||||
ld hl, wPlayerMinimized
|
||||
.ok
|
||||
ld a, [hl]
|
||||
and a
|
||||
|
@ -1,7 +1,7 @@
|
||||
_DisappearUser: ; fbd54
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld a, [hBattleTurn] ; $ff00+$e4
|
||||
ld [hBGMapMode], a
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .player
|
||||
call GetEnemyFrontpicCoords
|
||||
@ -21,8 +21,8 @@ _AppearUserLowerSub: ; fbd71 (3e:7d71)
|
||||
|
||||
AppearUser: ; fbd77 (3e:7d77)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld a, [hBattleTurn] ; $ff00+$e4
|
||||
ld [hBGMapMode], a
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .player
|
||||
call GetEnemyFrontpicCoords
|
||||
@ -36,7 +36,7 @@ AppearUser: ; fbd77 (3e:7d77)
|
||||
predef FillBox
|
||||
FinishAppearDisappearUser: ; fbd91 (3e:7d91)
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ret
|
||||
|
||||
GetEnemyFrontpicCoords: ; fbd96 (3e:7d96)
|
||||
|
@ -48,53 +48,3 @@ ANIM_BG_WOBBLE_MON EQU $34
|
||||
const ANIM_MON_UNUSED ; 6
|
||||
const ANIM_MON_EGG1 ; 7
|
||||
const ANIM_MON_EGG2 ; 8
|
||||
|
||||
const_value SET $d0
|
||||
const BATTLEANIM_D0
|
||||
const BATTLEANIM_D1
|
||||
const BATTLEANIM_D2
|
||||
const BATTLEANIM_D3
|
||||
const BATTLEANIM_D4
|
||||
const BATTLEANIM_D5
|
||||
const BATTLEANIM_D6
|
||||
const BATTLEANIM_D7
|
||||
const BATTLEANIM_D8
|
||||
const BATTLEANIM_D9
|
||||
const BATTLEANIM_DA
|
||||
const BATTLEANIM_DB
|
||||
const BATTLEANIM_DC
|
||||
const BATTLEANIM_DD
|
||||
const BATTLEANIM_DE
|
||||
const BATTLEANIM_DF
|
||||
const BATTLEANIM_E0
|
||||
const BATTLEANIM_E1
|
||||
const BATTLEANIM_E2
|
||||
const BATTLEANIM_E3
|
||||
const BATTLEANIM_E4
|
||||
const BATTLEANIM_E5
|
||||
const BATTLEANIM_E6
|
||||
const BATTLEANIM_E7
|
||||
const BATTLEANIM_E8
|
||||
const BATTLEANIM_E9
|
||||
const BATTLEANIM_EA
|
||||
const BATTLEANIM_EB
|
||||
const BATTLEANIM_EC
|
||||
const BATTLEANIM_ED
|
||||
const BATTLEANIM_EE
|
||||
const BATTLEANIM_EF
|
||||
const BATTLEANIM_F0
|
||||
const BATTLEANIM_F1
|
||||
const BATTLEANIM_F2
|
||||
const BATTLEANIM_F3
|
||||
const BATTLEANIM_F4
|
||||
const BATTLEANIM_F5
|
||||
const BATTLEANIM_F6
|
||||
const BATTLEANIM_F7
|
||||
const BATTLEANIM_F8
|
||||
const BATTLEANIM_F9
|
||||
const BATTLEANIM_FA
|
||||
const BATTLEANIM_FB
|
||||
const BATTLEANIM_FC
|
||||
const BATTLEANIM_FD
|
||||
const BATTLEANIM_FE
|
||||
const BATTLEANIM_FF
|
||||
|
@ -254,7 +254,7 @@ StartTrainerBattle_SetUpBGMap: ; 8c3a1 (23:43a1)
|
||||
call StartTrainerBattle_NextScene
|
||||
xor a
|
||||
ld [wcf64], a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ret
|
||||
|
||||
StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
|
||||
@ -309,10 +309,10 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
|
||||
StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
|
||||
callba Function5602
|
||||
ld a, $5
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
call StartTrainerBattle_NextScene
|
||||
ld a, $43
|
||||
ld [hLCDStatCustom], a ; $ff00+$c6
|
||||
ld [hLCDStatCustom], a
|
||||
xor a
|
||||
ld [hLCDStatCustom + 1], a
|
||||
ld a, $90
|
||||
@ -365,7 +365,7 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408)
|
||||
StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d)
|
||||
callba Function5602
|
||||
ld a, $5
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
call StartTrainerBattle_NextScene
|
||||
xor a
|
||||
ld [wcf64], a
|
||||
@ -386,7 +386,7 @@ ENDM
|
||||
|
||||
StartTrainerBattle_SpinToBlack: ; 8c44f (23:444f)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld a, [wcf64]
|
||||
ld e, a
|
||||
ld d, 0
|
||||
@ -400,7 +400,7 @@ endr
|
||||
ld [wcf65], a
|
||||
call .load
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call DelayFrame
|
||||
call DelayFrame
|
||||
ld hl, wcf64
|
||||
@ -409,12 +409,12 @@ endr
|
||||
|
||||
.end
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call DelayFrame
|
||||
call DelayFrame
|
||||
call DelayFrame
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld a, $20
|
||||
ld [wJumptableIndex], a
|
||||
ret
|
||||
@ -508,12 +508,12 @@ endr
|
||||
StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578)
|
||||
callba Function5602
|
||||
ld a, $5
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
call StartTrainerBattle_NextScene
|
||||
ld a, $10
|
||||
ld [wcf64], a
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ret
|
||||
|
||||
StartTrainerBattle_SpeckleToBlack: ; 8c58f (23:458f)
|
||||
@ -533,12 +533,12 @@ StartTrainerBattle_SpeckleToBlack: ; 8c58f (23:458f)
|
||||
|
||||
.done
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call DelayFrame
|
||||
call DelayFrame
|
||||
call DelayFrame
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld a, $20
|
||||
ld [wJumptableIndex], a
|
||||
ret
|
||||
@ -580,7 +580,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
|
||||
jp z, .nextscene
|
||||
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
hlcoord 0, 0, AttrMap
|
||||
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
|
||||
inc b
|
||||
@ -636,11 +636,11 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
|
||||
dec b
|
||||
jr nz, .loop2
|
||||
|
||||
ld a, [hCGB] ; $ff00+$e6
|
||||
ld a, [hCGB]
|
||||
and a
|
||||
jr nz, .cgb
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call DelayFrame
|
||||
call DelayFrame
|
||||
jr .nextscene
|
||||
@ -653,10 +653,10 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
|
||||
jr nz, .daytime
|
||||
ld hl, .nightpals
|
||||
.daytime
|
||||
ld a, [rSVBK] ; $ff00+$70
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $5 ; WRAM5 = palettes
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
call .copypals
|
||||
push hl
|
||||
ld de, Unkn1Pals + 8 * 7
|
||||
@ -667,9 +667,9 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
|
||||
ld bc, $8
|
||||
call CopyBytes
|
||||
pop af
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
ld a, $1
|
||||
ld [hCGBPalUpdate], a ; $ff00+$e5
|
||||
ld [hCGBPalUpdate], a
|
||||
call DelayFrame
|
||||
call Function8cf4f
|
||||
|
||||
@ -829,7 +829,7 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
|
||||
inc de
|
||||
ld h, a
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call .Copy
|
||||
call WaitBGMap
|
||||
jr .loop
|
||||
|
976
engine/breeding/egg.asm
Executable file
976
engine/breeding/egg.asm
Executable file
File diff suppressed because it is too large
Load Diff
@ -72,9 +72,9 @@ RestartClock: ; 20021 (8:4021)
|
||||
call UpdateTime
|
||||
call GetWeekday
|
||||
ld [Buffer4], a
|
||||
ld a, [hHours] ; $ff00+$94
|
||||
ld a, [hHours]
|
||||
ld [Buffer5], a
|
||||
ld a, [hMinutes] ; $ff00+$96
|
||||
ld a, [hMinutes]
|
||||
ld [Buffer6], a
|
||||
|
||||
.loop
|
||||
@ -223,7 +223,7 @@ RestartClock: ; 20021 (8:4021)
|
||||
.unreferenced: ; 20160
|
||||
ld a, [Buffer3]
|
||||
ld b, a
|
||||
call GetTileCoord
|
||||
call Coord2Tile
|
||||
ret
|
||||
; 20168
|
||||
|
||||
@ -233,7 +233,7 @@ RestartClock: ; 20021 (8:4021)
|
||||
ld a, [Buffer3]
|
||||
dec a
|
||||
ld b, a
|
||||
call GetTileCoord
|
||||
call Coord2Tile
|
||||
pop de
|
||||
ld [hl], d
|
||||
ld bc, 2 * SCREEN_WIDTH
|
||||
|
@ -300,7 +300,7 @@ Function109956: ; 109956 (42:5956)
|
||||
|
||||
Function10995e: ; 10995e (42:595e)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
jp Function109951
|
||||
|
||||
Function109964: ; 109964 (42:5964)
|
||||
@ -317,13 +317,13 @@ Function109964: ; 109964 (42:5964)
|
||||
|
||||
Function10997b: ; 10997b (42:597b)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld a, $8
|
||||
ld [Requested2bpp], a
|
||||
jp Function109951
|
||||
|
||||
Function109986: ; 109986 (42:5986)
|
||||
ld a, [rLY] ; $ff00+$44
|
||||
ld a, [rLY]
|
||||
cp $30
|
||||
jr c, Function109986
|
||||
ld a, [wcf66]
|
||||
@ -523,9 +523,9 @@ endr
|
||||
|
||||
Function109a95: ; 109a95 (42:5a95)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld a, $c
|
||||
ld [hBGMapAddress], a ; $ff00+$d6
|
||||
ld [hBGMapAddress], a
|
||||
ld a, $28
|
||||
hlcoord 0, 0
|
||||
ld bc, $168
|
||||
@ -558,8 +558,8 @@ Function109a95: ; 109a95 (42:5a95)
|
||||
call ByteFill
|
||||
call Function3200
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapAddress], a ; $ff00+$d6
|
||||
ld [hBGMapMode], a
|
||||
ld [hBGMapAddress], a
|
||||
hlcoord 0, 0
|
||||
call Function109aff
|
||||
call Function3200
|
||||
|
@ -1813,7 +1813,7 @@ Function28b87: ; 28b87
|
||||
ld a, [hli]
|
||||
ld [wc6fd], a
|
||||
ld a, [hl]
|
||||
ld [wc6fe], a
|
||||
ld [wPlayerMinimized], a
|
||||
ld a, [DefaultFlypoint]
|
||||
ld hl, PartyMon1Species
|
||||
call GetPartyLocation
|
||||
@ -2810,7 +2810,7 @@ Function2942e: ; 2942e
|
||||
ld [CurPartySpecies], a
|
||||
ld a, [wc6fd]
|
||||
ld [TempMonDVs], a
|
||||
ld a, [wc6fe]
|
||||
ld a, [wPlayerMinimized]
|
||||
ld [TempMonDVs + 1], a
|
||||
ld b, $1a
|
||||
call GetSGBLayout
|
||||
|
@ -2995,7 +2995,7 @@ Function56cd: ; 56cd
|
||||
jr nc, .ok8
|
||||
ld c, a
|
||||
push bc
|
||||
call GetTileCoord
|
||||
call Coord2Tile
|
||||
pop bc
|
||||
ld a, [hl]
|
||||
cp $60
|
||||
|
@ -1,5 +1,5 @@
|
||||
Function2400e:: ; 2400e
|
||||
ld hl, Function1c66
|
||||
ld hl, CopyMenuData2
|
||||
ld a, [wcf94]
|
||||
rst FarCall
|
||||
call Function24085
|
||||
@ -10,7 +10,7 @@ Function2400e:: ; 2400e
|
||||
; 24022
|
||||
|
||||
Function24022:: ; 24022
|
||||
ld hl, Function1c66
|
||||
ld hl, CopyMenuData2
|
||||
ld a, [wcf94]
|
||||
rst FarCall
|
||||
call Function24085
|
||||
@ -22,7 +22,7 @@ Function24022:: ; 24022
|
||||
; 2403c
|
||||
|
||||
Function2403c:: ; 2403c
|
||||
ld hl, Function1c66
|
||||
ld hl, CopyMenuData2
|
||||
ld a, [wcf94]
|
||||
rst FarCall
|
||||
call Function24085
|
||||
@ -126,8 +126,8 @@ Function240db: ; 240db
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
ld d, [hl]
|
||||
call Function1cc6
|
||||
call GetTileCoord
|
||||
call GetMenuTextStartCoord
|
||||
call Coord2Tile
|
||||
call Function240d3
|
||||
ld b, a
|
||||
.asm_240eb
|
||||
@ -166,7 +166,7 @@ Function240db: ; 240db
|
||||
|
||||
|
||||
Function2411a: ; 2411a (9:411a)
|
||||
call Function1cc6
|
||||
call GetMenuTextStartCoord
|
||||
ld a, b
|
||||
ld [wcfa1], a
|
||||
dec c
|
||||
@ -538,7 +538,7 @@ Function24329: ; 24329
|
||||
ld b, a
|
||||
ld a, [wcfa2]
|
||||
ld c, a
|
||||
call GetTileCoord
|
||||
call Coord2Tile
|
||||
ld a, [wcfa7]
|
||||
swap a
|
||||
and $f
|
||||
|
@ -44,7 +44,7 @@ Jumptable_10030: ; 10030 (4:4030)
|
||||
|
||||
Function10046: ; 10046 (4:4046)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call Function10955
|
||||
ld a, [wcf64]
|
||||
ld [wJumptableIndex], a
|
||||
@ -113,7 +113,7 @@ Function100d3: ; 100d3 (4:40d3)
|
||||
call ClearPocketList
|
||||
call DrawPocketName
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call WaitBGMap_DrawPackGFX
|
||||
call Function10866
|
||||
ret
|
||||
@ -203,7 +203,7 @@ Function10159: ; 10159
|
||||
ld [Options], a
|
||||
.asm_10179
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call Function10955
|
||||
call WaitBGMap_DrawPackGFX
|
||||
call Function10a40
|
||||
@ -478,7 +478,7 @@ Function10311: ; 10311
|
||||
jr z, .NoPokemon
|
||||
call DoItemEffect
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call Function10955
|
||||
call WaitBGMap_DrawPackGFX
|
||||
call Function10a40
|
||||
@ -634,7 +634,7 @@ Function103fd: ; 103fd
|
||||
pop af
|
||||
ld [Options], a
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call Function10955
|
||||
call WaitBGMap_DrawPackGFX
|
||||
call Function10a40
|
||||
@ -702,7 +702,7 @@ Jumptable_104c3: ; 104c3 (4:44c3)
|
||||
|
||||
Function104d9: ; 104d9 (4:44d9)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call Function10955
|
||||
ld a, [wcf64]
|
||||
ld [wJumptableIndex], a
|
||||
@ -771,7 +771,7 @@ Function10566: ; 10566 (4:4566)
|
||||
call ClearPocketList
|
||||
call DrawPocketName
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call WaitBGMap_DrawPackGFX
|
||||
ld hl, UnknownText_0x10b0c
|
||||
call Function10889
|
||||
@ -915,7 +915,7 @@ Function105dc: ; 105dc (4:45dc)
|
||||
and a
|
||||
jr nz, .asm_1067e
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call Function10955
|
||||
call WaitBGMap_DrawPackGFX
|
||||
call Function10a40
|
||||
|
@ -182,7 +182,7 @@ ChooseRandomCaller: ; 900bf (24:40bf)
|
||||
; Sample a random number between 0 and 31.
|
||||
ld c, a
|
||||
call Random
|
||||
ld a, [hRandomAdd] ; $ff00+$e1
|
||||
ld a, [hRandomAdd]
|
||||
swap a
|
||||
and $1f
|
||||
; Compute that number modulo the number of available callers.
|
||||
|
@ -209,7 +209,7 @@ Function40136: ; 40136 (10:4136)
|
||||
|
||||
Function4013c: ; 4013c (10:413c)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call ClearSprites
|
||||
xor a
|
||||
hlcoord 0, 0, AttrMap
|
||||
@ -226,7 +226,7 @@ Function4013c: ; 4013c (10:413c)
|
||||
call Function41af7
|
||||
call Function4074c
|
||||
ld a, $5
|
||||
ld [hSCX], a ; $ff00+$cf
|
||||
ld [hSCX], a
|
||||
ld a, [wc7d4]
|
||||
cp $1
|
||||
ld a, $4a
|
||||
@ -234,9 +234,9 @@ Function4013c: ; 4013c (10:413c)
|
||||
ld a, $47
|
||||
|
||||
.asm_4017b
|
||||
ld [hWX], a ; $ff00+$d1
|
||||
ld [hWX], a
|
||||
xor a
|
||||
ld [hWY], a ; $ff00+$d2
|
||||
ld [hWY], a
|
||||
call WaitBGMap
|
||||
call Function41af7
|
||||
ld a, $ff
|
||||
@ -272,7 +272,7 @@ Function401ae: ; 401ae (10:41ae)
|
||||
ret nc
|
||||
call Function41148
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call Function40b0f
|
||||
call Function41ad7
|
||||
call Function41af7
|
||||
@ -293,9 +293,9 @@ Function401ae: ; 401ae (10:41ae)
|
||||
ld a, $7
|
||||
ld [wJumptableIndex], a
|
||||
xor a
|
||||
ld [hSCX], a ; $ff00+$cf
|
||||
ld [hSCX], a
|
||||
ld a, $a7
|
||||
ld [hWX], a ; $ff00+$d1
|
||||
ld [hWX], a
|
||||
call DelayFrame
|
||||
ret
|
||||
|
||||
@ -304,9 +304,9 @@ Function401ae: ; 401ae (10:41ae)
|
||||
ld a, $5
|
||||
ld [wJumptableIndex], a
|
||||
xor a
|
||||
ld [hSCX], a ; $ff00+$cf
|
||||
ld [hSCX], a
|
||||
ld a, $a7
|
||||
ld [hWX], a ; $ff00+$d1
|
||||
ld [hWX], a
|
||||
call DelayFrame
|
||||
ret
|
||||
|
||||
@ -320,7 +320,7 @@ Function40217: ; 40217 (10:4217)
|
||||
xor a
|
||||
ld [wPokedexStatus], a
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call ClearSprites
|
||||
call Function41478
|
||||
call Function407fd
|
||||
@ -331,7 +331,7 @@ Function40217: ; 40217 (10:4217)
|
||||
call Function40ba0
|
||||
call WaitBGMap
|
||||
ld a, $a7
|
||||
ld [hWX], a ; $ff00+$d1
|
||||
ld [hWX], a
|
||||
call Function40bb1
|
||||
ld [CurPartySpecies], a
|
||||
ld a, $4
|
||||
@ -392,7 +392,7 @@ Function402aa: ; 402aa (10:42aa)
|
||||
xor a
|
||||
ld [wPokedexStatus], a
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call Function407fd
|
||||
call Function4134f
|
||||
call Function41478
|
||||
@ -509,7 +509,7 @@ Function4038d: ; 4038d
|
||||
|
||||
Function4039d: ; 4039d (10:439d)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call ClearSprites
|
||||
call Function4087c
|
||||
call Function4134f
|
||||
@ -615,7 +615,7 @@ Function4043a: ; 4043a (10:443a)
|
||||
|
||||
Function40443: ; 40443 (10:4443)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call ClearSprites
|
||||
call Function408f0
|
||||
call Function4134f
|
||||
@ -723,7 +723,7 @@ Function40501: ; 40501
|
||||
|
||||
Function4050a: ; 4050a (10:450a)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
xor a
|
||||
hlcoord 0, 0, AttrMap
|
||||
ld bc, $168
|
||||
@ -739,11 +739,11 @@ Function4050a: ; 4050a (10:450a)
|
||||
call Function41af7
|
||||
call Function40962
|
||||
ld a, $5
|
||||
ld [hSCX], a ; $ff00+$cf
|
||||
ld [hSCX], a
|
||||
ld a, $4a
|
||||
ld [hWX], a ; $ff00+$d1
|
||||
ld [hWX], a
|
||||
xor a
|
||||
ld [hWY], a ; $ff00+$d2
|
||||
ld [hWY], a
|
||||
call WaitBGMap
|
||||
call Function41af7
|
||||
callba Function1de1d1
|
||||
@ -768,7 +768,7 @@ Function40562: ; 40562 (10:4562)
|
||||
ret nc
|
||||
call Function41281
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call Function40b0f
|
||||
call Function41ad7
|
||||
call Function41af7
|
||||
@ -797,9 +797,9 @@ Function40562: ; 40562 (10:4562)
|
||||
ld a, $5
|
||||
ld [wJumptableIndex], a
|
||||
xor a
|
||||
ld [hSCX], a ; $ff00+$cf
|
||||
ld [hSCX], a
|
||||
ld a, $a7
|
||||
ld [hWX], a ; $ff00+$d1
|
||||
ld [hWX], a
|
||||
ret
|
||||
|
||||
Function405bd: ; 405bd (10:45bd)
|
||||
@ -876,14 +876,14 @@ Function40610: ; 40610 (10:4610)
|
||||
.asm_40635
|
||||
push af
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
pop af
|
||||
call Function40654
|
||||
call Function41a58
|
||||
call Function40658
|
||||
callba Functionfba2e
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
call DelayFrame
|
||||
call DelayFrame
|
||||
ret
|
||||
@ -1773,7 +1773,7 @@ String_40ee4: ; 40ee4
|
||||
|
||||
Function40f08: ; 40f08 (10:4f08)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
hlcoord 0, 12
|
||||
ld bc, $412
|
||||
call Function40ad5
|
||||
@ -1781,7 +1781,7 @@ Function40f08: ; 40f08 (10:4f08)
|
||||
hlcoord 1, 14
|
||||
call PlaceString
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld c, $40
|
||||
call DelayFrames
|
||||
ld de, SFX_CHANGE_DEX_MODE
|
||||
@ -1861,7 +1861,7 @@ Function40f84: ; 40f84
|
||||
|
||||
Function40fa8: ; 40fa8 (10:4fa8)
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
hlcoord 9, 3
|
||||
ld bc, $408
|
||||
ld a, $7f
|
||||
@ -1873,7 +1873,7 @@ Function40fa8: ; 40fa8 (10:4fa8)
|
||||
hlcoord 9, 6
|
||||
call Function40fcd
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ret
|
||||
|
||||
Function40fcd: ; 40fcd (10:4fcd)
|
||||
@ -2363,16 +2363,16 @@ Function413fe: ; 413fe (10:53fe)
|
||||
jp FillBoxWithByte
|
||||
|
||||
Function41401: ; 41401 (10:5401)
|
||||
ld a, [rSVBK] ; $ff00+$70
|
||||
ld a, [rSVBK]
|
||||
push af
|
||||
ld a, $5
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
ld hl, Unkn1Pals
|
||||
ld bc, $40
|
||||
xor a
|
||||
call ByteFill
|
||||
pop af
|
||||
ld [rSVBK], a ; $ff00+$70
|
||||
ld [rSVBK], a
|
||||
|
||||
Function41415: ; 41415
|
||||
ld a, $ff
|
||||
|
@ -1679,15 +1679,15 @@ BuenasPassword1: ; b8f12 (2e:4f12)
|
||||
|
||||
.PlayPassword: ; b8f22 (2e:4f22)
|
||||
call StartRadioStation
|
||||
ld a, [hBGMapMode] ; $ff00+$d4
|
||||
ld a, [hBGMapMode]
|
||||
push af
|
||||
xor a
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld de, String_b9171
|
||||
hlcoord 2, 9
|
||||
call PlaceString
|
||||
pop af
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld hl, UnknownText_0xb9182
|
||||
ld a, BUENAS_PASSWORD_2
|
||||
jp NextRadioLine
|
||||
@ -1951,12 +1951,12 @@ BuenasPassword19: ; b9122 (2e:5122)
|
||||
jp NextRadioLine
|
||||
|
||||
BuenasPassword20: ; b912a (2e:512a)
|
||||
ld a, [hBGMapMode] ; $ff00+$d4
|
||||
ld a, [hBGMapMode]
|
||||
push af
|
||||
callba NoRadioMusic
|
||||
callba NoRadioName
|
||||
pop af
|
||||
ld [hBGMapMode], a ; $ff00+$d4
|
||||
ld [hBGMapMode], a
|
||||
ld hl, WeeklyFlags
|
||||
res 7, [hl]
|
||||
ld a, BUENAS_PASSWORD
|
||||
@ -1980,7 +1980,7 @@ BuenasPassword21: ; b9152 (2e:5152)
|
||||
|
||||
BuenasPasswordCheckTime: ; b9169 (2e:5169)
|
||||
call UpdateTime
|
||||
ld a, [hHours] ; $ff00+$94
|
||||
ld a, [hHours]
|
||||
cp 18 ; 6 PM
|
||||
ret
|
||||
; b9171 (2e:5171)
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user