summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-05-04 00:37:07 +0000
committerYamaArashi <YamaArashi@users.noreply.github.com>2017-05-03 17:37:07 -0700
commit7f03ba4951c5045274dab3f2a3de8e8d498b8df3 (patch)
treeeea2b7a29e0eccff7057d6f4cb5eef42f5cd124c /data
parentf2eb51932811b66b083ab0c6a7663d846f274888 (diff)
decompile a little more of player_pc.c and dump half of battle_anim data incbins (#254)
* matching sub_813A280 and sub_813A4B4 * move data to item_use.c * slightly less ugly NewGameInitPCItems * more less ugly NewGameInitPCItems - Game Freak doesn't know how to use structs * decompile HandleQuantityRolling and sub_813A6FC * partially label and comment battle_anim.c * decompile sub_813A794 and sub_813A83C * minor comments on battle_anim.c * decompile up to GF shenanigans #14390 * up to GF shenanigans #38571 * dump half of battle_anim_80CA710.s incbins * dump most incbins from battle_anim_812C144.s * obj_rot_scal fixes * subsprite * i cant even identify byte arrays
Diffstat (limited to 'data')
-rw-r--r--data/battle_anim_80CA710.s57
-rw-r--r--data/battle_anim_812C144.s69
-rw-r--r--data/player_pc.s2
3 files changed, 103 insertions, 25 deletions
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s
index 88d88d99f..1c7bb061f 100644
--- a/data/battle_anim_80CA710.s
+++ b/data/battle_anim_80CA710.s
@@ -1303,7 +1303,16 @@ gSpriteAffineAnim_83D7250:: @ 83D7250
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x003d7278, 0x48
+@ unused
+ obj_rot_scal_anim_frame 16, 16, 0, 0
+ obj_rot_scal_anim_frame 30, 30, 0, 8
+ obj_rot_scal_anim_frame 0, 0, 0, 16
+ obj_rot_scal_anim_loop 0
+ obj_rot_scal_anim_frame 0, 0, 4, 11
+ obj_rot_scal_anim_frame 0, 0, -4, 11
+ obj_rot_scal_anim_loop 2
+ obj_rot_scal_anim_frame -30, -30, 0, 8
+ obj_rot_scal_anim_end 0
.align 2
gSpriteAffineAnimTable_83D72C0:: @ 83D72C0
@@ -1605,10 +1614,17 @@ gBattleAnimSpriteTemplate_83D76DC:: @ 83D76DC
.align 2
gUnknown_083D76F4:: @ 83D76F4
- .incbin "baserom.gba", 0x003d76f4, 0x20
+ obj_rot_scal_anim_frame -6, 4, 0, 8
+ obj_rot_scal_anim_frame 10, -10, 0, 8
+ obj_rot_scal_anim_frame -4, 6, 0, 8
+ obj_rot_scal_anim_end 0
+ .align 2
gUnknown_083D7714:: @ 83D7714
- .incbin "baserom.gba", 0x003d7714, 0x20
+ obj_rot_scal_anim_frame -4, -5, 0, 12
+ obj_rot_scal_anim_frame 0, 0, 0, 24
+ obj_rot_scal_anim_frame 4, 5, 0, 12
+ obj_rot_scal_anim_end 0
.align 2
gSpriteAnim_83D7734:: @ 83D7734
@@ -1651,7 +1667,12 @@ gBattleAnimSpriteTemplate_83D7798:: @ 83D7798
.align 2
gUnknown_083D77B0:: @ 83D77B0
- .incbin "baserom.gba", 0x003d77b0, 0x30
+ obj_rot_scal_anim_frame -10, 9, 0, 7
+ obj_rot_scal_anim_frame 20, -20, 0, 7
+ obj_rot_scal_anim_frame -20, 20, 0, 7
+ obj_rot_scal_anim_frame 10, -9, 0, 7
+ obj_rot_scal_anim_loop 2
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_83D77E0:: @ 83D77E0
@@ -1769,7 +1790,8 @@ gBattleAnimSpriteTemplate_83D79A4:: @ 83D79A4
.align 2
gUnknown_083D79BC:: @ 83D79BC
- .incbin "baserom.gba", 0x003d79bc, 0x10
+ obj_rot_scal_anim_frame 96, -13, 0, 8
+ obj_rot_scal_anim_end 0
.align 2
gSpriteAnim_83D79CC:: @ 83D79CC
@@ -1981,7 +2003,10 @@ gBattleAnimSpriteTemplate_83D7C90:: @ 83D7C90
.align 2
gUnknown_083D7CA8:: @ 83D7CA8
- .incbin "baserom.gba", 0x003d7ca8, 0x20
+ obj_rot_scal_anim_frame -12, 8, 0, 4
+ obj_rot_scal_anim_frame 20, -20, 0, 4
+ obj_rot_scal_anim_frame -8, 12, 0, 4
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_83D7CC8:: @ 83D7CC8
@@ -3483,7 +3508,8 @@ gBattleAnimSpriteTemplate_83DA498:: @ 83DA498
spr_template 10270, 10270, gOamData_837DF94, gSpriteAnimTable_83DA490, NULL, gDummySpriteAffineAnimTable, sub_80DA4D8
.align 2
- .incbin "baserom.gba", 0x003da4b0, 0x20
+@ unused palette
+ .incbin "graphics/unknown/unknown_3DA4B0.gbapal"
.align 2
gSpriteTemplate_83DA4D0:: @ 83DA4D0
@@ -3730,10 +3756,16 @@ gBattleAnimSpriteTemplate_83DA88C:: @ 83DA88C
.align 2
gUnknown_083DA8A4:: @ 83DA8A4
- .incbin "baserom.gba", 0x003da8a4, 0x20
+ obj_rot_scal_anim_frame -8, 10, 0, 16
+ obj_rot_scal_anim_frame 18, -18, 0, 16
+ obj_rot_scal_anim_frame -20, 16, 0, 8
+ obj_rot_scal_anim_end 0
+ .align 2
gUnknown_083DA8C4:: @ 83DA8C4
- .incbin "baserom.gba", 0x003da8c4, 0x18
+ obj_rot_scal_anim_frame 64, -4, 0, 20
+ obj_rot_scal_anim_frame 0, 0, 0, -56
+ obj_rot_scal_anim_end 0
.align 2
gSpriteTemplate_83DA8DC:: @ 83DA8DC
@@ -3986,10 +4018,12 @@ gBattleAnimSpriteTemplate_83DACE8:: @ 83DACE8
.align 2
Unknown_3DAD00:: @ 83DAD00
- .incbin "baserom.gba", 0x3dad00, 0x10
+ subsprite -16, 0, 1, 0, 32x16
+ subsprite 16, 0, 1, 8, 32x16
.align 2
gUnknown_083DAD10:: @ 83DAD10
+@ the first argument is likely the amount of structs there are in the pointed data.
.4byte 0x2, Unknown_3DAD00
.align 2
@@ -4574,7 +4608,8 @@ gBattleAnimSpriteTemplate_83DB550:: @ 83DB550
.align 2
gUnknown_083DB568:: @ 83DB568
- .incbin "baserom.gba", 0x003db568, 0x4
+@ seems to be a src element in a LoadPalette call.
+ .2byte 0x7FFF
.align 2
gUnknown_083DB56C:: @ 83DB56C
diff --git a/data/battle_anim_812C144.s b/data/battle_anim_812C144.s
index 62e3b45ae..acd704a85 100644
--- a/data/battle_anim_812C144.s
+++ b/data/battle_anim_812C144.s
@@ -189,7 +189,10 @@ gBattleAnimSpriteTemplate_84023E8:: @ 84023E8
.align 2
gUnknown_08402400:: @ 8402400
- .incbin "baserom.gba", 0x00402400, 0x20
+ obj_rot_scal_anim_frame -12, 8, 0, 4
+ obj_rot_scal_anim_frame 20, -20, 0, 4
+ obj_rot_scal_anim_frame -8, 12, 0, 4
+ obj_rot_scal_anim_end 0
.align 2
gSpriteAnim_8402420:: @ 8402420
@@ -238,7 +241,10 @@ gBattleAnimSpriteTemplate_8402498:: @ 8402498
.align 2
gUnknown_084024B0:: @ 84024B0
- .incbin "baserom.gba", 0x004024b0, 0x20
+ obj_rot_scal_anim_frame -12, 20, 0, 8
+ obj_rot_scal_anim_frame 12, -20, 0, 8
+ obj_rot_scal_anim_loop 2
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_84024D0:: @ 84024D0
@@ -254,11 +260,21 @@ gSpriteTemplate_8402500:: @ 8402500
.align 2
gUnknown_08402518:: @ 8402518
- .incbin "baserom.gba", 0x00402518, 0x28
+ obj_rot_scal_anim_frame 8, -8, 0, 12
+ obj_rot_scal_anim_frame -16, 16, 0, 12
+ obj_rot_scal_anim_frame 8, -8, 0, 12
+ obj_rot_scal_anim_loop 1
+ obj_rot_scal_anim_end 0
.align 2
gUnknown_08402540:: @ 8402540
- .incbin "baserom.gba", 0x00402540, 0x38
+ obj_rot_scal_anim_frame 0, 6, 0, 20
+ obj_rot_scal_anim_frame 0, 0, 0, 20
+ obj_rot_scal_anim_frame 0, -18, 0, 6
+ obj_rot_scal_anim_frame -18, -18, 0, 3
+ obj_rot_scal_anim_frame 0, 0, 0, 15
+ obj_rot_scal_anim_frame 4, 4, 0, 13
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_8402578:: @ 8402578
@@ -266,11 +282,16 @@ gBattleAnimSpriteTemplate_8402578:: @ 8402578
.align 2
gUnknown_08402590:: @ 8402590
- .incbin "baserom.gba", 0x00402590, 0x30
+ obj_rot_scal_anim_frame 0, 6, 0, 20
+ obj_rot_scal_anim_frame 0, 0, 0, 20
+ obj_rot_scal_anim_frame 7, -30, 0, 6
+ obj_rot_scal_anim_frame 0, 0, 0, 20
+ obj_rot_scal_anim_frame -2, 3, 0, 20
+ obj_rot_scal_anim_end 0
.align 2
gUnknown_084025C0:: @ 84025C0
- .incbin "baserom.gba", 0x004025c0, 0x4
+ .byte 0xE8, 0x18, 0xFC, 0x00 @ last could be align padding
.align 2
gSpriteAnim_84025C4:: @ 84025C4
@@ -300,13 +321,18 @@ gBattleAnimSpriteTemplate_84025EC:: @ 84025EC
.align 2
gUnknown_08402604:: @ 8402604
- .incbin "baserom.gba", 0x00402604, 0x4
+ .byte 0x78, 0x50, 0x28, 0x00 @ last could be align padding
+ .align 2
gUnknown_08402608:: @ 8402608
.incbin "baserom.gba", 0x00402608, 0x8
+ .align 2
gUnknown_08402610:: @ 8402610
- .incbin "baserom.gba", 0x00402610, 0x20
+ obj_rot_scal_anim_frame 0, -15, 0, 7
+ obj_rot_scal_anim_frame 0, 15, 0, 7
+ obj_rot_scal_anim_loop 2
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_8402630:: @ 8402630
@@ -352,7 +378,8 @@ gBattleAnimSpriteTemplate_84026A4:: @ 84026A4
spr_template 10238, 10238, gOamData_837DF24, gSpriteAnimTable_8402698, NULL, gDummySpriteAffineAnimTable, sub_812E7A0
.align 2
- .incbin "baserom.gba", 0x004026bc, 0x20
+@ probably unknown palette
+ .incbin "graphics/unknown/unknown_4026BC.gbapal"
.align 2
gSpriteAnim_84026DC:: @ 84026DC
@@ -383,7 +410,12 @@ gBattleAnimSpriteTemplate_8402738:: @ 8402738
.align 2
gUnknown_08402750:: @ 8402750
- .incbin "baserom.gba", 0x00402750, 0x30
+ obj_rot_scal_anim_frame 16, 0, 0, 4
+ obj_rot_scal_anim_frame 0, -3, 0, 16
+ obj_rot_scal_anim_frame 4, 0, 0, 4
+ obj_rot_scal_anim_frame 0, 0, 0, 24
+ obj_rot_scal_anim_frame -5, 3, 0, 16
+ obj_rot_scal_anim_end 0
.align 2
gSpriteAffineAnim_8402780:: @ 8402780
@@ -457,12 +489,16 @@ gBattleAnimSpriteTemplate_8402894:: @ 8402894
.align 2
gUnknown_084028AC:: @ 84028AC
- .incbin "baserom.gba", 0x004028ac, 0x20
+ obj_rot_scal_anim_frame -16, 16, 0, 6
+ obj_rot_scal_anim_frame 16, -16, 0, 12
+ obj_rot_scal_anim_frame -16, 16, 0, 6
+ obj_rot_scal_anim_end 0
.align 2
gSpriteTemplate_84028CC:: @ 84028CC
spr_template 10243, 10243, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812FF94
+ .align 2
gUnknown_084028E4:: @ 84028E4
.incbin "baserom.gba", 0x004028e4, 0x30
@@ -521,7 +557,9 @@ gBattleAnimSpriteTemplate_84029C4:: @ 84029C4
.align 2
gUnknown_084029DC:: @ 84029DC
- .incbin "baserom.gba", 0x004029dc, 0x18
+ obj_rot_scal_anim_frame 0, -16, 0, 6
+ obj_rot_scal_anim_frame 0, 16, 0, 6
+ obj_rot_scal_anim_end 0
.align 2
gBattleAnimSpriteTemplate_84029F4:: @ 84029F4
@@ -597,4 +635,9 @@ gBattleAnimSpriteTemplate_8402B10:: @ 8402B10
.align 2
gUnknown_08402B28:: @ 8402B28
- .incbin "baserom.gba", 0x00402b28, 0x30
+ obj_rot_scal_anim_frame 0, 16, 0, 4
+ obj_rot_scal_anim_frame -2, 0, 0, 8
+ obj_rot_scal_anim_frame 0, 4, 0, 4
+ obj_rot_scal_anim_frame 0, 0, 0, 24
+ obj_rot_scal_anim_frame 1, -5, 0, 16
+ obj_rot_scal_anim_end 0
diff --git a/data/player_pc.s b/data/player_pc.s
index fe46b0443..200ae19c2 100644
--- a/data/player_pc.s
+++ b/data/player_pc.s
@@ -43,7 +43,7 @@ gUnknown_084062E8:: @ 84062E8
.align 2
gNewGamePCItems:: @ 84062F0
.2byte ITEM_POTION, 1
- .2byte 0, 0
+ .2byte ITEM_NONE, 0
.align 2
gUnknown_084062F8:: @ 84062F8