ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

dumped a lot of strings

Browse Source
This commit is contained in:
DizzyEggg 2017-09-05 17:04:11 +02:00
parent 1680fc0b81
commit e18241d8ec
8 changed files with 2202 additions and 686 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
asm/battle_anim.s
View File

@ -2855,8 +2855,8 @@ ma18_load_background_probably: @ 80A5158
.pool .pool
thumb_func_end ma18_load_background_probably thumb_func_end ma18_load_background_probably
thumb_func_start sub_80A5178 thumb_func_start BattleAnimGetPanControl
sub_80A5178: @ 80A5178 BattleAnimGetPanControl: @ 80A5178
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@ -2975,7 +2975,7 @@ _080A526C:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80A5178 thumb_func_end BattleAnimGetPanControl
thumb_func_start sub_80A5278 thumb_func_start sub_80A5278
sub_80A5278: @ 80A5278 sub_80A5278: @ 80A5278
@ -3110,7 +3110,7 @@ ma19_08073BC8: @ 80A5354
orrs r4, r0 orrs r4, r0
movs r0, 0x2 movs r0, 0x2
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -3134,7 +3134,7 @@ ma1A_8073C00: @ 80A538C
str r0, [r4] str r0, [r4]
movs r0, 0x1 movs r0, 0x1
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
bl sub_80A5178 bl BattleAnimGetPanControl
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
bl SE12PanpotControl bl SE12PanpotControl
@ -3172,14 +3172,14 @@ ma1B_8073C2C: @ 80A53B8
ldrb r7, [r1, 0x5] ldrb r7, [r1, 0x5]
movs r0, 0x2 movs r0, 0x2
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
bl sub_80A5178 bl BattleAnimGetPanControl
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_80A5178 bl BattleAnimGetPanControl
mov r8, r0 mov r8, r0
lsls r5, 24 lsls r5, 24
asrs r5, 24 asrs r5, 24
@ -3487,7 +3487,7 @@ ma1C_8073ED0: @ 80A565C
mov r9, r2 mov r9, r2
movs r0, 0x2 movs r0, 0x2
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
bl sub_80A5178 bl BattleAnimGetPanControl
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@ -3592,7 +3592,7 @@ ma1D_08073FB4: @ 80A5740
mov r8, r0 mov r8, r0
movs r0, 0x2 movs r0, 0x2
ldrsb r0, [r1, r0] ldrsb r0, [r1, r0]
bl sub_80A5178 bl BattleAnimGetPanControl
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24

26
asm/battle_anim_80FE840.s
View File

@ -2640,7 +2640,7 @@ _080FFD56:
cmp r0, 0 cmp r0, 0
bne _080FFD8A bne _080FFD8A
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -2658,7 +2658,7 @@ _080FFD8A:
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -5778,7 +5778,7 @@ _08101604:
adds r0, r1 adds r0, r1
strh r0, [r5, 0x38] strh r0, [r5, 0x38]
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -5975,7 +5975,7 @@ _081017A4:
movs r2, 0x4 movs r2, 0x4
bl LoadPalette bl LoadPalette
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -7213,7 +7213,7 @@ sub_810217C: @ 810217C
strh r5, [r4, 0x34] strh r5, [r4, 0x34]
strh r5, [r4, 0x36] strh r5, [r4, 0x36]
subs r0, 0x42 subs r0, 0x42
bl sub_80A5178 bl BattleAnimGetPanControl
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
@ -10604,7 +10604,7 @@ _08103C90:
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
movs r0, 0x3F movs r0, 0x3F
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -11235,7 +11235,7 @@ sub_810421C: @ 810421C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -12986,7 +12986,7 @@ sub_810501C: @ 810501C
adds r0, 0x2 adds r0, 0x2
strh r0, [r4, 0x38] strh r0, [r4, 0x38]
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r4, 0x3A] strh r0, [r4, 0x3A]
@ -25228,12 +25228,12 @@ _0810B2DC:
movs r0, 0xC movs r0, 0xC
strh r0, [r5, 0x1E] strh r0, [r5, 0x1E]
subs r0, 0x4C subs r0, 0x4C
bl sub_80A5178 bl BattleAnimGetPanControl
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
@ -35110,7 +35110,7 @@ _081102B8:
beq _08110360 beq _08110360
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -36713,13 +36713,13 @@ _0811101E:
strh r4, [r6, 0x16] strh r4, [r6, 0x16]
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
asrs r4, 8 asrs r4, 8
lsrs r4, 16 lsrs r4, 16
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
lsls r0, 24 lsls r0, 24
strh r4, [r6, 0x22] strh r4, [r6, 0x22]
asrs r0, 24 asrs r0, 24

24
asm/rom_8158B30.s → asm/battle_anim_sound_tasks.s
View File

@ -22,12 +22,12 @@ sub_8158B30: @ 8158B30
strh r0, [r6, 0xA] strh r0, [r6, 0xA]
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
adds r5, r0, 0 adds r5, r0, 0
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
@ -128,7 +128,7 @@ sub_8158C04: @ 8158C04
movs r0, 0 movs r0, 0
strh r0, [r4, 0x1C] strh r0, [r4, 0x1C]
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
ldrh r0, [r4, 0xA] ldrh r0, [r4, 0xA]
lsls r1, 24 lsls r1, 24
@ -175,14 +175,14 @@ mas_80DCF38: @ 8158C58
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
bl sub_80A5178 bl BattleAnimGetPanControl
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
lsls r5, 24 lsls r5, 24
asrs r5, 24 asrs r5, 24
adds r0, r5, 0 adds r0, r5, 0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r5, r0, 0 adds r5, r0, 0
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
@ -307,7 +307,7 @@ sub_8158D8C: @ 8158D8C
movs r4, 0 movs r4, 0
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
bl IsContest bl IsContest
@ -432,7 +432,7 @@ sub_8158E9C: @ 8158E9C
movs r4, 0 movs r4, 0
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
bl IsContest bl IsContest
@ -691,7 +691,7 @@ sub_81590B8: @ 81590B8
strh r1, [r0, 0x1C] strh r1, [r0, 0x1C]
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
bl IsContest bl IsContest
@ -849,7 +849,7 @@ sub_8159210: @ 8159210
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -874,7 +874,7 @@ sub_8159244: @ 8159244
ldrb r0, [r0, 0x2] ldrb r0, [r0, 0x2]
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -906,14 +906,14 @@ sub_8159278: @ 8159278
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
bl sub_80A5178 bl BattleAnimGetPanControl
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
lsls r5, 24 lsls r5, 24
asrs r5, 24 asrs r5, 24
adds r0, r5, 0 adds r0, r5, 0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r5, r0, 0 adds r5, r0, 0
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24

18
asm/rom_815A0D4.s
View File

@ -1349,7 +1349,7 @@ sub_815AB5C: @ 815AB5C
bne _0815ABBA bne _0815ABBA
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -2004,7 +2004,7 @@ _0815B0BC:
lsrs r4, r0, 24 lsrs r4, r0, 24
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -3551,7 +3551,7 @@ _0815BD8E:
strh r0, [r1, 0x8] strh r0, [r1, 0x8]
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -10271,7 +10271,7 @@ _0815F3CE:
bne _0815F482 bne _0815F482
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -10341,7 +10341,7 @@ _0815F460:
bne _0815F482 bne _0815F482
movs r0, 0x40 movs r0, 0x40
negs r0, r0 negs r0, r0
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -10431,7 +10431,7 @@ _0815F520:
cmp r0, 0 cmp r0, 0
blt _0815F61A blt _0815F61A
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -10460,7 +10460,7 @@ _0815F544:
cmp r1, 0x7F cmp r1, 0x7F
ble _0815F61A ble _0815F61A
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -10502,7 +10502,7 @@ _0815F5B4:
cmp r0, 0x8 cmp r0, 0x8
ble _0815F61A ble _0815F61A
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24
@ -11557,7 +11557,7 @@ _0815FE92:
cmp r1, r0 cmp r1, r0
bne _0815FF2C bne _0815FF2C
movs r0, 0x3F movs r0, 0x3F
bl sub_80A5178 bl BattleAnimGetPanControl
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
asrs r1, 24 asrs r1, 24

4
charmap.txt
View File

@ -144,7 +144,6 @@ RIGHT_ARROW = 7C
'ä' = F4 'ä' = F4
'ö' = F5 'ö' = F5
'ü' = F6 'ü' = F6
@ Arrows at F7-FA are duplicates of 79-7C. Unused?
TALL_PLUS = FC 0C FB TALL_PLUS = FC 0C FB
'$' = FF '$' = FF
@ -353,6 +352,9 @@ DEFENDING_MON = FD 0D
@ indicates the end of a town/city name (before " TOWN" or " CITY") @ indicates the end of a town/city name (before " TOWN" or " CITY")
NAME_END = FC 00 NAME_END = FC 00
@ special 0xF7 character
SPECIAL_F7 = F7
@ more text functions @ more text functions
COLOR = FC 01 @ use a color listed below right after COLOR = FC 01 @ use a color listed below right after

5
data/battle_controller_player_partner.s
View File

@ -4,4 +4,7 @@
.section .rodata .section .rodata
gPlayerPartnerBufferCommands:: @ 8617170 gPlayerPartnerBufferCommands:: @ 8617170
.incbin "baserom.gba", 0x617170, 0x104 .incbin "baserom.gba", 0x617170, 0xE4
@ apparently unused data
.incbin "baserom.gba", 0x617254, 32

2791
data/strings.s
View File

File diff suppressed because it is too large Load Diff

2
ld_script.txt
View File

@ -191,7 +191,7 @@ SECTIONS {
asm/mystery_event_script.o(.text); asm/mystery_event_script.o(.text);
asm/field_effect_helpers.o(.text); asm/field_effect_helpers.o(.text);
asm/contest_ai.o(.text); asm/contest_ai.o(.text);
asm/rom_8158B30.o(.text); asm/battle_anim_sound_tasks.o(.text);
asm/battle_controller_safari.o(.text); asm/battle_controller_safari.o(.text);
asm/fldeff_sweetscent.o(.text); asm/fldeff_sweetscent.o(.text);
asm/rom_815A0D4.o(.text); asm/rom_815A0D4.o(.text);