summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/init.asm2
-rw-r--r--home/joypad.asm2
-rw-r--r--home/map.asm20
-rw-r--r--home/map_objects.asm2
-rw-r--r--home/movement.asm8
-rw-r--r--home/names.asm2
-rw-r--r--home/pic.asm7
-rw-r--r--home/predef.asm2
-rw-r--r--home/print_bcd.asm2
-rw-r--r--home/print_num.asm2
-rwxr-xr-xhome/tables.asm2
-rw-r--r--home/text.asm8
-rw-r--r--home/unknown_388f.asm2
-rw-r--r--home/util.asm30
14 files changed, 46 insertions, 45 deletions
diff --git a/home/init.asm b/home/init.asm
index 4c06359..a2d1745 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -13,7 +13,7 @@ SECTION "home/init.asm@Entry point", ROM0
SECTION "home/init.asm@Global check value", ROM0
; The ROM has an incorrect global check, so set it here.
; It is not corrected by RGBFIX.
- dw $C621
+ dw $C621
SECTION "home/init.asm@Init", ROM0
diff --git a/home/joypad.asm b/home/joypad.asm
index b68cb32..31d6b04 100644
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -172,7 +172,7 @@ TextboxWaitPressAorB_BlinkCursor:
; Show a blinking cursor in the lower right-hand
; corner of a textbox and wait until A or B is
; pressed.
-;
+;
; CAUTION: The cursor has to be shown when calling
; this function or no cursor will be shown at all.
; Waiting on button presses is unaffected by this.
diff --git a/home/map.asm b/home/map.asm
index 9e6da75..daaa49b 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -959,7 +959,7 @@ InitUnknownBuffercc9e:: ; 26f4
ld a, e
or d
jr z, .null
-
+
ld a, [wMapBuffer]
ld l, a
ld h, 0
@@ -1579,17 +1579,17 @@ Function2a8d:: ; 00:2a8d
.Pointers: ; 00:2ab1
dbbw $00, $55, Function2ae5
- dbbw $00, $55, Function2b52
- dbbw $00, $55, Function2b77
- dbbw $0e, $33, Function3904
+ dbbw $00, $55, Function2b52
+ dbbw $00, $55, Function2b77
+ dbbw $0e, $33, Function3904
dbbw $00, $55, Function2b39
- dbbw $0e, $33, Function391f
- dbbw $00, $33, Function2b78
- dbbw $00, $33, Function2b78
+ dbbw $0e, $33, Function391f
+ dbbw $00, $33, Function2b78
+ dbbw $00, $33, Function2b78
dbbw $0e, $33, Function3904
- dbbw $00, $55, Function2b79
- dbbw $00, $55, Function2b87
- dbbw $0e, $33, Function3920
+ dbbw $00, $55, Function2b79
+ dbbw $00, $55, Function2b87
+ dbbw $0e, $33, Function3920
dbbw $05, $33, Function14777
Function2ae5::
diff --git a/home/map_objects.asm b/home/map_objects.asm
index 1362c84..1dd875e 100644
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -325,7 +325,7 @@ GetObjectStruct:: ; 00:17bf
Function17cb::
add $10
-
+
Function17cd::
ld e, a
ldh a, [hROMBank]
diff --git a/home/movement.asm b/home/movement.asm
index db27b1e..d691786 100644
--- a/home/movement.asm
+++ b/home/movement.asm
@@ -61,7 +61,7 @@ ComputePathToWalkToPlayer::
dec a
cpl
ld h, RIGHT
-.asm_1a1d:
+.asm_1a1d:
ld d, a
ld a, c
sub e
@@ -70,7 +70,7 @@ ComputePathToWalkToPlayer::
dec a
cpl
ld l, DOWN
-.asm_1a28:
+.asm_1a28:
ld e, a
cp d
jr nc, .asm_1a32
@@ -80,7 +80,7 @@ ComputePathToWalkToPlayer::
ld a, d
ld d, e
ld e, a
-.asm_1a32:
+.asm_1a32:
pop af
ld b, a
ld a, h
@@ -110,7 +110,7 @@ ComputePathToWalkToPlayer::
pop de
ret
-.Data:
+.Data:
db $04, $05, $06, $07
db $08, $09, $0a, $0b
db $0c, $0d, $0e, $0f
diff --git a/home/names.asm b/home/names.asm
index 656835a..be029be 100644
--- a/home/names.asm
+++ b/home/names.asm
@@ -136,7 +136,7 @@ GetItemName::
jr .finish
.machine
- call GetMachineName
+ call GetMachineName
.finish
ld de, wStringBuffer1
pop bc
diff --git a/home/pic.asm b/home/pic.asm
index 65906a6..96c013b 100644
--- a/home/pic.asm
+++ b/home/pic.asm
@@ -47,10 +47,11 @@ _UncompressSpriteData:: ; 976 (0:976)
add a
add a
ld [wSpriteWidth], a
+ ; initialite bit1 to 0 and bit0 to the first input bit
+ ; this will load two chunks of data to sSpriteBuffer1 and sSpriteBuffer2
+ ; bit 0 decides in which one the first chunk is placed
call ReadNextInputBit
- ld [wSpriteLoadFlags], a ; initialite bit1 to 0 and bit0 to the first input bit
- ; this will load two chunks of data to sSpriteBuffer1 and sSpriteBuffer2
- ; bit 0 decides in which one the first chunk is placed
+ ld [wSpriteLoadFlags], a
; fallthrough
UncompressSpriteDataLoop::
diff --git a/home/predef.asm b/home/predef.asm
index f9f195a..2654c72 100644
--- a/home/predef.asm
+++ b/home/predef.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "home/predef.asm", ROM0
-Predef::
+Predef::
ld [wPredefID], a
ldh a, [hROMBank]
push af
diff --git a/home/print_bcd.asm b/home/print_bcd.asm
index 87851ae..15dbb76 100644
--- a/home/print_bcd.asm
+++ b/home/print_bcd.asm
@@ -49,7 +49,7 @@ PrintBCDDigit::
ld [hli], a
jp PrintLetterDelay
.zeroDigit
- bit 7, b ; either printing leading zeroes or
+ bit 7, b ; either printing leading zeroes or
jr z, .outputDigit ; already reached a nonzero digit?
bit 6, b
ret nz ; left-align, don't pad with space
diff --git a/home/print_num.asm b/home/print_num.asm
index c40f826..b3d8709 100644
--- a/home/print_num.asm
+++ b/home/print_num.asm
@@ -20,7 +20,7 @@ PrintNumber::
; instead of calling PrintNumber.
; This function works as follow
; There are three temporary registers
-; - hPrintNumDividend,
+; - hPrintNumDividend,
; - hPrintNumDivisor,
; - hPrintNumTemp
; All are three bytes long and organized in big-endian order.
diff --git a/home/tables.asm b/home/tables.asm
index c005ffc..038a623 100755
--- a/home/tables.asm
+++ b/home/tables.asm
@@ -1,5 +1,5 @@
INCLUDE "constants.asm"
-
+
SECTION "home/tables.asm", ROM0
; find value a from table hl with row length de
diff --git a/home/text.asm b/home/text.asm
index fbf2ce5..4996c99 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -411,8 +411,8 @@ TextCommandProcessor:: ; 10a6 (0:10a6)
ld [wTextDest], a
ld a, b
ld [wTextDest + 1], a
- ; fall through
-
+ ; fall through
+
NextTextCommand:: ; 10b7 (0:10b7)
ld a, [hli]
cp "@" ; terminator
@@ -454,7 +454,7 @@ Text_TX_BOX:: ; 10d0 (0:10d0)
call DrawTextBox
pop hl
jr NextTextCommand
-
+
Text_TX:: ; 10e2 (0:10e2)
; TX
; write text until "@"
@@ -697,7 +697,7 @@ Text_TX_DOTS: ; 11e1 (0:11e1)
ld c, l
pop hl
jp NextTextCommand
-
+
Text_TX_LINK_WAIT_BUTTON:: ; 1203 (0:1203)
push bc
call ButtonSound
diff --git a/home/unknown_388f.asm b/home/unknown_388f.asm
index d845e55..798dedb 100644
--- a/home/unknown_388f.asm
+++ b/home/unknown_388f.asm
@@ -46,7 +46,7 @@ Function38d8::
TestWildBattleStart::
ldh a, [hJoyState]
- and D_PAD
+ and D_PAD
ret z ; if no directions are down, don't try and trigger a wild encounter
call CheckBPressedDebug
jp nz, ClearAccumulator ; if b button is down, clear acc
diff --git a/home/util.asm b/home/util.asm
index 81435c2..410a331 100644
--- a/home/util.asm
+++ b/home/util.asm
@@ -51,14 +51,14 @@ Function33ef::
SkipNames::
; Returns hl + a * 6
- and a
- ret z
- ld bc, 6
+ and a
+ ret z
+ ld bc, 6
.loop:
- add hl, bc
- dec a
- jr nz, .loop
- ret
+ add hl, bc
+ dec a
+ jr nz, .loop
+ ret
AddNTimes::
; Adds bc to hl, a times
@@ -75,14 +75,14 @@ memcmp:: ; TODO: rename
; Compare c bytes at hl and de
; Returns z if all equal, nz otherwise.
.loop:
- ld a, [de]
- cp [hl]
- ret nz
- inc de
- inc hl
- dec c
- jr nz, .loop
- ret
+ ld a, [de]
+ cp [hl]
+ ret nz
+ inc de
+ inc hl
+ dec c
+ jr nz, .loop
+ ret
Function3439::
; Place 2x2 sprite from *de into OAM at slot a