diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-08-13 14:54:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 14:54:31 +0200 |
| commit | f5330d15daed2d77ff48360554a36162843fe199 (patch) | |
| tree | f8142591ea01c720be6d6b979b2fadb84e3018f0 /src/data | |
| parent | 783f5fe610c69006742b4976ab4f183f39512d89 (diff) | |
| parent | 3581a4baed71f596eedb9c234b910f1d6a7736be (diff) | |
Merge pull request #48 from xCrystal/master
More home and bank1 progress
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/booster_packs.asm | 2 | ||||
| -rw-r--r-- | src/data/decks.asm | 6 | ||||
| -rw-r--r-- | src/data/map_headers.asm (renamed from src/data/map_songs.asm) | 4 | ||||
| -rw-r--r-- | src/data/npcs.asm | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/data/booster_packs.asm b/src/data/booster_packs.asm index 03b64ee..7d1090c 100644 --- a/src/data/booster_packs.asm +++ b/src/data/booster_packs.asm @@ -1,5 +1,5 @@ BoosterSetRarityAmountsTable: ; 1e4d4 (7::64d4) -; energies, commons, uncommons, rares +; db energies, commons, uncommons, rares ; commons + uncommons + rares needs to be equal to 10 minus the number of energy cards ; defined in the pack's data below; otherwise, the number of cards in the pack won't be 10. db 1, 5, 3, 1 ; COLOSSEUM diff --git a/src/data/decks.asm b/src/data/decks.asm index 129b6d9..424874b 100644 --- a/src/data/decks.asm +++ b/src/data/decks.asm @@ -655,7 +655,7 @@ CharmanderExtraDeck: ; 30465 (c:4465) db 2, ABRA db 1, KADABRA db 1, GASTLY1 - db 30, GRASS_ENERGY + db 30, GRASS_ENERGY ; irrelevant db 0 ; end tx CharmanderExtraDeckName @@ -715,7 +715,7 @@ SquirtleExtraDeck: ; 304cf (c:44cf) db 1, MAGNEMITE1 db 1, MAGNETON1 db 1, ELECTABUZZ2 - db 30, GRASS_ENERGY + db 30, GRASS_ENERGY ; irrelevant db 0 ; end tx SquirtleExtraDeckName @@ -773,7 +773,7 @@ BulbasaurExtraDeck: ; 3053b (c:453b) db 1, BILL db 2, POTION db 1, GUST_OF_WIND - db 30, GRASS_ENERGY + db 30, GRASS_ENERGY ; irrelevant db 0 ; end tx BulbasaurExtraDeckName diff --git a/src/data/map_songs.asm b/src/data/map_headers.asm index 4012452..7f57a06 100644 --- a/src/data/map_songs.asm +++ b/src/data/map_headers.asm @@ -1,6 +1,6 @@ -; todo: figure out the rest of the data for each map +; TODO: figure out the rest of the data for each map ; related to the table at 20:4e5d -MapSongs: ; 1c374 (7:4374) +MapHeaders: ; 1c374 (7:4374) db $00,$01,$00,$01,$01,MUSIC_OVERWORLD ; OVERWORLD_MAP db $02,$03,$00,$02,$02,MUSIC_OVERWORLD ; MASON_LABORATORY db $06,$07,$00,$02,$02,MUSIC_OVERWORLD ; DECK_MACHINE_ROOM diff --git a/src/data/npcs.asm b/src/data/npcs.asm index d7a3a61..caa11af 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -1,4 +1,4 @@ -; When you press the a button in front of something it will find a data entry somewhere on this list +; When you press the A button in front of something it will find a data entry somewhere on this list ; it will then jump to the pointer in the data item. All jumps lead to an RST20 operation. PointerTable_118f5: dw Data_119dd |