Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub

asm/macros/event.inc

@@ -285,7 +285,7 @@
 	.endm
 
 	@ Blocks script execution until a command or C code manually unblocks it. Generally used with specific 
-	@ commands and specials. Calling EnableBothScriptContexts for instance will allow execution to continue.
+	@ commands and specials. Calling ScriptContext_Enable for instance will allow execution to continue.
 	.macro waitstate
 	.byte 0x27
 	.endm

charmap.txt

@@ -406,13 +406,9 @@ B_ATK_PREFIX2 = FD 2A
 B_DEF_PREFIX2 = FD 2B
 B_ATK_PREFIX3 = FD 2C
 B_DEF_PREFIX3 = FD 2D
-B_TRAINER2_CLASS = FD 2E
-B_TRAINER2_NAME = FD 2F
-B_TRAINER2_LOSE_TEXT = FD 30
-B_TRAINER2_WIN_TEXT = FD 31
-B_PARTNER_CLASS = FD 32
-B_PARTNER_NAME = FD 33
-B_BUFF3 = FD 34
+B_TRAINER2_LOSE_TEXT = FD 2E
+B_TRAINER2_WIN_TEXT = FD 2F
+B_BUFF3 = FD 30
 
 @ indicates the end of a town/city name (before " TOWN" or " CITY")
 NAME_END = FC 00

data/battle_scripts_1.s

@@ -2977,7 +2977,7 @@ BattleScript_BattleTowerLostLostSkipMonRecall::
 	waitstate
 	printstring STRINGID_TRAINER1WINTEXT
 	jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerLostLostSkipDouble
-	printstring STRINGID_TRAINER2NAME
+	printstring STRINGID_TRAINER2WINTEXT
 BattleScript_BattleTowerLostLostSkipDouble::
 	end2
 
@@ -2995,7 +2995,7 @@ BattleScript_BattleTowerTrainerBattleWon::
 	jumpifnotbattletype BATTLE_TYPE_TRAINER_TOWER, BattleScript_BattleTowerEtcTrainerBattleWonSkipText
 	printstring STRINGID_TRAINER1LOSETEXT
 	jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerEtcTrainerBattleWonSkipText
-	printstring STRINGID_TRAINER2CLASS
+	printstring STRINGID_TRAINER2LOSETEXT
 BattleScript_BattleTowerEtcTrainerBattleWonSkipText::
 	pickup
 	end2

graphics/interface/pss_unk_83CE738.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-148 148 172
-255 255 255
-0 0 0
-123 189 255
-0 123 255
-255 131 131
-172 24 24
-255 238 230
-255 230 213
-255 222 205
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/interface/pss_unk_83CEA10.pal

@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 255 255
-98 98 98
-213 213 205
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0

graphics/interface/pss_unk_83D29D0.pal

@@ -1,35 +0,0 @@
-JASC-PAL
-0100
-32
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255
-57 57 57
-255 255 255

graphics/pokemon_storage/close_box_button.bin

@@ -0,0 +1 @@
+L
M
N
O
p
q
r
s
t
\
]
^
_
€
�
‚
�
„
u
v
w
x
y
z
{
|
}
…
†
‡
�
‰
Š
‹
Ś
Ť

graphics/pokemon_storage/misc2.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+148 148 172
+82 82 90
+255 255 255
+205 255 255
+90 189 238
+90 164 205
+82 131 164
+82 106 123
+82 82 90
+0 0 0
+222 222 246
+164 164 180
+148 148 172
+115 115 123
+82 82 90

graphics/pokemon_storage/party_slot_empty.bin

@@ -0,0 +1 @@
+CDDESTTUcdde

graphics/pokemon_storage/party_slot_filled.bin

@@ -0,0 +1 @@
+@AABPQQR`aab

graphics/pokemon_storage/pkmn_data.bin

@@ -0,0 +1 @@
+

















!!!!!!!!!!!!!!!!

graphics/pokemon_storage/wallpapers/beach/box.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 222
+246 238 180
+238 230 148
+238 222 131
+222 205 115
+213 189 98
+205 164 90
+197 172 65
+255 98 197
+255 148 172
+49 213 205
+164 230 213
+0 0 0
+82 98 255
+49 65 156

graphics/pokemon_storage/wallpapers/beach/title.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-32
+16
 255 255 255
 156 106 57
 197 230 255
@@ -17,19 +17,3 @@ JASC-PAL
 255 255 255
 82 98 255
 49 65 156
-255 255 255
-255 255 222
-246 238 180
-238 230 148
-238 222 131
-222 205 115
-213 189 98
-205 164 90
-197 172 65
-255 98 197
-255 148 172
-49 213 205
-164 230 213
-0 0 0
-82 98 255
-49 65 156

graphics/pokemon_storage/wallpapers/cave/box.pal

@@ -1,22 +1,6 @@
 JASC-PAL
 0100
-32
-255 255 255
-230 197 123
-213 180 98
-180 148 65
-148 115 32
-115 82 0
-0 0 0
-0 0 0
-139 90 115
-156 106 131
-115 65 90
-0 0 0
-230 230 230
-255 255 255
-90 90 131
-49 49 90
+16
 255 255 255
 246 213 131
 213 180 98

graphics/pokemon_storage/wallpapers/cave/title.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+230 197 123
+213 180 98
+180 148 65
+148 115 32
+115 82 0
+0 0 0
+0 0 0
+139 90 115
+156 106 131
+115 65 90
+0 0 0
+230 230 230
+255 255 255
+90 90 131
+49 49 90

graphics/pokemon_storage/wallpapers/city/box.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 246
+255 238 246
+230 213 222
+205 189 197
+164 148 156
+139 123 131
+0 0 0
+0 0 0
+180 164 172
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+156 123 82
+115 82 41

graphics/pokemon_storage/wallpapers/city/title.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-32
+16
 255 255 255
 246 246 246
 90 131 197
@@ -17,19 +17,3 @@ JASC-PAL
 189 213 213
 156 123 82
 106 74 32
-255 255 255
-255 255 246
-255 238 246
-230 213 222
-205 189 197
-164 148 156
-139 123 131
-0 0 0
-0 0 0
-180 164 172
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-156 123 82
-115 82 41

graphics/pokemon_storage/wallpapers/crag/box.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+222 222 222
+189 189 189
+156 156 156
+123 123 123
+90 90 90
+57 57 57
+41 41 41
+222 189 205
+197 164 180
+172 139 156
+246 213 230
+238 238 238
+255 255 255
+213 189 82
+172 148 41

graphics/pokemon_storage/wallpapers/crag/title.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-32
+16
 255 255 255
 222 222 222
 189 189 189
@@ -17,19 +17,3 @@ JASC-PAL
 255 255 255
 213 189 82
 172 148 41
-255 255 255
-222 222 222
-189 189 189
-156 156 156
-123 123 123
-90 90 90
-57 57 57
-41 41 41
-222 189 205
-197 164 180
-172 139 156
-246 213 230
-238 238 238
-255 255 255
-213 189 82
-172 148 41

graphics/pokemon_storage/wallpapers/desert/box.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 238 189
+255 213 164
+230 189 139
+205 164 115
+180 139 90
+156 115 65
+131 90 41
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+164 139 82
+123 98 41

graphics/pokemon_storage/wallpapers/desert/title.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-32
+16
 255 255 255
 255 255 139
 205 189 131
@@ -17,19 +17,3 @@ JASC-PAL
 255 255 255
 164 139 82
 123 98 41
-255 255 255
-255 238 189
-255 213 164
-230 189 139
-205 164 115
-180 139 90
-156 115 65
-131 90 41
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-164 139 82
-123 98 41

graphics/pokemon_storage/wallpapers/forest/box.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+230 255 172
+205 255 148
+180 230 123
+156 205 98
+131 180 74
+106 156 49
+82 131 24
+0 0 0
+205 213 172
+172 180 139
+0 0 0
+0 0 0
+0 0 0
+164 139 82
+123 98 41

graphics/pokemon_storage/wallpapers/forest/title.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-32
+16
 255 255 255
 246 255 230
 255 255 213
@@ -17,19 +17,3 @@ JASC-PAL
 255 255 255
 164 139 82
 123 98 41
-255 255 255
-230 255 172
-205 255 148
-180 230 123
-156 205 98
-131 180 74
-106 156 49
-82 131 24
-0 0 0
-205 213 172
-172 180 139
-0 0 0
-0 0 0
-0 0 0
-164 139 82
-123 98 41

graphics/pokemon_storage/wallpapers/pokecenter/box.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 115
+41 82 82
+65 115 115
+115 164 156
+90 131 82
+131 172 123
+172 213 172
+189 230 197
+213 255 222
+255 164 139
+213 213 230
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+255 255 255

graphics/pokemon_storage/wallpapers/pokecenter/title.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-32
+16
 255 255 115
 41 82 82
 65 115 115
@@ -17,19 +17,3 @@ JASC-PAL
 164 205 172
 230 230 230
 255 255 255
-255 255 115
-41 82 82
-65 115 115
-115 164 156
-90 131 82
-131 172 123
-172 213 172
-189 230 197
-213 255 222
-255 164 139
-213 213 230
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-255 255 255

graphics/pokemon_storage/wallpapers/river/box.pal

@@ -1,22 +1,6 @@
 JASC-PAL
 0100
-32
-255 255 255
-238 255 255
-205 255 255
-164 255 255
-131 222 222
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-115 180 0
-148 213 24
-180 246 57
-230 230 230
-255 255 255
-180 148 106
-139 106 65
+16
 255 255 255
 230 255 156
 197 255 123

graphics/pokemon_storage/wallpapers/river/title.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+238 255 255
+205 255 255
+164 255 255
+131 222 222
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+115 180 0
+148 213 24
+180 246 57
+230 230 230
+255 255 255
+180 148 106
+139 106 65

graphics/pokemon_storage/wallpapers/savanna/box.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 131
+222 222 98
+189 189 65
+156 156 32
+123 123 0
+90 90 0
+57 57 0
+189 189 65
+131 180 57
+115 164 41
+205 205 82
+238 238 238
+255 255 255
+189 156 82
+148 115 41

graphics/pokemon_storage/wallpapers/savanna/title.pal

@@ -1,6 +1,6 @@
 JASC-PAL
 0100
-32
+16
 255 255 255
 222 222 222
 189 189 189
@@ -17,19 +17,3 @@ JASC-PAL
 255 255 255
 189 156 82
 148 115 41
-255 255 255
-255 255 131
-222 222 98
-189 189 65
-156 156 32
-123 123 0
-90 90 0
-57 57 0
-189 189 65
-131 180 57
-115 164 41
-205 205 82
-238 238 238
-255 255 255
-189 156 82
-148 115 41

graphics/pokemon_storage/wallpapers/seafloor/box.pal

@@ -1,22 +1,6 @@
 JASC-PAL
 0100
-32
-255 255 255
-131 180 255
-98 148 222
-65 115 189
-32 82 156
-0 24 98
-0 0 0
-0 0 0
-139 90 115
-156 106 131
-115 65 90
-0 0 0
-230 230 230
-255 255 255
-148 180 41
-106 139 0
+16
 255 255 255
 164 213 255
 131 180 255

graphics/pokemon_storage/wallpapers/seafloor/title.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+131 180 255
+98 148 222
+65 115 189
+32 82 156
+0 24 98
+0 0 0
+0 0 0
+139 90 115
+156 106 131
+115 65 90
+0 0 0
+230 230 230
+255 255 255
+148 180 41
+106 139 0

graphics/pokemon_storage/wallpapers/simple/box.pal

@@ -1,22 +1,6 @@
 JASC-PAL
 0100
-32
-255 156 213
-82 65 115
-106 90 139
-131 115 164
-172 172 255
-189 189 255
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-0 0 255
-255 255 255
+16
 255 156 213
 82 65 115
 106 90 139

graphics/pokemon_storage/wallpapers/simple/title.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 156 213
+82 65 115
+106 90 139
+131 115 164
+172 172 255
+189 189 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+255 255 255

graphics/pokemon_storage/wallpapers/sky/box.pal

@@ -1,22 +1,6 @@
 JASC-PAL
 0100
-32
-255 255 255
-238 255 255
-205 255 255
-164 255 255
-123 213 246
-90 180 213
-57 148 180
-24 115 148
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-230 230 230
-255 255 255
-205 139 41
-164 98 0
+16
 255 255 255
 238 255 255
 205 255 255