dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into clock

Browse Source
This commit is contained in:
PikalaxALT
2017-12-15 21:04:25 -05:00
parent 88636dfc2a 224fdbf026
commit da2e0dfe50
195 changed files with 20967 additions and 25013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_frontier/battle_frontier_mons.inc
View File

@@ -960,7 +960,7 @@ gBattleFrontierMons:: @ 85D97BC
.4byte NATURE_DOCILE
@ 137
.2byte SPECIES_FARFETCH_D
.2byte SPECIES_FARFETCHD
.2byte MOVE_SLASH, MOVE_KNOCK_OFF, MOVE_SWORDS_DANCE, MOVE_AGILITY
.byte BATTLE_FRONTIER_ITEM_STICK
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP

10226
data/battle_frontier/battle_frontier_trainers.inc
View File

File diff suppressed because it is too large Load Diff

1050
data/battle_frontier/fallarbor_battle_tent_trainers.inc
View File

File diff suppressed because it is too large Load Diff

1026
data/battle_frontier/slateport_battle_tent_trainers.inc
View File

File diff suppressed because it is too large Load Diff

1020
data/battle_frontier/verdanturf_battle_tent_trainers.inc
View File

File diff suppressed because it is too large Load Diff

2
data/battle_frontier_2.s
View File

@@ -1,3 +1,5 @@
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

457
data/battle_scripts_1.s
View File

File diff suppressed because it is too large Load Diff

48
data/battle_scripts_2.s
View File

@@ -1,3 +1,5 @@
#include "constants/items.h"
#include "constants/songs.h"
.include "asm/macros.inc"
.include "asm/macros/battle_script.inc"
.include "constants/constants.inc"
@@ -24,13 +26,13 @@ gBattlescriptsForBallThrow:: @ 82DBD08
.4byte BattleScript_BallThrow
.align 2
gUnknown_082DBD3C:: @ 82DBD3C
.4byte BattleScript_82DBE12
.4byte BattleScript_82DBE1C
.4byte BattleScript_82DBE1C
.4byte BattleScript_82DBE4B
.4byte BattleScript_82DBE6F
.4byte BattleScript_82DBE91
gBattlescriptsForUsingItem:: @ 82DBD3C
.4byte BattleScript_PlayerUsesItem
.4byte BattleScript_OpponentUsesHealItem
.4byte BattleScript_OpponentUsesHealItem
.4byte BattleScript_OpponentUsesStatusCureItem
.4byte BattleScript_OpponentUsesXItem
.4byte BattleScript_OpponentUsesGuardSpecs
.align 2
gBattlescriptsForRunningByItem:: @ 82DBD54
@@ -58,27 +60,27 @@ BattleScript_SafariBallThrow::
handleballthrow
BattleScript_SuccessBallThrow::
jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_82DBD92
jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo
incrementgamestat 0xB
BattleScript_82DBD92::
BattleScript_PrintCaughtMonInfo::
printstring STRINGID_GOTCHAPKMNCAUGHT
trysetcaughtmondexflags BattleScript_82DBDA5
trysetcaughtmondexflags BattleScript_TryNicknameCaughtMon
printstring STRINGID_PKMNDATAADDEDTODEX
waitstate
setbyte gBattleCommunication, 0x0
displaydexinfo
BattleScript_82DBDA5::
BattleScript_TryNicknameCaughtMon::
printstring STRINGID_GIVENICKNAMECAPTURED
waitstate
setbyte gBattleCommunication, 0x0
trygivecaughtmonnick BattleScript_82DBDC2
trygivecaughtmonnick BattleScript_GiveCaughtMonEnd
givecaughtmon
printfromtable gCaughtMonStringIds
waitmessage 0x40
goto BattleScript_82DBDC3
BattleScript_82DBDC2::
goto BattleScript_SuccessBallThrowEnd
BattleScript_GiveCaughtMonEnd::
givecaughtmon
BattleScript_82DBDC3::
BattleScript_SuccessBallThrowEnd::
setbyte gBattleOutcome, CAUGHT
finishturn
@@ -90,12 +92,12 @@ BattleScript_WallyBallThrow::
BattleScript_ShakeBallThrow::
printfromtable gBallEscapeStringIds
waitmessage 0x40
jumpifword NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_82DBE01
jumpifbyte NOT_EQUAL, gNumSafariBalls, 0x0, BattleScript_82DBE01
jumpifword NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
jumpifbyte NOT_EQUAL, gNumSafariBalls, 0x0, BattleScript_ShakeBallThrowEnd
printstring STRINGID_OUTOFSAFARIBALLS
waitmessage 0x40
setbyte gBattleOutcome, OUT_OF_BALLS
BattleScript_82DBE01::
BattleScript_ShakeBallThrowEnd::
finishaction
BattleScript_TrainerBallBlock::
@@ -106,12 +108,12 @@ BattleScript_TrainerBallBlock::
waitmessage 0x40
finishaction
BattleScript_82DBE12::
BattleScript_PlayerUsesItem::
setbyte sMOVEEND_STATE, 0xF
moveend 0x1, 0x0
end
BattleScript_82DBE1C::
BattleScript_OpponentUsesHealItem::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU
@@ -128,7 +130,7 @@ BattleScript_82DBE1C::
moveend 0x1, 0x0
finishaction
BattleScript_82DBE4B::
BattleScript_OpponentUsesStatusCureItem::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU
@@ -142,7 +144,7 @@ BattleScript_82DBE4B::
moveend 0x1, 0x0
finishaction
BattleScript_82DBE6F::
BattleScript_OpponentUsesXItem::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU
@@ -155,7 +157,7 @@ BattleScript_82DBE6F::
moveend 0x1, 0x0
finishaction
BattleScript_82DBE91::
BattleScript_OpponentUsesGuardSpecs::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU

4
data/battle_tower.s
View File

@@ -1,3 +1,7 @@
#include "constants/easy_chat.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

1
data/cable_car.s
View File

@@ -1,3 +1,4 @@
#include "constants/map_objects.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

3
data/data2b.s
View File

@@ -1,5 +1,8 @@
@ the second big chunk of data
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

4
data/data2c.s
View File

@@ -1,5 +1,9 @@
@ the second big chunk of data
#include "constants/abilities.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

3
data/easy_chat.s
View File

@@ -1,3 +1,6 @@
#include "constants/easy_chat.h"
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

8
data/event_scripts.s
View File

@@ -1,8 +1,12 @@
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/vars.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
.include "constants/variables.inc"
.include "constants/flags.inc"
.section script_data, "aw", %progbits

1
data/field_map_obj.s
View File

@@ -1,3 +1,4 @@
#include "constants/map_objects.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

102
data/graphics.s
View File

@@ -16,12 +16,108 @@ gUnknown_08C00524:: @ 8C00524
.incbin "baserom.gba", 0xc00c10, 0xa34
gUnknown_08C01644:: @ 8C01644
.incbin "baserom.gba", 0xc01644, 0xE0
.incbin "baserom.gba", 0xc01644, 0xe0
gUnknown_08C01724:: @ 8C01724
.incbin "baserom.gba", 0xc01724, 0xBDC
.incbin "baserom.gba", 0xc01724, 0x18
.align 2
gInterfaceGfx_PokeBall::
.incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC
gUnknown_08C02300:: @ 8C02300
.align 2
gInterfacePal_PokeBall::
.incbin "graphics/interface/ball/poke.gbapal.lz"
.align 2
gInterfaceGfx_GreatBall::
.incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_GreatBall::
.incbin "graphics/interface/ball/great.gbapal.lz"
.align 2
gInterfaceGfx_SafariBall::
.incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_SafariBall::
.incbin "graphics/interface/ball/safari.gbapal.lz"
.align 2
gInterfaceGfx_UltraBall::
.incbin "baserom.gba", 0xC019E0, 0xB4
.align 2
gInterfacePal_UltraBall::
.incbin "baserom.gba", 0xC01A94, 0x20
.align 2
gInterfaceGfx_MasterBall::
.incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_MasterBall::
.incbin "graphics/interface/ball/master.gbapal.lz"
.align 2
gInterfaceGfx_NetBall::
.incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_NetBall::
.incbin "graphics/interface/ball/net.gbapal.lz"
.align 2
gInterfaceGfx_DiveBall::
.incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_DiveBall::
.incbin "graphics/interface/ball/dive.gbapal.lz"
.align 2
gInterfaceGfx_NestBall::
.incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_NestBall::
.incbin "graphics/interface/ball/nest.gbapal.lz"
.align 2
gInterfaceGfx_RepeatBall::
.incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_RepeatBall::
.incbin "graphics/interface/ball/repeat.gbapal.lz"
.align 2
gInterfaceGfx_TimerBall::
.incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_TimerBall::
.incbin "graphics/interface/ball/timer.gbapal.lz"
.align 2
gInterfaceGfx_LuxuryBall::
.incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_LuxuryBall::
.incbin "graphics/interface/ball/luxury.gbapal.lz"
.align 2
gInterfaceGfx_PremierBall::
.incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_PremierBall::
.incbin "graphics/interface/ball/premier.gbapal.lz"
gOpenPokeballGfx:: @ 8C02300
.incbin "baserom.gba", 0xc02300, 0x7c
gUnknown_08C0237C:: @ 8C0237C

20
data/graphics/field_objects/berry_tree_graphics_tables.inc
View File

@@ -478,18 +478,18 @@ gFieldObjectPicTable_TamatoBerryTree:: @ 850C758
gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0
berry_tree_palette_slot_table 2
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.align 2
gBerryTreePicTablePointers:: @ 850C7B0

2
data/graphics/pokemon/animation_delay_table.inc
View File

@@ -81,7 +81,7 @@ gMonAnimationDelayTable:: @ 8329B87
.byte 0x00 @ SPECIES_SLOWBRO
.byte 0x00 @ SPECIES_MAGNEMITE
.byte 0x00 @ SPECIES_MAGNETON
.byte 0x00 @ SPECIES_FARFETCH_D
.byte 0x00 @ SPECIES_FARFETCHD
.byte 0x00 @ SPECIES_DODUO
.byte 0x00 @ SPECIES_DODRIO
.byte 0x00 @ SPECIES_SEEL

2
data/graphics/pokemon/front_anim_ids_table.inc
View File

@@ -81,7 +81,7 @@ gMonFrontAnimIdsTable:: @ 83299EC
.byte 0x0b @ SPECIES_SLOWBRO
.byte 0x54 @ SPECIES_MAGNEMITE
.byte 0x2c @ SPECIES_MAGNETON
.byte 0x48 @ SPECIES_FARFETCH_D
.byte 0x48 @ SPECIES_FARFETCHD
.byte 0x4c @ SPECIES_DODUO
.byte 0x41 @ SPECIES_DODRIO
.byte 0x0b @ SPECIES_SEEL

1
data/item_menu_icons.s
View File

@@ -1,3 +1,4 @@
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

1
data/link.s
View File

@@ -1,5 +1,6 @@
@ the second big chunk of data
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

6
data/map_events.s
View File

@@ -1,7 +1,9 @@
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/map_objects.h"
#include "constants/vars.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "constants/flags.inc"
.include "constants/variables.inc"
.section .rodata

1
data/maps.s
View File

@@ -1,3 +1,4 @@
#include "constants/songs.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

0
data/rom4.s → data/overworld.s
View File

1
data/player_pc.s
View File

@@ -1,3 +1,4 @@
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

14
data/pokeball.s
View File

@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0832C400:: @ 832C400
.incbin "baserom.gba", 0x32c400, 0x60
gUnknown_0832C460:: @ 832C460
.incbin "baserom.gba", 0x32c460, 0x128
gUnknown_0832C588:: @ 832C588
.incbin "baserom.gba", 0x32c588, 0x138

228
data/text/contest_strings.inc
View File

@@ -202,476 +202,516 @@ gContestMoveTypeSmartText:: @ 827D4FB
gContestMoveTypeToughText:: @ 827D501
.string "TOUGH$"
gUnknown_0827D507:: @ 827D507
gText_0827D507:: @ 827D507
.string "Appeal no. {STR_VAR_1}!\n"
.string "Which move will be played?$"
gUnknown_0827D531:: @ 827D531
gText_0827D531:: @ 827D531
.string "Appeal no. {STR_VAR_1}!\n"
.string "But it can’t participate!$"
gUnknown_0827D55A:: @ 827D55A
gText_0827D55A:: @ 827D55A
.string "{STR_VAR_1} appealed with\n"
.string "{STR_VAR_2}!$"
gUnknown_0827D56F:: @ 827D56F
gText_0827D56F:: @ 827D56F
.string "{STR_VAR_1} was watching\n"
.string "the others.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827D597:: @ 827D597
gText_0827D597:: @ 827D597
.string "We’re all out of\n"
.string "Appeal Time!{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827D5C1:: @ 827D5C1
gText_0827D5C1:: @ 827D5C1
.string "But the appeal was\n"
.string "jammed.$"
gUnknown_0827D5DC:: @ 827D5DC
gText_0827D5DC:: @ 827D5DC
.string "It followed another\n"
.string "POKéMON’s lead.$"
gUnknown_0827D600:: @ 827D600
gText_0827D600:: @ 827D600
.string "But it messed up.$"
gUnknown_0827D612:: @ 827D612
gText_0827D612:: @ 827D612
.string "It went better than\n"
.string "usual.$"
gUnknown_0827D62D:: @ 827D62D
gText_0827D62D:: @ 827D62D
.string "The JUDGE looked away\n"
.string "for some reason.$"
gUnknown_0827D654:: @ 827D654
gText_0827D654:: @ 827D654
.string "It worked hard to build on\n"
.string "past mistakes.$"
gUnknown_0827D67E:: @ 827D67E
gText_0827D67E:: @ 827D67E
.string "It can’t make any more\n"
.string "moves.$"
gUnknown_0827D69C:: @ 827D69C
gText_0827D69C:: @ 827D69C
.string "It worked frighteningly\n"
.string "well.$"
gUnknown_0827D6BA:: @ 827D6BA
gText_0827D6BA:: @ 827D6BA
.string "It worked as hard as the\n"
.string "standout POKéMON.$"
gUnknown_0827D6E5:: @ 827D6E5
gText_0827D6E5:: @ 827D6E5
.string "The JUDGE looked on\n"
.string "expectantly.$"
gUnknown_0827D706:: @ 827D706
gText_0827D706:: @ 827D706
.string "It worked rather well.$"
gUnknown_0827D71D:: @ 827D71D
gText_0827D71D:: @ 827D71D
.string "It worked a little better\n"
.string "than usual.$"
gUnknown_0827D743:: @ 827D743
gText_0827D743:: @ 827D743
.string "{STR_VAR_1} failed to\n"
.string "stand out at all…{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D764:: @ 827D764
gText_0827D764:: @ 827D764
.string "{STR_VAR_1} didn’t stand\n"
.string "out very much…{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D785:: @ 827D785
gText_0827D785:: @ 827D785
.string "{STR_VAR_1} caught a\n"
.string "little attention.{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D7A5:: @ 827D7A5
gText_0827D7A5:: @ 827D7A5
.string "{STR_VAR_1} attracted a\n"
.string "lot of attention.{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D7C8:: @ 827D7C8
gText_0827D7C8:: @ 827D7C8
.string "{STR_VAR_1} commanded\n"
.string "total attention.{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D7E8:: @ 827D7E8
gText_0827D7E8:: @ 827D7E8
.string "{STR_VAR_1} hasn’t made\n"
.string "its appeal.{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D805:: @ 827D805
gText_0827D805:: @ 827D805
.string "Anticipation swelled for\n"
.string "{STR_VAR_1}’s appeal next.$"
gUnknown_0827D830:: @ 827D830
gText_0827D830:: @ 827D830
.string "$"
gUnknown_0827D831:: @ 827D831
gText_0827D831:: @ 827D831
.string "The JUDGE ’s views on\n"
.string "{STR_VAR_1} held firm.$"
gUnknown_0827D855:: @ 827D855
gText_0827D855:: @ 827D855
.string "{STR_VAR_1}’s {STR_VAR_3}\n"
.string "changed perceptions.$"
gUnknown_0827D872:: @ 827D872
gText_0827D872:: @ 827D872
.string "{STR_VAR_1}’s appeal\n"
.string "effect wore off.$"
gUnknown_0827D88F:: @ 827D88F
gText_0827D88F:: @ 827D88F
.string "The special appeal’s\n"
.string "effect wore off.$"
gUnknown_0827D8B5:: @ 827D8B5
gText_0827D8B5:: @ 827D8B5
.string "Everyone’s appeals were\n"
.string "made to look the same.$"
gUnknown_0827D8E4:: @ 827D8E4
gText_0827D8E4:: @ 827D8E4
.string "It cheapened\n"
.string "{STR_VAR_2}’s appeal.$"
gUnknown_0827D8FE:: @ 827D8FE
gText_0827D8FE:: @ 827D8FE
.string "It cheapened the appeal\n"
.string "of those ahead.$"
gUnknown_0827D926:: @ 827D926
gText_0827D926:: @ 827D926
.string "It stole attention away\n"
.string "from {STR_VAR_2}.$"
gUnknown_0827D947:: @ 827D947
gText_0827D947:: @ 827D947
.string "It cheapened\n"
.string "{STR_VAR_2}’s appeal.$"
gUnknown_0827D961:: @ 827D961
gText_0827D961:: @ 827D961
.string "It severely cheapened\n"
.string "other appeals.$"
gUnknown_0827D986:: @ 827D986
gText_0827D986:: @ 827D986
.string "Anticipation swelled for\n"
.string "{STR_VAR_1}’s appeal next.$"
gUnknown_0827D9B1:: @ 827D9B1
gText_0827D9B1:: @ 827D9B1
.string "It cheapened the appeal\n"
.string "of those ahead.$"
gUnknown_0827D9D9:: @ 827D9D9
gText_0827D9D9:: @ 827D9D9
.string "It cheapened the JUDGE’s\n"
.string "favorite appeal.$"
gUnknown_0827DA03:: @ 827DA03
gText_0827DA03:: @ 827DA03
.string "The appeals of others\n"
.string "were cheapened by half.$"
gUnknown_0827DA31:: @ 827DA31
gText_0827DA31:: @ 827DA31
.string "It stood out to make up\n"
.string "for being jammed.$"
gUnknown_0827DA5B:: @ 827DA5B
gText_0827DA5B:: @ 827DA5B
.string "It can’t participate in\n"
.string "appeals any more.$"
gUnknown_0827DA85:: @ 827DA85
gText_0827DA85:: @ 827DA85
.string "It touched the JUDGE for\n"
.string "a fantastic appeal.$"
gUnknown_0827DAB2:: @ 827DAB2
gText_0827DAB2:: @ 827DAB2
.string "Anticipation rose for\n"
.string "upcoming appeals.$"
gUnknown_0827DADA:: @ 827DADA
gText_0827DADA:: @ 827DADA
.string "It stood out as much as\n"
.string "special appeals.$"
gUnknown_0827DB03:: @ 827DB03
gText_0827DB03:: @ 827DB03
.string "It stood out as much as\n"
.string "{STR_VAR_1}.$"
gUnknown_0827DB1F:: @ 827DB1F
gText_0827DB1F:: @ 827DB1F
.string "Jammed appeals were made\n"
.string "even less noticeable.$"
gUnknown_0827DB4E:: @ 827DB4E
gText_0827DB4E:: @ 827DB4E
.string "Everyone’s appeals were\n"
.string "made the same.$"
gText_827DB75:: @ 827DB75
.string "It became more conscious\n"
.string "of the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DBB0:: @ 827DBB0
.string "{STR_VAR_1} can’t make an\n"
.string "appeal after this.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DBE0:: @ 827DBE0
.string "It settled down just a\n"
.string "little bit.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DC0F:: @ 827DC0F
.string "It became oblivious to\n"
.string "the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DC45:: @ 827DC45
.string "It became less aware of\n"
.string "the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DC7C:: @ 827DC7C
.string "It stopped caring about\n"
.string "other POKéMON much.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DCB4:: @ 827DCB4
.string "It tried to startle the\n"
.string "other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DCE7:: @ 827DCE7
.string "It tried to dazzle the\n"
.string "others.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DD12:: @ 827DD12
.string "The JUDGE looked away\n"
.string "from {STR_VAR_1}.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DD3D:: @ 827DD3D
.string "It tried to unnerve the\n"
.string "next POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DD6F:: @ 827DD6F
.string "{STR_VAR_1} became\n"
.string "nervous.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DD8E:: @ 827DD8E
.string "The appeal tried to\n"
.string "unnerve waiting POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DDC7:: @ 827DDC7
.string "It taunted POKéMON\n"
.string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DDF2:: @ 827DDF2
.string "{STR_VAR_1} regained its\n"
.string "form.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DE14:: @ 827DE14
.string "It tried to jam POKéMON\n"
.string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DE44:: @ 827DE44
.string "The standout {STR_VAR_1}\n"
.string "hustled even more.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DE73:: @ 827DE73
.string "The largely unnoticed\n"
.string "{STR_VAR_1} worked hard.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DEA5:: @ 827DEA5
.string "It worked as much as\n"
.string "POKéMON before it.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DED9:: @ 827DED9
.string "{STR_VAR_1}’s appeal did\n"
.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DF02:: @ 827DF02
.string "It worked as much as the\n"
.string "preceding POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DF3A:: @ 827DF3A
.string "{STR_VAR_1}’s appeal did\n"
.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DF63:: @ 827DF63
.string "{STR_VAR_1}’s appeal did\n"
.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DF8C:: @ 827DF8C
.string "{STR_VAR_1}’s appeal\n"
.string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DFB8:: @ 827DFB8
.string "{STR_VAR_1}’s appeal\n"
.string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DFE2:: @ 827DFE2
.string "{STR_VAR_1}’s appeal\n"
.string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E00C:: @ 827E00C
.string "{STR_VAR_1}’s appeal was\n"
.string "a dud.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E02F:: @ 827E02F
.string "{STR_VAR_1}’s appeal did\n"
.string "not work very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E05F:: @ 827E05F
.string "{STR_VAR_1}’s appeal\n"
.string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E08B:: @ 827E08B
.string "{STR_VAR_1}’s appeal\n"
.string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E0B5:: @ 827E0B5
.string "{STR_VAR_1}’s appeal\n"
.string "went very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E0DD:: @ 827E0DD
.string "{STR_VAR_1}’s appeal\n"
.string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E107:: @ 827E107
.string "It’s the same type as the\n"
.string "POKéMON before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E143:: @ 827E143
.string "It’s not the same type as\n"
.string "the one before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E17F:: @ 827E17F
.string "It stood out much more\n"
.string "than the POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E1BB:: @ 827E1BB
.string "It didn’t do as well as the\n"
.string "POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E1F3:: @ 827E1F3
.string "{STR_VAR_1}’s condition\n"
.string "rose above usual.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E220:: @ 827E220
.string "{STR_VAR_1}’s hot status\n"
.string "made it a great appeal!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E254:: @ 827E254
.string "It moved up in line for\n"
.string "the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E289:: @ 827E289
.string "It moved back in line once\n"
.string "for the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E2C5:: @ 827E2C5
.string "It scrambled up the\n"
.string "order for the next turn.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gUnknown_0827E2FE:: @ 827E2FE
gText_0827E2FE:: @ 827E2FE
.string "The JUDGE looked at\n"
.string "{STR_VAR_1} expectantly.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E32E:: @ 827E32E
gText_0827E32E:: @ 827E32E
.string "The appeal combo went\n"
.string "over well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E35B:: @ 827E35B
gText_0827E35B:: @ 827E35B
.string "The appeal combo went\n"
.string "over very well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E38D:: @ 827E38D
gText_0827E38D:: @ 827E38D
.string "The appeal combo went\n"
.string "over excellently.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E3C1:: @ 827E3C1
gText_0827E3C1:: @ 827E3C1
.string "{STR_VAR_1} managed to\n"
.string "avert its gaze.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E3EB:: @ 827E3EB
gText_0827E3EB:: @ 827E3EB
.string "{STR_VAR_1} managed to\n"
.string "avoid seeing it.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E416:: @ 827E416
gText_0827E416:: @ 827E416
.string "{STR_VAR_1} isn’t fazed\n"
.string "by that sort of thing.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E448:: @ 827E448
gText_0827E448:: @ 827E448
.string "{STR_VAR_1} became a\n"
.string "little distracted.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E473:: @ 827E473
gText_0827E473:: @ 827E473
.string "It tried to startle the\n"
.string "other POKéMON.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E4A6:: @ 827E4A6
gText_0827E4A6:: @ 827E4A6
.string "{STR_VAR_1} looked down\n"
.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E4D5:: @ 827E4D5
gText_0827E4D5:: @ 827E4D5
.string "{STR_VAR_1} turned back\n"
.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E504:: @ 827E504
gText_0827E504:: @ 827E504
.string "{STR_VAR_1} couldn’t help\n"
.string "uttering a cry.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E531:: @ 827E531
gText_0827E531:: @ 827E531
.string "{STR_VAR_1} couldn’t help\n"
.string "leaping up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E55A:: @ 827E55A
gText_0827E55A:: @ 827E55A
.string "{STR_VAR_1} tripped over\n"
.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E58A:: @ 827E58A
gText_0827E58A:: @ 827E58A
.string "{STR_VAR_1} was too\n"
.string "nervous to move.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E5B2:: @ 827E5B2
gText_0827E5B2:: @ 827E5B2
.string "But it messed up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E5D0:: @ 827E5D0
gText_0827E5D0:: @ 827E5D0
.string "But it failed to make\n"
.string "the target nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E606:: @ 827E606
gText_0827E606:: @ 827E606
.string "But it failed to make\n"
.string "anyone nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E638:: @ 827E638
gText_0827E638:: @ 827E638
.string "But it was ignored…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E658:: @ 827E658
gText_0827E658:: @ 827E658
.string "But it couldn’t improve\n"
.string "its condition…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E68B:: @ 827E68B
gText_0827E68B:: @ 827E68B
.string "Its bad condition\n"
.string "resulted in a weak appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E6C4:: @ 827E6C4
gText_0827E6C4:: @ 827E6C4
.string "{STR_VAR_1} was\n"
.string "unaffected.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E6E3:: @ 827E6E3
gText_0827E6E3:: @ 827E6E3
.string "{STR_VAR_1} disappointed\n"
.string "by repeating an appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E717:: @ 827E717
gText_0827E717:: @ 827E717
.string "{STR_VAR_1}’s {STR_VAR_3}\n"
.string "went over great.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E73C:: @ 827E73C
gText_0827E73C:: @ 827E73C
.string "{STR_VAR_1}’s {STR_VAR_3}\n"
.string "didn’t go over well here…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E76A:: @ 827E76A
gText_0827E76A:: @ 827E76A
.string "{STR_VAR_1}’s {STR_VAR_3}\n"
.string "got the crowd going.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E793:: @ 827E793
gText_0827E793:: @ 827E793
.string "{STR_VAR_1} can’t appeal\n"
.string "next turn…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E7BA:: @ 827E7BA
gText_0827E7BA:: @ 827E7BA
.string "It attracted the crowd’s\n"
.string "attention.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E7EA:: @ 827E7EA
gText_0827E7EA:: @ 827E7EA
.string "The crowd continues to\n"
.string "watch {STR_VAR_3}.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E817:: @ 827E817
gText_0827E817:: @ 827E817
.string "{STR_VAR_1}’s\n"
.string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E837:: @ 827E837
gText_0827E837:: @ 827E837
.string "shyness$"
gUnknown_0827E83F:: @ 827E83F
gText_0827E83F:: @ 827E83F
.string "anxiety$"
gUnknown_0827E847:: @ 827E847
gText_0827E847:: @ 827E847
.string "laziness$"
gUnknown_0827E850:: @ 827E850
gText_0827E850:: @ 827E850
.string "hesitancy$"
gUnknown_0827E85A:: @ 827E85A
gText_0827E85A:: @ 827E85A
.string "fear$"
gUnknown_0827E85F:: @ 827E85F
gText_0827E85F:: @ 827E85F
.string "coolness$"
gUnknown_0827E868:: @ 827E868
gText_0827E868:: @ 827E868
.string "beauty$"
gUnknown_0827E86F:: @ 827E86F
gText_0827E86F:: @ 827E86F
.string "cuteness$"
gUnknown_0827E878:: @ 827E878
gText_0827E878:: @ 827E878
.string "smartness$"
gUnknown_0827E882:: @ 827E882
gText_0827E882:: @ 827E882
.string "toughness$"
gUnknown_0827E88C:: @ 827E88C
gText_0827E88C:: @ 827E88C
.string "TENSION$"
gUnknown_0827E894:: @ 827E894
gText_0827E894:: @ 827E894
.string "COOL Move$"
gUnknown_0827E89E:: @ 827E89E
gText_0827E89E:: @ 827E89E
.string "BEAUTY Move$"
gUnknown_0827E8AA:: @ 827E8AA
gText_0827E8AA:: @ 827E8AA
.string "CUTE Move$"
gUnknown_0827E8B4:: @ 827E8B4
gText_0827E8B4:: @ 827E8B4
.string "SMART Move$"
gUnknown_0827E8BF:: @ 827E8BF
gText_0827E8BF:: @ 827E8BF
.string "TOUGH Move$"
gUnknown_0827E8CA:: @ 827E8CA
gText_0827E8CA:: @ 827E8CA
.string "???$"

2
data/text/easy_chat/easy_chat_group_pokemon2.s
View File

@@ -57,7 +57,7 @@ gEasyChatGroup_Pokemon2:: @ 859CE0C
.2byte SPECIES_ESPEON
.2byte SPECIES_EXEGGCUTE
.2byte SPECIES_EXEGGUTOR
.2byte SPECIES_FARFETCH_D
.2byte SPECIES_FARFETCHD
.2byte SPECIES_FEAROW
.2byte SPECIES_FERALIGATR
.2byte SPECIES_FLAAFFY

4674
data/text/easy_chat/easy_chat_words_by_letter.inc
View File

File diff suppressed because it is too large Load Diff

3
data/trade.s
View File

@@ -3,6 +3,9 @@
.section .rodata
.align 2, 0
gUnknown_0832C6A8:: @ 832C6A8
.incbin "baserom.gba", 0x32C6A8, 0x18
gUnknown_0832C6C0:: @ 832C6C0
.incbin "baserom.gba", 0x32c6c0, 0x1fe

7
data/unk_81BAD84.s
View File

@@ -1,7 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_08617128:: @ 8617128
.incbin "baserom.gba", 0x617128, 0x48

1
data/wild_encounter.s
View File

@@ -1,3 +1,4 @@
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

3950
data/wild_mons.inc
View File

File diff suppressed because it is too large Load Diff