diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-11 14:42:13 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-11 14:42:13 +0200 |
| commit | 5394435520c4942ec9935454ff420acbab2ff4e4 (patch) | |
| tree | 1dbd23c0b1300d4553dbffc6d5a8d784ff687854 /data | |
| parent | 154a70e22829891ec56561e454a73a67e609679d (diff) | |
more of pokemon3 decompiled
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_message.s | 4 | ||||
| -rw-r--r-- | data/data2c.s | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/data/battle_message.s b/data/battle_message.s index 75bd65d23..d1bd0c8ef 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -249,7 +249,7 @@ gUnknown_085CA459:: @ 85CA459 .string "{STRING 19} transformed!$" .string "{STRING 16}’s {STRING 25}\ntook the attack!$" -gUnknown_085CB2A1:: @ 85CB2A1 +BattleText_PreventedSwitch:: @ 85CB2A1 .string "{STRING 0}’s {STRING 23}\nprevents switching!\p$" .string "{STRING 16}’s {STRING 25}\nprevented {STRING 19}’s\l{STRING 0} from working!$" @@ -682,7 +682,7 @@ gUnknown_085CCB8C:: @ 85CCB8C gUnknown_085CCB90:: @ 85CCB90 .incbin "baserom.gba", 0x5ccb90, 0x8 -gUnknown_085CCB98:: @ 85CCB98 +BattleText_Wally:: @ 85CCB98 .incbin "baserom.gba", 0x5ccb98, 0x6 gUnknown_085CCB9E:: @ 85CCB9E diff --git a/data/data2c.s b/data/data2c.s index 94d9c30e8..92e26785d 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -101,11 +101,8 @@ gUnknown_08329ECE:: @ 8329ECE gHMMoves:: @ 8329EEA .incbin "baserom.gba", 0x329eea, 0x12 -gUnknown_08329EFC:: @ 8329EFC - .incbin "baserom.gba", 0x329efc, 0x2 - -gAlteringCaveWildMonHeldItems:: @ 8329EFE - .incbin "baserom.gba", 0x329efe, 0x2a +gAlteringCaveWildMonHeldItems:: @ 8329EFC + .incbin "baserom.gba", 0x329efc, 0x2c gUnknown_08329F28:: @ 8329F28 .incbin "baserom.gba", 0x329f28, 0x18 |