diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-22 21:05:51 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-22 21:05:51 -0400 |
commit | 980ce8005df3ff2c2d008f3fe2c36ed357b2a2cb (patch) | |
tree | 745646bc2baccb60da67d83e3428f4d62cd923c3 /constants | |
parent | 106251da1f1412dbca66db8c0e0fe7fe9eb63968 (diff) | |
parent | f3de3a20dfccb8a57cdf9feb860bf1e89a733f50 (diff) |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'constants')
-rw-r--r-- | constants/tx_pre_constants.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/constants/tx_pre_constants.asm b/constants/tx_pre_constants.asm index 84ed3584..e2bade58 100644 --- a/constants/tx_pre_constants.asm +++ b/constants/tx_pre_constants.asm @@ -56,8 +56,8 @@ const_value = 1 tx_pre_const LinkCableHelp ; 34 tx_pre_const TMNotebook ; 35 tx_pre_const FightingDojoText ; 36 - tx_pre_const FightingDojoText_52a10 ; 37 - tx_pre_const FightingDojoText_52a1d ; 38 + tx_pre_const EnemiesOnEverySideText ; 37 + tx_pre_const WhatGoesAroundComesAroundText ; 38 tx_pre_const NewBicycleText ; 39 tx_pre_const IndigoPlateauStatues ; 3A tx_pre_const VermilionGymTrashSuccesText1 ; 3B |