engine/namingscreen.asm

engine/main_menu.asm

@@ -1062,8 +1062,8 @@ ShrinkFrame: ; 61f7 (1:61f7)
 	ret
 
 Intro_PlacePlayerSprite: ; 6210 (1:6210)
-	ld de, PlayerIcon
-	lb bc, BANK(PlayerIcon), 12
+	ld de, PlayerSpriteGFX
+	lb bc, BANK(PlayerSpriteGFX), 12
 	ld hl, $8000
 	call Request2bpp
 	ld hl, wOAMBuffer

home/joypad.asm

@@ -1,5 +1,7 @@
 JoypadInt:: ; 8df (0:08df)
 	reti
+
+ClearJoypad::
 	xor a
 	ld [hJoyPressed], a
 	ld [hJoyDown], a

main.asm

@@ -638,11 +638,8 @@ INCLUDE "engine/player_movement.asm"
 INCLUDE "engine/pack.asm"
 INCLUDE "engine/time.asm"
 INCLUDE "engine/learn_tm.asm"
+INCLUDE "engine/namingscreen.asm"
 
-NamingScreen_:
-	dr $11aa3, $11aad
-NamingScreen:
-	dr $11aad, $1269a
 AbortBugCatchingContest::
 	dr $1269a, $126fd
 Function126fd:
@@ -1210,7 +1207,10 @@ Function8ce7c:
 	dr $8ce7c, $8d174
 
 ClearAnimatedObjectBuffer:
-	dr $8d174, $8d18a
+	dr $8d174, $8d183
+
+AnimatedObjects_PlayFrameAndDelay:
+	dr $8d183, $8d18a
 
 AnimatedObjects_PlayFrame:
 	dr $8d18a, $8d1f7
@@ -1219,7 +1219,20 @@ InitAnimatedObjectStruct_:: ; 8d1f7
 	dr $8d1f7, $8d332
 
 ReinitAnimatedObjectFrame_:: ; 8d332
-	dr $8d332, $90000
+
+IF DEF(GOLD)
+	dr $8d332, $8e79f
+
+LoadMenuMonIcon::
+	dr $8e79f, $90000
+ENDC
+
+IF DEF(SILVER)
+	dr $8d332, $8e785
+
+LoadMenuMonIcon::
+	dr $8e785, $90000
+ENDC
 
 SECTION "bank24", ROMX, BANK[$24]
 	dr $90000, $90641
@@ -1325,8 +1338,14 @@ SECTION "bank2f", ROMX, BANK[$2f]
 	dr $bc000, $c0000
 
 SECTION "bank30", ROMX, BANK[$30]
-PlayerIcon:
-	dr $c0000, $c4000
+PlayerSpriteGFX:
+	dr $c0000, $c03c0
+
+SilverSpriteGFX:
+	dr $c03c0, $c0fc0
+
+MomSpriteGFX:
+	dr $c0fc0, $c4000
 
 SECTION "bank31", ROMX, BANK[$31]
 	dr $c4000, $c7a40

wram.asm

@@ -258,11 +258,10 @@ wc5cc:: ds 1 ; c5cc
 wc5cd:: ds 1 ; c5cd
 wc5ce:: ds 1 ; c5ce
 wc5cf:: ds 1 ; c5cf
-wc5d0:: ds 1 ; c5d0
-wc5d1:: ds 1 ; c5d1
+wNamingScreenDestinationPointer:: dw ; c5d0
 wc5d2:: ds 1 ; c5d2
 wc5d3:: ds 1 ; c5d3
-wc5d4:: ds 1 ; c5d4
+wNamingScreenType:: ds 1 ; c5d4
 wc5d5:: ds 1 ; c5d5
 wc5d6:: ds 1 ; c5d6
 wc5d7:: ds 1 ; c5d7