Fix a lot of bugs

17 files changed, 40 insertions, 25 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 b51d19b1..38aa9878 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]
diff --git a/home.asm b/home.asm
index f66a098a..8a182831 100644
--- a/home.asm
+++ b/home.asm
@@ -165,7 +165,7 @@ Joypad:: ; 01b9
 ReadJoypad:: ; 01c8 (0:01c8)
 	homecall_jump ReadJoypad_
 	
-INCLUDE "data/map_header_pointers.asm"
+;INCLUDE "data/map_header_pointers.asm"
 INCLUDE "home/overworld.asm"
 
 
diff --git a/home/copy2.asm b/home/copy2.asm
index 318ed882..ad82260a 100644
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -14,11 +14,11 @@ FarCopyDataDouble:: ; 15d4 (0:15d4)
 	ld e,a
 	ld a,b
 	and a
-	jr z,.8bitcopyamount
+	jr z,.eightbitcopyamount
 	ld a,c
 	and a ; multiple of $100
 	jr z, .expandloop ; if so, do not increment b because the first instance of dec c results in underflow
-.8bitcopyamount
+.eightbitcopyamount
 	inc b
 .expandloop
 	ld a,[de]
@@ -134,13 +134,13 @@ FillMemory:: ; 166e (0:166e)
 	push af
 	ld a,b
 	and a
-	jr z, .8bitcopyamount
+	jr z, .eightbitcopyamount
 	ld a,c
 	and a
-	jr z, .mulitpleof$100
-.8bitcopyamount
+	jr z, .mulitpleof0x100
+.eightbitcopyamount
 	inc b
-.multipleof$100
+.mulitpleof0x100
 	pop af
 .loop
 	ld [hli],a
diff --git a/home/overworld.asm b/home/overworld.asm
index b3008903..a0d52843 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -292,7 +292,7 @@ OverworldLoopLessDelay:: ; 0245 (0:0245)
 	ld c,$0a
 	call DelayFrames
 	jp EnterMap
-;.allPokemonFainted
+.allPokemonFainted
 ;	ld a,$ff
 ;	ld [W_ISINBATTLE],a
 ;	call RunMapScript
@@ -638,7 +638,7 @@ CheckMapConnections:: ; 05db (0:05db)
 	ld [wCurrentTileBlockMapViewPointer + 1],a
 .loadNewMap ; 06ce (0:06ce)
 ; load the connected map that was entered
-	ld hl,[wd430]
+	ld hl,wd430
 	set 4,[hl]
 	ld a,$2
 	ld [wd431],a
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)
diff --git a/main.asm b/main.asm
index 96b22a64..b1e295e1 100755
--- a/main.asm
+++ b/main.asm
@@ -19,7 +19,7 @@ SECTION "bank1",ROMX,BANK[$1]
 
 INCLUDE "data/facing.asm"
 
-ResetStatusAndHalveMoneyOnBlackout::
+;ResetStatusAndHalveMoneyOnBlackout::
 ; Reset player status on blackout.
 	xor a
 	ld [wBattleResult], a
@@ -2032,9 +2032,9 @@ SECTION "bank3",ROMX,BANK[$3]
 
 INCLUDE "engine/joypad.asm"
 
-INCLUDE "data/map_songs.asm"
+;INCLUDE "data/map_songs.asm"
 
-INCLUDE "data/map_header_banks.asm"
+;INCLUDE "data/map_header_banks.asm"
 
 ClearVariablesAfterLoadingMapData: ; c335 (3:4335)
 	ld a, $90
@@ -4858,7 +4858,7 @@ INCLUDE "data/mapHeaders/fuchsiacity.asm"
 INCLUDE "data/mapObjects/fuchsiacity.asm"
 FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk"
 
-INCLUDE "engine/play_time.asm"
+INCLUDE "home/play_time.asm"
 
 INCLUDE "scripts/pallettown.asm"
 INCLUDE "scripts/viridiancity.asm"
@@ -6671,14 +6671,14 @@ INCLUDE "engine/items/tm_prices.asm"
 
 SECTION "bank3c",ROMX,BANK[$3C]
 
-INCLUDE "yellow/bank3c/main.asm"
+INCLUDE "engine/bank3c/main.asm"
 
 SECTION "bank3d",ROMX,BANK[$3D]
 
-INCLUDE "yellow/bank3d/random.asm"
+INCLUDE "engine/bank3d/random.asm"
 
 SECTION "bank3e",ROMX,BANK[$3E]
 
 SECTION "bank3f",ROMX,BANK[$3F]
 
-INCLUDE "yellow/bank3f/main.asm"
\ No newline at end of file
+INCLUDE "engine/bank3f/main.asm"
\ No newline at end of file
diff --git a/wram.asm b/wram.asm
index f498297a..9ceb454a 100755
--- a/wram.asm
+++ b/wram.asm
@@ -1634,13 +1634,19 @@ wDestinationWarpID:: ; d42f
 wd430:: ds 1 ; d430
 wd431:: ds 1 ; d431
 
-	ds 3
+	ds 2
 
+wd434:: ds 1
 wd435:: ds 1
 wd436:: ds 1
 
-	ds 60
-	
+	ds 19
+
+wd44a:: ds 1
+wd44b:: ds 1
+
+	ds 39
+
 wd472:: ds 1
 wd473:: ds 1
 
diff --git a/yellow/audio.asm b/yellow/audio.asm
new file mode 100755
index 00000000..e94c7db5
--- /dev/null
+++ b/yellow/audio.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "audio.asm"
diff --git a/yellow/main.asm b/yellow/main.asm
new file mode 100755
index 00000000..36c88720
--- /dev/null
+++ b/yellow/main.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "main.asm"
diff --git a/yellow/text.asm b/yellow/text.asm
new file mode 100755
index 00000000..a84a633d
--- /dev/null
+++ b/yellow/text.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "text.asm"
diff --git a/yellow/wram.asm b/yellow/wram.asm
new file mode 100755
index 00000000..c0b7f781
--- /dev/null
+++ b/yellow/wram.asm
@@ -0,0 +1,2 @@
+INCLUDE "yellow.asm"
+INCLUDE "wram.asm"