From 2bd86dad2fddb1c836b462a4137fab724c7eb305 Mon Sep 17 00:00:00 2001 From: Deokishisu Date: Sun, 14 Oct 2018 12:26:48 -0400 Subject: [PATCH 1/3] Rename Boy4 to RichBoy --- .../pics/people/{boy_4.png => rich_boy.png} | Bin spritesheet_rules.mk | 2 +- .../field_event_obj/event_object_graphics.h | 2 +- .../event_object_graphics_info.h | 2 +- .../event_object_graphics_info_pointers.h | 4 ++-- .../field_event_obj/event_object_pic_tables.h | 20 +++++++++--------- 6 files changed, 15 insertions(+), 15 deletions(-) rename graphics/event_objects/pics/people/{boy_4.png => rich_boy.png} (100%) diff --git a/graphics/event_objects/pics/people/boy_4.png b/graphics/event_objects/pics/people/rich_boy.png similarity index 100% rename from graphics/event_objects/pics/people/boy_4.png rename to graphics/event_objects/pics/people/rich_boy.png diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 2f5bfe608..2aec2c43c 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -171,7 +171,7 @@ $(EVENTOBJGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_4.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(EVENTOBJGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index a99d5a779..c22bfea90 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -81,7 +81,7 @@ const u32 gEventObjectPic_LittleBoy2[] = INCBIN_U32("graphics/event_objects/pics const u32 gEventObjectPic_LittleGirl2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2.4bpp"); const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); -const u32 gEventObjectPic_Boy4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4.4bpp"); +const u32 gEventObjectPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp"); const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h index fd8bb78ce..df916e218 100755 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ b/src/data/field_event_obj/event_object_graphics_info.h @@ -17,7 +17,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2 = {0xFF const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy4, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RichBoy, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index c0ca57b60..12c32eb13 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -16,7 +16,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2; @@ -265,7 +265,7 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = &gEventObjectGraphicsInfo_LittleGirl2, &gEventObjectGraphicsInfo_Boy3, &gEventObjectGraphicsInfo_Girl3, - &gEventObjectGraphicsInfo_Boy4, + &gEventObjectGraphicsInfo_RichBoy, &gEventObjectGraphicsInfo_Woman1, &gEventObjectGraphicsInfo_FatMan, &gEventObjectGraphicsInfo_Woman2, diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h index 40a6ad61c..33581348a 100755 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -229,16 +229,16 @@ const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = { overworld_frame(gEventObjectPic_Girl3, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = { - overworld_frame(gEventObjectPic_Boy4, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 3), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 4), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 5), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 6), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 7), - overworld_frame(gEventObjectPic_Boy4, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_RichBoy[] = { + overworld_frame(gEventObjectPic_RichBoy, 2, 4, 0), + overworld_frame(gEventObjectPic_RichBoy, 2, 4, 1), + overworld_frame(gEventObjectPic_RichBoy, 2, 4, 2), + overworld_frame(gEventObjectPic_RichBoy, 2, 4, 3), + overworld_frame(gEventObjectPic_RichBoy, 2, 4, 4), + overworld_frame(gEventObjectPic_RichBoy, 2, 4, 5), + overworld_frame(gEventObjectPic_RichBoy, 2, 4, 6), + overworld_frame(gEventObjectPic_RichBoy, 2, 4, 7), + overworld_frame(gEventObjectPic_RichBoy, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = { From d7ba8a306c7e8a49ee128deef69de49c7cee1d52 Mon Sep 17 00:00:00 2001 From: Deokishisu Date: Sun, 14 Oct 2018 15:49:55 -0400 Subject: [PATCH 2/3] Rename OW Sprites Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed. Renamed: LittleBoy1 -> NinjaBoy LittleGirl1 -> Twin Woman2 -> PokefanF OldMan1 -> ExpertM OldWoman1 -> ExpertF Man3 -> PokefanM Woman6 -> LinkReceptionist Man7 -> DevonEmployee Boy4 -> RichBoy Boy5 -> GameboyKid (Consistent with pokecrystal) ContestOldMan -> ContestJudge Renamed Because of Numbering Changes: LittleBoy2 -> LittleBoy LittleGirl2 -> LittleGirl OldWoman2 -> OldWoman OldMan2 -> OldMan Man4 -> Man3 Man5 -> Man4 Man6 -> Man5 Woman3 -> Woman2 Woman4 -> Woman3 Woman5 -> Woman4 Woman7 -> Woman5 --- ...{contest_old_man.png => contest_judge.png} | Bin .../people/{man_7.png => devon_employee.png} | Bin .../people/{old_woman_1.png => expert_f.png} | Bin .../people/{old_man_1.png => expert_m.png} | Bin .../people/{boy_5.png => gameboy_kid.png} | Bin .../{woman_6.png => link_receptionist.png} | Bin .../{little_boy_2.png => little_boy.png} | Bin .../{little_girl_2.png => little_girl.png} | Bin graphics/event_objects/pics/people/man_3.png | Bin 784 -> 742 bytes graphics/event_objects/pics/people/man_4.png | Bin 742 -> 704 bytes graphics/event_objects/pics/people/man_5.png | Bin 704 -> 741 bytes graphics/event_objects/pics/people/man_6.png | Bin 741 -> 0 bytes .../{little_boy_1.png => ninja_boy.png} | Bin .../people/{old_man_2.png => old_man.png} | Bin .../people/{old_woman_2.png => old_woman.png} | Bin .../event_objects/pics/people/pokefan_f.png | Bin 0 -> 756 bytes .../event_objects/pics/people/pokefan_m.png | Bin 0 -> 784 bytes .../people/{little_girl_1.png => twin.png} | Bin .../event_objects/pics/people/woman_2.png | Bin 756 -> 774 bytes .../event_objects/pics/people/woman_3.png | Bin 774 -> 701 bytes .../event_objects/pics/people/woman_4.png | Bin 701 -> 736 bytes .../event_objects/pics/people/woman_5.png | Bin 736 -> 830 bytes .../event_objects/pics/people/woman_7.png | Bin 830 -> 0 bytes spritesheet_rules.mk | 40 +- .../field_event_obj/event_object_graphics.h | 38 +- .../event_object_graphics_info.h | 42 +- .../event_object_graphics_info_pointers.h | 76 ++-- .../field_event_obj/event_object_pic_tables.h | 392 +++++++++--------- 28 files changed, 294 insertions(+), 294 deletions(-) rename graphics/event_objects/pics/people/{contest_old_man.png => contest_judge.png} (100%) rename graphics/event_objects/pics/people/{man_7.png => devon_employee.png} (100%) rename graphics/event_objects/pics/people/{old_woman_1.png => expert_f.png} (100%) rename graphics/event_objects/pics/people/{old_man_1.png => expert_m.png} (100%) rename graphics/event_objects/pics/people/{boy_5.png => gameboy_kid.png} (100%) rename graphics/event_objects/pics/people/{woman_6.png => link_receptionist.png} (100%) rename graphics/event_objects/pics/people/{little_boy_2.png => little_boy.png} (100%) rename graphics/event_objects/pics/people/{little_girl_2.png => little_girl.png} (100%) delete mode 100644 graphics/event_objects/pics/people/man_6.png rename graphics/event_objects/pics/people/{little_boy_1.png => ninja_boy.png} (100%) rename graphics/event_objects/pics/people/{old_man_2.png => old_man.png} (100%) rename graphics/event_objects/pics/people/{old_woman_2.png => old_woman.png} (100%) create mode 100644 graphics/event_objects/pics/people/pokefan_f.png create mode 100644 graphics/event_objects/pics/people/pokefan_m.png rename graphics/event_objects/pics/people/{little_girl_1.png => twin.png} (100%) delete mode 100644 graphics/event_objects/pics/people/woman_7.png diff --git a/graphics/event_objects/pics/people/contest_old_man.png b/graphics/event_objects/pics/people/contest_judge.png similarity index 100% rename from graphics/event_objects/pics/people/contest_old_man.png rename to graphics/event_objects/pics/people/contest_judge.png diff --git a/graphics/event_objects/pics/people/man_7.png b/graphics/event_objects/pics/people/devon_employee.png similarity index 100% rename from graphics/event_objects/pics/people/man_7.png rename to graphics/event_objects/pics/people/devon_employee.png diff --git a/graphics/event_objects/pics/people/old_woman_1.png b/graphics/event_objects/pics/people/expert_f.png similarity index 100% rename from graphics/event_objects/pics/people/old_woman_1.png rename to graphics/event_objects/pics/people/expert_f.png diff --git a/graphics/event_objects/pics/people/old_man_1.png b/graphics/event_objects/pics/people/expert_m.png similarity index 100% rename from graphics/event_objects/pics/people/old_man_1.png rename to graphics/event_objects/pics/people/expert_m.png diff --git a/graphics/event_objects/pics/people/boy_5.png b/graphics/event_objects/pics/people/gameboy_kid.png similarity index 100% rename from graphics/event_objects/pics/people/boy_5.png rename to graphics/event_objects/pics/people/gameboy_kid.png diff --git a/graphics/event_objects/pics/people/woman_6.png b/graphics/event_objects/pics/people/link_receptionist.png similarity index 100% rename from graphics/event_objects/pics/people/woman_6.png rename to graphics/event_objects/pics/people/link_receptionist.png diff --git a/graphics/event_objects/pics/people/little_boy_2.png b/graphics/event_objects/pics/people/little_boy.png similarity index 100% rename from graphics/event_objects/pics/people/little_boy_2.png rename to graphics/event_objects/pics/people/little_boy.png diff --git a/graphics/event_objects/pics/people/little_girl_2.png b/graphics/event_objects/pics/people/little_girl.png similarity index 100% rename from graphics/event_objects/pics/people/little_girl_2.png rename to graphics/event_objects/pics/people/little_girl.png diff --git a/graphics/event_objects/pics/people/man_3.png b/graphics/event_objects/pics/people/man_3.png index a41a1ee9b5b1f583ab8d682d86e403a5fc92f277..05a87d4ddbec40b096f3bff8d9bf61cff0c1749b 100644 GIT binary patch delta 658 zcmV;D0&V?}2Id8jV1IE*L_t(YiS3jzYui8=hQC2zFobCg~lGLe&5NG%q5}F*|$7; zzdOB;Ie`IoYqxgmAB!=W_5bU!EYZNKHMYt2J%YQ18|EsORe!;!T-CB_L@Q<{kVTR( zp;N0=s`%tkp)KZusX!JP=refwa>>{h@92{779iA6o zJC>aZWRWaPs1%EZMxkLU)NC;mo)q3Pyp&WRiEarKDvt_3_X=;Yh%S|i_8v0)E~!8g z$-|mkqAAbV;#@AUB;Hkdfc-+hcl1LV&1jW!a!vuIhMRUr=!Qng;$RbIY67oI6 zD0h(&V-XTchSA&-$Rb&o5I%Y@f4QefKZ^WQYB;%e5$i-i>|@@Dgs`6pQ?9)B)a?*C zCqlqmSfuDAzz2`GFcqCdl!*)ciTN`+hbLdWBPu#?Pk%Wbh6@Tpn1>M_O4N5Z-s==&81l4mrca#xt!KJU6$Ks0;ev~l^y0>%adoFoHj&piX z{W_d{rlQGkG8BVBI2V0f?1MVy?j1QC`}`9QCLZ@gu@R2caGMZb#kd^B|Agw7cz=-O s0cAWa#Og44@4l67$3i(LlX(0Wu|3SHI+O%!01E&B07*qoM6N<$f`xD|asU7T delta 700 zcmV;t0z>`g1&{`iV1JuQL_t(YiS3j>Z__{+#&57xDUwx%tQ82mLQNNh&jPig;u>4& zpMkCA1JDN435mkSRw1`z+JR(3ZH1D2g@gfh^jSn=V8AETZ%|-G3h#4`o%G5diMj8P z=bp3g`Pp~Q%h*+2)m8nYl)9+4>i=JklsZAhJ*{>slivdV1b-Z=ExTPwBfBeQ4>PHh z@FRc$GJ%<mSiF`{P#niS3R*0d6g}$*a1nF~n5m@@q=bbhl!>4qSJ8In00U$KbG7{2-)?*l zgryLq1gi{mP=5|EKqfF(7I=>1`Z!d|p^1v)E-t7MzyO)RT$#l^mkWFiRDF2v`TY^V z1R20wSu5b&-y=m3DGNCt2bdrem}|KehI@5UD0h_V)Za2z*zM3STh0K`9r8nv2JVc2 zIoR#An;lOS+;*eU^bpjJnlwKLzyV_`(0yUe5vUE{B!A$($bp$wX5U27?%{N0wh={* z!)eCa%^3vw0Mvz5hGNqJf`^BN*>;?5yaZ)`7DM zo!DI8Tz`K?T3cJI;ZHcRQGEi@0LC;3*ENVdl>Fo|uWsQ~-)-Ulb?yK{L_1Rm{ zo@buJ4|rI0K2ngg5%PgYui8=hu=YPP%x!gGKScO4owL}hAa(LY=MT@quo#76X_(mLN6(W zd<^4~p;JrOlFiA|21>9Eq48GrJEUDYy6>y=oy65`p|fv!^na6dzej%$U_I7jJ^nEe zZASmsBW2!zy*@5;_y@si;gX^+WskN*SIRC^O4*Of0$XGWHB;H`@)q`}fX={__^c$b zMV7D-hiR@%`2;S+wATv@fgy`Z)IuZ1cry$!5^6#OF{*3T0z(#+xfE(9o7)fKK^*XO znt*T^zes7K5q}u6sGt#QIuEzMZ*2@b!I_``;Z_ZaT40N8p&ub=#N31>%ATzU!XmP=Z|K7b07z z30da*vl(--V1m9oJ1cyIARfJ=6NC1tbcUgPp7ZvH=1;5lS}Gzo{(Td zv2sD8PoA?wB9%$_(bGah=katjntt&#`CgB{(E%<#Sb5VtgXFM?@0kKogb1v|8kLj@NJ;S`(&Wo~n zHGh^VzkkiJAc!R3w<)N&)c|NUND!^aiQE3ne0Ajp{L|i(^fSFFNWb%Oq?Q>>_?ZT% z79cAl`iR5)0{nc3I2)c^M+E^#qrB*?e5V$$m-4xlk5w;9DmsynzQewpbF=7B1oMK99F)=X!82|tO00019_HbCg~lGLe&5NG%q5}F*?+e@dcQlpk2!$>c5AnG z>mQ3Tnf3qcu`JQRsx`LB_C12Tg&XE7mQ}&0T-CB_L@Q<{kVTR(p;N0=s`%tkp)KZu zsX!JP=refwa>>{h@92{779iA6oJC>aZWRWaPs1%EZ zMxkLU)NC;mo_`eHGQ5;jAc<}X6Dp4iKlci6u!t^|iuN8d{4S|L63N1p@a$lr?;isE z#@AUB;Hkdfc-+hcl1LV&1jW!a!vuIhMRUr=!Qng;$RbIY67oI6D0h(&V-XTchSA&- z$Rb&o5I%Y@f4QefKZ^WQYB;%e5$i-i>|@@Dgs`6pQ-7|!_SEeVIVVEETUey%B)|uc zxG)u+M3jjO{E7K9I)^7;ydx?)Z%;WLM_O z4N5Z-s==&81l4mrca#xt!KJU6$Ks0;ev~l^y0>%adoFoHj&piX{W_d{rlQGkG8BVB zI2V0f?1MVy?j1QC`}`9QCLZ@gu@R2caGMZb#WT1Z#s7rrmw11WnzQewpbF=7B1oMK99F)=X!82|tO00019_HJ;Z|uJa zD3b;g$c-7YD47znSfZgdU82yxP)f%Z_x+?w7t2nE&bj5eSAVB_pOa)v^f(^J<+9*GVM)((U7smLM$vc2gJr=(!h*E}(eI0aUmLrw z=M8<5LJYmZeL+Q35o%(m6n;&3{k|)F+LqGm54E5oS`rqdaYM?+FuQ<8qU}*@j6N+` z6jg;Kji(Ka4}Z2Hd4sg6(?pTff~u$@ENQH@8;#D$Hr6D@h>Nev*m*2IZDyj%e((RRH?OcGL=JQ`5 zIVj4I3o?;|T!@&C78ay5b(|yt@8b9_;Ujh}USEe`mw$h;Gl))YV;!R3oWDVMYL~)- z_2g?DzfW)KNgBsVdV`})FVJUfK`=$EpF?zM8(R?Fa=w7@(k_H0jc4)xS^U`sqX^_@ zeRYS0T?pRs#%qXX$PmSxfn-L7u%z)~dbWT5#Rj7Y#4~o5 zZk?jY;eY$7r=mzrG%4+F@(pzeI&FNFHbh(iQJx{>qFHk%D@te0>|LHHj3Z4lCq2bL zahE^;CIsP%Jh65XW_o4qg7hRfItkurk{KL^S&>o`ey2T5!sV=#qtsq@08Ds;w|DG@ znxuqa(Az*|G*xi8BJ%?TC^`;!#tSMm7ii{}DKf9kRV%Wo!V@-{Vvkg~`rr5O{i>K1 fCt1wJl|20cYZ}H^>FTVk00000NkvXXu0mjfS3*dO delta 660 zcmV;F0&D%{1;7Q6IDcx3tT{?z2oNCEbEKp}b5bBd)z#IDiYui8=hu=YPP%x!gGKScO4owL}hAa(LY=MT@quo#76X_(mLN6(W zd<^4~p;JrOlFiA|21>9Eq48GrJEUDYy6>y=oy65`p|fv!^na6dzej%$U_I7jJ^nEe zZASmsBW2!zy*@5;_y@si;gX^+WskN*SIRC^O4*Of0$XGWHB;H`@)q`}fX={__^c$b zMV7D-hiR@%`2;S+wATv@fgy`Z)IuZ1cry$!5^6#OF{*3T0z(#+xfE(9o7)fKK^*XO znt*T^zes7K5q}u6sGt#QIuEzMZ*2@b!I_``;Z_ZaT40N8p&ub=#N31>%ATzU!XmP=Z|K7b07z z30da*vl(--V1m9oJ1cyIARfJ=6NC1tbcUgPp7ZvH=1;5lS}Gzo{(Td zv2sD8PoA?wB9%$_(bGah=katjntt&#`CgB{(E%<#Sb5VtgXFM?@0kKogb1v|8kLj@NJ;S`(&Wo~n zHGh^VzkkiJAc!R3w<)N&)c|NUND!^aiQE3ne0Ajp{L|i(^fSFFNWb%Oq?Q>>_?ZT% z79cAl`iR5)0{nc3I2)c^M+E^#qrB*?e5V$$m-4xlk5w;9DmsyBjE7>2(=)FANSsk?2+5K5rRm{MU20&YSl%WD^%Y0`pfh;Qt_2q=>V z6UdDjvM8AnvRI;_HC>|6zfelY7We(6N*Bvcht9d>xmTxqpOa)v^f(^J<+9*GVM)((U7smLM$vc2gJr=(!h*E}(eI0aUmLrw=M8<5 zLJYmZeL+Q35o%(m6n;&3{k|)F+LqGm54E5oS`rqdaYM?+FuQ<8qU}*@j6N+`6jg;K zji(Ka54ItBgS4sBM3K~js;D9?X{@yyjn2q6)+EM=i@KO-K}EDAEJ)qwKQ>yMM6bE% zCl)qZQhvNASQJ%-CCRXwP0PkxpG!HnIa{Nb-?gABst8Nc?UiNiT!5eE^Isr2D9Vrv zGLeH^h?tHR7Nj(FoFoD7;`lD%BX%ubUx#3qf3Y)&PHkfyqTigqL3nDH!h-eWYaG8% zZ|X@J$4PpFqfIZ+XKX<*MXaAgbZHw~5Z!XVfbh~Tge8q<@%~x-*#@HsK1Ct1wJl|20c XYZ}H^>FTVk00000NkvXXu0mjfK;=}K diff --git a/graphics/event_objects/pics/people/little_boy_1.png b/graphics/event_objects/pics/people/ninja_boy.png similarity index 100% rename from graphics/event_objects/pics/people/little_boy_1.png rename to graphics/event_objects/pics/people/ninja_boy.png diff --git a/graphics/event_objects/pics/people/old_man_2.png b/graphics/event_objects/pics/people/old_man.png similarity index 100% rename from graphics/event_objects/pics/people/old_man_2.png rename to graphics/event_objects/pics/people/old_man.png diff --git a/graphics/event_objects/pics/people/old_woman_2.png b/graphics/event_objects/pics/people/old_woman.png similarity index 100% rename from graphics/event_objects/pics/people/old_woman_2.png rename to graphics/event_objects/pics/people/old_woman.png diff --git a/graphics/event_objects/pics/people/pokefan_f.png b/graphics/event_objects/pics/people/pokefan_f.png new file mode 100644 index 0000000000000000000000000000000000000000..c97fc3507007dc91db3ed4ba2a5fcc98f3595ac3 GIT binary patch literal 756 zcmVBjE6bJAd1OkHwx08oZnt19GumpubK(Sp9hIXnvbm)}GYoK5crn}Oi zkj>Im8aGse%pN3v0-Zo6Lm<&@ZYUW9?I-AaC+qB7n-)6z2LJWU-TU3i<_Ou0&De~8 z4928P|F4f0M|`D5DNhzA4*(BrdmY9kj5!_$ta&G011*okzq35f{!eOFDTdtRTjfx1Rz1bfn{cNUafA? zgvHP)1nQvnI0Iq@+=paPq?SBAtv$+84OqZa(%jvd@3XW7WJm@@lFP=ACp-Iab~tPT zXIFH+VXze-K{6;37H)6rCcJe917Ckz*I5DVB5>LGc@L66k)$%w_3kIg3&yS?$)tO6 zO;&&m$)HHz4+77F3}8T3T+e|ZK?z_6P%j}41}jixFm{|1oano*2U&6aF*H(YC4hNq z@;X?8P$TFfSi;IP*Kyp>W|@S1^}X|BqU<4n3o*}3We*%5YY)UT6TuI>5x}^?)^ps+ zJELWMcbtzcgOIys*X|S2g~mP}#RFi%>k}7icg*W0C{h``34$+uQ|Y|T^KXZ+qr7GG zppgnd6JK^6Aeg8ERMY@sgGK!uL2@^#^BiCUco^}Z~ZmiyrUv*llrRxcQIUd9CxVZV$aQLU1siRrS mFSeof_sf|{4|2T}i_c$vZaP%(i3j!o00007RkE zW7>gaLT!bTe1(Job@W+8Vqm~0)NfE=MGEh8jh*z$ABnl|kmsJW@A=tx&dbPHh@FRc$GJ%<mSiF`{P#niS3R*0d z6g}$*a1nF~n5m@@q=bbhl!>4qSJ8In00U$KbG7{2-)?*lgryLq1gi{mP!2FaCNNhP zc#h-xI8@4^iHhScE~pW}0GYsCnZ-Sq3w#Y!eR%Hq{Sm+f8NggwE8yJUBSjD?3ppPL zm>?6FYq=GMdv#GLca-YX-!fL%?a(h<&H&II@vr*zL5N9ZwY8cB9es5Y&#E zG(QKx0b?uBePPWJs14sF;J(O#nO0`sMA7cybY->?MUBI0#@fvp1o;5eg;j=P(*c5q z1|kFI8q6c$$PeZbctpF}s?6fTD)}8pSk5xdACss14&Yble)6ncpV2|*U}i1V8jaev zu$G=i(d%u2P4Tw?!a^=Aj)iz*1j8d3?{e&{=%ChtvkINqT;E)OMp|22tKm;Lu~B^j z(E!FY2-h`;Je2(8F|TgnRNrmzP@oHV_nx~rR_+HJL6(El)__MKy%>Q2U@r+s{>R<0 z_V@u~KX27SD6``v)$Jio(gZc*$z**QvknR(sFCI@U%Qo!Iuu)!JoOW7(L4O^+<@l1f(M0~$!Itn;wqs)q8N>+CqWX=a7HvM zoDoY&3LPjDd~>1tuPRtmiwZ(bJYlIsr>5W29ygb9)eCY#QB)La8nw$(Y5ALLNWr;~ zE^L;TMHB{>lz*2fh&6LjQK)IuR)4KLrJ%9b?o-gpGbzXM_f#M=?r71xurG5ajq1(% zniJvO;{cwazP@%<6BwWbJDOTFFT|~BCXrn(+exH$OnWwL`^piK78FGVVU#nuIJNDK za~h<=Tivp27?=wRqJmK7OnN@&{$X@Sw;#y~UVrl>5q}d)2}EoOC5p9ZUKmYsTJ?~z zP9=VFC$T0!0eb!kQ3?70VGtT!CEx>^I8wbKp*`@zj zeYHdLMt|#gI^FBKM$6mXZFlk2L8IBh7v?eNZz$*`=X*ig?^A!4_F$e?9SW+hg)|S` zn@-yt1>Vth8=ovqKe09rhVM~eyM~RTxA;6{D54&PjDC6W&fccLhQs_o1u;fJ+`B#^ z0$n}@F%;mDS}0;F2t}$tx@JnqwkTj}+EijNdsB=Z($=#8Fq4S#OfT)}ISra9N_!L% zdu^Y-OV$sMarJ>SIS*zD*@ur~{fo)CuLfm!{>Z0U78Zrx(!E;z0hDW%=0((=O#lD@ M07*qoM6N<$g3D=0N&o-= delta 712 zcmV;(0yq7J2J{7xIDh}uAl{r1YB>nzQewpbF=7B1oMK99F)=X!82|tO00019_H_cB(vd=#aFpC+K@8>+D>c7JoYX2LJWU-TU3i<_Ou0 z&De~84928P|F4f0M|`D5DNhzA4*(BrdmY9kj5!_$ta&G011*okzq35f{!eOFDTdtRTjfx1Rz1bfn{cN zUafA?gvHP)1b^zF_BaD#1>A>ZP^6YTJ*_>;QVm$ZQ_|esneVf-1Y}4CMUun6N)1_NJzTi00u>>_a4_<0YKK#`;}(e>^p$P31< zA<3kBaZOf$49TEK-wy)MgA8CmR$R}4AVCRW22d{{4u1wKP-HN6oD-bryRHXWar`kf zQfeiDd1~@HSb|U^=ptCc$}`t-+|Op2gnaeA^JAjyA%F`p&rD?x93N{B#4{7Y54;h; zxWU$Q+{rtmWqfy>k1d0cyJpw!6VipoJ|4vbV8ZJY7i)LS>m?{s8N3OCFMU(#yv_4( zhp?l(WqayO~-9AE=@7+Ad{3%|HMe1VM+zzwzx zgo=4ZUCbv7ozElrYrTW19_4utMY}(+QBrLi6BjOU2d_%VvT?&o$F>mEZrfG?TkYO^ z{Mkm+(G)YDjv{`sjAmC$0Q(ZPgm{1Ppj{2@K0*F}ZmiyrUv*llrRxcQIUd9CxVZV$ uaQLU1siRrSFSeof_sf|{4|2T}i_c$vZaP%(i3j!o0000nzQewpbF=7B1oMK99F)=X!82|tO00019_Hx?kR9KtEXr&inQ@yLvoA@K55WG~` zKOj|_lLtlP*;`WZo>|zmfuh|<|AP{}m-yapb~e1G3ZC;WpMQNb!}l}E&Md&Z<~6T> z6ryDGe>vU5BmsNwEDZ<9z9t-t@})!G8agZ5N3>Z_mH1r4hoZT-3_M% zQY3^%OewM6rJ%0XJr0Wd{UkUO2$2*T@huz_@moZ}Jz5gMwPL#0Odv&4n9(X03x&ae zgSaTDupev81%EYGlPcA4agYQW~sc zE)XIqG{m93v}AAK2~tvsN1$wb&%u!q2$2*TTIkufhtWAqY6L(%j*UQyq|gu!?zB5^ zngHVy#G^5t2UTs3M@Aq;Qke7k-A;RZlQ^a#Lg!QMHGianw@p_aJe(G}N(c?rrTZ`6 z*KWH+-zNfmY1AIme1in?R^@>CEeImfZTJ1f(M0~$!Itn;wqs)q8N>+CqWX=a7HvM zoDoY&3LPjDd~>1tuPRtmiwZ(bJYlIsr>5W29ygb9)eCY#QB)La8nw$(Y5ALLNWr;~ zE^L;TMHB{>lz*2fh&6LjQK)IuR)4KLrJ%9b?o-gpGbzXM_f#M=?r71xurG5ajq1(% zniJvO;{cwazP@%<6BwWbJDOTFFT|~BCXrn(+exH$OnWwL`^piK78FGVVU#nuIJNDK za~h<=Tivp27?=wRqJmK7OnN@&{$X@Sw;#y~UVrl>5q}d)2}EoOC5p9ZUKmYsTJ?~z zP9=VFC$T0!0eb!kQ3?70VGtT!CEx>^I8wbKp*`@zj zeYHdLMt|#gI^FBKM$6mXZFlk2L8IBh7v?eNZz$*`=X*ig?^A!4_F$e?9SW+hg)|S` zn@-yt1>Vth8=ovqKe09rhVM~eyM~RTxA;6{D54&PjDC6W&fccLhQs_o1u;fJ+`B#^ z0$n}@F%;mDS}0;F2t}$tx@JnqwkTj}+EijNdsB=Z($=#8Fq4S#OfT)}ISra9N_!L% zdu^Y-OV$sMarJ>SIS*zD*@ur~{fo)CuLfm!{>Z0U78Zrx(!E;z0hDW%=0((=O#lD@ M07*qoM6N<$f-aLt6951J diff --git a/graphics/event_objects/pics/people/woman_4.png b/graphics/event_objects/pics/people/woman_4.png index 2a29acae3018dab7ebe06ca70f55e7f985c70c2c..95dfc76dae41fda0cc319ee2a72e32c6b1ff6a07 100644 GIT binary patch delta 691 zcmV;k0!;nA1>gmcIe(K{+`X|Ns900013rp2q+H z0&7V`K~zYI?UYT6(?A%le@z zgk|Y2+rWN;G$)UpKw6YVGxH(#8~8jkowOZS1+>YDvk0FG~ z;{S3OlL>sW%r|xZ2f@w44IQ>jQ=B;|W0Fjf0yEfQX;2F_dB#$j@daaaCBc`=MZP1@ zr02V2rueIRH@;+y0#;bcS_=%3Dbxh9stbB+j_2t>ug+O6wgOXR3N@|zs#X)LuA_nq z=+!8=s060S6n|=35AIzz?ykEI1v3ojHCjTHnHHF$--MdZ;L&xX)hQf7Z-5K^hpqLK zJktVGR0(k(3AGr?%xyN^GAlF8r3K4%*PS%41ct~IRxJ59*B$0r$wj&lxBx@f0zu@LcT7hrPn@dS1RnwO0I+)@jXuO+Qc5=F_NYjt8A0}QhJ?E`#1 zCP4y_5NB8?Ld>TC^QjOC)-aiWIHCX8B!lC4M)f$3 z6SdD(LGHN>g2?kCs(lib&3vQ}ye;7#)rHKCCrRpa+R}GElvQgRc zqVmcr*w?i>=!Ajna3b;})!7PXkNAZtEH@q3SuAWipsv+~U%glBS5f}=-YkrXQ9D&l ZvtJfGWv(WL8qELz002ovPDHLkV1oB+O%ebA delta 656 zcmV;B0&o4`1-%83Ie*n4-kcC>ISA%bV#NS4VgMMNVoGW;F);ub|Ns90003V0bYTDh z0!T?jK~zYI?Uc`J6G0Tm-(gOLMWW|WY$~3lkX`UpSewOYr59mSy{pli_#>hayj0mg zAXS=^2SwxATT<|zS=h9JqTNUTgA%=$_}*@IHoT?^p7SoBeSb5<_cO`PEWo_xHLrgZ zqGa@cIo-n~0ek(FT8C!{W(y~@`n%m8Jy|`i`%IlO7f6v1W{h?Bke^}>3X^f&4W|TB zB!osxDY4$Apsv zxG1QwA8X77LVt8hn9;g&@z>({y{VwZ3rO$92!u!q4Xyq1@0HSOWW_umMzFS08mwY2 z5F#lw#G$>kWN+XJQc{RVplo~3!I2RNkrWzQ=-IZ1(K$?N1VBBGjX;W|&=3ypv^#H_ z0OJ$HqcNQaRc($(Mj%B}nDhDFPJ4TkIHn>(=Tq%9q<@09O;;T}oEEuC2o2Sx`!Cit{Rh%|WJh@H+Y88p@UFM!dN$>mIgIa#ULRe@m zzhbIR5P!7YoHTKRf|Pxef*tUgt||m7Pi{%1OVr$7 z>xUP#zVnF=ysacC4&yM&N!K!kH7q-6?#8U1&PCbgJElusx`5BhG+_c-GWmc-Gkc6w qG7t{|;qNv1gyLC!I$$NEe*hIcSVW3bt`GnK00{s|MNUMnLSTa7A~j$D diff --git a/graphics/event_objects/pics/people/woman_5.png b/graphics/event_objects/pics/people/woman_5.png index 95dfc76dae41fda0cc319ee2a72e32c6b1ff6a07..a7750dc4cb0d85a6b45e75ab24a47cc6387d45d8 100644 GIT binary patch delta 786 zcmV+t1MU3a1-=H5Ie*n4-kcC>ISA%bV#NS4VgMMNVoGW;F);ub|Ns90003V0bYTDh z0?A24K~zYI?UXTV6hRnr^ZjOK?~ZsPSbt}VefHb^=6z=NhGXn} zoR9PIkD>Kh>i^4Wx6MQ?l%o*&Xu)WqV<7Crpd&>_RH)^!pr90g2=x$Y9!*poAu>6r zbs-S8G3W@DfqGboh5@rq){!|V1jtk-=|#{N80Jod=fgq-6x2$!+fr(+M7u4dW}iC; z3QBDSm|&=x6@N)($(&FQs4r{%UZcU7B|hCDf}|5*1y&ST5%m#sD->`0RPy4<_(dfZ zod6~v7)0e4n_22VE_%^#_G#+DT$dEFW-p~;3pUq z#OkrZQ_fF`3!MKPQLn}j)~MT(`HQvsA_c`Yo8T`#ba{6T{UhY3kSn-o#vczK5=Are`($GSUlCF4d=Rv*l*Z*JYOo}_ZK{+`X|Ns900013rp2q+H z0&7V`K~zYI?UYT6(?A%le@z zgk|Y2+rWN;G$)UpKw6YVGxH(#8~8jkowOZS1+>YDvk0FG~ z;{S3OlL>sW%r|xZ2f@w44IQ>jQ=B;|W0Fjf0yEfQX;2F_dB#$j@daaaCBc`=MZP1@ zr02V2rueIRH@;+y0#;bcS_=%3Dbxh9stbB+j_2t>ug+O6wgOXR3N@|zs#X)LuA_nq z=+!8=s060S6n|=35AIzz?ykEI1v3ojHCjTHnHHF$--MdZ;L&xX)hQf7Z-5K^hpqLK zJktVGR0(k(3AGr?%xyN^GAlF8r3K4%*PS%41ct~IRxJ59*B$0r$wj&lxBx@f0zu@LcT7hrPn@dS1RnwO0I+)@jXuO+Qc5=F_NYjt8A0}QhJ?E`#1 zCP4y_5NB8?Ld>TC^QjOC)-aiWIHCX8B!lC4M)f$3 z6SdD(LGHN>g2?kCs(lib&3vQ}ye;7#)rHKCCrRpa+R}GElvQgRc zqVmcr*w?i>=!Ajna3b;})!7PXkNAZtEH@q3SuAWipsv+~U%glBS5f}=-YkrXQ9D&l ZvtJfGWv(WL8qELz002ovPDHLkV1oS6O%wnC diff --git a/graphics/event_objects/pics/people/woman_7.png b/graphics/event_objects/pics/people/woman_7.png deleted file mode 100644 index a7750dc4cb0d85a6b45e75ab24a47cc6387d45d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 830 zcmV-E1Ht@>P)4e-7>1`lVdtjBq+?Li!VG&bg zugC=xFgKw7fIF+$?F_8ON@uV&g~4Dzu8{NnW@hh>cp_M5ihcIm{pNjU_J(8Ze4LN- z@sFYPS?d4GX}8TpEtI1W`Dnptp<^KI#GoTZMpUTfu%Mt6e+cyuX&y~f9U(F~sC6L_ zwlU}km4SL#h=u{PPS%k*C`0RPy4<_(dfZZZmam4gHBgg|Ix~J`N z5Kf3=;Dmh!``ZhrN9zbO13}({Z**q`j9DUxBFwK#ag2nKIn$2bWb632u~G4^(d-Wu z#$KnB2n;v`TRV)6twF?duWUtDcvvCfkrNxvTZOj8g+8{wNB=1oJePyOo< z?N+?$U)n5yu3vVIFuX-8tA=S4thSn*cN?XGSi+BqZiBIT2zHS>GY!!m)oE&L2vH+w zY62@}QwRdRh1T{_9t$_&IETy!i2IqTG#f#=SZ;hxK?^R0>`qfg8#LVk)-ot#K zxPk{`oO9p;1kG7|%PvIUsoq+%HH4`B$LZ$WOUCNUb18|L7cbw55#T2n6vXPW!Bfsp zi3^Lf8iwZtqSPU`WJX;|@- zVY0+x)#jn~(bCXDjgqc-ZRbI~^4I@g>P(6|yW_KUGHAu^Z?6-j!L^uxe*gdg07*qo IM6N<$f(v|xTmS$7 diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk index 2aec2c43c..6e49a0a66 100644 --- a/spritesheet_rules.mk +++ b/spritesheet_rules.mk @@ -174,7 +174,7 @@ $(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/gameboy_kid.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(EVENTOBJGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png @@ -186,7 +186,7 @@ $(EVENTOBJGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/camper.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/contest_old_man.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(EVENTOBJGFXDIR)/people/cook.4bpp: %.4bpp: %.png @@ -231,16 +231,16 @@ $(EVENTOBJGFXDIR)/people/lass.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/leaf.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/little_boy_1.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/ninja_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/little_boy_2.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/little_boy.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 -$(EVENTOBJGFXDIR)/people/little_girl_1.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/twin.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/little_girl_2.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/little_girl.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 $(EVENTOBJGFXDIR)/people/man_1.4bpp: %.4bpp: %.png @@ -249,6 +249,9 @@ $(EVENTOBJGFXDIR)/people/man_1.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/man_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 +$(EVENTOBJGFXDIR)/people/pokefan_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + $(EVENTOBJGFXDIR)/people/man_3.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 @@ -258,10 +261,7 @@ $(EVENTOBJGFXDIR)/people/man_4.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/man_5.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/man_6.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 2 -mheight 4 - -$(EVENTOBJGFXDIR)/people/man_7.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/devon_employee.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(EVENTOBJGFXDIR)/people/maniac.4bpp: %.4bpp: %.png @@ -285,16 +285,16 @@ $(EVENTOBJGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/nurse.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_man_1.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/expert_m.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_man_2.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/old_man.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_woman_1.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/expert_f.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/old_woman_2.4bpp: %.4bpp: %.png +$(EVENTOBJGFXDIR)/people/old_woman.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 $(EVENTOBJGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png @@ -381,6 +381,9 @@ $(EVENTOBJGFXDIR)/people/wally.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 +$(EVENTOBJGFXDIR)/people/pokefan_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + $(EVENTOBJGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 @@ -390,15 +393,12 @@ $(EVENTOBJGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png $(EVENTOBJGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 +$(EVENTOBJGFXDIR)/people/link_receptionist.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + $(EVENTOBJGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 -$(EVENTOBJGFXDIR)/people/woman_6.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 2 -mheight 4 - -$(EVENTOBJGFXDIR)/people/woman_7.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 2 -mheight 4 - $(EVENTOBJGFXDIR)/people/youngster.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index c22bfea90..1b2564411 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -71,36 +71,36 @@ const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/f const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal"); const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal"); const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal"); -const u32 gEventObjectPic_LittleBoy1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1.4bpp"); -const u32 gEventObjectPic_LittleGirl1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1.4bpp"); +const u32 gEventObjectPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp"); +const u32 gEventObjectPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp"); const u32 gEventObjectPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp"); const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); -const u32 gEventObjectPic_LittleBoy2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2.4bpp"); -const u32 gEventObjectPic_LittleGirl2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2.4bpp"); +const u32 gEventObjectPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp"); +const u32 gEventObjectPic__LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp"); const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); const u32 gEventObjectPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp"); const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp"); const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp"); -const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); +const u32 gEventObjectPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp"); const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp"); -const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); -const u32 gEventObjectPic_OldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1.4bpp"); -const u32 gEventObjectPic_OldWoman1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1.4bpp"); +const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp"); +const u32 gEventObjectPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp"); +const u32 gEventObjectPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp"); const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp"); +const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp"); +const u32 gEventObjectPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp"); const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp"); -const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); -const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); const u32 gEventObjectPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp"); -const u32 gEventObjectPic_Woman6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6.4bpp"); -const u32 gEventObjectPic_OldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2.4bpp"); -const u32 gEventObjectPic_OldWoman2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2.4bpp"); +const u32 gEventObjectPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp"); +const u32 gEventObjectPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp"); +const u32 gEventObjectPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp"); const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp"); const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp"); -const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); -const u32 gEventObjectPic_Woman7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7.4bpp"); +const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp"); +const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp"); const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp"); const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp"); const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp"); @@ -124,8 +124,8 @@ const u32 gEventObjectPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/peo const u32 gEventObjectPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp"); const u32 gEventObjectPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp"); const u32 gEventObjectPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp"); +const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp"); const u32 gEventObjectPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp"); -const u32 gEventObjectPic_Man6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6.4bpp"); const u32 gEventObjectPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp"); const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp"); const u32 gEventObjectPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp"); @@ -139,7 +139,7 @@ const u32 gEventObjectPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/peop const u32 gEventObjectPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp"); const u32 gEventObjectPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp"); const u32 gEventObjectPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp"); -const u32 gEventObjectPic_Man7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7.4bpp"); +const u32 gEventObjectPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp"); const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp"); const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp"); const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp"); @@ -162,8 +162,8 @@ const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/peop const u32 gEventObjectPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp"); const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp"); const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp"); -const u32 gEventObjectPic_Boy5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5.4bpp"); -const u32 gEventObjectPic_ContestOldMan[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man.4bpp"); +const u32 gEventObjectPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp"); +const u32 gEventObjectPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp"); const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp"); const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp"); const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp"); diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h index df916e218..df6a909d3 100755 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ b/src/data/field_event_obj/event_object_graphics_info.h @@ -7,36 +7,36 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xFFFF, EVENT_OBJ_PAL_TAG_12, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_NinjaBoy, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Twin, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo__LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable__LittleGirl, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RichBoy, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanF, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan1, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ExpertF, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PokefanM, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman6, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LinkReceptionist, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman7, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable}; @@ -66,8 +66,8 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xFFF const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man6, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable}; @@ -118,7 +118,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xFFFF, EVENT_OBJ_PAL_TAG_19, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xFFFF, EVENT_OBJ_PAL_TAG_20, EVENT_OBJ_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_64x64, gEventObjectSpriteOamTables_64x64, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man7, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_DevonEmployee, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable}; @@ -191,8 +191,8 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0 const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy5, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestOldMan = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestOldMan, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_GameboyKid, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestJudge, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xFFFF, EVENT_OBJ_PAL_TAG_17, EVENT_OBJ_PAL_TAG_10, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_32x32, gEventObjectSpriteOamTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xFFFF, EVENT_OBJ_PAL_TAG_8, EVENT_OBJ_PAL_TAG_10, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable}; diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index 12c32eb13..8e9083216 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -6,36 +6,36 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_NinjaBoy; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Twin; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo__LittleGirl; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanF; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertM; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ExpertF; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PokefanM; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkReceptionist; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM; @@ -66,8 +66,8 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStag const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard; @@ -117,7 +117,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DevonEmployee; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM; @@ -190,8 +190,8 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestOldMan; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GameboyKid; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating; @@ -255,36 +255,36 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = &gEventObjectGraphicsInfo_BrendanSurfing, &gEventObjectGraphicsInfo_BrendanFieldMove, &gEventObjectGraphicsInfo_QuintyPlump, - &gEventObjectGraphicsInfo_LittleBoy1, - &gEventObjectGraphicsInfo_LittleGirl1, + &gEventObjectGraphicsInfo_NinjaBoy, + &gEventObjectGraphicsInfo_Twin, &gEventObjectGraphicsInfo_Boy1, &gEventObjectGraphicsInfo_Girl1, &gEventObjectGraphicsInfo_Boy2, &gEventObjectGraphicsInfo_Girl2, - &gEventObjectGraphicsInfo_LittleBoy2, - &gEventObjectGraphicsInfo_LittleGirl2, + &gEventObjectGraphicsInfo_LittleBoy, + &gEventObjectGraphicsInfo__LittleGirl, &gEventObjectGraphicsInfo_Boy3, &gEventObjectGraphicsInfo_Girl3, &gEventObjectGraphicsInfo_RichBoy, &gEventObjectGraphicsInfo_Woman1, &gEventObjectGraphicsInfo_FatMan, - &gEventObjectGraphicsInfo_Woman2, + &gEventObjectGraphicsInfo_PokefanF, &gEventObjectGraphicsInfo_Man1, - &gEventObjectGraphicsInfo_Woman3, - &gEventObjectGraphicsInfo_OldMan1, - &gEventObjectGraphicsInfo_OldWoman1, + &gEventObjectGraphicsInfo_Woman2, + &gEventObjectGraphicsInfo_ExpertM, + &gEventObjectGraphicsInfo_ExpertF, &gEventObjectGraphicsInfo_Man2, + &gEventObjectGraphicsInfo_Woman3, + &gEventObjectGraphicsInfo_PokefanM, &gEventObjectGraphicsInfo_Woman4, - &gEventObjectGraphicsInfo_Man3, - &gEventObjectGraphicsInfo_Woman5, &gEventObjectGraphicsInfo_Cook, - &gEventObjectGraphicsInfo_Woman6, - &gEventObjectGraphicsInfo_OldMan2, - &gEventObjectGraphicsInfo_OldWoman2, + &gEventObjectGraphicsInfo_LinkReceptionist, + &gEventObjectGraphicsInfo_OldMan, + &gEventObjectGraphicsInfo_OldWoman, &gEventObjectGraphicsInfo_Camper, &gEventObjectGraphicsInfo_Picnicker, - &gEventObjectGraphicsInfo_Man4, - &gEventObjectGraphicsInfo_Woman7, + &gEventObjectGraphicsInfo_Man3, + &gEventObjectGraphicsInfo_Woman5, &gEventObjectGraphicsInfo_Youngster, &gEventObjectGraphicsInfo_BugCatcher, &gEventObjectGraphicsInfo_PsychicM, @@ -315,8 +315,8 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = &gEventObjectGraphicsInfo_BerryTreeLateStages, &gEventObjectGraphicsInfo_BrendanAcroBike, &gEventObjectGraphicsInfo_ProfBirch, + &gEventObjectGraphicsInfo_Man4, &gEventObjectGraphicsInfo_Man5, - &gEventObjectGraphicsInfo_Man6, &gEventObjectGraphicsInfo_ReporterM, &gEventObjectGraphicsInfo_ReporterF, &gEventObjectGraphicsInfo_Bard, @@ -366,7 +366,7 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = &gEventObjectGraphicsInfo_MovingBox, &gEventObjectGraphicsInfo_CableCar, &gEventObjectGraphicsInfo_Scientist2, - &gEventObjectGraphicsInfo_Man7, + &gEventObjectGraphicsInfo_DevonEmployee, &gEventObjectGraphicsInfo_AquaMemberM, &gEventObjectGraphicsInfo_AquaMemberF, &gEventObjectGraphicsInfo_MagmaMemberM, @@ -439,8 +439,8 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = &gEventObjectGraphicsInfo_BigRegisteelDoll, &gEventObjectGraphicsInfo_Latias, &gEventObjectGraphicsInfo_Latios, - &gEventObjectGraphicsInfo_Boy5, - &gEventObjectGraphicsInfo_ContestOldMan, + &gEventObjectGraphicsInfo_GameboyKid, + &gEventObjectGraphicsInfo_ContestJudge, &gEventObjectGraphicsInfo_BrendanWatering, &gEventObjectGraphicsInfo_MayWatering, &gEventObjectGraphicsInfo_BrendanDecorating, diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h index 33581348a..fb0a8ed75 100755 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -109,28 +109,28 @@ const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = { overworld_frame(gEventObjectPic_QuintyPlump, 4, 4, 6), }; -const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = { - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy1, 2, 2, 8), +const struct SpriteFrameImage gEventObjectPicTable_NinjaBoy[] = { + overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 0), + overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 1), + overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 2), + overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 3), + overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 4), + overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 5), + overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 6), + overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 7), + overworld_frame(gEventObjectPic_NinjaBoy, 2, 2, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = { - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 0), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 1), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 2), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 3), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 4), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 5), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 6), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 7), - overworld_frame(gEventObjectPic_LittleGirl1, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_Twin[] = { + overworld_frame(gEventObjectPic_Twin, 2, 4, 0), + overworld_frame(gEventObjectPic_Twin, 2, 4, 1), + overworld_frame(gEventObjectPic_Twin, 2, 4, 2), + overworld_frame(gEventObjectPic_Twin, 2, 4, 3), + overworld_frame(gEventObjectPic_Twin, 2, 4, 4), + overworld_frame(gEventObjectPic_Twin, 2, 4, 5), + overworld_frame(gEventObjectPic_Twin, 2, 4, 6), + overworld_frame(gEventObjectPic_Twin, 2, 4, 7), + overworld_frame(gEventObjectPic_Twin, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = { @@ -181,28 +181,28 @@ const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = { overworld_frame(gEventObjectPic_Girl2, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = { - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleBoy2, 2, 2, 8), +const struct SpriteFrameImage gEventObjectPicTable_LittleBoy[] = { + overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = { - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 0), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 1), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 2), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 3), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 4), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 5), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 6), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 7), - overworld_frame(gEventObjectPic_LittleGirl2, 2, 2, 8), +const struct SpriteFrameImage gEventObjectPicTable__LittleGirl[] = { + overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 0), + overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 1), + overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 2), + overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 3), + overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 4), + overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 5), + overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 6), + overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 7), + overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = { @@ -265,16 +265,16 @@ const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = { overworld_frame(gEventObjectPic_FatMan, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { - overworld_frame(gEventObjectPic_Woman2, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman2, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_PokefanF[] = { + overworld_frame(gEventObjectPic_PokefanF, 2, 4, 0), + overworld_frame(gEventObjectPic_PokefanF, 2, 4, 1), + overworld_frame(gEventObjectPic_PokefanF, 2, 4, 2), + overworld_frame(gEventObjectPic_PokefanF, 2, 4, 3), + overworld_frame(gEventObjectPic_PokefanF, 2, 4, 4), + overworld_frame(gEventObjectPic_PokefanF, 2, 4, 5), + overworld_frame(gEventObjectPic_PokefanF, 2, 4, 6), + overworld_frame(gEventObjectPic_PokefanF, 2, 4, 7), + overworld_frame(gEventObjectPic_PokefanF, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { @@ -289,40 +289,40 @@ const struct SpriteFrameImage gEventObjectPicTable_Man1[] = { overworld_frame(gEventObjectPic_Man1, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { - overworld_frame(gEventObjectPic_Woman3, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman3, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = { + overworld_frame(gEventObjectPic_Woman2, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman2, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = { - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 3), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 4), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 5), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 6), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 7), - overworld_frame(gEventObjectPic_OldMan1, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_ExpertM[] = { + overworld_frame(gEventObjectPic_ExpertM, 2, 4, 0), + overworld_frame(gEventObjectPic_ExpertM, 2, 4, 1), + overworld_frame(gEventObjectPic_ExpertM, 2, 4, 2), + overworld_frame(gEventObjectPic_ExpertM, 2, 4, 3), + overworld_frame(gEventObjectPic_ExpertM, 2, 4, 4), + overworld_frame(gEventObjectPic_ExpertM, 2, 4, 5), + overworld_frame(gEventObjectPic_ExpertM, 2, 4, 6), + overworld_frame(gEventObjectPic_ExpertM, 2, 4, 7), + overworld_frame(gEventObjectPic_ExpertM, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = { - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 3), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 4), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 5), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 6), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 7), - overworld_frame(gEventObjectPic_OldWoman1, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_ExpertF[] = { + overworld_frame(gEventObjectPic_ExpertF, 2, 4, 0), + overworld_frame(gEventObjectPic_ExpertF, 2, 4, 1), + overworld_frame(gEventObjectPic_ExpertF, 2, 4, 2), + overworld_frame(gEventObjectPic_ExpertF, 2, 4, 3), + overworld_frame(gEventObjectPic_ExpertF, 2, 4, 4), + overworld_frame(gEventObjectPic_ExpertF, 2, 4, 5), + overworld_frame(gEventObjectPic_ExpertF, 2, 4, 6), + overworld_frame(gEventObjectPic_ExpertF, 2, 4, 7), + overworld_frame(gEventObjectPic_ExpertF, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { @@ -337,6 +337,30 @@ const struct SpriteFrameImage gEventObjectPicTable_Man2[] = { overworld_frame(gEventObjectPic_Man2, 2, 4, 8), }; +const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = { + overworld_frame(gEventObjectPic_Woman3, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman3, 2, 4, 8), +}; + +const struct SpriteFrameImage gEventObjectPicTable_PokefanM[] = { + overworld_frame(gEventObjectPic_PokefanM, 2, 4, 0), + overworld_frame(gEventObjectPic_PokefanM, 2, 4, 1), + overworld_frame(gEventObjectPic_PokefanM, 2, 4, 2), + overworld_frame(gEventObjectPic_PokefanM, 2, 4, 3), + overworld_frame(gEventObjectPic_PokefanM, 2, 4, 4), + overworld_frame(gEventObjectPic_PokefanM, 2, 4, 5), + overworld_frame(gEventObjectPic_PokefanM, 2, 4, 6), + overworld_frame(gEventObjectPic_PokefanM, 2, 4, 7), + overworld_frame(gEventObjectPic_PokefanM, 2, 4, 8), +}; + const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { overworld_frame(gEventObjectPic_Woman4, 2, 4, 0), overworld_frame(gEventObjectPic_Woman4, 2, 4, 1), @@ -349,30 +373,6 @@ const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = { overworld_frame(gEventObjectPic_Woman4, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { - overworld_frame(gEventObjectPic_Man3, 2, 4, 0), - overworld_frame(gEventObjectPic_Man3, 2, 4, 1), - overworld_frame(gEventObjectPic_Man3, 2, 4, 2), - overworld_frame(gEventObjectPic_Man3, 2, 4, 3), - overworld_frame(gEventObjectPic_Man3, 2, 4, 4), - overworld_frame(gEventObjectPic_Man3, 2, 4, 5), - overworld_frame(gEventObjectPic_Man3, 2, 4, 6), - overworld_frame(gEventObjectPic_Man3, 2, 4, 7), - overworld_frame(gEventObjectPic_Man3, 2, 4, 8), -}; - -const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { - overworld_frame(gEventObjectPic_Woman5, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman5, 2, 4, 8), -}; - const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { overworld_frame(gEventObjectPic_Cook, 2, 4, 0), overworld_frame(gEventObjectPic_Cook, 2, 4, 1), @@ -385,40 +385,40 @@ const struct SpriteFrameImage gEventObjectPicTable_Cook[] = { overworld_frame(gEventObjectPic_Cook, 2, 4, 2), }; -const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = { - overworld_frame(gEventObjectPic_Woman6, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman6, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_LinkReceptionist[] = { + overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 0), + overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 1), + overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 2), + overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 3), + overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 4), + overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 5), + overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 6), + overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 7), + overworld_frame(gEventObjectPic_LinkReceptionist, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = { - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldMan2, 2, 4, 2), +const struct SpriteFrameImage gEventObjectPicTable_OldMan[] = { + overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan, 2, 4, 0), + overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan, 2, 4, 1), + overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), + overworld_frame(gEventObjectPic_OldMan, 2, 4, 2), }; -const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = { - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 0), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 1), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 2), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 3), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 4), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 5), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 6), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 7), - overworld_frame(gEventObjectPic_OldWoman2, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_OldWoman[] = { + overworld_frame(gEventObjectPic_OldWoman, 2, 4, 0), + overworld_frame(gEventObjectPic_OldWoman, 2, 4, 1), + overworld_frame(gEventObjectPic_OldWoman, 2, 4, 2), + overworld_frame(gEventObjectPic_OldWoman, 2, 4, 3), + overworld_frame(gEventObjectPic_OldWoman, 2, 4, 4), + overworld_frame(gEventObjectPic_OldWoman, 2, 4, 5), + overworld_frame(gEventObjectPic_OldWoman, 2, 4, 6), + overworld_frame(gEventObjectPic_OldWoman, 2, 4, 7), + overworld_frame(gEventObjectPic_OldWoman, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Camper[] = { @@ -445,28 +445,28 @@ const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = { overworld_frame(gEventObjectPic_Picnicker, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { - overworld_frame(gEventObjectPic_Man4, 2, 4, 0), - overworld_frame(gEventObjectPic_Man4, 2, 4, 1), - overworld_frame(gEventObjectPic_Man4, 2, 4, 2), - overworld_frame(gEventObjectPic_Man4, 2, 4, 3), - overworld_frame(gEventObjectPic_Man4, 2, 4, 4), - overworld_frame(gEventObjectPic_Man4, 2, 4, 5), - overworld_frame(gEventObjectPic_Man4, 2, 4, 6), - overworld_frame(gEventObjectPic_Man4, 2, 4, 7), - overworld_frame(gEventObjectPic_Man4, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_Man3[] = { + overworld_frame(gEventObjectPic_Man3, 2, 4, 0), + overworld_frame(gEventObjectPic_Man3, 2, 4, 1), + overworld_frame(gEventObjectPic_Man3, 2, 4, 2), + overworld_frame(gEventObjectPic_Man3, 2, 4, 3), + overworld_frame(gEventObjectPic_Man3, 2, 4, 4), + overworld_frame(gEventObjectPic_Man3, 2, 4, 5), + overworld_frame(gEventObjectPic_Man3, 2, 4, 6), + overworld_frame(gEventObjectPic_Man3, 2, 4, 7), + overworld_frame(gEventObjectPic_Man3, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = { - overworld_frame(gEventObjectPic_Woman7, 2, 4, 0), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 1), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 2), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 3), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 4), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 5), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 6), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 7), - overworld_frame(gEventObjectPic_Woman7, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = { + overworld_frame(gEventObjectPic_Woman5, 2, 4, 0), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 1), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 2), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 3), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 4), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 5), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 6), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 7), + overworld_frame(gEventObjectPic_Woman5, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = { @@ -762,6 +762,18 @@ const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = { overworld_frame(gEventObjectPic_ProfBirch, 2, 4, 8), }; +const struct SpriteFrameImage gEventObjectPicTable_Man4[] = { + overworld_frame(gEventObjectPic_Man4, 2, 4, 0), + overworld_frame(gEventObjectPic_Man4, 2, 4, 1), + overworld_frame(gEventObjectPic_Man4, 2, 4, 2), + overworld_frame(gEventObjectPic_Man4, 2, 4, 3), + overworld_frame(gEventObjectPic_Man4, 2, 4, 4), + overworld_frame(gEventObjectPic_Man4, 2, 4, 5), + overworld_frame(gEventObjectPic_Man4, 2, 4, 6), + overworld_frame(gEventObjectPic_Man4, 2, 4, 7), + overworld_frame(gEventObjectPic_Man4, 2, 4, 8), +}; + const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { overworld_frame(gEventObjectPic_Man5, 2, 4, 0), overworld_frame(gEventObjectPic_Man5, 2, 4, 1), @@ -774,18 +786,6 @@ const struct SpriteFrameImage gEventObjectPicTable_Man5[] = { overworld_frame(gEventObjectPic_Man5, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_Man6[] = { - overworld_frame(gEventObjectPic_Man6, 2, 4, 0), - overworld_frame(gEventObjectPic_Man6, 2, 4, 1), - overworld_frame(gEventObjectPic_Man6, 2, 4, 2), - overworld_frame(gEventObjectPic_Man6, 2, 4, 3), - overworld_frame(gEventObjectPic_Man6, 2, 4, 4), - overworld_frame(gEventObjectPic_Man6, 2, 4, 5), - overworld_frame(gEventObjectPic_Man6, 2, 4, 6), - overworld_frame(gEventObjectPic_Man6, 2, 4, 7), - overworld_frame(gEventObjectPic_Man6, 2, 4, 8), -}; - const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = { overworld_frame(gEventObjectPic_ReporterM, 2, 4, 0), overworld_frame(gEventObjectPic_ReporterM, 2, 4, 1), @@ -1122,16 +1122,16 @@ const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = { overworld_frame(gEventObjectPic_Scientist2, 2, 4, 8), }; -const struct SpriteFrameImage gEventObjectPicTable_Man7[] = { - overworld_frame(gEventObjectPic_Man7, 2, 4, 0), - overworld_frame(gEventObjectPic_Man7, 2, 4, 1), - overworld_frame(gEventObjectPic_Man7, 2, 4, 2), - overworld_frame(gEventObjectPic_Man7, 2, 4, 3), - overworld_frame(gEventObjectPic_Man7, 2, 4, 4), - overworld_frame(gEventObjectPic_Man7, 2, 4, 5), - overworld_frame(gEventObjectPic_Man7, 2, 4, 6), - overworld_frame(gEventObjectPic_Man7, 2, 4, 7), - overworld_frame(gEventObjectPic_Man7, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_DevonEmployee[] = { + overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 0), + overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 1), + overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 2), + overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 3), + overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 4), + overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 5), + overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 6), + overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 7), + overworld_frame(gEventObjectPic_DevonEmployee, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = { @@ -1632,28 +1632,28 @@ const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = { overworld_frame(gEventObjectPic_LatiasLatios, 4, 4, 2), }; -const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = { - overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 0), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 1), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), - overworld_frame(gEventObjectPic_Boy5, 2, 4, 2), +const struct SpriteFrameImage gEventObjectPicTable_GameboyKid[] = { + overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), + overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), + overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), + overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), + overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 0), + overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), + overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 1), + overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), + overworld_frame(gEventObjectPic_GameboyKid, 2, 4, 2), }; -const struct SpriteFrameImage gEventObjectPicTable_ContestOldMan[] = { - overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 0), - overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 1), - overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 2), - overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 3), - overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 4), - overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 5), - overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 6), - overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 7), - overworld_frame(gEventObjectPic_ContestOldMan, 2, 4, 8), +const struct SpriteFrameImage gEventObjectPicTable_ContestJudge[] = { + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 0), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 1), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 2), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 3), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 4), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 5), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 6), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 7), + overworld_frame(gEventObjectPic_ContestJudge, 2, 4, 8), }; const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = { From 94bec0b8db0f2ab5c4c045dd02608e2698fe2c59 Mon Sep 17 00:00:00 2001 From: Deokishisu Date: Sun, 14 Oct 2018 16:14:01 -0400 Subject: [PATCH 3/3] Fix Double Underscores Whoops. --- .../field_event_obj/event_object_graphics.h | 2 +- .../event_object_graphics_info.h | 2 +- .../event_object_graphics_info_pointers.h | 4 ++-- .../field_event_obj/event_object_pic_tables.h | 20 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 1b2564411..4b65e694f 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -78,7 +78,7 @@ const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/peop const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp"); const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp"); const u32 gEventObjectPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp"); -const u32 gEventObjectPic__LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp"); +const u32 gEventObjectPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp"); const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp"); const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp"); const u32 gEventObjectPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp"); diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h index df6a909d3..ebc324b08 100755 --- a/src/data/field_event_obj/event_object_graphics_info.h +++ b/src/data/field_event_obj/event_object_graphics_info.h @@ -14,7 +14,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xFFFF, E const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xFFFF, EVENT_OBJ_PAL_TAG_0, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy, gDummySpriteAffineAnimTable}; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo__LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable__LittleGirl, gDummySpriteAffineAnimTable}; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x16, gEventObjectSpriteOamTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xFFFF, EVENT_OBJ_PAL_TAG_3, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xFFFF, EVENT_OBJ_PAL_TAG_1, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable}; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy = {0xFFFF, EVENT_OBJ_PAL_TAG_2, EVENT_OBJ_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gEventObjectBaseOam_16x32, gEventObjectSpriteOamTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RichBoy, gDummySpriteAffineAnimTable}; diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h index 8e9083216..3f726e30e 100755 --- a/src/data/field_event_obj/event_object_graphics_info_pointers.h +++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h @@ -13,7 +13,7 @@ const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy; -const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo__LittleGirl; +const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3; const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RichBoy; @@ -262,7 +262,7 @@ const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = &gEventObjectGraphicsInfo_Boy2, &gEventObjectGraphicsInfo_Girl2, &gEventObjectGraphicsInfo_LittleBoy, - &gEventObjectGraphicsInfo__LittleGirl, + &gEventObjectGraphicsInfo_LittleGirl, &gEventObjectGraphicsInfo_Boy3, &gEventObjectGraphicsInfo_Girl3, &gEventObjectGraphicsInfo_RichBoy, diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h index fb0a8ed75..bd1ad1a25 100755 --- a/src/data/field_event_obj/event_object_pic_tables.h +++ b/src/data/field_event_obj/event_object_pic_tables.h @@ -193,16 +193,16 @@ const struct SpriteFrameImage gEventObjectPicTable_LittleBoy[] = { overworld_frame(gEventObjectPic_LittleBoy, 2, 2, 8), }; -const struct SpriteFrameImage gEventObjectPicTable__LittleGirl[] = { - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 0), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 1), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 2), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 3), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 4), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 5), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 6), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 7), - overworld_frame(gEventObjectPic__LittleGirl, 2, 2, 8), +const struct SpriteFrameImage gEventObjectPicTable_LittleGirl[] = { + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 0), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 1), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 2), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 3), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 4), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 5), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 6), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 7), + overworld_frame(gEventObjectPic_LittleGirl, 2, 2, 8), }; const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = {