Merge branch 'master' of github.com:pret/pokeemerald

This commit is contained in:
Diegoisawesome
2017-12-28 03:00:15 -06:00
67 changed files with 10850 additions and 4312 deletions

View File

@@ -2705,34 +2705,34 @@ gUnknown_085EBB4F:: @ 85EBB4F
gUnknown_085EBB56:: @ 85EBB56
.string "What would you like to do?$"
gUnknown_085EBB71:: @ 85EBB71
gText_WithdrawPokemon:: @ 85EBB71
.string "WITHDRAW POKéMON$"
gUnknown_085EBB82:: @ 85EBB82
gText_DepositPokemon:: @ 85EBB82
.string "DEPOSIT POKéMON$"
gUnknown_085EBB92:: @ 85EBB92
gText_MovePokemon:: @ 85EBB92
.string "MOVE POKéMON$"
gUnknown_085EBB9F:: @ 85EBB9F
gText_MoveItems:: @ 85EBB9F
.string "MOVE ITEMS$"
gUnknown_085EBBAA:: @ 85EBBAA
gText_SeeYa:: @ 85EBBAA
.string "SEE YA!$"
gUnknown_085EBBB2:: @ 85EBBB2
gText_WithdrawMonDescription:: @ 85EBBB2
.string "Move POKéMON stored in BOXES to\nyour party.$"
gUnknown_085EBBDE:: @ 85EBBDE
gText_DepositMonDescription:: @ 85EBBDE
.string "Store POKéMON in your party in BOXES.$"
gUnknown_085EBC04:: @ 85EBC04
gText_MoveMonDescription:: @ 85EBC04
.string "Organize the POKéMON in BOXES and\nin your party.$"
gUnknown_085EBC35:: @ 85EBC35
gText_MoveItemsDescription:: @ 85EBC35
.string "Move items held by any POKéMON\nin a BOX or your party.$"
gUnknown_085EBC6C:: @ 85EBC6C
gText_SeeYaDescription:: @ 85EBC6C
.string "Return to the previous menu.$"
gText_JustOnePkmn:: @ 85EBC89
@@ -3521,10 +3521,10 @@ gText_Var1sTrainerCard:: @ 85ECFA6
gText_HallOfFameDebut:: @ 85ECFB8
.string "HALL OF FAME DEBUT $"
gUnknown_085ECFCD:: @ 85ECFCD
gText_LinkBattles:: @ 85ECFCD
.string "LINK BATTLES$"
gUnknown_085ECFDA:: @ 85ECFDA
gText_LinkCableBattles:: @ 85ECFDA
.string "LINK CABLE BATTLES$"
gText_WinsLosses:: @ 85ECFED
@@ -4488,34 +4488,34 @@ gUnknown_085EE6AD:: @ 85EE6AD
gUnknown_085EE6B6:: @ 85EE6B6
.string "Updated time$"
gUnknown_085EE6C3:: @ 85EE6C3
gText_MenuPokedex:: @ 85EE6C3
.string "POKéDEX$"
gUnknown_085EE6CB:: @ 85EE6CB
gText_MenuPokemon:: @ 85EE6CB
.string "POKéMON$"
gUnknown_085EE6D3:: @ 85EE6D3
gText_MenuBag:: @ 85EE6D3
.string "BAG$"
gUnknown_085EE6D7:: @ 85EE6D7
gText_MenuPokenav:: @ 85EE6D7
.string "POKéNAV$"
gUnknown_085EE6DF:: @ 85EE6DF
gText_MenuPlayer:: @ 85EE6DF
.string "{PLAYER}$"
gUnknown_085EE6E2:: @ 85EE6E2
gText_MenuSave:: @ 85EE6E2
.string "SAVE$"
gUnknown_085EE6E7:: @ 85EE6E7
gText_MenuOption:: @ 85EE6E7
.string "OPTION$"
gUnknown_085EE6EE:: @ 85EE6EE
gText_MenuExit:: @ 85EE6EE
.string "EXIT$"
gUnknown_085EE6F3:: @ 85EE6F3
gText_MenuRetire:: @ 85EE6F3
.string "RETIRE$"
gUnknown_085EE6FA:: @ 85EE6FA
gText_MenuRest:: @ 85EE6FA
.string "REST$"
gText_SafariBallStock:: @ 85EE6FF
@@ -4524,28 +4524,28 @@ gText_SafariBallStock:: @ 85EE6FF
gText_BattlePyramidFloor:: @ 85EE716
.string "Battle Pyramid\n{STR_VAR_1}$"
gUnknown_085EE728:: @ 85EE728
gText_Floor1:: @ 85EE728
.string "Floor 1$"
gUnknown_085EE730:: @ 85EE730
gText_Floor2:: @ 85EE730
.string "Floor 2$"
gUnknown_085EE738:: @ 85EE738
gText_Floor3:: @ 85EE738
.string "Floor 3$"
gUnknown_085EE740:: @ 85EE740
gText_Floor4:: @ 85EE740
.string "Floor 4$"
gUnknown_085EE748:: @ 85EE748
gText_Floor5:: @ 85EE748
.string "Floor 5$"
gUnknown_085EE750:: @ 85EE750
gText_Floor6:: @ 85EE750
.string "Floor 6$"
gUnknown_085EE758:: @ 85EE758
gText_Floor7:: @ 85EE758
.string "Floor 7$"
gUnknown_085EE760:: @ 85EE760
gText_Peak:: @ 85EE760
.string "Peak$"
gText_LinkStandby2:: @ 85EE765
@@ -5393,4 +5393,3 @@ gText_Berry:: @ 85EFCDF
gText_Berries:: @ 85EFCE5
.string "BERRIES$"