Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected some mislabeled 1bpps

Browse Source
This commit is contained in:
PikalaxALT
2015-11-04 15:35:29 -05:00
parent cf5d726b7f
commit 95cb4636af
8 changed files with 104 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
battle/core.asm
View File

@@ -2488,10 +2488,10 @@ WinTrainerBattle: ; 3cfa4
.skip_heal .skip_heal
ld a, [wc2cc] ld a, [wc2cc]
bit 0, a bit 0, a
jr nz, .skip_whatever_this_is jr nz, .skip_win_loss_text
call Function3718 call PrintWinLossText
.skip_whatever_this_is .skip_win_loss_text
jp Function3d02b jp Function3d02b
.mobile .mobile
@@ -3104,9 +3104,9 @@ LostBattle: ; 3d38e
ld a, [wc2cc] ld a, [wc2cc]
bit 0, a bit 0, a
jr nz, .skip jr nz, .skip_win_loss_text
call Function3718 call PrintWinLossText
.skip .skip_win_loss_text
ret ret
.battle_tower .battle_tower
@@ -7241,14 +7241,14 @@ Function3eda6: ; 3eda6
; 3edad ; 3edad
Function3edad: ; 3edad LoadHPExpBarGFX: ; unreferenced
ld de, GFX_f8ac0 ld de, EnemyHPBarBorderGFX
ld hl, VTiles2 tile $6c ld hl, VTiles2 tile $6c
lb bc, BANK(GFX_f8ac0), 4 lb bc, BANK(EnemyHPBarBorderGFX), 4
call Get1bpp call Get1bpp
ld de, GFX_f8ae0 ld de, HPExpBarBorderGFX
ld hl, VTiles2 tile $73 ld hl, VTiles2 tile $73
lb bc, BANK(GFX_f8ae0), 6 lb bc, BANK(HPExpBarBorderGFX), 6
call Get1bpp call Get1bpp
ld de, ExpBarGFX ld de, ExpBarGFX
ld hl, VTiles2 tile $55 ld hl, VTiles2 tile $55

4
constants/misc_constants.asm
View File

@@ -164,3 +164,7 @@ HMENURETURN_SCRIPT EQU %10000000
HMENURETURN_ASM EQU %11111111 HMENURETURN_ASM EQU %11111111
NUM_MON_SUBMENU_ITEMS EQU 8 NUM_MON_SUBMENU_ITEMS EQU 8
LEN_2BPP_TILE EQU 16
LEN_1BPP_TILE EQU 8
TILES_PER_FRAME EQU 6

0
gfx/unknown/0f8ac0.2bpp → gfx/battle/enemy_hp_bar_border.1bpp
View File

0
gfx/unknown/0f8ae0.2bpp → gfx/battle/hp_exp_bar_border.1bpp
View File

11
home.asm
View File

@@ -1600,20 +1600,21 @@ CheckTrainerFlag:: ; 36f5
; 3718 ; 3718
Function3718:: ; 3718 PrintWinLossText:: ; 3718
ld a, [BattleType] ld a, [BattleType]
cp BATTLETYPE_CANLOSE cp BATTLETYPE_CANLOSE
jr .canlose jr .canlose ; ??????????
ld hl, WalkingTile ; unreferenced
ld hl, wWinTextPointer
jr .ok jr .ok
.canlose .canlose
ld a, [wBattleResult] ld a, [wBattleResult]
ld hl, WalkingTile ld hl, wWinTextPointer
and $f and $f
jr z, .ok jr z, .ok
ld hl, wd048 + 1 ld hl, wLossTextPointer
.ok .ok
ld a, [hli] ld a, [hli]

8
home/copy.asm
View File

@@ -1,7 +1,7 @@
; Functions to copy data from ROM. ; Functions to copy data from ROM.
Functiondc9:: ; dc9 Get2bpp_2:: ; dc9
ld a, [rLCDC] ld a, [rLCDC]
bit 7, a bit 7, a
jp z, Copy2bpp jp z, Copy2bpp
@@ -17,7 +17,7 @@ Functiondc9:: ; dc9
ret ret
; ddc ; ddc
Functionddc:: ; ddc Get1bpp_2:: ; ddc
ld a, [rLCDC] ld a, [rLCDC]
bit 7, a bit 7, a
jp z, Copy1bpp jp z, Copy1bpp
@@ -33,13 +33,15 @@ Functionddc:: ; ddc
ret ret
; def ; def
Functiondef:: ; def FarCopyBytesDouble_DoubleBankSwitch:: ; def
ld [hBuffer], a ld [hBuffer], a
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, [hBuffer] ld a, [hBuffer]
rst Bankswitch rst Bankswitch
call FarCopyBytesDouble call FarCopyBytesDouble
pop af pop af
rst Bankswitch rst Bankswitch
ret ret

144
main.asm
View File

@@ -32254,7 +32254,7 @@ Function2c165: ; 2c165
ld de, GFX_2c172 ld de, GFX_2c172
ld hl, VTiles0 tile $31 ld hl, VTiles0 tile $31
lb bc, BANK(GFX_2c172), 4 lb bc, BANK(GFX_2c172), 4
call Functiondc9 call Get2bpp_2
ret ret
; 2c172 ; 2c172
@@ -57873,7 +57873,7 @@ GetGFXUnlessMobile: ; 8ea3f
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_MOBILE cp LINK_MOBILE
jp nz, Request2bpp jp nz, Request2bpp
jp Functiondc9 jp Get2bpp_2
; 8ea4a ; 8ea4a
Function8ea4a: ; 8ea4a Function8ea4a: ; 8ea4a
@@ -74940,12 +74940,12 @@ GFX_f8aa0: ; f8aa0
INCBIN "gfx/unknown/0f8aa0.2bpp" INCBIN "gfx/unknown/0f8aa0.2bpp"
; f8ac0 ; f8ac0
GFX_f8ac0: ; f8ac0 EnemyHPBarBorderGFX: ; f8ac0
INCBIN "gfx/unknown/0f8ac0.2bpp" INCBIN "gfx/battle/enemy_hp_bar_border.1bpp"
; f8ae0 ; f8ae0
GFX_f8ae0: ; f8ae0 HPExpBarBorderGFX: ; f8ae0
INCBIN "gfx/unknown/0f8ae0.2bpp" INCBIN "gfx/battle/hp_exp_bar_border.1bpp"
; f8b10 ; f8b10
ExpBarGFX: ; f8b10 ExpBarGFX: ; f8b10
@@ -74994,41 +74994,41 @@ Unknown_fb434:
Functionfb435: ; 4b435 Functionfb435: ; 4b435
ld a, [Unknown_fb434] ld a, [Unknown_fb434]
and a and a
jp nz, Functionddc jp nz, Get1bpp_2
jp Get1bpp jp Get1bpp
; fb43f ; fb43f
Functionfb43f: ; fb43f Functionfb43f: ; fb43f
ld a, [Unknown_fb434] ld a, [Unknown_fb434]
and a and a
jp nz, Functiondc9 jp nz, Get2bpp_2
jp Get2bpp jp Get2bpp
; fb449 ; fb449
Functionfb449:: ; fb449 Functionfb449:: ; fb449
ld de, Font ld de, Font
ld hl, VTiles1 ld hl, VTiles1
lb bc, BANK(Font), $400 / 8 lb bc, BANK(Font), $80
ld a, [rLCDC] ld a, [rLCDC]
bit 7, a bit 7, a
jp z, Copy1bpp jp z, Copy1bpp
ld de, Font ld de, Font
ld hl, VTiles1 ld hl, VTiles1
lb bc, BANK(Font), $100 / 8 lb bc, BANK(Font), $20
call Functionddc call Get1bpp_2
ld de, Font + $100 ld de, Font + $20 * LEN_1BPP_TILE
ld hl, VTiles1 + $200 ld hl, VTiles1 tile $20
lb bc, BANK(Font), $100 / 8 lb bc, BANK(Font), $20
call Functionddc call Get1bpp_2
ld de, Font + $200 ld de, Font + $40 * LEN_1BPP_TILE
ld hl, VTiles1 + $400 ld hl, VTiles1 tile $40
lb bc, BANK(Font), $100 / 8 lb bc, BANK(Font), $20
call Functionddc call Get1bpp_2
ld de, Font + $300 ld de, Font + $60 * LEN_1BPP_TILE
ld hl, VTiles1 + $600 ld hl, VTiles1 tile $60
lb bc, BANK(Font), $100 / 8 lb bc, BANK(Font), $20
call Functionddc call Get1bpp_2
ret ret
; fb48a ; fb48a
@@ -75038,16 +75038,16 @@ Functionfb48a:: ; fb48a
ld de, GFX_f9214 ld de, GFX_f9214
ld hl, VTiles2 tile $60 ld hl, VTiles2 tile $60
lb bc, BANK(GFX_f9214), 1 lb bc, BANK(GFX_f9214), 1
call Functionddc call Get1bpp_2
ld de, GFX_f8f24 ld de, GFX_f8f24
ld hl, VTiles2 tile $62 ld hl, VTiles2 tile $62
lb bc, BANK(GFX_f8f24), 1 lb bc, BANK(GFX_f8f24), 1
call Functiondc9 call Get2bpp_2
ld de, FontExtra + $30 ld de, FontExtra + 3 * LEN_2BPP_TILE
ld hl, VTiles2 tile $63 ld hl, VTiles2 tile $63
lb bc, BANK(FontExtra), $16 lb bc, BANK(FontExtra), $16
call Functiondc9 call Get2bpp_2
jr Functionfb4cc jr LoadFrame
; fb4b0 ; fb4b0
Functionfb4b0:: ; fb4b0 Functionfb4b0:: ; fb4b0
@@ -75055,7 +75055,7 @@ Functionfb4b0:: ; fb4b0
ld hl, VTiles2 tile $61 ld hl, VTiles2 tile $61
ld b, BANK(GFX_f9424) ld b, BANK(GFX_f9424)
ld c, 1 ld c, 1
call Functiondc9 call Get2bpp_2
ret ret
; fb4be ; fb4be
@@ -75063,25 +75063,25 @@ _LoadFontsBattleExtra:: ; fb4be
ld de, FontBattleExtra ld de, FontBattleExtra
ld hl, VTiles2 tile $60 ld hl, VTiles2 tile $60
lb bc, BANK(FontBattleExtra), $19 lb bc, BANK(FontBattleExtra), $19
call Functiondc9 call Get2bpp_2
jr Functionfb4cc jr LoadFrame
; fb4cc ; fb4cc
Functionfb4cc: ; fb4cc LoadFrame: ; fb4cc
ld a, [TextBoxFrame] ld a, [TextBoxFrame]
and 7 and 7
ld bc, $30 ld bc, TILES_PER_FRAME * LEN_1BPP_TILE
ld hl, Frames ld hl, Frames
call AddNTimes call AddNTimes
ld d, h ld d, h
ld e, l ld e, l
ld hl, VTiles2 tile $79 ld hl, VTiles2 tile $79
lb bc, BANK(Frames), 6 lb bc, BANK(Frames), TILES_PER_FRAME
call Functionddc call Get1bpp_2
ld hl, VTiles2 tile $7f ld hl, VTiles2 tile $7f
ld de, GFX_f9204 ld de, GFX_f9204
lb bc, BANK(GFX_f9204), 1 lb bc, BANK(GFX_f9204), 1
call Functionddc call Get1bpp_2
ret ret
; fb4f2 ; fb4f2
@@ -75089,60 +75089,62 @@ Functionfb4f2: ; fb4f2
ld de, FontBattleExtra ld de, FontBattleExtra
ld hl, VTiles2 tile $60 ld hl, VTiles2 tile $60
lb bc, BANK(FontBattleExtra), $c lb bc, BANK(FontBattleExtra), $c
call Functiondc9 call Get2bpp_2
ld hl, VTiles2 tile $70 ld hl, VTiles2 tile $70
ld de, FontBattleExtra + $100 ld de, FontBattleExtra + $10 * LEN_2BPP_TILE
lb bc, BANK(FontBattleExtra), 3 lb bc, BANK(FontBattleExtra), 3
call Functiondc9 call Get2bpp_2
call Functionfb4cc call LoadFrame
Functionfb50d: ; fb50d Functionfb50d: ; fb50d
ld de, GFX_f8ac0 ld de, EnemyHPBarBorderGFX
ld hl, VTiles2 tile $6c ld hl, VTiles2 tile $6c
lb bc, BANK(GFX_f8ac0), 4 lb bc, BANK(EnemyHPBarBorderGFX), 4
call Functionddc call Get1bpp_2
ld de, GFX_f8ae0 ld de, HPExpBarBorderGFX
ld hl, VTiles2 tile $73 ld hl, VTiles2 tile $73
lb bc, BANK(GFX_f8ae0), 6 lb bc, BANK(HPExpBarBorderGFX), 6
call Functionddc call Get1bpp_2
ld de, ExpBarGFX ld de, ExpBarGFX
ld hl, VTiles2 tile $55 ld hl, VTiles2 tile $55
lb bc, BANK(ExpBarGFX), 9 lb bc, BANK(ExpBarGFX), 9
call Functiondc9 call Get2bpp_2
ld de, GFX_f9214 + $90 ld de, GFX_f9214 + 9 * LEN_2BPP_TILE
ld hl, VTiles2 tile $5e ld hl, VTiles2 tile $5e
lb bc, BANK(GFX_f9214), 2 lb bc, BANK(GFX_f9214), 2
call Functiondc9 call Get2bpp_2
ret ret
; fb53e ; fb53e
Functionfb53e: ; fb53e Functionfb53e: ; fb53e
call _LoadFontsBattleExtra call _LoadFontsBattleExtra
ld de, GFX_f8ac0 ld de, EnemyHPBarBorderGFX
ld hl, VTiles2 tile $6c ld hl, VTiles2 tile $6c
lb bc, BANK(GFX_f8ac0), 4 lb bc, BANK(EnemyHPBarBorderGFX), 4
call Functionddc call Get1bpp_2
ld de, GFX_f8ae0 ld de, HPExpBarBorderGFX
ld hl, VTiles2 tile $78 ld hl, VTiles2 tile $78
lb bc, BANK(GFX_f8ae0), 1 lb bc, BANK(HPExpBarBorderGFX), 1
call Functionddc call Get1bpp_2
ld de, GFX_f8ae0 + $18 ld de, HPExpBarBorderGFX + 3 * LEN_1BPP_TILE
ld hl, VTiles2 tile $76 ld hl, VTiles2 tile $76
lb bc, BANK(GFX_f8ae0), 2 lb bc, BANK(HPExpBarBorderGFX), 2
call Functionddc call Get1bpp_2
ld de, ExpBarGFX ld de, ExpBarGFX
ld hl, VTiles2 tile $55 ld hl, VTiles2 tile $55
lb bc, BANK(ExpBarGFX), 8 lb bc, BANK(ExpBarGFX), 8
call Functiondc9 call Get2bpp_2
Functionfb571: ; fb571 Functionfb571: ; fb571
ld de, GFX_f89b0 ld de, GFX_f89b0
ld hl, VTiles2 tile $31 ld hl, VTiles2 tile $31
lb bc, BANK(GFX_f89b0), $11 lb bc, BANK(GFX_f89b0), $11
call Functiondc9 call Get2bpp_2
ret ret
; fb57e ; fb57e
; These functions seem to be related to backwards compatibility
Functionfb57e: ; fb57e Functionfb57e: ; fb57e
ld a, [wd003] ld a, [wd003]
ld hl, OTPartyMon1Species ld hl, OTPartyMon1Species
@@ -77306,6 +77308,7 @@ Function104265: ; 104265 (41:4265)
Function104284:: ; 104284 Function104284:: ; 104284
; 2bpp when [rLCDC] & $80
; switch to WRAM bank 6 ; switch to WRAM bank 6
ld a, [rSVBK] ld a, [rSVBK]
push af push af
@@ -77348,16 +77351,17 @@ endr
; 1042b2 ; 1042b2
Function1042b2:: ; 1042b2 Function1042b2:: ; 1042b2
; 1bpp when [rLCDC] & $80
.loop .loop
ld a, c ld a, c
cp $10 cp $10
jp c, .asm_1042d6 jp c, .bankswitch
jp z, .asm_1042d6 jp z, .bankswitch
push bc push bc
push hl push hl
push de push de
ld c, $10 ld c, $10
call .asm_1042d6 call .bankswitch
pop de pop de
ld hl, $80 ld hl, $80
add hl, de add hl, de
@@ -77373,34 +77377,40 @@ Function1042b2:: ; 1042b2
jr .loop jr .loop
; 1042d6 ; 1042d6
.asm_1042d6: ; 1042d6 .bankswitch: ; 1042d6
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $6 ld a, $6
ld [rSVBK], a ld [rSVBK], a
push bc push bc
push hl push hl
ld a, b ld a, b
ld l, c ld l, c
ld h, $0 ld h, $0
rept 3 rept 3
add hl, hl add hl, hl ; multiply by 8
endr endr
ld c, l ld c, l
ld b, h ld b, h
ld h, d ld h, d
ld l, e ld l, e
ld de, w6_d000 ld de, w6_d000
call Functiondef call FarCopyBytesDouble_DoubleBankSwitch
pop hl pop hl
pop bc pop bc
push bc push bc
call DelayFrame call DelayFrame
pop bc pop bc
ld d, h ld d, h
ld e, l ld e, l
ld hl, w6_d000 ld hl, w6_d000
call Function104209 call Function104209
pop af pop af
ld [rSVBK], a ld [rSVBK], a
ret ret
@@ -80944,7 +80954,7 @@ Function106464:: ; 106464
ld hl, VTiles2 tile $6b ld hl, VTiles2 tile $6b
ld b, $f ; XXX no graphics at 0f:40b0 ld b, $f ; XXX no graphics at 0f:40b0
call Get2bpp call Get2bpp
callba Functionfb4cc callba LoadFrame
ret ret
; 10649b ; 10649b

2
misc/mobile_42.asm
View File

@@ -1407,7 +1407,7 @@ Function108ad4: ; 108ad4
ld [rVBK], a ld [rVBK], a
ld hl, VTiles2 tile $4a ld hl, VTiles2 tile $4a
lb bc, $42, $10 lb bc, $42, $10
call Functiondc9 call Get2bpp_2
call DelayFrame call DelayFrame
ld a, $0 ld a, $0
ld [rVBK], a ld [rVBK], a