diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 8 | ||||
| -rw-r--r-- | home/cry.asm | 6 | ||||
| -rw-r--r-- | home/init.asm | 12 | ||||
| -rw-r--r-- | home/map.asm | 10 | ||||
| -rw-r--r-- | home/palettes.asm | 8 | ||||
| -rw-r--r-- | home/text.asm | 13 |
6 files changed, 23 insertions, 34 deletions
diff --git a/home/audio.asm b/home/audio.asm index 98e1fc40c..21e4f81f9 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -152,13 +152,13 @@ PlayCryHeader:: ; 3be3 ld a, [hROMBank] push af - ; Cry headers are stuck in one bank. - ld a, BANK(CryHeaders) + ; Cries are stuck in one bank. + ld a, BANK(PokemonCries) ld [hROMBank], a ld [MBC3RomBank], a - ld hl, CryHeaders -rept 6 + ld hl, PokemonCries +rept 6 ; sizeof(mon_cry) add hl, de endr diff --git a/home/cry.asm b/home/cry.asm index aea7af03d..393534a29 100644 --- a/home/cry.asm +++ b/home/cry.asm @@ -62,11 +62,11 @@ LoadCryHeader:: ; 37f3 ld a, [hROMBank] push af - ld a, BANK(CryHeaders) + ld a, BANK(PokemonCries) rst Bankswitch - ld hl, CryHeaders -rept 6 + ld hl, PokemonCries +rept 6 ; sizeof(mon_cry) add hl, bc endr diff --git a/home/init.asm b/home/init.asm index 9023fada2..daac79da3 100644 --- a/home/init.asm +++ b/home/init.asm @@ -69,8 +69,8 @@ Init:: ; 17d ld [rLCDC], a ; Clear WRAM bank 0 - ld hl, wRAM0Start - ld bc, wRAM1Start - wRAM0Start + ld hl, WRAM0_Begin + ld bc, WRAM0_End - WRAM0_Begin .ByteFill: ld [hl], 0 inc hl @@ -87,8 +87,8 @@ Init:: ; 17d ld a, [hFFEA] push af xor a - ld hl, HRAM_START - ld bc, HRAM_END - HRAM_START + ld hl, HRAM_Begin + ld bc, HRAM_End - HRAM_Begin call ByteFill pop af ld [hFFEA], a @@ -201,8 +201,8 @@ ClearWRAM:: ; 25a push af ld [rSVBK], a xor a - ld hl, wRAM1Start - ld bc, $1000 + ld hl, WRAM1_Begin + ld bc, WRAM1_End - WRAM1_Begin call ByteFill pop af inc a diff --git a/home/map.asm b/home/map.asm index 1becaa64a..83b5adf11 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1391,7 +1391,7 @@ UpdateBGMapColumn:: ; 27f8 ret ; 2821 -LoadTileset:: ; 2821 +LoadTilesetGFX:: ; 2821 ld hl, TilesetAddress ld a, [hli] ld h, [hl] @@ -2054,7 +2054,7 @@ ReloadTilesetAndPalettes:: ; 2bae call SwitchToAnyMapBank farcall UpdateTimeOfDayPal call OverworldTextModeSwitch - call LoadTileset + call LoadTilesetGFX ld a, 9 call SkipMusic pop af @@ -2372,17 +2372,17 @@ GetFishingGroup:: ; 2d19 ret ; 2d27 -LoadTilesetHeader:: ; 2d27 +LoadTileset:: ; 2d27 push hl push bc ld hl, Tilesets - ld bc, TilesetHeaderEnd - TilesetHeader + ld bc, TilesetEnd - Tileset ld a, [wTileset] call AddNTimes ld de, TilesetBank - ld bc, TilesetHeaderEnd - TilesetHeader + ld bc, TilesetEnd - Tileset ld a, BANK(Tilesets) call FarCopyBytes diff --git a/home/palettes.asm b/home/palettes.asm index 80e4e25ec..bf414eee7 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -246,7 +246,7 @@ CopyPals:: ; d50 ; copy c palettes in order b from de to hl push bc - ld c, 4 ; NUM_PAL_COLORS + ld c, NUM_PAL_COLORS .loop push de push hl @@ -280,7 +280,7 @@ CopyPals:: ; d50 jr nz, .loop ; de += 8 (next pal) - ld a, 1 palettes ; NUM_PAL_COLORS * 2 ; bytes per pal + ld a, NUM_PAL_COLORS * 2 add e jr nc, .ok inc d @@ -303,8 +303,8 @@ ClearVBank1:: ; d79 ld a, 1 ld [rVBK], a - ld hl, VTiles0 - ld bc, VRAM_End - VTiles0 + ld hl, VRAM_Begin + ld bc, VRAM_End - VRAM_Begin xor a call ByteFill diff --git a/home/text.asm b/home/text.asm index 4b0d0d5df..39d9a3ed1 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1,17 +1,7 @@ -BORDER_WIDTH EQU 2 -TEXTBOX_WIDTH EQU SCREEN_WIDTH -TEXTBOX_INNERW EQU TEXTBOX_WIDTH - BORDER_WIDTH -TEXTBOX_HEIGHT EQU 6 -TEXTBOX_INNERH EQU TEXTBOX_HEIGHT - BORDER_WIDTH -TEXTBOX_X EQU 0 -TEXTBOX_INNERX EQU TEXTBOX_X + 1 -TEXTBOX_Y EQU SCREEN_HEIGHT - TEXTBOX_HEIGHT -TEXTBOX_INNERY EQU TEXTBOX_Y + 2 - ClearBox:: ; fb6 ; Fill a c*b box at hl with blank tiles. - ld a, " " + ; fallthrough FillBoxWithByte:: .row @@ -56,7 +46,6 @@ ClearScreen:: ; fdb ; fe8 - TextBox:: ; fe8 ; Draw a text box at hl with room for ; b lines of c characters each. |