diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/charmap.s | 3 | ||||
| -rw-r--r-- | asm/macros.s | 2 | ||||
| -rw-r--r-- | asm/rom.s | 12 |
3 files changed, 10 insertions, 7 deletions
diff --git a/asm/charmap.s b/asm/charmap.s index b0be6759f..4b238d3bd 100644 --- a/asm/charmap.s +++ b/asm/charmap.s @@ -255,6 +255,9 @@ .charmap_const PKMN, 0x53, 0x54 .charmap_const POKEBLOCK, 0x55, 0x56, 0x57, 0x58, 0x59 + ; indicates the end of a town/city name (before " TOWN" or " CITY") + .charmap_const NAME_END, 0xFC, 0x00 + ; string placeholders ; unknown (0xFD, 0x00) .charmap_const PLAYER, 0xFD, 0x01 diff --git a/asm/macros.s b/asm/macros.s index 590df5a20..8faccc42a 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -5,7 +5,7 @@ .include "asm/macros/map.s" .include "asm/macros/field_effect_script.s" - .macro region_map_entry x, y, width, height, name + .macro region_map_location x, y, width, height, name .byte \x .byte \y .byte \width @@ -516453,7 +516453,7 @@ _080FB53A: .align 2 _080FB548: .4byte 0x02025748 _080FB54C: .4byte 0x020388cc -_080FB550: .4byte gUnknown_083E73C4 +_080FB550: .4byte gRegionMapLocations _080FB554: cmp r5, 0x29 beq _080FB566 @@ -516548,7 +516548,7 @@ _080FB5E8: bx r0 .align 2 _080FB5F8: .4byte 0x020388cc -_080FB5FC: .4byte gUnknown_083E73C4 +_080FB5FC: .4byte gRegionMapLocations thumb_func_end sub_80FB32C thumb_func_start sub_80FB600 @@ -516718,7 +516718,7 @@ _080FB710: bx r0 .align 2 _080FB750: .4byte 0x020388cc -_080FB754: .4byte gUnknown_083E73C4 +_080FB754: .4byte gRegionMapLocations thumb_func_end sub_80FB600 thumb_func_start sub_80FB758 @@ -517804,7 +517804,7 @@ _080FBFCA: bl CopyString b _080FBFF2 .align 2 -_080FBFE0: .4byte gUnknown_083E73C4 +_080FBFE0: .4byte gRegionMapLocations _080FBFE4: cmp r2, 0 bne _080FBFEA @@ -517885,7 +517885,7 @@ sub_80FC04C: ; 80FC04C pop {r0} bx r0 .align 2 -_080FC070: .4byte gUnknown_083E73C4 +_080FC070: .4byte gRegionMapLocations thumb_func_end sub_80FC04C thumb_func_start sub_80FC074 @@ -562736,7 +562736,7 @@ _0811170C: _08111720: .4byte gUnknown_083F858C _08111724: .4byte gUnknown_083F8594 _08111728: .4byte 0x02000000 -_0811172C: .4byte gUnknown_083E73C4 +_0811172C: .4byte gRegionMapLocations _08111730: .4byte gUnknown_083F85A4 _08111734: .4byte 0x02020004 thumb_func_end sub_8111658 |