diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 02:36:30 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-09 02:36:30 -0400 |
| commit | fc761599b412206f80d961a6052dce49b9998689 (patch) | |
| tree | 1f3eb8f01ae005b8b509d1f120ce5d7bce230992 /data | |
| parent | d343d1f19a74657489d987dbd97b84e7389ae295 (diff) | |
| parent | 4b4f716ae0c582068928a4ae7b31d9d10ac89eb5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'data')
| -rw-r--r-- | data/pokemon.s | 25 | ||||
| -rw-r--r-- | data/roamer.s | 28 | ||||
| -rw-r--r-- | data/specials.inc | 2 | ||||
| -rw-r--r-- | data/text/battle_strings.inc | 10 |
4 files changed, 17 insertions, 48 deletions
diff --git a/data/pokemon.s b/data/pokemon.s index 758e6c77e..2229512a4 100644 --- a/data/pokemon.s +++ b/data/pokemon.s @@ -115,20 +115,17 @@ gUnknown_082082FE:: @ 82082FE .byte -5, -5, -10 .align 1 -gUnknown_0820831A:: @ 820831A - .2byte 0xF - .2byte 0x13 - .2byte 0x39 - .2byte 0x46 - .2byte 0x94 - .2byte 0xF9 - .2byte 0x7F - .2byte 0x123 +gHMMoves:: @ 820831A + .2byte MOVE_CUT + .2byte MOVE_FLY + .2byte MOVE_SURF + .2byte MOVE_STRENGTH + .2byte MOVE_FLASH + .2byte MOVE_ROCK_SMASH + .2byte MOVE_WATERFALL + .2byte MOVE_DIVE .2byte 0xFFFF -@ "Nidoran♂" Japanese name +gJapaneseNidoranNames:: @ 820832C .string "ニドラン♂$", 11 - -@ "Nidoran♀" Japanese name -gUnknown_08208337:: @ 8208337 - .string "ニドラン♀$", 13 + .string "ニドラン♀$", 11 diff --git a/data/roamer.s b/data/roamer.s deleted file mode 100644 index e7c03c617..000000000 --- a/data/roamer.s +++ /dev/null @@ -1,28 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gRoamerLocations:: @ 8402E80 - .byte 0x19,0x1A,0x20,0x21,0x31,0xFF - .byte 0x1A,0x19,0x20,0x21,0xFF,0xFF - .byte 0x20,0x1A,0x19,0x21,0xFF,0xFF - .byte 0x21,0x20,0x19,0x1A,0x22,0x26 - .byte 0x22,0x21,0x23,0xFF,0xFF,0xFF - .byte 0x23,0x22,0x24,0xFF,0xFF,0xFF - .byte 0x24,0x23,0x25,0x26,0xFF,0xFF - .byte 0x25,0x24,0x26,0xFF,0xFF,0xFF - .byte 0x26,0x25,0x21,0xFF,0xFF,0xFF - .byte 0x27,0x24,0x28,0x29,0xFF,0xFF - .byte 0x28,0x27,0x2A,0xFF,0xFF,0xFF - .byte 0x29,0x27,0x2A,0xFF,0xFF,0xFF - .byte 0x2A,0x28,0x29,0x2B,0xFF,0xFF - .byte 0x2B,0x2A,0x2C,0xFF,0xFF,0xFF - .byte 0x2C,0x2B,0x2D,0xFF,0xFF,0xFF - .byte 0x2D,0x2C,0x2E,0xFF,0xFF,0xFF - .byte 0x2E,0x2D,0x2F,0xFF,0xFF,0xFF - .byte 0x2F,0x2E,0x30,0xFF,0xFF,0xFF - .byte 0x30,0x2F,0x31,0xFF,0xFF,0xFF - .byte 0x31,0x30,0x19,0xFF,0xFF,0xFF - .byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF diff --git a/data/specials.inc b/data/specials.inc index 76763781d..941fd12a8 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -297,7 +297,7 @@ gSpecials:: .4byte GetLeadMonEVCount .4byte sub_8064EAC .4byte sub_8064ED4 - .4byte sub_813430C + .4byte InitRoamer .4byte sub_810F5BC .4byte IsGrassTypeInParty .4byte sub_8081334 diff --git a/data/text/battle_strings.inc b/data/text/battle_strings.inc index 12ccf0fad..d0c8f74d5 100644 --- a/data/text/battle_strings.inc +++ b/data/text/battle_strings.inc @@ -480,7 +480,7 @@ BattleText_TookAttack2: .string "{DEFENDING_MON}’s {STRING 22}\ntook the attack!$" gUnknown_083FFCCA:: @ 83FFCCA -BattleText_PreventedSwitch: +BattleText_PreventedSwitch:: .string "{STRING 0}’s {STRING 20}\nprevents switching!\p$" BattleText_PreventedOther: .string "{DEFENDING_MON}’s {STRING 22}\nprevented {STRING 16}’s\l{STRING 0} from working!$" @@ -1043,15 +1043,15 @@ BattleText_SpDef: .string "SP. DEF$" gUnknown_08400DD6:: @ 8400DD6 -BattleText_SafariBalls: +BattleText_SafariBalls:: .string "{HIGHLIGHT RED}SAFARI BALLS$" gUnknown_08400DE6:: @ 8400DE6 -BattleText_SafariBallsLeft: +BattleText_SafariBallsLeft:: .string "{HIGHLIGHT RED}Left: $" gUnknown_08400DF0:: @ 8400DF0 -BattleText_HighlightRed: +BattleText_HighlightRed:: .string "{HIGHLIGHT RED}$" BattleText_Sleep:: @@ -1101,7 +1101,7 @@ gBadEggNickname:: @ 8400E3A .string "Bad EGG$" gUnknown_08400E42:: @ 8400E42 -BattleText_Wally: +BattleText_Wally:: .string "WALLY$" BattleText_Win:: @ 8400E48 |