pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

more cleanup

Browse Source
This commit is contained in:
yenatch 2013-07-31 19:17:35 -04:00
parent b275df6974
commit 59cb57b954
2 changed files with 53 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
main.asm
View File

@ -9322,10 +9322,10 @@ Function2f79: ; 2f79
push bc push bc
ld a, [hROMBank] ld a, [hROMBank]
push af push af
ld a, $3 ld a, BANK(Functiond244)
rst Bankswitch rst Bankswitch
call $5244 call Functiond244
pop bc pop bc
ld a, b ld a, b
rst Bankswitch rst Bankswitch
@ -20993,29 +20993,29 @@ Functiond244: ; d244
Functiond27b: ; d27b Functiond27b: ; d27b
ld a, l ld a, l
cp $92 cp TMsHMsEnd % $100
ret nz ret nz
ld a, h ld a, h
cp $d8 cp TMsHMsEnd / $100
ret ret
; d283 ; d283
Functiond283: ; d283 Functiond283: ; d283
ld c, $14 ld c, $14
ld a, e ld a, e
cp $92 cp TMsHMsEnd % $100
jr nz, .asm_d28e jr nz, .asm_d28e
ld a, d ld a, d
cp $d8 cp TMsHMsEnd / $100
ret z ret z
.asm_d28e .asm_d28e
ld c, $32 ld c, $32
ld a, e ld a, e
cp $f1 cp BallsEnd % $100
jr nz, .asm_d299 jr nz, .asm_d299
ld a, d ld a, d
cp $d8 cp BallsEnd / $100
ret z ret z
.asm_d299 .asm_d299
@ -21029,7 +21029,7 @@ Functiond29c: ; d29c
inc hl inc hl
ld a, [CurItem] ld a, [CurItem]
ld c, a ld c, a
ld b, $0 ld b, 0
.asm_d2a5 .asm_d2a5
ld a, [hli] ld a, [hli]
cp $ff cp $ff
@ -33128,7 +33128,6 @@ Function2c03a: ; 2c03a
; 2c059 ; 2c059
Function2c059: ; 2c059 Function2c059: ; 2c059
ld a, [de] ld a, [de]
push af push af
@ -33188,87 +33187,59 @@ Function2c075: ; 2c075
Function2c095: ; 2c095 Function2c095: ; 2c095
ld hl, .data_2c0a9 ld hl, .data_2c0a9
ld de, $d004 ld de, $d004
ld bc, $0004 ld bc, 4
call CopyBytes call CopyBytes
ld hl, $c57a ld hl, $c57a
ld de, rIE ld de, -1
jr .asm_2c0f1 jr Function2c0f1
.data_2c0a9 .data_2c0a9
db $73 db $73
db $77 db $77
db $6f db $6f
db $76 db $76
db $21 ; 2c0ad
db $c1
db $40 Function2c0ad: ; 2c0ad
db $11 ld hl, .data_2c0c1
db $4 ld de, $d004
db $d0 ld bc, 4
db $1 call CopyBytes
db $4 ld hl, $c57a
db $0 ld de, -1
db $cd jr Function2c0f1
db $26
db $30 .data_2c0c1
db $21 db $73, $5c, $6f, $76
db $7a ; 2c0c5
db $c5
db $11 Function2c0c5: ; 2c0c5
db $ff ld hl, .data_2c0ed
db $ff ld de, $d004
db $18 ld bc, 4
db $30 call CopyBytes
db $73 ld hl, $c4c9
db $5c ld de, 1
db $6f call Function2c0f1
db $76 ld a, [IsInBattle]
db $21 dec a
db $ed ret nz
db $40 ld a, [TempEnemyMonSpecies]
db $11 dec a
db $4 call CheckSeenMon
db $d0 ret z
db $1 ld hl, $c4b5
db $4 ld [hl], $5d
db $0 ret
db $cd
db $26 .data_2c0ed
db $30
db $21
db $c9
db $c4
db $11
db $1
db $0
db $cd
db $f1
db $40
db $fa
db $2d
db $d2
db $3d
db $c0
db $fa
db $4
db $d2
db $3d
db $cd
db $93
db $33
db $c8
db $21
db $b5
db $c4
db $36
db $5d
db $c9
db $6d db $6d
db $74 db $74
db $78 db $78
db $76 db $76
; 2c0f1
.asm_2c0f1 Function2c0f1: ; 2c0f1
ld a, [$d004] ld a, [$d004]
ld [hl], a ld [hl], a
ld bc, $0014 ld bc, $0014
@ -33289,7 +33260,6 @@ Function2c095: ; 2c095
; 2c10d ; 2c10d
Function2c10d: ; 2c10d Function2c10d: ; 2c10d
call Function2c165 call Function2c165
ld hl, PartyMon1CurHP ld hl, PartyMon1CurHP

4
wram.asm
View File

@ -1705,21 +1705,25 @@ KantoBadges: ; d858
SECTION "Items",BSS[$d859] SECTION "Items",BSS[$d859]
TMsHMs: ; d859 TMsHMs: ; d859
ds 57 ds 57
TMsHMsEnd
NumItems: ; d892 NumItems: ; d892
ds 1 ds 1
Items: ; d893 Items: ; d893
ds 41 ds 41
ItemsEnd
NumKeyItems: ; d8bc NumKeyItems: ; d8bc
ds 1 ds 1
KeyItems: ; d8bd KeyItems: ; d8bd
ds 26 ds 26
KeyItemsEnd
NumBalls: ; d8d7 NumBalls: ; d8d7
ds 1 ds 1
Balls: ; d8d8 Balls: ; d8d8
ds 25 ds 25
BallsEnd
SECTION "overworld",BSS[$d95b] SECTION "overworld",BSS[$d95b]
WhichRegisteredItem: ; d95b WhichRegisteredItem: ; d95b