OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming #456

roukaour · 2018-01-01T23:08:43Z

Also merges:

Menu work #452 Menu work
sort the symfile by symbol type #457 sort the symfile by symbol type
Consistent unused content references, and predef and special label names #459 Consistent unused content references, and predef and special label names
Replace hardcoded banks & addresses in non-mobile code #460 Replace hardcoded banks & addresses in non-mobile code

…ates)

find . -name '*.asm' -exec sed -i 's/[ \t]\+$//' {} \;

yenatch · 2018-01-19T05:33:21Z

home/names.asm

@@ -7,7 +7,7 @@ NamesPointers:: ; 33ab
 	dbw 0, PartyMonOT
 	dbw 0, OTPartyMonOT
 	dba TrainerClassNames
-	dbw $4, $4b52 ; within PackMenuGFX
+	dbw $4, PackMenuGFX + 60


This comment was just to indicate that it wasn't a valid address. It's not actually referencing PackMenuGFX. My guess would be it's a pointer to MoveDescriptions (0b:4b52). The $4, $4b52 is $4, $4000 in Gold. The address of MoveDescriptions in Gold is also at 0x4000 (6d:4000). The bank is wrong still, but 04:4000 in Gold was GetPlayerMovement, so the bank was probably wrong to begin with.

… G/S, $4b52 in Crystal)

…ts WRAM labels)

xCrystal · 2018-01-20T00:18:27Z

engine/battle/core.asm

@@ -26,7 +26,7 @@ DoBattle: ; 3c000
 	and a
 	jr z, .not_linked

-	ld a, [hLinkPlayerNumber]
+	ld a, [hSerialConnectionStatus]
 	cp $2


Some hSerialConnectionStatus constants (like USING_INTERNAL_CLOCK) are missing in code, more specifically in engine/battle/core.asm, home/init.asm, mobile/mobile_40.asm, and a few in engine/link.asm. Pointing out in case you haven't noticed, because you may already be aware.

Thanks. Even with that the link code has much left to do (e.g. the wPlayerLinkAction and wOtherPlayerLinkMode values, the many wXXXX labels, hardcoded sizes like $1b9), but I don't have the knowledge of GB serial hardware to do it.

yenatch · 2018-01-21T21:51:48Z

engine/pokedex.asm

@@ -15,6 +15,9 @@
 	const DEXSTATE_UPDATE_UNOWN_MODE
 	const DEXSTATE_EXIT

+POKDEX_SCX EQU 5


yenatch · 2018-01-21T22:28:22Z

engine/types.asm

 	jp CopyBytes
 ; 5097b


 INCLUDE "data/types/names.asm"
+
+
+Unreferenced_GetGen1TrainerClassName: ; 50a28


what? why is this here?

Should it go in engine/routines/unreferenced_getgen1trainerclassname.asm?

yenatch · 2018-01-21T23:06:12Z

wram.asm

@@ -1565,7 +1565,7 @@ wDaysSince:: db

 SECTION "WRAM 1", WRAMX

-wd000:: ds 1
+wDecompressBuffer:: ds 1


should this be a union?

No, there are no uses of unidentified wd000 left.

pretty sure wDecompressBuffer is not 1 byte large

Okay, I see. You could, but there's a big union right after it at d002, and every NEXTU would need a ds 2 at the beginning. How about a comment noting that wDecompressBuffer is larger than that? (Max size: GBCOnlyGFX takes $540 bytes uncompressed, and ~~I think LZ_170d16 takes $c10 in mobile_5c.asm~~. Oh, mobile_5c.asm should have used wDecompressScratch, not wDecompressBuffer. So yeah, $540 bytes, and wGBCOnlyDecompressBuffer would be a more accurate name.)

yenatch · 2018-01-22T01:55:09Z

charmap.asm

+	charmap "<ROUTE>",   $35 ; "ばん　どうろ"
+	charmap "<WATASHI>", $36 ; "わたし"
+	charmap "<KOKO_WA>", $37 ; "ここは"
+	charmap "<GA>",      $4a ; "が "


I have a feeling these are a 'd situation. It's fine to leave them for now but they were probably invisible.

They're dummied out in the English version, but home/text.asm and a couple of control character tables still mention them, so it's either this or JP_ROUTE_CHAR EQU $35.

What I mean is this:

charmap "ばん　どうろ", $35

? charmap "ばん　どうろ", $35 doesn't exist anywhere. The "ばん　どうろ" is just a comment explaining what the control character was for.

yenatch · 2018-01-22T02:11:49Z

engine/link_2.asm

@@ -56,7 +56,7 @@ LinkTextbox2: ; 4d35b

 .PlaceBorder: ; 4d37e
 	push hl
-	ld a, $76
+	ld a, "ぁ" ; $76


this doesnt seem like a border tile

Yeah, I undid that later.

yenatch · 2018-01-22T02:11:58Z

engine/link_trade.asm

@@ -139,7 +139,7 @@ _LoadTradeScreenBorder: ; 16d696

 LinkComms_LoadPleaseWaitTextboxBorderGFX: ; 16d69a
 	ld de, LinkCommsBorderGFX + $30 tiles
-	ld hl, vTiles2 tile $76
+	ld hl, vTiles2 tile "ぁ"


this doesnt seem right either

.pal -> .gbcpal has been omitted for now since there's no tool to convert it yet.

roukaour and others added 30 commits January 1, 2018 18:08

Consistent map naming ("Town" and "City" are left out in houses and g…

9859467

…ates)

Route 17-18 Gate and Route 29-46 Gate

eb8e55a

Remove trailing whitespace

0722de7

find . -name '*.asm' -exec sed -i 's/[ \t]\+$//' {} \;

Consistent *_palette_map.asm

3c953ef

Bold

fbfda45

Unused tileset animations stands out amid useful data

802cf61

sort the symfile by symbol type

f185cc9

Clean up XXX comments for unused content

9a3088e

Clean up Predef function names

7a24703

More unreferenced labels cleanup

6f0b815

Clean up leftover code from main.asm

7c0e903

Consolidate Special function names

f1ea15b

Finish consistent Special function names

b4a4935

Reword Magikarp length comments

d435bd8

More clarification

be2aeed

Consistent predef function names

d7970f7

More unreferenced labels and unused text

b4e0871

No more mobile EQUS ret (replace with Stubbed_ + ret)

aa9a0a9

Document more sprite anim data

7ad8ea1

More sprite anim documentation

2dd9ac0

Egg hatch shell framgent data is not exactly dsprite

776b8c7

Comment correction

648e718

1-based EZ Chat cursor data indexes

6a3045d

More G/S intro OAM documentation

64b27d8

Align comments

6cc4b53

Align comments

d5c8cb7

One more G/S intro OAM identified

ae78ee6

town_map.png matches pokegear.png

e6778f9

Use BANK for all hardcoded banks with BANK in comments.

0caea0f

Identify more G/S intro OAM data

41de67e

clean up GetName/NamesPointers

9576740

yenatch reviewed Jan 19, 2018

View reviewed changes

roukaour added 5 commits January 19, 2018 00:42

This table entry has the address of MoveDescriptions in GSC ($4000 in…

c861ff5

… G/S, $4b52 in Crystal)

wrong bank

d7afa76

More Unicode

e69544b

Keep hex address until surrounding code is cleaned up

52993d2

Resolve pret#471 (although link code still needs more cleanup, like i…

0c63388

…ts WRAM labels)

xCrystal reviewed Jan 20, 2018

View reviewed changes

roukaour added 8 commits January 19, 2018 19:31

Use hSerialConnectionStatus constants elsewhere

b199f6c

More Japanese characters

ddec0ee

Japanese characters in Japanese text (e.g. "ォ" not "," for $f4)

b071dd3

Rename BATTLETOWER_NROF constants

8127d1f

PARTY_LENGTH; MON_NAME; sgb_border.bin

05382d3

Scale addresses with PARTY_LENGTH

732bb36

Separate new_game graphics

a8eb44b

cgb layouts

81ba6c8

yenatch reviewed Jan 21, 2018

View reviewed changes

engine/pokedex.asm Outdated

@@ -15,6 +15,9 @@

const DEXSTATE_UPDATE_UNOWN_MODE

const DEXSTATE_EXIT

POKDEX_SCX EQU 5

Copy link

Contributor

yenatch Jan 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pokdex?

POKEDEX_SCX

5db31fe

yenatch reviewed Jan 21, 2018

View reviewed changes

roukaour added 2 commits January 21, 2018 17:45

Unrelated routine gets its own file

5e4fa42

Group engine/pokedex files

7f54df5

yenatch reviewed Jan 21, 2018

View reviewed changes

roukaour added 2 commits January 21, 2018 18:15

6 → PARTY_LENGTH

f091bb8

wGBCOnlyDecompressBuffer

5ddea59

yenatch reviewed Jan 22, 2018

View reviewed changes

roukaour and others added 2 commits January 21, 2018 21:51

Comment on wGBCOnlyDecompressBuffer size

5bd84e7

Add back catch-all graphics rules.

7fba864

.pal -> .gbcpal has been omitted for now since there's no tool to convert it yet.

yenatch merged commit c60f133 into pret:master Jan 22, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming #456

OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming #456

roukaour commented Jan 1, 2018 •

edited

Loading

yenatch Jan 19, 2018 •

edited

Loading

xCrystal Jan 20, 2018

roukaour Jan 20, 2018

yenatch Jan 21, 2018

yenatch Jan 21, 2018

Rangi42 Jan 21, 2018

yenatch Jan 21, 2018

Rangi42 Jan 21, 2018

yenatch Jan 22, 2018

Rangi42 Jan 22, 2018

yenatch Jan 22, 2018

Rangi42 Jan 22, 2018

yenatch Jan 22, 2018

Rangi42 Jan 22, 2018

yenatch Jan 22, 2018

Rangi42 Jan 22, 2018

yenatch Jan 22, 2018

OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming #456

OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming #456

Conversation

roukaour commented Jan 1, 2018 • edited Loading

yenatch Jan 19, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

roukaour commented Jan 1, 2018 •

edited

Loading

yenatch Jan 19, 2018 •

edited

Loading