diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/gfx.asm | 4 | ||||
| -rw-r--r-- | home/map.asm | 8 | ||||
| -rw-r--r-- | home/menu.asm | 8 | ||||
| -rwxr-xr-x | home/pokemon.asm | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/home/gfx.asm b/home/gfx.asm index 14a46844..7c5deb51 100644 --- a/home/gfx.asm +++ b/home/gfx.asm @@ -32,8 +32,8 @@ Functiond9e:: farcall Functionf8000 ret -Functionda5:: - farcall Functionf8032 +LoadFontsBattleExtra:: + farcall _LoadFontsBattleExtra ret LoadFontsExtra:: diff --git a/home/map.asm b/home/map.asm index cf60545b..d331c40d 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2024,8 +2024,8 @@ CheckIfFacingTileCoordIsSign:: ; 2b8f (0:2b8f) .asm_2bad pop hl - ld de, wcf29 - ld bc, $5 + ld de, wCurBGEvent + ld bc, BG_EVENT_SIZE call CopyBytes scf ret @@ -2088,8 +2088,8 @@ CheckCurrentMapXYTriggers:: .asm_2c02 pop hl - ld de, wcf29 - ld bc, $8 + ld de, wCurCoordEvent + ld bc, COORD_EVENT_SIZE call CopyBytes scf ret diff --git a/home/menu.asm b/home/menu.asm index a82fa3a3..634d4bf3 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -110,8 +110,8 @@ RestoreTileBackup:: ret PopWindow:: - ld b, $10 - ld de, wMenuFlags + ld b, wMenuHeaderEnd - wMenuHeader + ld de, wMenuHeader .loop ld a, [hld] ld [de], a @@ -142,8 +142,8 @@ CopyMenuData:: ld a, [hli] ld h, [hl] ld l, a - ld de, wMenuDataFlags - ld bc, wMenuDataEnd - wMenuDataFlags + ld de, wMenuData + ld bc, wMenuDataEnd - wMenuData call CopyBytes pop af pop bc diff --git a/home/pokemon.asm b/home/pokemon.asm index 774bc04a..0c51fba8 100755 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -204,7 +204,7 @@ Print8BitNumLeftAlign:: jp PrintNum Unreferenced_GetNthMove:: - ld hl, wd149 + ld hl, wListMoves_MoveIndicesBuffer ld c, a ld b, 0 add hl, bc |