Merge git://github.com/dannye/pokeyellow into dannye-master

Conflicts:
	constants/connection_constants.asm
	constants/evolution_constants.asm
	constants/list_constants.asm
	constants/oam_constants.asm
	constants/sprite_constants.asm
	constants/type_constants.asm
	engine/bank3d/random.asm
	engine/bank3f/main.asm
	home.asm
	home/overworld.asm
	home/serial.asm
	macros.asm
	main.asm
	wram.asm

13 files changed, 18 insertions, 18 deletions

diff --git a/yellow/bank3c/main.asm b/engine/bank3c/main.asm
index c05f46f5..92f5634c 100644
--- a/yellow/bank3c/main.asm
+++ b/engine/bank3c/main.asm
@@ -1,4 +1,4 @@
-INCLUDE "yellow/bank3c/overworld.asm"
+INCLUDE "engine/bank3c/overworld.asm"
 
 ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274)
 ; Reset player status on blackout.
diff --git a/yellow/bank3c/overworld.asm b/engine/bank3c/overworld.asm
index 778244d6..778244d6 100644
--- a/yellow/bank3c/overworld.asm
+++ b/engine/bank3c/overworld.asm
diff --git a/yellow/bank3d/random.asm b/engine/bank3d/random.asm
index b7fb0edd..8c8ead4e 100644
--- a/yellow/bank3d/random.asm
+++ b/engine/bank3d/random.asm
@@ -1,4 +1,4 @@
-SECTION "bank3d",ROMX[$67DC],BANK[$3D]
+SECTION "bank3d Random",ROMX[$67DC],BANK[$3D]
 
 Random_::
 ; Generate a random 16-bit value.
diff --git a/yellow/bank3f/data/map_header_banks.asm b/engine/bank3f/data/map_header_banks.asm
index 94a13510..94a13510 100644
--- a/yellow/bank3f/data/map_header_banks.asm
+++ b/engine/bank3f/data/map_header_banks.asm
diff --git a/yellow/bank3f/data/map_header_pointers.asm b/engine/bank3f/data/map_header_pointers.asm
index 5431727e..5431727e 100644
--- a/yellow/bank3f/data/map_header_pointers.asm
+++ b/engine/bank3f/data/map_header_pointers.asm
diff --git a/yellow/bank3f/data/map_songs.asm b/engine/bank3f/data/map_songs.asm
index 4a84aebb..4a84aebb 100644
--- a/yellow/bank3f/data/map_songs.asm
+++ b/engine/bank3f/data/map_songs.asm
diff --git a/yellow/bank3f/main.asm b/engine/bank3f/main.asm
index c9662acd..b02829eb 100644
--- a/yellow/bank3f/main.asm
+++ b/engine/bank3f/main.asm
@@ -1,6 +1,6 @@
-INCLUDE "yellow/bank3f/data/map_songs.asm"
-INCLUDE "yellow/bank3f/data/map_header_pointers.asm"
-INCLUDE "yellow/bank3f/data/map_header_banks.asm"
+INCLUDE "engine/bank3f/data/map_songs.asm"
+INCLUDE "engine/bank3f/data/map_header_pointers.asm"
+INCLUDE "engine/bank3f/data/map_header_banks.asm"
 
 Func_fc4dd:: ; fc4dd (3f:44dd)
 ; possibly to test if pika should be out?
@@ -21,7 +21,7 @@ Func_fc4dd:: ; fc4dd (3f:44dd)
 	and a
 	ret
 	
-Func_fc5fa:: ; fc5fa (3f:44fa)
+Func_fc4fa:: ; fc4fa (3f:44fa)
 	ld hl,wd430
 	bit 4,[hl]
 	res 4,[hl]
@@ -188,7 +188,7 @@ Func_fc5fa:: ; fc5fa (3f:45fa)
 	cp ROCK_TUNNEL_1
 	jr z,.asm_fc645
 	ld a,[W_CURMAP]
-	ld hl,Pointer_fc64b
+	ld hl,Pointer_fc46b
 	call Func_1568 ; similar to IsInArray, but not the same
 	jr c,.asm_fc639
 	ld a,[W_CURMAP]
@@ -232,7 +232,7 @@ Pointer_fc653:: ; fc653 (3f:4653)
 
 Func_fc65b:: ; fc65b (3f:465b)
 	ld a,[W_CURMAP]
-
+	
 Func_fc69a:: ; fc69a (3f:469a)
 
 Func_fcc08:: ; fcc08 (3f:4c08)
diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/bank_e_misc.asm
index 78b27108..6ef4065f 100644..100755
--- a/engine/battle/bank_e_misc.asm
+++ b/engine/battle/bank_e_misc.asm
@@ -119,4 +119,4 @@ GetMonSpecies: ; 39c37 (e:5c37)
 	add hl, de
 	ld a, [hl]
 	ld [wcf91], a
-	ret
\ No newline at end of file
+	ret
diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm
index f03dd07f..5d78af5b 100644..100755
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
@@ -85,4 +85,4 @@ DrawText: ; 13864 (4:7864)
 
 PickUpPayDayMoneyText: ; 1386b (4:786b)
 	TX_FAR _PickUpPayDayMoneyText
-	db "@"
\ No newline at end of file
+	db "@"
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index 3cdfb5cb..d8da714e 100644..100755
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -163,4 +163,4 @@ ReadTrainer: ; 39c53 (e:5c53)
 	inc de
 	dec b
 	jr nz,.LastLoop ; repeat W_CURENEMYLVL times
-	ret
\ No newline at end of file
+	ret
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
index 191cfd5e..19a184f2 100644
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -808,7 +808,7 @@ AIIncreaseStat: ; 3a808 (e:6808)
 	ld a,[hl]
 	push af
 	push hl
-	ld a,$AF
+	ld a,ANIM_AF
 	ld [hli],a
 	ld [hl],b
 	callab StatModifierUpEffect
diff --git a/engine/battle/trainer_pic_money_pointers.asm b/engine/battle/trainer_pic_money_pointers.asm
index 3d32eb00..3f684db3 100644..100755
--- a/engine/battle/trainer_pic_money_pointers.asm
+++ b/engine/battle/trainer_pic_money_pointers.asm
@@ -140,4 +140,4 @@ TrainerPicAndMoneyPointers: ; 39914 (e:5914)
 	money 9900
 
 	dw LancePic
-	money 9900
\ No newline at end of file
+	money 9900
diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm
index 03119b90..61b318b9 100644
--- a/engine/battle/wild_encounters.asm
+++ b/engine/battle/wild_encounters.asm
@@ -23,7 +23,7 @@ TryDoWildEncounter: ; 13870 (4:7870)
 	jr z, .lastRepelStep
 	ld [wRepelRemainingSteps], a
 .asm_1389e
-; determine if wild pokémon can appear in the half-block we’re standing in	
+; determine if wild pokemon can appear in the half-block we're standing in	
 ; is the bottom right tile (9,9) of the half-block we're standing in a grass/water tile?
 	hlCoord 9, 9
 	ld c, [hl]
@@ -35,9 +35,9 @@ TryDoWildEncounter: ; 13870 (4:7870)
 	cp c
 	ld a, [W_WATERRATE]
 	jr z, .CanEncounter
-; even if not in grass/water, standing anywhere we can encounter pokémon
-; so long as the map is “indoor” and has wild pokémon defined.
-; …as long as it’s not Viridian Forest or Safari Zone.
+; even if not in grass/water, standing anywhere we can encounter pokemon
+; so long as the map is "indoor" and has wild pokemon defined.
+; ...as long as it's not Viridian Forest or Safari Zone.
 	ld a, [W_CURMAP]
 	cp REDS_HOUSE_1F ; is this an indoor map?
 	jr c, .CantEncounter2
@@ -61,7 +61,7 @@ TryDoWildEncounter: ; 13870 (4:7870)
 	inc hl
 	jr .determineEncounterSlot
 .gotEncounterSlot
-; determine which wild pokémon (grass or water) can appear in the half-block we’re standing in
+; determine which wild pokemon (grass or water) can appear in the half-block we're standing in
 	ld c, [hl]
 	ld hl, W_GRASSMONS
 	aCoord 8, 9