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

More WRAM cleanup

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-09 19:41:03 -05:00
parent 880fb511e1
commit cd2a748128
34 changed files with 1043 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
event/halloffame.asm
View File

@@ -489,7 +489,7 @@ DisplayHOFMon: ; 86748
hlcoord 1, 13
ld a, "№"
ld [hli], a
ld [hl], "<PERIOD>"
ld [hl], "<DOT>"
hlcoord 3, 13
ld de, wd265
lb bc, PRINTNUM_LEADINGZEROS | 1, 3

22
event/magikarp.asm
View File

@@ -33,14 +33,14 @@ Special_CheckMagikarpLength: ; fbb32
call PrintText
; Did we beat the record?
ld hl, Buffer1
ld hl, wMagikarpLength
ld de, wBestMagikarpLengthFeet
ld c, 2
call StringCmp
jr nc, .not_long_enough
; NEW RECORD!!! Let's save that.
ld hl, Buffer1
ld hl, wMagikarpLength
ld de, wBestMagikarpLengthFeet
ld a, [hli]
ld [de], a
@@ -93,12 +93,12 @@ INCBIN "gfx/unknown/0fbbbb.2bpp"
PrintMagikarpLength: ; fbbdb
call Magikarp_LoadFeetInchesChars
ld hl, StringBuffer1
ld de, Buffer1
ld de, wMagikarpLength
lb bc, PRINTNUM_RIGHTALIGN | 1, 2
call PrintNum
ld [hl], "′"
inc hl
ld de, Buffer2
ld de, wMagikarpLength + 1
lb bc, PRINTNUM_RIGHTALIGN | 1, 2
call PrintNum
ld [hl], "″"
@@ -108,7 +108,7 @@ PrintMagikarpLength: ; fbbdb
; fbbfc
CalcMagikarpLength: ; fbbfc
; Return Magikarp's length (in mm) at MagikarpLength (big endian).
; Return Magikarp's length (in mm) at wMagikarpLength (big endian).
;
; input:
; de: EnemyMonDVs
@@ -125,9 +125,9 @@ CalcMagikarpLength: ; fbbfc
; bc = rrc(dv[0]) ++ rrc(dv[1]) ^ rrc(id)
; if bc < 10: [MagikarpLength] = c + 190
; if bc ≥ $ff00: [MagikarpLength] = c + 1370
; else: [MagikarpLength] = z × 100 + (bc − x) / y
; if bc < 10: [wMagikarpLength] = c + 190
; if bc ≥ $ff00: [wMagikarpLength] = c + 1370
; else: [wMagikarpLength] = z × 100 + (bc − x) / y
; X, Y, and Z depend on the value of b as follows:
@@ -274,7 +274,7 @@ CalcMagikarpLength: ; fbbfc
.ok
ld e, a
ld hl, MagikarpLength
ld hl, wMagikarpLength
ld [hl], d
inc hl
ld [hl], e
@@ -326,9 +326,9 @@ CalcMagikarpLength: ; fbbfc
Special_MagikarpHouseSign: ; fbcd2
ld a, [wBestMagikarpLengthFeet]
ld [Buffer1], a
ld [wMagikarpLength], a
ld a, [wBestMagikarpLengthInches]
ld [Buffer2], a
ld [wMagikarpLength + 1], a
call PrintMagikarpLength
ld hl, .CurrentRecordtext
call PrintText

8
event/overworld.asm
View File

@@ -432,7 +432,7 @@ SurfFunction: ; c909
.DoSurf: ; c95f (3:495f)
call GetSurfType
ld [Buffer2], a ; wd1eb (aliases: MovementType)
ld [Buffer2], a
call GetPartyNick
ld hl, SurfFromMenuScript
call QueueScript
@@ -569,7 +569,7 @@ TrySurfOW:: ; c9e7
jr nz, .quit
call GetSurfType
ld [MovementType], a
ld [Buffer2], a
call GetPartyNick
ld a, BANK(AskSurfScript)
@@ -837,7 +837,7 @@ dig_incave
ret
.incave
ld hl, wDigWarp
ld hl, wDigWarpNumber
ld a, [hli]
and a
jr z, .fail
@@ -851,7 +851,7 @@ dig_incave
ret
.DoDig: ; cbd8
ld hl, wDigWarp
ld hl, wDigWarpNumber
ld de, wNextWarp
ld bc, 3
call CopyBytes