Comment some more bank 0 functions.

constants/hardware_constants.asm

@@ -1,5 +1,7 @@
 ; From http://nocash.emubase.de/pandocs.htm.
 
+GBC EQU $11
+
 ; MBC3
 MBC3SRamEnable EQU $0000
 MBC3RomBank    EQU $2000
@@ -28,6 +30,8 @@ TIMER    EQU 2
 SERIAL   EQU 3
 JOYPAD   EQU 4
 
+LY_VBLANK EQU 145
+
 ; OAM attribute flags
 OAM_PALETTE   EQU %111
 OAM_TILE_BANK EQU 3
@@ -76,6 +80,8 @@ rNR50       EQU $ff24 ; Channel control / ON-OFF / Volume (R/W)
 rNR51       EQU $ff25 ; Selection of Sound output terminal (R/W)
 rNR52       EQU $ff26 ; Sound on/off
 rLCDC       EQU $ff40 ; LCD Control (R/W)
+rLCDC_ENABLE EQU 7
+rLCDC_ENABLE_MASK EQU 1 << rLCDC_ENABLE
 rSTAT       EQU $ff41 ; LCDC Status (R/W)
 rSCY        EQU $ff42 ; Scroll Y (R/W)
 rSCX        EQU $ff43 ; Scroll X (R/W)

engine/battle/1c.asm

@@ -24,7 +24,7 @@ Func_708ca: ; 708ca (1c:48ca)
 	sla a
 	ld [rOBP1], a ; $ff49
 	jr nz, .asm_708f6
-	call CleanLCD_OAM
+	call ClearSprites
 	call Func_7092a
 	ld b, $e4
 .asm_7090d
@@ -42,7 +42,7 @@ Func_708ca: ; 708ca (1c:48ca)
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
 	call Delay3
-	jp CleanLCD_OAM
+	jp ClearSprites
 
 Func_7092a: ; 7092a (1c:492a)
 	ld de, $9000

engine/battle/animations.asm

@@ -616,7 +616,7 @@ AnimationCleanOAM: ; 78ec8 (1e:4ec8)
 	push bc
 	push af
 	call DelayFrame
-	call CleanLCD_OAM
+	call ClearSprites
 	pop af
 	pop bc
 	pop de
@@ -2616,7 +2616,7 @@ AnimationPetalsFalling: ; 79c8a (1e:5c8a)
 	ld a, $14
 	ld [W_SUBANIMTRANSFORM], a
 	call Func_79c97
-	jp CleanLCD_OAM
+	jp ClearSprites
 
 Func_79c97: ; 79c97 (1e:5c97)
 	ld c, a
@@ -2773,7 +2773,7 @@ AnimationShakeEnemyHUD: ; 79d77 (1e:5d77)
 	ld de, $0208
 	call Func_79de9
 	call AnimationShowMonPic
-	call CleanLCD_OAM
+	call ClearSprites
 	ld a, $90
 	ld [$ffb0], a
 	ld hl, $9c00

engine/battle/core.asm

@@ -183,7 +183,7 @@ Func_3c04c: ; 3c04c (f:404c)
 	call Delay3
 	ld b, $1
 	call GoPAL_SET
-	call ResetLCD_OAM
+	call HideSprites
 	ld hl, PrintBeginningBattleText
 	ld b, BANK(PrintBeginningBattleText)
 	jp Bankswitch
@@ -1146,7 +1146,7 @@ Func_3c7d8: ; 3c7d8 (f:47d8)
 .asm_3c7fa
 	xor a
 	ld [$cd6a], a
-	call CleanLCD_OAM
+	call ClearSprites
 	ld a, [wWhichPokemon] ; $cf92
 	ld [wPlayerMonNumber], a ; $cc2f
 	ld c, a
@@ -1449,7 +1449,7 @@ Func_3c92a: ; 3c92a (f:492a)
 	call Func_3ee5b
 	call LoadScreenTilesFromBuffer1
 .next4
-	call CleanLCD_OAM
+	call ClearSprites
 	ld hl,wTileMap
 	ld bc,$040B
 	call ClearScreenArea
@@ -2271,7 +2271,7 @@ asm_3d05f: ; 3d05f (f:505f)
 	ld [$d152], a
 	call UseItem
 	call Func_3ee5b
-	call CleanLCD_OAM
+	call ClearSprites
 	xor a
 	ld [wCurrentMenuItem], a ; $cc26
 	ld a, [W_BATTLETYPE] ; $d05a
@@ -2335,7 +2335,7 @@ Func_3d0e0: ; 3d0e0 (f:50e0)
 asm_3d0ed: ; 3d0ed (f:50ed)
 	jp nc, Func_3d119
 asm_3d0f0: ; 3d0f0 (f:50f0)
-	call CleanLCD_OAM
+	call ClearSprites
 	call GBPalWhiteOut
 	call Func_3ee5b
 	call LoadScreenTilesFromBuffer2
@@ -2383,7 +2383,7 @@ Func_3d119: ; 3d119 (f:5119)
 	xor a
 	ld [$cc49], a
 	ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
-	call CleanLCD_OAM
+	call ClearSprites
 	ld a, $36
 	call Predef ; indirect jump to StatusScreen (12953 (4:6953))
 	ld a, $37
@@ -2423,7 +2423,7 @@ Func_3d119: ; 3d119 (f:5119)
 	ld a, $1
 	ld [$cd6a], a
 	call GBPalWhiteOut
-	call CleanLCD_OAM
+	call ClearSprites
 	call Func_3ee5b
 	call LoadScreenTilesFromBuffer1
 	call GoPAL_SET_CF1C
@@ -6219,7 +6219,7 @@ Func_3ec32: ; 3ec32 (f:6c32)
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
 	ld a, $ff
 	ld [$cfcb], a
-	call CleanLCD_OAM
+	call ClearSprites
 	call ClearScreen
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -6787,7 +6787,7 @@ Func_3efeb: ; 3efeb (f:6feb)
 	ld hl, Coord
 	ld bc, $40a
 	call ClearScreenArea
-	call CleanLCD_OAM
+	call ClearSprites
 	ld a, [W_ISINBATTLE] ; $d057
 	dec a
 	call z, Func_3cdec

engine/cable_club.asm

@@ -887,7 +887,7 @@ Func_5a5f: ; 5a5f (1:5a5f)
 	ret nz
 	ld a, $4d
 	call Predef ; indirect jump to Func_5aaf (5aaf (1:5aaf))
-	jp InitGame
+	jp Init
 .asm_5a75
 	call Func_5317
 	ld hl, Club_GFX

engine/clear_save.asm

@@ -15,9 +15,9 @@ Func_1c98a: ; 1c98a (7:498a)
 	call DisplayTextBoxID
 	ld a, [wCurrentMenuItem] ; $cc26
 	and a
-	jp z, InitGame
+	jp z, Init
 	callba Func_73b6a
-	jp InitGame
+	jp Init
 
 ClearSaveDataText: ; 1c9c1 (7:49c1)
 	TX_FAR _ClearSaveDataText

engine/evos_moves.asm

@@ -123,7 +123,7 @@ Func_3ad71: ; 3ad71 (e:6d71)
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
 	ld a, $ff
 	ld [$cfcb], a
-	call CleanLCD_OAM
+	call ClearSprites
 	callab Func_7bde9
 	jp c, Func_3af2e
 	ld hl, EvolvedText

engine/intro.asm

@@ -9,7 +9,7 @@ PlayIntro: ; 41682 (10:5682)
 	xor a
 	ld [$ffae], a
 	ld [H_AUTOBGTRANSFERENABLED], a
-	call CleanLCD_OAM
+	call ClearSprites
 	call DelayFrame
 	ret
 
@@ -329,7 +329,7 @@ PlayShootingStar: ; 4188a (10:588a)
 	ld [$c0ee], a
 	call PlaySound
 	call Func_417f8
-	call CleanLCD_OAM
+	call ClearSprites
 	jp Delay3
 
 Func_418e9: ; 418e9 (10:58e9)

engine/items/items.asm

@@ -419,7 +419,7 @@ ItemUseBall: ; d687 (3:5687)
 	jr nz,.checkParty
 	ld hl,ItemUseBallText06
 	call PrintText
-	call CleanLCD_OAM
+	call ClearSprites
 	ld a,[$cfe5]	;caught mon_ID
 	ld [$d11e],a
 	ld a,$3d
@@ -430,11 +430,11 @@ ItemUseBall: ; d687 (3:5687)
 	jr z,.sendToBox
 	xor a
 	ld [$cc49],a
-	call CleanLCD_OAM
+	call ClearSprites
 	call AddPokemonToParty	;add mon to Party
 	jr .End
 .sendToBox	;$5907
-	call CleanLCD_OAM
+	call ClearSprites
 	call Func_e7a4
 	ld hl,ItemUseBallText07
 	ld a,[$d7f1]
@@ -448,7 +448,7 @@ ItemUseBall: ; d687 (3:5687)
 	ld hl,ItemUseBallText05
 .printText0	;$5922
 	call PrintText
-	call CleanLCD_OAM
+	call ClearSprites
 .End	;$5928
 	ld a,[W_BATTLETYPE]
 	and a
@@ -2148,7 +2148,7 @@ ItemUseTMHM: ; e479 (3:6479)
 	pop af
 	pop af
 	call GBPalWhiteOutWithDelay3
-	call CleanLCD_OAM
+	call ClearSprites
 	call GoPAL_SET_CF1C
 	jp LoadScreenTilesFromBuffer1 ; restore saved screen
 .checkIfAbleToLearnMove

engine/menu/naming_screen.asm

@@ -163,7 +163,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	call CopyData
 	call GBPalWhiteOutWithDelay3
 	call ClearScreen
-	call CleanLCD_OAM
+	call ClearSprites
 	call GoPAL_SET_CF1C
 	call GBPalNormal
 	xor a

engine/menu/start_sub_menus.asm

@@ -95,7 +95,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
 	call GoBackToPartyMenu
 	jp .checkIfPokemonChosen
 .choseStats
-	call CleanLCD_OAM
+	call ClearSprites
 	xor a
 	ld [$cc49],a
 	ld a,$36
@@ -710,7 +710,7 @@ TrainerInfo_DrawVerticalLine: ; 135d8 (4:75d8)
 StartMenu_SaveReset: ; 135e3 (4:75e3)
 	ld a,[$d72e]
 	bit 6,a ; is the player using the link feature?
-	jp nz,InitGame
+	jp nz,Init
 	ld a,$3f
 	call Predef ; save the game
 	call LoadScreenTilesFromBuffer2 ; restore saved screen

engine/overworld/cut.asm

@@ -35,7 +35,7 @@ asm_ef82: ; ef82 (3:6f82)
 	ld hl, $d730
 	set 6, [hl]
 	call GBPalWhiteOutWithDelay3
-	call CleanLCD_OAM
+	call ClearSprites
 	call Func_3dbe
 	ld a, $90
 	ld [$ffb0], a

engine/palettes.asm

@@ -409,7 +409,7 @@ LoadSGBBorderAndPalettes: ; 7202b (1c:602b)
 	ld de, PalPacket_724d8
 	ld hl, SuperPalettes
 	call Func_7210b
-	call ZeroVram
+	call ClearVram
 	ld hl, PalPacket_72538
 	jp SendSGBPacket
 

engine/titlescreen.asm

@@ -226,7 +226,7 @@ ENDC
 	call PlayCry
 	call WaitForSoundToFinish
 	call GBPalWhiteOutWithDelay3
-	call CleanLCD_OAM
+	call ClearSprites
 	xor a
 	ld [$ffb0], a
 	inc a
@@ -306,7 +306,7 @@ Func_44dd: ; 44dd (1:44dd)
 	ld bc, $230
 	ld a, BANK(PlayerCharacterTitleGraphics)
 	call FarCopyData2
-	call CleanLCD_OAM
+	call ClearSprites
 	xor a
 	ld [wWhichTrade], a ; $cd3d
 	ld hl, wOAMBuffer

engine/town_map.asm

@@ -138,7 +138,7 @@ MonsNestText: ; 70f89 (1c:4f89)
 	db "'s NEST@"
 
 LoadTownMap_Fly: ; 70f90 (1c:4f90)
-	call CleanLCD_OAM
+	call ClearSprites
 	call LoadTownMap
 	call LoadPlayerSpriteGraphics
 	call LoadFontTilePatterns
@@ -343,7 +343,7 @@ Func_711ab: ; 711ab (1c:51ab)
 	ld [$d09b], a
 	call GBPalWhiteOut
 	call ClearScreen
-	call CleanLCD_OAM
+	call ClearSprites
 	call LoadPlayerSpriteGraphics
 	call LoadFontTilePatterns
 	call UpdateSprites

engine/trade.asm

@@ -117,7 +117,7 @@ LoadTradingGFXAndMonNames: ; 411a1 (10:51a1)
 	ld bc, $800
 	ld a, $7f
 	call FillMemory
-	call CleanLCD_OAM
+	call ClearSprites
 	ld a, $ff
 	ld [$cfcb], a
 	ld hl, $d730
@@ -281,7 +281,7 @@ Func_412d2: ; 412d2 (10:52d2)
 	call PlaySound
 	jr .asm_412e7
 .asm_41318
-	call CleanLCD_OAM
+	call ClearSprites
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
 	call ClearScreen
@@ -355,7 +355,7 @@ Func_41376: ; 41376 (10:5376)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
 	call Func_41525
-	jp CleanLCD_OAM
+	jp ClearSprites
 
 Func_413c6: ; 413c6 (10:53c6)
 	call Func_41411
@@ -386,7 +386,7 @@ Func_413c6: ; 413c6 (10:53c6)
 	call Func_414c5
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	jp CleanLCD_OAM
+	jp ClearSprites
 
 Func_41411: ; 41411 (10:5411)
 	ld a, $1

macros.asm

@@ -11,6 +11,18 @@ page   EQUS "db $49,"     ; Start a new Pokedex page.
 dex    EQUS "db $5f, $50" ; End a Pokedex entry.
 
 
+homecall: MACRO
+	ld a, [H_LOADEDROMBANK]
+	push af
+	ld a, BANK(\1)
+	ld [H_LOADEDROMBANK], a
+	ld [MBC3RomBank], a
+	call \1
+	pop af
+	ld [H_LOADEDROMBANK], a
+	ld [MBC3RomBank], a
+	ENDM
+
 callba: MACRO
 	ld b, BANK(\1)
 	ld hl, \1

scripts/halloffameroom.asm

@@ -58,7 +58,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
 	dec b
 	jr nz, .asm_5a4ff ; 0x5a505 $f8
 	call WaitForTextScrollButtonPress
-	jp InitGame
+	jp Init
 
 HallofFameRoomScript0: ; 5a50d (16:650d)
 	ld a, $ff

wram.asm

@@ -271,8 +271,7 @@ wTileMapBackup2:: ; cd81
 	ds 20 * 18
 
 wBuffer:: ; cee9
-; used for temporary things
-
+; Temporary storage area of 30 bytes.
 wHPBarMaxHP:: ; cee9
 	ds 2
 wHPBarOldHP:: ; ceeb
@@ -281,12 +280,9 @@ wHPBarNewHP:: ; ceed
 	ds 2
 wHPBarDelta:: ; ceef
 	ds 1
-
 	ds 13
-
 wHPBarHPDifference:: ; cefd
 	ds 1
-
 	ds 9
 
 wAnimSoundID:: ; cf07
@@ -304,7 +300,12 @@ wCurSpriteMovement2:: ; cf14
 ; movement byte 2 of current sprite
 	ds 1
 
-	ds 74
+	ds 5
+
+wGBC:: ; cf1a
+	ds 1
+
+	ds 68
 
 wGymCityName:: ; cf5f
 wStringBuffer1:: ; cf5f
@@ -1473,3 +1474,7 @@ W_BOXMON2NAME:: ; de11
 	ds 11 * 19
 
 ; dee2
+
+SECTION "Stack", WRAMX[$dfff]
+wStack:: ; dfff
+	ds -$100