Merge remote-tracking branch 'upstream/master' into misc_docs
# Conflicts: # src/field_weather_effect.c
This commit is contained in:
Marcus Huderle
+43
-43
@@ -1515,7 +1515,7 @@ Move_VINE_WHIP:
|
||||
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
|
||||
delay 6
|
||||
playsewithpan SE_W010, SOUND_PAN_TARGET
|
||||
createsprite gUnknown_085928E8, ANIM_TARGET, 2, 0, 0
|
||||
createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0
|
||||
delay 6
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1
|
||||
end
|
||||
@@ -1656,12 +1656,12 @@ Explosion1:
|
||||
Move_DEFENSE_CURL:
|
||||
loadspritegfx ANIM_TAG_ECLIPSING_ORB
|
||||
loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3
|
||||
createvisualtask sub_811489C, 5, 0, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
|
||||
createvisualtask sub_815B338, 5
|
||||
waitforvisualfinish
|
||||
createsprite gUnknown_085CE338, ANIM_ATTACKER, 2, 0, 6, 0, 1
|
||||
waitforvisualfinish
|
||||
createvisualtask sub_811489C, 5, 0, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
@@ -2003,7 +2003,7 @@ Move_ATTRACT:
|
||||
createsprite gBattleAnimSpriteTemplate_85939B8, ANIM_TARGET, 3, -384, -31
|
||||
waitforvisualfinish
|
||||
waitplaysewithpan SE_W213B, 0, 15
|
||||
createvisualtask sub_81062E8, 5
|
||||
createvisualtask AnimTask_HeartsBackground, 5
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 16, 256, 0
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 224, 240, 15
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 126, 272, 30
|
||||
@@ -2012,7 +2012,7 @@ Move_ATTRACT:
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 40, 256, 75
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 112, 256, 90
|
||||
createsprite gUnknown_085939D0, ANIM_ATTACKER, 40, 200, 272, 90
|
||||
delay 0x4B
|
||||
delay 75
|
||||
createvisualtask sub_8115A04, 2, 4, 4, 4, 0, 10, RGB(31, 25, 27)
|
||||
end
|
||||
|
||||
@@ -3220,13 +3220,13 @@ EndureEffect:
|
||||
Move_CHARM:
|
||||
loadspritegfx ANIM_TAG_MAGENTA_HEART
|
||||
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
delay 15
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
delay 15
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
waitforvisualfinish
|
||||
end
|
||||
@@ -4358,7 +4358,7 @@ Move_AERIAL_ACE:
|
||||
|
||||
Move_IRON_DEFENSE:
|
||||
loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 0, 0, 0
|
||||
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
|
||||
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0
|
||||
waitforvisualfinish
|
||||
end
|
||||
@@ -4393,13 +4393,13 @@ Move_COVET:
|
||||
loadspritegfx ANIM_TAG_MAGENTA_HEART
|
||||
loadspritegfx ANIM_TAG_ITEM_BAG
|
||||
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
delay 15
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
delay 15
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
|
||||
@@ -4570,7 +4570,7 @@ Move_SHOCK_WAVE:
|
||||
|
||||
Move_HARDEN:
|
||||
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 0, 0, 0
|
||||
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
@@ -5347,7 +5347,7 @@ Move_ICE_BEAM:
|
||||
loadspritegfx ANIM_TAG_ICE_CRYSTALS
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
|
||||
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
|
||||
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20
|
||||
createsprite gUnknown_08595B2C, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20
|
||||
delay 1
|
||||
@@ -5403,7 +5403,7 @@ Move_AURORA_BEAM:
|
||||
call AuroraBeam1
|
||||
call AuroraBeam1
|
||||
setarg 7, -1
|
||||
createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
|
||||
createsoundtask sub_8158C58, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
|
||||
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1
|
||||
call AuroraBeam1
|
||||
call AuroraBeam1
|
||||
@@ -7123,7 +7123,7 @@ Move_PSYBEAM:
|
||||
loadspritegfx ANIM_TAG_GOLD_RING
|
||||
playsewithpan SE_W060, SOUND_PAN_ATTACKER
|
||||
call SetPsychicBackground
|
||||
createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
|
||||
createsoundtask sub_8158C58, SE_W060B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
|
||||
call Psybeam1
|
||||
call Psybeam1
|
||||
createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET
|
||||
@@ -7169,7 +7169,7 @@ Move_PSYWAVE:
|
||||
playsewithpan SE_W060, SOUND_PAN_ATTACKER
|
||||
call SetPsychicBackground
|
||||
createvisualtask sub_81076C8, 5, 100
|
||||
createsoundtask sub_8158C58, 203, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
|
||||
createsoundtask sub_8158C58, SE_W100, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
|
||||
call Psywave1
|
||||
call Psywave1
|
||||
createvisualtask sub_8115A04, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31)
|
||||
@@ -7213,7 +7213,7 @@ Move_STEEL_WING:
|
||||
loadspritegfx ANIM_TAG_GUST
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 0, 0, 0
|
||||
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
|
||||
waitforvisualfinish
|
||||
monbg ANIM_DEF_PARTNER
|
||||
monbgprio_28 ANIM_TARGET
|
||||
@@ -7239,7 +7239,7 @@ Move_STEEL_WING:
|
||||
Move_IRON_TAIL:
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 1, 0, 0
|
||||
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0
|
||||
waitforvisualfinish
|
||||
monbg ANIM_TARGET
|
||||
setalpha 12, 8
|
||||
@@ -7249,7 +7249,7 @@ Move_IRON_TAIL:
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
|
||||
playsewithpan SE_W233B, SOUND_PAN_TARGET
|
||||
waitforvisualfinish
|
||||
createvisualtask sub_811489C, 5, 0, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
clearmonbg ANIM_TARGET
|
||||
blendoff
|
||||
waitforvisualfinish
|
||||
@@ -7259,7 +7259,7 @@ Move_POISON_TAIL:
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
loadspritegfx ANIM_TAG_POISON_BUBBLE
|
||||
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23)
|
||||
createvisualtask AnimTask_MetallicShine, 5, 1, 1, RGB(24, 6, 23)
|
||||
waitforvisualfinish
|
||||
monbg ANIM_TARGET
|
||||
setalpha 12, 8
|
||||
@@ -7269,7 +7269,7 @@ Move_POISON_TAIL:
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
|
||||
playsewithpan SE_W233B, SOUND_PAN_TARGET
|
||||
waitforvisualfinish
|
||||
createvisualtask sub_811489C, 5, 0, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
clearmonbg ANIM_TARGET
|
||||
blendoff
|
||||
call PoisonBubblesEffect
|
||||
@@ -7279,7 +7279,7 @@ Move_POISON_TAIL:
|
||||
Move_METAL_CLAW:
|
||||
loadspritegfx ANIM_TAG_CLAW_SLASH
|
||||
loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
|
||||
createvisualtask sub_81144F8, 5, 0, 0, 0
|
||||
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
|
||||
waitforvisualfinish
|
||||
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
|
||||
delay 2
|
||||
@@ -7346,8 +7346,8 @@ Move_SHADOW_BALL:
|
||||
fadetobg BG_GHOST
|
||||
waitbgfadein
|
||||
delay 15
|
||||
createsoundtask sub_8158C58, 168, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
|
||||
createsprite gUnknown_08596D58, ANIM_TARGET, 2, 16, 16, 8
|
||||
createsoundtask sub_8158C58, SE_W054, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
|
||||
createsprite gShadowBallSpriteTemplate, ANIM_TARGET, 2, 16, 16, 8
|
||||
waitforvisualfinish
|
||||
playsewithpan SE_W028, SOUND_PAN_TARGET
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1
|
||||
@@ -7459,7 +7459,7 @@ Move_STRING_SHOT:
|
||||
end
|
||||
|
||||
StringShot1:
|
||||
createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 1
|
||||
createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 1
|
||||
delay 1
|
||||
return
|
||||
|
||||
@@ -7488,7 +7488,7 @@ Move_SPIDER_WEB:
|
||||
call SpiderWeb1
|
||||
waitforvisualfinish
|
||||
playsewithpan SE_W081B, SOUND_PAN_TARGET
|
||||
createsprite gUnknown_08596A2C, ANIM_ATTACKER, 2
|
||||
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_DEF_PARTNER
|
||||
delay 1
|
||||
@@ -7496,7 +7496,7 @@ Move_SPIDER_WEB:
|
||||
end
|
||||
|
||||
SpiderWeb1:
|
||||
createsprite gUnknown_085969E0, ANIM_TARGET, 2, 20, 0, 512, 20, 0
|
||||
createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 0
|
||||
delay 1
|
||||
return
|
||||
|
||||
@@ -7941,16 +7941,16 @@ Move_PERISH_SONG:
|
||||
panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
|
||||
delay 80
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
|
||||
createvisualtask sub_811489C, 5, 4, 0
|
||||
createvisualtask sub_811489C, 5, 5, 0
|
||||
createvisualtask sub_811489C, 5, 6, 0
|
||||
createvisualtask sub_811489C, 5, 7, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 0
|
||||
delay 100
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK
|
||||
createvisualtask sub_811489C, 5, 4, 1
|
||||
createvisualtask sub_811489C, 5, 5, 1
|
||||
createvisualtask sub_811489C, 5, 6, 1
|
||||
createvisualtask sub_811489C, 5, 7, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 1
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
@@ -8019,7 +8019,7 @@ Move_TRI_ATTACK:
|
||||
delay 20
|
||||
playsewithpan SE_W161, SOUND_PAN_ATTACKER
|
||||
delay 20
|
||||
createsoundtask sub_8158C58, 220, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
|
||||
createsoundtask sub_8158C58, SE_W161, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
|
||||
waitforvisualfinish
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK
|
||||
delay 16
|
||||
@@ -8356,7 +8356,7 @@ Move_HYPER_BEAM:
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1
|
||||
waitforvisualfinish
|
||||
delay 30
|
||||
createsoundtask sub_8158C58, 247, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
|
||||
createsoundtask sub_8158C58, SE_W063B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
|
||||
createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0
|
||||
call HyperBeam1
|
||||
@@ -9570,7 +9570,7 @@ Move_DOOM_DESIRE:
|
||||
createvisualtask sub_8114960, 2
|
||||
delay 1
|
||||
monbg ANIM_ATK_PARTNER
|
||||
createvisualtask sub_811489C, 5, 1, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 0
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
setalpha 8, 8
|
||||
@@ -9578,7 +9578,7 @@ Move_DOOM_DESIRE:
|
||||
createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
|
||||
waitforvisualfinish
|
||||
delay 20
|
||||
createvisualtask sub_811489C, 5, 1, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 1
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_ATK_PARTNER
|
||||
@@ -10237,13 +10237,13 @@ Burn1:
|
||||
Status_Infatuation:
|
||||
loadspritegfx ANIM_TAG_MAGENTA_HEART
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
|
||||
delay 15
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, -20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
|
||||
delay 15
|
||||
playsewithpan SE_W204, SOUND_PAN_ATTACKER
|
||||
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 20, 20
|
||||
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
|
||||
end
|
||||
|
||||
Status_Sleep:
|
||||
|
||||
-412
@@ -1,412 +0,0 @@
|
||||
#include "constants/species.h"
|
||||
#include "constants/moves.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2, 0
|
||||
|
||||
gUnknown_08587A6C:: @ 8587A6C
|
||||
.byte 0x24, 0x4c, 0x74, 0x9c
|
||||
|
||||
gUnknown_08587A70:: @ 8587A70
|
||||
.byte 0x24, 0x4c, 0x74, 0x9c
|
||||
|
||||
.align 2
|
||||
gUnknown_08587A74:: @ 8587A74
|
||||
obj_tiles gTiles_8C19450, 0x0020, 0x4e20
|
||||
|
||||
.align 2
|
||||
gOamData_8587A7C:: @ 8587A7C
|
||||
.2byte 0x0000
|
||||
.2byte 0x0000
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8587A84:: @ 8587A84
|
||||
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8587A94:: @ 8587A94
|
||||
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
|
||||
obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, -20, 20
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_8587AAC:: @ 8587AAC
|
||||
obj_rot_scal_anim_frame 0x38, 0x38, 0, 0
|
||||
obj_rot_scal_anim_frame 0xA, 0xA, 20, 20
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnimTable_8587AC4:: @ 8587AC4
|
||||
.4byte gSpriteAffineAnim_8587A84
|
||||
.4byte gSpriteAffineAnim_8587A94
|
||||
.4byte gSpriteAffineAnim_8587AAC
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587AD0:: @ 8587AD0
|
||||
spr_template 0x4e20, 0xabe0, gOamData_8587A7C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8587AC4, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_08587AE8:: @ 8587AE8
|
||||
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e22
|
||||
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e23
|
||||
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e24
|
||||
obj_tiles gContestNextTurnGfx, 0x0100, 0x4e25
|
||||
|
||||
.align 2
|
||||
gUnknown_08587B08:: @ 8587B08
|
||||
obj_pal gContestPal, 0x4e22
|
||||
|
||||
.align 2
|
||||
gOamData_8587B10:: @ 8587B10
|
||||
.2byte 0x4000
|
||||
.2byte 0x4000
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587B18:: @ 8587B18
|
||||
spr_template 0x4e22, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
spr_template 0x4e23, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
spr_template 0x4e24, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
spr_template 0x4e25, 0x4e22, gOamData_8587B10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gSubspriteTable_8587B78:: @ 8587B78
|
||||
subsprite -28, -4, 0, 0, 32x8
|
||||
subsprite 4, -4, 0, 4, 32x8
|
||||
|
||||
.align 2
|
||||
gSubspriteTables_8587B80:: @ 8587B80
|
||||
.4byte 2, gSubspriteTable_8587B78
|
||||
|
||||
.align 2
|
||||
gUnknown_08587B88:: @ 8587B88
|
||||
obj_tiles gUnknown_08C19168, 0x0180, 0xabe1
|
||||
|
||||
.align 2
|
||||
gOamData_8587B90:: @ 8587B90
|
||||
.2byte 0x0000
|
||||
.2byte 0x4000
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587B98:: @ 8587B98
|
||||
spr_template 0xabe1, 0xabe0, gOamData_8587B90, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_08587BB0:: @ 8587BB0
|
||||
obj_tiles gContestApplauseGfx, 0x0400, 0xabe2
|
||||
|
||||
.align 2
|
||||
gUnknown_08587BB8:: @ 8587BB8
|
||||
obj_pal gContestPal, 0xabe2
|
||||
|
||||
.align 2
|
||||
gOamData_8587BC0:: @ 8587BC0
|
||||
.2byte 0x4000
|
||||
.2byte 0xC000
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587BC8:: @ 8587BC8
|
||||
spr_template 0xabe2, 0xabe2, gOamData_8587BC0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gOamData_8587BE0:: @ 8587BE0
|
||||
.2byte 0x0000
|
||||
.2byte 0xC000
|
||||
.2byte 0x2C00
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587BE8:: @ 8587BE8
|
||||
spr_template 0x4e21, 0x4e21, gOamData_8587BE0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_08587C00:: @ 8587C00
|
||||
obj_tiles gContestJudgeGfx, 0x0800, 0x4e21
|
||||
|
||||
.align 2
|
||||
gUnknown_08587C08:: @ 8587C08
|
||||
obj_tiles gContestJudgeSymbolsGfx, 0x0380, 0xabe0
|
||||
|
||||
.align 2
|
||||
gUnknown_08587C10:: @ 8587C10
|
||||
obj_pal gContest3Pal, 0xabe0
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_8587C18:: @ 8587C18
|
||||
spr_template 0xabe0, 0xabe0, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_08587C30:: @ 8587C30
|
||||
.incbin "graphics/unknown/unknown_587C30.gbapal"
|
||||
|
||||
@ 8587C50
|
||||
.include "data/text/contest_text_pointers.inc"
|
||||
|
||||
.align 2
|
||||
gUnknown_08587D5C:: @ 8587D5C
|
||||
.4byte gText_0827D5C1
|
||||
.4byte gText_0827D5DC
|
||||
.4byte gText_0827D600
|
||||
.4byte gText_0827D612
|
||||
.4byte gText_0827D612
|
||||
.4byte gText_0827D62D
|
||||
.4byte gText_0827D654
|
||||
.4byte gText_0827D67E
|
||||
.4byte gText_0827D69C
|
||||
.4byte gText_0827D6BA
|
||||
.4byte gText_0827D6E5
|
||||
.4byte gText_0827D706
|
||||
.4byte gText_0827D71D
|
||||
|
||||
.align 2
|
||||
gUnknown_08587D90:: @ 8587D90
|
||||
.4byte gText_0827D743
|
||||
.4byte gText_0827D764
|
||||
.4byte gText_0827D785
|
||||
.4byte gText_0827D7A5
|
||||
.4byte gText_0827D7C8
|
||||
.4byte gText_0827D7E8
|
||||
.4byte gText_0827D831
|
||||
.4byte gText_0827D855
|
||||
.4byte gText_0827D830
|
||||
.4byte gText_0827D872
|
||||
.4byte gText_0827D88F
|
||||
.4byte gText_0827D8B5
|
||||
.4byte gText_0827D8E4
|
||||
.4byte gText_0827D8FE
|
||||
.4byte gText_0827D926
|
||||
.4byte gText_0827D947
|
||||
.4byte gText_0827D961
|
||||
.4byte gText_0827D986
|
||||
.4byte gText_0827D9B1
|
||||
.4byte gText_0827D9D9
|
||||
.4byte gText_0827DA03
|
||||
.4byte gText_0827DA31
|
||||
.4byte gText_0827DA5B
|
||||
.4byte gText_0827DA85
|
||||
.4byte gText_0827DAB2
|
||||
.4byte gText_0827DADA
|
||||
.4byte gText_0827DB03
|
||||
.4byte gText_0827D830
|
||||
.4byte gText_0827D830
|
||||
.4byte gText_0827D830
|
||||
.4byte gText_0827DB1F
|
||||
.4byte gText_0827DB4E
|
||||
|
||||
.align 2
|
||||
gUnknown_08587E10:: @ 8587E10
|
||||
.4byte gText_827DB75
|
||||
.4byte gText_827DBB0
|
||||
.4byte gText_827DBE0
|
||||
.4byte gText_827DC0F
|
||||
.4byte gText_827DC45
|
||||
.4byte gText_827DC7C
|
||||
.4byte gText_827DCB4
|
||||
.4byte gText_827DCE7
|
||||
.4byte gText_827DD12
|
||||
.4byte gText_827DD3D
|
||||
.4byte gText_827DD6F
|
||||
.4byte gText_827DD8E
|
||||
.4byte gText_827DDC7
|
||||
.4byte gText_827DDF2
|
||||
.4byte gText_827DE14
|
||||
.4byte gText_827DE44
|
||||
.4byte gText_827DE73
|
||||
.4byte gText_827DEA5
|
||||
.4byte gText_827DED9
|
||||
.4byte gText_827DF02
|
||||
.4byte gText_827DF3A
|
||||
.4byte gText_827DF63
|
||||
.4byte gText_827DF8C
|
||||
.4byte gText_827DFB8
|
||||
.4byte gText_827DFE2
|
||||
.4byte gText_827E00C
|
||||
.4byte gText_827E02F
|
||||
.4byte gText_827E05F
|
||||
.4byte gText_827E08B
|
||||
.4byte gText_827E0B5
|
||||
.4byte gText_827E0DD
|
||||
.4byte gText_827E107
|
||||
.4byte gText_827E143
|
||||
.4byte gText_827E17F
|
||||
.4byte gText_827E1BB
|
||||
.4byte gText_827E1F3
|
||||
.4byte gText_827E220
|
||||
.4byte gText_827E254
|
||||
.4byte gText_827E289
|
||||
.4byte gText_827E2C5
|
||||
.4byte gText_0827E2FE
|
||||
.4byte gText_0827E32E
|
||||
.4byte gText_0827E35B
|
||||
.4byte gText_0827E38D
|
||||
.4byte gText_0827E3C1
|
||||
.4byte gText_0827E3EB
|
||||
.4byte gText_0827E416
|
||||
.4byte gText_0827E448
|
||||
.4byte gText_0827E473
|
||||
.4byte gText_0827E4A6
|
||||
.4byte gText_0827E4D5
|
||||
.4byte gText_0827E504
|
||||
.4byte gText_0827E531
|
||||
.4byte gText_0827E55A
|
||||
.4byte gText_0827E5B2
|
||||
.4byte gText_0827E5D0
|
||||
.4byte gText_0827E606
|
||||
.4byte gText_0827E638
|
||||
.4byte gText_0827E658
|
||||
.4byte gText_0827E68B
|
||||
.4byte gText_0827E6C4
|
||||
.4byte gText_0827E7BA
|
||||
|
||||
.align 2
|
||||
gUnknown_08587F08:: @ 8587F08
|
||||
.4byte gText_0827E85F
|
||||
.4byte gText_0827E868
|
||||
.4byte gText_0827E86F
|
||||
.4byte gText_0827E878
|
||||
.4byte gText_0827E882
|
||||
|
||||
.align 2
|
||||
gUnknown_08587F1C:: @ 8587F1C
|
||||
.4byte gText_0827E894
|
||||
.4byte gText_0827E89E
|
||||
.4byte gText_0827E8AA
|
||||
.4byte gText_0827E8B4
|
||||
.4byte gText_0827E8BF
|
||||
.4byte gText_0827E8CA
|
||||
|
||||
.align 2
|
||||
gUnknown_08587F34:: @ 8587F34
|
||||
.4byte 0x00000580, 0x000015e9, 0x000005c2, 0x000031a3
|
||||
|
||||
.align 2
|
||||
gUnknown_08587F44:: @ 8587F44
|
||||
window_template 0x00, 0x12, 0x00, 0x0c, 0x02, 0x0f, 0x0200
|
||||
window_template 0x00, 0x12, 0x05, 0x0c, 0x02, 0x0f, 0x0218
|
||||
window_template 0x00, 0x12, 0x0a, 0x0c, 0x02, 0x0f, 0x0230
|
||||
window_template 0x00, 0x12, 0x0f, 0x0c, 0x02, 0x0f, 0x0248
|
||||
window_template 0x00, 0x01, 0x0f, 0x11, 0x04, 0x0f, 0x0260
|
||||
window_template 0x00, 0x01, 0x1f, 0x09, 0x02, 0x0f, 0x02a4
|
||||
window_template 0x00, 0x01, 0x21, 0x09, 0x02, 0x0f, 0x02b6
|
||||
window_template 0x00, 0x01, 0x23, 0x09, 0x02, 0x0f, 0x02c8
|
||||
window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da
|
||||
window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec
|
||||
window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee
|
||||
null_window_template
|
||||
|
||||
.align 2
|
||||
gUnknown_08587FA4:: @ 8587FA4
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_ELECTRIKE
|
||||
.byte 2
|
||||
.string "ELECTER$", 11
|
||||
.string "EZRA$", 8
|
||||
.2byte 0
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_TROPIUS
|
||||
.byte 0
|
||||
.string "TROPO$", 11
|
||||
.string "ALLAN$", 8
|
||||
.2byte 2
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_XATU
|
||||
.byte 1
|
||||
.string "TUXA$", 11
|
||||
.string "JULIET$", 8
|
||||
.2byte 0
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_PLUSLE
|
||||
.byte 4
|
||||
.string "PULSE$", 11
|
||||
.string "BAILY$", 8
|
||||
.2byte 3
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_SHUPPET
|
||||
.byte 3
|
||||
.string "SHUPUP$", 11
|
||||
.string "MELANY$", 8
|
||||
.2byte 1
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_ZANGOOSE
|
||||
.byte 0
|
||||
.string "GOOZAN$", 11
|
||||
.string "HANA$", 8
|
||||
.2byte 2
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_LOUDRED
|
||||
.byte 1
|
||||
.string "LOUDED$", 11
|
||||
.string "BRYANT$", 8
|
||||
.2byte 2
|
||||
.4byte NULL, 0xFFFF
|
||||
.2byte SPECIES_DELCATTY
|
||||
.byte 2
|
||||
.string "KITSY$", 11
|
||||
.string "OMAR$", 8
|
||||
.2byte 3
|
||||
|
||||
|
||||
.align 2
|
||||
gContestOpponents:: @ 85880A4
|
||||
.include "data/contest_opponents.inc"
|
||||
|
||||
gUnknown_085898A4:: @ 85898A4
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
|
||||
.byte 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02
|
||||
|
||||
.align 2
|
||||
gUnknown_08589904:: @ 8589904
|
||||
obj_tiles gBlankGfxCompressed, 0x1000, 0x80e8
|
||||
obj_tiles gBlankGfxCompressed, 0x1000, 0x80e9
|
||||
obj_tiles gBlankGfxCompressed, 0x1000, 0x80ea
|
||||
obj_tiles gBlankGfxCompressed, 0x1000, 0x80eb
|
||||
|
||||
.align 2
|
||||
gUnknown_08589924:: @ 8589924 Yup this is super dangerous but that's how it is here
|
||||
obj_pal gHeap + 0x1A0A4, 0x80e8
|
||||
obj_pal gHeap + 0x1A0C4, 0x80e9
|
||||
obj_pal gHeap + 0x1A0E4, 0x80ea
|
||||
obj_pal gHeap + 0x1A104, 0x80eb
|
||||
|
||||
.align 2
|
||||
gOamData_8589944:: @ 8589944
|
||||
.2byte 0x0700
|
||||
.2byte 0xC000
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_858994C:: @ 858994C
|
||||
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnim_858995C:: @ 858995C
|
||||
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
|
||||
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
|
||||
obj_rot_scal_anim_frame 0x3, 0x3, 0, 15
|
||||
obj_rot_scal_anim_frame 0xFFFD, 0xFFFD, 0, 15
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
.align 2
|
||||
gSpriteAffineAnimTable_8589984:: @ 8589984
|
||||
.4byte gSpriteAffineAnim_858994C
|
||||
.4byte gSpriteAffineAnim_858995C
|
||||
|
||||
.align 2
|
||||
gSpriteTemplate_858998C:: @ 858998C
|
||||
spr_template 0x80e8, 0x80e8, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
|
||||
spr_template 0x80e9, 0x80e9, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
|
||||
spr_template 0x80ea, 0x80ea, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
|
||||
spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gContestExcitementTable:: @ 85899EC
|
||||
.2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -59,4 +59,4 @@
|
||||
],
|
||||
"coord_events": [],
|
||||
"bg_events": []
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5
|
||||
specialvar VAR_RESULT, sub_813B514
|
||||
compare VAR_RESULT, 1
|
||||
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB
|
||||
specialvar VAR_RESULT, sub_801B27C
|
||||
specialvar VAR_RESULT, ValidateReceivedWonderCard
|
||||
compare VAR_RESULT, 0
|
||||
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF
|
||||
goto OldaleTown_PokemonCenter_2F_EventScript_276AFB
|
||||
|
||||
+1
-1
@@ -434,7 +434,7 @@ gSpecials:: @ 81DBA64
|
||||
def_special sub_81B8958
|
||||
def_special sub_8018090
|
||||
def_special sub_813990C
|
||||
def_special sub_801B27C
|
||||
def_special ValidateReceivedWonderCard
|
||||
def_special HasAtLeastOneBerry
|
||||
def_special sub_802C920
|
||||
def_special sub_802E3C4
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
.align 2
|
||||
gContestEffectDescriptionPointers:: @ 8587C50
|
||||
.4byte gContestEffect00hDescription
|
||||
.4byte gContestEffect01hDescription
|
||||
.4byte gContestEffect02hDescription
|
||||
.4byte gContestEffect03hDescription
|
||||
.4byte gContestEffect04hDescription
|
||||
.4byte gContestEffect05hDescription
|
||||
.4byte gContestEffect06hDescription
|
||||
.4byte gContestEffect07hDescription
|
||||
.4byte gContestEffect08hDescription
|
||||
.4byte gContestEffect09hDescription
|
||||
.4byte gContestEffect0AhDescription
|
||||
.4byte gContestEffect0BhDescription
|
||||
.4byte gContestEffect0ChDescription
|
||||
.4byte gContestEffect0DhDescription
|
||||
.4byte gContestEffect0EhDescription
|
||||
.4byte gContestEffect0FhDescription
|
||||
.4byte gContestEffect10hDescription
|
||||
.4byte gContestEffect11hDescription
|
||||
.4byte gContestEffect12hDescription
|
||||
.4byte gContestEffect13hDescription
|
||||
.4byte gContestEffect14hDescription
|
||||
.4byte gContestEffect15hDescription
|
||||
.4byte gContestEffect16hDescription
|
||||
.4byte gContestEffect17hDescription
|
||||
.4byte gContestEffect18hDescription
|
||||
.4byte gContestEffect19hDescription
|
||||
.4byte gContestEffect1AhDescription
|
||||
.4byte gContestEffect1BhDescription
|
||||
.4byte gContestEffect1ChDescription
|
||||
.4byte gContestEffect1DhDescription
|
||||
.4byte gContestEffect1EhDescription
|
||||
.4byte gContestEffect1FhDescription
|
||||
.4byte gContestEffect20hDescription
|
||||
.4byte gContestEffect21hDescription
|
||||
.4byte gContestEffect22hDescription
|
||||
.4byte gContestEffect23hDescription
|
||||
.4byte gContestEffect24hDescription
|
||||
.4byte gContestEffect25hDescription
|
||||
.4byte gContestEffect26hDescription
|
||||
.4byte gContestEffect27hDescription
|
||||
.4byte gContestEffect28hDescription
|
||||
.4byte gContestEffect29hDescription
|
||||
.4byte gContestEffect2AhDescription
|
||||
.4byte gContestEffect2BhDescription
|
||||
.4byte gContestEffect2ChDescription
|
||||
.4byte gContestEffect2DhDescription
|
||||
.4byte gContestEffect2EhDescription
|
||||
.4byte gContestEffect2FhDescription
|
||||
|
||||
@ 8587D10
|
||||
@ Unreferenced array of pointers to move names.
|
||||
@ All of the moves except Conversion are combo starters, so this may have
|
||||
@ been an early list of combo starters.
|
||||
.align 2
|
||||
.4byte gUnusedContestMoveName0
|
||||
.4byte gUnusedContestMoveName0
|
||||
.4byte gUnusedContestMoveName1
|
||||
.4byte gUnusedContestMoveName2
|
||||
.4byte gUnusedContestMoveName3
|
||||
.4byte gUnusedContestMoveName4
|
||||
.4byte gUnusedContestMoveName5
|
||||
.4byte gUnusedContestMoveName6
|
||||
.4byte gUnusedContestMoveName7
|
||||
.4byte gUnusedContestMoveName8
|
||||
.4byte gUnusedContestMoveName9
|
||||
.4byte gUnusedContestMoveName10
|
||||
.4byte gUnusedContestMoveName11
|
||||
.4byte gUnusedContestMoveName12
|
||||
|
||||
.align 2
|
||||
gContestMoveTypeTextPointers:: @ 8587D48
|
||||
.4byte gContestMoveTypeCoolText
|
||||
.4byte gContestMoveTypeBeautyText
|
||||
.4byte gContestMoveTypeCuteText
|
||||
.4byte gContestMoveTypeSmartText
|
||||
.4byte gContestMoveTypeToughText
|
||||
@@ -1,246 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gUnkTextboxBorderPal:: @ 82F0548
|
||||
.incbin "graphics/interface/unk_textbox_border.gbapal"
|
||||
|
||||
.align 2
|
||||
gUnkTextboxBorderGfx:: @ 82F0568
|
||||
.incbin "graphics/interface/unk_textbox_border.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0598:: @ 82F0598 struct BgTemplate
|
||||
.4byte 0x000000f8
|
||||
.4byte 0x000010e1
|
||||
.4byte 0x000020d2
|
||||
.4byte 0x000030c3
|
||||
|
||||
.align 2
|
||||
gUnknown_082F05A8:: @ 82F05A8
|
||||
window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0c, 0x0013
|
||||
window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0c, 0x004f
|
||||
window_template 0x00, 0x00, 0x0f, 0x1e, 0x05, 0x0d, 0x004f
|
||||
null_window_template
|
||||
|
||||
.align 2
|
||||
gUnknown_082F05C8:: @ 82F05C8
|
||||
window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0c, 0x00e5
|
||||
|
||||
.align 2
|
||||
gUnknown_082F05D0:: @ 82F05D0
|
||||
window_template 0x00, 0x01, 0x0f, 0x14, 0x04, 0x0c, 0x00e5
|
||||
|
||||
.align 2
|
||||
gUnknown_082F05D8:: @ 82F05D8
|
||||
window_template 0x00, 0x01, 0x0f, 0x13, 0x04, 0x0c, 0x00e5
|
||||
|
||||
.align 2
|
||||
gUnknown_082F05E0:: @ 82F05E0
|
||||
window_template 0x00, 0x08, 0x06, 0x0e, 0x06, 0x0c, 0x0155
|
||||
|
||||
.align 2
|
||||
gUnknown_082F05E8:: @ 82F05E8
|
||||
window_template 0x00, 0x17, 0x0f, 0x06, 0x04, 0x0c, 0x0155
|
||||
|
||||
.align 2
|
||||
gUnknown_082F05F0:: @ 82F05F0
|
||||
window_template 0x00, 0x16, 0x0b, 0x07, 0x08, 0x0c, 0x0155
|
||||
|
||||
.align 2
|
||||
gUnknown_082F05F8:: @ 82F05F8
|
||||
window_template 0x00, 0x16, 0x0d, 0x07, 0x06, 0x0c, 0x0155
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0600:: @ 82F0600
|
||||
window_template 0x00, 0x16, 0x0f, 0x07, 0x04, 0x0c, 0x0155
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0608:: @ 82F0608
|
||||
.4byte gText_WonderCards, 0x00000000
|
||||
.4byte gText_WonderNews, 0x00000001
|
||||
.4byte gText_Exit3, 0xfffffffe
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0620:: @ 82F0620
|
||||
.4byte gText_WirelessCommunication, 0x00000000
|
||||
.4byte gText_Friend2, 0x00000001
|
||||
.4byte gText_Cancel2, 0xfffffffe
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0638:: @ 82F0638 struct ListMenuTemplate
|
||||
.4byte NULL
|
||||
.4byte ListMenuDefaultCursorMoveFunc
|
||||
.4byte NULL
|
||||
.byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00
|
||||
.byte 0x21, 0x31, 0x00, 0x01
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0650:: @ 82F0650
|
||||
.4byte gText_Receive, 0x00000000
|
||||
.4byte gText_Send, 0x00000001
|
||||
.4byte gText_Toss, 0x00000002
|
||||
.4byte gText_Cancel2, 0xfffffffe
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0670:: @ 82F0670
|
||||
.4byte gText_Receive, 0x00000000
|
||||
.4byte gText_Toss, 0x00000002
|
||||
.4byte gText_Cancel2, 0xfffffffe
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0688:: @ 82F0688
|
||||
.4byte gText_Receive, 0x00000000
|
||||
.4byte gText_Send, 0x00000001
|
||||
.4byte gText_Cancel2, 0xfffffffe
|
||||
|
||||
.align 2
|
||||
gUnknown_082F06A0:: @ 82F06A0
|
||||
.4byte gText_Receive, 0x00000000
|
||||
.4byte gText_Cancel2, 0xfffffffe
|
||||
|
||||
.align 2
|
||||
gUnknown_082F06B0:: @ 82F06B0 struct ListMenuTemplate
|
||||
.4byte gUnknown_082F0650
|
||||
.4byte ListMenuDefaultCursorMoveFunc
|
||||
.4byte NULL
|
||||
.byte 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00
|
||||
.byte 0x21, 0x31, 0x00, 0x01
|
||||
|
||||
.align 2
|
||||
gUnknown_082F06C8:: @ 82F06C8
|
||||
.4byte gUnknown_082F0670
|
||||
.4byte ListMenuDefaultCursorMoveFunc
|
||||
.4byte NULL
|
||||
.byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00
|
||||
.byte 0x21, 0x31, 0x00, 0x01
|
||||
|
||||
.align 2
|
||||
gUnknown_082F06E0:: @ 82F06E0
|
||||
.4byte gUnknown_082F0688
|
||||
.4byte ListMenuDefaultCursorMoveFunc
|
||||
.4byte NULL
|
||||
.byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00
|
||||
.byte 0x21, 0x31, 0x00, 0x01
|
||||
|
||||
.align 2
|
||||
gUnknown_082F06F8:: @ 82F06F8
|
||||
.4byte gUnknown_082F06A0
|
||||
.4byte ListMenuDefaultCursorMoveFunc
|
||||
.4byte NULL
|
||||
.byte 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00
|
||||
.byte 0x21, 0x31, 0x00, 0x01
|
||||
|
||||
.align 2
|
||||
.4byte gText_VarietyOfEventsImportedWireless
|
||||
.4byte gText_WonderCardsInPossession
|
||||
.4byte gText_ReadNewsThatArrived
|
||||
.4byte gText_ReturnToTitle
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0720:: @ 82F0720
|
||||
.byte 0x00, 0x01, 0x02
|
||||
|
||||
.align 2
|
||||
.byte 0x00, 0x01, 0x02
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0728:: @ 82F0728
|
||||
.byte 0x01, 0x02, 0x03
|
||||
|
||||
.align 2
|
||||
gUnknown_082F072C:: @ 82F072C
|
||||
.byte 0x21, 0x2c, 0x1f, 0x23, 0x25, 0x24, 0x41, 0x42
|
||||
.byte 0x00, 0x00, 0x22, 0x28, 0x20, 0x2f, 0x2f, 0x0e
|
||||
.byte 0x14, 0x2d, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0740:: @ 82F0740
|
||||
.2byte 0x0004, 0x0006, 0x000d, 0x0008
|
||||
.2byte 0x000a, 0x0006, 0x0001, 0x0008
|
||||
.2byte 0x000d, 0x0004, 0x0007, 0x0004
|
||||
.2byte 0x0001, 0x0004, 0x0007, 0x0008
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0760:: @ 82F0760
|
||||
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00
|
||||
.byte 0x00, 0x01
|
||||
|
||||
gUnknown_082F076A:: @ 82F076A
|
||||
.byte 0x00, 0x02, 0x01, 0x04, 0x03
|
||||
|
||||
gUnknown_082F076F:: @ 82F076F
|
||||
.byte 0x01, 0x03, 0x01, 0x04, 0x02
|
||||
|
||||
gUnknown_082F0774:: @ 82F0774
|
||||
.byte 0x09, 0x08, 0x07, 0x02, 0x06, 0x05, 0x04, 0x03
|
||||
.byte 0xbf, 0x02, 0xc0, 0x02, 0xc1, 0x02, 0xc2, 0x02
|
||||
.byte 0xc3, 0x02, 0xc4, 0x02, 0xc5, 0x02, 0xc6, 0x02
|
||||
|
||||
gUnknown_082F078C:: @ 82F078C
|
||||
.byte 0x9c, 0xfe
|
||||
|
||||
gUnknown_082F078E:: @ 82F078E
|
||||
.byte 0x9d, 0xfe
|
||||
|
||||
.align 2
|
||||
gWirelessInfoScreenPal:: @ 82F0790
|
||||
.incbin "graphics/interface/wireless_info_screen.gbapal"
|
||||
|
||||
.align 2
|
||||
gWirelessInfoScreenGfx:: @ 82F0990
|
||||
.incbin "graphics/interface/wireless_info_screen.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gWirelessInfoScreenTilemap:: @ 82F0BA0
|
||||
.incbin "graphics/interface/wireless_info_screen.bin.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0D34:: @ 82F0D34
|
||||
.4byte 0x000001f8
|
||||
.4byte 0x00001081
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0D3C:: @ 82F0D3C
|
||||
window_template 0x00, 0x03, 0x00, 0x18, 0x03, 0x0f, 0x0001
|
||||
window_template 0x00, 0x03, 0x04, 0x15, 0x0f, 0x0f, 0x0049
|
||||
window_template 0x00, 0x18, 0x04, 0x03, 0x0f, 0x0f, 0x0184
|
||||
null_window_template
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0D5C:: @ 82F0D5C
|
||||
.4byte gText_WirelessCommStatus
|
||||
.4byte gText_PeopleTrading
|
||||
.4byte gText_PeopleBattling
|
||||
.4byte gText_PeopleInUnionRoom
|
||||
.4byte gText_PeopleCommunicating
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0D70:: @ 82F0D70
|
||||
.byte 0x01, 0x01, 0x02, 0x02, 0x01, 0x02, 0x03, 0x01
|
||||
.byte 0x04, 0x04, 0x00, 0x02, 0x06, 0x03, 0x02, 0x07
|
||||
.byte 0x03, 0x02, 0x09, 0x03, 0x00, 0x0a, 0x03, 0x00
|
||||
.byte 0x0b, 0x03, 0x00, 0x0c, 0xff, 0x00, 0x0d, 0x00
|
||||
.byte 0x00, 0x10, 0x03, 0x00, 0x0f, 0x03, 0x00, 0x40
|
||||
.byte 0x02, 0x01, 0x41, 0x02, 0x02, 0x44, 0x02, 0x02
|
||||
.byte 0x45, 0x02, 0x00, 0x48, 0x02, 0x02, 0x54, 0x02
|
||||
.byte 0x01, 0x53, 0x02, 0x02, 0x51, 0x02, 0x01, 0x52
|
||||
.byte 0x02, 0x01, 0x15, 0x03, 0x02, 0x16, 0x03, 0x02
|
||||
.byte 0x17, 0x03, 0x00, 0x18, 0x03, 0x00, 0x19, 0x03
|
||||
.byte 0x00, 0x1a, 0x03, 0x00, 0x1b, 0x03, 0x00, 0x1c
|
||||
.byte 0x01, 0x02, 0x0e, 0x01, 0x02, 0x00, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0DD0:: @ 82F0DD0
|
||||
.4byte 0x000001FC
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0DD4:: @ 82F0DD4
|
||||
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0014
|
||||
null_window_template
|
||||
|
||||
.align 2
|
||||
gUnknown_082F0DE4:: @ 82F0DE4
|
||||
.byte 0x01, 0x02, 0x03
|
||||
Reference in New Issue
Block a user