dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move field effect object template pointers to src

Browse Source
This commit is contained in:
GriffinR
2020-03-24 20:36:52 -04:00
parent 936529b3cb
commit d50ce48776
3 changed files with 76 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_object_movement.s
-38
View File
@@ -1161,42 +1161,4 @@ gObjectEventGraphicsInfoPointers:: @ 839FDB0
.4byte gObjectEventGraphicsInfo_83A4E40
.4byte gObjectEventGraphicsInfo_83A5134
gFieldEffectObjectTemplatePointers:: @ 83A0010
.4byte gUnknown_83A537C
.4byte gUnknown_83A5394
.4byte gUnknown_83A53AC
.4byte gUnknown_83A53C4
.4byte gUnknown_83A5420
.4byte gUnknown_83A5488
.4byte gUnknown_83A54E4
.4byte gUnknown_83A556C
.4byte gUnknown_83A5604
.4byte gUnknown_83A5648
.4byte gUnknown_83A5698
.4byte gUnknown_83A56F4
.4byte gUnknown_83A583C
.4byte gUnknown_83A589C
.4byte gUnknown_83A58E0
.4byte gUnknown_83A593C
.4byte gUnknown_83A59A4
.4byte gUnknown_83A5A30
.4byte gUnknown_83A5A88
.4byte gUnknown_83A5AD8
.4byte gUnknown_83A5B74
.4byte gUnknown_83A5C34
.4byte NULL
.4byte gUnknown_83A5750
.4byte gUnknown_83A5CB4
.4byte gUnknown_83A5D34
.4byte gUnknown_83A5E00
.4byte gUnknown_83A57EC
.4byte gUnknown_83A5D84
.4byte gUnknown_83A5B1C
.4byte gUnknown_83A5E38
.4byte gUnknown_83A5E64
.4byte gUnknown_83A5EC0
.4byte gUnknown_83A5F24
.4byte gUnknown_83A5FA4
.4byte gUnknown_83A5FE0
@9186
src/data/field_effects/field_effect_object_template_pointers.h
+74
View File
@@ -0,0 +1,74 @@
const struct SpriteTemplate gUnknown_83A537C;
const struct SpriteTemplate gUnknown_83A5394;
const struct SpriteTemplate gUnknown_83A53AC;
const struct SpriteTemplate gUnknown_83A53C4;
const struct SpriteTemplate gUnknown_83A5420;
const struct SpriteTemplate gUnknown_83A5488;
const struct SpriteTemplate gUnknown_83A54E4;
const struct SpriteTemplate gUnknown_83A556C;
const struct SpriteTemplate gUnknown_83A5604;
const struct SpriteTemplate gUnknown_83A5648;
const struct SpriteTemplate gUnknown_83A5698;
const struct SpriteTemplate gUnknown_83A56F4;
const struct SpriteTemplate gUnknown_83A583C;
const struct SpriteTemplate gUnknown_83A589C;
const struct SpriteTemplate gUnknown_83A58E0;
const struct SpriteTemplate gUnknown_83A593C;
const struct SpriteTemplate gUnknown_83A59A4;
const struct SpriteTemplate gUnknown_83A5A30;
const struct SpriteTemplate gUnknown_83A5A88;
const struct SpriteTemplate gUnknown_83A5AD8;
const struct SpriteTemplate gUnknown_83A5B74;
const struct SpriteTemplate gUnknown_83A5C34;
const struct SpriteTemplate gUnknown_83A5750;
const struct SpriteTemplate gUnknown_83A5CB4;
const struct SpriteTemplate gUnknown_83A5D34;
const struct SpriteTemplate gUnknown_83A5E00;
const struct SpriteTemplate gUnknown_83A57EC;
const struct SpriteTemplate gUnknown_83A5D84;
const struct SpriteTemplate gUnknown_83A5B1C;
const struct SpriteTemplate gUnknown_83A5E38;
const struct SpriteTemplate gUnknown_83A5E64;
const struct SpriteTemplate gUnknown_83A5EC0;
const struct SpriteTemplate gUnknown_83A5F24;
const struct SpriteTemplate gUnknown_83A5FA4;
const struct SpriteTemplate gUnknown_83A5FE0;
const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[] = {
&gUnknown_83A537C,
&gUnknown_83A5394,
&gUnknown_83A53AC,
&gUnknown_83A53C4,
&gUnknown_83A5420,
&gUnknown_83A5488,
&gUnknown_83A54E4,
&gUnknown_83A556C,
&gUnknown_83A5604,
&gUnknown_83A5648,
&gUnknown_83A5698,
&gUnknown_83A56F4,
&gUnknown_83A583C,
&gUnknown_83A589C,
&gUnknown_83A58E0,
&gUnknown_83A593C,
&gUnknown_83A59A4,
&gUnknown_83A5A30,
&gUnknown_83A5A88,
&gUnknown_83A5AD8,
&gUnknown_83A5B74,
&gUnknown_83A5C34,
NULL,
&gUnknown_83A5750,
&gUnknown_83A5CB4,
&gUnknown_83A5D34,
&gUnknown_83A5E00,
&gUnknown_83A57EC,
&gUnknown_83A5D84,
&gUnknown_83A5B1C,
&gUnknown_83A5E38,
&gUnknown_83A5E64,
&gUnknown_83A5EC0,
&gUnknown_83A5F24,
&gUnknown_83A5FA4,
&gUnknown_83A5FE0,
};
src/event_object_movement.c
+2 -2
View File
@@ -884,8 +884,8 @@ extern const u32 gUnknown_8394E28[];
#define OBJ_EVENT_PAL_TAG_34 0x1123
#define OBJ_EVENT_PAL_TAG_NONE 0x11FF
/*#include "data/object_events/object_event_graphics_info_pointers.h"
#include "data/field_effects/field_effect_object_template_pointers.h"*/
/*#include "data/object_events/object_event_graphics_info_pointers.h"*/
#include "data/field_effects/field_effect_object_template_pointers.h"
#include "data/object_events/object_event_pic_tables.h"
#include "data/object_events/object_event_anims.h"
#include "data/object_events/base_oam.h"