From 6f0b81504d6471afe7df6adae83791cc81933ca6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 16:04:21 +0100 Subject: More unreferenced labels cleanup --- home/trainers.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home/trainers.asm') diff --git a/home/trainers.asm b/home/trainers.asm index 857a95629..44093bfc1 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -240,7 +240,7 @@ PrintWinLossText:: ; 3718 cp BATTLETYPE_CANLOSE jr .canlose ; ?????????? -; unreferenced +; unused ld hl, wWinTextPointer jr .ok -- cgit v1.2.3 From bf074f359886707d2ffb2e0b525b03dc7af0fe29 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 22:57:19 -0500 Subject: =?UTF-8?q?map=5Fheader=20=E2=86=92=20map=5Fdef;=20map=5Fheader=5F?= =?UTF-8?q?2=20=E2=86=92=20map=5Fdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- home/trainers.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'home/trainers.asm') diff --git a/home/trainers.asm b/home/trainers.asm index 44093bfc1..4eabfbcbb 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -2,7 +2,7 @@ CheckTrainerBattle2:: ; 3600 ld a, [hROMBank] push af - call SwitchToMapScriptHeaderBank + call SwitchToMapScriptsBank call CheckTrainerBattle pop bc @@ -110,7 +110,7 @@ TalkToTrainer:: ; 3674 ld [EngineBuffer3], a LoadTrainer_continue:: ; 367e - call GetMapScriptHeaderBank + call GetMapScriptsBank ld [EngineBuffer1], a ld a, [hLastTalked] @@ -120,8 +120,8 @@ LoadTrainer_continue:: ; 367e add hl, bc ld a, [EngineBuffer1] call GetFarHalfword - ld de, wTempTrainerHeader - ld bc, wTempTrainerHeaderEnd - wTempTrainerHeader + ld de, wTempTrainer + ld bc, wTempTrainerEnd - wTempTrainer ld a, [EngineBuffer1] call FarCopyBytes xor a @@ -221,7 +221,7 @@ CheckTrainerFlag:: ; 36f5 ld a, [hli] ld h, [hl] ld l, a - call GetMapScriptHeaderBank + call GetMapScriptsBank call GetFarHalfword ld d, h ld e, l @@ -255,7 +255,7 @@ PrintWinLossText:: ; 3718 ld a, [hli] ld h, [hl] ld l, a - call GetMapScriptHeaderBank + call GetMapScriptsBank call FarPrintText call WaitBGMap call WaitPressAorB_BlinkCursor -- cgit v1.2.3