Merge d16b2fc383 into 09d2148d6d

constants/event_flags.asm

@@ -64,7 +64,7 @@
 	const EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
 	const EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
 	const EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
-	const EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
+	const EVENT_LAKE_OF_RAGE_ETHER_ON_STANDBY
 	const_skip ; unused
 	const_skip ; unused
 	const EVENT_HEALED_MOOMOO

data/pokemon/palettes.asm

@@ -3,7 +3,6 @@ PokemonPalettes:
 
 ; Each normal.gbcpal is generated from the corresponding .png, and
 ; only the middle two colors are included, not black or white.
-; (Back sprites are used since they are the same in Gold and Silver.)
 ; Shiny palettes are defined directly, not generated.
 
 	; 2 middle palettes, front and shiny, with 2 colors each

engine/battle/battle_transition.asm

@@ -57,7 +57,7 @@ DoBattleTransition:
 	farcall ReanchorBGMap_NoOAMUpdate
 	call UpdateSprites
 	call DelayFrame
-	call ConvertTrainerBattlePokeballTilesTo2bpp
+	call LoadBattleTransitionGFX
 	call CGBOnly_CopyTilemapAtOnce
 
 	ld a, SCREEN_HEIGHT_PX
@@ -73,32 +73,33 @@ DoBattleTransition:
 	call WipeLYOverrides
 	ret
 
-ConvertTrainerBattlePokeballTilesTo2bpp:
+LoadBattleTransitionGFX:
 	ld hl, wDecompressScratch
-	ld bc, $28 tiles
+	ld bc, TILEMAP_WIDTH * (TILEMAP_HEIGHT - 12)
 .loop
-	ld [hl], -1
+	ld [hl], BATTLETRANSITION_BLACK
 	inc hl
 	dec bc
 	ld a, c
 	or b
 	jr nz, .loop
 
+; fill visible area of BGMap0 with BATTLETRANSITION_BLACK
 	ld de, wDecompressScratch
-	hlbgcoord 0, 0, vBGMap2
+	hlbgcoord 0, 0
 	ld b, BANK(@)
-	ld c, $28
+	ld c, TILEMAP_WIDTH * (TILEMAP_HEIGHT - 12) / TILE_SIZE
 	call Request2bpp
 
-	ld de, TrainerBattlePokeballTiles
-	ld hl, vTiles3 tile BATTLETRANSITION_SQUARE
-	ld b, BANK(TrainerBattlePokeballTiles)
+	ld de, BattleTransitionTiles
+	ld hl, vTiles0 tile BATTLETRANSITION_SQUARE
+	ld b, BANK(BattleTransitionTiles)
 	ld c, 2
 	call Request2bpp
 	ret
 
-TrainerBattlePokeballTiles:
-INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
+BattleTransitionTiles:
+INCBIN "gfx/overworld/battle_transition_tiles.2bpp"
 
 BattleTransitionJumptable:
 	jumptable .Jumptable, wJumptableIndex

engine/battle/core.asm

@@ -2856,7 +2856,7 @@ MonFaintedAnimation:
 	dec b
 	jr nz, .InnerLoop
 
-	ld bc, 20
+	ld bc, SCREEN_WIDTH
 	add hl, bc
 	ld de, .Spaces
 	call PlaceString
@@ -4629,7 +4629,9 @@ UpdateHPPal:
 	jp FinishBattleAnim
 
 Battle_DummyFunction:
-; called before placing either battler's nickname in the HUD
+; Called before placing either battler's nickname in the HUD.
+; This was CenterMonName in Gen 1.
+; In Gen 2, pokemon nicknames are always left-aligned on the HUD.
 	ret
 
 BattleMenu:
@@ -7806,7 +7808,7 @@ StartBattle:
 	lb bc, 4, 10
 	call ClearBox
 	call ClearSprites
-	ld a, [wEnemyMonEnd]
+	ld a, [wBattleMode]
 	cp WILD_BATTLE
 	call z, UpdateEnemyHUD
 	ld a, $1
@@ -8135,7 +8137,7 @@ ReadAndPrintLinkBattleRecord:
 	pop hl
 	call PlaceString
 	pop hl
-	ld de, 26
+	ld de, SCREEN_WIDTH + 6
 	add hl, de
 	push hl
 	ld de, wLinkBattleRecordWins

engine/items/pack.asm

@@ -807,7 +807,7 @@ TMHMSubmenu:
 
 .UsableMenuHeader:
 	db MENU_BACKUP_TILES ; flags
-	menu_coords 0, 7, TEXTBOX_HEIGHT, TEXTBOX_Y - 1
+	menu_coords 0, 7, SCREEN_WIDTH - 14, TEXTBOX_Y - 1
 	dw .UsableMenuData
 	db 1 ; default option
 

engine/menus/intro_menu.asm

@@ -166,7 +166,7 @@ SetDefaultBoxNames:
 	ld [hli], a
 	ld [hl], '@'
 	pop hl
-	ld de, 9
+	ld de, BOX_NAME_LENGTH
 	add hl, de
 	inc c
 	ld a, c
@@ -474,11 +474,7 @@ Continue_DisplayPokedexNumCaught:
 	ret z
 	push hl
 	ld hl, wPokedexCaught
-if NUM_POKEMON % 8
-	ld b, NUM_POKEMON / 8 + 1
-else
-	ld b, NUM_POKEMON / 8
-endc
+	ld b, (NUM_POKEMON + 7) / 8
 	call CountSetBits
 	pop hl
 	ld de, wNumSetBits

engine/menus/menu_2.asm

@@ -16,7 +16,7 @@ PlaceMenuItemQuantity:
 	pop hl
 	and a
 	jr nz, .done
-	ld de, $15
+	ld de, SCREEN_WIDTH + 1
 	add hl, de
 	ld [hl], '×'
 	inc hl
@@ -231,7 +231,7 @@ Kurt_SelectApricorn:
 	db 1 ; default option
 
 .MenuData:
-	db SCROLLINGMENU_ENABLE_SELECT | SCROLLINGMENU_ENABLE_FUNCTION3
+	db STATICMENU_CURSOR | STATICMENU_WRAP
 	dbw 0, wKurtApricornCount
 	dw .Name
 	dw NULL

engine/menus/savemenu_copytilemapatonce.asm

@@ -57,7 +57,7 @@ SaveMenu_CopyTilemapAtOnce:
 .loop
 rept SCREEN_WIDTH / 2
 	pop de
-; if in v/hblank, wait until not in v/hblank
+; wait until PPU v/hblank mode
 .loop\@
 	ldh a, [c]
 	and b

engine/phone/phonering_copytilemapatonce.asm

@@ -60,7 +60,7 @@ PhoneRing_CopyTilemapAtOnce:
 .loop
 rept SCREEN_WIDTH / 2
 	pop de
-; if in v/hblank, wait until not in v/hblank
+; wait until PPU v/hblank mode
 .loop\@
 	ldh a, [c]
 	and b

engine/pokegear/pokegear.asm

@@ -415,7 +415,7 @@ Pokegear_FinishTilemap:
 	ld [hli], a
 	inc a
 	ld [hld], a
-	ld bc, $14
+	ld bc, SCREEN_WIDTH
 	add hl, bc
 	add $f
 	ld [hli], a
@@ -529,7 +529,8 @@ PokegearMap_CheckRegion:
 .johto
 	ld a, POKEGEARSTATE_JOHTOMAPINIT
 	jr .done
-	ret
+
+	ret ; unreferenced
 
 .kanto
 	ld a, POKEGEARSTATE_KANTOMAPINIT
@@ -1225,7 +1226,7 @@ PokegearPhoneContactSubmenu:
 	jr nz, .clear_column
 	pop hl
 	ld a, [wPokegearPhoneSubmenuCursor]
-	ld bc, SCREEN_WIDTH  * 2
+	ld bc, SCREEN_WIDTH * 2
 	call AddNTimes
 	ld [hl], '▶'
 	pop de

engine/pokemon/mail.asm

@@ -101,7 +101,7 @@ MoveMailFromPCToParty:
 	ld bc, MAIL_STRUCT_LENGTH
 	call CopyBytes
 	pop hl
-	ld de, PARTYMON_STRUCT_LENGTH - MON_MOVES
+	ld de, MAIL_STRUCT_LENGTH - 1 ; message type
 	add hl, de
 	ld d, [hl]
 	ld a, [wCurPartyMon]

home/tilemap.asm

@@ -110,7 +110,7 @@ CopyTilemapAtOnce::
 .loop
 rept SCREEN_WIDTH / 2
 	pop de
-; if in v/hblank, wait until not in v/hblank
+; wait until PPU v/hblank mode
 .loop\@
 	ldh a, [c]
 	and b

maps/LakeOfRageMagikarpHouse.asm

@@ -9,7 +9,7 @@ LakeOfRageMagikarpHouse_MapScripts:
 MagikarpLengthRaterScript:
 	faceplayer
 	opentext
-	checkevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
+	checkevent EVENT_LAKE_OF_RAGE_ETHER_ON_STANDBY
 	iftrue .GetReward
 	checkevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
 	iftrue .AskedForMagikarp
@@ -57,12 +57,12 @@ MagikarpLengthRaterScript:
 	writetext MagikarpLengthRaterText_Bonus
 	waitbutton
 	closetext
-	clearevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
+	clearevent EVENT_LAKE_OF_RAGE_ETHER_ON_STANDBY
 	end
 
 .NoRoom:
 	closetext
-	setevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
+	setevent EVENT_LAKE_OF_RAGE_ETHER_ON_STANDBY
 	end
 
 .TooShort: