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

Merge remote-tracking branch 'pret/master'

Browse Source
This commit is contained in:
Diegoisawesome
2017-09-19 19:42:32 -05:00
parent fcc94f9722 f94074b602
commit d273493cbb
79 changed files with 14787 additions and 32744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
data/battle_scripts_1.s
View File

@@ -21,7 +21,7 @@ gUnknown_082D8CD4:: @ 82D8CD4
gUnknown_082D8D65:: @ 82D8D65
.incbin "baserom.gba", 0x2d8d65, 0x6fd
gUnknown_082D9462:: @ 82D9462
BattleScript_MoveUsedMustRecharge:: @ 82D9462
.incbin "baserom.gba", 0x2d9462, 0xa7f
gUnknown_082D9EE1:: @ 82D9EE1
@@ -120,16 +120,16 @@ gUnknown_082DACFA:: @ 82DACFA
gUnknown_082DAD0B:: @ 82DAD0B
.incbin "baserom.gba", 0x2dad0b, 0xa
gUnknown_082DAD15:: @ 82DAD15
BattleScript_LeechSeedTurnDrain:: @ 82DAD15
.incbin "baserom.gba", 0x2dad15, 0x5c
gUnknown_082DAD71:: @ 82DAD71
BattleScript_BideStoringEnergy:: @ 82DAD71
.incbin "baserom.gba", 0x2dad71, 0xb
gUnknown_082DAD7C:: @ 82DAD7C
BattleScript_BideAttack:: @ 82DAD7C
.incbin "baserom.gba", 0x2dad7c, 0x48
gUnknown_082DADC4:: @ 82DADC4
BattleScript_BideNoEnergyToAttack:: @ 82DADC4
.incbin "baserom.gba", 0x2dadc4, 0x14
gUnknown_082DADD8:: @ 82DADD8
@@ -141,19 +141,19 @@ gUnknown_082DAE03:: @ 82DAE03
gUnknown_082DAE0D:: @ 82DAE0D
.incbin "baserom.gba", 0x2dae0d, 0x7
gUnknown_082DAE14:: @ 82DAE14
BattleScript_MoveUsedIsDisabled:: @ 82DAE14
.incbin "baserom.gba", 0x2dae14, 0xb
gUnknown_082DAE1F:: @ 82DAE1F
.incbin "baserom.gba", 0x2dae1f, 0x4
gUnknown_082DAE23:: @ 82DAE23
BattleScript_DisabledNoMore:: @ 82DAE23
.incbin "baserom.gba", 0x2dae23, 0x7
gUnknown_082DAE2A:: @ 82DAE2A
.incbin "baserom.gba", 0x2dae2a, 0xd
gUnknown_082DAE37:: @ 82DAE37
BattleScript_EncoredNoMore:: @ 82DAE37
.incbin "baserom.gba", 0x2dae37, 0x7
gUnknown_082DAE3E:: @ 82DAE3E
@@ -192,7 +192,7 @@ gUnknown_082DAFDD:: @ 82DAFDD
gUnknown_082DAFE4:: @ 82DAFE4
.incbin "baserom.gba", 0x2dafe4, 0x8e
gUnknown_082DB072:: @ 82DB072
BattleScript_NoMovesLeft:: @ 82DB072
.incbin "baserom.gba", 0x2db072, 0x4
gUnknown_082DB076:: @ 82DB076
@@ -210,16 +210,16 @@ gUnknown_082DB098:: @ 82DB098
gUnknown_082DB0A0:: @ 82DB0A0
.incbin "baserom.gba", 0x2db0a0, 0x4
gUnknown_082DB0A4:: @ 82DB0A4
BattleScript_MoveUsedIsTaunted:: @ 82DB0A4
.incbin "baserom.gba", 0x2db0a4, 0xb
gUnknown_082DB0AF:: @ 82DB0AF
.incbin "baserom.gba", 0x2db0af, 0x8
gUnknown_082DB0B7:: @ 82DB0B7
BattleScript_WishComesTrue:: @ 82DB0B7
.incbin "baserom.gba", 0x2db0b7, 0x37
gUnknown_082DB0EE:: @ 82DB0EE
BattleScript_IngrainTurnHeal:: @ 82DB0EE
.incbin "baserom.gba", 0x2db0ee, 0x29
gUnknown_082DB117:: @ 82DB117
@@ -228,7 +228,7 @@ gUnknown_082DB117:: @ 82DB117
gUnknown_082DB168:: @ 82DB168
.incbin "baserom.gba", 0x2db168, 0xe
gUnknown_082DB176:: @ 82DB176
BattleScript_MoveUsedIsImprisoned:: @ 82DB176
.incbin "baserom.gba", 0x2db176, 0xb
gUnknown_082DB181:: @ 82DB181
@@ -258,67 +258,67 @@ gUnknown_082DB1D5:: @ 82DB1D5
gUnknown_082DB1FF:: @ 82DB1FF
.incbin "baserom.gba", 0x2db1ff, 0x14
gUnknown_082DB213:: @ 82DB213
BattleScript_MoveUsedIsAsleep:: @ 82DB213
.incbin "baserom.gba", 0x2db213, 0xd
gUnknown_082DB220:: @ 82DB220
BattleScript_MoveUsedWokeUp:: @ 82DB220
.incbin "baserom.gba", 0x2db220, 0x14
gUnknown_082DB234:: @ 82DB234
.incbin "baserom.gba", 0x2db234, 0x9
gUnknown_082DB23D:: @ 82DB23D
BattleScript_PoisonTurnDmg:: @ 82DB23D
.incbin "baserom.gba", 0x2db23d, 0x22
gUnknown_082DB25F:: @ 82DB25F
BattleScript_BurnTurnDmg:: @ 82DB25F
.incbin "baserom.gba", 0x2db25f, 0xb
gUnknown_082DB26A:: @ 82DB26A
BattleScript_MoveUsedIsFrozen:: @ 82DB26A
.incbin "baserom.gba", 0x2db26a, 0xd
gUnknown_082DB277:: @ 82DB277
BattleScript_MoveUsedUnfroze:: @ 82DB277
.incbin "baserom.gba", 0x2db277, 0xb
gUnknown_082DB282:: @ 82DB282
.incbin "baserom.gba", 0x2db282, 0x9
gUnknown_082DB28B:: @ 82DB28B
BattleScript_MoveUsedIsParalyzed:: @ 82DB28B
.incbin "baserom.gba", 0x2db28b, 0x10
gUnknown_082DB29B:: @ 82DB29B
BattleScript_MoveUsedFlinched:: @ 82DB29B
.incbin "baserom.gba", 0x2db29b, 0xb
gUnknown_082DB2A6:: @ 82DB2A6
.incbin "baserom.gba", 0x2db2a6, 0x9
gUnknown_082DB2AF:: @ 82DB2AF
BattleScript_ThrashConfuses:: @ 82DB2AF
.incbin "baserom.gba", 0x2db2af, 0xe
gUnknown_082DB2BD:: @ 82DB2BD
BattleScript_MoveUsedIsConfused:: @ 82DB2BD
.incbin "baserom.gba", 0x2db2bd, 0x43
gUnknown_082DB300:: @ 82DB300
BattleScript_MoveUsedIsConfusedNoMore:: @ 82DB300
.incbin "baserom.gba", 0x2db300, 0x7
gUnknown_082DB307:: @ 82DB307
.incbin "baserom.gba", 0x2db307, 0x7
gUnknown_082DB30E:: @ 82DB30E
BattleScript_WrapTurnDmg:: @ 82DB30E
.incbin "baserom.gba", 0x2db30e, 0x12
gUnknown_082DB320:: @ 82DB320
BattleScript_WrapEnds:: @ 82DB320
.incbin "baserom.gba", 0x2db320, 0x7
gUnknown_082DB327:: @ 82DB327
BattleScript_MoveUsedIsInLove:: @ 82DB327
.incbin "baserom.gba", 0x2db327, 0xd
gUnknown_082DB334:: @ 82DB334
BattleScript_MoveUsedIsParalyzedCantAttack:: @ 82DB334
.incbin "baserom.gba", 0x2db334, 0xb
gUnknown_082DB33F:: @ 82DB33F
BattleScript_NightmareTurnDmg:: @ 82DB33F
.incbin "baserom.gba", 0x2db33f, 0x11
gUnknown_082DB350:: @ 82DB350
BattleScript_CurseTurnDmg:: @ 82DB350
.incbin "baserom.gba", 0x2db350, 0x11
gUnknown_082DB361:: @ 82DB361
@@ -327,7 +327,7 @@ gUnknown_082DB361:: @ 82DB361
gUnknown_082DB36A:: @ 82DB36A
.incbin "baserom.gba", 0x2db36A, 0xE
gUnknown_082DB378:: @ 82DB378
BattleScript_YawnMakesAsleep:: @ 82DB378
.incbin "baserom.gba", 0x2db378, 0xE
gUnknown_082DB386:: @ 82DB386
@@ -363,25 +363,25 @@ gUnknown_082DB3F4:: @ 82DB3F4
gUnknown_082DB422:: @ 82DB422
.incbin "baserom.gba", 0x2db422, 0xe
gUnknown_082DB430:: @ 82DB430
BattleScript_DrizzleActivates:: @ 82DB430
.incbin "baserom.gba", 0x2db430, 0x14
gUnknown_082DB444:: @ 82DB444
BattleScript_SpeedBoostActivates:: @ 82DB444
.incbin "baserom.gba", 0x2db444, 0xe
gUnknown_082DB452:: @ 82DB452
BattleScript_TraceActivates:: @ 82DB452
.incbin "baserom.gba", 0x2db452, 0xa
gUnknown_082DB45C:: @ 82DB45C
BattleScript_RainDishActivates:: @ 82DB45C
.incbin "baserom.gba", 0x2db45c, 0x14
gUnknown_082DB470:: @ 82DB470
BattleScript_SandstreamActivates:: @ 82DB470
.incbin "baserom.gba", 0x2db470, 0x14
gUnknown_082DB484:: @ 82DB484
BattleScript_ShedSkinActivates:: @ 82DB484
.incbin "baserom.gba", 0x2db484, 0x25
gUnknown_082DB4A9:: @ 82DB4A9
BattleScript_CastformChange:: @ 82DB4A9
.incbin "baserom.gba", 0x2db4a9, 0xf
gUnknown_082DB4B8:: @ 82DB4B8
@@ -390,7 +390,7 @@ gUnknown_082DB4B8:: @ 82DB4B8
gUnknown_082DB4C1:: @ 82DB4C1
.incbin "baserom.gba", 0x2db4c1, 0x69
gUnknown_082DB52A:: @ 82DB52A
BattleScript_DroughtActivates:: @ 82DB52A
.incbin "baserom.gba", 0x2db52a, 0x14
gUnknown_082DB53E:: @ 82DB53E
@@ -402,10 +402,10 @@ gUnknown_082DB552:: @ 82DB552
gUnknown_082DB560:: @ 82DB560
.incbin "baserom.gba", 0x2db560, 0xe
gUnknown_082DB56E:: @ 82DB56E
BattleScript_MoveHPDrain_PPLoss:: @ 82DB56E
.incbin "baserom.gba", 0x2db56e, 0x1
gUnknown_082DB56F:: @ 82DB56F
BattleScript_MoveHPDrain:: @ 82DB56F
.incbin "baserom.gba", 0x2db56f, 0x22
gUnknown_082DB591:: @ 82DB591
@@ -414,10 +414,10 @@ gUnknown_082DB591:: @ 82DB591
gUnknown_082DB592:: @ 82DB592
.incbin "baserom.gba", 0x2db592, 0x15
gUnknown_082DB5A7:: @ 82DB5A7
BattleScript_FlashFireBoost_PPLoss:: @ 82DB5A7
.incbin "baserom.gba", 0x2db5a7, 0x1
gUnknown_082DB5A8:: @ 82DB5A8
BattleScript_FlashFireBoost:: @ 82DB5A8
.incbin "baserom.gba", 0x2db5a8, 0x1f
gUnknown_082DB5C7:: @ 82DB5C7
@@ -438,7 +438,7 @@ gUnknown_082DB5F5:: @ 82DB5F5
gUnknown_082DB603:: @ 82DB603
.incbin "baserom.gba", 0x2db603, 0x1c
gUnknown_082DB61F:: @ 82DB61F
BattleScript_SoundproofProtected:: @ 82DB61F
.incbin "baserom.gba", 0x2db61f, 0x10
gUnknown_082DB62F:: @ 82DB62F
@@ -447,19 +447,19 @@ gUnknown_082DB62F:: @ 82DB62F
gUnknown_082DB63F:: @ 82DB63F
.incbin "baserom.gba", 0x2db63f, 0xe
gUnknown_082DB64D:: @ 82DB64D
BattleScript_ColorChangeActivates:: @ 82DB64D
.incbin "baserom.gba", 0x2db64d, 0x7
gUnknown_082DB654:: @ 82DB654
BattleScript_RoughSkinActivates:: @ 82DB654
.incbin "baserom.gba", 0x2db654, 0x1b
gUnknown_082DB66F:: @ 82DB66F
BattleScript_CuteCharmActivates:: @ 82DB66F
.incbin "baserom.gba", 0x2db66f, 0xd
gUnknown_082DB67C:: @ 82DB67C
BattleScript_ApplySecondaryEffect:: @ 82DB67C
.incbin "baserom.gba", 0x2db67c, 0x3
gUnknown_082DB67F:: @ 82DB67F
BattleScript_SynchronizeActivates:: @ 82DB67F
.incbin "baserom.gba", 0x2db67f, 0x3
gUnknown_082DB682:: @ 82DB682
@@ -474,7 +474,7 @@ gUnknown_082DB695:: @ 82DB695
gUnknown_082DB6A5:: @ 82DB6A5
.incbin "baserom.gba", 0x2db6a5, 0x8
gUnknown_082DB6AD:: @ 82DB6AD
BattleScript_MoveUsedLoafingAround:: @ 82DB6AD
.incbin "baserom.gba", 0x2db6ad, 0x2c
gUnknown_082DB6D9:: @ 82DB6D9
@@ -486,64 +486,64 @@ gUnknown_082DB6F0:: @ 82DB6F0
gUnknown_082DB6FB:: @ 82DB6FB
.incbin "baserom.gba", 0x2db6fb, 0xb
gUnknown_082DB706:: @ 82DB706
BattleScript_BerryCurePrlzEnd2:: @ 82DB706
.incbin "baserom.gba", 0x2db706, 0x6
gUnknown_082DB70C:: @ 82DB70C
BattleScript_BerryCureParRet:: @ 82DB70C
.incbin "baserom.gba", 0x2db70c, 0x12
gUnknown_082DB71E:: @ 82DB71E
BattleScript_BerryCurePsnEnd2:: @ 82DB71E
.incbin "baserom.gba", 0x2db71e, 0x6
gUnknown_082DB724:: @ 82DB724
BattleScript_BerryCurePsnRet:: @ 82DB724
.incbin "baserom.gba", 0x2db724, 0x12
gUnknown_082DB736:: @ 82DB736
BattleScript_BerryCureBrnEnd2:: @ 82DB736
.incbin "baserom.gba", 0x2db736, 0x6
gUnknown_082DB73C:: @ 82DB73C
BattleScript_BerryCureBrnRet:: @ 82DB73C
.incbin "baserom.gba", 0x2db73c, 0x12
gUnknown_082DB74E:: @ 82DB74E
BattleScript_BerryCureFrzEnd2:: @ 82DB74E
.incbin "baserom.gba", 0x2db74e, 0x6
gUnknown_082DB754:: @ 82DB754
BattleScript_BerryCureFrzRet:: @ 82DB754
.incbin "baserom.gba", 0x2db754, 0x12
gUnknown_082DB766:: @ 82DB766
BattleScript_BerryCureSlpEnd2:: @ 82DB766
.incbin "baserom.gba", 0x2db766, 0x6
gUnknown_082DB76C:: @ 82DB76C
BattleScript_BerryCureSlpRet:: @ 82DB76C
.incbin "baserom.gba", 0x2db76c, 0x12
gUnknown_082DB77E:: @ 82DB77E
BattleScript_BerryCureConfusionEnd2:: @ 82DB77E
.incbin "baserom.gba", 0x2db77e, 0x6
gUnknown_082DB784:: @ 82DB784
BattleScript_BerryCureConfusionRet:: @ 82DB784
.incbin "baserom.gba", 0x2db784, 0x10
gUnknown_082DB794:: @ 82DB794
BattleScript_BerryCureChosenStatusEnd2:: @ 82DB794
.incbin "baserom.gba", 0x2db794, 0x6
gUnknown_082DB79A:: @ 82DB79A
BattleScript_BerryCureChosenStatusRet:: @ 82DB79A
.incbin "baserom.gba", 0x2db79a, 0x14
gUnknown_082DB7AE:: @ 82DB7AE
BattleScript_WhiteHerbEnd2:: @ 82DB7AE
.incbin "baserom.gba", 0x2db7ae, 0x6
gUnknown_082DB7B4:: @ 82DB7B4
BattleScript_WhiteHerbRet:: @ 82DB7B4
.incbin "baserom.gba", 0x2db7b4, 0x10
gUnknown_082DB7C4:: @ 82DB7C4
BattleScript_ItemHealHP_RemoveItem:: @ 82DB7C4
.incbin "baserom.gba", 0x2db7c4, 0x1d
gUnknown_082DB7E1:: @ 82DB7E1
BattleScript_BerryPPHealEnd2:: @ 82DB7E1
.incbin "baserom.gba", 0x2db7e1, 0x10
gUnknown_082DB7F1:: @ 82DB7F1
BattleScript_ItemHealHP_End2:: @ 82DB7F1
.incbin "baserom.gba", 0x2db7f1, 0x6
gUnknown_082DB7F7:: @ 82DB7F7
BattleScript_ItemHealHP_Ret:: @ 82DB7F7
.incbin "baserom.gba", 0x2db7f7, 0x1b
gUnknown_082DB812:: @ 82DB812
@@ -552,13 +552,13 @@ gUnknown_082DB812:: @ 82DB812
gUnknown_082DB816:: @ 82DB816
.incbin "baserom.gba", 0x2db816, 0xe
gUnknown_082DB824:: @ 82DB824
BattleScript_BerryConfuseHealEnd2:: @ 82DB824
.incbin "baserom.gba", 0x2db824, 0x2a
gUnknown_082DB84E:: @ 82DB84E
BattleScript_BerryStatRaiseEnd2:: @ 82DB84E
.incbin "baserom.gba", 0x2db84e, 0x1b
gUnknown_082DB869:: @ 82DB869
BattleScript_BerryFocusEnergyEnd2:: @ 82DB869
.incbin "baserom.gba", 0x2db869, 0x10
gUnknown_082DB879:: @ 82DB879

16
data/data2b.s
View File

@@ -227,25 +227,25 @@ gUnknown_0831BC0C:: @ 831BC0C
gUnknown_0831BC44:: @ 831BC44
.incbin "baserom.gba", 0x31bc44, 0x2c
gUnknown_0831BC70:: @ 831BC70
gStatusConditionString_PoisonJpn:: @ 831BC70
.incbin "baserom.gba", 0x31bc70, 0x8
gUnknown_0831BC78:: @ 831BC78
gStatusConditionString_SleepJpn:: @ 831BC78
.incbin "baserom.gba", 0x31bc78, 0x8
gUnknown_0831BC80:: @ 831BC80
gStatusConditionString_ParalysisJpn:: @ 831BC80
.incbin "baserom.gba", 0x31bc80, 0x8
gUnknown_0831BC88:: @ 831BC88
gStatusConditionString_BurnJpn:: @ 831BC88
.incbin "baserom.gba", 0x31bc88, 0x8
gUnknown_0831BC90:: @ 831BC90
gStatusConditionString_IceJpn:: @ 831BC90
.incbin "baserom.gba", 0x31bc90, 0x8
gUnknown_0831BC98:: @ 831BC98
gStatusConditionString_ConfusionJpn:: @ 831BC98
.incbin "baserom.gba", 0x31bc98, 0x8
gUnknown_0831BCA0:: @ 831BCA0
gStatusConditionString_LoveJpn:: @ 831BCA0
.incbin "baserom.gba", 0x31bca0, 0x8
gUnknown_0831BCA8:: @ 831BCA8
@@ -260,6 +260,6 @@ gUnknown_0831BCEF:: @ 831BCEF
gUnknown_0831BCF3:: @ 831BCF3
.incbin "baserom.gba", 0x31bcf3, 0x5
gUnknown_0831BCF8:: @ 831BCF8
gSoundMovesTable:: @ 831BCF8
.incbin "baserom.gba", 0x31bcf8, 0x18

504
data/data3.s
View File

@@ -632,499 +632,9 @@ gUnknown_084975B0:: @ 84975B0
gUnknown_084975BC:: @ 84975BC
.incbin "baserom.gba", 0x4975bc, 0x8
gUnknown_084975C4:: @ 84975C4
.incbin "baserom.gba", 0x4975c4, 0x10
// data/field_map_obj.s
gUnknown_084975D4:: @ 84975D4
.incbin "baserom.gba", 0x4975d4, 0x18
gUnknown_084975EC:: @ 84975EC
.incbin "baserom.gba", 0x4975ec, 0xc
@ 84975F8
.include "data/graphics/field_objects/field_object_graphics.inc"
gUnknown_08505438:: @ 8505438
.incbin "baserom.gba", 0x505438, 0x144
gUnknown_0850557C:: @ 850557C
.incbin "baserom.gba", 0x50557c, 0x51
gUnknown_085055CD:: @ 85055CD
.incbin "baserom.gba", 0x5055cd, 0x53
@ 8505620
.include "data/graphics/field_objects/field_object_graphics_info_pointers.inc"
@ 85059F8
.include "data/graphics/field_objects/field_effect_object_template_pointers.inc"
@ 8505A8C
.include "data/graphics/field_objects/field_object_pic_tables.inc"
@ 85089FC
.include "data/graphics/field_objects/field_object_anims.inc"
gUnknown_085094AC:: @ 85094AC
.incbin "baserom.gba", 0x5094ac, 0x40
@ 85094EC
.include "data/graphics/field_objects/field_object_oam.inc"
@ 8509954
.include "data/graphics/field_objects/field_object_graphics_info.inc"
gUnknown_0850BBC8:: @ 850BBC8
.incbin "baserom.gba", 0x50bbc8, 0x138
gUnknown_0850BD00:: @ 850BD00
.incbin "baserom.gba", 0x50bd00, 0x78
gUnknown_0850BD78:: @ 850BD78
.incbin "baserom.gba", 0x50bd78, 0xc0
gUnknown_0850BE38:: @ 850BE38
.incbin "baserom.gba", 0x50be38, 0x10
@ 850BE48
.include "data/graphics/field_objects/berry_tree_graphics_tables.inc"
@ 850C9C0
.include "data/graphics/field_objects/field_effect_objects.inc"
.incbin "baserom.gba", 0x50d6d4, 0x8
gUnknown_0850D6DC:: @ 850D6DC
.incbin "baserom.gba", 0x50d6dc, 0x10
gUnknown_0850D6EC:: @ 850D6EC
.incbin "baserom.gba", 0x50d6ec, 0x8
gUnknown_0850D6F4:: @ 850D6F4
.incbin "baserom.gba", 0x50d6f4, 0x1c
gUnknown_0850D710:: @ 850D710
.incbin "baserom.gba", 0x50d710, 0x4
gUnknown_0850D714:: @ 850D714
.incbin "baserom.gba", 0x50d714, 0x2c
gUnknown_0850D740:: @ 850D740
.incbin "baserom.gba", 0x50d740, 0x14
gUnknown_0850D754:: @ 850D754
.incbin "baserom.gba", 0x50d754, 0x1c
gUnknown_0850D770:: @ 850D770
.incbin "baserom.gba", 0x50d770, 0x4
gUnknown_0850D774:: @ 850D774
.incbin "baserom.gba", 0x50d774, 0x1c
gUnknown_0850D790:: @ 850D790
.incbin "baserom.gba", 0x50d790, 0x4
gUnknown_0850D794:: @ 850D794
.incbin "baserom.gba", 0x50d794, 0xc
gUnknown_0850D7A0:: @ 850D7A0
.incbin "baserom.gba", 0x50d7a0, 0x14
gUnknown_0850D7B4:: @ 850D7B4
.incbin "baserom.gba", 0x50d7b4, 0x14
gUnknown_0850D7C8:: @ 850D7C8
.incbin "baserom.gba", 0x50d7c8, 0x14
gUnknown_0850D7DC:: @ 850D7DC
.incbin "baserom.gba", 0x50d7dc, 0x14
gUnknown_0850D7F0:: @ 850D7F0
.incbin "baserom.gba", 0x50d7f0, 0x4
gUnknown_0850D7F4:: @ 850D7F4
.incbin "baserom.gba", 0x50d7f4, 0x14
gUnknown_0850D808:: @ 850D808
.incbin "baserom.gba", 0x50d808, 0x4
gUnknown_0850D80C:: @ 850D80C
.incbin "baserom.gba", 0x50d80c, 0x14
gUnknown_0850D820:: @ 850D820
.incbin "baserom.gba", 0x50d820, 0x4
gUnknown_0850D824:: @ 850D824
.incbin "baserom.gba", 0x50d824, 0x14
gUnknown_0850D838:: @ 850D838
.incbin "baserom.gba", 0x50d838, 0x4
gUnknown_0850D83C:: @ 850D83C
.incbin "baserom.gba", 0x50d83c, 0x14
gUnknown_0850D850:: @ 850D850
.incbin "baserom.gba", 0x50d850, 0x4
gUnknown_0850D854:: @ 850D854
.incbin "baserom.gba", 0x50d854, 0x14
gUnknown_0850D868:: @ 850D868
.incbin "baserom.gba", 0x50d868, 0x4
gUnknown_0850D86C:: @ 850D86C
.incbin "baserom.gba", 0x50d86c, 0x14
gUnknown_0850D880:: @ 850D880
.incbin "baserom.gba", 0x50d880, 0x4
gUnknown_0850D884:: @ 850D884
.incbin "baserom.gba", 0x50d884, 0x14
gUnknown_0850D898:: @ 850D898
.incbin "baserom.gba", 0x50d898, 0x4
gUnknown_0850D89C:: @ 850D89C
.incbin "baserom.gba", 0x50d89c, 0x10
gUnknown_0850D8AC:: @ 850D8AC
.incbin "baserom.gba", 0x50d8ac, 0x8
gUnknown_0850D8B4:: @ 850D8B4
.incbin "baserom.gba", 0x50d8b4, 0x10
gUnknown_0850D8C4:: @ 850D8C4
.incbin "baserom.gba", 0x50d8c4, 0x8
gUnknown_0850D8CC:: @ 850D8CC
.incbin "baserom.gba", 0x50d8cc, 0x10
gUnknown_0850D8DC:: @ 850D8DC
.incbin "baserom.gba", 0x50d8dc, 0xc
gUnknown_0850D8E8:: @ 850D8E8
.incbin "baserom.gba", 0x50d8e8, 0x4
gUnknown_0850D8EC:: @ 850D8EC
.incbin "baserom.gba", 0x50d8ec, 0xc
gUnknown_0850D8F8:: @ 850D8F8
.incbin "baserom.gba", 0x50d8f8, 0x4
gUnknown_0850D8FC:: @ 850D8FC
.incbin "baserom.gba", 0x50d8fc, 0xc
gUnknown_0850D908:: @ 850D908
.incbin "baserom.gba", 0x50d908, 0x4
gUnknown_0850D90C:: @ 850D90C
.incbin "baserom.gba", 0x50d90c, 0xc
gUnknown_0850D918:: @ 850D918
.incbin "baserom.gba", 0x50d918, 0x4
gUnknown_0850D91C:: @ 850D91C
.incbin "baserom.gba", 0x50d91c, 0xc
gUnknown_0850D928:: @ 850D928
.incbin "baserom.gba", 0x50d928, 0x4
gUnknown_0850D92C:: @ 850D92C
.incbin "baserom.gba", 0x50d92c, 0xc
gUnknown_0850D938:: @ 850D938
.incbin "baserom.gba", 0x50d938, 0x4
gUnknown_0850D93C:: @ 850D93C
.incbin "baserom.gba", 0x50d93c, 0xc
gUnknown_0850D948:: @ 850D948
.incbin "baserom.gba", 0x50d948, 0xc
gUnknown_0850D954:: @ 850D954
.incbin "baserom.gba", 0x50d954, 0x4
gUnknown_0850D958:: @ 850D958
.incbin "baserom.gba", 0x50d958, 0xc
gUnknown_0850D964:: @ 850D964
.incbin "baserom.gba", 0x50d964, 0x4
gUnknown_0850D968:: @ 850D968
.incbin "baserom.gba", 0x50d968, 0xc
gUnknown_0850D974:: @ 850D974
.incbin "baserom.gba", 0x50d974, 0x4
gUnknown_0850D978:: @ 850D978
.incbin "baserom.gba", 0x50d978, 0xc
gUnknown_0850D984:: @ 850D984
.incbin "baserom.gba", 0x50d984, 0x4
gUnknown_0850D988:: @ 850D988
.incbin "baserom.gba", 0x50d988, 0xc
gUnknown_0850D994:: @ 850D994
.incbin "baserom.gba", 0x50d994, 0x4
gUnknown_0850D998:: @ 850D998
.incbin "baserom.gba", 0x50d998, 0xc
gUnknown_0850D9A4:: @ 850D9A4
.incbin "baserom.gba", 0x50d9a4, 0x4
gUnknown_0850D9A8:: @ 850D9A8
.incbin "baserom.gba", 0x50d9a8, 0xc
gUnknown_0850D9B4:: @ 850D9B4
.incbin "baserom.gba", 0x50d9b4, 0x4
gUnknown_0850D9B8:: @ 850D9B8
.incbin "baserom.gba", 0x50d9b8, 0xc
gUnknown_0850D9C4:: @ 850D9C4
.incbin "baserom.gba", 0x50d9c4, 0x4
gUnknown_0850D9C8:: @ 850D9C8
.incbin "baserom.gba", 0x50d9c8, 0xc
gUnknown_0850D9D4:: @ 850D9D4
.incbin "baserom.gba", 0x50d9d4, 0x4
gUnknown_0850D9D8:: @ 850D9D8
.incbin "baserom.gba", 0x50d9d8, 0xc
gUnknown_0850D9E4:: @ 850D9E4
.incbin "baserom.gba", 0x50d9e4, 0x4
gUnknown_0850D9E8:: @ 850D9E8
.incbin "baserom.gba", 0x50d9e8, 0xc
gUnknown_0850D9F4:: @ 850D9F4
.incbin "baserom.gba", 0x50d9f4, 0x4
gUnknown_0850D9F8:: @ 850D9F8
.incbin "baserom.gba", 0x50d9f8, 0xc
gUnknown_0850DA04:: @ 850DA04
.incbin "baserom.gba", 0x50da04, 0x4
gUnknown_0850DA08:: @ 850DA08
.incbin "baserom.gba", 0x50da08, 0xc
gUnknown_0850DA14:: @ 850DA14
.incbin "baserom.gba", 0x50da14, 0x4
gUnknown_0850DA18:: @ 850DA18
.incbin "baserom.gba", 0x50da18, 0xc
gUnknown_0850DA24:: @ 850DA24
.incbin "baserom.gba", 0x50da24, 0x4
gUnknown_0850DA28:: @ 850DA28
.incbin "baserom.gba", 0x50da28, 0xc
gUnknown_0850DA34:: @ 850DA34
.incbin "baserom.gba", 0x50da34, 0x4
gUnknown_0850DA38:: @ 850DA38
.incbin "baserom.gba", 0x50da38, 0xc
gUnknown_0850DA44:: @ 850DA44
.incbin "baserom.gba", 0x50da44, 0x4
gUnknown_0850DA48:: @ 850DA48
.incbin "baserom.gba", 0x50da48, 0xc
gUnknown_0850DA54:: @ 850DA54
.incbin "baserom.gba", 0x50da54, 0x4
gUnknown_0850DA58:: @ 850DA58
.incbin "baserom.gba", 0x50da58, 0xc
gUnknown_0850DA64:: @ 850DA64
.incbin "baserom.gba", 0x50da64, 0x2c
gUnknown_0850DA90:: @ 850DA90
.incbin "baserom.gba", 0x50da90, 0xc
gUnknown_0850DA9C:: @ 850DA9C
.incbin "baserom.gba", 0x50da9c, 0x4
gUnknown_0850DAA0:: @ 850DAA0
.incbin "baserom.gba", 0x50daa0, 0x8
gUnknown_0850DAA8:: @ 850DAA8
.incbin "baserom.gba", 0x50daa8, 0x8
gUnknown_0850DAB0:: @ 850DAB0
.incbin "baserom.gba", 0x50dab0, 0x8
gUnknown_0850DAB8:: @ 850DAB8
.incbin "baserom.gba", 0x50dab8, 0x8
gUnknown_0850DAC0:: @ 850DAC0
.incbin "baserom.gba", 0x50dac0, 0xc
gUnknown_0850DACC:: @ 850DACC
.incbin "baserom.gba", 0x50dacc, 0x9
gUnknown_0850DAD5:: @ 850DAD5
.incbin "baserom.gba", 0x50dad5, 0x9
gUnknown_0850DADE:: @ 850DADE
.incbin "baserom.gba", 0x50dade, 0x9
gUnknown_0850DAE7:: @ 850DAE7
.incbin "baserom.gba", 0x50dae7, 0x9
gUnknown_0850DAF0:: @ 850DAF0
.incbin "baserom.gba", 0x50daf0, 0x9
gUnknown_0850DAF9:: @ 850DAF9
.incbin "baserom.gba", 0x50daf9, 0x9
gUnknown_0850DB02:: @ 850DB02
.incbin "baserom.gba", 0x50db02, 0x9
gUnknown_0850DB0B:: @ 850DB0B
.incbin "baserom.gba", 0x50db0b, 0x9
gUnknown_0850DB14:: @ 850DB14
.incbin "baserom.gba", 0x50db14, 0x9
gUnknown_0850DB1D:: @ 850DB1D
.incbin "baserom.gba", 0x50db1d, 0x9
gUnknown_0850DB26:: @ 850DB26
.incbin "baserom.gba", 0x50db26, 0x9
gUnknown_0850DB2F:: @ 850DB2F
.incbin "baserom.gba", 0x50db2f, 0x9
gUnknown_0850DB38:: @ 850DB38
.incbin "baserom.gba", 0x50db38, 0x9
gUnknown_0850DB41:: @ 850DB41
.incbin "baserom.gba", 0x50db41, 0x9
gUnknown_0850DB4A:: @ 850DB4A
.incbin "baserom.gba", 0x50db4a, 0x9
gUnknown_0850DB53:: @ 850DB53
.incbin "baserom.gba", 0x50db53, 0x9
gUnknown_0850DB5C:: @ 850DB5C
.incbin "baserom.gba", 0x50db5c, 0x10
gUnknown_0850DB6C:: @ 850DB6C
.incbin "baserom.gba", 0x50db6c, 0x10
gUnknown_0850DB7C:: @ 850DB7C
.incbin "baserom.gba", 0x50db7c, 0x24
gUnknown_0850DBA0:: @ 850DBA0
.incbin "baserom.gba", 0x50dba0, 0x5
gUnknown_0850DBA5:: @ 850DBA5
.incbin "baserom.gba", 0x50dba5, 0x5
gUnknown_0850DBAA:: @ 850DBAA
.incbin "baserom.gba", 0x50dbaa, 0x5
gUnknown_0850DBAF:: @ 850DBAF
.incbin "baserom.gba", 0x50dbaf, 0x5
gUnknown_0850DBB4:: @ 850DBB4
.incbin "baserom.gba", 0x50dbb4, 0x5
gUnknown_0850DBB9:: @ 850DBB9
.incbin "baserom.gba", 0x50dbb9, 0x5
gUnknown_0850DBBE:: @ 850DBBE
.incbin "baserom.gba", 0x50dbbe, 0x5
gUnknown_0850DBC3:: @ 850DBC3
.incbin "baserom.gba", 0x50dbc3, 0x5
gUnknown_0850DBC8:: @ 850DBC8
.incbin "baserom.gba", 0x50dbc8, 0x5
gUnknown_0850DBCD:: @ 850DBCD
.incbin "baserom.gba", 0x50dbcd, 0x5
gUnknown_0850DBD2:: @ 850DBD2
.incbin "baserom.gba", 0x50dbd2, 0x5
gUnknown_0850DBD7:: @ 850DBD7
.incbin "baserom.gba", 0x50dbd7, 0x5
gUnknown_0850DBDC:: @ 850DBDC
.incbin "baserom.gba", 0x50dbdc, 0x5
gUnknown_0850DBE1:: @ 850DBE1
.incbin "baserom.gba", 0x50dbe1, 0x5
gUnknown_0850DBE6:: @ 850DBE6
.incbin "baserom.gba", 0x50dbe6, 0x5
gUnknown_0850DBEB:: @ 850DBEB
.incbin "baserom.gba", 0x50dbeb, 0x5
gUnknown_0850DBF0:: @ 850DBF0
.incbin "baserom.gba", 0x50dbf0, 0x5
gUnknown_0850DBF5:: @ 850DBF5
.incbin "baserom.gba", 0x50dbf5, 0x5
gUnknown_0850DBFA:: @ 850DBFA
.incbin "baserom.gba", 0x50dbfa, 0x5
gUnknown_0850DBFF:: @ 850DBFF
.incbin "baserom.gba", 0x50dbff, 0x5
gUnknown_0850DC04:: @ 850DC04
.incbin "baserom.gba", 0x50dc04, 0x5
gUnknown_0850DC09:: @ 850DC09
.incbin "baserom.gba", 0x50dc09, 0x5
gUnknown_0850DC0E:: @ 850DC0E
.incbin "baserom.gba", 0x50dc0e, 0x5
gUnknown_0850DC13:: @ 850DC13
.incbin "baserom.gba", 0x50dc13, 0x5
gUnknown_0850DC18:: @ 850DC18
.incbin "baserom.gba", 0x50dc18, 0x5
gUnknown_0850DC1D:: @ 850DC1D
.incbin "baserom.gba", 0x50dc1d, 0x5
gUnknown_0850DC22:: @ 850DC22
.incbin "baserom.gba", 0x50dc22, 0x5
gUnknown_0850DC27:: @ 850DC27
.incbin "baserom.gba", 0x50dc27, 0x8
gUnknown_0850DC2F:: @ 850DC2F
.incbin "baserom.gba", 0x50dc2f, 0x10
gUnknown_0850DC3F:: @ 850DC3F
.incbin "baserom.gba", 0x50dc3f, 0x11
gUnknown_0850DC50:: @ 850DC50
.incbin "baserom.gba", 0x50dc50, 0x298
gUnknown_0850DEE8:: @ 850DEE8
.incbin "baserom.gba", 0x50dee8, 0xd4
gUnknown_0850DFBC:: @ 850DFBC
.incbin "baserom.gba", 0x50dfbc, 0x6
gUnknown_0850DFC2:: @ 850DFC2
.incbin "baserom.gba", 0x50dfc2, 0x61a
.section .rodata_b
gUnknown_0850E5DC:: @ 850E5DC
.incbin "baserom.gba", 0x50e5dc, 0x8
@@ -1184,7 +694,15 @@ gUnknown_0850E84A:: @ 850E84A
.incbin "baserom.gba", 0x50e84a, 0x6
gUnknown_0850E850:: @ 850E850
.incbin "baserom.gba", 0x50e850, 0x2c
.incbin "baserom.gba", 0x50e850, 0x4
gUnknown_0850E854::
.incbin "baserom.gba", 0x50e854, 0x8
gUnknown_0850E85C::
.incbin "baserom.gba", 0x50e85C, 0x8
gUnknown_0850E864::
.incbin "baserom.gba", 0x50e864, 0xc
gUnknown_0850E870::
.incbin "baserom.gba", 0x50e870, 0xc
gUnknown_0850E87C:: @ 850E87C
.incbin "baserom.gba", 0x50e87c, 0x1680

1903
data/field_map_obj.s Normal file
View File

File diff suppressed because it is too large Load Diff

8
data/strings.s
View File

@@ -2159,20 +2159,20 @@ gUnknown_085ED207:: @ 85ED207
gUnknown_085ED21E:: @ 85ED21E
.string "{COLOR DARK_GREY}$"
.string "{COLOR_HIGHLIGHT_SHADOW BORDER_COLOR6 WHITE BORDER_COLOR5}$"
.string "{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR6 WHITE DYNAMIC_COLOR5}$"
gUnknown_085ED228:: @ 85ED228
.string "{HIGHLIGHT DARK_GREY}$"
.string " $"
gUnknown_085ED22E:: @ 85ED22E
.string "{COLOR BORDER_COLOR2}♂$"
.string "{COLOR DYNAMIC_COLOR2}♂$"
gUnknown_085ED233:: @ 85ED233
.string "{COLOR BORDER_COLOR1}♀$"
.string "{COLOR DYNAMIC_COLOR1}♀$"
gUnknown_085ED238:: @ 85ED238
.string "{COLOR BORDER_COLOR2}$"
.string "{COLOR DYNAMIC_COLOR2}$"
gUnknown_085ED23C:: @ 85ED23C
.string "UPPER$"