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

1 files changed, 1 insertions, 0 deletions

diff --git a/macros.asm b/macros.asm
index 1a7aae56..a241672b 100644
--- a/macros.asm
+++ b/macros.asm
@@ -75,6 +75,7 @@ callsb: MACRO
 	ld a, BANK(\1)
 	call BankswitchCommon
 	call \1
+	ENDM
 	
 callba: MACRO
 	ld b, BANK(\1)