From 10984f14cebe3357c45c7d0d2b981d216fc623bf Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 22 May 2016 19:40:45 -0400 Subject: Replace MonsterNames dr with file already in repo --- engine/unknown_e8d35.asm | 2 +- main.asm | 3 +-- text/monster_names.asm | 2 +- wram.asm | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/engine/unknown_e8d35.asm b/engine/unknown_e8d35.asm index 955a9f45..7aeeff39 100755 --- a/engine/unknown_e8d35.asm +++ b/engine/unknown_e8d35.asm @@ -42,7 +42,7 @@ Func_e8d35:: ; e8d35 (3a:4e79) jr c, .asm_e8ddc xor a ld [wUnknownSerialFlag_d49a], a - ld [$d49a], a + ld [wUnknownSerialFlag_d49b], a ld c, 12 call DelayFrames xor a diff --git a/main.asm b/main.asm index 8f84396b..0fe6f2fd 100755 --- a/main.asm +++ b/main.asm @@ -875,8 +875,7 @@ SECTION "bank39",ROMX,BANK[$39] SECTION "bank3A",ROMX,BANK[$3A] -MonsterNames: ; e8000 (3a:4000) - dr $e8000,$e876c +INCLUDE "text/monster_names.asm" IsPlayerJustOutsideMap: ; e876c (3a:476c) dr $e876c,$e8783 Func_e8783: ; e8783 (3a:4783) diff --git a/text/monster_names.asm b/text/monster_names.asm index c7e0226f..3262ec02 100755 --- a/text/monster_names.asm +++ b/text/monster_names.asm @@ -1,4 +1,4 @@ -MonsterNames: ; 1c21e (7:421e) +MonsterNames: ; e8000 (3a:4000) db "RHYDON@@@@" db "KANGASKHAN" db "NIDORAN♂@@" diff --git a/wram.asm b/wram.asm index 3ba0c67b..de88919b 100755 --- a/wram.asm +++ b/wram.asm @@ -2536,7 +2536,7 @@ wd47a:: ds 1 ds 24 -wPreventBlackout:: ds 1 +wPreventBlackout:: ds 1 ; d492 ds 1 -- cgit v1.3.1-sl0p