Merge branch 'master' of github.com:pret/pokeyellow

13 files changed, 103 insertions, 98 deletions

diff --git a/data/hidden_coins.asm b/data/hidden_coins.asm
index e444bf28..c0dc63b1 100755
--- a/data/hidden_coins.asm
+++ b/data/hidden_coins.asm
@@ -1,4 +1,4 @@
-HiddenCoinCoords: ; 76822 (1d:6822)
+HiddenCoinCoords: ; 7608e (1d:608e)
 	db GAME_CORNER,$08,$00
 	db GAME_CORNER,$10,$01
 	db GAME_CORNER,$0b,$03
diff --git a/engine/bank3e.asm b/engine/bank3e.asm
new file mode 100644
index 00000000..af7cc074
--- /dev/null
+++ b/engine/bank3e.asm
@@ -0,0 +1,27 @@
+Func_f8000: ; f8000 (3e:4000)
+	dr $f8000,$f8bcb
+
+Func_f8bcb: ; f8bcb (3e:4bcb)
+	push de
+	callab IsSurfingPikachuInThePlayersParty
+	pop de
+	ret nc
+	callab PlayPikachuSoundClip
+	ret
+
+Func_f8bdf: ; f8bdf (3e:4bdf)
+	dr $f8bdf,$f982d
+PlayIntroScene: ; f982d (3e:582d)
+	dr $f982d,$fa35a
+
+YellowIntroGraphics:  INCBIN "gfx/yellow_intro.2bpp"
+
+Func_fbb5a: ; fbb5a (3e:7b5a)
+	ld hl, wTileMapBackup
+	ld bc, 10 * SCREEN_WIDTH
+	xor a
+	call FillMemory
+	ret
+
+Func_fbb65: ; fbb65 (3e:7b65)
+	dr $fbb65,$fbd76
\ No newline at end of file
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index d07e0b42..52d2ee6e 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -2300,7 +2300,7 @@ ChangeMonPic: ; 798d4 (1e:58d4)
 	ld [wcf91], a
 	ld [wd0b5], a
 	xor a
-	ld [W_SPRITEFLIPPED], a
+	ld [wSpriteFlipped], a
 	call GetMonHeader
 	coord hl, 12, 0
 	call LoadFrontSpriteByMonIndex
diff --git a/engine/battle/bank3d_battle.asm b/engine/battle/bank3d_battle.asm
index b9713cec..7f8854a4 100644
--- a/engine/battle/bank3d_battle.asm
+++ b/engine/battle/bank3d_battle.asm
@@ -237,7 +237,7 @@ CopyUncompressedPicToHL: ; f6203 (3d:6203)
 	ld bc, $707
 	ld de, $14
 	push af
-	ld a, [W_SPRITEFLIPPED]
+	ld a, [wSpriteFlipped]
 	and a
 	jr nz, .asm_f6220
 	pop af
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index 762850f3..d5c8b2f2 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -20,7 +20,7 @@ AnimateHallOfFame: ; 701c6 (1c:41c6)
 	xor a
 	ld [wUpdateSpritesEnabled], a
 	ld [hTilesetType], a
-	ld [W_SPRITEFLIPPED], a
+	ld [wSpriteFlipped], a
 	ld [wLetterPrintingDelayFlags], a ; no delay
 	ld [wHoFMonOrPlayer], a ; mon
 	inc a
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm
index 5b8ae7f0..21ee30b0 100755
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -1,4 +1,4 @@
-PKMNLeaguePC: ; 0x7657e
+PKMNLeaguePC: ; 75dfe (1d:5dfe)
 	ld hl, AccessedHoFPCText
 	call PrintText
 	ld hl, wd730
@@ -10,7 +10,7 @@ PKMNLeaguePC: ; 0x7657e
 	push af
 	xor a
 	ld [hTilesetType], a
-	ld [W_SPRITEFLIPPED], a
+	ld [wSpriteFlipped], a
 	ld [wUpdateSpritesEnabled], a
 	ld [wHoFTeamIndex2], a
 	ld [wHoFTeamNo], a
@@ -50,7 +50,7 @@ PKMNLeaguePC: ; 0x7657e
 	call RunDefaultPaletteCommand
 	jp GBPalNormal
 
-LeaguePCShowTeam: ; 765e5 (1d:65e5)
+LeaguePCShowTeam: ; 75e65 (1d:5e65)
 	ld c, PARTY_LENGTH
 .loop
 	push bc
@@ -77,7 +77,7 @@ LeaguePCShowTeam: ; 765e5 (1d:65e5)
 	scf
 	ret
 
-LeaguePCShowMon: ; 76610 (1d:6610)
+LeaguePCShowMon: ; 75e90 (1d:5e90)
 	call GBPalWhiteOutWithDelay3
 	call ClearScreen
 	ld hl, wHallOfFame
@@ -100,8 +100,7 @@ LeaguePCShowMon: ; 76610 (1d:6610)
 	call LoadFrontSpriteByMonIndex
 	call GBPalNormal
 	coord hl, 0, 13
-	ld b, 2
-	ld c, $12
+	lb bc, 2, 18
 	call TextBoxBorder
 	coord hl, 1, 15
 	ld de, HallOfFameNoText
@@ -110,11 +109,11 @@ LeaguePCShowMon: ; 76610 (1d:6610)
 	ld de, wHoFTeamNo
 	lb bc, 1, 3
 	call PrintNumber
-	jpba HoFDisplayMonInfo
+	jpba Func_7033f
 
-HallOfFameNoText: ; 76670 (1d:6670)
+HallOfFameNoText: ; 75eef (1d:5eef)
 	db "HALL OF FAME No   @"
 
-AccessedHoFPCText: ; 76683 (1d:6683)
+AccessedHoFPCText: ; 75f02 (1d:5f02)
 	TX_FAR _AccessedHoFPCText
 	db "@"
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index 8460889f..74a6aadb 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -1,4 +1,4 @@
-VendingMachineMenu: ; 74ee0 (1d:4ee0)
+VendingMachineMenu: ; 74726 (1d:4726)
 	ld hl, VendingMachineText1
 	call PrintText
 	ld a, MONEY_BOX
@@ -18,8 +18,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
 	ld hl, wd730
 	set 6, [hl]
 	coord hl, 0, 3
-	ld b, 8
-	ld c, 12
+	lb bc, 8, 12
 	call TextBoxBorder
 	call UpdateSprites
 	coord hl, 2, 5
@@ -80,38 +79,38 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
 	ld hl, VendingMachineText7
 	jp PrintText
 
-VendingMachineText1: ; 74f99 (1d:4f99)
+VendingMachineText1: ; 747de (1d:47de)
 	TX_FAR _VendingMachineText1
 	db "@"
 
-DrinkText: ; 74f9e (1d:4f9e)
+DrinkText: ; 747e3 (1d:47e3)
 	db   "FRESH WATER"
 	next "SODA POP"
 	next "LEMONADE"
 	next "CANCEL@"
 
-DrinkPriceText: ; 74fc3 (1d:4fc3)
+DrinkPriceText: ; 74808 (1d:4808)
 	db   "¥200"
 	next "¥300"
 	next "¥350",$4E,"@"
 
-VendingMachineText4: ; 74fd3 (1d:4fd3)
+VendingMachineText4: ; 74818 (1d:4818)
 	TX_FAR _VendingMachineText4
 	db "@"
 
-VendingMachineText5: ; 74fd8 (1d:4fd8)
+VendingMachineText5: ; 7481d (1d:481d)
 	TX_FAR _VendingMachineText5
 	db "@"
 
-VendingMachineText6: ; 74fdd (1d:4fdd)
+VendingMachineText6: ; 74822 (1d:4822)
 	TX_FAR _VendingMachineText6
 	db "@"
 
-VendingMachineText7: ; 74fe2 (1d:4fe2)
+VendingMachineText7: ; 74827 (1d:4827)
 	TX_FAR _VendingMachineText7
 	db "@"
 
-LoadVendingMachineItem: ; 74fe7 (1d:4fe7)
+LoadVendingMachineItem: ; 7482c (1d:482c)
 	ld hl, VendingPrices
 	ld a, [wCurrentMenuItem]
 	add a
@@ -129,7 +128,10 @@ LoadVendingMachineItem: ; 74fe7 (1d:4fe7)
 	ld [hVendingMachinePrice + 2], a
 	ret
 
-VendingPrices: ; 75000 (1d:5000)
-	db FRESH_WATER,$00,$02,$00
-	db SODA_POP,   $00,$03,$00
-	db LEMONADE,   $00,$03,$50
+VendingPrices: ; 74845 (1d:4845)
+	db FRESH_WATER
+	money 200
+	db SODA_POP
+	money 300
+	db LEMONADE
+	money 350
diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm
index 05a9cc4e..b355102f 100755
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -1,11 +1,10 @@
-ShakeElevator: ; 7bf15 (1e:7f15)
+ShakeElevator: ; 75f07 (1d:5f07)
 	ld de, -$20
 	call ShakeElevatorRedrawRow
 	ld de, SCREEN_HEIGHT * $20
 	call ShakeElevatorRedrawRow
 	call Delay3
-	ld a, $ff
-	call PlaySound
+	call StopAllMusic
 	ld a, [hSCY]
 	ld d, a
 	ld e, $1
@@ -27,19 +26,18 @@ ShakeElevator: ; 7bf15 (1e:7f15)
 	jr nz, .shakeLoop
 	ld a, d
 	ld [hSCY], a
-	ld a, $ff
-	call PlaySound
+	call StopAllMusic
 	ld c, BANK(SFX_Safari_Zone_PA)
 	ld a, SFX_SAFARI_ZONE_PA
 	call PlayMusic
 .musicLoop
 	ld a, [wChannelSoundIDs + CH4]
-	cp $b9
+	cp SFX_SAFARI_ZONE_PA
 	jr z, .musicLoop
 	call UpdateSprites
 	jp PlayDefaultMusic
 
-ShakeElevatorRedrawRow: ; 7bf64 (1e:7f64)
+ShakeElevatorRedrawRow: ; 75f52 (1d:5f52)
 ; This function is used to redraw certain portions of the screen, but it does
 ; not appear to ever result in any visible effect, so this function seems to
 ; be pointless.
@@ -56,7 +54,7 @@ ShakeElevatorRedrawRow: ; 7bf64 (1e:7f64)
 	add hl, de
 	ld a, h
 	and $3
-	or $98
+	or vBGMap0 / $100
 	ld d, a
 	ld a, l
 	pop hl
diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm
index 39bb385d..43a56658 100755
--- a/engine/overworld/hidden_items.asm
+++ b/engine/overworld/hidden_items.asm
@@ -1,4 +1,4 @@
-HiddenItems: ; 76688 (1d:6688)
+HiddenItems: ; 75f74 (1d:5f74)
 	ld hl, HiddenItemCoords
 	call FindHiddenItemOrCoinsIndex
 	ld [wHiddenItemOrCoinsIndex], a
@@ -9,7 +9,7 @@ HiddenItems: ; 76688 (1d:6688)
 	predef FlagActionPredef
 	ld a, c
 	and a
-	jr nz, .asm_75fa5
+	jr nz, .itemAlreadyFound
 	call EnableAutoTextBoxDrawing
 	ld a, 1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -18,21 +18,21 @@ HiddenItems: ; 76688 (1d:6688)
 	call GetItemName
 	tx_pre_jump FoundHiddenItemText
 
-.asm_75fa5
+.itemAlreadyFound
 	ld a, $ff
 	ld [hItemAlreadyFound], a
 	ret
 
 INCLUDE "data/hidden_item_coords.asm"
 
-FoundHiddenItemText: ; 7675b (1d:675b)
+FoundHiddenItemText: ; 76050 (1d:6050)
 	TX_FAR _FoundHiddenItemText
 	TX_ASM
 	ld a, [wHiddenObjectFunctionArgument] ; item ID
 	ld b, a
 	ld c, 1
 	call GiveItem
-	jr nc, .BagFull
+	jr nc, .bagFull
 	ld hl, wObtainedHiddenItemsFlags
 	ld a, [wHiddenItemOrCoinsIndex]
 	ld c, a
@@ -42,7 +42,7 @@ FoundHiddenItemText: ; 7675b (1d:675b)
 	call PlaySoundWaitForCurrent
 	call WaitForSoundToFinish
 	jp TextScriptEnd
-.BagFull
+.bagFull
 	call WaitForTextScrollButtonPress ; wait for button press
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -50,16 +50,16 @@ FoundHiddenItemText: ; 7675b (1d:675b)
 	call PrintText
 	jp TextScriptEnd
 
-HiddenItemBagFullText: ; 76794 (1d:6794)
+HiddenItemBagFullText: ; 76089 (1d:6089)
 	TX_FAR _HiddenItemBagFullText
 	db "@"
 
-HiddenCoins: ; 76799 (1d:6799)
+HiddenCoins: ; 7608e (1d:608e)
 	ld b, COIN_CASE
 	predef GetQuantityOfItemInBag
 	ld a, b
 	and a
-	jr z, .asm_760ce
+	jr z, .doNotPickUpCoins
 	ld hl, HiddenCoinCoords
 	call FindHiddenItemOrCoinsIndex
 	ld [wHiddenItemOrCoinsIndex], a
@@ -70,7 +70,7 @@ HiddenCoins: ; 76799 (1d:6799)
 	predef FlagActionPredef
 	ld a, c
 	and a
-	jr nz, .asm_760ce
+	jr nz, .doNotPickUpCoins
 	xor a
 	ld [hUnusedCoinsByte], a
 	ld [hCoins], a
@@ -82,10 +82,10 @@ HiddenCoins: ; 76799 (1d:6799)
 	cp 20
 	jr z, .bcd20
 	cp 40
-	jr z, .bcd20
+	jr z, .bcd20 ; should be bcd40
 	jr .bcd100
 
-.asm_760ce
+.doNotPickUpCoins
 	ld a, $ff
 	ld [hItemAlreadyFound], a
 	ret
@@ -93,19 +93,19 @@ HiddenCoins: ; 76799 (1d:6799)
 .bcd10
 	ld a, $10
 	ld [hCoins + 1], a
-	jr .bcddone
+	jr .bcdDone
 .bcd20
 	ld a, $20
 	ld [hCoins + 1], a
-	jr .bcddone
+	jr .bcdDone
 .bcd40 ; due to a typo, this is never used
 	ld a, $40
 	ld [hCoins + 1], a
-	jr .bcddone
+	jr .bcdDone
 .bcd100
 	ld a, $1
 	ld [hCoins], a
-.bcddone
+.bcdDone
 	ld de, wPlayerCoins + 1
 	ld hl, hCoins + 1
 	ld c, $2
@@ -118,30 +118,30 @@ HiddenCoins: ; 76799 (1d:6799)
 	call EnableAutoTextBoxDrawing
 	ld a, [wPlayerCoins]
 	cp $99
-	jr nz, .RoomInCoinCase
+	jr nz, .roomInCoinCase
 	ld a, [wPlayerCoins + 1]
 	cp $99
-	jr nz, .RoomInCoinCase
+	jr nz, .roomInCoinCase
 	tx_pre_id DroppedHiddenCoinsText
 	jr .done
-.RoomInCoinCase
+.roomInCoinCase
 	tx_pre_id FoundHiddenCoinsText
 .done
 	jp PrintPredefTextID
 
 INCLUDE "data/hidden_coins.asm"
 
-FoundHiddenCoinsText: ; 76847 (1d:6847)
+FoundHiddenCoinsText: ; 76143 (1d:6143)
 	TX_FAR _FoundHiddenCoinsText
 	db $10,"@"
 
-DroppedHiddenCoinsText: ; 7684d (1d:684d)
+DroppedHiddenCoinsText: ; 76149 (1d:6149)
 	TX_FAR _FoundHiddenCoins2Text
 	db $10
 	TX_FAR _DroppedHiddenCoinsText
 	db "@"
 
-FindHiddenItemOrCoinsIndex: ; 76857 (1d:6857)
+FindHiddenItemOrCoinsIndex: ; 76153 (1d:6153)
 	ld a, [wHiddenObjectY]
 	ld d, a
 	ld a, [wHiddenObjectX]
diff --git a/home.asm b/home.asm
index 6fb3e08b..9f62d820 100644
--- a/home.asm
+++ b/home.asm
@@ -316,7 +316,7 @@ OverwritewMoves:: ; 113a (0:113a)
 
 LoadFlippedFrontSpriteByMonIndex:: ; 1144 (0:1144)
 	ld a, 1
-	ld [W_SPRITEFLIPPED], a
+	ld [wSpriteFlipped], a
 
 LoadFrontSpriteByMonIndex:: ; 1149 (0:1149)
 	push hl
@@ -350,7 +350,7 @@ LoadFrontSpriteByMonIndex:: ; 1149 (0:1149)
 	ld [hStartTileID], a
 	call CopyUncompressedPicToHL
 	xor a
-	ld [W_SPRITEFLIPPED], a
+	ld [wSpriteFlipped], a
 	pop af
 	jp BankswitchCommon
 
@@ -949,7 +949,7 @@ InterlaceMergeSpriteBuffers:: ; 14c7 (0:14c7)
 	dec a
 	ld [H_SPRITEINTERLACECOUNTER], a
 	jr nz, .interlaceLoop
-	ld a, [W_SPRITEFLIPPED]
+	ld a, [wSpriteFlipped]
 	and a
 	jr z, .notFlipped
 	ld bc, 2*SPRITEBUFFERSIZE
diff --git a/home/pic.asm b/home/pic.asm
index 96cd6cd1..25a2ceb5 100644
--- a/home/pic.asm
+++ b/home/pic.asm
@@ -299,7 +299,7 @@ SpriteDifferentialDecode:: ; 25ca (0:25ca)
 	ld [W_SPRITECURPOSX], a
 	ld [W_SPRITECURPOSY], a
 	call StoreSpriteOutputPointer
-	ld a, [W_SPRITEFLIPPED]
+	ld a, [wSpriteFlipped]
 	and a
 	jr z, .notFlipped
 	ld hl, DecodeNybble0TableFlipped
@@ -386,7 +386,7 @@ DifferentialDecodeNybble:: ; 2663 (0:2663)
 	ld c, $1
 .evenNumber
 	ld l, a
-	ld a, [W_SPRITEFLIPPED]
+	ld a, [wSpriteFlipped]
 	and a
 	jr z, .notFlipped     ; determine if initial value is 0 or one
 	bit 3, e              ; if flipped, consider MSB of last data
@@ -479,7 +479,7 @@ XorSpriteChunks:: ; 26bd (0:26bd)
 	ld a, [W_SPRITEOUTPUTPTRCACHED+1]
 	ld d, a
 .xorChunksLoop
-	ld a, [W_SPRITEFLIPPED]
+	ld a, [wSpriteFlipped]
 	and a
 	jr z, .notFlipped
 	push de
@@ -563,10 +563,10 @@ NybbleReverseTable:: ; 275d (0:275d)
 ; combines the two loaded chunks with xor (the chunk loaded second is the destination). Both chunks are differeintial decoded beforehand.
 UnpackSpriteMode2:: ; 276d (0:276d)
 	call ResetSpriteBufferPointers
-	ld a, [W_SPRITEFLIPPED]
+	ld a, [wSpriteFlipped]
 	push af
 	xor a
-	ld [W_SPRITEFLIPPED], a            ; temporarily clear flipped flag for decoding the destination chunk
+	ld [wSpriteFlipped], a            ; temporarily clear flipped flag for decoding the destination chunk
 	ld a, [W_SPRITEOUTPUTPTRCACHED]
 	ld l, a
 	ld a, [W_SPRITEOUTPUTPTRCACHED+1]
@@ -574,7 +574,7 @@ UnpackSpriteMode2:: ; 276d (0:276d)
 	call SpriteDifferentialDecode
 	call ResetSpriteBufferPointers
 	pop af
-	ld [W_SPRITEFLIPPED], a
+	ld [wSpriteFlipped], a
 	jp XorSpriteChunks
 
 ; stores hl into the output pointers
diff --git a/main.asm b/main.asm
index a38de48c..0110758c 100755
--- a/main.asm
+++ b/main.asm
@@ -1386,10 +1386,14 @@ INCLUDE "scripts/pewtermart.asm"
 INCLUDE "data/mapObjects/pewtermart.asm"
 
 	dr $7453d,$74726
-VendingMachineMenu: ; 74726 (1d:4726)
-	dr $74726,$75dfe
-PKMNLeaguePC: ; 75dfe (1d:5dfe)
-	dr $75dfe,$75f74
+
+INCLUDE "engine/menu/vending_machine.asm"
+
+	dr $74851,$75dfe
+	
+INCLUDE "engine/menu/league_pc.asm"
+
+INCLUDE "engine/overworld/elevator.asm"
 
 INCLUDE "engine/overworld/hidden_items.asm"
 
@@ -1592,33 +1596,8 @@ SECTION "bank3D",ROMX,BANK[$3D]
 INCLUDE "engine/bank3d.asm"
 
 SECTION "bank3E",ROMX,BANK[$3E]
-Func_f8000: ; f8000
-	dr $f8000,$f8bcb
-
-Func_f8bcb: ; f8bcb
-	push de
-	callab IsSurfingPikachuInThePlayersParty
-	pop de
-	ret nc
-	callab PlayPikachuSoundClip
-	ret
-
-Func_f8bdf: ; f8bdf
-	dr $f8bdf,$f982d
-PlayIntroScene: ; f982d (3e:582d)
-	dr $f982d,$fa35a
-
-YellowIntroGraphics:  INCBIN "gfx/yellow_intro.2bpp"
-
-Func_fbb5a:
-	ld hl, wTileMapBackup
-	ld bc, 10 * SCREEN_WIDTH
-	xor a
-	call FillMemory
-	ret
 
-Func_fbb65:
-	dr $fbb65,$fbd76
+INCLUDE "engine/bank3e.asm"
 
 SECTION "bank3F",ROMX,BANK[$3F]
 
diff --git a/wram.asm b/wram.asm
index 610574da..593f7c09 100755
--- a/wram.asm
+++ b/wram.asm
@@ -1967,7 +1967,7 @@ W_SPRITELOADFLAGS:: ; d0a8
 	ds 1
 W_SPRITEUNPACKMODE:: ; d0a9
 	ds 1
-W_SPRITEFLIPPED:: ; d0aa
+wSpriteFlipped:: ; d0aa
 	ds 1
 
 W_SPRITEINPUTPTR:: ; d0ab