Dummy Game

engine/mail.asm

@@ -27,7 +27,7 @@ SendMailToPC: ; 4456e
 	call ByteFill
 	ld a, MON_ITEM
 	call GetPartyParamLocation
-	ld [hl], $0
+	ld [hl], 0
 	ld hl, sMailboxCount
 	inc [hl]
 	call CloseSRAM
@@ -355,7 +355,7 @@ InitMail: ; 0x447b9
 	ret
 ; 0x447da
 
-Function447da: ; 0x447da
+MailboxPC_GetMailAuthor: ; 0x447da
 	dec a
 	ld hl, sMailbox1Author
 	ld bc, MAIL_STRUCT_LENGTH
@@ -373,10 +373,10 @@ Function447da: ; 0x447da
 	ret
 ; 0x447fb
 
-Function447fb: ; 0x447fb
+MailboxPC_PrintMailAuthor: ; 0x447fb
 	push de
 	ld a, [MenuSelection]
-	call Function447da
+	call MailboxPC_GetMailAuthor
 	pop hl
 	jp PlaceString
 ; 0x44806
@@ -384,11 +384,11 @@ Function447fb: ; 0x447fb
 MailboxPC: ; 0x44806
 	xor a
 	ld [OBPals + 8 * 6], a
-	ld a, $1
+	ld a, 1
 	ld [wCurMessageIndex], a
 .loop
 	call InitMail
-	ld hl, MenuData4494c
+	ld hl, .TopMenuDataHeader
 	call CopyMenuDataHeader
 	xor a
 	ld [hBGMapMode], a
@@ -406,9 +406,9 @@ MailboxPC: ; 0x44806
 	ld [wCurMessageIndex], a
 
 	ld a, [wMenuJoypad]
-	cp $2
+	cp B_BUTTON
 	jr z, .exit
-	call Function4484a
+	call .Submenu
 	jr .loop
 
 .exit
@@ -416,18 +416,18 @@ MailboxPC: ; 0x44806
 	ret
 ; 0x4484a
 
-Function4484a: ; 0x4484a
-	ld hl, MenuData44964
+.Submenu: ; 0x4484a
+	ld hl, .SubMenuDataHeader
 	call LoadMenuDataHeader
 	call VerticalMenu
 	call ExitMenu
-	jr c, .exit
+	jr c, .subexit
 	ld a, [wMenuCursorY]
 	dec a
 	ld hl, .JumpTable
 	rst JumpTable
 
-.exit
+.subexit
 	ret
 ; 0x44861
 
@@ -455,7 +455,7 @@ Function4484a: ; 0x4484a
 	ld a, [MenuSelection]
 	dec a
 	call .GetMailType
-	ld a, $1
+	ld a, 1
 	ld [wItemQuantityChangeBuffer], a
 	ld hl, NumItems
 	call ReceiveItem
@@ -557,30 +557,30 @@ Function4484a: ; 0x4484a
 .Cancel
 	ret
 
-MenuData4494c: ; 0x4494c
+.TopMenuDataHeader: ; 0x4494c
 	db %01000000 ; flags
 	db 1, 8 ; start coords
 	db 10, 18 ; end coords
-	dw .MenuData2
+	dw .TopMenuData2
 	db 1 ; default option
 
-.MenuData2
+.TopMenuData2
 	db %00010000 ; flags
 	db 4, 0 ; rows/columns?
 	db 1 ; horizontal spacing?
 	dbw 0, wMailboxCount ; text pointer
-	dba Function447fb
-	dbw 0,0
-	dbw 0,0
+	dba MailboxPC_PrintMailAuthor
+	dba NULL
+	dba NULL
 
-MenuData44964: ; 0x44964
+.SubMenuDataHeader: ; 0x44964
 	db %01000000 ; flags
-	db 0, 0 ; start coords
-	db 9, $d ; end coords
-	dw .MenuData2
+	db 0,  0 ; start coords
+	db 9, 13 ; end coords
+	dw .SubMenuData2
 	db 1 ; default option
 
-.MenuData2
+.SubMenuData2
 	db %10000000 ; flags
 	db 4 ; items
 	db "READ MAIL@"

engine/sprite_anims.asm

@@ -413,7 +413,7 @@ DoAnimFrame: ; 8d24b
 	ret
 
 .fourteen: ; 8d47c (23:547c)
-	callab Functione21a1
+	callab DummyGame_InterpretJoypad_AnimateCursor
 	ret
 
 .sixteen: ; 8d483 (23:5483)

engine/std_scripts.asm

@@ -202,7 +202,7 @@ HomepageScript:
 
 Radio1Script:
 	opentext
-	writebyte $0
+	writebyte MAPRADIO_POKEMON_CHANNEL
 	special MapRadio
 	closetext
 	end
@@ -210,7 +210,7 @@ Radio1Script:
 Radio2Script:
 ; Lucky Channel
 	opentext
-	writebyte $4
+	writebyte MAPRADIO_LUCKY_CHANNEL
 	special MapRadio
 	closetext
 	end
@@ -1807,59 +1807,59 @@ GameCornerCoinVendorScript: ; 0xbcdcd
 CoinVendor_IntroScript: ; 0xbcde0
 	farwritetext CoinVendor_IntroText
 
-CoinVendor_SellCoinsMenuScript: ; 0xbcde4
+.loop: ; 0xbcde4
 	special Special_DisplayMoneyAndCoinBalance
-	loadmenudata CoinVendor_MenuDataHeader
+	loadmenudata .MenuDataHeader
 	verticalmenu
 	closewindow
-	if_equal $1, CoinVendor_Buy50CoinsScript
-	if_equal $2, CoinVendor_Buy500CoinsScript
-	jump CoinVendor_CancelScript
+	if_equal $1, .Buy50
+	if_equal $2, .Buy500
+	jump .Cancel
 ; 0xbcdf7
 
-CoinVendor_Buy50CoinsScript: ; 0xbcdf7
+.Buy50: ; 0xbcdf7
 	checkcoins 9949
-	if_equal $0, CoinVendor_CoinCaseFullScript
+	if_equal $0, .CoinCaseFull
 	checkmoney $0, 1000
-	if_equal $2, CoinVendor_NotEnoughMoneyScript
+	if_equal $2, .NotEnoughMoney
 	givecoins 50
 	takemoney $0, 1000
 	waitsfx
 	playsound SFX_TRANSACTION
 	farwritetext CoinVendor_Buy50CoinsText
 	waitbutton
-	jump CoinVendor_SellCoinsMenuScript
+	jump .loop
 ; 0xbce1b
 
-CoinVendor_Buy500CoinsScript: ; 0xbce1b
+.Buy500: ; 0xbce1b
 	checkcoins 9499
-	if_equal $0, CoinVendor_CoinCaseFullScript
+	if_equal $0, .CoinCaseFull
 	checkmoney $0, 10000
-	if_equal $2, CoinVendor_NotEnoughMoneyScript
+	if_equal $2, .NotEnoughMoney
 	givecoins 500
 	takemoney $0, 10000
 	waitsfx
 	playsound SFX_TRANSACTION
 	farwritetext CoinVendor_Buy500CoinsText
 	waitbutton
-	jump CoinVendor_SellCoinsMenuScript
+	jump .loop
 ; 0xbce3f
 
-CoinVendor_NotEnoughMoneyScript: ; 0xbce3f
+.NotEnoughMoney: ; 0xbce3f
 	farwritetext CoinVendor_NotEnoughMoneyText
 	waitbutton
 	closetext
 	end
 ; 0xbce46
 
-CoinVendor_CoinCaseFullScript: ; 0xbce46
+.CoinCaseFull: ; 0xbce46
 	farwritetext CoinVendor_CoinCaseFullText
 	waitbutton
 	closetext
 	end
 ; 0xbce4d
 
-CoinVendor_CancelScript: ; 0xbce4d
+.Cancel: ; 0xbce4d
 	farwritetext CoinVendor_CancelText
 	waitbutton
 	closetext
@@ -1867,15 +1867,14 @@ CoinVendor_CancelScript: ; 0xbce4d
 ; 0xbce54
 
 
-CoinVendor_MenuDataHeader: ; 0xbce54
+.MenuDataHeader
 	db $40 ; flags
 	db 04, 00 ; start coords
 	db 11, 15 ; end coords
-	dw CoinVendor_MenuData2
+	dw .MenuData2
 	db 1 ; default option
-; 0xbce5c
 
-CoinVendor_MenuData2: ; 0xbce5c
+.MenuData2
 	db $80 ; flags
 	db 3 ; items
 	db " 50 :  ¥1000@"