easy chat words by letter

This commit is contained in:
YamaArashi 2015-10-16 16:57:46 -07:00
parent fc49fe46fd
commit 8ce02b461e
5 changed files with 3738 additions and 16 deletions

View File

@ -1,14 +1,4 @@
.include "constants/gba_constants.s"
.include "constants/misc_constants.s"
.include "constants/species_constants.s"
.include "constants/ability_constants.s"
.include "constants/move_constants.s"
.include "constants/item_constants.s"
.include "constants/type_constants.s"
.include "constants/contest_constants.s"
.include "constants/pokemon_data_constants.s"
.include "constants/item_data_constants.s"
.include "constants/battle_move_constants.s"
.include "constants/constants.s"
.include "asm/macros.s"
.include "asm/charmap.s"
@ -550795,7 +550785,7 @@ sub_811F46C: ; 811F46C
sub sp, 0x10
movs r3, 0
@0811F47A:
ldr r2, =gUnknown_0859E46C
ldr r2, =gEasyChatWordsByLetterPointers
lsls r1, r3, 3
adds r0, r2, 0x4
adds r0, r1, r0

12
constants/constants.s Normal file
View File

@ -0,0 +1,12 @@
.include "constants/gba_constants.s"
.include "constants/misc_constants.s"
.include "constants/species_constants.s"
.include "constants/ability_constants.s"
.include "constants/move_constants.s"
.include "constants/item_constants.s"
.include "constants/type_constants.s"
.include "constants/contest_constants.s"
.include "constants/pokemon_data_constants.s"
.include "constants/item_data_constants.s"
.include "constants/battle_move_constants.s"
.include "constants/easy_chat_constants.s"

File diff suppressed because it is too large Load Diff

View File

@ -5055,10 +5055,8 @@ gUnknown_08597E6C: ; 8597E6C
; 8597E9C
.include "data/text/easy_chat/easy_chat_groups.s"
.incbin "base_emerald.gba", 0x59d0b4, 0x13b8
gUnknown_0859E46C: ; 859E46C
.incbin "base_emerald.gba", 0x59e46c, 0x168
; 859D0B4
.include "data/text/easy_chat/easy_chat_words_by_letter.s"
; 859E5D4
.include "data/text/easy_chat/easy_chat_group_name_pointers.s"

File diff suppressed because it is too large Load Diff