Merge remote-tracking branch 'pret/master'

data/battle_frontier/battle_frontier_mons.inc

@@ -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

data/battle_frontier_2.s

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

data/battle_scripts_2.s

@@ -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

data/battle_tower.s

@@ -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"
 

data/cable_car.s

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

data/data2b.s

@@ -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"
 

data/data2c.s

@@ -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"
 

data/easy_chat.s

@@ -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"
 

data/event_scripts.s

@@ -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
 

data/field_map_obj.s

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

data/graphics.s

@@ -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

data/graphics/field_objects/berry_tree_graphics_tables.inc

@@ -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

data/graphics/pokemon/animation_delay_table.inc

@@ -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

data/graphics/pokemon/front_anim_ids_table.inc

@@ -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

data/item_menu_icons.s

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

data/link.s

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

data/map_events.s

@@ -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
 

data/maps.s

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

data/player_pc.s

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

data/pokeball.s

@@ -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

data/text/easy_chat/easy_chat_group_pokemon2.s

@@ -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

data/trade.s

@@ -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

data/wild_encounter.s

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