[RTM] Fix triple newlines left over from removing address comments, and other improvements #534

Rangi42 · 2018-06-25T03:25:14Z

Example:

Function1337: ; 1337
    ret
; 1338

Function1338: ; 1338
    ...

became:

Function1337:
    ret


Function1338:
    ...

so this reformats it to:

Function1337:
    ret

Function1338:
    ...

mid-kid · 2018-06-25T09:43:36Z

I actually removed the entire line if I removed the address comment on an otherwise blank line.
It's probable, however that things like

Function1337: ; 1337
    ret

; 1338

Function1338: ; 1338
    ...

became

Function1337: ; 1337
    ret


Function1338: ; 1338
    ...

I thought it was fine because there's a lot of other places where two newlines are used between functions for some reason.
Any two newlines separating things in constants/ already existed before I went through them. I didn't touch those at all.

mid-kid

I'm actually happy to see double blank lines between functions used less, as they're rather arbitrary.

mid-kid · 2018-06-25T09:47:35Z

engine/battle/ai/scoring.asm

@@ -232,7 +230,6 @@ AI_Types:
 	jr .checkmove



There's still three newlines here?

mid-kid · 2018-06-25T09:47:45Z

engine/battle/ai/scoring.asm

@@ -260,7 +257,6 @@ AI_Offensive:
 	jr .checkmove



Here as well? Not going to point all of them out, but there's more.

Rangi42 · 2018-06-25T16:24:43Z

I don't know why those were missed the first time, but now they're done.

(events_2.asm was only separate because scripting.asm intervenes; but other files have a similar "code / INCLUDE self-contained code / more code" structure to this)

Using X+1 makes sense when X is the last control character in a contiguous group, but "┘" is not, so we can use the first non-control character

yenatch · 2018-06-30T21:31:52Z

engine/pokemon/correct_nick_errors.asm

@@ -70,5 +70,5 @@ CorrectNickErrors::
 	db "<ROUTE>",  "<GREEN>" + 1
 	db "<ENEMY>",  "<ENEMY>" + 1
 	db "<MOM>",    "<TM>"    + 1
-	db "<ROCKET>", "┘"       + 1
+	db "<ROCKET>", " "


" " has no relation other than being one after. If border tiles don't count as control characters the problem is the labelling.

I guess border tiles can count as control characters, then.

yenatch · 2018-06-30T21:34:52Z

engine/games/card_flip.asm

-CARDFLIP_LIGHT_OFF EQU $ef
-CARDFLIP_LIGHT_ON  EQU $f5
+CARDFLIP_LIGHT_OFF EQUS "\"♂\"" ; $ef
+CARDFLIP_LIGHT_ON  EQUS "\"♀\"" ; $f5


This seems like an assembler bug. EQU "♂" should be allowed.

True; but until then the escapes are necessary, and were already used in some other files.

yenatch · 2018-06-30T21:48:28Z

home/audio.asm

@@ -50,8 +50,6 @@ UpdateSound::

 _LoadMusicByte::
 ; wCurMusicByte = [a:de]
-GLOBAL LoadMusicByte


This was here because BANK() used to not flag labels for import, but it was fixed a while ago.

Rangi42 added 2 commits June 24, 2018 23:22

Fix triple newlines left over from removing address comments

67d1364

"→" should be "ェ"

0f074e2

mid-kid reviewed Jun 25, 2018

View reviewed changes

Rangi42 added 3 commits June 25, 2018 12:01

Remove more triple newlines

9f3e914

Single newline at the end of files

5693cc4

No space between labels and bodies

1caa50a

Rangi42 added 3 commits June 25, 2018 13:45

Keep more data/ INCLUDEs with relevant routines

67152ea

Merge events_2.asm with events.asm

00c2dba

(events_2.asm was only separate because scripting.asm intervenes; but other files have a similar "code / INCLUDE self-contained code / more code" structure to this)

Use charmap “ and ”

9ed402c

Rangi42 changed the title ~~Fix triple newlines left over from removing address comments~~ [RTM] Fix triple newlines left over from removing address comments, and other improvements Jun 25, 2018

Rangi42 added 7 commits June 25, 2018 14:09

"┘" + 1 == " "

06eb89d

Using X+1 makes sense when X is the last control character in a contiguous group, but "┘" is not, so we can use the first non-control character

Use charmap values

a6560d0

Use specific constants for overwritten text tiles

aa334dc

Use :: for all global labels, not the GLOBAL keyword

4eb8165

Add more collision nybble constants

e2cf3eb

No linebreak

6306e59

Use significant values 5, 6, and 7

8b06ff0

yenatch reviewed Jun 30, 2018

View reviewed changes

" " → "┘" + 1

da5125e

yenatch reviewed Jun 30, 2018

View reviewed changes

yenatch merged commit 2641f93 into pret:master Jun 30, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RTM] Fix triple newlines left over from removing address comments, and other improvements #534

[RTM] Fix triple newlines left over from removing address comments, and other improvements #534

Rangi42 commented Jun 25, 2018

mid-kid commented Jun 25, 2018 •

edited

mid-kid left a comment •

edited

mid-kid Jun 25, 2018

mid-kid Jun 25, 2018

Rangi42 commented Jun 25, 2018

yenatch Jun 30, 2018

Rangi42 Jun 30, 2018

yenatch Jun 30, 2018

Rangi42 Jun 30, 2018

yenatch Jun 30, 2018 •

edited

[RTM] Fix triple newlines left over from removing address comments, and other improvements #534

[RTM] Fix triple newlines left over from removing address comments, and other improvements #534

Conversation

Rangi42 commented Jun 25, 2018

mid-kid commented Jun 25, 2018 • edited

mid-kid left a comment • edited

Choose a reason for hiding this comment

mid-kid Jun 25, 2018

Choose a reason for hiding this comment

mid-kid Jun 25, 2018

Choose a reason for hiding this comment

Rangi42 commented Jun 25, 2018

yenatch Jun 30, 2018

Choose a reason for hiding this comment

Rangi42 Jun 30, 2018

Choose a reason for hiding this comment

yenatch Jun 30, 2018

Choose a reason for hiding this comment

Rangi42 Jun 30, 2018

Choose a reason for hiding this comment

yenatch Jun 30, 2018 • edited

Choose a reason for hiding this comment

mid-kid commented Jun 25, 2018 •

edited

mid-kid left a comment •

edited

yenatch Jun 30, 2018 •

edited