summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-12-14 15:47:00 -0600
committerdannye <33dannye@gmail.com>2020-12-14 15:47:00 -0600
commitd4c65263cd550f057681f86f5d09c3676ebab755 (patch)
tree966af4e1f8f375fafa7d065ce081e1a5953a0d3c /src/engine
parentf4d31e19b0de7c9390f5645b551212ce2696b7b5 (diff)
Fix some comment alignment
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/booster_packs.asm12
-rw-r--r--src/engine/home.asm14
2 files changed, 13 insertions, 13 deletions
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm
index a799d71..238a8b2 100644
--- a/src/engine/booster_packs.asm
+++ b/src/engine/booster_packs.asm
@@ -164,7 +164,7 @@ GetBoosterCardType: ; 1e2a0 (7:62a0)
pop hl
ret
-CardTypeTable: ; 1e2b1 (7:62b1)
+CardTypeTable: ; 1e2b1 (7:62b1)
db BOOSTER_CARD_TYPE_FIRE ; TYPE_PKMN_FIRE
db BOOSTER_CARD_TYPE_GRASS ; TYPE_PKMN_GRASS
db BOOSTER_CARD_TYPE_LIGHTNING ; TYPE_PKMN_LIGHTNING
@@ -344,7 +344,7 @@ GenerateRandomEnergy: ; 1e387 (7:6387)
jr AddBoosterEnergyToDrawnEnergies
; generates a booster with 10 random energies
-GenerateRandomEnergyBooster: ; 1e390 (7:6390)
+GenerateRandomEnergyBooster: ; 1e390 (7:6390)
ld a, NUM_CARDS_IN_BOOSTER
.generate_energy_loop
push af
@@ -355,22 +355,22 @@ GenerateRandomEnergyBooster: ; 1e390 (7:6390)
jr ZeroBoosterRarityData
; generates a booster with 5 Lightning energies and 5 Fire energies
-GenerateEnergyBoosterLightningFire: ; 1e39c (7:639c)
+GenerateEnergyBoosterLightningFire: ; 1e39c (7:639c)
ld hl, EnergyBoosterLightningFireData
jr GenerateTwoTypesEnergyBooster
; generates a booster with 5 Water energies and 5 Fighting energies
-GenerateEnergyBoosterWaterFighting: ; 1e3a1 (7:63a1)
+GenerateEnergyBoosterWaterFighting: ; 1e3a1 (7:63a1)
ld hl, EnergyBoosterWaterFightingData
jr GenerateTwoTypesEnergyBooster
; generates a booster with 5 Grass energies and 5 Psychic energies
-GenerateEnergyBoosterGrassPsychic: ; 1e3a6 (7:63a6)
+GenerateEnergyBoosterGrassPsychic: ; 1e3a6 (7:63a6)
ld hl, EnergyBoosterGrassPsychicData
jr GenerateTwoTypesEnergyBooster
; generates a booster with 5 energies of 2 different types each
-GenerateTwoTypesEnergyBooster: ; 1e3ab (7:63ab)
+GenerateTwoTypesEnergyBooster: ; 1e3ab (7:63ab)
ld b, $02
.add_two_energies_to_booster_loop
ld c, NUM_CARDS_IN_BOOSTER / 2
diff --git a/src/engine/home.asm b/src/engine/home.asm
index cd9c9c9..0094924 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -653,7 +653,7 @@ EmptyScreen: ; 04a2 (0:04a2)
AttrBlkPacket_EmptyScreen: ; 04bf (0:04bf)
sgb ATTR_BLK, 1 ; sgb_command, length
db 1 ; number of data sets
- ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
+ ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
db ATTR_BLK_CTRL_INSIDE + ATTR_BLK_CTRL_LINE, 0 << 0 + 0 << 2, 0, 0, 19, 17 ; data set 1
ds 6 ; data set 2
ds 2 ; data set 3
@@ -1928,7 +1928,7 @@ Pal23Packet_0b00: ; 0b00 (0:0b00)
AttrBlkPacket_0b10: ; 0b10 (0:0b10)
sgb ATTR_BLK, 1 ; sgb_command, length
db 1 ; number of data sets
- ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
+ ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
db ATTR_BLK_CTRL_INSIDE + ATTR_BLK_CTRL_LINE, 1 << 0 + 2 << 2, 5, 5, 10, 10 ; data set 1
ds 6 ; data set 2
ds 2 ; data set 3
@@ -5830,7 +5830,7 @@ ColorizeTextBoxSGB: ; 1f1b (0:1f1b)
AttrBlkPacket_TextBox: ; 1f4f (0:1f4f)
sgb ATTR_BLK, 1 ; sgb_command, length
db 1 ; number of data sets
- ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
+ ; Control Code, Color Palette Designation, X1, Y1, X2, Y2
db ATTR_BLK_CTRL_INSIDE + ATTR_BLK_CTRL_LINE, 0 << 0 + 1 << 2, 0, 0, 0, 0 ; data set 1
ds 6 ; data set 2
ds 2 ; data set 3
@@ -6182,7 +6182,7 @@ LoadSymbolsFont: ; 2119 (0:2119)
; if $4000 ≤ hl ≤ $7fff
; copy b tiles from Gfx2:hl to de
CopyFontsOrDuelGraphicsTiles: ; 2121 (0:2121)
- ld a, BANK(Fonts); BANK(DuelGraphics)
+ ld a, BANK(Fonts) ; BANK(DuelGraphics)
call BankpushROM
ld c, TILE_SIZE
call CopyGfxData
@@ -6240,7 +6240,7 @@ DrawDuelBoxMessage: ; 2167 (0:2167)
; from gfx/fonts/full_width/3.1bpp and gfx/fonts/full_width/4.1bpp
LoadFullWidthFontTiles: ; 2189 (0:2189)
ld hl, FullWidthFonts + $3cc tiles_1bpp - $4000
- ld a, BANK(Fonts); BANK(DuelGraphics)
+ ld a, BANK(Fonts) ; BANK(DuelGraphics)
call BankpushROM
push hl
ld e, l
@@ -6999,7 +6999,7 @@ ConvertTileNumberToTileDataAddress: ; 2518 (0:2518)
; create, at wTextTileBuffer, a full-width font tile given its
; within the full-width font graphics (FullWidthFonts) in hl
CreateFullWidthFontTile: ; 252e (0:252e)
- ld a, BANK(Fonts); BANK(DuelGraphics)
+ ld a, BANK(Fonts) ; BANK(DuelGraphics)
call BankpushROM
ld de, wTextTileBuffer
push de
@@ -8977,7 +8977,7 @@ LoadCardGfx: ; 2fa0 (0:2fa0)
; identical to CopyFontsOrDuelGraphicsTiles
CopyFontsOrDuelGraphicsTiles2: ; 2fcb (0:2fcb)
- ld a, BANK(Fonts); BANK(DuelGraphics)
+ ld a, BANK(Fonts) ; BANK(DuelGraphics)
call BankpushROM
ld c, TILE_SIZE
call CopyGfxData