diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-18 05:11:30 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-18 05:11:30 -0700 |
| commit | e17df124ff5d5870b97406a934da1b275f4b710a (patch) | |
| tree | c4ab3bf1f796dbce4643bd6a912c2d598e0a0dfa /asm | |
| parent | b948fcbb0d092e1034857415330ef68416a47224 (diff) | |
Hoenn region map entries
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/charmap.s | 1 | ||||
| -rw-r--r-- | asm/emerald.s | 12 | ||||
| -rw-r--r-- | asm/macros.s | 8 |
3 files changed, 15 insertions, 6 deletions
diff --git a/asm/charmap.s b/asm/charmap.s index f69cb5eca..c7aadf035 100644 --- a/asm/charmap.s +++ b/asm/charmap.s @@ -252,4 +252,5 @@ .charmapconst PK, 0x53 .charmapconst PKMN, 0x53, 0x54 .charmapconst POKEBLOCK, 0x55, 0x56, 0x57, 0x58, 0x59 + .charmapconst AQUA, 0xFD, 0x08 .charmapconst next, 0xFE diff --git a/asm/emerald.s b/asm/emerald.s index 320f4f322..6e67bb048 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -559815,7 +559815,7 @@ sub_81238AC: ; 81238AC ldrh r3, [r7, 0x6] @08123ABE: str r6, [sp] - ldr r5, =gUnknown_085A147C + ldr r5, =gRegionMapEntries ldr r4, =0x0203a144 ldr r0, [r4] mov r10, r0 @@ -560069,7 +560069,7 @@ sub_8123C00: ; 8123C00 ldrb r1, [r0, 0x14] strh r1, [r2] ldr r6, [r0] - ldr r1, =gUnknown_085A147C + ldr r1, =gRegionMapEntries ldrh r0, [r2] lsls r0, 3 adds r5, r0, r1 @@ -560125,7 +560125,7 @@ sub_8123C00: ; 8123C00 movs r1, 0 strb r1, [r0] ldr r2, [r2] - ldr r3, =gUnknown_085A147C + ldr r3, =gRegionMapEntries ldrh r0, [r2] lsls r0, 3 adds r0, r3 @@ -561270,7 +561270,7 @@ GetMapName: ; 812456C @08124584: cmp r1, 0xD4 bhi @081245A0 - ldr r0, =gUnknown_085A147C + ldr r0, =gRegionMapEntries lsls r1, 3 adds r0, 0x4 adds r1, r0 @@ -561371,7 +561371,7 @@ sub_8124630: ; 8124630 push {r4,r5,lr} ldr r5, [sp, 0xC] lsls r0, 16 - ldr r4, =gUnknown_085A147C + ldr r4, =gRegionMapEntries lsrs r0, 13 adds r0, r4 ldrb r4, [r0] @@ -611472,7 +611472,7 @@ sub_813D6D0: ; 813D6D0 adds r7, r2, 0 ldr r0, =0x030011fc mov r9, r0 - ldr r6, =gUnknown_085A147C + ldr r6, =gRegionMapEntries ldr r1, =0x030011fe mov r8, r1 @0813D710: diff --git a/asm/macros.s b/asm/macros.s index 7b24cb47c..3fb5c375a 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -128,3 +128,11 @@ .macro ec_pokemon2 name .2byte (EC_GROUP_POKEMON2 << 9) | SPECIES_\name .endm + + .macro region_map_entry x, y, width, height, name + .byte \x + .byte \y + .byte \width + .byte \height + .4byte gMapName_\name + .endm |