summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-06 03:22:40 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-06 03:22:40 -0500
commita33f356461e29559950f51dbef2e2d83235ea98f (patch)
tree20a7d6dc38f69f23045cb45b34d0ef17f28bf5f2 /main.asm
parenta070bdcb21310c7d17b4fd057852f788fdfd61ca (diff)
Remove unused source files
Diffstat (limited to 'main.asm')
-rwxr-xr-xmain.asm32
1 files changed, 3 insertions, 29 deletions
diff --git a/main.asm b/main.asm
index cc67186d..f263f4be 100755
--- a/main.asm
+++ b/main.asm
@@ -1665,20 +1665,7 @@ VictoryRoad1Blocks: INCBIN "maps/victoryroad1.blk"
INCLUDE "engine/evolution.asm"
-SetPartyMonTypes::
- call GetPredefRegisters
- ld bc, 5
- add hl, bc
- ld a, [wd11e]
- ld [wd0b5], a
- push hl
- call GetMonHeader
- pop hl
- ld a, [wMonHType1]
- ld [hli], a
- ld a, [wMonHType2]
- ld [hl], a
- ret
+INCLUDE "engine/predefs17.asm"
INCLUDE "engine/hidden_object_functions17.asm"
@@ -2154,21 +2141,8 @@ INCBIN "gfx/pikachu/unknown_e7d13.2bpp"
SECTION "bank3A",ROMX,BANK[$3A]
INCLUDE "text/monster_names.asm"
-IsPlayerJustOutsideMap: ; e876c (3a:476c)
- ld a, [wYCoord]
- ld b, a
- ld a, [wCurMapHeight]
- call Func_e877e
- ret z
- ld a, [wXCoord]
- ld b, a
- ld a, [wCurMapWidth]
-Func_e877e:
- add a
- cp b
- ret z
- inc b
- ret
+
+INCLUDE "engine/overworld/is_player_just_outside_map.asm"
INCLUDE "engine/printer.asm"
INCLUDE "engine/diploma_3a.asm"