Cleaning up static HRAM labels; movement stuff, route 38 trainers

2015-11-09 23:01:45 -05:00
parent 77d0a8a396
commit f1b2466cc3
20 changed files with 483 additions and 373 deletions
--- a/home.asm
+++ b/home.asm
@@ -1460,17 +1460,17 @@ CheckTrainerBattle:: ; 360d
 	pop af
 	ld [hLastTalked], a
 	ld a, b
-	ld [CurFruit], a
+	ld [EngineBuffer2], a
 	ld a, c
-	ld [wd040], a
+	ld [EngineBuffer3], a
 	jr Function367e
 ; 3674

 Function3674:: ; 3674
 	ld a, 1
-	ld [CurFruit], a
+	ld [EngineBuffer2], a
 	ld a, -1
-	ld [wd040], a
+	ld [EngineBuffer3], a

 Function367e:: ; 367e
 	call GetMapScriptHeaderBank