-
Notifications
You must be signed in to change notification settings - Fork 995
Remove Blank Leader Names
YakiNeen edited this page Apr 28, 2023
·
3 revisions
In the japanese versions, the Trainer Card display the names of Gym Leaders above face. Instead removing relevant code, the name graphics were erased.
TrainerInfoTextBoxTileGraphics: INCBIN "gfx/trainer_card/trainer_info.2bpp"
TrainerInfoTextBoxTileGraphicsEnd:
-BlankLeaderNames: INCBIN "gfx/trainer_card/blank_leader_names.2bpp"
CircleTile: INCBIN "gfx/trainer_card/circle_tile.2bpp"
BadgeNumbersTileGraphics: INCBIN "gfx/trainer_card/badge_numbers.2bpp"
Delete gfx\trainer_card\blank_leader_names.png.
DrawBadges:
; Draw 4x2 gym leader faces, with the faces replaced by
; badges if they are owned. Used in the player status screen.
-; In Japanese versions, names are displayed above faces.
-; Instead of removing relevant code, the name graphics were erased.
...
...
; Draw two rows of badges.
ld hl, wBadgeNumberTile
ld a, $d8 ; [1]
ld [hli], a
- ld [hl], $60 ; First name
hlcoord 2, 11
ld de, wTempObtainedBadgesBooleans
call .DrawBadgeRow
hlcoord 2, 14
ld de, wTempObtainedBadgesBooleans + 4
; fallthrough
.DrawBadgeRow
; Draw 4 badges.
ld c, 4
.DrawBadge
push de
push hl
; Badge no.
ld a, [wBadgeNumberTile]
ld [hli], a
inc a
ld [wBadgeNumberTile], a
+ ld a, [wBadgeNameTile]
+ inc a
+ inc a
+ inc hl
-; Names aren't printed if the badge is owned.
- ld a, [de]
- and a
- ld a, [wBadgeNameTile]
- jr nz, .SkipName
- call .PlaceTiles
- jr .PlaceBadge
-.SkipName
- inc a
- inc a
- inc hl
.PlaceBadge
ld [wBadgeNameTile], a
ld de, SCREEN_WIDTH - 1
add hl, de
ld a, [wBadgeOrFaceTiles]
call .PlaceTiles
add hl, de
call .PlaceTiles
...
DrawTrainerInfo in engine\menus\start_sub_menus.asm
...
; loads tile patterns and draws everything except for gym leader faces / badges
DrawTrainerInfo:
ld de, RedPicFront
lb bc, BANK(RedPicFront), $01
predef DisplayPicCenteredOrUpperRight
call DisableLCD
hlcoord 0, 2
ld a, " "
call TrainerInfo_DrawVerticalLine
hlcoord 1, 2
call TrainerInfo_DrawVerticalLine
ld hl, vChars2 tile $07
ld de, vChars2 tile $00
ld bc, $1c tiles
call CopyData
ld hl, TrainerInfoTextBoxTileGraphics ; trainer info text box tile patterns
ld de, vChars2 tile $77
ld bc, 8 tiles
push bc
call TrainerInfo_FarCopyData
- ld hl, BlankLeaderNames
- ld de, vChars2 tile $60
- ld bc, $17 tiles
+ ld hl, CircleTile
+ ld de, vChars2 tile $76
+ ld bc, 1 tiles
call TrainerInfo_FarCopyData
pop bc
ld hl, BadgeNumbersTileGraphics ; badge number tile patterns
ld de, vChars1 tile $58
call TrainerInfo_FarCopyData
ld hl, GymLeaderFaceAndBadgeTileGraphics ; gym leader face and badge tile patterns
ld de, vChars2 tile $20
ld bc, 8 * 8 tiles
...