summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_ai_scripts.s52
-rw-r--r--data/battle_anim_scripts.s181
-rw-r--r--data/battle_scripts_1.s148
-rw-r--r--data/berry_tag_screen.s34
-rw-r--r--data/coord_event_weather.s21
-rw-r--r--data/graphics/berries/berry_graphics.inc172
-rw-r--r--data/item_icon.s15
-rw-r--r--data/mystery_event_menu.s12
-rw-r--r--data/pokemon_animation.s240
-rw-r--r--data/reset_rtc_screen.s78
-rw-r--r--data/save.s20
-rw-r--r--data/scripts/cable_club.inc34
-rw-r--r--data/scripts/maps/BattleFrontier_BattleTowerLobby.inc8
-rw-r--r--data/scripts/maps/LilycoveCity_ContestLobby.inc6
-rw-r--r--data/scripts/pokeblocks.inc8
-rw-r--r--data/specials.inc2
-rw-r--r--data/time_events.s7
-rw-r--r--data/title_screen.s163
18 files changed, 306 insertions, 895 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
index 2b9b6864b..afe365231 100644
--- a/data/battle_ai_scripts.s
+++ b/data/battle_ai_scripts.s
@@ -218,7 +218,7 @@ BattleAIScript_82DC2D4:
get_ability AI_TARGET
if_equal ABILITY_INSOMNIA, Score_Minus10
if_equal ABILITY_VITAL_SPIRIT, Score_Minus10
- if_status AI_TARGET, STATUS_ANY, Score_Minus10
+ if_status AI_TARGET, STATUS1_ANY, Score_Minus10
if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
end
@@ -237,11 +237,11 @@ BattleAIScript_82DC31A:
BattleAIScript_82DC31B:
if_status2 AI_TARGET, STATUS2_NIGHTMARE, Score_Minus10
- if_not_status AI_TARGET, STATUS_SLEEP, Score_Minus8
+ if_not_status AI_TARGET, STATUS1_SLEEP, Score_Minus8
end
BattleAIScript_82DC330:
- if_not_status AI_TARGET, STATUS_SLEEP, Score_Minus8
+ if_not_status AI_TARGET, STATUS1_SLEEP, Score_Minus8
if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
end
@@ -350,7 +350,7 @@ BattleAIScript_82DC48C:
if_equal TYPE_POISON, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_IMMUNITY, Score_Minus10
- if_status AI_TARGET, STATUS_ANY, Score_Minus10
+ if_status AI_TARGET, STATUS1_ANY, Score_Minus10
if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
end
@@ -402,7 +402,7 @@ BattleAIScript_82DC545:
if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_LIMBER, Score_Minus10
- if_status AI_TARGET, STATUS_ANY, Score_Minus10
+ if_status AI_TARGET, STATUS1_ANY, Score_Minus10
if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
end
@@ -428,7 +428,7 @@ BattleAIScript_82DC59D:
end
BattleAIScript_82DC5A5:
- if_not_status AI_USER, STATUS_SLEEP, Score_Minus8
+ if_not_status AI_USER, STATUS1_SLEEP, Score_Minus8
end
BattleAIScript_82DC5B0:
@@ -536,7 +536,7 @@ BattleAIScript_82DC6A9:
BattleAIScript_82DC6B4:
get_ability AI_TARGET
if_equal ABILITY_WATER_VEIL, Score_Minus10
- if_status AI_TARGET, STATUS_ANY, Score_Minus10
+ if_status AI_TARGET, STATUS1_ANY, Score_Minus10
if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
if_type_effectiveness AI_EFFECTIVENESS_x0_5, Score_Minus10
if_type_effectiveness AI_EFFECTIVENESS_x0_25, Score_Minus10
@@ -566,7 +566,7 @@ BattleAIScript_82DC708:
end
BattleAIScript_82DC713:
- if_not_status AI_USER, STATUS_POISON | STATUS_BURN | STATUS_PARALYSIS | STATUS_TOXIC_POISON, Score_Minus10
+ if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, Score_Minus10
end
BattleAIScript_82DC71E:
@@ -1076,7 +1076,7 @@ BattleAIScript_82DCD3D:
score -1
BattleAIScript_82DCD4D:
- if_not_status AI_TARGET, STATUS_TOXIC_POISON, BattleAIScript_82DCD6C
+ if_not_status AI_TARGET, STATUS1_TOXIC_POISON, BattleAIScript_82DCD6C
if_hp_more_than AI_USER, 50, BattleAIScript_82DCD64
if_random_less_than 80, BattleAIScript_82DCD6C
@@ -1263,7 +1263,7 @@ BattleAIScript_82DCF22:
score -2
BattleAIScript_82DCF32:
- if_not_status AI_TARGET, STATUS_TOXIC_POISON, BattleAIScript_82DCF44
+ if_not_status AI_TARGET, STATUS1_TOXIC_POISON, BattleAIScript_82DCF44
if_random_less_than 70, BattleAIScript_82DCF44
score +2
@@ -1520,7 +1520,7 @@ BattleAIScript_82DD228:
end
BattleAIScript_82DD229:
- if_status AI_TARGET, STATUS_TOXIC_POISON, BattleAIScript_82DD256
+ if_status AI_TARGET, STATUS1_TOXIC_POISON, BattleAIScript_82DD256
if_status2 AI_TARGET, STATUS2_CURSED, BattleAIScript_82DD256
if_status3 AI_TARGET, STATUS3_PERISH_SONG, BattleAIScript_82DD256
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DD256
@@ -1673,7 +1673,7 @@ BattleAIScript_82DD381:
goto BattleAIScript_82DD3E9
BattleAIScript_82DD3B9:
- if_not_status AI_TARGET, STATUS_ANY, BattleAIScript_82DD3E1
+ if_not_status AI_TARGET, STATUS1_ANY, BattleAIScript_82DD3E1
goto BattleAIScript_82DD3E9
BattleAIScript_82DD3C8:
@@ -1722,7 +1722,7 @@ BattleAIScript_82DD430:
end
BattleAIScript_82DD431:
- if_status AI_TARGET, STATUS_SLEEP, BattleAIScript_82DD4D6
+ if_status AI_TARGET, STATUS1_SLEEP, BattleAIScript_82DD4D6
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DD4D6
if_status2 AI_TARGET, STATUS2_CONFUSION, BattleAIScript_82DD4D6
if_hp_more_than AI_USER, 30, BattleAIScript_82DD45E
@@ -1901,7 +1901,7 @@ BattleAIScript_82DD582:
end
BattleAIScript_82DD583:
- if_status AI_USER, STATUS_SLEEP, Score_Plus10
+ if_status AI_USER, STATUS1_SLEEP, Score_Plus10
score -5
end
@@ -1952,8 +1952,8 @@ BattleAIScript_82DD60A:
end
BattleAIScript_82DD60B:
- if_status AI_TARGET, STATUS_ANY, BattleAIScript_82DD621
- if_status_in_party AI_TARGET, STATUS_ANY, BattleAIScript_82DD621
+ if_status AI_TARGET, STATUS1_ANY, BattleAIScript_82DD621
+ if_status_in_party AI_TARGET, STATUS1_ANY, BattleAIScript_82DD621
score -5
BattleAIScript_82DD621:
@@ -2012,7 +2012,7 @@ BattleAIScript_82DD693:
BattleAIScript_82DD694:
get_protect_count AI_USER
if_more_than 1, BattleAIScript_82DD75A
- if_status AI_USER, STATUS_TOXIC_POISON, BattleAIScript_82DD751
+ if_status AI_USER, STATUS1_TOXIC_POISON, BattleAIScript_82DD751
if_status2 AI_USER, STATUS2_CURSED, BattleAIScript_82DD751
if_status3 AI_USER, STATUS3_PERISH_SONG, BattleAIScript_82DD751
if_status2 AI_USER, STATUS2_INFATUATION, BattleAIScript_82DD751
@@ -2020,7 +2020,7 @@ BattleAIScript_82DD694:
if_status3 AI_USER, STATUS3_YAWN, BattleAIScript_82DD751
if_has_move_with_effect AI_TARGET, EFFECT_RESTORE_HP, BattleAIScript_82DD751
if_has_move_with_effect AI_TARGET, EFFECT_DEFENSE_CURL, BattleAIScript_82DD751
- if_status AI_TARGET, STATUS_TOXIC_POISON, BattleAIScript_82DD730
+ if_status AI_TARGET, STATUS1_TOXIC_POISON, BattleAIScript_82DD730
if_status2 AI_TARGET, STATUS2_CURSED, BattleAIScript_82DD730
if_status3 AI_TARGET, STATUS3_PERISH_SONG, BattleAIScript_82DD730
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DD730
@@ -2238,7 +2238,7 @@ BattleAIScript_82DD959:
end
BattleAIScript_82DD95A:
- if_status AI_TARGET, STATUS_SLEEP, BattleAIScript_82DD9FF
+ if_status AI_TARGET, STATUS1_SLEEP, BattleAIScript_82DD9FF
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DD9FF
if_status2 AI_TARGET, STATUS2_CONFUSION, BattleAIScript_82DD9FF
if_hp_more_than AI_USER, 30, BattleAIScript_82DD987
@@ -2323,7 +2323,7 @@ BattleAIScript_82DDA2F:
goto BattleAIScript_82DDAB4
BattleAIScript_82DDA3D:
- if_status AI_TARGET, STATUS_TOXIC_POISON, BattleAIScript_82DDAAC
+ if_status AI_TARGET, STATUS1_TOXIC_POISON, BattleAIScript_82DDAAC
if_status2 AI_TARGET, STATUS2_CURSED, BattleAIScript_82DDAAC
if_status3 AI_TARGET, STATUS3_LEECHSEED, BattleAIScript_82DDAAC
get_weather
@@ -2396,7 +2396,7 @@ BattleAIScript_82DDAF5:
end
BattleAIScript_82DDAF6:
- if_not_status AI_TARGET, STATUS_POISON | STATUS_BURN | STATUS_PARALYSIS | STATUS_TOXIC_POISON, BattleAIScript_82DDB02
+ if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, BattleAIScript_82DDB02
score +1
BattleAIScript_82DDB02:
@@ -2405,7 +2405,7 @@ BattleAIScript_82DDB02:
BattleAIScript_82DDB03:
if_type_effectiveness AI_EFFECTIVENESS_x0_25, BattleAIScript_82DDB42
if_type_effectiveness AI_EFFECTIVENESS_x0_5, BattleAIScript_82DDB42
- if_status AI_TARGET, STATUS_SLEEP, BattleAIScript_82DDB59
+ if_status AI_TARGET, STATUS1_SLEEP, BattleAIScript_82DDB59
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DDB49
if_status2 AI_TARGET, STATUS2_CONFUSION, BattleAIScript_82DDB49
is_first_turn_for AI_USER
@@ -2429,7 +2429,7 @@ BattleAIScript_82DDB5B:
end
BattleAIScript_82DDB5C:
- if_status AI_TARGET, STATUS_PARALYSIS, BattleAIScript_82DDB6B
+ if_status AI_TARGET, STATUS1_PARALYSIS, BattleAIScript_82DDB6B
goto BattleAIScript_82DDB6D
BattleAIScript_82DDB6B:
@@ -2571,7 +2571,7 @@ sItemsTable_82DDC6E:
.byte -1
BattleAIScript_82DDC72:
- if_status AI_TARGET, STATUS_SLEEP, BattleAIScript_82DDC9D
+ if_status AI_TARGET, STATUS1_SLEEP, BattleAIScript_82DDC9D
if_status2 AI_TARGET, STATUS2_INFATUATION, BattleAIScript_82DDC9D
if_status2 AI_TARGET, STATUS2_CONFUSION, BattleAIScript_82DDC9D
if_random_less_than 180, BattleAIScript_82DDC9D
@@ -2960,7 +2960,7 @@ BattleAIScript_82DDFED:
end
BattleAIScript_82DDFF5:
- if_status AI_USER, STATUS_ANY, BattleAIScript_82DE000
+ if_status AI_USER, STATUS1_ANY, BattleAIScript_82DE000
end
BattleAIScript_82DE000:
@@ -3060,7 +3060,7 @@ BattleAIScript_82DE14A:
BattleAIScript_82DE14F:
get_ability AI_TARGET
if_not_equal ABILITY_GUTS, Score_Minus30_
- if_status AI_TARGET, STATUS_ANY, Score_Minus30_
+ if_status AI_TARGET, STATUS1_ANY, Score_Minus30_
if_hp_less_than AI_USER, 91, Score_Minus30_
goto Score_Plus5
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index a0c3b39d2..878b48ccb 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1,6 +1,7 @@
+#include "constants/rgb.h"
+#include "constants/songs.h"
.include "asm/macros/battle_anim_script.inc"
.include "include/constants/battle_anim.h"
- .include "include/constants/songs.h"
.section script_data, "aw", %progbits
@@ -684,7 +685,7 @@ Move_FLAME_WHEEL:
createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6
delay 0x4
createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 8, 1
- createvisualtask sub_80A7B98, 0x3, 1, 31, 12, 1, 1
+ createvisualtask sub_80A7B98, 0x3, 1, RGB_RED, 12, 1, 1
playsewithpan SE_W172B, +63
call AnimScript_82D2D18
delay 0x7
@@ -789,7 +790,7 @@ Move_DOUBLE_EDGE:
waitplaysewithpan SE_W207, -64, 0x8
createvisualtask sub_80D5830, 0x2, 0, 18, 6, 2, 4
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 0, 16, 16, 0x7FFF
+ createsprite gUnknown_08597274, 0x2, 1, 0, 16, 16, RGB_WHITE
createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4
delay 0x3
waitforvisualfinish
@@ -801,7 +802,7 @@ Move_DOUBLE_EDGE:
createvisualtask sub_80D6134, 0x2, 8, -256, 1, 0
createvisualtask sub_80D5484, 0x2, 0, 4, 0, 12, 1
createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1
- createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0x7FFF
+ createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_WHITE
waitforvisualfinish
createvisualtask sub_80D6134, 0x2, 8, -256, 0, 1
createvisualtask sub_80D6134, 0x2, 8, -256, 1, 1
@@ -942,7 +943,7 @@ Move_MEGA_PUNCH:
loadspritegfx 0x279F
monbg ANIM_TARGET
delay 0x2
- createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, 0
+ createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK
setalpha 0x80C
playsewithpan SE_W025, +63
createsprite gUnknown_08595F48, 0x3, 0, 0, 0, 50
@@ -990,7 +991,7 @@ Move_MEGA_KICK:
loadspritegfx 0x279F
monbg ANIM_TARGET
delay 0x2
- createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, 0
+ createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK
setalpha 0x80C
playsewithpan SE_W025, +63
createsprite gUnknown_08595F48, 0x3, 0, 0, 1, 50
@@ -1232,7 +1233,7 @@ Move_HIDDEN_POWER:
createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0
waitforvisualfinish
delay 0x1E
- createvisualtask sub_80A7B98, 0x5, 0, 20479, 12, 5, 1
+ createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 31, 19), 12, 5, 1
delay 0x4
createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0
playsewithpan SE_W179, -64
@@ -1705,7 +1706,7 @@ Move_PROTECT:
Move_DETECT:
loadspritegfx 0x2757
- createsprite gUnknown_08597274, 0x2, 1, 2, 0, 9, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 0, 9, RGB_BLACK
waitforvisualfinish
createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, 0x7FFF
delay 0x12
@@ -1713,7 +1714,7 @@ Move_DETECT:
createsprite gUnknown_0853EE84, 0xD, 20, -20
waitforvisualfinish
delay 0xA
- createsprite gUnknown_08597274, 0x2, 1, 2, 9, 0, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 9, 0, RGB_BLACK
createvisualtask sub_8116620, 0xA, 2, 2, 9, 0, 0x7FFF
waitforvisualfinish
end
@@ -2118,12 +2119,12 @@ Move_MEAN_LOOK:
loadspritegfx 0x27CB
monbg ANIM_DEF_PARTNER
playsewithpan SE_W060, -64
- createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, 0
+ createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK
loopsewithpan SE_W109, +63, 0xF, 0x4
waitplaysewithpan SE_W043, +63, 0x55
createsprite gUnknown_085CE104, 0x2
delay 0x78
- createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK
delay 0x1E
clearmonbg ANIM_DEF_PARTNER
waitforvisualfinish
@@ -2792,7 +2793,7 @@ Move_RAGE:
loadspritegfx 0x2767
monbg ANIM_TARGET
setalpha 0x80C
- createvisualtask sub_80A7B98, 0x3, 0, 31, 10, 0, 2
+ createvisualtask sub_80A7B98, 0x3, 0, RGB_RED, 10, 0, 2
createsprite gUnknown_0859368C, 0x2, 0, -20, -28
playsewithpan SE_W207B, -64
delay 0x14
@@ -3068,7 +3069,7 @@ Move_SUPER_FANG:
playsewithpan SE_W082, -64
waitforvisualfinish
createvisualtask sub_80D5484, 0x2, 0, 3, 0, 48, 1
- createvisualtask sub_80A7B98, 0x2, 0, 1247, 12, 4, 1
+ createvisualtask sub_80A7B98, 0x2, 0, RGB(31, 6, 1), 12, 4, 1
waitforvisualfinish
delay 0x14
createsprite gUnknown_0857FE28, 0x2, 4, 4
@@ -3137,7 +3138,7 @@ Move_NIGHTMARE:
end
AnimScript_82CD4CF:
- createvisualtask sub_80A7B98, 0x2, 0, 0x7FFF, 10, 2, 1
+ createvisualtask sub_80A7B98, 0x2, 0, RGB_WHITE, 10, 2, 1
createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 32, 1
playsewithpan SE_W171, +63
waitforvisualfinish
@@ -3220,7 +3221,7 @@ Move_FORESIGHT:
delay 0x18
playsewithpan SE_W166, +63
delay 0xA
- createvisualtask sub_80A7B98, 0x5, 1, 0x7FFF, 12, 2, 1
+ createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 2, 1
playsewithpan SE_W197, +63
waitforvisualfinish
blendoff
@@ -3418,7 +3419,7 @@ Move_MOONLIGHT:
loadspritegfx 0x27D3
loadspritegfx 0x272F
setalpha 0x1000
- createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, 0
+ createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK
waitforvisualfinish
createsprite gUnknown_08592EBC, 0x2, 120, 56
createvisualtask sub_80A7A74, 0x3, 0, 16, 16, 0, 1
@@ -3517,7 +3518,7 @@ Move_UPROAR:
Move_HEAT_WAVE:
loadspritegfx 0x2815
- createvisualtask sub_8116848, 0x5, 10261, 0, 6, 6, 31
+ createvisualtask sub_8116848, 0x5, 10261, 0, 6, 6, RGB_RED
createvisualtask sub_8110BCC, 0x5, 1
createvisualtask sub_810A060, 0x6, 6, 31
panse_1B SE_W257, -64, +63, +2, 0x0
@@ -3555,7 +3556,7 @@ Move_TORMENT:
loadspritegfx 0x27E1
createvisualtask sub_815AFF0, 0x2
waitforvisualfinish
- createvisualtask sub_80A7B98, 0x2, 1, 31, 10, 1, 1
+ createvisualtask sub_80A7B98, 0x2, 1, RGB_RED, 10, 1, 1
createsprite gUnknown_0859368C, 0x82, 1, -20, -28
playsewithpan SE_W207B, +63
delay 0x14
@@ -3625,7 +3626,7 @@ Move_CHARGE:
loadspritegfx 0x27E5
monbg ANIM_ATTACKER
setalpha 0x80C
- createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK
waitforvisualfinish
createvisualtask sub_810AAFC, 0x2, 0, 60, 2, 12
playsewithpan SE_W268, -64
@@ -3649,7 +3650,7 @@ Move_CHARGE:
createsprite gUnknown_0859598C, 0x2, 0, -16, -16
playsewithpan SE_W085B, -64
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, 0
+ createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK
clearmonbg ANIM_ATTACKER
blendoff
end
@@ -3688,7 +3689,7 @@ Move_HELPING_HAND:
delay 0x14
playsewithpan SE_W227, 0
createvisualtask sub_80D52D0, 0x2, 2, 3, 0, 10, 1
- createvisualtask sub_80A7B98, 0x2, 2, 1023, 12, 1, 1
+ createvisualtask sub_80A7B98, 0x2, 2, RGB_YELLOW, 12, 1, 1
end
Move_ASSIST:
@@ -3750,7 +3751,7 @@ Move_RECYCLE:
createsprite gUnknown_085CE9B0, 0x2
loopsewithpan SE_W036, -64, 0x18, 0x3
waitforvisualfinish
- createvisualtask sub_80A7B98, 0x5, 0, 0x7FFF, 12, 2, 1
+ createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 2, 1
playsewithpan SE_W036, -64
waitforvisualfinish
blendoff
@@ -3780,13 +3781,13 @@ AnimScript_82CE0A7:
playsewithpan SE_W233, +63
delay 0x14
createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3
- createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK
delay 0x25
createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0
playsewithpan SE_W233B, +63
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
end
@@ -3807,7 +3808,7 @@ AnimScript_82CE154:
playsewithpan SE_W233, +63
delay 0x14
createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3
- createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK
delay 0x25
createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0
@@ -3819,7 +3820,7 @@ AnimScript_82CE154:
createsprite gUnknown_08595FA8, 0x2, 1, 3, 8, 12
playsewithpan SE_W280, +63
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
end
@@ -3845,7 +3846,7 @@ Move_ENDEAVOR:
loadspritegfx 0x2797
createvisualtask sub_815DCA4, 0x2, 0, 2
loopsewithpan SE_W039, -64, 0x18, 0x2
- createvisualtask sub_80A7B98, 0x5, 0, 703, 12, 1, 2
+ createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 21, 0), 12, 1, 2
delay 0x6
createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0
createsprite gUnknown_08597358, 0x82, 12, -12, 1, 2
@@ -3858,7 +3859,7 @@ Move_ENDEAVOR:
Move_ERUPTION:
loadspritegfx 0x27D9
- createsprite gUnknown_08597274, 0x2, 31, 2, 0, 4, 31
+ createsprite gUnknown_08597274, 0x2, 31, 2, 0, 4, RGB_RED
waitforvisualfinish
createvisualtask sub_8109460, 0x2
waitplaysewithpan SE_W153, -64, 0x3C
@@ -3878,18 +3879,18 @@ Move_ERUPTION:
createvisualtask sub_81152DC, 0x5, 4, 8, 60
loopsewithpan SE_W088, +63, 0x10, 0xC
delay 0x50
- createsprite gUnknown_08597274, 0x28, 31, 4, 4, 0, 31
+ createsprite gUnknown_08597274, 0x28, 31, 4, 4, 0, RGB_RED
end
Move_SKILL_SWAP:
loadspritegfx 0x280B
call AnimScript_82D7CD1
createvisualtask sub_810FBF0, 0x3, 1
- createvisualtask sub_80A7B98, 0x5, 1, 0x7FFF, 12, 3, 1
+ createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 3, 1
loopsewithpan SE_W179, -64, 0x18, 0x3
delay 0x10
createvisualtask sub_810FBF0, 0x3, 0
- createvisualtask sub_80A7B98, 0x5, 0, 0x7FFF, 12, 3, 1
+ createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 3, 1
waitforvisualfinish
call AnimScript_82D7CDD
end
@@ -3951,13 +3952,13 @@ Move_TAIL_GLOW:
loadspritegfx 0x27E4
monbg ANIM_ATTACKER
setalpha 0x80C
- createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK
waitforvisualfinish
createsprite gUnknown_08596AC8, 0x42, 0
delay 0x12
loopsewithpan SE_W234, -64, 0x10, 0x6
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, 0
+ createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK
clearmonbg ANIM_ATTACKER
blendoff
delay 0x1
@@ -4193,7 +4194,7 @@ Move_AROMATHERAPY:
loadspritegfx 0x27AF
loadspritegfx 0x27DB
loadspritegfx 0x2741
- createsprite gUnknown_08597274, 0x0, 1, 0, 0, 7, 13293
+ createsprite gUnknown_08597274, 0x0, 1, 0, 0, 7, RGB(13, 31, 12)
delay 0x1
monbg ANIM_ATTACKER
delay 0x1
@@ -4211,7 +4212,7 @@ Move_AROMATHERAPY:
waitforvisualfinish
clearmonbg ANIM_ATTACKER
delay 0x1
- createsprite gUnknown_08597274, 0x0, 1, 0, 7, 0, 13293
+ createsprite gUnknown_08597274, 0x0, 1, 0, 7, 0, RGB(13, 31, 12)
delay 0x1
playsewithpan SE_W287, -64
createvisualtask sub_815DFCC, 0x2, 1
@@ -4222,7 +4223,7 @@ Move_AROMATHERAPY:
createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1
waitforvisualfinish
playsewithpan SE_REAPOKE, -64
- createsprite gUnknown_08597274, 0x0, 43, 3, 10, 0, 13293
+ createsprite gUnknown_08597274, 0x0, 43, 3, 10, 0, RGB(13, 31, 12)
createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1
waitforvisualfinish
end
@@ -4231,7 +4232,7 @@ Move_FAKE_TEARS:
loadspritegfx 0x27AB
loadspritegfx 0x27E1
loadspritegfx 0x2758
- createvisualtask sub_8116848, 0x5, 10155, 0, 4, 4, 32108
+ createvisualtask sub_8116848, 0x5, 10155, 0, 4, 4, RGB(12, 11, 31)
waitforvisualfinish
createvisualtask sub_815C478, 0x5, 0, 2, 1
loopsewithpan SE_W039, -64, 0xC, 0x4
@@ -4289,7 +4290,7 @@ Move_ODOR_SLEUTH:
Move_GRASS_WHISTLE:
loadspritegfx 0x2758
- createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, 13298
+ createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB(18, 31, 12)
waitforvisualfinish
createvisualtask sub_8102BE8, 0x2
waitforvisualfinish
@@ -4320,19 +4321,19 @@ Move_GRASS_WHISTLE:
delay 0x4
waitforvisualfinish
createvisualtask sub_8102CA0, 0x2
- createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, 13298
+ createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB(18, 31, 12)
waitforvisualfinish
end
Move_TICKLE:
loadspritegfx 0x27EA
- createsprite gUnknown_08597274, 0x2, 2, 0, 0, 16, 0
+ createsprite gUnknown_08597274, 0x2, 2, 0, 0, 16, RGB_BLACK
waitforvisualfinish
createsprite gUnknown_08593A84, 0x0, -16, -8
createsprite gUnknown_08593A84, 0x0, 16, -8
playsewithpan SE_W197, -64
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 2, 0, 16, 0, 0
+ createsprite gUnknown_08597274, 0x2, 2, 0, 16, 0, RGB_BLACK
waitforvisualfinish
delay 0x14
createvisualtask sub_80D5EB8, 0x3, 0, 6, 1280, 3, 0
@@ -4384,11 +4385,11 @@ Move_EXTRASENSORY:
call AnimScript_82D7CD1
monbg ANIM_DEF_PARTNER
setalpha 0x80C
- createvisualtask sub_80A7B98, 0x5, 0, 891, 12, 1, 1
+ createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1
createvisualtask sub_810FE14, 0x5, 0
playsewithpan SE_W020, +63
waitforvisualfinish
- createvisualtask sub_80A7B98, 0x5, 0, 891, 12, 1, 1
+ createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1
createvisualtask sub_810FE14, 0x5, 1
playsewithpan SE_W020, +63
waitforvisualfinish
@@ -4607,7 +4608,7 @@ Move_SHOCK_WAVE:
loadspritegfx 0x2735
monbg ANIM_ATTACKER
setalpha 0x80C
- createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK
waitforvisualfinish
createvisualtask sub_810AAFC, 0x2, 0, 20, 0, 2
playsewithpan SE_W268, -64
@@ -4725,7 +4726,7 @@ Move_ICE_PUNCH:
loadspritegfx 0x279D
loadspritegfx 0x2797
loadspritegfx 0x279F
- createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, 0
+ createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK
createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, 32588
delay 0x14
playsewithpan SE_W081, +63
@@ -4750,7 +4751,7 @@ Move_ICE_PUNCH:
delay 0x5
createvisualtask sub_8116620, 0xA, 4, 2, 9, 0, 32588
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, 0
+ createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -4829,7 +4830,7 @@ Move_THUNDER:
waitbgfadeout
createvisualtask sub_8117660, 0x5, -256, 0, 1, -1
waitbgfadein
- createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK
delay 0x10
createvisualtask sub_8115F10, 0x2, 257, 257, 257
playsewithpan SE_W086, +63
@@ -4873,7 +4874,7 @@ Move_THUNDER:
delay 0x2
createvisualtask sub_8115F10, 0x2, 257, 257, 257
delay 0x1
- createsprite gUnknown_08597274, 0x82, 1, 2, 16, 0, 0
+ createsprite gUnknown_08597274, 0x82, 1, 2, 16, 0, RGB_BLACK
waitforvisualfinish
restorebg
waitbgfadeout
@@ -4887,7 +4888,7 @@ Move_THUNDER_PUNCH:
loadspritegfx 0x2735
monbg ANIM_TARGET
setalpha 0x80C
- createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK
waitforvisualfinish
playsewithpan SE_W004, +63
createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0
@@ -4907,7 +4908,7 @@ Move_THUNDER_PUNCH:
createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1
createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2
delay 0x1
- createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0
+ createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK
delay 0x14
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -5413,7 +5414,7 @@ Move_ICE_BEAM:
monbgprio_28 ANIM_TARGET
setalpha 0x80C
loadspritegfx 0x279D
- createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, 0
+ createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK
waitforvisualfinish
createsoundtask sub_8158C58, 183, -64, 63, 4, 4, 0, 10
createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20
@@ -5422,7 +5423,7 @@ Move_ICE_BEAM:
call AnimScript_82D07C1
call AnimScript_82D07C1
call AnimScript_82D07C1
- createsprite gUnknown_08597274, 0x2, 4, -31, 0, 7, 32384
+ createsprite gUnknown_08597274, 0x2, 4, -31, 0, 7, RGB(0, 20, 31)
createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 25, 1
call AnimScript_82D07C1
call AnimScript_82D07C1
@@ -5438,9 +5439,9 @@ Move_ICE_BEAM:
waitforvisualfinish
delay 0x14
call AnimScript_82D7720
- createsprite gUnknown_08597274, 0x2, 4, 5, 7, 0, 32384
+ createsprite gUnknown_08597274, 0x2, 4, 5, 7, 0, RGB(0, 20, 31)
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, 0
+ createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
@@ -5648,7 +5649,7 @@ AnimScript_82D0CB2:
Move_POWDER_SNOW:
loadspritegfx 0x279D
monbg ANIM_DEF_PARTNER
- createsprite gUnknown_08597274, 0x2, 31, 1, 0, 3, 0
+ createsprite gUnknown_08597274, 0x2, 31, 1, 0, 3, RGB_BLACK
waitforvisualfinish
panse_1B SE_W016, -64, +63, +2, 0x0
call AnimScript_82D0D03
@@ -5660,7 +5661,7 @@ Move_POWDER_SNOW:
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
delay 0x14
- createsprite gUnknown_08597274, 0x2, 31, 1, 3, 0, 0
+ createsprite gUnknown_08597274, 0x2, 31, 1, 3, 0, RGB_BLACK
end
AnimScript_82D0D03:
@@ -5778,7 +5779,7 @@ Move_ABSORB:
monbg ANIM_DEF_PARTNER
monbgprio_2A ANIM_TARGET
setalpha 0x80C
- createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, 13293
+ createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12)
waitforvisualfinish
playsewithpan SE_W071, +63
createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
@@ -5791,7 +5792,7 @@ Move_ABSORB:
delay 0xF
call AnimScript_82D79DF
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, 13293
+ createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -5831,7 +5832,7 @@ Move_MEGA_DRAIN:
monbg ANIM_DEF_PARTNER
monbgprio_2A ANIM_TARGET
setalpha 0x80C
- createsprite gUnknown_08597274, 0x2, 1, 1, 0, 8, 13293
+ createsprite gUnknown_08597274, 0x2, 1, 1, 0, 8, RGB(13, 31, 12)
waitforvisualfinish
playsewithpan SE_W071, +63
createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1
@@ -5844,7 +5845,7 @@ Move_MEGA_DRAIN:
delay 0xF
call AnimScript_82D79DF
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 1, 8, 0, 13293
+ createsprite gUnknown_08597274, 0x2, 1, 1, 8, 0, RGB(13, 31, 12)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -5892,7 +5893,7 @@ Move_GIGA_DRAIN:
monbg ANIM_DEF_PARTNER
monbgprio_2A ANIM_TARGET
setalpha 0x80C
- createsprite gUnknown_08597274, 0x2, 1, 1, 0, 12, 13293
+ createsprite gUnknown_08597274, 0x2, 1, 1, 0, 12, RGB(13, 31, 12)
waitforvisualfinish
playsewithpan SE_W071, +63
createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0
@@ -5905,7 +5906,7 @@ Move_GIGA_DRAIN:
delay 0xF
call AnimScript_82D79DF
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 1, 12, 0, 13293
+ createsprite gUnknown_08597274, 0x2, 1, 1, 12, 0, RGB(13, 31, 12)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -6446,14 +6447,14 @@ Move_WHIRLPOOL:
monbgprio_28 ANIM_TARGET
setalpha 0x80C
delay 0x0
- createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, 23968
+ createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23)
playsewithpan SE_W250, +63
createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 50, 1
call AnimScript_82D1F5B
call AnimScript_82D1F5B
call AnimScript_82D1F5B
delay 0xC
- createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, 23968
+ createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
@@ -7354,7 +7355,7 @@ Move_POISON_TAIL:
loadspritegfx 0x2797
loadspritegfx 0x27A6
loopsewithpan SE_W231, -64, 0x1C, 0x2
- createvisualtask sub_81144F8, 0x5, 1, 1, 23768
+ createvisualtask sub_81144F8, 0x5, 1, 1, RGB(24, 6, 23)
waitforvisualfinish
monbg ANIM_TARGET
setalpha 0x80C
@@ -7783,7 +7784,7 @@ Move_SOFT_BOILED:
delay 0x78
delay 0x7
playsewithpan SE_W030, -64
- createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, 31500
+ createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30)
createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1
delay 0x8
createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1
@@ -7855,7 +7856,7 @@ Move_FAKE_OUT:
createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1
createvisualtask sub_8106020, 0x3
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, 0x7FFF
+ createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE
end
Move_SCARY_FACE:
@@ -8270,7 +8271,7 @@ Move_STOCKPILE:
call AnimScript_82D4972
call AnimScript_82D4972
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 2, 0, 12, 0, 0x7FFF
+ createsprite gUnknown_08597274, 0x2, 2, 0, 12, 0, RGB_WHITE
end
AnimScript_82D4972:
@@ -8585,7 +8586,7 @@ Move_REFRESH:
call AnimScript_82D79B4
waitforvisualfinish
playsewithpan SE_REAPOKE, -64
- createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, 31500
+ createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30)
createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0
end
@@ -8622,7 +8623,7 @@ Move_HYPER_VOICE:
end
AnimScript_82D50FA:
- createsprite gUnknown_08597274, 0x2, 31, 3, 8, 0, 1023
+ createsprite gUnknown_08597274, 0x2, 31, 3, 8, 0, RGB_YELLOW
createvisualtask sub_80D6064, 0x5, -5, -5, 5, 0, 0
createsprite gUnknown_08593880, 0x0, 45, 0, 0, 0, 0, 0, 1
createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1
@@ -8633,14 +8634,14 @@ AnimScript_82D50FA:
Move_SAND_TOMB:
loadspritegfx 0x275A
- createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, 563
+ createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0)
createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 43, 1
playsewithpan SE_W328, +63
call AnimScript_82D51B7
call AnimScript_82D51B7
call AnimScript_82D51B7
delay 0x16
- createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, 563
+ createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0)
waitforvisualfinish
end
@@ -9422,7 +9423,7 @@ Move_OVERHEAT:
loadspritegfx 0x2797
monbg ANIM_DEF_PARTNER
setalpha 0x120C
- createsprite gUnknown_08597274, 0x2, 1, 1, 0, 5, 28
+ createsprite gUnknown_08597274, 0x2, 1, 1, 0, 5, RGB(28, 0, 0)
waitforvisualfinish
createvisualtask sub_8117C44, 0x5
waitforvisualfinish
@@ -9433,7 +9434,7 @@ Move_OVERHEAT:
playsewithpan SE_W082, -64
createvisualtask sub_8117CA0, 0x5, 1, 0
delay 0x1
- createsprite gUnknown_08597274, 0x2, 2, 1, 0, 13, 28
+ createsprite gUnknown_08597274, 0x2, 2, 1, 0, 13, RGB(28, 0, 0)
createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1
waitforvisualfinish
playsewithpan SE_W172B, -64
@@ -9479,12 +9480,12 @@ Move_OVERHEAT:
playsewithpan SE_W007, +63
createvisualtask sub_8117DD8, 0x5, 1
delay 0x1
- createsprite gUnknown_08597274, 0x2, 2, -1, 0, 13, 19026
+ createsprite gUnknown_08597274, 0x2, 2, -1, 0, 13, RGB(18, 18, 18)
createvisualtask sub_80D51AC, 0x5, 0, 3, 0, 15, 1
waitforvisualfinish
createvisualtask sub_8117D3C, 0x5, 0, 1
delay 0x1
- createsprite gUnknown_08597274, 0x2, 1, 1, 5, 0, 28
+ createsprite gUnknown_08597274, 0x2, 1, 1, 5, 0, RGB(28, 0, 0)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -9492,7 +9493,7 @@ Move_OVERHEAT:
delay 0xF
createvisualtask sub_8117D3C, 0x5, 1, 0
delay 0x1
- createsprite gUnknown_08597274, 0x2, 2, 0, 13, 0, 19026
+ createsprite gUnknown_08597274, 0x2, 2, 0, 13, 0, RGB(18, 18, 18)
waitforvisualfinish
createvisualtask sub_8117C70, 0x5
waitforvisualfinish
@@ -9643,7 +9644,7 @@ Move_WATER_PULSE:
monbg ANIM_TARGET
monbgprio_28 ANIM_TARGET
playsewithpan SE_W145C, -64
- createsprite gUnknown_08597274, 0x2, 1, 0, 0, 7, 29472
+ createsprite gUnknown_08597274, 0x2, 1, 0, 0, 7, RGB(0, 25, 28)
delay 0xA
createsprite gUnknown_085952F8, 0x42, 100, 100, 8, 1, 20, 40, 0
createsprite gUnknown_085952F8, 0x42, 20, 100, 16, 2, 10, 35, 1
@@ -9663,7 +9664,7 @@ Move_WATER_PULSE:
delay 0xD
createvisualtask sub_80D51AC, 0x2, 1, 0, 8, 18, 1
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, 29472
+ createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, RGB(0, 25, 28)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
@@ -10560,13 +10561,13 @@ AnimScript_82D800E:
monbgprio_28 ANIM_TARGET
setalpha 0x80C
delay 0x0
- createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, 23968
+ createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23)
playsewithpan SE_W250, +63
createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1
call AnimScript_82D1F5B
call AnimScript_82D1F5B
delay 0xC
- createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, 23968
+ createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23)
waitforvisualfinish
stopsound
clearmonbg ANIM_DEF_PARTNER
@@ -10591,13 +10592,13 @@ AnimScript_82D8062:
AnimScript_82D80BF:
loadspritegfx 0x275A
- createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, 563
+ createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0)
createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1
playsewithpan SE_W328, +63
call AnimScript_82D51B7
call AnimScript_82D51B7
delay 0x16
- createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, 563
+ createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0)
waitforvisualfinish
stopsound
end
@@ -10619,7 +10620,7 @@ Anim_ItemEffect:
call AnimScript_82D79B4
waitforvisualfinish
playsewithpan SE_REAPOKE, -64
- createsprite gUnknown_08597274, 0x2, 2, 3, 7, 0, 26609
+ createsprite gUnknown_08597274, 0x2, 2, 3, 7, 0, RGB(17, 31, 25)
createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0
waitforvisualfinish
end
@@ -10663,11 +10664,11 @@ Anim_SmokeBallEscape:
end
Anim_HangedOn:
- createsprite gUnknown_08597274, 0x0, 2, 7, 0, 9, 31
+ createsprite gUnknown_08597274, 0x0, 2, 7, 0, 9, RGB_RED
playsewithpan SE_W082, -64
createvisualtask sub_815DB90, 0x5, 30, 128, 0, 1, 2, 0, 1
waitforvisualfinish
- createsprite gUnknown_08597274, 0x0, 2, 4, 9, 0, 31
+ createsprite gUnknown_08597274, 0x0, 2, 4, 9, 0, RGB_RED
waitforvisualfinish
delay 0x6
createsprite gUnknown_0857FE58, 0x0, 0, 0, 15
@@ -10769,7 +10770,7 @@ Anim_FutureSightHit:
Anim_DoomDesireHit:
createvisualtask sub_8117F10, 0x2
loadspritegfx 0x27D6
- createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, 0x7FFF
+ createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, RGB_WHITE
waitforvisualfinish
delay 0xA
createvisualtask sub_815C0A4, 0x5
@@ -10796,7 +10797,7 @@ Anim_DoomDesireHit:
playsewithpan SE_W120, +63
createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, 0x7FFF
+ createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE
waitforvisualfinish
end
@@ -10818,7 +10819,7 @@ Status_Ingrain:
loadspritegfx 0x272F
monbg ANIM_DEF_PARTNER
setalpha 0x80C
- createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, 13293
+ createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12)
waitforvisualfinish
delay 0x3
call AnimScript_82D1009
@@ -10826,7 +10827,7 @@ Status_Ingrain:
delay 0xF
call AnimScript_82D79DF
waitforvisualfinish
- createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, 13293
+ createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 27aff5f19..4d8b22186 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -286,7 +286,7 @@ BattleScript_MoveEnd::
end
BattleScript_MakeMoveMissed::
- orbyte gBattleMoveFlags, MOVESTATUS_MISSED
+ orbyte gMoveResultFlags, MOVE_RESULT_MISSED
BattleScript_PrintMoveMissed::
attackstring
ppreduce
@@ -303,9 +303,9 @@ BattleScript_EffectSleep::
attackstring
ppreduce
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS_SLEEP, BattleScript_AlreadyAsleep
+ jumpifstatus TARGET, STATUS1_SLEEP, BattleScript_AlreadyAsleep
jumpifcantmakeasleep BattleScript_CantMakeAsleep
- jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
+ jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
@@ -397,7 +397,7 @@ BattleScript_EffectExplosion::
faintifabilitynotdamp
setatkhptozero
waitstate
- jumpifbyte NO_COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED, BattleScript_82D8B94
+ jumpifbyte NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_82D8B94
call BattleScript_82D8BEA
goto BattleScript_82D8B96
BattleScript_82D8B94::
@@ -436,16 +436,16 @@ BattleScript_82D8BCF::
end
BattleScript_82D8BEA::
- bicbyte gBattleMoveFlags, MOVESTATUS_MISSED
+ bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
attackanimation
waitanimation
- orbyte gBattleMoveFlags, MOVESTATUS_MISSED
+ orbyte gMoveResultFlags, MOVE_RESULT_MISSED
return
BattleScript_EffectDreamEater::
attackcanceler
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_82D8C0E
- jumpifstatus TARGET, STATUS_SLEEP, BattleScript_82D8C18
+ jumpifstatus TARGET, STATUS1_SLEEP, BattleScript_82D8C18
BattleScript_82D8C0E::
attackstring
ppreduce
@@ -487,7 +487,7 @@ BattleScript_EffectMirrorMove::
pause 0x40
trymirrormove
ppreduce
- orbyte gBattleMoveFlags, MOVESTATUS_FAILED
+ orbyte gMoveResultFlags, MOVE_RESULT_FAILED
printstring STRINGID_MIRRORMOVEFAILED
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -633,7 +633,7 @@ BattleScript_MultiHitLoop::
jumpifhasnohp ATTACKER, BattleScript_MultiHitEnd
jumpifhasnohp TARGET, BattleScript_MultiHitPrintStrings
jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoMultiHit
- jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_MultiHitPrintStrings
+ jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_MultiHitPrintStrings
BattleScript_DoMultiHit::
movevaluescleanup
copybyte cEFFECT_CHOOSER, sMULTIHIT_EFFECT
@@ -656,7 +656,7 @@ BattleScript_DoMultiHit::
addbyte sMULTIHIT_STRING + 4, 0x1
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
- jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_MultiHitPrintStrings
+ jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
decrementmultihit BattleScript_MultiHitLoop
goto BattleScript_MultiHitPrintStrings
BattleScript_MultiHitNoMoreHits::
@@ -712,9 +712,9 @@ BattleScript_EffectToxic::
ppreduce
jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS_POISON, BattleScript_AlreadyPoisoned
- jumpifstatus TARGET, STATUS_TOXIC_POISON, BattleScript_AlreadyPoisoned
- jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
+ jumpifstatus TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
+ jumpifstatus TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
+ jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected
jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
@@ -735,7 +735,7 @@ BattleScript_AlreadyPoisoned::
goto BattleScript_MoveEnd
BattleScript_ImmunityProtected::
- copybyte gEffectBank, gBankTarget
+ copybyte gEffectBank, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0x0
call BattleScript_PSNPrevention
goto BattleScript_MoveEnd
@@ -759,7 +759,7 @@ BattleScript_EffectRest::
attackcanceler
attackstring
ppreduce
- jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_RestIsAlreadyAsleep
+ jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_RestIsAlreadyAsleep
jumpifcantmakeasleep BattleScript_RestCantSleep
trysetrest BattleScript_AlreadyAtFullHp
pause 0x20
@@ -835,7 +835,7 @@ BattleScript_EffectSuperFang::
attackstring
ppreduce
typecalc
- bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+ bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
damagetohalftargethp
goto BattleScript_HitFromAtkAnimation
@@ -845,7 +845,7 @@ BattleScript_EffectDragonRage::
attackstring
ppreduce
typecalc
- bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+ bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
setword gBattleMoveDamage, 40
adjustsetdamage
goto BattleScript_HitFromAtkAnimation
@@ -879,19 +879,19 @@ BattleScript_MoveMissedDoDamage::
pause 0x40
resultmessage
waitmessage 0x40
- jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_NOTAFFECTED, BattleScript_MoveEnd
+ jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
printstring STRINGID_PKMNCRASHED
waitmessage 0x40
damagecalc
typecalc
adjustnormaldamage
manipulatedamage ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP
- bicbyte gBattleMoveFlags, MOVESTATUS_MISSED
+ bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate ATTACKER
datahpupdate ATTACKER
tryfaintmon ATTACKER, FALSE, NULL
- orbyte gBattleMoveFlags, MOVESTATUS_MISSED
+ orbyte gMoveResultFlags, MOVE_RESULT_MISSED
goto BattleScript_MoveEnd
BattleScript_EffectMist::
@@ -1012,11 +1012,11 @@ BattleScript_EffectPoison::
ppreduce
jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS_POISON, BattleScript_AlreadyPoisoned
- jumpifstatus TARGET, STATUS_TOXIC_POISON, BattleScript_AlreadyPoisoned
+ jumpifstatus TARGET, STATUS1_POISON, BattleScript_AlreadyPoisoned
+ jumpifstatus TARGET, STATUS1_TOXIC_POISON, BattleScript_AlreadyPoisoned
jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected
jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected
- jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
+ jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
@@ -1035,8 +1035,8 @@ BattleScript_EffectParalyze::
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
typecalc
jumpifmovehadnoeffect BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS_PARALYSIS, BattleScript_AlreadyParalyzed
- jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
+ jumpifstatus TARGET, STATUS1_PARALYSIS, BattleScript_AlreadyParalyzed
+ jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
@@ -1055,7 +1055,7 @@ BattleScript_AlreadyParalyzed::
goto BattleScript_MoveEnd
BattleScript_LimberProtected::
- copybyte gEffectBank, gBankTarget
+ copybyte gEffectBank, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0x0
call BattleScript_PRLZPrevention
goto BattleScript_MoveEnd
@@ -1221,7 +1221,7 @@ BattleScript_EffectLevelDamage::
attackstring
ppreduce
typecalc
- bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+ bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
dmgtolevel
adjustsetdamage
goto BattleScript_HitFromAtkAnimation
@@ -1232,7 +1232,7 @@ BattleScript_EffectPsywave::
attackstring
ppreduce
typecalc
- bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+ bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
psywavedamageeffect
adjustsetdamage
goto BattleScript_HitFromAtkAnimation
@@ -1279,7 +1279,7 @@ BattleScript_EffectPainSplit::
BattleScript_EffectSnore::
attackcanceler
- jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_SnoreIsAsleep
+ jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_SnoreIsAsleep
attackstring
ppreduce
goto BattleScript_ButItFailed
@@ -1333,7 +1333,7 @@ BattleScript_EffectSketch::
BattleScript_EffectSleepTalk::
attackcanceler
- jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_SleepTalkIsAsleep
+ jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_SleepTalkIsAsleep
attackstring
ppreduce
goto BattleScript_ButItFailed
@@ -1415,7 +1415,7 @@ BattleScript_TripleKickLoop::
jumpifhasnohp ATTACKER, BattleScript_TripleKickEnd
jumpifhasnohp TARGET, BattleScript_TripleKickNoMoreHits
jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoTripleKickAttack
- jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_TripleKickNoMoreHits
+ jumpifstatus ATTACKER, STATUS1_SLEEP, BattleScript_TripleKickNoMoreHits
BattleScript_DoTripleKickAttack::
accuracycheck BattleScript_TripleKickNoMoreHits, ACC_CURR_MOVE
movevaluescleanup
@@ -1440,18 +1440,18 @@ BattleScript_DoTripleKickAttack::
waitmessage 0x1
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
- jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_TripleKickPrintStrings
+ jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
decrementmultihit BattleScript_TripleKickLoop
goto BattleScript_TripleKickPrintStrings
BattleScript_TripleKickNoMoreHits::
pause 0x20
jumpifbyte EQUAL, sMULTIHIT_STRING + 4, 0x0, BattleScript_TripleKickPrintStrings
- bicbyte gBattleMoveFlags, MOVESTATUS_MISSED
+ bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
BattleScript_TripleKickPrintStrings::
resultmessage
waitmessage 0x40
jumpifbyte EQUAL, sMULTIHIT_STRING + 4, 0x0, BattleScript_TripleKickEnd
- jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_NOTAFFECTED, BattleScript_TripleKickEnd
+ jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_TripleKickEnd
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 0x6
printstring STRINGID_HITXTIMES
waitmessage 0x40
@@ -1487,7 +1487,7 @@ BattleScript_EffectNightmare::
ppreduce
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
jumpifstatus2 TARGET, STATUS2_NIGHTMARE, BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS_SLEEP, BattleScript_NightmareWorked
+ jumpifstatus TARGET, STATUS1_SLEEP, BattleScript_NightmareWorked
goto BattleScript_ButItFailed
BattleScript_NightmareWorked::
attackanimation
@@ -1513,7 +1513,7 @@ BattleScript_EffectCurse::
jumpifstat ATTACKER, NOT_EQUAL, ATK, 0xC, BattleScript_CurseTrySpeed
jumpifstat ATTACKER, EQUAL, DEF, 0xC, BattleScript_ButItFailed
BattleScript_CurseTrySpeed::
- copybyte gBankTarget, gBankAttacker
+ copybyte gBattlerTarget, gBattlerAttacker
setbyte sANIM_TURN, 0x1
attackanimation
waitanimation
@@ -1534,7 +1534,7 @@ BattleScript_CurseTryDefence::
BattleScript_CurseEnd::
goto BattleScript_MoveEnd
BattleScript_GhostCurse::
- jumpifbytenotequal gBankAttacker, gBankTarget, BattleScript_DoGhostCurse
+ jumpifbytenotequal gBattlerAttacker, gBattlerTarget, BattleScript_DoGhostCurse
getmovetarget ATTACKER
BattleScript_DoGhostCurse::
attackcanceler
@@ -1603,7 +1603,7 @@ BattleScript_PerishSongLoop::
jumpifability SCRIPTING_BANK, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
BattleScript_PerishSongLoopIncrement::
addbyte sBANK, 0x1
- jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_PerishSongLoop
+ jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop
goto BattleScript_MoveEnd
BattleScript_PerishSongNotAffected::
@@ -1748,7 +1748,7 @@ BattleScript_EffectSonicboom::
attackstring
ppreduce
typecalc
- bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+ bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
setword gBattleMoveDamage, 20
adjustsetdamage
goto BattleScript_HitFromAtkAnimation
@@ -2085,14 +2085,14 @@ BattleScript_ButItFailedPpReduce::
ppreduce
BattleScript_ButItFailed::
pause 0x20
- orbyte gBattleMoveFlags, MOVESTATUS_FAILED
+ orbyte gMoveResultFlags, MOVE_RESULT_FAILED
resultmessage
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_NotAffected::
pause 0x20
- orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED
+ orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
resultmessage
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -2204,10 +2204,10 @@ BattleScript_EffectWillOWisp::
attackstring
ppreduce
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
- jumpifstatus TARGET, STATUS_BURN, BattleScript_AlreadyBurned
+ jumpifstatus TARGET, STATUS1_BURN, BattleScript_AlreadyBurned
jumpiftype TARGET, TYPE_FIRE, BattleScript_NotAffected
jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_WaterVeilPrevents
- jumpifstatus TARGET, STATUS_ANY, BattleScript_ButItFailed
+ jumpifstatus TARGET, STATUS1_ANY, BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
attackanimation
@@ -2217,7 +2217,7 @@ BattleScript_EffectWillOWisp::
goto BattleScript_MoveEnd
BattleScript_WaterVeilPrevents::
- copybyte gEffectBank, gBankTarget
+ copybyte gEffectBank, gBattlerTarget
setbyte cMULTISTRING_CHOOSER, 0x0
call BattleScript_BRNPrevention
goto BattleScript_MoveEnd
@@ -2275,7 +2275,7 @@ BattleScript_82DA15A::
goto BattleScript_MoveEnd
BattleScript_EffectFacade::
- jumpifstatus ATTACKER, STATUS_POISON | STATUS_BURN | STATUS_PARALYSIS | STATUS_TOXIC_POISON, BattleScript_FacadeDoubleDmg
+ jumpifstatus ATTACKER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, BattleScript_FacadeDoubleDmg
goto BattleScript_EffectHit
BattleScript_FacadeDoubleDmg::
@@ -2293,7 +2293,7 @@ BattleScript_EffectFocusPunch::
BattleScript_EffectSmellingsalt::
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectHit
setmoveeffect EFFECT_REMOVE_PARALYSIS | CERTAIN
- jumpifstatus TARGET, STATUS_PARALYSIS, BattleScript_SmellingsaltDoubleDmg
+ jumpifstatus TARGET, STATUS1_PARALYSIS, BattleScript_SmellingsaltDoubleDmg
goto BattleScript_EffectHit
BattleScript_SmellingsaltDoubleDmg::
@@ -2452,7 +2452,7 @@ BattleScript_EffectBrickBreak::
typecalc
adjustnormaldamage
jumpifbyte EQUAL, sANIM_TURN, 0x0, BattleScript_BrickBreakAnim
- bicbyte gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED
+ bicbyte gMoveResultFlags, MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE
BattleScript_BrickBreakAnim::
attackanimation
waitanimation
@@ -2511,7 +2511,7 @@ BattleScript_EffectEndeavor::
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation
- bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+ bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
copyword gBattleMoveDamage, gHpDealt
adjustsetdamage
goto BattleScript_HitFromAtkAnimation
@@ -2598,11 +2598,11 @@ BattleScript_EffectTeeterDance::
attackcanceler
attackstring
ppreduce
- setbyte gBankTarget, 0x0
+ setbyte gBattlerTarget, 0x0
BattleScript_TeeterDanceLoop::
movevaluescleanup
setmoveeffect EFFECT_CONFUSION
- jumpifbyteequal gBankAttacker, gBankTarget, BattleScript_TeeterDanceLoopIncrement
+ jumpifbyteequal gBattlerAttacker, gBattlerTarget, BattleScript_TeeterDanceLoopIncrement
jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_TeeterDanceOwnTempoPrevents
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_TeeterDanceSubstitutePrevents
jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_TeeterDanceAlreadyConfused
@@ -2618,8 +2618,8 @@ BattleScript_TeeterDanceDoMoveEndIncrement::
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
BattleScript_TeeterDanceLoopIncrement::
- addbyte gBankTarget, 0x1
- jumpifbytenotequal gBankTarget, gNoOfAllBanks, BattleScript_TeeterDanceLoop
+ addbyte gBattlerTarget, 0x1
+ jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TeeterDanceLoop
end
BattleScript_TeeterDanceOwnTempoPrevents::
@@ -2706,7 +2706,7 @@ BattleScript_TickleEnd::
BattleScript_CantLowerMultipleStats::
pause 0x20
- orbyte gBattleMoveFlags, MOVESTATUS_FAILED
+ orbyte gMoveResultFlags, MOVE_RESULT_FAILED
printstring STRINGID_STATSWONTDECREASE2
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -2792,7 +2792,7 @@ BattleScript_CalmMindEnd::
BattleScript_CantRaiseMultipleStats::
pause 0x20
- orbyte gBattleMoveFlags, MOVESTATUS_FAILED
+ orbyte gMoveResultFlags, MOVE_RESULT_FAILED
printstring STRINGID_STATSWONTINCREASE2
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -2935,7 +2935,7 @@ BattleScript_82DA908::
switchinanim GBANK_1, FALSE
waitstate
switchineffects 5
- jumpifbytenotequal gBank1, gNoOfAllBanks, BattleScript_82DA908
+ jumpifbytenotequal gBank1, gBattlersCount, BattleScript_82DA908
BattleScript_82DA92C::
end2
@@ -2950,7 +2950,7 @@ BattleScript_LocalBattleWonLoseTexts::
waitstate
printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleWonReward
- trainerslideout IDENTITY_OPPONENT_MON1
+ trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein GBANK_1
waitstate
@@ -2991,7 +2991,7 @@ BattleScript_LocalBattleLostPrintTrainersWinText::
jumpifbattletype BATTLE_TYPE_x800000, BattleScript_LocalBattleLostDoTrainer2WinText
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleLostEnd_
BattleScript_LocalBattleLostDoTrainer2WinText::
- trainerslideout IDENTITY_OPPONENT_MON1
+ trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein GBANK_1
waitstate
@@ -3007,7 +3007,7 @@ BattleScript_82DAA0B::
trainerslidein ATTACKER
waitstate
printstring STRINGID_TRAINER1WINTEXT
- trainerslideout IDENTITY_OPPONENT_MON1
+ trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein GBANK_1
waitstate
@@ -3035,7 +3035,7 @@ BattleScript_82DAA5C::
trainerslidein ATTACKER
waitstate
printstring STRINGID_TRAINER1LOSETEXT
- trainerslideout IDENTITY_OPPONENT_MON1
+ trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein GBANK_1
waitstate
@@ -3058,7 +3058,7 @@ BattleScript_82DAAAE::
waitstate
printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DAACB
- trainerslideout IDENTITY_OPPONENT_MON1
+ trainerslideout B_POSITION_OPPONENT_LEFT
waitstate
trainerslidein GBANK_1
waitstate
@@ -3228,7 +3228,7 @@ BattleScript_DamagingWeatherContinues::
playanimation2 ATTACKER, sANIM_ARG1, NULL
setbyte gBattleCommunication, 0x0
BattleScript_DamagingWeatherLoop::
- copyarraywithindex gBankAttacker, gBanksByTurnOrder, gBattleCommunication, 0x1
+ copyarraywithindex gBattlerAttacker, gBattleTurnOrder, gBattleCommunication, 0x1
weatherdamage
jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement
printfromtable gSandStormHailDmgStringIds
@@ -3243,7 +3243,7 @@ BattleScript_DamagingWeatherLoop::
BattleScript_DamagingWeatherLoopIncrement::
jumpifbyte NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamagingWeatherContinuesEnd
addbyte gBattleCommunication, 0x1
- jumpifbytenotequal gBattleCommunication, gNoOfAllBanks, BattleScript_DamagingWeatherLoop
+ jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_DamagingWeatherLoop
BattleScript_DamagingWeatherContinuesEnd::
bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
end2
@@ -3322,7 +3322,7 @@ BattleScript_BideAttack::
waitmessage 0x40
accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE
typecalc
- bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+ bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
copyword gBattleMoveDamage, sBIDE_DMG
adjustsetdamage
setbyte sANIM_TURN, 0x1
@@ -3521,7 +3521,7 @@ BattleScript_RapidSpinAway::
BattleScript_WrapFree::
printstring STRINGID_PKMNGOTFREE
waitmessage 0x40
- copybyte gBankTarget, sBANK
+ copybyte gBattlerTarget, sBANK
return
BattleScript_LeechSeedFree::
@@ -3564,16 +3564,16 @@ BattleScript_FutureAttackEnd::
moveend 0x1, 0x0
setbyte sMOVEEND_STATE, 0xB
moveend 0x2, 0xE
- setbyte gBattleMoveFlags, 0
+ setbyte gMoveResultFlags, 0
end2
BattleScript_FutureAttackMiss::
pause 0x20
- setbyte gBattleMoveFlags, 0
- orbyte gBattleMoveFlags, MOVESTATUS_FAILED
+ setbyte gMoveResultFlags, 0
+ orbyte gMoveResultFlags, MOVE_RESULT_FAILED
resultmessage
waitmessage 0x40
- setbyte gBattleMoveFlags, 0
+ setbyte gMoveResultFlags, 0
end2
BattleScript_NoMovesLeft::
@@ -4032,7 +4032,7 @@ BattleScript_WeatherFormChanges::
BattleScript_WeatherFormChangesLoop::
trycastformdatachange
addbyte sBANK, 0x1
- jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_WeatherFormChangesLoop
+ jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop
return
BattleScript_CastformChange::
@@ -4053,7 +4053,7 @@ BattleScript_82DB4B8::
BattleScript_82DB4BE::
pause 0x20
BattleScript_82DB4C1::
- setbyte gBankTarget, 0x0
+ setbyte gBattlerTarget, 0x0
setstatchanger ATK, 1, TRUE
BattleScript_82DB4CD::
trygetintimidatetarget BattleScript_82DB51B
@@ -4068,7 +4068,7 @@ BattleScript_82DB4CD::
printstring STRINGID_PKMNCUTSATTACKWITH
waitmessage 0x40
BattleScript_82DB510::
- addbyte gBankTarget, 0x1
+ addbyte gBattlerTarget, 0x1
goto BattleScript_82DB4CD
BattleScript_82DB51B::
return
@@ -4117,7 +4117,7 @@ BattleScript_MoveHPDrain::
datahpupdate TARGET
printstring STRINGID_PKMNRESTOREDHPUSING
waitmessage 0x40
- orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED
+ orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd
BattleScript_MonMadeMoveUseless_PPLoss::
@@ -4127,7 +4127,7 @@ BattleScript_MonMadeMoveUseless::
pause 0x20
printstring STRINGID_PKMNSXMADEYUSELESS
waitmessage 0x40
- orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED
+ orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd
BattleScript_FlashFireBoost_PPLoss::
@@ -4474,7 +4474,7 @@ BattleScript_82DB887::
waitmessage 0x40
BattleScript_82DB89D::
addbyte gBattleCommunication + 1, 0x1
- jumpifbytenotequal gBattleCommunication + 1, gNoOfAllBanks, BattleScript_82DB887
+ jumpifbytenotequal gBattleCommunication + 1, gBattlersCount, BattleScript_82DB887
setbyte gBattleCommunication, 0x0
setbyte gBattleCommunication + 1, 0x0
end2
diff --git a/data/berry_tag_screen.s b/data/berry_tag_screen.s
deleted file mode 100644
index cacc023b4..000000000
--- a/data/berry_tag_screen.s
+++ /dev/null
@@ -1,34 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_085EFCF0:: @ 85EFCF0
- .4byte 0x000001f0, 0x000011e1, 0x000021d2, 0x000031c3
-
- .align 2
-gUnknown_085EFD00:: @ 85EFD00
- .incbin "graphics/interface/berry_tag_screen.gbapal"
-
- .align 2
-gUnknown_085EFD20:: @ 85EFD20
- .byte 0x00, 0x02, 0x03
-
- .byte 0x0F, 0x0E, 0x0D
-
- .align 2
-gUnknown_085EFD28:: @ 85EFD28
- window_template 0x01, 0x0b, 0x04, 0x08, 0x02, 0x0f, 0x0045
- window_template 0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055
- window_template 0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d
- window_template 0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101
- null_window_template
-
- .align 2
-gBerryFirmnessStringPointers:: @ 85EFD50
- .4byte gBerryFirmnessString_VerySoft
- .4byte gBerryFirmnessString_Soft
- .4byte gBerryFirmnessString_Hard
- .4byte gBerryFirmnessString_VeryHard
- .4byte gBerryFirmnessString_SuperHard
diff --git a/data/coord_event_weather.s b/data/coord_event_weather.s
deleted file mode 100644
index c7b995912..000000000
--- a/data/coord_event_weather.s
+++ /dev/null
@@ -1,21 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
-gUnknown_085102E0:: @ 85102E0
- .4byte 0x00000001, sub_809D7BC
- .4byte 0x00000002, sub_809D7C8
- .4byte 0x00000003, sub_809D7D4
- .4byte 0x00000004, sub_809D7E0
- .4byte 0x00000005, sub_809D7EC
- .4byte 0x00000006, sub_809D7F8
- .4byte 0x00000007, sub_809D804
- .4byte 0x00000008, sub_809D810
- .4byte 0x00000009, sub_809D81C
- .4byte 0x0000000a, sub_809D828
- .4byte 0x0000000b, sub_809D834
- .4byte 0x00000014, sub_809D840
- .4byte 0x00000015, sub_809D84C
-
diff --git a/data/graphics/berries/berry_graphics.inc b/data/graphics/berries/berry_graphics.inc
index 01a7c776d..358cc8fc1 100644
--- a/data/graphics/berries/berry_graphics.inc
+++ b/data/graphics/berries/berry_graphics.inc
@@ -1,343 +1,343 @@
.align 2
gBerryPic_Cheri:: @ 8D9C3A8
- .incbin "graphics/berries/pics/cheri.4bpp.lz"
+ .incbin "graphics/berries/cheri.4bpp.lz"
.align 2
gBerryPic_Oran:: @ 8D9C4FC
- .incbin "graphics/berries/pics/oran.4bpp.lz"
+ .incbin "graphics/berries/oran.4bpp.lz"
.align 2
gBerryPic_Pecha:: @ 8D9C670
- .incbin "graphics/berries/pics/pecha.4bpp.lz"
+ .incbin "graphics/berries/pecha.4bpp.lz"
.align 2
gBerryPic_Rawst:: @ 8D9C7E4
- .incbin "graphics/berries/pics/rawst.4bpp.lz"
+ .incbin "graphics/berries/rawst.4bpp.lz"
.align 2
gBerryPic_Aspear:: @ 8D9C97C
- .incbin "graphics/berries/pics/aspear.4bpp.lz"
+ .incbin "graphics/berries/aspear.4bpp.lz"
.align 2
gBerryPic_Leppa:: @ 8D9CB24
- .incbin "graphics/berries/pics/leppa.4bpp.lz"
+ .incbin "graphics/berries/leppa.4bpp.lz"
.align 2
gBerryPic_Chesto:: @ 8D9CC94
- .incbin "graphics/berries/pics/chesto.4bpp.lz"
+ .incbin "graphics/berries/chesto.4bpp.lz"
.align 2
gBerryPic_Persim:: @ 8D9CE78
- .incbin "graphics/berries/pics/persim.4bpp.lz"
+ .incbin "graphics/berries/persim.4bpp.lz"
.align 2
gBerryPic_Lum:: @ 8D9CFC8
- .incbin "graphics/berries/pics/lum.4bpp.lz"
+ .incbin "graphics/berries/lum.4bpp.lz"
.align 2
gBerryPic_Sitrus:: @ 8D9D0E4
- .incbin "graphics/berries/pics/sitrus.4bpp.lz"
+ .incbin "graphics/berries/sitrus.4bpp.lz"
.align 2
gBerryPic_Figy:: @ 8D9D288
- .incbin "graphics/berries/pics/figy.4bpp.lz"
+ .incbin "graphics/berries/figy.4bpp.lz"
.align 2
gBerryPic_Wiki:: @ 8D9D434
- .incbin "graphics/berries/pics/wiki.4bpp.lz"
+ .incbin "graphics/berries/wiki.4bpp.lz"
.align 2
gBerryPic_Mago:: @ 8D9D628
- .incbin "graphics/berries/pics/mago.4bpp.lz"
+ .incbin "graphics/berries/mago.4bpp.lz"
.align 2
gBerryPic_Aguav:: @ 8D9D7DC
- .incbin "graphics/berries/pics/aguav.4bpp.lz"
+ .incbin "graphics/berries/aguav.4bpp.lz"
.align 2
gBerryPic_Iapapa:: @ 8D9D950
- .incbin "graphics/berries/pics/iapapa.4bpp.lz"
+ .incbin "graphics/berries/iapapa.4bpp.lz"
.align 2
gBerryPic_Razz:: @ 8D9DC08
- .incbin "graphics/berries/pics/razz.4bpp.lz"
+ .incbin "graphics/berries/razz.4bpp.lz"
.align 2
gBerryPic_Bluk:: @ 8D9DE38
- .incbin "graphics/berries/pics/bluk.4bpp.lz"
+ .incbin "graphics/berries/bluk.4bpp.lz"
.align 2
gBerryPic_Nanab:: @ 8D9E020
- .incbin "graphics/berries/pics/nanab.4bpp.lz"
+ .incbin "graphics/berries/nanab.4bpp.lz"
.align 2
gBerryPic_Wepear:: @ 8D9E194
- .incbin "graphics/berries/pics/wepear.4bpp.lz"
+ .incbin "graphics/berries/wepear.4bpp.lz"
.align 2
gBerryPic_Pinap:: @ 8D9E35C
- .incbin "graphics/berries/pics/pinap.4bpp.lz"
+ .incbin "graphics/berries/pinap.4bpp.lz"
.align 2
gBerryPic_Pomeg:: @ 8D9E570
- .incbin "graphics/berries/pics/pomeg.4bpp.lz"
+ .incbin "graphics/berries/pomeg.4bpp.lz"
.align 2
gBerryPic_Kelpsy:: @ 8D9E718
- .incbin "graphics/berries/pics/kelpsy.4bpp.lz"
+ .incbin "graphics/berries/kelpsy.4bpp.lz"
.align 2
gBerryPic_Qualot:: @ 8D9E8C0
- .incbin "graphics/berries/pics/qualot.4bpp.lz"
+ .incbin "graphics/berries/qualot.4bpp.lz"
.align 2
gBerryPic_Hondew:: @ 8D9EA8C
- .incbin "graphics/berries/pics/hondew.4bpp.lz"
+ .incbin "graphics/berries/hondew.4bpp.lz"
.align 2
gBerryPic_Grepa:: @ 8D9ECE4
- .incbin "graphics/berries/pics/grepa.4bpp.lz"
+ .incbin "graphics/berries/grepa.4bpp.lz"
.align 2
gBerryPic_Tamato:: @ 8D9EE74
- .incbin "graphics/berries/pics/tamato.4bpp.lz"
+ .incbin "graphics/berries/tamato.4bpp.lz"
.align 2
gBerryPic_Cornn:: @ 8D9F138
- .incbin "graphics/berries/pics/cornn.4bpp.lz"
+ .incbin "graphics/berries/cornn.4bpp.lz"
.align 2
gBerryPic_Magost:: @ 8D9F33C
- .incbin "graphics/berries/pics/magost.4bpp.lz"
+ .incbin "graphics/berries/magost.4bpp.lz"
.align 2
gBerryPic_Rabuta:: @ 8D9F4E0
- .incbin "graphics/berries/pics/rabuta.4bpp.lz"
+ .incbin "graphics/berries/rabuta.4bpp.lz"
.align 2
gBerryPic_Nomel:: @ 8D9F7D4
- .incbin "graphics/berries/pics/nomel.4bpp.lz"
+ .incbin "graphics/berries/nomel.4bpp.lz"
.align 2
gBerryPic_Spelon:: @ 8D9F9B0
- .incbin "graphics/berries/pics/spelon.4bpp.lz"
+ .incbin "graphics/berries/spelon.4bpp.lz"
.align 2
gBerryPic_Pamtre:: @ 8D9FBA0
- .incbin "graphics/berries/pics/pamtre.4bpp.lz"
+ .incbin "graphics/berries/pamtre.4bpp.lz"
.align 2
gBerryPic_Watmel:: @ 8D9FDF0
- .incbin "graphics/berries/pics/watmel.4bpp.lz"
+ .incbin "graphics/berries/watmel.4bpp.lz"
.align 2
gBerryPic_Durin:: @ 8DA00D4
- .incbin "graphics/berries/pics/durin.4bpp.lz"
+ .incbin "graphics/berries/durin.4bpp.lz"
.align 2
gBerryPic_Belue:: @ 8DA04A0
- .incbin "graphics/berries/pics/belue.4bpp.lz"
+ .incbin "graphics/berries/belue.4bpp.lz"
.align 2
gBerryPic_Liechi:: @ 8DA0778
- .incbin "graphics/berries/pics/liechi.4bpp.lz"
+ .incbin "graphics/berries/liechi.4bpp.lz"
.align 2
gBerryPic_Ganlon:: @ 8DA09D0
- .incbin "graphics/berries/pics/ganlon.4bpp.lz"
+ .incbin "graphics/berries/ganlon.4bpp.lz"
.align 2
gBerryPic_Salac:: @ 8DA0B68
- .incbin "graphics/berries/pics/salac.4bpp.lz"
+ .incbin "graphics/berries/salac.4bpp.lz"
.align 2
gBerryPic_Petaya:: @ 8DA0DAC
- .incbin "graphics/berries/pics/petaya.4bpp.lz"
+ .incbin "graphics/berries/petaya.4bpp.lz"
.align 2
gBerryPic_Apicot:: @ 8DA1054
- .incbin "graphics/berries/pics/apicot.4bpp.lz"
+ .incbin "graphics/berries/apicot.4bpp.lz"
.align 2
gBerryPic_Lansat:: @ 8DA11E4
- .incbin "graphics/berries/pics/lansat.4bpp.lz"
+ .incbin "graphics/berries/lansat.4bpp.lz"
.align 2
gBerryPic_Starf:: @ 8DA13D8
- .incbin "graphics/berries/pics/starf.4bpp.lz"
+ .incbin "graphics/berries/starf.4bpp.lz"
.align 2
gBerryPic_Enigma:: @ 8DA15A8
- .incbin "graphics/berries/pics/enigma.4bpp.lz"
+ .incbin "graphics/berries/enigma.4bpp.lz"
.align 2
gBerryPalette_Cheri:: @ 8DA17C0
- .incbin "graphics/berries/palettes/cheri.gbapal.lz"
+ .incbin "graphics/berries/cheri.gbapal.lz"
.align 2
gBerryPalette_Oran:: @ 8DA17E8
- .incbin "graphics/berries/palettes/oran.gbapal.lz"
+ .incbin "graphics/berries/oran.gbapal.lz"
.align 2
gBerryPalette_Pecha:: @ 8DA1810
- .incbin "graphics/berries/palettes/pecha.gbapal.lz"
+ .incbin "graphics/berries/pecha.gbapal.lz"
.align 2
gBerryPalette_Rawst:: @ 8DA1838
- .incbin "graphics/berries/palettes/rawst.gbapal.lz"
+ .incbin "graphics/berries/rawst.gbapal.lz"
.align 2
gBerryPalette_Aspear:: @ 8DA1860
- .incbin "graphics/berries/palettes/aspear.gbapal.lz"
+ .incbin "graphics/berries/aspear.gbapal.lz"
.align 2
gBerryPalette_Leppa:: @ 8DA1888
- .incbin "graphics/berries/palettes/leppa.gbapal.lz"
+ .incbin "graphics/berries/leppa.gbapal.lz"
.align 2
gBerryPalette_Chesto:: @ 8DA18B0
- .incbin "graphics/berries/palettes/chesto.gbapal.lz"
+ .incbin "graphics/berries/chesto.gbapal.lz"
.align 2
gBerryPalette_Persim:: @ 8DA18D8
- .incbin "graphics/berries/palettes/persim.gbapal.lz"
+ .incbin "graphics/berries/persim.gbapal.lz"
.align 2
gBerryPalette_Lum:: @ 8DA1900
- .incbin "graphics/berries/palettes/lum.gbapal.lz"
+ .incbin "graphics/berries/lum.gbapal.lz"
.align 2
gBerryPalette_Sitrus:: @ 8DA1928
- .incbin "graphics/berries/palettes/sitrus.gbapal.lz"
+ .incbin "graphics/berries/sitrus.gbapal.lz"
.align 2
gBerryPalette_Figy:: @ 8DA1950
- .incbin "graphics/berries/palettes/figy.gbapal.lz"
+ .incbin "graphics/berries/figy.gbapal.lz"
.align 2
gBerryPalette_Wiki:: @ 8DA1978
- .incbin "graphics/berries/palettes/wiki.gbapal.lz"
+ .incbin "graphics/berries/wiki.gbapal.lz"
.align 2
gBerryPalette_Mago:: @ 8DA19A0
- .incbin "graphics/berries/palettes/mago.gbapal.lz"
+ .incbin "graphics/berries/mago.gbapal.lz"
.align 2
gBerryPalette_Aguav:: @ 8DA19C8
- .incbin "graphics/berries/palettes/aguav.gbapal.lz"
+ .incbin "graphics/berries/aguav.gbapal.lz"
.align 2
gBerryPalette_Iapapa:: @ 8DA19F0
- .incbin "graphics/berries/palettes/iapapa.gbapal.lz"
+ .incbin "graphics/berries/iapapa.gbapal.lz"
.align 2
gBerryPalette_Razz:: @ 8DA1A18
- .incbin "graphics/berries/palettes/razz.gbapal.lz"
+ .incbin "graphics/berries/razz.gbapal.lz"
.align 2
gBerryPalette_Bluk:: @ 8DA1A40
- .incbin "graphics/berries/palettes/bluk.gbapal.lz"
+ .incbin "graphics/berries/bluk.gbapal.lz"
.align 2
gBerryPalette_Nanab:: @ 8DA1A68
- .incbin "graphics/berries/palettes/nanab.gbapal.lz"
+ .incbin "graphics/berries/nanab.gbapal.lz"
.align 2
gBerryPalette_Wepear:: @ 8DA1A90
- .incbin "graphics/berries/palettes/wepear.gbapal.lz"
+ .incbin "graphics/berries/wepear.gbapal.lz"
.align 2
gBerryPalette_Pinap:: @ 8DA1AB8
- .incbin "graphics/berries/palettes/pinap.gbapal.lz"
+ .incbin "graphics/berries/pinap.gbapal.lz"
.align 2
gBerryPalette_Pomeg:: @ 8DA1AE0
- .incbin "graphics/berries/palettes/pomeg.gbapal.lz"
+ .incbin "graphics/berries/pomeg.gbapal.lz"
.align 2
gBerryPalette_Kelpsy:: @ 8DA1B08
- .incbin "graphics/berries/palettes/kelpsy.gbapal.lz"
+ .incbin "graphics/berries/kelpsy.gbapal.lz"
.align 2
gBerryPalette_Qualot:: @ 8DA1B30
- .incbin "graphics/berries/palettes/qualot.gbapal.lz"
+ .incbin "graphics/berries/qualot.gbapal.lz"
.align 2
gBerryPalette_Hondew:: @ 8DA1B58
- .incbin "graphics/berries/palettes/hondew.gbapal.lz"
+ .incbin "graphics/berries/hondew.gbapal.lz"
.align 2
gBerryPalette_Grepa:: @ 8DA1B80
- .incbin "graphics/berries/palettes/grepa.gbapal.lz"
+ .incbin "graphics/berries/grepa.gbapal.lz"
.align 2
gBerryPalette_Tamato:: @ 8DA1BA8
- .incbin "graphics/berries/palettes/tamato.gbapal.lz"
+ .incbin "graphics/berries/tamato.gbapal.lz"
.align 2
gBerryPalette_Cornn:: @ 8DA1BD0
- .incbin "graphics/berries/palettes/cornn.gbapal.lz"
+ .incbin "graphics/berries/cornn.gbapal.lz"
.align 2
gBerryPalette_Magost:: @ 8DA1BF8
- .incbin "graphics/berries/palettes/magost.gbapal.lz"
+ .incbin "graphics/berries/magost.gbapal.lz"
.align 2
gBerryPalette_Rabuta:: @ 8DA1C20
- .incbin "graphics/berries/palettes/rabuta.gbapal.lz"
+ .incbin "graphics/berries/rabuta.gbapal.lz"
.align 2
gBerryPalette_Nomel:: @ 8DA1C48
- .incbin "graphics/berries/palettes/nomel.gbapal.lz"
+ .incbin "graphics/berries/nomel.gbapal.lz"
.align 2
gBerryPalette_Spelon:: @ 8DA1C70
- .incbin "graphics/berries/palettes/spelon.gbapal.lz"
+ .incbin "graphics/berries/spelon.gbapal.lz"
.align 2
gBerryPalette_Pamtre:: @ 8DA1C98
- .incbin "graphics/berries/palettes/pamtre.gbapal.lz"
+ .incbin "graphics/berries/pamtre.gbapal.lz"
.align 2
gBerryPalette_Watmel:: @ 8DA1CC0
- .incbin "graphics/berries/palettes/watmel.gbapal.lz"
+ .incbin "graphics/berries/watmel.gbapal.lz"
.align 2
gBerryPalette_Durin:: @ 8DA1CE8
- .incbin "graphics/berries/palettes/durin.gbapal.lz"
+ .incbin "graphics/berries/durin.gbapal.lz"
.align 2
gBerryPalette_Belue:: @ 8DA1D10
- .incbin "graphics/berries/palettes/belue.gbapal.lz"
+ .incbin "graphics/berries/belue.gbapal.lz"
.align 2
gBerryPalette_Liechi:: @ 8DA1D38
- .incbin "graphics/berries/palettes/liechi.gbapal.lz"
+ .incbin "graphics/berries/liechi.gbapal.lz"
.align 2
gBerryPalette_Ganlon:: @ 8DA1D60
- .incbin "graphics/berries/palettes/ganlon.gbapal.lz"
+ .incbin "graphics/berries/ganlon.gbapal.lz"
.align 2
gBerryPalette_Salac:: @ 8DA1D88
- .incbin "graphics/berries/palettes/salac.gbapal.lz"
+ .incbin "graphics/berries/salac.gbapal.lz"
.align 2
gBerryPalette_Petaya:: @ 8DA1DB0
- .incbin "graphics/berries/palettes/petaya.gbapal.lz"
+ .incbin "graphics/berries/petaya.gbapal.lz"
.align 2
gBerryPalette_Apicot:: @ 8DA1DD8
- .incbin "graphics/berries/palettes/apicot.gbapal.lz"
+ .incbin "graphics/berries/apicot.gbapal.lz"
.align 2
gBerryPalette_Lansat:: @ 8DA1E00
- .incbin "graphics/berries/palettes/lansat.gbapal.lz"
+ .incbin "graphics/berries/lansat.gbapal.lz"
.align 2
gBerryPalette_Starf:: @ 8DA1E28
- .incbin "graphics/berries/palettes/starf.gbapal.lz"
+ .incbin "graphics/berries/starf.gbapal.lz"
.align 2
gBerryPalette_Enigma:: @ 8DA1E50
- .incbin "graphics/berries/palettes/enigma.gbapal.lz"
+ .incbin "graphics/berries/enigma.gbapal.lz"
diff --git a/data/item_icon.s b/data/item_icon.s
index 41fb7d9a1..6fd94d0a0 100644
--- a/data/item_icon.s
+++ b/data/item_icon.s
@@ -6,18 +6,3 @@
@ 8614410
.include "data/graphics/items/item_icon_table.inc"
-gUnknown_08614FE0:: @ 8614FE0
- .2byte 0
- .2byte 0x8000
- .2byte 0x2400
- .2byte 0
-
-gUnknown_08614FE8:: @ 8614FE8
- obj_image_anim_frame 0, 0
- obj_image_anim_end
-
-gUnknown_08614FF0:: @ 8614FF0
- .4byte gUnknown_08614FE8
-
-gUnknown_08614FF4:: @ 8614FF4
- spr_template 0, 0, gUnknown_08614FE0, gUnknown_08614FF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
diff --git a/data/mystery_event_menu.s b/data/mystery_event_menu.s
deleted file mode 100644
index bb8330497..000000000
--- a/data/mystery_event_menu.s
+++ /dev/null
@@ -1,12 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-gUnknown_085EFD64:: @ 85EFD64
- .4byte 0x1F8
-
-gUnknown_085EFD68:: @ 85EFD68
- window_template 0, 4, 15, 22, 4, 14, 20
- window_template 0, 7, 6, 16, 4, 14, 0x6C
- null_window_template
diff --git a/data/pokemon_animation.s b/data/pokemon_animation.s
deleted file mode 100644
index 535c91b2d..000000000
--- a/data/pokemon_animation.s
+++ /dev/null
@@ -1,240 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-gUnknown_0860A8C8:: @ 860A8C8
- .byte 0x00, 0x13, 0x02, 0x08, 0x12, 0x15, 0x17, 0x12, 0x12, 0x19, 0x02, 0x13, 0x11, 0x02, 0x13, 0x01, 0x0f, 0x15, 0x0f, 0x0a, 0x0a, 0x0f, 0x15, 0x0f, 0x09, 0x16, 0x16, 0x12, 0x10, 0x12, 0x15, 0x09
- .byte 0x12, 0x15, 0x09, 0x13, 0x13, 0x10, 0x01, 0x13, 0x06, 0x11, 0x09, 0x02, 0x02, 0x14, 0x02, 0x08, 0x0a, 0x11, 0x09, 0x09, 0x10, 0x0f, 0x02, 0x14, 0x10, 0x10, 0x15, 0x15, 0x12, 0x09, 0x0e, 0x14
- .byte 0x14, 0x0d, 0x15, 0x09, 0x09, 0x0b, 0x0b, 0x0b, 0x02, 0x02, 0x0e, 0x08, 0x08, 0x17, 0x15, 0x02, 0x13, 0x0f, 0x0f, 0x02, 0x0f, 0x15, 0x13, 0x02, 0x0b, 0x0c, 0x13, 0x0f, 0x01, 0x01, 0x14, 0x09
- .byte 0x13, 0x14, 0x0a, 0x09, 0x15, 0x15, 0x02, 0x10, 0x15, 0x10, 0x02, 0x0f, 0x02, 0x06, 0x06, 0x0e, 0x0e, 0x12, 0x0b, 0x12, 0x13, 0x11, 0x11, 0x11, 0x13, 0x19, 0x14, 0x0f, 0x13, 0x16, 0x17, 0x0e
- .byte 0x0e, 0x10, 0x09, 0x19, 0x05, 0x12, 0x19, 0x16, 0x17, 0x01, 0x13, 0x13, 0x13, 0x15, 0x15, 0x13, 0x19, 0x16, 0x17, 0x02, 0x0f, 0x09, 0x0d, 0x12, 0x12, 0x02, 0x09, 0x12, 0x15, 0x17, 0x15, 0x15
- .byte 0x09, 0x12, 0x10, 0x11, 0x0f, 0x0a, 0x11, 0x0a, 0x02, 0x0f, 0x0b, 0x16, 0x12, 0x13, 0x13, 0x13, 0x11, 0x12, 0x14, 0x12, 0x13, 0x16, 0x11, 0x12, 0x13, 0x02, 0x10, 0x11, 0x11, 0x11, 0x10, 0x13
- .byte 0x02, 0x11, 0x0b, 0x02, 0x14, 0x14, 0x12, 0x13, 0x01, 0x14, 0x0b, 0x14, 0x08, 0x09, 0x0f, 0x05, 0x09, 0x15, 0x09, 0x0d, 0x15, 0x13, 0x15, 0x0f, 0x13, 0x09, 0x17, 0x17, 0x0a, 0x08, 0x02, 0x02
- .byte 0x05, 0x0f, 0x02, 0x15, 0x09, 0x09, 0x19, 0x15, 0x0e, 0x01, 0x13, 0x02, 0x0f, 0x07, 0x02, 0x08, 0x17, 0x02, 0x13, 0x16, 0x17, 0x19, 0x0e, 0x09, 0x0e, 0x19, 0x17, 0x18, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x15, 0x09, 0x12, 0x10, 0x17, 0x02, 0x12, 0x19, 0x12, 0x08
- .byte 0x0f, 0x15, 0x0b, 0x08, 0x11, 0x08, 0x0f, 0x02, 0x10, 0x10, 0x13, 0x09, 0x14, 0x0a, 0x01, 0x14, 0x12, 0x15, 0x13, 0x15, 0x07, 0x11, 0x11, 0x03, 0x11, 0x19, 0x19, 0x13, 0x12, 0x01, 0x13, 0x14
- .byte 0x0e, 0x17, 0x01, 0x0b, 0x09, 0x04, 0x0f, 0x15, 0x03, 0x19, 0x04, 0x15, 0x13, 0x01, 0x0f, 0x0e, 0x0e, 0x15, 0x09, 0x0e, 0x17, 0x13, 0x09, 0x09, 0x0a, 0x08, 0x0f, 0x0f, 0x13, 0x13, 0x10, 0x10
- .byte 0x14, 0x12, 0x12, 0x09, 0x14, 0x14, 0x11, 0x11, 0x12, 0x01, 0x01, 0x18, 0x02, 0x10, 0x08, 0x0b, 0x0b, 0x0e, 0x13, 0x09, 0x0d, 0x13, 0x11, 0x11, 0x14, 0x01, 0x01, 0x0b, 0x15, 0x02, 0x15, 0x09
- .byte 0x0e, 0x11, 0x11, 0x11, 0x0c, 0x0b, 0x0f, 0x09, 0x14, 0x14, 0x14, 0x09, 0x09, 0x08, 0x0f, 0x15, 0x09, 0x09, 0x09, 0x09, 0x19, 0x17, 0x0d, 0x01, 0x01, 0x11, 0x14, 0x11
-
-gUnknown_0860AA64:: @ 860AA64
- .byte 0x00, 0x05, 0x01, 0x01, 0x00, 0x0f, 0x01, 0x04, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x00, 0xff
-
-gUnknown_0860AA80:: @ 860AA80
- .byte 0x06, 0x1e, 0xfe, 0x0f, 0x06, 0x1e, 0xff, 0x00
-
- .align 2
-gUnknown_0860AA88:: @ 860AA88
- .4byte pokemonanimfunc_00
- .4byte pokemonanimfunc_01
- .4byte pokemonanimfunc_02
- .4byte pokemonanimfunc_03
- .4byte pokemonanimfunc_04
- .4byte pokemonanimfunc_05
- .4byte pokemonanimfunc_06
- .4byte pokemonanimfunc_07
- .4byte pokemonanimfunc_08
- .4byte pokemonanimfunc_09
- .4byte pokemonanimfunc_0A
- .4byte pokemonanimfunc_0B
- .4byte pokemonanimfunc_0C
- .4byte pokemonanimfunc_0D
- .4byte pokemonanimfunc_0E
- .4byte pokemonanimfunc_0F
- .4byte pokemonanimfunc_10
- .4byte pokemonanimfunc_11
- .4byte pokemonanimfunc_12
- .4byte pokemonanimfunc_13
- .4byte pokemonanimfunc_14
- .4byte pokemonanimfunc_15
- .4byte pokemonanimfunc_16
- .4byte pokemonanimfunc_17
- .4byte pokemonanimfunc_18
- .4byte pokemonanimfunc_19
- .4byte pokemonanimfunc_1A
- .4byte pokemonanimfunc_1B
- .4byte pokemonanimfunc_1C
- .4byte pokemonanimfunc_1D
- .4byte pokemonanimfunc_1E
- .4byte pokemonanimfunc_1F
- .4byte pokemonanimfunc_20
- .4byte pokemonanimfunc_21
- .4byte pokemonanimfunc_22
- .4byte pokemonanimfunc_23
- .4byte pokemonanimfunc_24
- .4byte pokemonanimfunc_25
- .4byte pokemonanimfunc_26
- .4byte pokemonanimfunc_27
- .4byte pokemonanimfunc_28
- .4byte pokemonanimfunc_29
- .4byte pokemonanimfunc_2A
- .4byte pokemonanimfunc_2B
- .4byte pokemonanimfunc_2C
- .4byte pokemonanimfunc_2D
- .4byte pokemonanimfunc_2E
- .4byte pokemonanimfunc_2F
- .4byte pokemonanimfunc_30
- .4byte pokemonanimfunc_31
- .4byte pokemonanimfunc_32
- .4byte pokemonanimfunc_33
- .4byte pokemonanimfunc_34
- .4byte pokemonanimfunc_35
- .4byte pokemonanimfunc_36
- .4byte pokemonanimfunc_37
- .4byte pokemonanimfunc_38
- .4byte pokemonanimfunc_39
- .4byte pokemonanimfunc_3A
- .4byte pokemonanimfunc_3B
- .4byte pokemonanimfunc_3C
- .4byte pokemonanimfunc_3D
- .4byte pokemonanimfunc_3E
- .4byte pokemonanimfunc_3F
- .4byte pokemonanimfunc_40
- .4byte pokemonanimfunc_41
- .4byte pokemonanimfunc_42
- .4byte pokemonanimfunc_43
- .4byte pokemonanimfunc_44
- .4byte pokemonanimfunc_45
- .4byte pokemonanimfunc_46
- .4byte pokemonanimfunc_47
- .4byte pokemonanimfunc_48
- .4byte pokemonanimfunc_49
- .4byte pokemonanimfunc_4A
- .4byte pokemonanimfunc_4B
- .4byte pokemonanimfunc_4C
- .4byte pokemonanimfunc_4D
- .4byte pokemonanimfunc_4E
- .4byte pokemonanimfunc_4F
- .4byte pokemonanimfunc_50
- .4byte pokemonanimfunc_51
- .4byte pokemonanimfunc_52
- .4byte pokemonanimfunc_53
- .4byte pokemonanimfunc_54
- .4byte pokemonanimfunc_55
- .4byte pokemonanimfunc_56
- .4byte pokemonanimfunc_57
- .4byte pokemonanimfunc_58
- .4byte pokemonanimfunc_59
- .4byte pokemonanimfunc_5A
- .4byte pokemonanimfunc_5B
- .4byte pokemonanimfunc_5C
- .4byte pokemonanimfunc_5D
- .4byte pokemonanimfunc_5E
- .4byte pokemonanimfunc_5F
- .4byte pokemonanimfunc_60
- .4byte pokemonanimfunc_61
- .4byte pokemonanimfunc_62
- .4byte pokemonanimfunc_63
- .4byte pokemonanimfunc_64
- .4byte pokemonanimfunc_65
- .4byte pokemonanimfunc_66
- .4byte pokemonanimfunc_67
- .4byte pokemonanimfunc_68
- .4byte pokemonanimfunc_69
- .4byte pokemonanimfunc_6A
- .4byte pokemonanimfunc_6B
- .4byte pokemonanimfunc_6C
- .4byte pokemonanimfunc_6D
- .4byte pokemonanimfunc_6E
- .4byte pokemonanimfunc_6F
- .4byte pokemonanimfunc_70
- .4byte pokemonanimfunc_71
- .4byte pokemonanimfunc_72
- .4byte pokemonanimfunc_73
- .4byte pokemonanimfunc_74
- .4byte pokemonanimfunc_75
- .4byte pokemonanimfunc_76
- .4byte pokemonanimfunc_77
- .4byte pokemonanimfunc_78
- .4byte pokemonanimfunc_79
- .4byte pokemonanimfunc_7A
- .4byte pokemonanimfunc_7B
- .4byte pokemonanimfunc_7C
- .4byte pokemonanimfunc_7D
- .4byte pokemonanimfunc_7E
- .4byte pokemonanimfunc_7F
- .4byte pokemonanimfunc_80
- .4byte pokemonanimfunc_81
- .4byte pokemonanimfunc_82
- .4byte pokemonanimfunc_83
- .4byte pokemonanimfunc_84
- .4byte pokemonanimfunc_85
- .4byte pokemonanimfunc_86
- .4byte pokemonanimfunc_87
- .4byte pokemonanimfunc_88
- .4byte pokemonanimfunc_89
- .4byte pokemonanimfunc_8A
- .4byte pokemonanimfunc_8B
- .4byte pokemonanimfunc_8C
- .4byte pokemonanimfunc_8D
- .4byte pokemonanimfunc_8E
- .4byte pokemonanimfunc_8F
- .4byte pokemonanimfunc_90
- .4byte pokemonanimfunc_91
- .4byte pokemonanimfunc_92
- .4byte pokemonanimfunc_93
- .4byte pokemonanimfunc_94
- .4byte pokemonanimfunc_95
- .4byte pokemonanimfunc_96
-
-gUnknown_0860ACE4:: @ 860ACE4
- .byte 0x60, 0x5f, 0x02, 0x5e, 0x03, 0x46, 0x6d, 0x3e, 0x6e, 0x6f, 0x70, 0x3f, 0x71, 0x13, 0x72, 0x6c, 0x6b, 0x3a, 0x64, 0x14, 0x4f, 0x5d, 0x0f, 0x4c, 0x61, 0x57, 0x58, 0x67, 0x66, 0x59, 0x74, 0x73
- .byte 0x5a, 0x75, 0x76, 0x5b, 0x77, 0x78, 0x65, 0x63, 0x5c, 0x62, 0x6a, 0x69, 0x68, 0x7b, 0x7a, 0x79, 0x7e, 0x7d, 0x7c, 0x81, 0x80, 0x7f, 0x84, 0x82, 0x83, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b
- .byte 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96
-
-gUnknown_0860AD2F:: @ 860AD2F
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01
-
- .align 2
-gSpriteAffineAnim_860AD48:: @ 860AD48
- obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
- obj_rot_scal_anim_end
-
- .align 2
-gSpriteAffineAnim_860AD58:: @ 860AD58
- obj_rot_scal_anim_frame -0x100, 0x100, 0, 0
- obj_rot_scal_anim_end
-
- .align 2
-gSpriteAffineAnimTable_860AD68:: @ 860AD68
- .4byte gSpriteAffineAnim_860AD48
- .4byte gSpriteAffineAnim_860AD58
-
-gUnknown_0860AD70:: @ 860AD70
- .byte 0xff, 0xff, 0x06, 0x02, 0x00, 0x06, 0xfe, 0x02, 0x06, 0x02, 0x00, 0x06, 0xfe, 0xfe, 0x06, 0x02, 0x00, 0x06, 0xfe, 0x02, 0x06, 0x02, 0x00, 0x06, 0xff, 0xff, 0x06, 0x00, 0x00, 0x00
-
-gUnknown_0860AD8E:: @ 860AD8E
- .byte 0x00, 0x08, 0x08, 0x08, 0xf8, 0x0c, 0xf8, 0x08, 0x0c, 0x08, 0xf8, 0x0c, 0xf8, 0x08, 0x0c, 0x08, 0xf8, 0x0c, 0xf8, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x08, 0xf8, 0x18, 0xf8, 0x08
- .byte 0x18, 0x08, 0xf8, 0x18, 0xf8, 0x08, 0x18, 0x08, 0xf8, 0x18, 0xf8, 0x00, 0x18, 0x00, 0x00, 0x00
-
-gUnknown_0860ADBE:: @ 860ADBE
- .byte 0x01, 0x01, 0x0c, 0xfe, 0x00, 0x0c, 0x01, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_0860ADCC:: @ 860ADCC
- .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
- .byte 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
- .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
- .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
- .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00
-
-gUnknown_0860AE1C:: @ 860AE1C
- .byte 0x00, 0x05, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
- .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00
-
-gUnknown_0860AE54:: @ 860AE54
- .byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
- .byte 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
- .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00
-
- .align 2
-gUnknown_0860AE7C:: @ 860AE7C
- .4byte gUnknown_0860ADCC
- .4byte gUnknown_0860AE1C
- .4byte gUnknown_0860AE54
-
- .align 1
-gUnknown_0860AE88:: @ 860AE88
- .2byte 0x001f, 0x03e0, 0x7c00, 0x0000
diff --git a/data/reset_rtc_screen.s b/data/reset_rtc_screen.s
deleted file mode 100644
index 6d3964da8..000000000
--- a/data/reset_rtc_screen.s
+++ /dev/null
@@ -1,78 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
-gUnknown_08510404:: @ 8510404 struct BgTemplate
- .4byte 0x000001f0
-
- .align 2
-gUnknown_08510408:: @ 8510408
- window_template 0x00, 0x01, 0x01, 0x13, 0x09, 0x0f, 0x0155
- window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x00e9
- null_window_template
-
- .align 2
-gUnknown_08510420:: @ 8510420
- window_template 0x00, 0x04, 0x09, 0x15, 0x02, 0x0f, 0x00bf
-
- .align 2
-gUnknown_08510428:: @ 8510428
- .byte 3, 0, 1, 0, 15, 39, 0, 2, 0, 0, 0, 0
- .byte 4, 0, 0, 0, 23, 0, 1, 3, 0, 0, 0, 0
- .byte 5, 0, 0, 0, 59, 0, 2, 4, 0, 0, 0, 0
- .byte 6, 0, 0, 0, 59, 0, 3, 5, 0, 0, 0, 0
- .byte 7, 0, 0, 0, 0, 0, 4, 0, 6, 0, 0, 0
-
- .align 2
-gOamData_08510464:: @ 8510464
- .2byte 0x0000
- .2byte 0x0000
- .2byte 0x0000
-
- .align 2
-gResetRtcScreen_DownArrowGfx:: @ 851046C
- .incbin "graphics/misc/reset_rtc_screen_downarrow.4bpp"
-
- .align 2
-gResetRtcScreen_RightArrowGfx:: @ 851048C
- .incbin "graphics/misc/reset_rtc_screen_rightarrow.4bpp"
-
- .align 2
-gResetRtcScreen_ArrowPal: @ 85104AC
- .incbin "graphics/misc/reset_rtc_screen_arrow.gbapal"
-
- .align 2
-gSpriteImageTable_85104B4:: @ 85104B4
- obj_frame_tiles gResetRtcScreen_DownArrowGfx, 0x20
- obj_frame_tiles gResetRtcScreen_RightArrowGfx, 0x20
-
- .align 2
-gUnknown_085104C4:: @ 85104C4
- obj_pal gResetRtcScreen_ArrowPal, 0x1000
-
- .align 2
-gSpriteAnim_85104CC:: @ 85104CC
- obj_image_anim_frame 0, 30
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_85104D4: @ 85104D4
- obj_image_anim_frame 0, 30, OBJ_IMAGE_ANIM_V_FLIP
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnim_85104DC:: @ 85104DC
- obj_image_anim_frame 1, 30
- obj_image_anim_jump 0
-
- .align 2
-gSpriteAnimTable_85104E4:: @ 85104E4
- .4byte gSpriteAnim_85104CC
- .4byte gSpriteAnim_85104D4
- .4byte gSpriteAnim_85104DC
-
- .align 2
-gSpriteTemplate_85104F0:: @ 85104F0
- spr_template 0xFFFF, 0x1000, gOamData_08510464, gSpriteAnimTable_85104E4, gSpriteImageTable_85104B4, gDummySpriteAffineAnimTable, SpriteCallbackDummy
diff --git a/data/save.s b/data/save.s
deleted file mode 100644
index 23a8d3928..000000000
--- a/data/save.s
+++ /dev/null
@@ -1,20 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-gSaveSectionOffsets:: @ 85CDC00
- .2byte 0, 0xF2C
- .2byte 0, 0xF80
- .2byte 0xF80, 0xF80
- .2byte 0x1F00, 0xF80
- .2byte 0x2E80, 0xF08
- .2byte 0, 0xF80
- .2byte 0xF80, 0xF80
- .2byte 0x1F00, 0xF80
- .2byte 0x2E80, 0xF80
- .2byte 0x3E00, 0xF80
- .2byte 0x4D80, 0xF80
- .2byte 0x5D00, 0xF80
- .2byte 0x6C80, 0xF80
- .2byte 0x7C00, 0x7D0
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index bcd92d1c2..b8aef7c3d 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -231,7 +231,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D
end
OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5
- special sub_80097E8
+ special CloseLink
setvar VAR_0x4087, 0
compare VAR_0x8007, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
@@ -254,7 +254,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7
end
OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF
- special sub_80097E8
+ special CloseLink
setvar VAR_0x4087, 0
compare VAR_0x8007, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
@@ -276,7 +276,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D2C:: @ 8276D2C
end
OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44
- special sub_80097E8
+ special CloseLink
setvar VAR_0x4087, 0
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F
waitmovement 0
@@ -501,25 +501,25 @@ OldaleTown_PokemonCenter_2F_EventScript_277046:: @ 8277046
end
OldaleTown_PokemonCenter_2F_EventScript_277072:: @ 8277072
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_27833D, 4
goto OldaleTown_PokemonCenter_2F_EventScript_2770A5
end
OldaleTown_PokemonCenter_2F_EventScript_277083:: @ 8277083
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_278307, 4
goto OldaleTown_PokemonCenter_2F_EventScript_2770A5
end
OldaleTown_PokemonCenter_2F_EventScript_277094:: @ 8277094
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_2782D1, 4
goto OldaleTown_PokemonCenter_2F_EventScript_2770A5
end
OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_278372, 4
release
end
@@ -658,45 +658,45 @@ OldaleTown_PokemonCenter_2F_EventScript_27724C:: @ 827724C
end
OldaleTown_PokemonCenter_2F_EventScript_2772AB:: @ 82772AB
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_278565, 4
release
end
OldaleTown_PokemonCenter_2F_EventScript_2772B8:: @ 82772B8
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_2785C9, 4
release
end
BattleFrontier_BattleTowerLobby_EventScript_2772C5:: @ 82772C5
OldaleTown_PokemonCenter_2F_EventScript_2772C5:: @ 82772C5
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_27821C, 4
release
end
BattleFrontier_BattleTowerLobby_EventScript_2772D2:: @ 82772D2
OldaleTown_PokemonCenter_2F_EventScript_2772D2:: @ 82772D2
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_2781C7, 4
release
end
OldaleTown_PokemonCenter_2F_EventScript_2772DF:: @ 82772DF
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_278255, 4
release
end
OldaleTown_PokemonCenter_2F_EventScript_2772EC:: @ 82772EC
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_278291, 4
release
end
MossdeepCity_GameCorner_1F_EventScript_2772F9:: @ 82772F9
- special sub_80097E8
+ special CloseLink
msgbox MossdeepCity_GameCorner_1F_Text_278D51, 4
release
end
@@ -708,19 +708,19 @@ OldaleTown_PokemonCenter_2F_EventScript_277306:: @ 8277306
end
OldaleTown_PokemonCenter_2F_EventScript_27730E:: @ 827730E
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_2782A8, 4
release
end
OldaleTown_PokemonCenter_2F_EventScript_27731B:: @ 827731B
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_2785E9, 4
release
end
OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328
- special sub_80097E8
+ special CloseLink
msgbox OldaleTown_PokemonCenter_2F_Text_278651, 4
release
end
diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
index 7c0762417..def3dd122 100644
--- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
+++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
@@ -725,7 +725,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3
special copy_player_party_from_sav1
BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6
- special sub_80097E8
+ special CloseLink
msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4
BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1
@@ -951,7 +951,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
end
BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327
- special sub_80097E8
+ special CloseLink
compare VAR_0x8005, 3
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F
msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4
@@ -966,13 +966,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F
BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351
msgbox BattleFrontier_BattleTowerLobby_Text_241240, 4
- special sub_80097E8
+ special CloseLink
msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, 4
release
end
BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366
- special sub_80097E8
+ special CloseLink
compare VAR_0x8005, 0
call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394
compare VAR_0x8005, 1
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 3b7d6a2f2..beb96e171 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -709,7 +709,7 @@ LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971
end
LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F
- special sub_80097E8
+ special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4
release
end
@@ -811,13 +811,13 @@ LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1
end
LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF
- special sub_80097E8
+ special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27821C, 4
release
end
LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC
- special sub_80097E8
+ special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27C879, 4
release
end
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 0f705c841..39cca8244 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -655,25 +655,25 @@ LilycoveCity_ContestLobby_EventScript_29416C:: @ 829416C
end
LilycoveCity_ContestLobby_EventScript_294176:: @ 8294176
- special sub_80097E8
+ special CloseLink
msgbox LilycoveCity_ContestLobby_Text_2781C7, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_294183:: @ 8294183
- special sub_80097E8
+ special CloseLink
msgbox LilycoveCity_ContestLobby_Text_278255, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_294190:: @ 8294190
- special sub_80097E8
+ special CloseLink
msgbox gUnknown_08272D9C, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_29419D:: @ 829419D
- special sub_80097E8
+ special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27821C, 4
releaseall
end
diff --git a/data/specials.inc b/data/specials.inc
index 332c58bca..ac4a47b69 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -40,7 +40,7 @@ gSpecials:: @ 81DBA64
def_special sub_80B2E4C
def_special sub_80B2E74
def_special sub_80B2EA8
- def_special sub_80097E8
+ def_special CloseLink
def_special sub_80B3968
def_special sub_80B3924
def_special nullsub_37
diff --git a/data/time_events.s b/data/time_events.s
deleted file mode 100644
index 7a543fff5..000000000
--- a/data/time_events.s
+++ /dev/null
@@ -1,7 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-gUnknown_085B2B44:: @ 85B2B44
- .byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01
diff --git a/data/title_screen.s b/data/title_screen.s
deleted file mode 100644
index b07464ce9..000000000
--- a/data/title_screen.s
+++ /dev/null
@@ -1,163 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
- .incbin "graphics/title_screen/unk_853EF78.gbapal"
-
- .align 2
-gTitleScreenRayquazaGfx:: @ 853F058
- .incbin "graphics/title_screen/rayquaza.4bpp.lz"
-
- .align 2
-gTitleScreenRayquazaTilemap:: @ 853F83C
- .incbin "graphics/title_screen/rayquaza.bin.lz"
-
- .align 2
-gTitleScreenLogoShineGfx:: @ 853FB3C
- .incbin "graphics/title_screen/logo_shine.4bpp.lz"
-
- .align 2
-gTitleScreenCloudsGfx:: @ 853FC8C
- .incbin "graphics/title_screen/clouds.4bpp.lz"
-
- .align 2
-gUnknown_0853FF70:: @ 853FF70
- .2byte 0x0010, 0x0110, 0x0210, 0x0310, 0x0410, 0x0510, 0x0610, 0x0710
- .2byte 0x0810, 0x0910, 0x0a10, 0x0b10, 0x0c10, 0x0d10, 0x0e10, 0x0f10
- .2byte 0x100f, 0x100e, 0x100d, 0x100c, 0x100b, 0x100a, 0x1009, 0x1008
- .2byte 0x1007, 0x1006, 0x1005, 0x1004, 0x1003, 0x1002, 0x1001, 0x1000
- .2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000
- .2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000
- .2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000
- .2byte 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000
-
- .align 2
-gUnknown_0853FFF0:: @ 853FFF0
- .byte 0xa0, 0x60, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
-
- .align 2
-gUnknown_0853FFF8:: @ 853FFF8
- .byte 0xa0, 0x60, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
-
- .align 2
-gUnknown_08540000:: @ 8540000
- .2byte 0x0000, 0x001e, 0xffff, 0x0000
-
- .align 2
-gUnknown_08540008:: @ 8540008
- .2byte 0x0040, 0x001e, 0xffff, 0x0000
-
- .align 2
-gUnknown_08540010:: @ 8540010
- .4byte gUnknown_08540000
-
- .align 2
-gUnknown_08540014:: @ 8540014
- .4byte gUnknown_08540008
-
- .align 2
-gUnknown_08540018:: @ 8540018
- spr_template 0x03e8, 0x03e8, gUnknown_0853FFF0, gUnknown_08540010, NULL, gDummySpriteAffineAnimTable, sub_80AA40C
-
- .align 2
-gUnknown_08540030:: @ 8540030
- spr_template 0x03e8, 0x03e8, gUnknown_0853FFF8, gUnknown_08540014, NULL, gDummySpriteAffineAnimTable, sub_80AA474
-
- .align 2
-gUnknown_08540048:: @ 8540048
- obj_tiles gTitleScreenEmeraldVersionGfx, 0x1000, 0x03e8
- null_obj_tiles
-
- .align 2
-gUnknown_08540058:: @ 8540058
- .byte 0xa0, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
-
- .align 2
-gUnknown_08540060:: @ 8540060
- .2byte 0x0001, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_08540068:: @ 8540068
- .2byte 0x0005, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_08540070:: @ 8540070
- .2byte 0x0009, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_08540078:: @ 8540078
- .2byte 0x000d, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_08540080:: @ 8540080
- .2byte 0x0011, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_08540088:: @ 8540088
- .2byte 0x0015, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_08540090:: @ 8540090
- .2byte 0x0019, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_08540098:: @ 8540098
- .2byte 0x001d, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_085400A0:: @ 85400A0
- .2byte 0x0021, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_085400A8:: @ 85400A8
- .2byte 0x0025, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_085400B0:: @ 85400B0
- .4byte gUnknown_08540060
- .4byte gUnknown_08540068
- .4byte gUnknown_08540070
- .4byte gUnknown_08540078
- .4byte gUnknown_08540080
- .4byte gUnknown_08540088
- .4byte gUnknown_08540090
- .4byte gUnknown_08540098
- .4byte gUnknown_085400A0
- .4byte gUnknown_085400A8
-
- .align 2
-gUnknown_085400D8:: @ 85400D8
- spr_template 0x03e9, 0x03e9, gUnknown_08540058, gUnknown_085400B0, NULL, gDummySpriteAffineAnimTable, sub_80AA4B4
-
- .align 2
-gUnknown_085400F0:: @ 85400F0
- obj_tiles gTitleScreenPressStartGfx, 0x0520, 0x03e9
- null_obj_tiles
-
- .align 2
-gUnknown_08540100:: @ 8540100
- obj_pal gTitleScreenPressStartPal, 0x03e9
- null_obj_pal
-
- .align 2
-gUnknown_08540110:: @ 8540110
- .byte 0xa0, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
-
- .align 2
-gUnknown_08540118:: @ 8540118
- .2byte 0x0000, 0x0004, 0xffff, 0x0000
-
- .align 2
-gUnknown_08540120:: @ 8540120
- .4byte gUnknown_08540118
-
- .align 2
-gUnknown_08540124:: @ 8540124
- spr_template 0x03ea, 0x03e9, gUnknown_08540110, gUnknown_08540120, NULL, gDummySpriteAffineAnimTable, title_screen_logo_shine_obj_callback_type1
-
- .align 2
-gUnknown_0854013C:: @ 854013C
- obj_tiles gTitleScreenLogoShineGfx, 0x0800, 0x03ea
- null_obj_tiles
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 23:32:15 +0000