summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-03-25 14:11:25 -0400
committerentrpntr <entrpntr@gmail.com>2020-03-25 15:10:21 -0400
commitca12e16b29402bd14b2bc96a13a2cf16639a35aa (patch)
treeef1ba8fde885d659852b6feab044283687d287b0 /home
parent14fb37e8100ed219e1bc08446424d1bfaf401a96 (diff)
Disassemble load_pics.asm and move_mon_wo_mail.asm in bank $14.
Diffstat (limited to 'home')
-rw-r--r--home/gfx.asm8
-rwxr-xr-xhome/pokemon.asm8
2 files changed, 8 insertions, 8 deletions
diff --git a/home/gfx.asm b/home/gfx.asm
index 7c5deb51..409b0778 100644
--- a/home/gfx.asm
+++ b/home/gfx.asm
@@ -42,18 +42,18 @@ LoadFontsExtra::
DecompressRequest2bpp::
push de
- ld a, BANK(sScratch)
+ ld a, BANK(sDecompressScratch)
call OpenSRAM
push bc
- ld de, sScratch
+ ld de, sDecompressScratch
ld a, b
call FarDecompress
pop bc
pop hl
- ld de, sScratch
+ ld de, sDecompressScratch
call Request2bpp
call CloseSRAM
ret
@@ -267,7 +267,7 @@ Function_ea6::
Function_eac::
push de
push hl
-
+
; bank
ld a, b
diff --git a/home/pokemon.asm b/home/pokemon.asm
index 0c51fba8..9bc54b2d 100755
--- a/home/pokemon.asm
+++ b/home/pokemon.asm
@@ -60,7 +60,7 @@ DrawBattleHPBar::
PrepMonFrontpic::
ld a, $1
- ld [wcf3b], a
+ ld [wBoxAlignment], a
_PrepMonFrontpic::
ld a, [wCurPartySpecies]
@@ -80,12 +80,12 @@ _PrepMonFrontpic::
lb bc, 7, 7
predef PlaceGraphic
xor a
- ld [wcf3b], a
+ ld [wBoxAlignment], a
ret
.not_pokemon
xor a
- ld [wcf3b], a
+ ld [wBoxAlignment], a
inc a
ld [wCurPartySpecies], a
ret
@@ -236,7 +236,7 @@ GetBaseData::
jr .end
.egg
- ld de, UnknownEggPic
+ ld de, EggPic
; Sprite dimensions
ld b, $55 ; 5x5