diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-04-30 17:46:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-30 17:46:39 -0700 |
| commit | 500ce71ff42e0ecf067a819edab0ddb6e2d63cd7 (patch) | |
| tree | b6c99f7b3b2c65573d573f14439718271a246ac9 /data/use_pokeblock.s | |
| parent | db789b296cd739964c53cd60d4673238a175837a (diff) | |
| parent | 6ba35687fb842e9151e5a806b1889cb831097722 (diff) | |
Merge pull request #250 from marijnvdwerf/include/baserom-1
Include some baserom data
Diffstat (limited to 'data/use_pokeblock.s')
| -rw-r--r-- | data/use_pokeblock.s | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index 914b3570b..b82c6756c 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -12,7 +12,11 @@ ConditionUpDownTiles: .incbin "graphics/misc/condition_up_down.4bpp" gUnknown_08406118:: @ 8406118 - .incbin "baserom.gba", 0x00406118, 0x14 + .4byte 22 @ MON_DATA_COOL + .4byte 47 @ MON_DATA_TOUGH + .4byte 33 @ MON_DATA_SMART + .4byte 24 @ MON_DATA_CUTE + .4byte 23 @ MON_DATA_BEAUTY .align 2 gUnknown_0840612C:: @ 840612C @@ -35,7 +39,11 @@ gSpritePalette_ConditionUpDown:: @ 8406150 obj_pal ConditionUpDownPalette, 0 gUnknown_08406158:: @ 8406158 - .incbin "baserom.gba", 0x00406158, 0x14 + .2byte 156, 30 + .2byte 117, 53 + .2byte 117, 112 + .2byte 197, 112 + .2byte 197, 53 .align 2 gOamData_840616C:: @ 840616C |