Attempt to make Yellow buildable, part 6.

10 files changed, 191 insertions, 155 deletions

diff --git a/engine/bank3c/main.asm b/engine/bank3c/main.asm
index c2cf770e..026c7d48 100644
--- a/engine/bank3c/main.asm
+++ b/engine/bank3c/main.asm
@@ -1,4 +1,5 @@
 ;INCLUDE "engine/bank3c/overworld.asm"
+Func_f0000:: ; f0000 (3c:4000)
 	dr $f0000,$f010c
 _AdvancePlayerSprite:: ; f010c (3c:410c)
 	dr $f010c,$f0274
diff --git a/engine/bank3f/main.asm b/engine/bank3f/main.asm
index b1bd6e55..b0d3a808 100644
--- a/engine/bank3f/main.asm
+++ b/engine/bank3f/main.asm
@@ -302,7 +302,9 @@ Func_fce18:: ; fce18 (3f:4e18)
 Func_fcf0c:: ; fcf0c (3f:4f0c)
 	dr $fcf0c,$fd004
 Func_fd004:: ; fd004 (3f:5004)
-	dr $fd004,$fd2a1
+	dr $fd004,$fd0d0
+Func_fd0d0:: ; fd0d0 (3f:50d0)
+	dr $fd0d0,$fd2a1
 Func_fd2a1:: ; fd2a1 (3f:52a1)
 	dr $fd2a1,$fe66f
 
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm
index d3200beb..e1fbedc2 100644
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@@ -76,7 +76,7 @@ PrintBeginningBattleText: ; f4000 (3d:4000)
 	ld [wc0f1], a
 	ld a, $80
 	ld [wc0f2], a
-	ld a, (SFX_08_77 - SFX_Headers_08) / 3
+	ld a, $e9 ; (SFX_08_77 - SFX_Headers_08) / 3
 	call PlaySound
 	jp WaitForSoundToFinish
 .done
diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm
index 10765ced..b3854b7b 100755
--- a/engine/gamefreak.asm
+++ b/engine/gamefreak.asm
@@ -5,7 +5,7 @@ LoadShootingStarGraphics: ; 70000 (1c:4000)
 	ld [rOBP1], a ; $ff49
 	call Func_3040
 	call Func_3061
-	ld de, AnimationTileset2 + $30 ; $471e ; star tile (top left quadrant)
+	ld de, AnimationTileset2 + $30 ; $4757 ; star tile (top left quadrant)
 	ld hl, vChars1 + $200
 	ld bc, (BANK(AnimationTileset2) << 8) + $01
 	call CopyVideoData
@@ -28,7 +28,7 @@ LoadShootingStarGraphics: ; 70000 (1c:4000)
 
 AnimateShootingStar: ; 7004a (1c:404a)
 	call LoadShootingStarGraphics
-	ld a, (SFX_1f_67 - SFX_Headers_1f) / 3
+	ld a, $c2 ; (SFX_1f_67 - SFX_Headers_1f) / 3
 	call PlaySound
 	ld hl, wOAMBuffer
 	ld bc, $a004
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index 9481afab..8c7ca55f 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -33,8 +33,8 @@ AnimateHallOfFame: ; 701c6 (1c:41c6)
 .asm_70211
 	ld a, $90
 	ld [hWY], a
-	ld c, BANK(Music_HallOfFame)
-	ld a, MUSIC_HALL_OF_FAME
+	ld c, $1f ; BANK(Music_HallOfFame)
+	ld a, $ca ; MUSIC_HALL_OF_FAME
 	call PlayMusic
 	ld hl, wPartySpecies
 	ld c, $ff
@@ -254,9 +254,9 @@ Func_703d1: ; 703d1 (1c:43d1)
 	ld c, $a3
 	call PrintBCDNumber
 	ld hl, DexSeenOwnedText
-	call Func_703e2
+	call Func_7043a
 	ld hl, DexRatingText
-	call Func_703e2
+	call Func_7043a
 	ld hl, wcc5d
 
 Func_7043a: ; 7043a (1c:443a)
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index 09abf779..eb23c80c 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -29,7 +29,7 @@ AnimateHealingMachine: ; 7048b (1c:448b)
 	ld b, a
 .asm_704c4
 	call Func_7055a
-	ld a, (SFX_02_4a - SFX_Headers_02) / 3
+	ld a, $9e ; (SFX_02_4a - SFX_Headers_02) / 3
 	call PlaySound
 	ld c, $1e
 	call DelayFrames
@@ -41,17 +41,17 @@ AnimateHealingMachine: ; 7048b (1c:448b)
 	jr nz, .asm_704e6
 	call StopAllMusic
 	call PlaySound
-	ld a, BANK(Music_PkmnHealed)
+	ld a, $2 ; BANK(Music_PkmnHealed)
 	ld [wc0ef], a
 .asm_704e6
-	ld a, MUSIC_PKMN_HEALED
+	ld a, $e8 ; MUSIC_PKMN_HEALED
 	ld [wc0ee], a
 	call PlaySound
 	ld d, $28
 	call FlashSprite8Times
 .asm_704f3
 	ld a, [wc026]
-	cp MUSIC_PKMN_HEALED
+	cp $e8 ; MUSIC_PKMN_HEALED
 	jr z, .asm_704f3
 	ld c, $20
 	call DelayFrames
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index bd0a52b5..43d3ec9c 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -9,7 +9,7 @@ EnterMapAnim: ; 70567 (1c:4567)
 	bit 7, [hl] ; used fly out of battle?
 	res 7, [hl]
 	jr nz, .flyAnimation
-	ld a, (SFX_02_4c - SFX_Headers_02) / 3
+	ld a, $a0 ; (SFX_02_4c - SFX_Headers_02) / 3
 	call PlaySound
 	ld hl, wd732
 	bit 4, [hl] ; used dungeon warp?
@@ -17,7 +17,7 @@ EnterMapAnim: ; 70567 (1c:4567)
 	;res 4, [hl]
 	jr nz, .dungeonWarpAnimation
 	call PlayerSpinWhileMovingDown
-	ld a, (SFX_02_4f - SFX_Headers_02) / 3
+	ld a, $a3 ; (SFX_02_4f - SFX_Headers_02) / 3
 	call PlaySound
 	call IsPlayerStandingOnWarpPadOrHole
 	ld a, b
@@ -55,7 +55,7 @@ EnterMapAnim: ; 70567 (1c:4567)
 	;ld bc, (BANK(BirdSprite) << 8) + $0c
 	;call CopyVideoData
 	call LoadBirdSpriteGraphics
-	ld a, (SFX_02_50 - SFX_Headers_02) / 3
+	ld a, $a4 ; (SFX_02_50 - SFX_Headers_02) / 3
 	call PlaySound
 	ld hl, wFlyAnimUsingCoordList
 	xor a ; is using coord list
@@ -107,7 +107,7 @@ _LeaveMapAnim: ; 70615 (1c:4615)
 	dec a
 	jp nz, LeaveMapThroughHoleAnim
 .spinWhileMovingUp
-	ld a, (SFX_02_4b - SFX_Headers_02) / 3
+	ld a, $9f ; (SFX_02_4b - SFX_Headers_02) / 3
 	call PlaySound
 	ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	ld a, -$10
@@ -141,7 +141,7 @@ _LeaveMapAnim: ; 70615 (1c:4615)
 	ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta
 	xor a
 	ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue
-	ld [hl], (SFX_02_4d - SFX_Headers_02) / 3 ; wPlayerSpinInPlaceAnimSoundID
+	ld [hl], $a1 ; (SFX_02_4d - SFX_Headers_02) / 3 ; wPlayerSpinInPlaceAnimSoundID
 	ld hl, wcd48
 	call PlayerSpinInPlace
 	jr .spinWhileMovingUp
@@ -154,7 +154,7 @@ _LeaveMapAnim: ; 70615 (1c:4615)
 	ld [hli], a ; wFlyAnimCounter
 	ld [hl], $c ; wFlyAnimBirdSpriteImageIndex
 	call DoFlyAnimation
-	ld a, (SFX_02_50 - SFX_Headers_02) / 3
+	ld a, $a4 ; (SFX_02_50 - SFX_Headers_02) / 3
 	call PlaySound
 	ld hl, wFlyAnimUsingCoordList
 	xor a ; is using coord list
@@ -452,7 +452,7 @@ Func_70816: ; 70816 (1c:4816)
 	call LoadFontTilePatterns
 	ret
 
-Func_70842: ; 708a3 (1c:48a3)
+Func_708a3: ; 708a3 (1c:48a3)
 	ld a, [hl]
 	xor $1
 	ld [hl], a
diff --git a/engine/palettes.asm b/engine/palettes.asm
index 4c2ac3b2..0624b61f 100755
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -220,7 +220,7 @@ BuildTrainerCardPalPacket: ; 72025 (1c:6025)
 	ld de, wcc5b
 	ld bc, $40
 	call CopyData
-	ld de, LoopCounts_71f8f
+	ld de, LoopCounts_7208b
 	ld hl, wcc5d
 	ld a, [W_OBTAINEDBADGES]
 	ld c, $8
@@ -255,7 +255,7 @@ BuildTrainerCardPalPacket: ; 72025 (1c:6025)
 
 SendUnknownPalPacket_7205d:: ; 7205d (1c:605d)
 	ld hl,UnknownPalPacket_72811
-	ld de,UnknownPacket_72611
+	ld de,BlkPacket_WholeScreen
 	ret
 	
 SendUnknownPalPacket_72064:: ; 72064 (1c:6064)
@@ -311,19 +311,19 @@ Func_720ad:: ; 720ad (1c:60ad)
 	ld a,e
 	and a
 	jr nz,Func_720bd
-	ld hl,Pointer_727e1
+	ld hl,PalPacket_Generic
 	ld a,[hGBC]
 	and a
 	jp z,Func_721b4
 	jp Func_72346
 
 Func_720bd:: ; 720bd (1c:60bd)
-	ld hl,Func_72811
+	ld hl,UnknownPalPacket_72811
 	ld a,[hGBC]
 	and a
 	jp z,Func_721b4
 	call Func_72346
-	ld hl,Pointer_727e1
+	ld hl,PalPacket_Generic
 	inc hl
 	ld a,[hli]
 	call Func_723fe
@@ -338,7 +338,7 @@ Func_720bd:: ; 720bd (1c:60bd)
 	ret
 	
 Func_720e3:: ; 720e3 (1c:60e3)
-	ld hl,Pointer_72761
+	ld hl,PalPacket_Empty
 	ld de,wcf2d
 	ld bc,$10
 	call CopyData
@@ -357,7 +357,7 @@ Func_720e3:: ; 720e3 (1c:60e3)
 .asm_72109
 	call Func_72346
 .asm_7210c
-	ld hl,UnknownPacket_72611
+	ld hl,BlkPacket_WholeScreen
 	ld de,wcf2d
 	ld bc,$10
 	call CopyData
@@ -433,7 +433,7 @@ SendBlkPacket_PartyMenu: ; 7217f (1c:617f)
 	ld bc, $30
 	jp CopyData
 
-Func_71fc2: ; 7218b (1c:618b)
+Func_7218b: ; 7218b (1c:618b)
 	ld hl, wcf1f
 	ld a, [wcf2d]
 	ld e, a
@@ -569,7 +569,7 @@ LoadSGB: ; 721f8 (1c:61f8)
 	jp SendSGBPacket
 
 Func_72247: ; 72247 (1c:6247)
-	ld hl, PointerTable_72089
+	ld hl, PointerTable_7225b
 	ld c, $9
 .loop
 	push bc
@@ -587,14 +587,14 @@ Func_72247: ; 72247 (1c:6247)
 
 PointerTable_7225b: ; 7225b (1c:625b)
 	dw MaskEnFreezePacket
-	dw DataSnd_72548
-	dw DataSnd_72558
-	dw DataSnd_72568
-	dw DataSnd_72578
-	dw DataSnd_72588
-	dw DataSnd_72598
-	dw DataSnd_725a8
-	dw DataSnd_725b8
+	dw DataSnd_728a1
+	dw DataSnd_728b1
+	dw DataSnd_728c1
+	dw DataSnd_728d1
+	dw DataSnd_728e1
+	dw DataSnd_728f1
+	dw DataSnd_72901
+	dw DataSnd_72911
 
 CheckSGB: ; 7226d (1c:626d)
 	ld hl, MltReq2Packet
@@ -725,7 +725,7 @@ Func_72346: ; 72346 (1c:6346)
 	ld a,[hl]
 	and $f8
 	cp $20
-	jp z,Func_7265e
+	jp z,Func_725be
 	inc hl
 	ld a,[hli]
 	inc hl
@@ -1133,12 +1133,37 @@ Func_725be:: ; 725be (1c:65be)
 .asm_725d9
 	callba Func_bf450 ; 2f:7250
 	ret
+
+Pointer_725e2:: ; 725e2 (1c:65e2)	
+	db $0c,$11,$66,$21,$66,$41,$66,$51,$61,$81,$1a,$66,$2d
+	db $cf,$5b,$cc,$31,$67,$2c,$cf,$51,$67
 	
-	dr $725e2,$734b9
-;INCLUDE "data/sgb_packets.asm"
+Func_725fb: ; 725fb (1c:65fb)
+	ld b, $80
+.loop
+	ld c, $10
+.asm_725ff
+	ld a, [hli]
+	ld [de], a
+	inc de
+	dec c
+	jr nz, .asm_725ff
+	ld c, $10
+	xor a
+.asm_72608
+	ld [de], a
+	inc de
+	dec c
+	jr nz, .asm_72608
+	dec b
+	jr nz, .loop
+	ret
+
+	;dr $725e2,$734b9
+INCLUDE "data/sgb_packets.asm"
 
-;INCLUDE "data/mon_palettes.asm"
+INCLUDE "data/mon_palettes.asm"
 
-;INCLUDE "data/super_palettes.asm"
+INCLUDE "data/super_palettes.asm"
 
-;INCLUDE "data/sgb_border.asm"
\ No newline at end of file
+INCLUDE "data/sgb_border.asm"
\ No newline at end of file
diff --git a/engine/predefs.asm b/engine/predefs.asm
index 30099dfe..859d4aec 100755
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -52,102 +52,107 @@ GetPredefPointer: ; f67ed (3d:67ed)
 PredefPointers:: ; f681d (3d:681d)
 ; these are pointers to ASM routines.
 ; they appear to be used in overworld map scripts.
-	add_predef DrawPlayerHUDAndHPBar
-	add_predef Func_3f0c6
-	add_predef Func_3f073
-	add_predef ScaleSpriteByTwo
-	add_predef LoadMonBackPic
-	add_predef Func_79aba
-	add_predef LoadMissableObjects
-	add_predef HealParty
-	add_predef MoveAnimation; 08 play move animation
-	add_predef DivideBCDPredef
-	add_predef DivideBCDPredef2
-	add_predef AddBCDPredef
-	add_predef SubBCDPredef
-	add_predef DivideBCDPredef3
-	add_predef DivideBCDPredef4
-	add_predef InitPlayerData
-	add_predef FlagActionPredef
-	add_predef HideObject
-	add_predef IsObjectHidden
-	add_predef ApplyOutOfBattlePoisonDamage
-	add_predef AnyPartyAlive
-	add_predef ShowObject
-	add_predef ShowObject2
-	add_predef ReplaceTileBlock
-	add_predef InitPlayerData2
-	add_predef LoadTilesetHeader
-	add_predef LearnMoveFromLevelUp
-	add_predef LearnMove
-	add_predef IsItemInBag_
-	dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0
-	dbw $03,GiveItem
-	add_predef ChangeBGPalColor0_4Frames
-	add_predef FindPathToPlayer
-	add_predef Func_480ff
-	add_predef CalcPositionOfPlayerRelativeToNPC
-	add_predef ConvertNPCMovementDirectionsToJoypadMasks
-	add_predef Func_48125
-	add_predef UpdateHPBar
-	add_predef HPBarLength
-	add_predef Diploma_TextBoxBorder
-	add_predef DoubleOrHalveSelectedStats
-	add_predef ShowPokedexMenu
-	add_predef EvolutionAfterBattle
-	add_predef SaveSAVtoSRAM0
-	add_predef InitOpponent
-	add_predef CableClub_Run
-	add_predef DrawBadges
-	add_predef ExternalClockTradeAnim
-	add_predef BattleTransition
-	add_predef CopyTileIDsFromList
-	add_predef PlayIntro
-	add_predef Func_79869
-	add_predef FlashScreen
+	dr $f681d,$f68a1
+	;add_predef DrawPlayerHUDAndHPBar
+	;add_predef Func_3f0c6
+	;add_predef Func_3f073
+	;add_predef ScaleSpriteByTwo
+	;add_predef LoadMonBackPic
+	;add_predef Func_79aba
+	;add_predef LoadMissableObjects
+	;add_predef HealParty
+	;add_predef MoveAnimation; 08 play move animation
+	;add_predef DivideBCDPredef
+	;add_predef DivideBCDPredef2
+	;add_predef AddBCDPredef
+	;add_predef SubBCDPredef
+	;add_predef DivideBCDPredef3
+	;add_predef DivideBCDPredef4
+	;add_predef InitPlayerData
+	;add_predef FlagActionPredef
+	;add_predef HideObject
+	;add_predef IsObjectHidden
+	;add_predef ApplyOutOfBattlePoisonDamage
+	;add_predef AnyPartyAlive
+	;add_predef ShowObject
+	;add_predef ShowObject2
+	;add_predef ReplaceTileBlock
+	;add_predef InitPlayerData2
+	;add_predef LoadTilesetHeader
+	;add_predef LearnMoveFromLevelUp
+	;add_predef LearnMove
+	;add_predef IsItemInBag_
+	;dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0
+	;dbw $03,GiveItem
+	;add_predef ChangeBGPalColor0_4Frames
+	;add_predef FindPathToPlayer
+	;add_predef Func_480ff
+	;add_predef CalcPositionOfPlayerRelativeToNPC
+	;add_predef ConvertNPCMovementDirectionsToJoypadMasks
+	;add_predef Func_48125
+	;add_predef UpdateHPBar
+	;add_predef HPBarLength
+	;add_predef Diploma_TextBoxBorder
+	;add_predef DoubleOrHalveSelectedStats
+	;add_predef ShowPokedexMenu
+	;add_predef EvolutionAfterBattle
+	;add_predef SaveSAVtoSRAM0
+	;add_predef InitOpponent
+CableClub_RunPredef::
+	dr $f68a1,$f68b9
+	;add_predef CableClub_Run
+	;add_predef DrawBadges
+	;add_predef ExternalClockTradeAnim
+	;add_predef BattleTransition
+	;add_predef CopyTileIDsFromList
+	;add_predef PlayIntro
+	;add_predef Func_79869
+	;add_predef FlashScreen
 	add_predef GetTileAndCoordsInFrontOfPlayer
-	add_predef StatusScreen
-	add_predef StatusScreen2
-	add_predef InternalClockTradeAnim
-	add_predef TrainerEngage
-	add_predef IndexToPokedex
-	add_predef Predef3B; 3B display pic?
-	add_predef UsedCut
-	add_predef ShowPokedexData
-	add_predef WriteMonMoves
-	add_predef SaveSAV
-	add_predef LoadSGB
-	add_predef MarkTownVisitedAndLoadMissableObjects
-	add_predef SetPartyMonTypes
-	add_predef CanLearnTM
-	add_predef TMToMove
+	dr $f68bc,$f68e9
+	;add_predef StatusScreen
+	;add_predef StatusScreen2
+	;add_predef InternalClockTradeAnim
+	;add_predef TrainerEngage
+	;add_predef IndexToPokedex
+	;add_predef Predef3B; 3B display pic?
+	;add_predef UsedCut
+	;add_predef ShowPokedexData
+	;add_predef WriteMonMoves
+	;add_predef SaveSAV
+	;add_predef LoadSGB
+	;add_predef MarkTownVisitedAndLoadMissableObjects
+	;add_predef SetPartyMonTypes
+	;add_predef CanLearnTM
+	;add_predef TMToMove
 	add_predef Func_71ddf
-	add_predef StarterDex ; 46
-	add_predef _AddPartyMon
-	add_predef UpdateHPBar2
-	add_predef DrawEnemyHUDAndHPBar
-	add_predef LoadTownMap_Nest
-	add_predef PrintMonType
-	add_predef EmotionBubble; 4C player exclamation
-	add_predef EmptyFunc3; return immediately
-	add_predef AskName
-	add_predef PewterGuys
-	add_predef SaveSAVtoSRAM2
-	add_predef LoadSAVCheckSum2
-	add_predef LoadSAV
-	add_predef SaveSAVtoSRAM1
-	add_predef DoInGameTradeDialogue ; 54 initiate trade
-	add_predef HallOfFamePC
-	add_predef DisplayDexRating
-	dbw $1E, _LeaveMapAnim ; wrong bank
-	dbw $1E, EnterMapAnim ; wrong bank
-	add_predef GetTileTwoStepsInFrontOfPlayer
-	add_predef CheckForCollisionWhenPushingBoulder
-	add_predef PrintStrengthTxt
-	add_predef PickupItem
-	add_predef PrintMoveType
-	add_predef LoadMovePPs
-	add_predef DrawHP ; 5F
-	add_predef DrawHP2
-	add_predef Func_1c9c6
-	add_predef OaksAideScript
+	dr $f68e9,$f8000
+	;add_predef StarterDex ; 46
+	;add_predef _AddPartyMon
+	;add_predef UpdateHPBar2
+	;add_predef DrawEnemyHUDAndHPBar
+	;add_predef LoadTownMap_Nest
+	;add_predef PrintMonType
+	;add_predef EmotionBubble; 4C player exclamation
+	;add_predef EmptyFunc3; return immediately
+	;add_predef AskName
+	;add_predef PewterGuys
+	;add_predef SaveSAVtoSRAM2
+	;add_predef LoadSAVCheckSum2
+	;add_predef LoadSAV
+	;add_predef SaveSAVtoSRAM1
+	;add_predef DoInGameTradeDialogue ; 54 initiate trade
+	;add_predef HallOfFamePC
+	;add_predef DisplayDexRating
+	;dbw $1E, _LeaveMapAnim ; wrong bank
+	;dbw $1E, EnterMapAnim ; wrong bank
+	;add_predef GetTileTwoStepsInFrontOfPlayer
+	;add_predef CheckForCollisionWhenPushingBoulder
+	;add_predef PrintStrengthTxt
+	;add_predef PickupItem
+	;add_predef PrintMoveType
+	;add_predef LoadMovePPs
+	;add_predef DrawHP ; 5F
+	;add_predef DrawHP2
+	;add_predef Func_1c9c6
+	;add_predef OaksAideScript
diff --git a/engine/town_map.asm b/engine/town_map.asm
index 48e79d14..6b12c04b 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -40,7 +40,7 @@ Func_70ef4: ; 70ef4 (1c:4ef4)
 
 Func_70f08: ; 70f08 (1c:4f08)
 	ld de, wHPBarMaxHP
-	call Func_712f1
+	call Func_7137a
 	ld a, [de]
 	push hl
 	call Func_712e1
@@ -70,7 +70,7 @@ Func_70f08: ; 70f08 (1c:4f08)
 	ld b, a
 	and D_DOWN | D_UP | B_BUTTON | A_BUTTON
 	jr z, .asm_70f3e
-	ld a, (SFX_02_3c - SFX_Headers_02) / 3
+	ld a, $8c ; (SFX_02_3c - SFX_Headers_02) / 3
 	call PlaySound
 	bit 6, b
 	jr nz, .asm_70f68
@@ -107,7 +107,7 @@ Func_70f08: ; 70f08 (1c:4f08)
 	ld a,[hJoy5]
 	and D_DOWN | D_UP | B_BUTTON | A_BUTTON
 	ret z
-	callab Func_f4000
+	callab PrintBeginningBattleText
 	ret
 	
 INCLUDE "data/town_map_order.asm"
@@ -204,7 +204,7 @@ LoadTownMap_Fly: ; 71014 (1c:5014)
 	jr z, .asm_7108d
 	bit 0, b
 	jr nz, .asm_710af
-	ld a, (SFX_02_3c - SFX_Headers_02) / 3
+	ld a, $8c ; (SFX_02_3c - SFX_Headers_02) / 3
 	call PlaySound
 	bit 6, b
 	jr nz, .asm_710cd
@@ -212,7 +212,7 @@ LoadTownMap_Fly: ; 71014 (1c:5014)
 	jr nz, .asm_710e3
 	jr .asm_710c0
 .asm_710af
-	ld a, (SFX_02_3e - SFX_Headers_02) / 3
+	ld a, $8e ; (SFX_02_3e - SFX_Headers_02) / 3
 	call PlaySound
 	ld a, [hl]
 	ld [wDestinationMap], a
@@ -296,7 +296,7 @@ LoadTownMap: ; 71126 (1c:5126)
 	ld de, vChars2 + $600
 	ld bc, $100
 	ld a, BANK(WorldMapTileGraphics)
-	call FarCopyData2
+	call FarCopyData
 	ld hl, MonNestIcon ; $574b
 	ld de, vSprites + $40
 	ld bc, $8
@@ -348,13 +348,13 @@ Func_71235: ; 71235 (1c:5235)
 	call UpdateSprites
 	jp GoPAL_SET_CF1C
 
-Func_711c4: ; 7124e (1c:524e)
+Func_7124e: ; 7124e (1c:524e)
 	push af
 	ld a, b
 	ld [wcd5b], a
 	pop af
 	ld de, wHPBarMaxHP
-	call Func_712f1
+	call Func_7137a
 	ld a, [de]
 	push hl
 	call Func_712e1
@@ -372,7 +372,7 @@ Func_711c4: ; 7124e (1c:524e)
 	ld bc, $a0
 	jp CopyData
 
-Func_71279: ; 711ef (1c:51ef)
+Func_71279: ; 71279 (1c:5279)
 	callba FindWildLocationsOfMon
 	call Func_71362
 	ld hl, wOAMBuffer
@@ -553,7 +553,7 @@ Func_7137a: ; 7137a (1c:537a)
 	cp REDS_HOUSE_1F
 	jr c, .asm_7138d
 	ld bc, $4
-	ld hl, InternalMapEntries ; $5382
+	ld hl, InternalMapEntries ; $540b
 .asm_71384
 	cp [hl]
 	jr c, .asm_7138a
@@ -563,7 +563,7 @@ Func_7137a: ; 7137a (1c:537a)
 	inc hl
 	jr .asm_71384
 .asm_7138d
-	ld hl, ExternalMapEntries ; $5313
+	ld hl, ExternalMapEntries ; $539c
 	ld c, a
 	ld b, $0
 	add hl, bc
@@ -576,15 +576,18 @@ Func_7137a: ; 7137a (1c:537a)
 	ld h, [hl]
 	ld l, a
 	ret
-
-INCBIN "baserom.gbc",$7139c,$71753 - $7139c
-
+	
+ExternalMapEntries: ; 7139c (1c:539c)
+	dr $7139c,$7140b
+InternalMapEntries: ; 7140b (1c:540b)
+	dr $7140b,$7174b
+	
 ;INCLUDE "data/town_map_entries.asm"
 
 ;INCLUDE "text/map_names.asm" ; TODO: relabel addresses
 
-;MonNestIcon: ; 716be (1c:56be) ; relabel this too
-;	INCBIN "gfx/mon_nest_icon.1bpp"
+MonNestIcon: ; 7174b (1c:574b) ; relabel this too
+	INCBIN "gfx/mon_nest_icon.1bpp"
 
 TownMapSpriteBlinkingAnimation: ; 71753 (1c:5753)
 	ld a, [wTownMapSpriteBlinkingCounter]