diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/header.asm | 2 | ||||
| -rw-r--r-- | home/init.asm | 12 | ||||
| -rw-r--r-- | home/trainers.asm | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/home/header.asm b/home/header.asm index 671f29b1..505a2100 100644 --- a/home/header.asm +++ b/home/header.asm @@ -79,3 +79,5 @@ Start:: ; This makes sure it doesn't get used for anything else. ds $0150 - @ + +ENDSECTION diff --git a/home/init.asm b/home/init.asm index 58264dcf..f6d6d372 100644 --- a/home/init.asm +++ b/home/init.asm @@ -41,8 +41,8 @@ DEF rLCDC_DEFAULT EQU %11100011 ld sp, wStack - ld hl, WRAM0_Begin - ld bc, WRAM1_End - WRAM0_Begin + ld hl, STARTOF(WRAM0) + ld bc, SIZEOF(WRAM0) .loop ld [hl], 0 inc hl @@ -53,8 +53,8 @@ DEF rLCDC_DEFAULT EQU %11100011 call ClearVram - ld hl, HRAM_Begin - ld bc, HRAM_End - HRAM_Begin - 1 + ld hl, STARTOF(HRAM) + ld bc, SIZEOF(HRAM) - 1 call FillMemory call ClearSprites @@ -121,8 +121,8 @@ DEF rLCDC_DEFAULT EQU %11100011 jp PrepareTitleScreen ClearVram:: - ld hl, VRAM_Begin - ld bc, VRAM_End - VRAM_Begin + ld hl, STARTOF(VRAM) + ld bc, SIZEOF(VRAM) xor a jp FillMemory diff --git a/home/trainers.asm b/home/trainers.asm index 457f47cd..4166a4db 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -258,7 +258,7 @@ SetSpritePosition1:: SetSpritePosition2:: ld hl, _SetSpritePosition2 SpritePositionBankswitch:: - ld b, BANK(_GetSpritePosition1) ; BANK(_GetSpritePosition2), BANK(_SetSpritePosition1), BANK(_SetSpritePosition2) + ld b, BANK("Trainer Sight") jp Bankswitch ; indirect jump to one of the four functions CheckForEngagingTrainers:: |