summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-04-12 16:35:54 -0400
committerentrpntr <entrpntr@gmail.com>2020-04-12 17:31:25 -0400
commit71f217cfa0f824b9e4224ddcac836e4aef86382f (patch)
tree7e038e3186f41bca4d46f1330efc226e225ba87a /engine
parent531e26c91a369d17c5f2a6105bcb3d345602ae27 (diff)
Finish disassembling bank $05.
Diffstat (limited to 'engine')
-rw-r--r--engine/events/pokemon_pc.asm2
-rw-r--r--engine/menus/naming_screen.asm2
-rw-r--r--engine/overworld/load_map_part.asm119
-rwxr-xr-xengine/overworld/player_object.asm2
-rw-r--r--engine/tilesets/map_palettes.asm2
5 files changed, 124 insertions, 3 deletions
diff --git a/engine/events/pokemon_pc.asm b/engine/events/pokemon_pc.asm
index e22a2ffc..7d3cc42e 100644
--- a/engine/events/pokemon_pc.asm
+++ b/engine/events/pokemon_pc.asm
@@ -1,3 +1,5 @@
+INCLUDE "data/events/unused_pokemonpc_menudata.asm"
+
PokemonCenterPC:
call PC_CheckPartyForPokemon
ret c
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 937f4267..4a86b58d 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -926,7 +926,7 @@ Function12267: ; 12267 (4:6267)
ld a, BANK(MailIcon)
call FarCopyBytes
xor a
- ld hl, wTilemapEnd
+ ld hl, wSpriteAnimDict
ld [hli], a
ld [hl], a
lb de, $18, $10
diff --git a/engine/overworld/load_map_part.asm b/engine/overworld/load_map_part.asm
index da143640..23758f28 100644
--- a/engine/overworld/load_map_part.asm
+++ b/engine/overworld/load_map_part.asm
@@ -34,3 +34,122 @@ _LoadMapPart::
dec b
jr nz, .loop
ret
+
+UnusedFunction153ba:
+ decoord 2, 2
+ ld bc, (SURROUNDING_WIDTH + 1) * 2
+ add hl, bc
+ ld c, SCREEN_HEIGHT - 4 * 1
+.loop:
+ ld b, SCREEN_WIDTH - SCREEN_META_WIDTH
+.loop2:
+ ld a, [hli]
+ ld [de], a
+ inc de
+ dec b
+ jr nz, .loop2
+ ld a, l
+ add SCREEN_META_WIDTH + METATILE_WIDTH
+ ld l, a
+ jr nc, .carry1
+ inc h
+
+.carry1:
+ ld a, e
+ add SCREEN_META_WIDTH
+ ld e, a
+ jr nc, .carry2
+ inc d
+
+.carry2:
+ dec c
+ jr nz, .loop
+ ret
+
+UnusedFunction153dd:
+ decoord 4, 4
+ ld bc, (SURROUNDING_WIDTH + 1) * 4
+ add hl, bc
+ ld c, SCREEN_HEIGHT - 4 * 2
+.loop:
+ ld b, SCREEN_WIDTH - SCREEN_META_WIDTH - METATILE_WIDTH
+.loop2:
+ ld a, [hli]
+ ld [de], a
+ inc de
+ dec b
+ jr nz, .loop2
+ ld a, l
+ add SCREEN_META_WIDTH + METATILE_WIDTH * 2
+ ld l, a
+ jr nc, .carry1
+ inc h
+
+.carry1:
+ ld a, e
+ add SCREEN_META_WIDTH + METATILE_WIDTH
+ ld e, a
+ jr nc, .carry2
+ inc d
+
+.carry2:
+ dec c
+ jr nz, .loop
+ ret
+
+UnusedFunction15400:
+ decoord 6, 6
+ ld bc, (SURROUNDING_WIDTH + 1) * 6
+ add hl, bc
+ ld c, SCREEN_HEIGHT - 4 * 3
+.loop:
+ ld b, SCREEN_WIDTH - SCREEN_META_WIDTH - METATILE_WIDTH * 2
+.loop2:
+ ld a, [hli]
+ ld [de], a
+ inc de
+ dec b
+ jr nz, .loop2
+ ld a, l
+ add SCREEN_META_WIDTH + METATILE_WIDTH * 3
+ ld l, a
+ jr nc, .carry1
+ inc h
+
+.carry1:
+ ld a, e
+ add SCREEN_META_WIDTH + METATILE_WIDTH * 2
+ ld e, a
+ jr nc, .carry2
+ inc d
+
+.carry2:
+ dec c
+ jr nz, .loop
+ ret
+
+UnusedFunction15423:
+ decoord 8, 8
+ ld bc, (SURROUNDING_WIDTH + 1) * 8
+ add hl, bc
+.loop
+ ld a, [hli]
+ ld [de], a
+ inc de
+ ld a, [hli]
+ ld [de], a
+ ld bc, SCREEN_WIDTH + 2
+ add hl, bc
+ ld a, e
+ add SCREEN_META_WIDTH + METATILE_WIDTH * 3 + 1
+ ld e, a
+ jr nc, .carry
+ inc d
+
+.carry:
+ ld a, [hli]
+ ld [de], a
+ inc de
+ ld a, [hli]
+ ld [de], a
+ ret
diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm
index e5a0c374..1ea552b5 100755
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -4,7 +4,7 @@ BlankScreen:
ldh [hBGMapMode], a
call ClearBGPalettes
call ClearSprites
- ld hl, wTilemap
+ hlcoord 0, 0
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
ld a, " "
call ByteFill
diff --git a/engine/tilesets/map_palettes.asm b/engine/tilesets/map_palettes.asm
index 3d7a5b1b..c8a4a57d 100644
--- a/engine/tilesets/map_palettes.asm
+++ b/engine/tilesets/map_palettes.asm
@@ -1,5 +1,5 @@
_SwapTextboxPalettes::
- ld hl, wTilemap
+ hlcoord 0, 0
ld de, wAttrmap
ld b, SCREEN_HEIGHT
.loop