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

Fix unnecessary white space and retire add_n_times

Browse Source
This commit is contained in:
PikalaxALT
2015-07-20 11:28:05 -04:00
parent bef792f2d2
commit d9300a9bec
14 changed files with 997 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
battle/core.asm
View File

File diff suppressed because it is too large Load Diff

45
data/wild/fish.asm
View File

@@ -6,16 +6,18 @@ FishAction: ; 92402
push af
push bc
push hl
; Get the fishing group for this map.
ld b, e
call GetFishGroupHeader
ld hl, FishGroupHeaders
add_n_times hl, de, 7
rept 7
add hl, de
endr
call Fish
pop hl
pop bc
pop af
@@ -42,29 +44,31 @@ Fish: ; 9241a
inc hl
ld e, b
ld d, 0
add_n_times hl, de, 2
rept 2
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
; Encounter chance for this monster:
call Random
.CheckEncounter
cp [hl]
jr z, .ReadMon
jr c, .ReadMon
; Next monster...
inc hl
inc hl
inc hl
jr .CheckEncounter
.ReadMon
; We're done with the encounter chance
inc hl
; Species 0 triggers a read from a time-based encounter table.
ld a, [hli]
ld d, a
@@ -74,21 +78,20 @@ Fish: ; 9241a
; Level
ld e, [hl]
ret
.NoBite
ld de, 0
ret
.TimeEncounter
; The level byte is repurposed as the index for the new table.
ld e, [hl]
ld d, 0
ld hl, TimeFishGroups
rept 4
add hl, de
add hl, de
add hl, de
add hl, de
endr
; One nightmon, then one daymon
ld a, [TimeOfDay]
@@ -97,7 +100,7 @@ Fish: ; 9241a
jr c, .TimeSpecies
inc hl
inc hl
.TimeSpecies
ld d, [hl]
inc hl
@@ -115,27 +118,27 @@ GetFishGroupHeader: ; 9245b
bit 2, [hl]
pop hl
jr z, .end
; Groups 11 and 12 have special attributes.
ld a, d
cp 11
jr z, .group11
cp 12
jr z, .group12
.end
dec d
ld e, d
ld d, 0
ret
.group11
ld a, [wdfce]
cp 1
jr nz, .end
ld d, 6
jr .end
.group12
ld a, [wdfce]
cp 2

12
engine/color.asm
View File

@@ -806,7 +806,9 @@ Function9764: ; 9764
Function976b: ; 976b
ld l, a
ld h, 0
add_n_times hl, hl, 2
rept 2
add hl,hl
endr
ld bc, TrainerPalettes
add hl, bc
ret
@@ -1974,7 +1976,9 @@ Functionb1de: ; b1de
push hl
ld l, a
ld h, 0
add_n_times hl, hl, 3
rept 3
add hl,hl
endr
ld de, TilesetBGPalette
add hl, de
ld e, l
@@ -2014,7 +2018,9 @@ Functionb1de: ; b1de
ld a, [MapGroup]
ld l, a
ld h, 0
add_n_times hl, hl, 3
rept 3
add hl,hl
endr
ld de, RoofPals
add hl, de
ld a, [TimeOfDayPal]

8
engine/events.asm
View File

@@ -472,7 +472,9 @@ Function968ec: ; 968ec
ld a, [hli]
ld h, [hl]
ld l, a
add_n_times hl, de, 4
rept 4
add hl,de
endr
call GetMapScriptHeaderBank
call GetFarHalfword
@@ -1043,7 +1045,9 @@ Function96beb: ; 96beb
ld c, a
ld b, 0
ld hl, ScriptPointers96c0c
add_n_times hl, bc, 3
rept 3
add hl,bc
endr
ld a, [hli]
ld [ScriptBank], a
ld a, [hli]

12
engine/map_objects.asm
View File

@@ -226,7 +226,9 @@ Function444d: ; 444d
ld a, [hl]
ld l, a
ld h, 0
add_n_times hl, hl, 2
rept 2
add hl,hl
endr
add hl, de
ld a, [hli]
ld h, [hl]
@@ -1385,7 +1387,9 @@ Function4a46: ; 4a46
ld e, a
ld d, 0
ld hl, .data_4a81
add_n_times hl, de, 2
rept 2
add hl,de
endr
ld d, [hl]
inc hl
ld e, [hl]
@@ -3655,7 +3659,9 @@ Function5ac2: ; 5ac2
ld c, a
ld b, 0
ld hl, .Addresses
add_n_times hl, bc, 2
rept 2
add hl,bc
endr
ld c, [hl]
inc hl
ld b, [hl]

212
engine/predef.asm
View File

@@ -1,106 +1,108 @@
GetPredefPointer:: ; 854b
; Return the bank and address of PredefID in a and PredefAddress.
; Save hl for later (back in Predef)
ld a, h
ld [PredefTemp], a
ld a, l
ld [PredefTemp + 1], a
push de
ld a, [PredefID]
ld e, a
ld d, 0
ld hl, PredefPointers
add_n_times hl, de, 3
pop de
ld a, [hli]
ld [PredefAddress + 1], a
ld a, [hli]
ld [PredefAddress], a
ld a, [hl]
ret
; 856b
PredefPointers:: ; 856b
; $4b Predef pointers
; address, bank
add_predef LearnMove ; $0
add_predef Predef1
add_predef HealParty
add_predef FlagPredef
add_predef Functionc699
add_predef FillPP
add_predef Functiond88c
add_predef Functionda96
add_predef Functiondb3f ; $8
add_predef Functionde6e
add_predef GiveEgg
add_predef Functionc6e0
add_predef Functione167
add_predef Functione17b
add_predef CanLearnTMHMMove
add_predef GetTMHMMove
add_predef Function28eef ; $ 10
add_predef PrintMoveDesc
add_predef UpdatePlayerHUD
add_predef FillBox
add_predef Function3d873
add_predef UpdateEnemyHUD
add_predef StartBattle
add_predef FillInExpBar
add_predef Function3f43d ; $18
add_predef Function3f47c
add_predef LearnLevelMoves
add_predef FillMoves
add_predef Function421e6
add_predef Function28f63
add_predef Function28f24
add_predef Function5084a
add_predef ListMoves ; $20
add_predef Function50d2e
add_predef Function50cdb
add_predef Function50c50
add_predef GetGender
add_predef StatsScreenInit
add_predef DrawPlayerHP
add_predef DrawEnemyHP
add_predef PrintTempMonStats ; $28
add_predef GetTypeName
add_predef PrintMoveType
add_predef PrintType
add_predef PrintMonTypes
add_predef GetUnownLetter
add_predef Functioncbcdd
add_predef Predef2F
add_predef Function9853 ; $30
add_predef Function864c
add_predef Function91d11
add_predef CheckContestMon
add_predef Function8c20f
add_predef Function8c000
add_predef Function8c000_2
add_predef PlayBattleAnim
add_predef Predef38 ; $38
add_predef Predef39
add_predef Functionfd1d0
add_predef PartyMonItemName
add_predef GetFrontpic
add_predef GetBackpic
add_predef Function5108b
add_predef GetTrainerPic
add_predef DecompressPredef ; $40
add_predef Function347d3
add_predef ConvertMon_1to2
add_predef Functionfb877
add_predef Functiond0000
add_predef Function50d0a
add_predef Functiond00a3
add_predef Functiond008e
add_predef Functiond0669 ; $48
add_predef Functiond066e
dbw $ff, Function2d43 ; ????
GetPredefPointer:: ; 854b
; Return the bank and address of PredefID in a and PredefAddress.
; Save hl for later (back in Predef)
ld a, h
ld [PredefTemp], a
ld a, l
ld [PredefTemp + 1], a
push de
ld a, [PredefID]
ld e, a
ld d, 0
ld hl, PredefPointers
rept 3
add hl,de
endr
pop de
ld a, [hli]
ld [PredefAddress + 1], a
ld a, [hli]
ld [PredefAddress], a
ld a, [hl]
ret
; 856b
PredefPointers:: ; 856b
; $4b Predef pointers
; address, bank
add_predef LearnMove ; $0
add_predef Predef1
add_predef HealParty
add_predef FlagPredef
add_predef Functionc699
add_predef FillPP
add_predef Functiond88c
add_predef Functionda96
add_predef Functiondb3f ; $8
add_predef Functionde6e
add_predef GiveEgg
add_predef Functionc6e0
add_predef Functione167
add_predef Functione17b
add_predef CanLearnTMHMMove
add_predef GetTMHMMove
add_predef Function28eef ; $ 10
add_predef PrintMoveDesc
add_predef UpdatePlayerHUD
add_predef FillBox
add_predef Function3d873
add_predef UpdateEnemyHUD
add_predef StartBattle
add_predef FillInExpBar
add_predef Function3f43d ; $18
add_predef Function3f47c
add_predef LearnLevelMoves
add_predef FillMoves
add_predef Function421e6
add_predef Function28f63
add_predef Function28f24
add_predef Function5084a
add_predef ListMoves ; $20
add_predef Function50d2e
add_predef Function50cdb
add_predef Function50c50
add_predef GetGender
add_predef StatsScreenInit
add_predef DrawPlayerHP
add_predef DrawEnemyHP
add_predef PrintTempMonStats ; $28
add_predef GetTypeName
add_predef PrintMoveType
add_predef PrintType
add_predef PrintMonTypes
add_predef GetUnownLetter
add_predef Functioncbcdd
add_predef Predef2F
add_predef Function9853 ; $30
add_predef Function864c
add_predef Function91d11
add_predef CheckContestMon
add_predef Function8c20f
add_predef Function8c000
add_predef Function8c000_2
add_predef PlayBattleAnim
add_predef Predef38 ; $38
add_predef Predef39
add_predef Functionfd1d0
add_predef PartyMonItemName
add_predef GetFrontpic
add_predef GetBackpic
add_predef Function5108b
add_predef GetTrainerPic
add_predef DecompressPredef ; $40
add_predef Function347d3
add_predef ConvertMon_1to2
add_predef Functionfb877
add_predef Functiond0000
add_predef Function50d0a
add_predef Functiond00a3
add_predef Functiond008e
add_predef Functiond0669 ; $48
add_predef Functiond066e
dbw $ff, Function2d43 ; ????
; 864c

4
engine/scripting.asm
View File

@@ -3144,7 +3144,9 @@ ExitScriptSubroutine: ; 0x97b9a
ld e, [hl]
ld d, $0
ld hl, wd43d
add_n_times hl, de, 3
rept 3
add hl,de
endr
ld a, [hli]
ld b, a
and " "

4
engine/spawn_points.asm
View File

@@ -56,7 +56,9 @@ LoadSpawnPoint: ; 1531f
jr z, .spawn_n_a
ld l, a
ld h, 0
add_n_times hl, hl, 2 ; multiply hl by 4
rept 2 ; multiply hl by 4
add hl,hl
endr
ld de, SpawnPoints
add hl, de
ld a, [hli]

4
engine/specials.asm
View File

@@ -2,7 +2,9 @@
Special:: ; c01b
; Run script special de.
ld hl, SpecialsPointers
add_n_times hl, de, 3
rept 3
add hl,de
endr
ld b, [hl]
inc hl
ld a, [hli]

24
home.asm
View File

@@ -715,14 +715,14 @@ ClearPalettes:: ; 3317
ld a, [hCGB]
and a
jr nz, .cgb
; DMG: just change palettes to 0 (white)
xor a
ld [rBGP], a
ld [rOBP0], a
ld [rOBP1], a
ret
.cgb
ld a, [rSVBK]
push af
@@ -755,11 +755,11 @@ GetSGBLayout:: ; 3340
ld a, [hCGB]
and a
jr nz, .sgb
ld a, [hSGB]
and a
ret z
.sgb
predef_jump Function864c ; LoadSGBLayout
; 334e
@@ -872,7 +872,9 @@ GetName:: ; 33c3
ld e, a
ld d, 0
ld hl, NamesPointers
add_n_times hl, de, 3
rept 3
add hl, de
endr
ld a, [hli]
rst Bankswitch
ld a, [hli]
@@ -1788,7 +1790,7 @@ GetBaseData:: ; 3856
push af
ld a, BANK(BaseData)
rst Bankswitch
; Egg doesn't have BaseData
ld a, [CurSpecies]
cp EGG
@@ -1803,16 +1805,16 @@ GetBaseData:: ; 3856
ld bc, BaseData1 - BaseData0
call CopyBytes
jr .end
.egg
; ????
ld de, UnknownEggPic
; Sprite dimensions
ld b, $55 ; 5x5
ld hl, BasePicSize
ld [hl], b
; ????
ld hl, BasePadding
ld [hl], e
@@ -1823,12 +1825,12 @@ GetBaseData:: ; 3856
inc hl
ld [hl], d
jr .end
.end
; Replace Pokedex # with species
ld a, [CurSpecies]
ld [BaseDexNo], a
pop af
rst Bankswitch
pop hl

12
home/map.asm
View File

@@ -150,7 +150,9 @@ Function2198:: ; 2198
add a
ld l, a
ld h, 0
add_n_times hl, hl, 3
rept 3
add hl,hl
endr
ld a, [TilesetBlocksAddress]
add l
ld l, a
@@ -1703,7 +1705,9 @@ GetFacingTileCoord:: ; 2a07
srl a
ld l, a
ld h, 0
add_n_times hl, hl, 2
rept 2
add hl,hl
endr
ld de, .Directions
add hl, de
@@ -1745,7 +1749,9 @@ Function2a3c:: ; 2a3c
jr z, .nope
ld l, a
ld h, $0
add_n_times hl, hl, 2
rept 2
add hl,hl
endr
ld a, [TilesetCollisionAddress]
ld c, a
ld a, [TilesetCollisionAddress + 1]

12
home/map_objects.asm
View File

@@ -493,7 +493,9 @@ Function1a2f:: ; 1a2f
ld hl, ObjectStruct3_Data
ld e, a
ld d, 0
add_n_times hl, de, OBJECT_STRUCT_3_DATA_WIDTH
rept OBJECT_STRUCT_3_DATA_WIDTH
add hl,de
endr
ld a, [hl]
ret
; 1a47
@@ -504,7 +506,9 @@ Function1a47:: ; 1a47
ld e, a
ld d, 0
ld hl, ObjectStruct3_Data + 1
add_n_times hl, de, OBJECT_STRUCT_3_DATA_WIDTH
rept OBJECT_STRUCT_3_DATA_WIDTH
add hl,de
endr
ld a, BANK(ObjectStruct3_Data)
call GetFarByte
add a
@@ -542,7 +546,9 @@ Function1a71:: ; 1a71
ld e, a
ld d, 0
ld hl, ObjectStruct3_Data + 1
add_n_times hl, de, OBJECT_STRUCT_3_DATA_WIDTH
rept OBJECT_STRUCT_3_DATA_WIDTH
add hl,de
endr
ld b, h
ld c, l
pop de

6
macros.asm
View File

@@ -142,9 +142,3 @@ bcd: MACRO
shift
endr
ENDM
add_n_times: MACRO
rept \3
add \1, \2
endr
ENDM

1070
main.asm
View File

File diff suppressed because it is too large Load Diff