diff options
| author | YamaArashi <shadow962@live.com> | 2016-01-25 19:03:04 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-01-25 19:03:04 -0800 |
| commit | ada7b7b72e0c4cdc1788d3fd7be14331df447702 (patch) | |
| tree | fe886439f33be752671f95ce56826da5aecfc123 | |
| parent | 5cfa2f7d458d0383c60c48fe12bf07ccbfb721d1 (diff) | |
easy chat group sizes
| -rw-r--r-- | asm/rom.s | 12 | ||||
| -rw-r--r-- | data/data2.s | 7 | ||||
| -rw-r--r-- | data/text/easy_chat/group_sizes.s | 23 |
3 files changed, 34 insertions, 8 deletions
@@ -482881,7 +482881,7 @@ _080EAEC2: pop {r1} bx r1 .align 2 -_080EAEC8: .4byte gUnknown_083DEFFA +_080EAEC8: .4byte gEasyChatGroupSizes thumb_func_end sub_80EAE88 thumb_func_start sub_80EAECC @@ -483243,7 +483243,7 @@ _080EB16A: _080EB184: .4byte gUnknown_083DB694 _080EB188: .4byte 0x00004178 _080EB18C: .4byte gUnknown_083DFE14 -_080EB190: .4byte gUnknown_083DEFFA +_080EB190: .4byte gEasyChatGroupSizes _080EB194: .4byte 0x00009a2a _080EB198: .4byte 0x000001ff _080EB19C: @@ -483552,7 +483552,7 @@ _080EB3C2: b _080EB3F4 .align 2 _080EB3D8: .4byte gEasyChatGroups -_080EB3DC: .4byte gUnknown_083DEFFA +_080EB3DC: .4byte gEasyChatGroupSizes _080EB3E0: ldr r0, _080EB3F0 adds r0, r2, r0 @@ -483563,7 +483563,7 @@ _080EB3EA: movs r0, 0 b _080EB3F6 .align 2 -_080EB3F0: .4byte gUnknown_083DEFFA +_080EB3F0: .4byte gEasyChatGroupSizes _080EB3F4: movs r0, 0x1 _080EB3F6: @@ -484076,7 +484076,7 @@ _080EB766: pop {r1} bx r1 .align 2 -_080EB778: .4byte gUnknown_083DEFFA +_080EB778: .4byte gEasyChatGroupSizes _080EB77C: .4byte gEasyChatGroups _080EB780: .4byte 0x000001ff thumb_func_end sub_80EB72C @@ -484475,7 +484475,7 @@ _080EBA48: bx r1 .align 2 _080EBA50: .4byte gEasyChatGroups -_080EBA54: .4byte gUnknown_083DEFFA +_080EBA54: .4byte gEasyChatGroupSizes _080EBA58: .4byte 0x0000ffff thumb_func_end sub_80EB9D8 diff --git a/data/data2.s b/data/data2.s index ae6d5e0f0..2397c6c55 100644 --- a/data/data2.s +++ b/data/data2.s @@ -3962,8 +3962,11 @@ gUnknown_083DE138: ; 83DE138 gUnknown_083DEFC2: ; 83DEFC2 .incbin "baserom.gba", 0x003defc2, 0x38 -gUnknown_083DEFFA: ; 83DEFFA - .incbin "baserom.gba", 0x003deffa, 0xe1a +; 83DEFFA + .include "data/text/easy_chat/group_sizes.s" + +; 83DF010 + .incbin "baserom.gba", 0x3DF010, 0xE04 gUnknown_083DFE14: ; 83DFE14 .incbin "baserom.gba", 0x003dfe14, 0x58 diff --git a/data/text/easy_chat/group_sizes.s b/data/text/easy_chat/group_sizes.s new file mode 100644 index 000000000..971105808 --- /dev/null +++ b/data/text/easy_chat/group_sizes.s @@ -0,0 +1,23 @@ +gEasyChatGroupSizes: ; 83DEFFA + .byte 202 ; Pokémon + .byte 19 ; Trainer + .byte 109 ; Status + .byte 63 ; Battle + .byte 42 ; Greetings + .byte 75 ; People + .byte 63 ; Voices + .byte 60 ; Speech + .byte 69 ; Endings + .byte 69 ; Feelings + .byte 69 ; Conditions + .byte 78 ; Actions + .byte 45 ; Lifestyle + .byte 54 ; Hobbies + .byte 45 ; Time + .byte 42 ; Misc. + .byte 36 ; Adjectives + .byte 22 ; Event. + .byte 153 ; Move 1 + .byte 194 ; Move 2 + .byte 33 ; Trendy Saying + .byte 251 ; Pokémon2 |