Merge branch 'master' into decomp_battle2

This commit is contained in:
DizzyEggg
2017-10-01 18:55:21 +02:00
81 changed files with 2432 additions and 167 deletions

View File

@@ -40,7 +40,5 @@ gUnknown_0832C108:: @ 832C108
.align 2
gUnknown_0832C128:: @ 832C128
obj_pal gUnknown_08C11B9C, 0xd6ff
obj_pal gUnknown_08C11BBC, 0xd704
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
obj_pal gBattleInterface_BallStatusBarPal, 0xd6ff
obj_pal gBattleInterface_BallDisplayPal, 0xd704

View File

@@ -4,53 +4,177 @@
.section .rodata
.align 2, 0
gUnknown_0832C138:: @ 832C138
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C140:: @ 832C140
.incbin "baserom.gba", 0x32c140, 0x30
spr_template 0xd6ff, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C158:: @ 832C158
spr_template 0xd700, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C170:: @ 832C170
.incbin "baserom.gba", 0x32c170, 0x30
spr_template 0xd701, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C188:: @ 832C188
spr_template 0xd702, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C1A0:: @ 832C1A0
.incbin "baserom.gba", 0x32c1a0, 0x20
spr_template 0xd70b, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0832C1B8:: @ 832C1B8
.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C1C0:: @ 832C1C0
.incbin "baserom.gba", 0x32c1c0, 0xcc
spr_template 0xd704, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C1D8:: @ 832C1D8
spr_template 0xd705, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C1F0:: @ 832C1F0
spr_template 0xd706, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C208:: @ 832C208
spr_template 0xd707, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
.align 2
gUnknown_0832C220:: @ 832C220
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
.byte 0xf0, 0x20, 0x05, 0x43, 0x10, 0x20, 0x45, 0x43
.byte 0x30, 0x20, 0x85, 0x43
.align 2
gUnknown_0832C234:: @ 832C234
.byte 0xf0, 0x00, 0x0d, 0x44, 0x30, 0x00, 0x08, 0x46
.byte 0xf0, 0x20, 0x05, 0x47, 0x10, 0x20, 0x45, 0x47
.byte 0x30, 0x20, 0x85, 0x47
.align 2
gUnknown_0832C248:: @ 832C248
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
.align 2
gUnknown_0832C250:: @ 832C250
.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
.align 2
gUnknown_0832C258:: @ 832C258
.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
.align 2
gUnknown_0832C260:: @ 832C260
.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
.byte 0xe0, 0x00, 0x80, 0x40
.align 2
gUnknown_0832C26C:: @ 832C26C
.4byte 0x00000005, gUnknown_0832C220
.4byte 0x00000002, gUnknown_0832C248
.4byte 0x00000005, gUnknown_0832C234
.4byte 0x00000002, gUnknown_0832C250
.align 2
gUnknown_0832C28C:: @ 832C28C
.incbin "baserom.gba", 0x32c28c, 0x38
.4byte 0x00000002, gUnknown_0832C258
.4byte 0x00000003, gUnknown_0832C260
.align 2
gUnknown_0832C29C:: @ 832C29C
.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0xc5, 0x40
.align 2
gUnknown_0832C2AC:: @ 832C2AC
.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0x85, 0x40
.byte 0x20, 0x00, 0x85, 0x40, 0x40, 0x00, 0xc5, 0x40
.align 2
gUnknown_0832C2C4:: @ 832C2C4
.incbin "baserom.gba", 0x32c2c4, 0x8
.4byte 0x00000004, gUnknown_0832C29C
.align 2
gUnknown_0832C2CC:: @ 832C2CC
.incbin "baserom.gba", 0x32c2cc, 0x68
.4byte 0x00000006, gUnknown_0832C2AC
.align 2
gUnknown_0832C2D4:: @ 832C2D4
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
.2byte 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
.2byte 0x7777, 0x7777, 0x7777, 0x7717, 0x1777, 0x7177, 0x7777, 0x7771
.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
.2byte 0x7777, 0x7777, 0x7777, 0x7111, 0x7777, 0x7171, 0x7777, 0x7111
.align 2
gUnknown_0832C334:: @ 832C334
.incbin "baserom.gba", 0x32c334, 0x8
obj_tiles gBattleInterface_BallStatusBarGfx, 0x0200, 0xd70c
.align 2
gUnknown_0832C33C:: @ 832C33C
.incbin "baserom.gba", 0x32c33c, 0x8
obj_pal gBattleInterface_BallStatusBarPal, 0xd710
.align 2
gUnknown_0832C344:: @ 832C344
.incbin "baserom.gba", 0x32c344, 0x8
obj_pal gBattleInterface_BallDisplayPal, 0xd712
.align 2
gUnknown_0832C34C:: @ 832C34C
.incbin "baserom.gba", 0x32c34c, 0x18
obj_tiles gBattleInterface_BallDisplayGfx, 0x0080, 0xd714
.align 2
gUnknown_0832C354:: @ 832C354
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C35C:: @ 832C35C
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00
.align 2
gUnknown_0832C364:: @ 832C364
.incbin "baserom.gba", 0x32c364, 0x30
spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
.align 2
gUnknown_0832C37C:: @ 832C37C
spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
.align 2
gUnknown_0832C394:: @ 832C394
.incbin "baserom.gba", 0x32c394, 0x30
spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
.align 2
gUnknown_0832C3AC:: @ 832C3AC
spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
.align 2
gUnknown_0832C3C4:: @ 832C3C4
.incbin "baserom.gba", 0x32c3c4, 0x14
.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x02, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0832C3D8:: @ 832C3D8
.incbin "baserom.gba", 0x32c3d8, 0x14
.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0832C3EC:: @ 832C3EC
.incbin "baserom.gba", 0x32c3ec, 0xc
.byte 0x98, 0x61, 0xf7, 0x0e, 0x94, 0x46, 0xd1, 0x72
.byte 0xdc, 0x29, 0x00, 0x00
.align 2
gUnknown_0832C3F8:: @ 832C3F8
.incbin "baserom.gba", 0x32c3f8, 0x8
.byte 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00

View File

@@ -3,7 +3,7 @@
.section .rodata
.incbin "baserom.gba", 0x5f53c4, 0x48
.incbin "baserom.gba", 0x5f53cc, 0x40
gUnknown_085F540C:: @ 85F540C
.incbin "baserom.gba", 0x5f540c, 0x10

View File

@@ -30,14 +30,25 @@ gUnknown_08C0237C:: @ 8C0237C
gUnknown_08C093F0:: @ 8C093F0
.incbin "baserom.gba", 0xc093f0, 0x87ac
gUnknown_08C11B9C:: @ 8C11B9C
.incbin "baserom.gba", 0xc11b9c, 0x20
.align 2
gBattleInterface_BallStatusBarPal:: @ 8C11B9C
.incbin "graphics/battle_interface/ball_status_bar.gbapal"
gUnknown_08C11BBC:: @ 8C11BBC
.incbin "baserom.gba", 0xc11bbc, 0x20
.align 2
gBattleInterface_BallDisplayPal:: @ 8C11BBC
.incbin "graphics/battle_interface/ball_display.gbapal"
.align 2
gUnknown_08C11BDC:: @ 8C11BDC
.incbin "baserom.gba", 0xc11bdc, 0x52b4
.incbin "baserom.gba", 0xc11bdc, 0x840
.align 2
gBattleInterface_BallDisplayGfx:: @ 8C1241C
.incbin "graphics/battle_interface/ball_display.4bpp"
.align 2
gUnknown_08C1249C:: @ 8C1249C
.incbin "baserom.gba", 0xc1249c, 0x49f4
gUnknown_08C16E90:: @ 8C16E90
.incbin "baserom.gba", 0xc16e90, 0x118
@@ -366,8 +377,13 @@ gUnknown_08D85A1C:: @ 8D85A1C
.incbin "baserom.gba", 0xd85a1c, 0x234
gUnknown_08D85C50:: @ 8D85C50
.incbin "baserom.gba", 0xd85c50, 0x80
.incbin "baserom.gba", 0xd85c50, 0x60
.align 2
gIntro2BrendanNoTurnPal:: @ 8D85CB0
.incbin "graphics/intro/intro2_brendan_noturn.gbapal"
.align 2
gUnknown_08D85CD0:: @ 8D85CD0
.incbin "baserom.gba", 0xd85cd0, 0x182
@@ -381,36 +397,46 @@ gUnknown_08D85E7C:: @ 8D85E7C
.incbin "baserom.gba", 0xd85e7c, 0x54
.align 2
gIntroVolbeatPal:: @ 8D85ED0
.incbin "graphics/intro/volbeat.gbapal"
gIntro2VolbeatPal:: @ 8D85ED0
.incbin "graphics/intro/intro2_volbeat.gbapal"
.align 2
gIntroTorchicPal:: @ 8D85EF0
.incbin "graphics/intro/torchic.gbapal"
gIntro2TorchicPal:: @ 8D85EF0
.incbin "graphics/intro/intro2_torchic.gbapal"
.align 2
gIntroManectricPal:: @ 8D85ED0
.incbin "graphics/intro/manectric.gbapal"
gIntro2ManectricPal:: @ 8D85ED0
.incbin "graphics/intro/intro2_manectric.gbapal"
.align 2
gUnknown_08D85F30:: @ 8D85ED0
.incbin "baserom.gba", 0xd85f30, 0x20
gIntro2FlygonPal:: @ 8D85F30
.incbin "graphics/intro/intro2_flygon.gbapal"
.align 2
gIntroVolbeatGfx:: @ 8D85F50
.incbin "graphics/intro/volbeat.4bpp.lz"
gIntro2VolbeatGfx:: @ 8D85F50
.incbin "graphics/intro/intro2_volbeat.4bpp.lz"
.align 2
gIntroTorchicGfx:: @ 8D86130
.incbin "graphics/intro/torchic.4bpp.lz"
gIntro2TorchicGfx:: @ 8D86130
.incbin "graphics/intro/intro2_torchic.4bpp.lz"
.align 2
gIntroManectricGfx:: @ 8D86550
.incbin "graphics/intro/manectric.4bpp.lz"
gIntro2ManectricGfx:: @ 8D86550
.incbin "graphics/intro/intro2_manectric.4bpp.lz"
.align 2
.incbin "baserom.gba", 0xd8702c, 0x1468
gIntro2FlygonGfx:: @ 8D8702C
.incbin "graphics/intro/intro2_flygon.4bpp.lz"
.align 2
gIntro2BrendanNoTurnGfx:: @ 8D87568
.incbin "graphics/intro/intro2_brendan_noturn.4bpp.lz"
.align 2
gIntro2MayNoTurnGfx:: @ 8D87CA4
.incbin "graphics/intro/intro2_may_noturn.4bpp.lz"
.align 2
gUnknown_08D88494:: @ 8D88494
.incbin "baserom.gba", 0xd88494, 0x8ac
@@ -445,12 +471,12 @@ gUnknown_08D8B6E8:: @ 8D8B6E8
.incbin "baserom.gba", 0xd8b6e8, 0x124
.align 2
gIntroRayquazaLightningGfx:: @ 8D8B80C
.incbin "graphics/intro/rayquaza_lightning.4bpp.lz"
gIntro3LightningGfx:: @ 8D8B80C
.incbin "graphics/intro/intro3_lightning.4bpp.lz"
.align 2
gIntroRayquazaLightningPal:: @ 8D8BA54
.incbin "graphics/intro/rayquaza_lightning.gbapal"
gIntro3LightningPal:: @ 8D8BA54
.incbin "graphics/intro/intro3_lightning.gbapal"
.align 2
gUnknown_08D8BA74:: @ 8D8BA74
@@ -466,20 +492,20 @@ gUnknown_08D8CCC8:: @ 8D8CCC8
.incbin "baserom.gba", 0xd8ccc8, 0x27c
.align 2
gIntroKyogreBubblesGfx:: @ 8D8CF44
.incbin "graphics/intro/kyogre_bubbles.4bpp.lz"
gIntro2BubblesGfx:: @ 8D8CF44
.incbin "graphics/intro/intro2_bubbles.4bpp.lz"
.align 2
gIntroKyogreBubblesPal:: @ 8D8D110
.incbin "graphics/intro/kyogre_bubbles.gbapal"
gIntro2BubblesPal:: @ 8D8D110
.incbin "graphics/intro/intro2_bubbles.gbapal"
.align 2
gIntroFlygonSilhouette:: @ 8D8D130
.incbin "graphics/intro/flygon_silhouette.4bpp.lz"
gIntro1FlygonGfx:: @ 8D8D130
.incbin "graphics/intro/intro1_flygon.4bpp.lz"
.align 2
gIntroLeavesDropletSparkleGfx:: @ 8D8D208
.incbin "graphics/intro/droplet_sparkle.4bpp.lz"
gIntro1SparkleGfx:: @ 8D8D208
.incbin "graphics/intro/intro1_sparkle.4bpp.lz"
.align 2
.incbin "baserom.gba", 0xd8d2a4, 0x16c
@@ -506,7 +532,11 @@ gUnknown_08D8FB9C:: @ 8D8FB9C
.incbin "baserom.gba", 0xd8fb9c, 0x24
gUnknown_08D8FBC0:: @ 8D8FBC0
.incbin "baserom.gba", 0xd8fbc0, 0xb4
.incbin "baserom.gba", 0xd8fbc0, 0x30
.align 2
gBattleInterface_BallStatusBarGfx:: @ 8D8FBF0
.incbin "graphics/battle_interface/ball_status_bar.4bpp.lz"
.align 2
gMonIcon_Egg:: @ 8D8FC74

View File

@@ -4,79 +4,79 @@
.section .rodata
.align 2
gIntroLeavesDropsPal:: @ 85DFF90
.incbin "graphics/intro/leaves_drops.gbapal"
gIntro1DropsPal:: @ 85DFF90
.incbin "graphics/intro/intro1_drops.gbapal"
.align 2
gIntroLeavesGFLogoPal:: @ 85DFFB0
.incbin "graphics/intro/leaves_gflogo.gbapal"
gIntro1GFLogoPal:: @ 85DFFB0
.incbin "graphics/intro/intro1_gflogo.gbapal"
.align 2
gIntroLeavesGFLogoGfx:: @ 85DFFD0
.incbin "graphics/intro/leaves_gflogo.4bpp.lz"
gIntroTiles:: @ 85DFFD0
.incbin "graphics/intro/intro.4bpp.lz"
.align 2
gIntroLeavesPal:: @ 85E05C4
.incbin "graphics/intro/leaves.gbapal"
gIntro1BGPals:: @ 85E05C4
.incbin "graphics/intro/intro1_bgpal.gbapal"
.align 2
gIntroLeavesForegroundTilemap:: @ 85E07C4
.incbin "graphics/intro/leaves_foreground.bin.lz"
gIntro1BG0_Tilemap:: @ 85E07C4
.incbin "graphics/intro/intro1_bg0_map.bin.lz"
.align 2
gIntroLeavesMidgroundTilemap:: @ 85E0B78
.incbin "graphics/intro/leaves_midground.bin.lz"
gIntro1BG1_Tilemap:: @ 85E0B78
.incbin "graphics/intro/intro1_bg1_map.bin.lz"
.align 2
gIntroLeavesBgLeavesTilemap:: @ 85E0EAC
.incbin "graphics/intro/leaves_bgleaves.bin.lz"
gIntro1BG2_Tilemap:: @ 85E0EAC
.incbin "graphics/intro/intro1_bg2_map.bin.lz"
.align 2
gIntroLeavesBgMountainsTilemap:: @ 85E119C
.incbin "graphics/intro/leaves_bgmountains.bin.lz"
gIntro1BG3_Tilemap:: @ 85E119C
.incbin "graphics/intro/intro1_bg3_map.bin.lz"
.align 2
gIntroLeavesBgGfx:: @ 85E13B4
.incbin "graphics/intro/leaves_bg.4bpp.lz"
gIntro1BGLeavesGfx:: @ 85E13B4
.incbin "graphics/intro/introgfx.4bpp.lz"
.align 2
gIntroBattlePokeBallPal:: @ 85E3524
.incbin "graphics/intro/battle_pokeball.gbapal"
gIntro3PokeballPal:: @ 85E3524
.incbin "graphics/intro/intro3_pokeball.gbapal"
.align 2
gIntroBattlePokeBallTilemap:: @ 85E3724
.incbin "graphics/intro/battle_pokeball.bin.lz"
gIntro3Pokeball_Tilemap:: @ 85E3724
.incbin "graphics/intro/intro3_pokeball_map.bin.lz"
.align 2
gIntroBattlePokeBallGfx:: @ 85E3854
.incbin "graphics/intro/battle_pokeball.8bpp.lz"
gIntro3Pokeball_Gfx:: @ 85E3854
.incbin "graphics/intro/intro3_pokeball.8bpp.lz"
.align 2
.incbin "graphics/intro/battle_streaks.gbapal"
.incbin "graphics/intro/intro3_streaks.gbapal"
.align 2
.incbin "graphics/intro/battle_streaks.4bpp.lz"
.incbin "graphics/intro/intro3_streaks.4bpp.lz"
.align 2
.incbin "graphics/intro/battle_streaks.bin.lz"
.incbin "graphics/intro/intro3_streaks_map.bin.lz"
.align 2
gIntroBattleCirclePal:: @ 85E4570
.incbin "graphics/intro/battle_circle_1.gbapal"
gIntro3Misc1Pal:: @ 85E4570
.incbin "graphics/intro/intro3_misc1.gbapal"
.align 2
.incbin "graphics/intro/battle_circle_2.gbapal"
.incbin "graphics/intro/intro3_misc2.gbapal"
.align 2
gIntroBattleCircleGfx:: @ 85E45B0
.incbin "graphics/intro/battle_circle.4bpp.lz"
gIntro3MiscTiles:: @ 85E45B0
.incbin "graphics/intro/intro3_misc.4bpp.lz"
.align 2
gIntroFlyingPkmnSilhouettePal:: @ 85E492C
.incbin "graphics/intro/flying_silhouette.gbapal"
gIntro1FlygonPal:: @ 85E492C
.incbin "graphics/intro/intro1_flygon.gbapal"
.align 2
.incbin "graphics/intro/latis.4bpp.lz"
.incbin "graphics/intro/intro1_eon.4bpp.lz"
.align 2
.byte 0x02, 0x03, 0x04, 0x05, 0x01, 0x01, 0x01, 0x06
@@ -90,12 +90,12 @@ gIntroFlyingPkmnSilhouettePal:: @ 85E492C
.align 2
gUnknown_085E4A74:: @ 85E4A74
obj_tiles gIntroLeavesDropletSparkleGfx, 0x0400, 0x05e1
obj_tiles gIntro1SparkleGfx, 0x0400, 0x05e1
null_obj_tiles
.align 2
gUnknown_085E4A84:: @ 85E4A84
obj_pal gIntroRayquazaLightningPal, 0x05e1
obj_pal gIntro3LightningPal, 0x05e1
null_obj_pal
.align 2
@@ -122,16 +122,16 @@ gUnknown_085E4AD0:: @ 85E4AD0
.align 2
gUnknown_085E4AE8:: @ 85E4AE8
obj_tiles gIntroVolbeatGfx, 0x0400, 0x05dc
obj_tiles gIntroTorchicGfx, 0x0c00, 0x05dd
obj_tiles gIntroManectricGfx, 0x2000, 0x05de
obj_tiles gIntro2VolbeatGfx, 0x0400, 0x05dc
obj_tiles gIntro2TorchicGfx, 0x0c00, 0x05dd
obj_tiles gIntro2ManectricGfx, 0x2000, 0x05de
null_obj_tiles
.align 2
gUnknown_085E4B08:: @ 85E4B08
obj_pal gIntroVolbeatPal, 0x05dc
obj_pal gIntroTorchicPal, 0x05dd
obj_pal gIntroManectricPal, 0x05de
obj_pal gIntro2VolbeatPal, 0x05dc
obj_pal gIntro2TorchicPal, 0x05dd
obj_pal gIntro2ManectricPal, 0x05de
null_obj_pal
.align 2
@@ -194,12 +194,12 @@ gUnknown_085E4BDC:: @ 85E4BDC
.align 2
gUnknown_085E4BF4:: @ 85E4BF4
obj_tiles gIntroRayquazaLightningGfx, 0x0c00, 0x05df
obj_tiles gIntro3LightningGfx, 0x0c00, 0x05df
null_obj_tiles
.align 2
gUnknown_085E4C04:: @ 85E4C04
obj_pal gIntroRayquazaLightningPal, 0x05df
obj_pal gIntro3LightningPal, 0x05df
null_obj_pal
.align 2
@@ -236,12 +236,12 @@ gUnknown_085E4C64:: @ 85E4C64
.align 2
gUnknown_085E4C88:: @ 85E4C88
obj_tiles gIntroKyogreBubblesGfx, 0x0600, 0x05e0
obj_tiles gIntro2BubblesGfx, 0x0600, 0x05e0
null_obj_tiles
.align 2
gUnknown_085E4C98:: @ 85E4C98
obj_pal gIntroKyogreBubblesPal, 0x05e0
obj_pal gIntro2BubblesPal, 0x05e0
null_obj_pal
.align 2
@@ -488,18 +488,18 @@ gUnknown_085E4FC4:: @ 85E4FC4
.align 2
gUnknown_085E4FDC:: @ 85E4FDC
obj_tiles gIntroLeavesGFLogoGfx, 0x1400, 0x07d0
obj_tiles gIntroTiles, 0x1400, 0x07d0
null_obj_tiles
gUnknown_085E4FEC:: @ 85E4FEC
obj_tiles gIntroFlygonSilhouette, 0x0400, 0x07d2
obj_tiles gIntro1FlygonGfx, 0x0400, 0x07d2
null_obj_tiles
.align 2
gUnknown_085E4FFC:: @ 85E4FFC
obj_pal gIntroLeavesDropsPal, 0x07d0
obj_pal gIntroLeavesGFLogoPal, 0x07d1
obj_pal gIntroFlyingPkmnSilhouettePal, 0x07d2
obj_pal gIntro1DropsPal, 0x07d0
obj_pal gIntro1GFLogoPal, 0x07d1
obj_pal gIntro1FlygonPal, 0x07d2
null_obj_pal
.align 2
@@ -520,10 +520,10 @@ gUnknown_085E5030:: @ 85E5030
.align 2
gUnknown_085E5048:: @ 85E5048
obj_tiles gIntroBattleCircleGfx, 0x0a00, 0x07d3
obj_tiles gIntro3MiscTiles, 0x0a00, 0x07d3
null_obj_tiles
gUnknown_085E5058:: @ 85E5058
obj_pal gIntroBattleCirclePal, 0x07d3
obj_pal gIntro3Misc1Pal, 0x07d3
null_obj_pal

View File

@@ -3,146 +3,457 @@
.section .rodata
.align 2
gUnknown_085F06E0:: @ 85F06E0
.incbin "baserom.gba", 0x5f06e0, 0x20
.incbin "graphics/intro/intro2_grass.gbapal"
.align 2
gUnknown_085F0700:: @ 85F0700
.incbin "baserom.gba", 0x5f0700, 0x20
.incbin "graphics/intro/intro2_grass_afternoon.gbapal"
.align 2
gUnknown_085F0720:: @ 85F0720
.incbin "baserom.gba", 0x5f0720, 0x20
.incbin "graphics/intro/intro2_grass_night.gbapal"
.align 2
gUnknown_085F0740:: @ 85F0740
.incbin "baserom.gba", 0x5f0740, 0x480
.incbin "graphics/intro/intro2_grass.4bpp.lz"
.align 2
gUnknown_085F0BC0:: @ 85F0BC0
.incbin "baserom.gba", 0x5f0bc0, 0x13c
.incbin "graphics/intro/intro2_grass_map.bin.lz"
.align 2
gUnknown_085F0CFC:: @ 85F0CFC
.incbin "baserom.gba", 0x5f0cfc, 0x60
.incbin "graphics/intro/85F0CFC.gbapal"
.align 2
gUnknown_085F0D5C:: @ 85F0D5C
.incbin "baserom.gba", 0x5f0d5c, 0x60
.incbin "graphics/intro/85F0D5C.gbapal"
.align 2
gUnknown_085F0DBC:: @ 85F0DBC
.incbin "baserom.gba", 0x5f0dbc, 0x5dc
.incbin "graphics/intro/intro2_bgclouds.4bpp.lz"
.align 2
gUnknown_085F1398:: @ 85F1398
.incbin "baserom.gba", 0x5f1398, 0x2d0
.incbin "graphics/intro/intro2_bgclouds_map.bin.lz"
.align 2
gUnknown_085F1668:: @ 85F1668
.incbin "baserom.gba", 0x5f1668, 0x20
.incbin "graphics/intro/intro2_bgclouds.gbapal"
.align 2
gUnknown_085F1688:: @ 85F1688
.incbin "baserom.gba", 0x5f1688, 0x20
.incbin "graphics/intro/intro2_bgclouds_afternoon.gbapal"
.align 2
gUnknown_085F16A8:: @ 85F16A8
.incbin "baserom.gba", 0x5f16a8, 0x13c
.incbin "graphics/intro/intro2_bgclouds2.4bpp.lz"
.align 2
gUnknown_085F17E4:: @ 85F17E4
.incbin "baserom.gba", 0x5f17e4, 0x20
.incbin "graphics/intro/intro2_bgtrees2.gbapal"
.align 2
gUnknown_085F1804:: @ 85F1804
.incbin "baserom.gba", 0x5f1804, 0x20
.incbin "graphics/intro/intro2_bgtrees2_afternoon.gbapal"
.align 2
gUnknown_085F1824:: @ 85F1824
.incbin "baserom.gba", 0x5f1824, 0x688
.incbin "graphics/intro/intro2_bgtrees.4bpp.lz"
.align 2
gUnknown_085F1EAC:: @ 85F1EAC
.incbin "baserom.gba", 0x5f1eac, 0x304
.incbin "graphics/intro/intro2_bgtrees_map.bin.lz"
.align 2
gUnknown_085F21B0:: @ 85F21B0
.incbin "baserom.gba", 0x5f21b0, 0x16c
.incbin "graphics/intro/intro2_bgtrees.gbapal"
.align 2
gIntro2TreeGfx:: @ 85F21D0
.incbin "graphics/intro/intro2_bgtreessmall.4bpp.lz"
.align 2
gUnknown_085F231C:: @ 85F231C
.incbin "baserom.gba", 0x5f231c, 0x40
.incbin "graphics/intro/85F231C.gbapal"
.align 2
gUnknown_085F235C:: @ 85F235C
.incbin "baserom.gba", 0x5f235c, 0x1ec
.incbin "graphics/intro/intro2_bgnight.4bpp.lz"
.align 2
gUnknown_085F2548:: @ 85F2548
.incbin "baserom.gba", 0x5f2548, 0x20
.incbin "graphics/intro/intro2_bgnight.gbapal"
.align 2
gUnknown_085F2568:: @ 85F2568
.incbin "baserom.gba", 0x5f2568, 0x2ae4
.incbin "graphics/intro/intro2_bgnight_map.bin.lz"
.align 2
gIntro2NightGfx:: @ 85F2814
.incbin "graphics/intro/intro2_night.4bpp.lz"
.align 2
gIntro2BrendanPal:: @ 85F2898
.incbin "graphics/intro/intro2_brendan.gbapal"
.align 2
gIntro2BrendanGfx:: @ 85F28B8
.incbin "graphics/intro/intro2_brendan.4bpp.lz"
.align 2
gIntro2MayPal:: @ 85F3470
.incbin "graphics/intro/intro2_may.gbapal"
.align 2
gUnknown_085F3490:: @ 85F3490
.space 0x1E0
.align 2
gIntro2MayGfx:: @ 85F3670
.incbin "graphics/intro/intro2_may.4bpp.lz"
.align 2
gIntro2BicycleGfx:: @ 85F4318
.incbin "graphics/intro/intro2_bicycle.4bpp.lz"
.align 2
gIntro2LatiosPal:: @ 85F4744
.incbin "graphics/intro/intro2_latios.gbapal"
.align 2
gIntro2LatiosGfx:: @ 85F4764
.incbin "graphics/intro/intro2_latios.4bpp.lz"
.align 2
gIntro2LatiasPal:: @ 85F4C08
.incbin "graphics/intro/intro2_latias.gbapal"
.align 2
gIntro2LatiasGfx:: @ 85F4C28
.incbin "graphics/intro/intro2_latias.4bpp.lz"
.align 2
gUnknown_085F504C:: @ 85F504C
.incbin "baserom.gba", 0x5f504c, 0x18
spr_template 0x07d0, 0xffff, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817B62C
.align 2
gUnknown_085F5064:: @ 85F5064
.incbin "baserom.gba", 0x5f5064, 0x30
obj_tiles gUnknown_085F16A8, 0x0400, 0x07d0
null_obj_tiles
.align 2
gUnknown_085F5074:: @ 85F5074
obj_image_anim_frame 0, 30
obj_image_anim_end
.align 2
gUnknown_085F507C:: @ 85F507C
obj_image_anim_frame 16, 30
obj_image_anim_end
.align 2
gUnknown_085F5084:: @ 85F5084
obj_image_anim_frame 20, 30
obj_image_anim_end
.align 2
gUnknown_085F508C:: @ 85F508C
obj_image_anim_frame 22, 30
obj_image_anim_end
.align 2
gUnknown_085F5094:: @ 85F5094
.incbin "baserom.gba", 0x5f5094, 0x10
.4byte gUnknown_085F5074
.4byte gUnknown_085F507C
.4byte gUnknown_085F5084
.4byte gUnknown_085F508C
.align 2
gUnknown_085F50A4:: @ 85F50A4
.incbin "baserom.gba", 0x5f50a4, 0x48
.byte -128, 72, 32, 100
.2byte 0xC00
.space 2
.byte -128, -98, 32, 100
.2byte 0xC00
.space 2
.byte 65, -64, 40, 101
.2byte 0x800
.space 2
.byte 65, 56, 40, 101
.2byte 0x800
.space 2
.byte 18, 100, 44, 102
.2byte 0x400
.space 2
.byte 18, -104, 44, 102
.2byte 0x400
.space 2
.byte 19, 8, 46, 103
.2byte 0x100
.space 2
.byte 19, 56, 46, 103
.2byte 0x100
.space 2
.byte 19, -16, 46, 103
.2byte 0x100
.space 2
.align 2
gUnknown_085F50EC:: @ 85F50EC
.incbin "baserom.gba", 0x5f50ec, 0x28
obj_tiles gIntro2TreeGfx, 0x0400, 0x07d0
null_obj_tiles
.align 2
gUnknown_085F50FC:: @ 85F50FC
obj_image_anim_frame 0, 30
obj_image_anim_end
.align 2
gUnknown_085F5104:: @ 85F5104
obj_image_anim_frame 16, 30
obj_image_anim_end
.align 2
gUnknown_085F510C:: @ 85F510C
obj_image_anim_frame 24, 30
obj_image_anim_end
.align 2
gUnknown_085F5114:: @ 85F5114
.incbin "baserom.gba", 0x5f5114, 0xc
.4byte gUnknown_085F50FC
.4byte gUnknown_085F5104
.4byte gUnknown_085F510C
.align 2
gUnknown_085F5120:: @ 85F5120
.incbin "baserom.gba", 0x5f5120, 0x60
.byte -128, 16, 88, 100
.2byte 0x2000
.space 2
.byte -128, 80, 88, 100
.2byte 0x2000
.space 2
.byte -128, -112, 88, 100
.2byte 0x2000
.space 2
.byte -128, -48, 88, 100
.2byte 0x2000
.space 2
.byte -95, 40, 88, 101
.2byte 0x1000
.space 2
.byte -95, 104, 88, 101
.2byte 0x1000
.space 2
.byte -95, -88, 88, 101
.2byte 0x1000
.space 2
.byte -95, -24, 88, 101
.2byte 0x1000
.space 2
.byte -94, 56, 88, 102
.2byte 0x800
.space 2
.byte -94, 120, 88, 102
.2byte 0x800
.space 2
.byte -94, -72, 88, 102
.2byte 0x800
.space 2
.byte -94, -8, 88, 102
.2byte 0x800
.space 2
.align 2
gUnknown_085F5180:: @ 85F5180
.incbin "baserom.gba", 0x5f5180, 0x18
obj_tiles gIntro2NightGfx, 0x0400, 0x07d0
null_obj_tiles
.align 2
gUnknown_085F5190:: @ 85F5190
obj_image_anim_frame 0, 30
obj_image_anim_end
.align 2
gUnknown_085F5198:: @ 85F5198
.incbin "baserom.gba", 0x5f5198, 0x4
.4byte gUnknown_085F5190
.align 2
gUnknown_085F519C:: @ 85F519C
.incbin "baserom.gba", 0x5f519c, 0x50
.byte -128, 24, 88, 100
.2byte 0x1000
.space 2
.byte -128, 64, 88, 100
.2byte 0x1000
.space 2
.byte -128, 104, 88, 100
.2byte 0x1000
.space 2
.byte -128, -112, 88, 100
.2byte 0x1000
.space 2
.byte -128, -72, 88, 100
.2byte 0x1000
.space 2
.byte -128, -32, 88, 100
.2byte 0x1000
.space 2
.align 2
gOamData_85F51CC:: @ 85F51CC
.2byte 0x00A0
.2byte 0xC000
.2byte 0x0400
.align 2
gUnknown_085F51D4:: @ 85F51D4
obj_image_anim_frame 0, 8
obj_image_anim_frame 64, 8
obj_image_anim_frame 128, 8
obj_image_anim_frame 192, 8
obj_image_anim_jump 0
.align 2
gUnknown_085F51E8:: @ 85F51E8
.4byte gUnknown_085F51D4
.align 2
gUnknown_085F51EC:: @ 85F51EC
.incbin "baserom.gba", 0x5f51ec, 0x18
spr_template 0x03ea, 0x03ea, gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65
.align 2
gUnknown_085F5204:: @ 85F5204
.incbin "baserom.gba", 0x5f5204, 0x38
spr_template 0x03eb, 0x03eb, gOamData_85F51CC, gUnknown_085F51E8, NULL, gDummySpriteAffineAnimTable, nullsub_65
.align 2
gUnknown_085F521C:: @ 85F521C
.2byte 0x40A0
.2byte 0xC000
.2byte 0x0400
.align 2
gUnknown_085F5224:: @ 85F5224
obj_image_anim_frame 0, 8
obj_image_anim_frame 32, 8
obj_image_anim_frame 64, 8
obj_image_anim_frame 96, 8
obj_image_anim_jump 0
.align 2
gUnknown_085F5238:: @ 85F5238
.4byte gUnknown_085F5224
.align 2
gUnknown_085F523C:: @ 85F523C
.incbin "baserom.gba", 0x5f523c, 0x18
spr_template 0x03e9, 0x03ea, gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4
.align 2
gUnknown_085F5254:: @ 85F5254
.incbin "baserom.gba", 0x5f5254, 0x38
spr_template 0x03e9, 0x03eb, gUnknown_085F521C, gUnknown_085F5238, NULL, gDummySpriteAffineAnimTable, sub_817B7C4
.align 2
gUnknown_085F526C:: @ 85F526C
.2byte 0x00A0
.2byte 0xC000
.2byte 0x0400
.align 2
gUnknown_085F5274:: @ 85F5274
obj_image_anim_frame 0, 16
obj_image_anim_end
.align 2
gUnknown_085F527C:: @ 85F527C
obj_image_anim_frame 64, 16
obj_image_anim_end
.align 2
gUnknown_085F5284:: @ 85F5284
.4byte gUnknown_085F5274
.4byte gUnknown_085F527C
.align 2
gUnknown_085F528C:: @ 85F528C
.incbin "baserom.gba", 0x5f528c, 0x18
spr_template 0x03ec, 0x03ec, gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66
.align 2
gUnknown_085F52A4:: @ 85F52A4
.incbin "baserom.gba", 0x5f52a4, 0x18
spr_template 0x03ed, 0x03ed, gUnknown_085F526C, gUnknown_085F5284, NULL, gDummySpriteAffineAnimTable, nullsub_66
.align 2
gUnknown_085F52BC:: @ 85F52BC
.incbin "baserom.gba", 0x5f52bc, 0x10
obj_tiles gIntro2BrendanNoTurnGfx, 0x2000, 0x03ea
null_obj_tiles
.align 2
gUnknown_085F52CC:: @ 85F52CC
.incbin "baserom.gba", 0x5f52cc, 0x10
obj_tiles gIntro2MayNoTurnGfx, 0x2000, 0x03eb
null_obj_tiles
.align 2
gUnknown_085F52DC:: @ 85F52DC
.incbin "baserom.gba", 0x5f52dc, 0x20
obj_tiles gIntro2BicycleGfx, 0x1000, 0x03e9
null_obj_tiles
.align 2
gUnknown_085F52EC:: @ 85F52EC
obj_tiles gIntro2FlygonGfx, 0x1000, 0x03ec
null_obj_tiles
.align 2
gUnknown_085F52FC:: @ 85F52FC
.incbin "baserom.gba", 0x5f52fc, 0x10
obj_tiles gIntro2FlygonGfx, 0x1000, 0x03ed
null_obj_tiles
.align 2
gUnknown_085F530C:: @ 85F530C
.incbin "baserom.gba", 0x5f530c, 0x28
obj_pal gIntro2BrendanNoTurnPal, 0x03ea
obj_pal gIntro2BrendanNoTurnPal, 0x03eb
obj_pal gIntro2FlygonPal, 0x03ec
obj_pal gIntro2FlygonPal, 0x03ed
null_obj_pal
.align 2
gUnknown_085F5334:: @ 85F5334
.incbin "baserom.gba", 0x5f5334, 0x10
obj_tiles gIntro2BrendanGfx, 0x3800, 0x03ea
null_obj_tiles
.align 2
gUnknown_085F5344:: @ 85F5344
.incbin "baserom.gba", 0x5f5344, 0x10
obj_tiles gIntro2MayGfx, 0x3800, 0x03eb
null_obj_tiles
.align 2
gUnknown_085F5354:: @ 85F5354
.incbin "baserom.gba", 0x5f5354, 0x30
obj_tiles gIntro2BicycleGfx, 0x1000, 0x03e9
null_obj_tiles
.align 2
gUnknown_085F5364:: @ 85F5364
obj_tiles gIntro2LatiosGfx, 0x1000, 0x03ec
null_obj_tiles
.align 2
gUnknown_085F5374:: @ 85F5374
obj_tiles gIntro2LatiasGfx, 0x1000, 0x03ed
null_obj_pal
.align 2
gUnknown_085F5384:: @ 85F5384
.incbin "baserom.gba", 0x5f5384, 0x28
obj_pal gIntro2BrendanPal, 0x03ea
obj_pal gIntro2MayPal, 0x03eb
obj_pal gIntro2LatiosPal, 0x03ec
obj_pal gIntro2LatiasPal, 0x03ed
null_obj_pal
.align 2
gUnknown_085F53AC:: @ 85F53AC
.incbin "baserom.gba", 0x5f53ac, 0x10
obj_tiles gIntro2BrendanGfx, 0x2000, 0x03ea
null_obj_tiles
.align 2
gUnknown_085F53BC:: @ 85F53BC
.incbin "baserom.gba", 0x5f53bc, 0x8
obj_tiles gIntro2MayGfx, 0x2000, 0x03eb
null_obj_tiles