Another chunk of bank 3c

2 files changed, 115 insertions, 2 deletions

diff --git a/home/overworld.asm b/home/overworld.asm
index 1f84597d..3a9708d9 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -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,wPikachuOverworldStateFlags
 	set 4,[hl]
 	ld a,$2
 	ld [wd431],a
@@ -1716,7 +1716,7 @@ CollisionCheckOnWater:: ; 0cca (0:0cca)
 .stopSurfing ; based game freak
 	ld a,$3
 	ld [wd431],a
-	ld hl,wd430
+	ld hl,wPikachuOverworldStateFlags
 	set 5,[hl]
 	xor a
 	ld [wWalkBikeSurfState],a
diff --git a/home/pikachu.asm b/home/pikachu.asm
new file mode 100755
index 00000000..5239873c
--- /dev/null
+++ b/home/pikachu.asm
@@ -0,0 +1,113 @@
+Func_1510:: ; 1510 (0:1510)
+	push hl
+	ld hl, wPikachuOverworldStateFlags
+	set 7, [hl]
+	ld hl, wSpriteStateData1 + $f2 ; pikachu data?
+	ld [hl], $ff
+	pop hl
+	ret
+
+Func_151d:: ; 151d (0:151d)
+	push hl
+	ld hl, wPikachuOverworldStateFlags
+	res 7, [hl]
+	pop hl
+	ret
+
+Func_1525:: ; 1525 (0:1525)
+	push hl
+	ld hl, wPikachuOverworldStateFlags
+	res 3, [hl]
+	pop hl
+	ret
+	
+Func_152d:: ; 152d (0:152d)
+	push hl
+	ld hl, wPikachuOverworldStateFlags
+	set 3, [hl]
+	ld hl, wSpriteStateData1 + $f2 ; pikachu data?
+	ld [hl], $ff
+	pop hl
+	ret
+	
+Func_153a:: ; 153a (0:153a)
+	push hl
+	ld hl, wPikachuOverworldStateFlags
+	set 1, [hl]
+	pop hl
+	ret
+
+Func_1542:: ; 1542 (0:1542)
+	push hl
+	ld hl, wPikachuOverworldStateFlags
+	res 1, [hl]
+	pop hl
+	ret
+	
+Func_154a:: ; 154a (0:154a)
+	push hl
+	ld hl, wPikachuOverworldStateFlags
+	bit 1, [hl]
+	pop hl
+	ret
+	
+Func_1552:: ; 1552 (0:1552)
+	ld a, [hl]
+	dec a
+	swap a
+	ld [hTilePlayerStandingOn], a
+	homecall Func_fc6d5 ; 3f:46d5
+	ret
+
+Func_1568:: ; 1568 (0:1568)
+	ld b, $0
+	ld c, a
+.asm_156b
+	inc b
+	ld a, [hli]
+	cp $ff
+	jr z, .asm_1578
+	cp c
+	jr nz, .asm_156b
+	dec b
+	dec hl
+	scf
+	ret
+.asm_1578
+	dec b
+	dec hl
+	and a
+	ret
+	
+Func_157c:: ; 157c (0:157c)
+	push hl
+	push bc
+	ld a, [H_LOADEDROMBANK]
+	push af
+	ld a, [wd44a]
+	call BankswitchCommon
+	ld hl, wd44b
+	ld c, [hl]
+	inc hl
+	ld b, [hl]
+	ld a, [bc]
+	inc bc
+	ld [hl], b
+	dec hl
+	ld [hl], c
+	ld c, a
+	pop af
+	call BankswitchCommon
+	ld a, c
+	pop bc
+	pop hl
+	ret
+
+Func_159b:: ; 159b (0:159b)
+	ld a, [H_LOADEDROMBANK]
+	ld b, a
+	push af
+	callbs Func_fd2a1
+	pop af
+	call BankswitchCommon
+	ret