thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'huderlem/master' into master

Browse source 
Conflicts:
	main.asm
This commit is contained in:
yenatch 2014-03-29 22:51:57 -04:00
parent da67a699c5 14dbeb36b0
commit caf92984d5
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
main.asm
View file

@ -10507,9 +10507,10 @@ Func_3eb5:: ; 3eb5 (0:3eb5)
ld a, [$cd3e] ld a, [$cd3e]
ld [$2000], a ld [$2000], a
ld [H_LOADEDROMBANK], a ld [H_LOADEDROMBANK], a
ld de, $3eda ld de, .asm_3eda
push de push de
jp [hl] jp [hl]
.asm_3eda
xor a xor a
jr .asm_3eec jr .asm_3eec
.asm_3edd .asm_3edd
@ -14169,9 +14170,9 @@ Func_5c0a: ; 5c0a (1:5c0a)
ld [$d700], a ld [$d700], a
ld a, [wCurrentMenuItem] ; $cc26 ld a, [wCurrentMenuItem] ; $cc26
and a and a
ld a, $f0 ld a, TRADE_CENTER
jr nz, .asm_5cfc jr nz, .asm_5cfc
ld a, $ef ld a, BATTLE_CENTER
.asm_5cfc .asm_5cfc
ld [$d72d], a ld [$d72d], a
ld hl, UnnamedText_5d48 ; $5d48 ld hl, UnnamedText_5d48 ; $5d48
@ -14903,7 +14904,7 @@ Func_62ce: ; 62ce (1:62ce)
Func_62ff: ; 62ff (1:62ff) Func_62ff: ; 62ff (1:62ff)
ld a, [$d72d] ld a, [$d72d]
cp $ef cp BATTLE_CENTER
jr nz, .asm_6314 jr nz, .asm_6314
ld hl, BattleCenterSpec1 ; $6428 ld hl, BattleCenterSpec1 ; $6428
ld a, [$FF00+$aa] ld a, [$FF00+$aa]
@ -14912,7 +14913,7 @@ Func_62ff: ; 62ff (1:62ff)
ld hl, BattleCenterSpec2 ; $6430 ld hl, BattleCenterSpec2 ; $6430
jr .asm_6334 jr .asm_6334
.asm_6314 .asm_6314
cp $f0 cp TRADE_CENTER
jr nz, .asm_6326 jr nz, .asm_6326
ld hl, TradeCenterSpec1 ; $6438 ld hl, TradeCenterSpec1 ; $6438
ld a, [$FF00+$aa] ld a, [$FF00+$aa]
@ -50923,13 +50924,15 @@ Func_396c6: ; 396c6 (e:56c6)
dec hl dec hl
ret ret
Func_396d3: ; 396d3 (e:56d3) _ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3)
; Load the enemy trainer's pic and scrolls it into
; the screen from the right.
xor a xor a
ld [W_ENEMYMONID], a ld [W_ENEMYMONID], a
ld b, $1 ld b, $1
call GoPAL_SET call GoPAL_SET
ld hl, Func_3f04b ld hl, _LoadTrainerPic
ld b, BANK(Func_3f04b) ld b, BANK(_LoadTrainerPic)
call Bankswitch call Bankswitch
FuncCoord 19, 0 ; $c3b3 FuncCoord 19, 0 ; $c3b3
ld hl, Coord ld hl, Coord
@ -57175,7 +57178,7 @@ TrainerBattleVictory: ; 3c696 (f:4696)
ld a, [W_ISLINKBATTLE] ; $d12b ld a, [W_ISLINKBATTLE] ; $d12b
cp $4 cp $4
ret z ret z
call Func_3ed12 call ScrollTrainerPicAfterBattle
ld c, $28 ld c, $28
call DelayFrames call DelayFrames
call Func_3381 call Func_3381
@ -57371,7 +57374,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837)
ld hl, wTileMap ; sony 1 battle ld hl, wTileMap ; sony 1 battle
ld bc, $815 ld bc, $815
call ClearScreenArea call ClearScreenArea
call Func_3ed12 call ScrollTrainerPicAfterBattle
ld c, $28 ld c, $28
call DelayFrames call DelayFrames
ld hl, Sony1WinText ld hl, Sony1WinText
@ -62616,9 +62619,9 @@ Func_3ed02: ; 3ed02 (f:6d02)
ld b, BANK(Func_396a7) ld b, BANK(Func_396a7)
jp Bankswitch jp Bankswitch
Func_3ed12: ; 3ed12 (f:6d12) ScrollTrainerPicAfterBattle: ; 3ed12 (f:6d12)
ld hl, Func_396d3 ld hl, _ScrollTrainerPicAfterBattle
ld b, BANK(Func_396d3) ld b, BANK(_ScrollTrainerPicAfterBattle)
jp Bankswitch jp Bankswitch
Func_3ed1a: ; 3ed1a (f:6d1a) Func_3ed1a: ; 3ed1a (f:6d1a)
@ -63001,7 +63004,7 @@ asm_3ef3d: ; 3ef3d (f:6f3d)
ld b, BANK(ReadTrainer) ld b, BANK(ReadTrainer)
call Bankswitch call Bankswitch
call Func_3ec32 call Func_3ec32
call Func_3f04b call _LoadTrainerPic
xor a xor a
ld [W_ENEMYMONID], a ld [W_ENEMYMONID], a
ld [$FF00+$e1], a ld [$FF00+$e1], a
@ -63114,17 +63117,18 @@ Func_3efeb: ; 3efeb (f:6feb)
TerminatorText_3f04a: ; 3f04a (f:704a) TerminatorText_3f04a: ; 3f04a (f:704a)
db "@" db "@"
Func_3f04b: ; 3f04b (f:704b) _LoadTrainerPic: ; 3f04b (f:704b)
; $d033-$d034 contain pointer to pic
ld a, [$d033] ld a, [$d033]
ld e, a ld e, a
ld a, [$d034] ld a, [$d034]
ld d, a ld d, a ; de contains pointer to trainer pic
ld a, [W_ISLINKBATTLE] ; $d12b ld a, [W_ISLINKBATTLE] ; $d12b
and a and a
ld a, $13 ld a, Bank(YoungsterPic) ; this is where all the trainer pics are (not counting Red's)
jr z, .asm_3f05d jr z, .loadSprite
ld a, $4 ld a, Bank(RedPicFront)
.asm_3f05d .loadSprite
call UncompressSpriteFromDE call UncompressSpriteFromDE
ld de, $9000 ld de, $9000
ld a, $77 ld a, $77