diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-05 13:03:12 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-05-05 13:03:12 -0400 |
| commit | d343d1f19a74657489d987dbd97b84e7389ae295 (patch) | |
| tree | 2e47b11231a68494c5146a32b2a90685cc850a13 | |
| parent | ac4ca95a7bcf05482add953aafa081df824fc954 (diff) | |
| parent | 6b5f5b95bdac53ab4abd93302897d02118738561 (diff) | |
whitespace was released outside. Bye-bye, whitespace!
36 files changed, 2927 insertions, 2892 deletions
diff --git a/data/battle_interface.s b/data/battle_interface.s new file mode 100644 index 000000000..040b1b9d3 --- /dev/null +++ b/data/battle_interface.s @@ -0,0 +1,318 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_0820A47C:: @ 820A47C + obj_tiles gBattleWindowLargeGfx, 4096, 0xd6ff + + .align 2 +gUnknown_0820A484:: @ 820A484 + obj_tiles gBattleWindowSmallGfx, 4096, 0xd701 + + .align 2 +gUnknown_0820A48C:: @ 820A48C + obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd6ff + + .align 2 +gUnknown_0820A494:: @ 820A494 + obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd700 + + .align 2 +gUnknown_0820A49C:: @ 820A49C + obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd701 + + .align 2 +gUnknown_0820A4A4:: @ 820A4A4 + obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd702 + + .align 2 +gUnknown_0820A4AC:: @ 820A4AC + obj_tiles gBattleWindowLarge2Gfx, 4096, 0xd70b + + .align 2 +gUnknown_0820A4B4:: @ 820A4B4 + obj_tiles gBlankGfxCompressed, 256, 0xd704 + obj_tiles gBlankGfxCompressed, 288, 0xd705 + obj_tiles gBlankGfxCompressed, 256, 0xd706 + obj_tiles gBlankGfxCompressed, 288, 0xd707 + + .align 2 +gUnknown_0820A4D4:: @ 820A4D4 + obj_pal gUnknown_08D1212C, 0xD6FF + obj_pal gUnknown_08D1214C, 0xD704 + + .align 2 +gOamData_820A4E4:: @ 820A4E4 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x0400 + + .align 2 +gSpriteTemplate_820A4EC:: @ 820A4EC + spr_template 55039, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_820A504:: @ 820A504 + spr_template 55040, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_820A51C:: @ 820A51C + spr_template 55041, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_820A534:: @ 820A534 + spr_template 55042, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteTemplate_820A54C:: @ 820A54C + spr_template 55051, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gOamData_820A564:: @ 820A564 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0400 + + .align 2 +gSpriteTemplate_820A56C:: @ 820A56C + spr_template 55044, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC + + .align 2 +gSpriteTemplate_820A584:: @ 820A584 + spr_template 55045, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC + + .align 2 +gSpriteTemplate_820A59C:: @ 820A59C + spr_template 55046, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC + + .align 2 +gSpriteTemplate_820A5B4:: @ 820A5B4 + spr_template 55047, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC + + .align 2 +gSubspriteTable_820A5CC:: @ 820A5CC + subsprite -16, 0, 1, 0, 64x32 + subsprite 48, 0, 1, 32, 32x32 + subsprite -16, 32, 1, 48, 32x8 + subsprite 16, 32, 1, 52, 32x8 + subsprite 48, 32, 1, 56, 32x8 + + .align 2 +gSubspriteTable_820A5F4:: @ 820A5F4 + subsprite -16, 0, 1, 64, 64x32 + subsprite 48, 0, 1, 96, 32x32 + subsprite -16, 32, 1, 112, 32x8 + subsprite 16, 32, 1, 116, 32x8 + subsprite 48, 32, 1, 120, 32x8 + + .align 2 +gSubspriteTable_820A61C:: @ 820A61C + subsprite -16, 0, 1, 0, 64x32 + subsprite 48, 0, 1, 32, 32x32 + + .align 2 +gSubspriteTable_820A62C:: @ 820A62C + subsprite -16, 0, 1, 0, 64x32 + subsprite 48, 0, 1, 32, 32x32 + + .align 2 +gSubspriteTable_820A63C:: @ 820A63C + subsprite -16, 0, 1, 0, 32x8 + subsprite 16, 0, 1, 4, 32x8 + + .align 2 +gSubspriteTable_820A64C:: @ 820A64C + subsprite -16, 0, 1, 0, 32x8 + subsprite 16, 0, 1, 4, 32x8 + subsprite -32, 0, 1, 8, 8x8 + +@ unreferenced + .align 2 + .4byte 5, gSubspriteTable_820A5CC + .4byte 2, gSubspriteTable_820A61C + .4byte 5, gSubspriteTable_820A5F4 + .4byte 2, gSubspriteTable_820A62C + + .align 2 +gSubspriteTables_820A684:: @ 820A684 + .4byte 2, gSubspriteTable_820A63C + .4byte 3, gSubspriteTable_820A64C + + .align 2 +gSubspriteTable_820A694:: @ 820A694 + subsprite -96, 0, 1, 0, 32x8 + subsprite -64, 0, 1, 4, 32x8 + subsprite -32, 0, 1, 8, 32x8 + subsprite 0, 0, 1, 12, 32x8 + + .align 2 +gSubspriteTable_820A6B4:: @ 820A6B4 + subsprite -96, 0, 1, 0, 32x8 + subsprite -64, 0, 1, 4, 32x8 + subsprite -32, 0, 1, 8, 32x8 + subsprite 0, 0, 1, 8, 32x8 + subsprite 32, 0, 1, 8, 32x8 + subsprite 64, 0, 1, 12, 32x8 + + .align 2 +gSubspriteTables_820A6E4:: @ 820A6E4 + .4byte 4, gSubspriteTable_820A694 + + .align 2 +gSubspriteTables_820A6EC:: @ 820A6EC + .4byte 6, gSubspriteTable_820A6B4 + +@ unused dakuten/handakuten tiles + .incbin "graphics/unused/dakuten.4bpp" + + .align 2 +gUnknown_0820A754:: @ 820A754 + obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70c + obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70d + + .align 2 +gUnknown_0820A764:: @ 820A764 + obj_pal gUnknown_08D1212C, 0xd710 + obj_pal gUnknown_08D1212C, 0xd711 + + .align 2 +gUnknown_0820A774:: @ 820A774 + obj_pal gUnknown_08D1214C, 0xd712 + obj_pal gUnknown_08D1214C, 0xd713 + + .align 2 +gUnknown_0820A784:: @ 820A784 + obj_tiles Tiles_D129AC, 0x80, 0xd714 + obj_tiles Tiles_D129AC, 0x80, 0xd715 + + .align 2 +gOamData_820A794:: @ 820A794 + .2byte 0x4000 + .2byte 0xC000 + .2byte 0x0400 + + .align 2 +gOamData_820A79C:: @ 820A79C + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0400 + + .align 2 +gSpriteTemplate_820A7A4:: @ 820A7A4 + spr_template 55052, 55056, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8045030 + + .align 2 +gSpriteTemplate_820A7BC:: @ 820A7BC + spr_template 55053, 55057, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8045030 + + .align 2 +gSpriteTemplate_820A7D4:: @ 820A7D4 + spr_template 55060, 55058, gOamData_820A79C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_804507C + + .align 2 +gSpriteTemplate_820A7EC:: @ 820A7EC + spr_template 55061, 55059, gOamData_820A79C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_804507C + + .align 2 +gUnknown_0820A804:: @ 820A804 + .4byte OBJ_VRAM0 + 0x940 + .4byte OBJ_VRAM0 + 0x960 + + .align 2 +gUnknown_0820A80C:: @ 820A80C + .4byte OBJ_VRAM0 + 0x520 + .4byte OBJ_VRAM0 + 0x540 + + .align 2 +gUnknown_0820A814:: @ 820A814 + .4byte OBJ_VRAM0 + 0x540 + .4byte OBJ_VRAM0 + 0x560 + +gUnknown_0820A81C:: @ 820A81C + .string "{COLOR DARK_GREY}{HIGHLIGHT RED} " + + .align 2 +gUnknown_0820A83C:: @ 820A83C + .4byte OBJ_VRAM0 + 0x3E0 + .4byte OBJ_VRAM0 + 0xB00 + .4byte OBJ_VRAM0 + 0xB20 + + .align 2 +gUnknown_0820A848:: @ 820A848 + .4byte OBJ_VRAM0 + 0x2C0 + .4byte OBJ_VRAM0 + 0x2E0 + .4byte OBJ_VRAM0 + 0x600 + + .align 2 +gUnknown_0820A854:: @ 820A854 + .4byte OBJ_VRAM0 + 0xB40 + .4byte OBJ_VRAM0 + 0xB60 + + .align 2 +gUnknown_0820A85C:: @ 820A85C + .4byte OBJ_VRAM0 + 0x620 + .4byte OBJ_VRAM0 + 0x640 + +gUnknown_0820A864:: @ 820A864 + .string "{COLOR DARK_GREY}{HIGHLIGHT RED} /$" + + .align 2 +gUnknown_0820A87C:: @ 820A87C + .4byte OBJ_VRAM0 + .4byte OBJ_VRAM0 + 0x20 + .4byte OBJ_VRAM0 + 0x40 + .4byte OBJ_VRAM0 + 0x60 + .4byte OBJ_VRAM0 + 0x80 + .4byte OBJ_VRAM0 + 0xA0 + + .align 2 +gUnknown_0820A894:: @ 820A894 + .4byte OBJ_VRAM0 + 0xC0 + .4byte OBJ_VRAM0 + 0xE0 + +gUnknown_0820A89C:: @ 820A89C + .string "{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT} " + +gUnknown_0820A8B0:: @ 820A8B0 + .string "{HIGHLIGHT RED}$" + + .align 2 +gUnknown_0820A8B4:: @ 820A8B4 + .4byte OBJ_VRAM0 + 0x40 + .4byte OBJ_VRAM0 + 0x60 + .4byte OBJ_VRAM0 + 0x80 + .4byte OBJ_VRAM0 + 0xA0 + .4byte OBJ_VRAM0 + 0xC0 + .4byte OBJ_VRAM0 + 0xE0 + .4byte OBJ_VRAM0 + 0x800 + .4byte OBJ_VRAM0 + 0x820 + .4byte OBJ_VRAM0 + 0x840 + .4byte OBJ_VRAM0 + 0x860 + + .align 2 +gUnknown_0820A8DC:: @ 820A8DC + .4byte OBJ_VRAM0 + 0x20 + .4byte OBJ_VRAM0 + 0x40 + .4byte OBJ_VRAM0 + 0x60 + .4byte OBJ_VRAM0 + 0x80 + .4byte OBJ_VRAM0 + 0xA0 + .4byte OBJ_VRAM0 + 0xC0 + .4byte OBJ_VRAM0 + 0xE0 + .4byte OBJ_VRAM0 + 0x400 + .4byte OBJ_VRAM0 + 0x420 + .4byte OBJ_VRAM0 + 0x440 + + .align 2 +gUnknown_0820A904:: @ 820A904 + .4byte OBJ_VRAM0 + 0x40 + .4byte OBJ_VRAM0 + 0x60 + .4byte OBJ_VRAM0 + 0x80 + .4byte OBJ_VRAM0 + 0xA0 + .4byte OBJ_VRAM0 + 0xC0 + .4byte OBJ_VRAM0 + 0xE0 + .4byte OBJ_VRAM0 + 0x400 + .4byte OBJ_VRAM0 + 0x420 + .4byte OBJ_VRAM0 + 0x440 + .4byte OBJ_VRAM0 + 0x460 diff --git a/data/data2.s b/data/data2.s index 873679c95..b8b6dc7db 100644 --- a/data/data2.s +++ b/data/data2.s @@ -6,61 +6,6 @@ .section .rodata .align 2 -gUnknown_081E764C:: @ 81E764C - .incbin "graphics/birch_speech/bg0.gbapal" - .incbin "graphics/birch_speech/bg1.gbapal" - - .align 2 -gBirchIntroShadowGfx:: @ 81E768C - .incbin "graphics/birch_speech/shadow.4bpp.lz" - - .align 2 -gUnknown_081E7834:: @ 81E7834 - .incbin "graphics/birch_speech/map.bin.lz" - - .align 2 -gUnknown_081E795C:: @ 81E795C - .incbin "graphics/birch_speech/bg2.gbapal" - - .align 2 -gUnknown_081E796C:: @ 81E796C - .space 16 - - .align 2 -gMainMenuPalette:: @ 81E797C - .incbin "graphics/misc/main_menu.gbapal" - - .align 2 -gSpriteAffineAnim_81E799C:: @ 81E799C - obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 48 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_81E79AC:: @ 81E79AC - .4byte gSpriteAffineAnim_81E799C - - .align 2 -gUnknown_081E79B0:: @ 81E79B0 - .4byte gBirchText_Boy, 0 - .4byte gBirchText_Girl, 0 - - .align 2 -gMalePresetNames:: @ 81E79C0 - .4byte gBirchText_NewName, 0 - .4byte gDefaultBoyName1, 0 - .4byte gDefaultBoyName2, 0 - .4byte gDefaultBoyName3, 0 - .4byte gDefaultBoyName4, 0 - - .align 2 -gFemalePresetNames:: @ 81E79E8 - .4byte gBirchText_NewName, 0 - .4byte gDefaultGirlName1, 0 - .4byte gDefaultGirlName2, 0 - .4byte gDefaultGirlName3, 0 - .4byte gDefaultGirlName4, 0 - - .align 2 gSpriteImageTable_81E7A10:: @ 81E7A10 obj_frame_tiles 0x2008000, 0x800 obj_frame_tiles 0x2008800, 0x800 @@ -1857,650 +1802,3 @@ gUnknown_081FC1D0:: @ 81FC1D0 .2byte -1, -1, -1 .space 2 - -@ 81FC1E0 - .include "data/species_id_conversion_tables.inc" - -@ 81FCB84 - .include "data/spinda_spot_graphics.inc" - -@ 81FCC14 - .include "data/item_effects.inc" - -@ 81FD070 - .include "data/nature_stat_table.inc" - -@ 81FD0F0 - .include "data/tm_hm_learnsets.inc" - -@ 81FDDD0 - .include "data/trainer_class_index_tables.inc" - -@ 81FDE6A - .include "data/cry_id_table.inc" - -@ 81FDF78 - .include "data/experience_tables/tables.inc" - -@ 81FEC18 - .include "data/base_stats.inc" - -@ 8201928 - .include "data/level_up_learnsets.inc" - -@ 8203B68 - .include "data/evolution_table.inc" - -@ 8207BC8 - .include "data/level_up_learnset_pointers.inc" - -gUnknown_08208238:: @ 8208238 - .byte 0x03, 0x0C, 0x30, 0xC0 - -gUnknown_0820823C:: @ 820823C - .byte 0xFC, 0xF3, 0xCF, 0x3F - -gUnknown_08208240:: @ 8208240 - .byte 0x01, 0x04, 0x10, 0x40 - -gStatStageRatios:: @ 8208244 - .byte 10, 40 @ -6 - .byte 10, 35 @ -5 - .byte 10, 30 @ -4 - .byte 10, 25 @ -3 - .byte 10, 20 @ -2 - .byte 10, 15 @ -1 - .byte 10, 10 @ 0 - .byte 15, 10 @ +1 - .byte 20, 10 @ +2 - .byte 25, 10 @ +3 - .byte 30, 10 @ +4 - .byte 35, 10 @ +5 - .byte 40, 10 @ +6 - -@ abbreviation of Game Freak - .string "ゲーフリ$" - -gHoldEffectToType:: @ 8208263 - .byte HOLD_EFFECT_BUG_POWER, TYPE_BUG - .byte HOLD_EFFECT_STEEL_POWER, TYPE_STEEL - .byte HOLD_EFFECT_GROUND_POWER, TYPE_GROUND - .byte HOLD_EFFECT_ROCK_POWER, TYPE_ROCK - .byte HOLD_EFFECT_GRASS_POWER, TYPE_GRASS - .byte HOLD_EFFECT_DARK_POWER, TYPE_DARK - .byte HOLD_EFFECT_FIGHTING_POWER, TYPE_FIGHTING - .byte HOLD_EFFECT_ELECTRIC_POWER, TYPE_ELECTRIC - .byte HOLD_EFFECT_WATER_POWER, TYPE_WATER - .byte HOLD_EFFECT_FLYING_POWER, TYPE_FLYING - .byte HOLD_EFFECT_POISON_POWER, TYPE_POISON - .byte HOLD_EFFECT_ICE_POWER, TYPE_ICE - .byte HOLD_EFFECT_GHOST_POWER, TYPE_GHOST - .byte HOLD_EFFECT_PSYCHIC_POWER, TYPE_PSYCHIC - .byte HOLD_EFFECT_FIRE_POWER, TYPE_FIRE - .byte HOLD_EFFECT_DRAGON_POWER, TYPE_DRAGON - .byte HOLD_EFFECT_NORMAL_POWER, TYPE_NORMAL - .byte 0, 0 - - .align 2 -gSpriteTemplate_8208288:: @ 8208288 - spr_template 0xFFFF, 0, gOamData_81F96F0, NULL, gSpriteImageTable_81E7A10, gSpriteAffineAnimTable_81E7B70, sub_80105A0 - spr_template 0xFFFF, 0, gOamData_81F96E8, NULL, gSpriteImageTable_81E7A30, gSpriteAffineAnimTable_81E7BEC, oac_poke_opponent - spr_template 0xFFFF, 0, gOamData_81F96F0, NULL, gSpriteImageTable_81E7A50, gSpriteAffineAnimTable_81E7B70, sub_80105A0 - spr_template 0xFFFF, 0, gOamData_81F96E8, NULL, gSpriteImageTable_81E7A70, gSpriteAffineAnimTable_81E7BEC, oac_poke_opponent - -gSecretBaseTrainerClasses:: @ 82082E8 - .byte TRAINER_CLASS_YOUNGSTER, TRAINER_CLASS_BUG_CATCHER, TRAINER_CLASS_RICH_BOY, TRAINER_CLASS_CAMPER, TRAINER_CLASS_COOL_TRAINER_M - .byte TRAINER_CLASS_LASS, TRAINER_CLASS_SCHOOL_KID_F, TRAINER_CLASS_LADY, TRAINER_CLASS_PICNICKER, TRAINER_CLASS_COOL_TRAINER_F - -gUnknown_082082F2:: @ 82082F2 - .byte 0x1A, 0x1B, 0x1C, 0x1D, 0x1F, 0x1E - -gUnknown_082082F8:: @ 82082F8 - .byte 1, 1, 3, 2, 4, 6 - -gUnknown_082082FE:: @ 82082FE - .byte 5, 3, 2 - .byte 5, 3, 2 - .byte 1, 1, 0 - .byte 3, 2, 1 - .byte 1, 1, 0 - .byte 1, 1, 1 - .byte -1, -1, -1 - .byte -5, -5, -10 - .byte -5, -5, -10 - - .align 1 -gUnknown_0820831A:: @ 820831A - .2byte 0xF - .2byte 0x13 - .2byte 0x39 - .2byte 0x46 - .2byte 0x94 - .2byte 0xF9 - .2byte 0x7F - .2byte 0x123 - .2byte 0xFFFF - -@ "Nidoran♂" Japanese name - .string "ニドラン♂$", 11 - -@ "Nidoran♀" Japanese name -gUnknown_08208337:: @ 8208337 - .string "ニドラン♀$", 13 - -@ 8208344 - .include "data/sine_table.inc" - -@ 82085C4 - .include "data/sine_degree_table.inc" - - .align 2 -gBitTable:: @ 820872C - .4byte 0x00000001 - .4byte 0x00000002 - .4byte 0x00000004 - .4byte 0x00000008 - .4byte 0x00000010 - .4byte 0x00000020 - .4byte 0x00000040 - .4byte 0x00000080 - .4byte 0x00000100 - .4byte 0x00000200 - .4byte 0x00000400 - .4byte 0x00000800 - .4byte 0x00001000 - .4byte 0x00002000 - .4byte 0x00004000 - .4byte 0x00008000 - .4byte 0x00010000 - .4byte 0x00020000 - .4byte 0x00040000 - .4byte 0x00080000 - .4byte 0x00100000 - .4byte 0x00200000 - .4byte 0x00400000 - .4byte 0x00800000 - .4byte 0x01000000 - .4byte 0x02000000 - .4byte 0x04000000 - .4byte 0x08000000 - .4byte 0x10000000 - .4byte 0x20000000 - .4byte 0x40000000 - .4byte 0x80000000 - - .align 2 -gInvisibleSpriteTemplate:: @ 82087AC - spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteDimensions:: @ 82087C4 - @ square - .byte 1, 1 - .byte 2, 2 - .byte 4, 4 - .byte 8, 8 - - @ horizontal rectangle - .byte 2, 1 - .byte 4, 1 - .byte 4, 2 - .byte 8, 4 - - @ vertical rectangle - .byte 1, 2 - .byte 1, 4 - .byte 2, 4 - .byte 4, 8 - -@ 82087DC - .include "data/crc16_table.inc" - - .align 2 -gMiscBlank_Gfx:: @ 82089DC - .incbin "graphics/interface/blank.4bpp" - -@ 82091DC - .include "data/egg_moves.inc" - - .align 2 -gUnknown_08209AC4:: @ 8209AC4 - .4byte DaycareText_GetAlongVeryWell - .4byte DaycareText_GetAlong - .4byte DaycareText_DontLikeOther - .4byte DaycareText_PlayOther - -gUnknown_08209AD4:: @ 8209AD4 - .string "タマゴ$" - -EggPalette:: @ 8209AD8 - .incbin "graphics/pokemon/egg/palette.gbapal" - -EggHatchTiles:: @ 8209AF8 - .incbin "graphics/misc/egg_hatch.4bpp" - -EggShardTiles:: @ 820A2F8 - .incbin "graphics/misc/egg_shard.4bpp" - - .align 2 -gOamData_820A378:: @ 820A378 - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_820A380:: @ 820A380 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820A388:: @ 820A388 - obj_image_anim_frame 16, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820A390:: @ 820A390 - obj_image_anim_frame 32, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820A398:: @ 820A398 - obj_image_anim_frame 48, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_820A3A0:: @ 820A3A0 - .4byte gSpriteAnim_820A380 - .4byte gSpriteAnim_820A388 - .4byte gSpriteAnim_820A390 - .4byte gSpriteAnim_820A398 - - .align 2 -gUnknown_0820A3B0:: @ 820A3B0 - obj_tiles EggHatchTiles, 2048, 12345 - - .align 2 -gUnknown_0820A3B8:: @ 820A3B8 - obj_tiles EggShardTiles, 128, 23456 - - .align 2 -gUnknown_0820A3C0:: @ 820A3C0 - obj_pal EggPalette, 54321 - - .align 2 -gSpriteTemplate_820A3C8:: @ 820A3C8 - spr_template 12345, 54321, gOamData_820A378, gSpriteAnimTable_820A3A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_820A3E0:: @ 820A3E0 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_820A3E8:: @ 820A3E8 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820A3F0:: @ 820A3F0 - obj_image_anim_frame 1, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820A3F8:: @ 820A3F8 - obj_image_anim_frame 2, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820A400:: @ 820A400 - obj_image_anim_frame 3, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_820A408:: @ 820A408 - .4byte gSpriteAnim_820A3E8 - .4byte gSpriteAnim_820A3F0 - .4byte gSpriteAnim_820A3F8 - .4byte gSpriteAnim_820A400 - - .align 2 -gSpriteTemplate_820A418:: @ 820A418 - spr_template 23456, 54321, gOamData_820A3E0, gSpriteAnimTable_820A408, NULL, gDummySpriteAffineAnimTable, SpriteCB_EggShard - -@ The values are Q8.8 fixed-point numbers. - .align 1 -gEggShardVelocities:: @ 820A430 - .2byte 0xFE80, 0xFC40 @ (-1.5, -3.75) - .2byte 0xFB00, 0xFD00 @ (-5, -3) - .2byte 0x0380, 0xFD00 @ (3.5, -3) - .2byte 0xFC00, 0xFC40 @ (-4, -3.75) - .2byte 0x0200, 0xFE80 @ (2, -1.5) - .2byte 0xFF80, 0xF940 @ (-0.5, -6.75) - .2byte 0x0500, 0xFDC0 @ (5, -2.25) - .2byte 0xFE80, 0xFC40 @ (-1.5, -3.75) - .2byte 0x0480, 0xFE80 @ (4.5, -1.5) - .2byte 0xFF00, 0xF940 @ (-1, -6.75) - .2byte 0x0400, 0xFDC0 @ (4, -2.25) - .2byte 0xFC80, 0xFC40 @ (-3.5, -3.75) - .2byte 0x0100, 0xFE80 @ (1, -1.5) - .2byte 0xFC7C, 0xF940 @ (-3.515625, -6.75) - .2byte 0x0480, 0xFDC0 @ (4.5, -2.25) - .2byte 0xFF80, 0xF880 @ (-0.5, -7.5) - .2byte 0x0100, 0xFB80 @ (1, -4.5) - .2byte 0xFD80, 0xFDC0 @ (-2.5, -2.25) - .2byte 0x0280, 0xF880 @ (2.5, -7.5) - - .align 2 -gUnknown_0820A47C:: @ 820A47C - obj_tiles gBattleWindowLargeGfx, 4096, 0xd6ff - - .align 2 -gUnknown_0820A484:: @ 820A484 - obj_tiles gBattleWindowSmallGfx, 4096, 0xd701 - - .align 2 -gUnknown_0820A48C:: @ 820A48C - obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd6ff - - .align 2 -gUnknown_0820A494:: @ 820A494 - obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd700 - - .align 2 -gUnknown_0820A49C:: @ 820A49C - obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd701 - - .align 2 -gUnknown_0820A4A4:: @ 820A4A4 - obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd702 - - .align 2 -gUnknown_0820A4AC:: @ 820A4AC - obj_tiles gBattleWindowLarge2Gfx, 4096, 0xd70b - - .align 2 -gUnknown_0820A4B4:: @ 820A4B4 - obj_tiles gBlankGfxCompressed, 256, 0xd704 - obj_tiles gBlankGfxCompressed, 288, 0xd705 - obj_tiles gBlankGfxCompressed, 256, 0xd706 - obj_tiles gBlankGfxCompressed, 288, 0xd707 - - .align 2 -gUnknown_0820A4D4:: @ 820A4D4 - obj_pal gUnknown_08D1212C, 0xD6FF - obj_pal gUnknown_08D1214C, 0xD704 - - .align 2 -gOamData_820A4E4:: @ 820A4E4 - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteTemplate_820A4EC:: @ 820A4EC - spr_template 55039, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_820A504:: @ 820A504 - spr_template 55040, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_820A51C:: @ 820A51C - spr_template 55041, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_820A534:: @ 820A534 - spr_template 55042, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_820A54C:: @ 820A54C - spr_template 55051, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_820A564:: @ 820A564 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteTemplate_820A56C:: @ 820A56C - spr_template 55044, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC - - .align 2 -gSpriteTemplate_820A584:: @ 820A584 - spr_template 55045, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC - - .align 2 -gSpriteTemplate_820A59C:: @ 820A59C - spr_template 55046, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC - - .align 2 -gSpriteTemplate_820A5B4:: @ 820A5B4 - spr_template 55047, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC - - .align 2 -gSubspriteTable_820A5CC:: @ 820A5CC - subsprite -16, 0, 1, 0, 64x32 - subsprite 48, 0, 1, 32, 32x32 - subsprite -16, 32, 1, 48, 32x8 - subsprite 16, 32, 1, 52, 32x8 - subsprite 48, 32, 1, 56, 32x8 - - .align 2 -gSubspriteTable_820A5F4:: @ 820A5F4 - subsprite -16, 0, 1, 64, 64x32 - subsprite 48, 0, 1, 96, 32x32 - subsprite -16, 32, 1, 112, 32x8 - subsprite 16, 32, 1, 116, 32x8 - subsprite 48, 32, 1, 120, 32x8 - - .align 2 -gSubspriteTable_820A61C:: @ 820A61C - subsprite -16, 0, 1, 0, 64x32 - subsprite 48, 0, 1, 32, 32x32 - - .align 2 -gSubspriteTable_820A62C:: @ 820A62C - subsprite -16, 0, 1, 0, 64x32 - subsprite 48, 0, 1, 32, 32x32 - - .align 2 -gSubspriteTable_820A63C:: @ 820A63C - subsprite -16, 0, 1, 0, 32x8 - subsprite 16, 0, 1, 4, 32x8 - - .align 2 -gSubspriteTable_820A64C:: @ 820A64C - subsprite -16, 0, 1, 0, 32x8 - subsprite 16, 0, 1, 4, 32x8 - subsprite -32, 0, 1, 8, 8x8 - -@ unreferenced - .align 2 - .4byte 5, gSubspriteTable_820A5CC - .4byte 2, gSubspriteTable_820A61C - .4byte 5, gSubspriteTable_820A5F4 - .4byte 2, gSubspriteTable_820A62C - - .align 2 -gSubspriteTables_820A684:: @ 820A684 - .4byte 2, gSubspriteTable_820A63C - .4byte 3, gSubspriteTable_820A64C - - .align 2 -gSubspriteTable_820A694:: @ 820A694 - subsprite -96, 0, 1, 0, 32x8 - subsprite -64, 0, 1, 4, 32x8 - subsprite -32, 0, 1, 8, 32x8 - subsprite 0, 0, 1, 12, 32x8 - - .align 2 -gSubspriteTable_820A6B4:: @ 820A6B4 - subsprite -96, 0, 1, 0, 32x8 - subsprite -64, 0, 1, 4, 32x8 - subsprite -32, 0, 1, 8, 32x8 - subsprite 0, 0, 1, 8, 32x8 - subsprite 32, 0, 1, 8, 32x8 - subsprite 64, 0, 1, 12, 32x8 - - .align 2 -gSubspriteTables_820A6E4:: @ 820A6E4 - .4byte 4, gSubspriteTable_820A694 - - .align 2 -gSubspriteTables_820A6EC:: @ 820A6EC - .4byte 6, gSubspriteTable_820A6B4 - -@ unused dakuten/handakuten tiles - .incbin "graphics/unused/dakuten.4bpp" - - .align 2 -gUnknown_0820A754:: @ 820A754 - obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70c - obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70d - - .align 2 -gUnknown_0820A764:: @ 820A764 - obj_pal gUnknown_08D1212C, 0xd710 - obj_pal gUnknown_08D1212C, 0xd711 - - .align 2 -gUnknown_0820A774:: @ 820A774 - obj_pal gUnknown_08D1214C, 0xd712 - obj_pal gUnknown_08D1214C, 0xd713 - - .align 2 -gUnknown_0820A784:: @ 820A784 - obj_tiles Tiles_D129AC, 0x80, 0xd714 - obj_tiles Tiles_D129AC, 0x80, 0xd715 - - .align 2 -gOamData_820A794:: @ 820A794 - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gOamData_820A79C:: @ 820A79C - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0400 - - .align 2 -gSpriteTemplate_820A7A4:: @ 820A7A4 - spr_template 55052, 55056, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8045030 - - .align 2 -gSpriteTemplate_820A7BC:: @ 820A7BC - spr_template 55053, 55057, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8045030 - - .align 2 -gSpriteTemplate_820A7D4:: @ 820A7D4 - spr_template 55060, 55058, gOamData_820A79C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_804507C - - .align 2 -gSpriteTemplate_820A7EC:: @ 820A7EC - spr_template 55061, 55059, gOamData_820A79C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_804507C - - .align 2 -gUnknown_0820A804:: @ 820A804 - .4byte OBJ_VRAM0 + 0x940 - .4byte OBJ_VRAM0 + 0x960 - - .align 2 -gUnknown_0820A80C:: @ 820A80C - .4byte OBJ_VRAM0 + 0x520 - .4byte OBJ_VRAM0 + 0x540 - - .align 2 -gUnknown_0820A814:: @ 820A814 - .4byte OBJ_VRAM0 + 0x540 - .4byte OBJ_VRAM0 + 0x560 - -gUnknown_0820A81C:: @ 820A81C - .string "{COLOR DARK_GREY}{HIGHLIGHT RED} " - - .align 2 -gUnknown_0820A83C:: @ 820A83C - .4byte OBJ_VRAM0 + 0x3E0 - .4byte OBJ_VRAM0 + 0xB00 - .4byte OBJ_VRAM0 + 0xB20 - - .align 2 -gUnknown_0820A848:: @ 820A848 - .4byte OBJ_VRAM0 + 0x2C0 - .4byte OBJ_VRAM0 + 0x2E0 - .4byte OBJ_VRAM0 + 0x600 - - .align 2 -gUnknown_0820A854:: @ 820A854 - .4byte OBJ_VRAM0 + 0xB40 - .4byte OBJ_VRAM0 + 0xB60 - - .align 2 -gUnknown_0820A85C:: @ 820A85C - .4byte OBJ_VRAM0 + 0x620 - .4byte OBJ_VRAM0 + 0x640 - -gUnknown_0820A864:: @ 820A864 - .string "{COLOR DARK_GREY}{HIGHLIGHT RED} /$" - - .align 2 -gUnknown_0820A87C:: @ 820A87C - .4byte OBJ_VRAM0 - .4byte OBJ_VRAM0 + 0x20 - .4byte OBJ_VRAM0 + 0x40 - .4byte OBJ_VRAM0 + 0x60 - .4byte OBJ_VRAM0 + 0x80 - .4byte OBJ_VRAM0 + 0xA0 - - .align 2 -gUnknown_0820A894:: @ 820A894 - .4byte OBJ_VRAM0 + 0xC0 - .4byte OBJ_VRAM0 + 0xE0 - -gUnknown_0820A89C:: @ 820A89C - .string "{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT} " - -gUnknown_0820A8B0:: @ 820A8B0 - .string "{HIGHLIGHT RED}$" - - .align 2 -gUnknown_0820A8B4:: @ 820A8B4 - .4byte OBJ_VRAM0 + 0x40 - .4byte OBJ_VRAM0 + 0x60 - .4byte OBJ_VRAM0 + 0x80 - .4byte OBJ_VRAM0 + 0xA0 - .4byte OBJ_VRAM0 + 0xC0 - .4byte OBJ_VRAM0 + 0xE0 - .4byte OBJ_VRAM0 + 0x800 - .4byte OBJ_VRAM0 + 0x820 - .4byte OBJ_VRAM0 + 0x840 - .4byte OBJ_VRAM0 + 0x860 - - .align 2 -gUnknown_0820A8DC:: @ 820A8DC - .4byte OBJ_VRAM0 + 0x20 - .4byte OBJ_VRAM0 + 0x40 - .4byte OBJ_VRAM0 + 0x60 - .4byte OBJ_VRAM0 + 0x80 - .4byte OBJ_VRAM0 + 0xA0 - .4byte OBJ_VRAM0 + 0xC0 - .4byte OBJ_VRAM0 + 0xE0 - .4byte OBJ_VRAM0 + 0x400 - .4byte OBJ_VRAM0 + 0x420 - .4byte OBJ_VRAM0 + 0x440 - - .align 2 -gUnknown_0820A904:: @ 820A904 - .4byte OBJ_VRAM0 + 0x40 - .4byte OBJ_VRAM0 + 0x60 - .4byte OBJ_VRAM0 + 0x80 - .4byte OBJ_VRAM0 + 0xA0 - .4byte OBJ_VRAM0 + 0xC0 - .4byte OBJ_VRAM0 + 0xE0 - .4byte OBJ_VRAM0 + 0x400 - .4byte OBJ_VRAM0 + 0x420 - .4byte OBJ_VRAM0 + 0x440 - .4byte OBJ_VRAM0 + 0x460 diff --git a/data/daycare.s b/data/daycare.s new file mode 100644 index 000000000..92eb4637e --- /dev/null +++ b/data/daycare.s @@ -0,0 +1,17 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +@ 82091DC + .include "data/egg_moves.inc" + + .align 2 +gUnknown_08209AC4:: @ 8209AC4 + .4byte DaycareText_GetAlongVeryWell + .4byte DaycareText_GetAlong + .4byte DaycareText_DontLikeOther + .4byte DaycareText_PlayOther + +gUnknown_08209AD4:: @ 8209AD4 + .string "タマゴ$" diff --git a/data/egg_hatch.s b/data/egg_hatch.s new file mode 100644 index 000000000..1823409dd --- /dev/null +++ b/data/egg_hatch.s @@ -0,0 +1,122 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +EggPalette:: @ 8209AD8 + .incbin "graphics/pokemon/egg/palette.gbapal" + +EggHatchTiles:: @ 8209AF8 + .incbin "graphics/misc/egg_hatch.4bpp" + +EggShardTiles:: @ 820A2F8 + .incbin "graphics/misc/egg_shard.4bpp" + + .align 2 +gOamData_820A378:: @ 820A378 + .2byte 0x0000 + .2byte 0x8000 + .2byte 0x0400 + + .align 2 +gSpriteAnim_820A380:: @ 820A380 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_820A388:: @ 820A388 + obj_image_anim_frame 16, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_820A390:: @ 820A390 + obj_image_anim_frame 32, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_820A398:: @ 820A398 + obj_image_anim_frame 48, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_820A3A0:: @ 820A3A0 + .4byte gSpriteAnim_820A380 + .4byte gSpriteAnim_820A388 + .4byte gSpriteAnim_820A390 + .4byte gSpriteAnim_820A398 + + .align 2 +gUnknown_0820A3B0:: @ 820A3B0 + obj_tiles EggHatchTiles, 2048, 12345 + + .align 2 +gUnknown_0820A3B8:: @ 820A3B8 + obj_tiles EggShardTiles, 128, 23456 + + .align 2 +gUnknown_0820A3C0:: @ 820A3C0 + obj_pal EggPalette, 54321 + + .align 2 +gSpriteTemplate_820A3C8:: @ 820A3C8 + spr_template 12345, 54321, gOamData_820A378, gSpriteAnimTable_820A3A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gOamData_820A3E0:: @ 820A3E0 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0800 + + .align 2 +gSpriteAnim_820A3E8:: @ 820A3E8 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_820A3F0:: @ 820A3F0 + obj_image_anim_frame 1, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_820A3F8:: @ 820A3F8 + obj_image_anim_frame 2, 5 + obj_image_anim_end + + .align 2 +gSpriteAnim_820A400:: @ 820A400 + obj_image_anim_frame 3, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_820A408:: @ 820A408 + .4byte gSpriteAnim_820A3E8 + .4byte gSpriteAnim_820A3F0 + .4byte gSpriteAnim_820A3F8 + .4byte gSpriteAnim_820A400 + + .align 2 +gSpriteTemplate_820A418:: @ 820A418 + spr_template 23456, 54321, gOamData_820A3E0, gSpriteAnimTable_820A408, NULL, gDummySpriteAffineAnimTable, SpriteCB_EggShard + +@ The values are Q8.8 fixed-point numbers. + .align 1 +gEggShardVelocities:: @ 820A430 + .2byte 0xFE80, 0xFC40 @ (-1.5, -3.75) + .2byte 0xFB00, 0xFD00 @ (-5, -3) + .2byte 0x0380, 0xFD00 @ (3.5, -3) + .2byte 0xFC00, 0xFC40 @ (-4, -3.75) + .2byte 0x0200, 0xFE80 @ (2, -1.5) + .2byte 0xFF80, 0xF940 @ (-0.5, -6.75) + .2byte 0x0500, 0xFDC0 @ (5, -2.25) + .2byte 0xFE80, 0xFC40 @ (-1.5, -3.75) + .2byte 0x0480, 0xFE80 @ (4.5, -1.5) + .2byte 0xFF00, 0xF940 @ (-1, -6.75) + .2byte 0x0400, 0xFDC0 @ (4, -2.25) + .2byte 0xFC80, 0xFC40 @ (-3.5, -3.75) + .2byte 0x0100, 0xFE80 @ (1, -1.5) + .2byte 0xFC7C, 0xF940 @ (-3.515625, -6.75) + .2byte 0x0480, 0xFDC0 @ (4.5, -2.25) + .2byte 0xFF80, 0xF880 @ (-0.5, -7.5) + .2byte 0x0100, 0xFB80 @ (1, -4.5) + .2byte 0xFD80, 0xFDC0 @ (-2.5, -2.25) + .2byte 0x0280, 0xF880 @ (2.5, -7.5) diff --git a/data/main_menu.s b/data/main_menu.s new file mode 100644 index 000000000..1fae3850b --- /dev/null +++ b/data/main_menu.s @@ -0,0 +1,59 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_081E764C:: @ 81E764C + .incbin "graphics/birch_speech/bg0.gbapal" + .incbin "graphics/birch_speech/bg1.gbapal" + + .align 2 +gBirchIntroShadowGfx:: @ 81E768C + .incbin "graphics/birch_speech/shadow.4bpp.lz" + + .align 2 +gUnknown_081E7834:: @ 81E7834 + .incbin "graphics/birch_speech/map.bin.lz" + + .align 2 +gUnknown_081E795C:: @ 81E795C + .incbin "graphics/birch_speech/bg2.gbapal" + + .align 2 +gUnknown_081E796C:: @ 81E796C + .space 16 + + .align 2 +gMainMenuPalette:: @ 81E797C + .incbin "graphics/misc/main_menu.gbapal" + + .align 2 +gSpriteAffineAnim_81E799C:: @ 81E799C + obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 48 + obj_rot_scal_anim_end + + .align 2 +gSpriteAffineAnimTable_81E79AC:: @ 81E79AC + .4byte gSpriteAffineAnim_81E799C + + .align 2 +gUnknown_081E79B0:: @ 81E79B0 + .4byte gBirchText_Boy, 0 + .4byte gBirchText_Girl, 0 + + .align 2 +gMalePresetNames:: @ 81E79C0 + .4byte gBirchText_NewName, 0 + .4byte gDefaultBoyName1, 0 + .4byte gDefaultBoyName2, 0 + .4byte gDefaultBoyName3, 0 + .4byte gDefaultBoyName4, 0 + + .align 2 +gFemalePresetNames:: @ 81E79E8 + .4byte gBirchText_NewName, 0 + .4byte gDefaultGirlName1, 0 + .4byte gDefaultGirlName2, 0 + .4byte gDefaultGirlName3, 0 + .4byte gDefaultGirlName4, 0 diff --git a/data/pokemon.s b/data/pokemon.s new file mode 100644 index 000000000..758e6c77e --- /dev/null +++ b/data/pokemon.s @@ -0,0 +1,134 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +@ 81FC1E0 + .include "data/species_id_conversion_tables.inc" + +@ 81FCB84 + .include "data/spinda_spot_graphics.inc" + +@ 81FCC14 + .include "data/item_effects.inc" + +@ 81FD070 + .include "data/nature_stat_table.inc" + +@ 81FD0F0 + .include "data/tm_hm_learnsets.inc" + +@ 81FDDD0 + .include "data/trainer_class_index_tables.inc" + +@ 81FDE6A + .include "data/cry_id_table.inc" + +@ 81FDF78 + .include "data/experience_tables/tables.inc" + +@ 81FEC18 + .include "data/base_stats.inc" + +@ 8201928 + .include "data/level_up_learnsets.inc" + +@ 8203B68 + .include "data/evolution_table.inc" + +@ 8207BC8 + .include "data/level_up_learnset_pointers.inc" + +gUnknown_08208238:: @ 8208238 + .byte 0x03, 0x0C, 0x30, 0xC0 + +gUnknown_0820823C:: @ 820823C + .byte 0xFC, 0xF3, 0xCF, 0x3F + +gUnknown_08208240:: @ 8208240 + .byte 0x01, 0x04, 0x10, 0x40 + +gStatStageRatios:: @ 8208244 + .byte 10, 40 @ -6 + .byte 10, 35 @ -5 + .byte 10, 30 @ -4 + .byte 10, 25 @ -3 + .byte 10, 20 @ -2 + .byte 10, 15 @ -1 + .byte 10, 10 @ 0 + .byte 15, 10 @ +1 + .byte 20, 10 @ +2 + .byte 25, 10 @ +3 + .byte 30, 10 @ +4 + .byte 35, 10 @ +5 + .byte 40, 10 @ +6 + +@ abbreviation of Game Freak + .string "ゲーフリ$" + +gHoldEffectToType:: @ 8208263 + .byte HOLD_EFFECT_BUG_POWER, TYPE_BUG + .byte HOLD_EFFECT_STEEL_POWER, TYPE_STEEL + .byte HOLD_EFFECT_GROUND_POWER, TYPE_GROUND + .byte HOLD_EFFECT_ROCK_POWER, TYPE_ROCK + .byte HOLD_EFFECT_GRASS_POWER, TYPE_GRASS + .byte HOLD_EFFECT_DARK_POWER, TYPE_DARK + .byte HOLD_EFFECT_FIGHTING_POWER, TYPE_FIGHTING + .byte HOLD_EFFECT_ELECTRIC_POWER, TYPE_ELECTRIC + .byte HOLD_EFFECT_WATER_POWER, TYPE_WATER + .byte HOLD_EFFECT_FLYING_POWER, TYPE_FLYING + .byte HOLD_EFFECT_POISON_POWER, TYPE_POISON + .byte HOLD_EFFECT_ICE_POWER, TYPE_ICE + .byte HOLD_EFFECT_GHOST_POWER, TYPE_GHOST + .byte HOLD_EFFECT_PSYCHIC_POWER, TYPE_PSYCHIC + .byte HOLD_EFFECT_FIRE_POWER, TYPE_FIRE + .byte HOLD_EFFECT_DRAGON_POWER, TYPE_DRAGON + .byte HOLD_EFFECT_NORMAL_POWER, TYPE_NORMAL + .byte 0, 0 + + .align 2 +gSpriteTemplate_8208288:: @ 8208288 + spr_template 0xFFFF, 0, gOamData_81F96F0, NULL, gSpriteImageTable_81E7A10, gSpriteAffineAnimTable_81E7B70, sub_80105A0 + spr_template 0xFFFF, 0, gOamData_81F96E8, NULL, gSpriteImageTable_81E7A30, gSpriteAffineAnimTable_81E7BEC, oac_poke_opponent + spr_template 0xFFFF, 0, gOamData_81F96F0, NULL, gSpriteImageTable_81E7A50, gSpriteAffineAnimTable_81E7B70, sub_80105A0 + spr_template 0xFFFF, 0, gOamData_81F96E8, NULL, gSpriteImageTable_81E7A70, gSpriteAffineAnimTable_81E7BEC, oac_poke_opponent + +gSecretBaseTrainerClasses:: @ 82082E8 + .byte TRAINER_CLASS_YOUNGSTER, TRAINER_CLASS_BUG_CATCHER, TRAINER_CLASS_RICH_BOY, TRAINER_CLASS_CAMPER, TRAINER_CLASS_COOL_TRAINER_M + .byte TRAINER_CLASS_LASS, TRAINER_CLASS_SCHOOL_KID_F, TRAINER_CLASS_LADY, TRAINER_CLASS_PICNICKER, TRAINER_CLASS_COOL_TRAINER_F + +gUnknown_082082F2:: @ 82082F2 + .byte 0x1A, 0x1B, 0x1C, 0x1D, 0x1F, 0x1E + +gUnknown_082082F8:: @ 82082F8 + .byte 1, 1, 3, 2, 4, 6 + +gUnknown_082082FE:: @ 82082FE + .byte 5, 3, 2 + .byte 5, 3, 2 + .byte 1, 1, 0 + .byte 3, 2, 1 + .byte 1, 1, 0 + .byte 1, 1, 1 + .byte -1, -1, -1 + .byte -5, -5, -10 + .byte -5, -5, -10 + + .align 1 +gUnknown_0820831A:: @ 820831A + .2byte 0xF + .2byte 0x13 + .2byte 0x39 + .2byte 0x46 + .2byte 0x94 + .2byte 0xF9 + .2byte 0x7F + .2byte 0x123 + .2byte 0xFFFF + +@ "Nidoran♂" Japanese name + .string "ニドラン♂$", 11 + +@ "Nidoran♀" Japanese name +gUnknown_08208337:: @ 8208337 + .string "ニドラン♀$", 13 diff --git a/data/trig.s b/data/trig.s new file mode 100644 index 000000000..6f9c95971 --- /dev/null +++ b/data/trig.s @@ -0,0 +1,10 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +@ 8208344 + .include "data/sine_table.inc" + +@ 82085C4 + .include "data/sine_degree_table.inc" diff --git a/data/util.s b/data/util.s new file mode 100644 index 000000000..03c92a988 --- /dev/null +++ b/data/util.s @@ -0,0 +1,70 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gBitTable:: @ 820872C + .4byte 0x00000001 + .4byte 0x00000002 + .4byte 0x00000004 + .4byte 0x00000008 + .4byte 0x00000010 + .4byte 0x00000020 + .4byte 0x00000040 + .4byte 0x00000080 + .4byte 0x00000100 + .4byte 0x00000200 + .4byte 0x00000400 + .4byte 0x00000800 + .4byte 0x00001000 + .4byte 0x00002000 + .4byte 0x00004000 + .4byte 0x00008000 + .4byte 0x00010000 + .4byte 0x00020000 + .4byte 0x00040000 + .4byte 0x00080000 + .4byte 0x00100000 + .4byte 0x00200000 + .4byte 0x00400000 + .4byte 0x00800000 + .4byte 0x01000000 + .4byte 0x02000000 + .4byte 0x04000000 + .4byte 0x08000000 + .4byte 0x10000000 + .4byte 0x20000000 + .4byte 0x40000000 + .4byte 0x80000000 + + .align 2 +gInvisibleSpriteTemplate:: @ 82087AC + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + + .align 2 +gSpriteDimensions:: @ 82087C4 + @ square + .byte 1, 1 + .byte 2, 2 + .byte 4, 4 + .byte 8, 8 + + @ horizontal rectangle + .byte 2, 1 + .byte 4, 1 + .byte 4, 2 + .byte 8, 4 + + @ vertical rectangle + .byte 1, 2 + .byte 1, 4 + .byte 2, 4 + .byte 4, 8 + +@ 82087DC + .include "data/crc16_table.inc" + + .align 2 +gMiscBlank_Gfx:: @ 82089DC + .incbin "graphics/interface/blank.4bpp" diff --git a/ld_script.txt b/ld_script.txt index c329ef736..76d8d7c8e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -327,7 +327,14 @@ SECTIONS { src/string_util.o(.rodata); src/link.o(.rodata); src/rtc.o(.rodata); + data/main_menu.o(.rodata); data/data2.o(.rodata); + data/pokemon.o(.rodata); + data/trig.o(.rodata); + data/util.o(.rodata); + data/daycare.o(.rodata); + data/egg_hatch.o(.rodata); + data/battle_interface.o(.rodata); data/pokeball.o(.rodata); data/trade.o(.rodata); data/berry_blender.o(.rodata); diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index 1ceb129fe..4d66910ba 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -360,7 +360,7 @@ void dp01t_00_3_getattr(void) u8 unk[256]; int r6 = 0; s32 i; - + if (gUnknown_02023A60[gUnknown_02024A60][2] == 0) { r6 = dp01_getattr_by_ch1_for_player_pokemon(gUnknown_02024A6A[gUnknown_02024A60], unk); @@ -389,7 +389,7 @@ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) s16 data16; u32 data32; s32 size = 0; - + switch (gUnknown_02023A60[gUnknown_02024A60][1]) { case 0: @@ -694,7 +694,7 @@ void sub_811EC10(void) { u8 i; u8 r4; - + if (gUnknown_02023A60[gUnknown_02024A60][2] == 0) { sub_811EC68(gUnknown_02024A6A[gUnknown_02024A60]); diff --git a/src/battle_ai.c b/src/battle_ai.c index cefa8fecb..bd320904f 100644 --- a/src/battle_ai.c +++ b/src/battle_ai.c @@ -421,7 +421,7 @@ void BattleAI_DoAIProcessing(void) AI_THINKING_STRUCT->aiState = AIState_SettingUp; // as long as their are more moves to process, keep setting this to setup state. else AI_THINKING_STRUCT->aiState++; // done processing. - AI_THINKING_STRUCT->aiAction &= (AI_ACTION_FLEE | AI_ACTION_WATCH | AI_ACTION_DO_NOT_ATTACK | + AI_THINKING_STRUCT->aiAction &= (AI_ACTION_FLEE | AI_ACTION_WATCH | AI_ACTION_DO_NOT_ATTACK | AI_ACTION_UNK5 | AI_ACTION_UNK6 | AI_ACTION_UNK7 | AI_ACTION_UNK8); // disable AI_ACTION_DONE. } break; diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index d61da637e..820d16465 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -129,7 +129,7 @@ int SetUpBattlePartyMenu(void) { EWRAM_1B000.unk266 = 0; EWRAM_1B000.unk264++; - } + } } break; case 1: @@ -223,7 +223,7 @@ void SetUpBattlePokemonMenu(u8 a) gUnknown_03004AE4(a, gScriptItemId, Task_80952E4); return; } - + switch (sub_806BD80(a)) { case 1: @@ -331,7 +331,7 @@ static void Task_809538C(void) static void Task_HandlePopupMenuInput(u8 taskId) { TaskFunc func; - + if (!gPaletteFade.active) { if (gMain.newAndRepeatedKeys & DPAD_UP) @@ -347,7 +347,7 @@ static void Task_HandlePopupMenuInput(u8 taskId) return; } if (gMain.newKeys & A_BUTTON) - { + { PlaySE(SE_SELECT); func = PartyMenuGetPopupMenuFunc(gTasks[taskId].data[4], sBattlePartyPopupMenus, @@ -374,7 +374,7 @@ static void Task_80954C0(u8 taskId) static void Task_ShowSummaryScreen(u8 taskId) { u8 partySelection = sub_806CA38(taskId); - + if (!gPaletteFade.active) { DestroyTask(taskId); @@ -395,7 +395,7 @@ static void Task_BattlePartyMenuShift(u8 taskId) u8 partySelection; u8 i; u8 r4; - + sub_806E7D0(gTasks[taskId].data[4], sBattlePartyPopupMenus); partySelection = sub_806CA38(taskId); if (IsLinkDoubleBattle() == TRUE && (partySelection == 1 || partySelection == 4 || partySelection == 5)) @@ -458,7 +458,7 @@ static void Task_BattlePartyMenuShift(u8 taskId) { u8 r0; u8 r4 = gUnknown_02024E6C; - + sub_806D5A4(); r0 = pokemon_order_func(gUnknown_02024A6A[r4]); GetMonNickname(&gPlayerParty[r0], gStringVar1); diff --git a/src/bike.c b/src/bike.c index 4faa6329f..d7175b5e0 100644 --- a/src/bike.c +++ b/src/bike.c @@ -303,7 +303,7 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys *newDirection = gPlayerAvatar.unk9; gPlayerAvatar.bikeFrameCounter++; - + //Wait 6 frames before actually changing direction if (gPlayerAvatar.bikeFrameCounter > 6) { @@ -341,7 +341,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *ptr, u16 newKeys, u16 heldKeys) direction = player_get_direction_upper_nybble(); playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId]; gPlayerAvatar.running2 = 0; - + if (heldKeys & B_BUTTON) gPlayerAvatar.bikeFrameCounter++; else @@ -406,9 +406,9 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *ptr, u16 newKeys, u16 heldKeys) return 4; } } - + //B Button is still held - + if (*ptr == DIR_NONE) { *ptr = direction; diff --git a/src/diploma.c b/src/diploma.c index 649f4a33d..112647956 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -23,8 +23,8 @@ static void DisplayDiplomaText(void); static const u16 gDiplomaPalettes[][16] = { - INCBIN_U16("graphics/misc/diploma_national.gbapal"), - INCBIN_U16("graphics/misc/diploma_hoenn.gbapal"), + INCBIN_U16("graphics/misc/diploma_national.gbapal"), + INCBIN_U16("graphics/misc/diploma_hoenn.gbapal"), }; static const u8 gDiplomaTilemap[] = INCBIN_U8("graphics/misc/diploma_map.bin.lz"); diff --git a/src/field_map_obj.c b/src/field_map_obj.c index e049aae57..f7e09aacf 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -105,7 +105,7 @@ void sub_805AAB0(void) u8 sub_805AB54(void) { u8 i; - + for (i = 0; i < 16; i++) { if (!gMapObjects[i].active) @@ -134,7 +134,7 @@ bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 u8 GetFieldObjectIdByXY(s16 x, s16 y) { u8 i; - + for (i = 0; i < 16; i++) { if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y) @@ -146,7 +146,7 @@ u8 GetFieldObjectIdByXY(s16 x, s16 y) u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroup) { u8 i; - + for (i = 0; i < 16; i++) { if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup) @@ -158,7 +158,7 @@ u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroup) u8 GetFieldObjectIdByLocalId(u8 localId) { u8 i; - + for (i = 0; i < 16; i++) { if (gMapObjects[i].active && gMapObjects[i].localId == localId) @@ -174,7 +174,7 @@ u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 u8 var; u16 r3; u16 r2; - + //asm("nop"::"r"(b)); if (GetAvailableFieldObjectSlot(template->localId, b, c, &var) != 0) return 16; @@ -382,14 +382,14 @@ u8 sub_805ADDC(u8 localId) { u8 objectCount; u8 i; - + if (gMapHeader.events == NULL) return 16; objectCount = gMapHeader.events->mapObjectCount; for (i = 0; i < objectCount; i++) { struct MapObjectTemplate *template = &gSaveBlock1.mapObjectTemplates[i]; - + if (template->localId == localId && !FlagGet(template->flagId)) return InitFieldObjectStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } @@ -399,7 +399,7 @@ u8 sub_805ADDC(u8 localId) u8 GetAvailableFieldObjectSlot(u16 a, u8 b, u8 c, u8 *d) { u8 i = 0; - + for (i = 0; i < 16 && gMapObjects[i].active; i++) { if (gMapObjects[i].localId == a && gMapObjects[i].mapNum == b && gMapObjects[i].mapGroup == c) @@ -425,7 +425,7 @@ void RemoveFieldObject(struct MapObject *mapObject) void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { u8 mapObjectId; - + if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) return; FlagSet(GetFieldObjectFlagIdByFieldObjectId(mapObjectId)); @@ -436,7 +436,7 @@ void RemoveFieldObjectInternal(struct MapObject *mapObject) { struct SpriteFrameImage image; const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); - + image.size = gfxInfo->size; gSprites[mapObject->spriteId].images = ℑ DestroySprite(&gSprites[mapObject->spriteId]); @@ -445,7 +445,7 @@ void RemoveFieldObjectInternal(struct MapObject *mapObject) void npc_hide_all_but_player(void) { u8 i; - + for (i = 0; i < 16; i++) { if (i != gPlayerAvatar.mapObjectId) @@ -460,11 +460,11 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * const struct MapObjectGraphicsInfo *gfxInfo; struct MapObject *mapObject; struct Sprite *sprite; - + mapObjectId = InitFieldObjectStateFromTemplate(mapObjTemplate, c, d); if (mapObjectId == 16) return 16; - + mapObject = &gMapObjects[mapObjectId]; gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); if (gfxInfo->paletteSlot == 0) @@ -473,7 +473,7 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate * npc_load_two_palettes__and_record(gfxInfo->paletteTag1, gfxInfo->paletteSlot); if (mapObject->animPattern == 0x4C) mapObject->mapobj_bit_13 = TRUE; - + #ifdef NONMATCHING sprTemplate->paletteTag = 0xFFFF; #else @@ -510,7 +510,7 @@ u8 SpawnFieldObject(struct MapObjectTemplate *mapObjTemplate, u8 b, u8 c, s16 d, struct SpriteFrameImage spriteFrameImage; const struct MapObjectGraphicsInfo *gfxInfo; u8 mapObjectId; - + gfxInfo = GetFieldObjectGraphicsInfo(mapObjTemplate->graphicsId); MakeObjectTemplateFromFieldObjectTemplate(mapObjTemplate, &spriteTemplate, &subspriteTables); spriteFrameImage.size = gfxInfo->size; @@ -528,7 +528,7 @@ u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjTemplate) { s16 x; s16 y; - + GetFieldObjectMovingCameraOffset(&x, &y); return SpawnFieldObject(mapObjTemplate, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, x, y); } @@ -536,7 +536,7 @@ u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjTemplate) u8 SpawnSpecialFieldObjectParametrized(u8 a, u8 b, u8 c, s16 d, s16 e, u8 f) { struct MapObjectTemplate mapObjTemplate; - + d -= 7; e -= 7; mapObjTemplate.localId = c; @@ -558,7 +558,7 @@ u8 show_sprite(u8 a, u8 b, u8 c) struct MapObjectTemplate *r5; s16 x; s16 y; - + r5 = GetFieldObjectTemplateByLocalIdAndMap(a, b, c); if (r5 == NULL) return 16; @@ -569,7 +569,7 @@ u8 show_sprite(u8 a, u8 b, u8 c) void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, struct SubspriteTable **subspriteTables) { const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(graphicsId); - + sprTemplate->tileTag = gfxInfo->tileTag; sprTemplate->paletteTag = gfxInfo->paletteTag1; sprTemplate->oam = gfxInfo->oam; @@ -595,7 +595,7 @@ u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 c struct SpriteTemplate spriteTemplate; struct SubspriteTable *subspriteTables; u8 spriteId; - + MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables); if (spriteTemplate.paletteTag != 0xFFFF) sub_805BDF8(spriteTemplate.paletteTag); @@ -618,7 +618,7 @@ u8 sub_805B410(u8 a, u8 b, s16 c, s16 d, u8 e, u8 f) struct SpriteTemplate spriteTemplate; struct SubspriteTable *subspriteTables; u8 spriteId; - + gfxInfo = GetFieldObjectGraphicsInfo(a); MakeObjectTemplateFromFieldObjectGraphicsInfo(a, sub_8064970, &spriteTemplate, &subspriteTables); #ifdef NONMATCHING @@ -633,7 +633,7 @@ u8 sub_805B410(u8 a, u8 b, s16 c, s16 d, u8 e, u8 f) if (spriteId != 64) { struct Sprite *sprite = &gSprites[spriteId]; - + sprite->centerToCornerVecX = -(gfxInfo->width >> 1); sprite->centerToCornerVecY = -(gfxInfo->height >> 1); sprite->pos1.y += sprite->centerToCornerVecY; @@ -658,7 +658,7 @@ u8 sub_805B410(u8 a, u8 b, s16 c, s16 d, u8 e, u8 f) void sub_805B55C(s16 a, s16 b) { u8 i; - + if (gMapHeader.events != NULL) { s16 r9 = gSaveBlock1.pos.x - 2; @@ -666,13 +666,13 @@ void sub_805B55C(s16 a, s16 b) s16 r10 = gSaveBlock1.pos.y; s16 spC = gSaveBlock1.pos.y + 16; u8 objectCount = gMapHeader.events->mapObjectCount; - + for (i = 0; i < objectCount; i++) { struct MapObjectTemplate *template = &gSaveBlock1.mapObjectTemplates[i]; s16 foo = template->x + 7; s16 bar = template->y + 7; - + if (r10 <= bar && spC >= bar && r9 <= foo && sp8 >= foo && !FlagGet(template->flagId)) SpawnFieldObject(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, a, b); @@ -686,11 +686,11 @@ void RemoveFieldObjectsOutsideView(void) { u8 i; u8 j; - + for (i = 0; i < 16; i++) { bool8 isActiveLinkPlayer; - + for (j = 0, isActiveLinkPlayer = 0; j < 4; j++) { if (gLinkPlayerMapObjects[j].active && i == gLinkPlayerMapObjects[j].mapObjId) @@ -699,7 +699,7 @@ void RemoveFieldObjectsOutsideView(void) if (!isActiveLinkPlayer) { struct MapObject *mapObject = &gMapObjects[i]; - + if (mapObject->active && !mapObject->mapobj_bit_16) RemoveFieldObjectIfOutsideView(mapObject); } @@ -712,7 +712,7 @@ void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject) s16 r5 = gSaveBlock1.pos.x + 17; s16 r4 = gSaveBlock1.pos.y; s16 r6 = gSaveBlock1.pos.y + 16; - + if (mapObject->coords2.x >= r7 && mapObject->coords2.x <= r5 && mapObject->coords2.y >= r4 && mapObject->coords2.y <= r6) return; @@ -727,7 +727,7 @@ void sub_805B75C(u8, s16, s16); void sub_805B710(u16 a, u16 b) { u8 i; - + ClearPlayerAvatarInfo(); for (i = 0; i < 16; i++) { @@ -748,7 +748,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) const struct MapObjectGraphicsInfo *gfxInfo; struct MapObject *mapObject; u8 spriteId; - + #define i spriteId for (i = 0; i < 4; i++) { @@ -756,7 +756,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) return; } #undef i - + mapObject = &gMapObjects[a]; asm("":::"r5"); subspriteTables = NULL; @@ -774,7 +774,7 @@ void sub_805B75C(u8 a, s16 b, s16 c) if (spriteId != 64) { struct Sprite *sprite = &gSprites[spriteId]; - + sub_8060388(b + mapObject->coords2.x, c + mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(gfxInfo->width >> 1); sprite->centerToCornerVecY = -(gfxInfo->height >> 1); @@ -824,7 +824,7 @@ void sub_805B980(struct MapObject *mapObject, u8 graphicsId) { const struct MapObjectGraphicsInfo *gfxInfo; struct Sprite *sprite; - + gfxInfo = GetFieldObjectGraphicsInfo(graphicsId); sprite = &gSprites[mapObject->spriteId]; if (gfxInfo->paletteSlot == 0) @@ -851,7 +851,7 @@ void sub_805B980(struct MapObject *mapObject, u8 graphicsId) void unref_sub_805BA80(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId) { u8 mapObjectId; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) sub_805B980(&gMapObjects[mapObjectId], graphicsId); } @@ -869,7 +869,7 @@ void FieldObjectTurn(struct MapObject *mapObject, u8 direction) void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction) { u8 mapObjectId; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) FieldObjectTurn(&gMapObjects[mapObjectId], direction); } @@ -883,7 +883,7 @@ void get_berry_tree_graphics(struct MapObject *mapObject, struct Sprite *sprite) { u8 treeStage; u8 treeId; - + mapObject->mapobj_bit_13 = TRUE; sprite->invisible = TRUE; treeStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId); @@ -920,7 +920,7 @@ void FieldObjectHandleDynamicGraphicsId(struct MapObject *mapObject) void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 d) { u8 mapObjectId; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) gMapObjects[mapObjectId].mapobj_bit_13 = d; } @@ -936,7 +936,7 @@ void sub_805BCC0(s16 x, s16 y) { u8 mapObjectId; struct MapObject *mapObject; - + mapObjectId = GetFieldObjectIdByXY(x, y); if (mapObjectId != 16) { @@ -950,7 +950,7 @@ void sub_805BCF0(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority) u8 mapObjectId; struct MapObject *mapObject; struct Sprite *sprite; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { mapObject = &gMapObjects[mapObjectId]; @@ -964,7 +964,7 @@ void sub_805BD48(u8 localId, u8 mapNum, u8 mapGroup) { u8 mapObjectId; struct MapObject *mapObject; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { mapObject = &gMapObjects[mapObjectId]; @@ -977,7 +977,7 @@ void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { u8 mapObjectId; struct Sprite *sprite; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { sprite = &gSprites[gMapObjects[mapObjectId].spriteId]; @@ -995,7 +995,7 @@ void gpu_pal_allocator_reset__manage_upper_four(void) void sub_805BDF8(u16 tag) { u16 paletteIndex = FindFieldObjectPaletteIndexByTag(tag); - + if (paletteIndex != 0x11FF) //always happens. FindFieldObjectPaletteIndexByTag returns u8 sub_805BE58(&gUnknown_0837377C[paletteIndex]); } @@ -1003,7 +1003,7 @@ void sub_805BDF8(u16 tag) void unref_sub_805BE24(u16 *arr) { u8 i; - + for (i = 0; arr[i] != 0x11FF; i++) sub_805BDF8(arr[i]); } @@ -1020,7 +1020,7 @@ void pal_patch_for_npc(u16 a, u16 b) { u8 var = b; u8 paletteIndex = FindFieldObjectPaletteIndexByTag(a); - + LoadPalette(gUnknown_0837377C[paletteIndex].data, var * 16 + 0x100, 0x20); } @@ -1033,7 +1033,7 @@ void pal_patch_for_npc_range(const u16 *arr, u8 b, u8 c) u8 FindFieldObjectPaletteIndexByTag(u16 tag) { u8 i; - + for (i = 0; gUnknown_0837377C[i].tag != 0x11FF; i++) { if (gUnknown_0837377C[i].tag == tag) @@ -1047,7 +1047,7 @@ const u8 gUnknown_0830FD14[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0 void npc_load_two_palettes__no_record(u16 a, u8 b) { u8 i; - + pal_patch_for_npc(a, b); for (i = 0; gUnknown_08373874[i].tag != 0x11FF; i++) { @@ -1062,7 +1062,7 @@ void npc_load_two_palettes__no_record(u16 a, u8 b) void npc_load_two_palettes__and_record(u16 a, u8 b) { u8 i; - + gUnknown_030005A6 = a; pal_patch_for_npc(a, b); for (i = 0; gUnknown_083738E4[i].tag != 0x11FF; i++) @@ -1103,7 +1103,7 @@ void sub_805C058(struct MapObject *mapObject, s16 x, s16 y) { struct Sprite *sprite = &gSprites[mapObject->spriteId]; const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId); - + npc_coords_set(mapObject, x, y); sub_80603CC(mapObject->coords2.x, mapObject->coords2.y, &sprite->pos1.x, &sprite->pos1.y); sprite->centerToCornerVecX = -(gfxInfo->width >> 1); @@ -1118,7 +1118,7 @@ void sub_805C058(struct MapObject *mapObject, s16 x, s16 y) void sub_805C0F8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { u8 mapObjectId; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { x += 7; @@ -1137,17 +1137,17 @@ void UpdateFieldObjectCoordsForCameraUpdate(void) u8 i; s16 deltaX; s16 deltaY; - + #ifndef NONMATCHING asm(""::"r"(i)); //makes the compiler store i in r3 #endif if (gUnknown_0202E844.field_0) - { + { for (i = 0, deltaX = gUnknown_0202E844.x, deltaY = gUnknown_0202E844.y; i < 16; i++) { struct MapObject *mapObject = &gMapObjects[i]; - + if (mapObject->active) { mapObject->coords1.x -= deltaX; @@ -1166,7 +1166,7 @@ bool8 FieldObjectDoesZCoordMatch(struct MapObject *, u8); u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z) { u8 i; - + for (i = 0; i < 16; i++) { if (gMapObjects[i].active && gMapObjects[i].coords2.x == x && gMapObjects[i].coords2.y == y @@ -1207,7 +1207,7 @@ const struct SpriteTemplate gSpriteTemplate_830FD24 = u8 AddCameraObject(u8 a) { u8 spriteId = CreateSprite(&gSpriteTemplate_830FD24, 0, 0, 4); - + gSprites[spriteId].invisible = TRUE; gSprites[spriteId].data0 = a; return spriteId; @@ -1225,7 +1225,7 @@ void ObjectCB_CameraObject(struct Sprite *sprite) CameraObject_1, CameraObject_2, }; - + cameraObjectFuncs[sprite->data1](sprite); } @@ -1242,7 +1242,7 @@ void CameraObject_1(struct Sprite *sprite) { s16 x = gSprites[sprite->data0].pos1.x; s16 y = gSprites[sprite->data0].pos1.y; - + sprite->data2 = x - sprite->pos1.x; sprite->data3 = y - sprite->pos1.y; sprite->pos1.x = x; @@ -1260,7 +1260,7 @@ void CameraObject_2(struct Sprite *sprite) struct Sprite *FindCameraObject(void) { u8 i; - + for (i = 0; i < 64; i++) { if (gSprites[i].inUse && gSprites[i].callback == ObjectCB_CameraObject) @@ -1272,7 +1272,7 @@ struct Sprite *FindCameraObject(void) void CameraObjectReset1(void) { struct Sprite *cameraSprite = FindCameraObject(); - + if (cameraSprite != NULL) { cameraSprite->data1 = 0; @@ -1283,7 +1283,7 @@ void CameraObjectReset1(void) void CameraObjectSetFollowedObjectId(u8 state) { struct Sprite *cameraSprite = FindCameraObject(); - + if (cameraSprite != NULL) { cameraSprite->data0 = state; @@ -1294,7 +1294,7 @@ void CameraObjectSetFollowedObjectId(u8 state) u8 CameraObjectGetFollowedObjectId(void) { struct Sprite *cameraSprite = FindCameraObject(); - + if (cameraSprite == NULL) return 64; else @@ -1304,14 +1304,14 @@ u8 CameraObjectGetFollowedObjectId(void) void CameraObjectReset2(void) { struct Sprite *cameraSprite = FindCameraObject(); - + cameraSprite->data1 = 2; } u8 unref_sub_805C43C(struct Sprite *src, s16 x, s16 y, u8 subpriority) { u8 i; - + for (i = 0; i < 64; i++) { if (!gSprites[i].inUse) @@ -1329,7 +1329,7 @@ u8 unref_sub_805C43C(struct Sprite *src, s16 x, s16 y, u8 subpriority) u8 obj_unfreeze(struct Sprite *src, s16 x, s16 y, u8 subpriority) { s16 i; - + for (i = 63; i > -1; i--) { if (!gSprites[i].inUse) @@ -1358,7 +1358,7 @@ void FieldObjectSetDirection(struct MapObject *mapObject, u8 direction) u8 *GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { struct MapObjectTemplate *template = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - + return template->script; } @@ -1370,7 +1370,7 @@ u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId) u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { struct MapObjectTemplate *template = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup); - + return template->flagId; } @@ -1382,7 +1382,7 @@ u16 GetFieldObjectFlagIdByFieldObjectId(u8 mapObjectId) u8 unref_sub_805C5D0(u8 localId, u8 mapNum, u8 mapGroup) { u8 mapObjectId; - + if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) return 0xFF; else @@ -1397,7 +1397,7 @@ u8 unref_sub_805C60C(u8 mapObjectId) u8 unref_sub_805C624(u8 localId, u8 mapNum, u8 mapGroup) { u8 mapObjectId; - + if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) return 0xFF; else @@ -1418,7 +1418,7 @@ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 m else { struct MapHeader *mapHeader = get_mapheader_by_bank_and_number(mapGroup, mapNum); - + return FindFieldObjectTemplateInArrayByLocalId(localId, mapHeader->events->mapObjects, mapHeader->events->mapObjectCount); } } @@ -1426,7 +1426,7 @@ struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 m struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count) { u8 i; - + for (i = 0; i < count; i++) { if (templates[i].localId == localId) @@ -1438,11 +1438,11 @@ struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, st struct MapObjectTemplate *sub_805C700(struct MapObject *mapObject) { s32 i; - + if (mapObject->mapNum != gSaveBlock1.location.mapNum || mapObject->mapGroup != gSaveBlock1.location.mapGroup) return NULL; - + for (i = 0; i < 64; i++) { if (mapObject->localId == gSaveBlock1.mapObjectTemplates[i].localId) @@ -1454,7 +1454,7 @@ struct MapObjectTemplate *sub_805C700(struct MapObject *mapObject) void sub_805C754(struct MapObject *mapObject) { struct MapObjectTemplate *template = sub_805C700(mapObject); - + if (template != NULL) { template->x = mapObject->coords2.x - 7; @@ -1465,7 +1465,7 @@ void sub_805C754(struct MapObject *mapObject) void sub_805C774(struct MapObject *mapObject, u8 movementType) { struct MapObjectTemplate *template = sub_805C700(mapObject); - + if (template != NULL) template->movementType = movementType; } @@ -1473,7 +1473,7 @@ void sub_805C774(struct MapObject *mapObject, u8 movementType) void sub_805C78C(u8 localId, u8 mapNum, u8 mapGroup) { u8 mapObjectId; - + if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) sub_805C754(&gMapObjects[mapObjectId]); } @@ -1489,10 +1489,10 @@ void sub_805C7C4(u8 a) u16 npc_paltag_by_palslot(u8 a) { u8 i; - + if (a < 10) return gUnknown_0837399C[gUnknown_030005A4][a]; - + for (i = 0; gUnknown_083738E4[i].tag != 0x11FF; i++) { if (gUnknown_083738E4[i].tag == gUnknown_030005A6) diff --git a/src/field_special_scene.c b/src/field_special_scene.c index fe7daea0a..fc4d96e18 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -16,10 +16,10 @@ // porthole states enum { - INIT_PORTHOLE, - IDLE_CHECK, - EXECUTE_MOVEMENT, - EXIT_PORTHOLE, + INIT_PORTHOLE, + IDLE_CHECK, + EXECUTE_MOVEMENT, + EXIT_PORTHOLE, }; extern s8 gTruckCamera_HorizontalTable[]; @@ -286,7 +286,7 @@ void Task_HandlePorthole(u8 taskId) data[0] = EXIT_PORTHOLE; // exit porthole. return; } - // run this once. + // run this once. if (*var == 2) // which direction? { exec_movement(0xFF, location->mapNum, location->mapGroup, gUnknown_083D295F); diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 1f5f49850..77c8752d1 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -87,7 +87,7 @@ void sub_80A25E8(void) bool8 FldEff_UseCutOnGrass(void) { u8 taskId = oei_task_add(); - + gTasks[taskId].data[8] = (u32)sub_80A2684 >> 16; gTasks[taskId].data[9] = (u32)sub_80A2684; IncrementGameStat(0x12); @@ -103,7 +103,7 @@ void sub_80A2634(void) bool8 FldEff_UseCutOnTree(void) { u8 taskId = oei_task_add(); - + gTasks[taskId].data[8] = (u32)sub_80A2B00 >> 16; gTasks[taskId].data[9] = (u32)sub_80A2B00; IncrementGameStat(0x12); @@ -157,7 +157,7 @@ bool8 FldEff_CutGrass(void) void sub_80A27A8(s16 x, s16 y) { int metatileId = MapGridGetMetatileIdAt(x, y); - + switch(metatileId) { case 0x208: @@ -167,19 +167,19 @@ void sub_80A27A8(s16 x, s16 y) break; case 0x1C6: MapGridSetMetatileIdAt(x, y, 0x1CE); - break; + break; case 0x1C7: MapGridSetMetatileIdAt(x, y, 0x1CF); - break; + break; case 0x281: MapGridSetMetatileIdAt(x, y, 0x279); - break; + break; case 0x282: MapGridSetMetatileIdAt(x, y, 0x27A); - break; + break; case 0x283: MapGridSetMetatileIdAt(x, y, 0x27B); - break; + break; case 0x206: case 0x207: MapGridSetMetatileIdAt(x, y, 0x271); @@ -197,7 +197,7 @@ void sub_80A27A8(s16 x, s16 y) s32 sub_80A28A0(s16 x, s16 y) { u16 metatileId = MapGridGetMetatileIdAt(x, y); - + if(metatileId == 1) return 1; else if(metatileId == 633) @@ -214,7 +214,7 @@ void sub_80A28F4(s16 x, s16 y) { s16 i; u16 lowerY = y + 3; - + for(i = 0; i < 3; i++) { u16 currentX = x + i; @@ -266,7 +266,7 @@ void objc_8097BBC(struct Sprite *sprite) sprite->pos2.x = Sin(sprite->data2, sprite->data0); sprite->pos2.y = Cos(sprite->data2, sprite->data0); - + sprite->data2 = (sprite->data2 + 8) & 0xFF; sprite->data0 += ((tempdata2 = sprite->data3) << 16 >> 18) + 1; // what? sprite->data3 = tempdata2 + 1; @@ -281,12 +281,12 @@ void objc_8097BBC(struct Sprite *sprite) void sub_80A2AB8(void) { u8 i; - + for(i = 1; i < 8; i++) { DestroySprite(&gSprites[gCutGrassSpriteArray[i]]); } - + FieldEffectStop(&gSprites[gCutGrassSpriteArray[0]], 0x3A); sub_8064E2C(); ScriptContext2_Disable(); diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 70bb6d669..25651702d 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -28,7 +28,7 @@ void sub_80F7A34(void) oldMan->oldMan1.unk_2D94 = 0; oldMan->oldMan1.unk_2DBD = 0; - + for(i = 0; i < 6; i++) oldMan->oldMan1.mauvilleOldMan_ecArray[i] = gUnknown_083E537C[i]; } @@ -36,7 +36,7 @@ void sub_80F7A34(void) void sub_80F7A6C(void) { struct UnkMauvilleOldManStruct *bard = &gSaveBlock1.oldMan.oldMan1; - + bard->unk_2D94 = 1; bard->unk_2D95 = 0; } @@ -49,7 +49,7 @@ void sub_80F7A7C(void) void sub_80F7A88(void) { OldMan *oldMan = &gSaveBlock1.oldMan; - + oldMan->oldMan1.unk_2D94 = 4; oldMan->oldMan1.unk_2D95 = 0; } @@ -62,7 +62,7 @@ void sub_80F7A98(void) void SetMauvilleOldMan(void) { u32 var = ((u16)((gSaveBlock2.playerTrainerId[1] << 8 | gSaveBlock2.playerTrainerId[0])) % 10) / 2; - + switch(var) { case 0: @@ -100,7 +100,7 @@ void sub_80F7B2C(void) { u16 *scriptPtr = &gScriptResult; // why?? OldMan *oldMan = &gSaveBlock1.oldMan; - + *scriptPtr = oldMan->oldMan1.unk_2DBD; } @@ -109,15 +109,15 @@ void sub_80F7B40(void) u16 i; OldMan *oldMan = &gSaveBlock1.oldMan; //struct UnkMauvilleOldManStruct *oldManStruct = &gSaveBlock1.oldManStruct; - + StringCopy(oldMan->oldMan1.playerName, gSaveBlock2.playerName); - + for(i = 0; i < 4; i++) oldMan->oldMan1.playerTrainerId[i] = gSaveBlock2.playerTrainerId[i]; - + for(i = 0; i < 6; i++) oldMan->oldMan1.mauvilleOldMan_ecArray[i] = oldMan->oldMan1.mauvilleOldMan_ecArray2[i]; - + oldMan->oldMan1.unk_2DBD = 1; } @@ -237,14 +237,14 @@ void sub_80F7C70(void) { u16 *scriptPtr = &gScriptResult; // again?? OldMan *oldMan = &gSaveBlock1.oldMan; - + *scriptPtr = oldMan->oldMan1.unk_2D95; } void sub_80F7C84(void) { OldMan *oldMan = &gSaveBlock1.oldMan; - + oldMan->oldMan1.unk_2D95 = 1; } @@ -266,7 +266,7 @@ void sub_80F7C90(void) void sub_80F7CC8(void) { OldMan *oldMan = &gSaveBlock1.oldMan; - + if(oldMan->oldMan1.unk_2D95 == 10) { gScriptResult = FALSE; @@ -282,7 +282,7 @@ void sub_80F7CF4(void) { u8 *stringPtr; OldMan *oldMan = &gSaveBlock1.oldMan; - + if(oldMan->oldMan2.unk1 == 0) sub_80F7DC0(); @@ -302,7 +302,7 @@ void sub_80F7CF4(void) oldMan->oldMan2.unk1 = 10; else oldMan->oldMan2.unk1++; - + gScriptResult = TRUE; } #else diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index a7fb5abef..befd6f20d 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -3,7 +3,7 @@ #define TILE_ATTRIBUTES(three, two, one) (((one) ? 1 : 0) | ((two) ? 2 : 0) | ((three) ? 4 : 0)) -static const u8 sTileBitAttributes[] = +static const u8 sTileBitAttributes[] = { TILE_ATTRIBUTES(TRUE, FALSE, FALSE), TILE_ATTRIBUTES(FALSE, FALSE, FALSE), diff --git a/src/naming_screen.c b/src/naming_screen.c index cd108740b..f00a9bd3e 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -209,7 +209,7 @@ static void VBlankCB_NamingScreen(void) static void StoreNamingScreenParameters(u8 templateNum, u8 *destBuffer, u16 c, u16 d, u32 e, MainCallback returnCallback) { struct Task *task; - + //Create a task that does nothing, and use it as a temporary space to store parameters task = &gTasks[CreateTask(Task_DoNothing, 0xFF)]; task->data[0] = templateNum; @@ -225,7 +225,7 @@ static void GetNamingScreenParameters(void) { u8 taskId; struct Task *task; - + taskId = FindTaskIdByFunc(Task_DoNothing); task = &gTasks[taskId]; namingScreenData.templateNum = task->data[0]; @@ -251,7 +251,7 @@ static void NamingScreen_TurnOffScreen(void) static void NamingScreen_InitDisplayMode(void) { u16 savedIme; - + SetVBlankCallback(VBlankCB_NamingScreen); savedIme = REG_IME; REG_IME = 0; @@ -401,7 +401,7 @@ static bool8 (*const sMainStateFuncs[])(struct Task *) = static void sub_80B5E50(void) { u8 taskId; - + taskId = CreateTask(Task_NamingScreenMain, 2); Task_NamingScreenMain(taskId); } @@ -462,7 +462,7 @@ static bool8 MainState_WaitPageSwap(struct Task *task) { s16 cursorX; s16 cursorY; - + if (IsPageSwapAnimNotInProgress()) { namingScreenData.state = MAIN_STATE_HANDLE_INPUT; @@ -552,7 +552,7 @@ static bool8 HandleKeyboardEvent(void) { u8 event = GetInputEvent(); u8 keyRole = GetKeyRoleAtCursorPos(); - + if (event == KBEVENT_PRESSED_SELECT) return sub_80B61C8(); else if (event == KBEVENT_PRESSED_B) @@ -574,7 +574,7 @@ static bool8 KeyboardKeyHandler_Character(u8 event) if (event == KBEVENT_PRESSED_A) { u8 var = sub_80B7004(); - + sub_80B6914(); if (var) { @@ -656,14 +656,14 @@ static void InputInit(void) static u8 GetInputEvent(void) { u8 taskId = FindTaskIdByFunc(Task_HandleInput); - + return gTasks[taskId].tKeyboardEvent; } static void SetInputState(u8 state) { u8 taskId = FindTaskIdByFunc(Task_HandleInput); - + gTasks[taskId].tState = state; } @@ -731,7 +731,7 @@ static void HandleDpadMovement(struct Task *task) s16 cursorY; u16 dpadDir; s16 prevCursorX; - + GetCursorPos(&cursorX, &cursorY); dpadDir = 0; if (gMain.newAndRepeatedKeys & DPAD_UP) @@ -742,18 +742,18 @@ static void HandleDpadMovement(struct Task *task) dpadDir = 3; if (gMain.newAndRepeatedKeys & DPAD_RIGHT) dpadDir = 4; - + //Get new cursor position prevCursorX = cursorX; cursorX += sDpadDeltaX[dpadDir]; cursorY += sDpadDeltaY[dpadDir]; - + //Wrap cursor position in the X direction if (cursorX < 0) cursorX = 8; if (cursorX > 8) cursorX = 0; - + //Handle cursor movement in X direction if (sDpadDeltaX[dpadDir] != 0) { @@ -765,7 +765,7 @@ static void HandleDpadMovement(struct Task *task) else cursorX = 5; } - + if (cursorX == 8) { //We are now on the last column @@ -780,7 +780,7 @@ static void HandleDpadMovement(struct Task *task) cursorY = gUnknown_083CE274[cursorY]; } } - + if (cursorX == 8) { //There are only 3 keys on the last column, unlike the others, @@ -809,7 +809,7 @@ static void HandleDpadMovement(struct Task *task) #undef tKbFunctionKey //-------------------------------------------------- -// +// //-------------------------------------------------- static void Task_80B64D4(u8); @@ -820,7 +820,7 @@ static void sub_80B65D4(struct Task *, u8, u8); static void sub_80B6438(void) { u8 taskId; - + taskId = CreateTask(Task_80B64D4, 3); gTasks[taskId].data[0] = 3; } @@ -828,7 +828,7 @@ static void sub_80B6438(void) static void sub_80B6460(u8 a, u8 b, u8 c) { struct Task *task = &gTasks[FindTaskIdByFunc(Task_80B64D4)]; - + if (a == task->data[0] && c == 0) { task->data[1] = b; @@ -845,7 +845,7 @@ static void sub_80B6460(u8 a, u8 b, u8 c) static void Task_80B64D4(u8 taskId) { struct Task *task = &gTasks[taskId]; - + if (task->data[0] == 3 || task->data[2] == 0) return; MultiplyInvertedPaletteRGBComponents(sub_80B654C(task->data[0]), task->data[3], task->data[3], task->data[3]); @@ -874,14 +874,14 @@ static u16 sub_80B654C(u8 a) IndexOfSpritePaletteTag(6) * 16 + 0x10C, IndexOfSpritePaletteTag(6) * 16 + 0x10E, }; - + return arr[a]; } static void sub_80B65AC(u8 a) { u16 index = sub_80B654C(a); - + gPlttBufferFaded[index] = gPlttBufferUnfaded[index]; } @@ -918,7 +918,7 @@ static bool8 (*const sPageSwapAnimStateFuncs[])(struct Task *) = static void StartPageSwapAnim(void) { u8 taskId; - + taskId = CreateTask(Task_HandlePageSwapAnim, 0); Task_HandlePageSwapAnim(taskId); } @@ -952,14 +952,14 @@ static bool8 PageSwapAnimState_1(struct Task *task) &namingScreenData.bg2vOffset, &namingScreenData.bg1vOffset }; - + task->tFrameCount += 4; *arr[namingScreenData.unkC] = Sin(task->tFrameCount, 40); *arr[namingScreenData.unkD] = Sin((task->tFrameCount + 128) & 0xFF, 40); if (task->tFrameCount >= 64) { u8 temp = namingScreenData.unk8; //Why u8 and not u16? - + namingScreenData.unk8 = namingScreenData.unkA; namingScreenData.unkA = temp; task->tState++; @@ -970,14 +970,14 @@ static bool8 PageSwapAnimState_1(struct Task *task) static bool8 PageSwapAnimState_2(struct Task *task) { u16 *const arr[] = {&namingScreenData.bg2vOffset, &namingScreenData.bg1vOffset}; - + task->tFrameCount += 4; *arr[namingScreenData.unkC] = Sin(task->tFrameCount, 40); *arr[namingScreenData.unkD] = Sin((task->tFrameCount + 128) & 0xFF, 40); if (task->tFrameCount >= 128) { u8 temp = namingScreenData.unkC; - + namingScreenData.unkC = namingScreenData.unkD; namingScreenData.unkD = temp; task->tState++; @@ -1023,7 +1023,7 @@ static u8 CursorColToKeyboardCol(s16 x) static void SetCursorPos(s16 x, s16 y) { struct Sprite *cursorSprite = &gSprites[namingScreenData.cursorSpriteId]; - + cursorSprite->pos1.x = CursorColToKeyboardCol(x) * 8 + 27; cursorSprite->pos1.y = y * 16 + 80; cursorSprite->data2 = cursorSprite->data0; @@ -1035,7 +1035,7 @@ static void SetCursorPos(s16 x, s16 y) static void GetCursorPos(s16 *x, s16 *y) { struct Sprite *cursorSprite = &gSprites[namingScreenData.cursorSpriteId]; - + *x = cursorSprite->data0; *y = cursorSprite->data1; } @@ -1073,7 +1073,7 @@ static u8 GetKeyRoleAtCursorPos(void) const u8 keyRoles[] = {KEY_ROLE_PAGE, KEY_ROLE_BACKSPACE, KEY_ROLE_OK}; s16 cursorX; s16 cursorY; - + GetCursorPos(&cursorX, &cursorY); if (cursorX < 8) return KEY_ROLE_CHAR; @@ -1108,7 +1108,7 @@ void sub_80B6998(struct Sprite *sprite) s8 gb = sprite->data5; s8 r = sprite->data5 >> 1; u16 index = IndexOfSpritePaletteTag(5) * 16 + 0x0101; - + MultiplyInvertedPaletteRGBComponents(index, r, gb, gb); } } @@ -1118,15 +1118,15 @@ static void sub_80B6A80(void) u8 spriteId1; u8 spriteId2; u8 spriteId3; - + spriteId1 = CreateSprite(&gSpriteTemplate_83CE5C8, 0xCC, 0x50, 0); namingScreenData.unk10 = spriteId1; SetSubspriteTables(&gSprites[spriteId1], gSubspriteTables_83CE558); - + spriteId2 = CreateSprite(&gSpriteTemplate_83CE5F8, 0xCC, 0x4C, 1); gSprites[spriteId1].data6 = spriteId2; SetSubspriteTables(&gSprites[spriteId2], gSubspriteTables_83CE560); - + spriteId3 = CreateSprite(&gSpriteTemplate_83CE5E0, 0xCC, 0x4B, 2); gSprites[spriteId3].oam.priority = 1; gSprites[spriteId1].data7 = spriteId3; @@ -1135,7 +1135,7 @@ static void sub_80B6A80(void) static void sub_80B6B14(void) { struct Sprite *sprite = &gSprites[namingScreenData.unk10]; - + sprite->data0 = 2; sprite->data1 = namingScreenData.currentPage; } @@ -1178,7 +1178,7 @@ static u8 sub_80B6B9C(struct Sprite *sprite) { struct Sprite *r4 = &gSprites[sprite->data6]; struct Sprite *r5 = &gSprites[sprite->data7]; - + r4->pos2.y++; if (r4->pos2.y > 7) { @@ -1193,7 +1193,7 @@ static u8 sub_80B6B9C(struct Sprite *sprite) static u8 sub_80B6C08(struct Sprite *sprite) { struct Sprite *r2 = &gSprites[sprite->data6]; - + r2->invisible = FALSE; r2->pos2.y++; if (r2->pos2.y >= 0) @@ -1219,10 +1219,10 @@ static void sub_80B6C48(u8 a, struct Sprite *b, struct Sprite *c) static void sub_80B6CA8(void) { u8 spriteId; - + spriteId = CreateSprite(&gSpriteTemplate_83CE610, 0xCC, 0x6C, 0); SetSubspriteTables(&gSprites[spriteId], gSubspriteTables_83CE578); - + spriteId = CreateSprite(&gSpriteTemplate_83CE628, 0xCC, 0x84, 0); SetSubspriteTables(&gSprites[spriteId], gSubspriteTables_83CE578); } @@ -1232,7 +1232,7 @@ static void sub_80B6D04(void) u8 spriteId; s16 r1; u8 i; - + r1 = (namingScreenData.unk2 - 1) * 8 + 4; spriteId = CreateSprite(&gSpriteTemplate_83CE658, r1, 0x28, 0); gSprites[spriteId].oam.priority = 3; @@ -1248,7 +1248,7 @@ static void sub_80B6D04(void) void sub_80B6D9C(struct Sprite *sprite) { const s16 arr[] = {0, -4, -2, -1}; - + if (sprite->data0 == 0 || --sprite->data0 == 0) { sprite->data0 = 8; @@ -1261,7 +1261,7 @@ void sub_80B6DE8(struct Sprite *sprite) { const s16 arr[] = {2, 3, 2, 1}; u8 var; - + var = GetTextCaretPosition(); if (var != (u8)sprite->data0) { @@ -1309,7 +1309,7 @@ static void sub_80B6E68(void) { u8 rivalGfxId; u8 spriteId; - + rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, namingScreenData.unk3E); spriteId = AddPseudoFieldObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x18, 0); gSprites[spriteId].oam.priority = 3; @@ -1319,7 +1319,7 @@ static void sub_80B6E68(void) static void sub_80B6EBC(void) { u8 spriteId; - + spriteId = CreateSprite(&gSpriteTemplate_83CE688, 0x34, 0x18, 0); SetSubspriteTables(&gSprites[spriteId], gSubspriteTables_83CE580); gSprites[spriteId].oam.priority = 3; @@ -1328,7 +1328,7 @@ static void sub_80B6EBC(void) static void sub_80B6EFC(void) { u8 spriteId; - + sub_809D51C(); spriteId = CreateMonIcon(namingScreenData.unk3E, SpriteCallbackDummy, 0x34, 0x18, 0, namingScreenData.unk42); gSprites[spriteId].oam.priority = 3; @@ -1337,7 +1337,7 @@ static void sub_80B6EFC(void) static u8 GetTextCaretPosition(void) { u8 i; - + for (i = 0; i < namingScreenData.template->maxChars; i++) { if (namingScreenData.textBuffer[i] == EOS) @@ -1349,7 +1349,7 @@ static u8 GetTextCaretPosition(void) static u8 GetPreviousTextCaretPosition(void) { s8 i; - + for (i = namingScreenData.template->maxChars - 1; i > 0; i--) { if (namingScreenData.textBuffer[i] != EOS) @@ -1362,7 +1362,7 @@ static void DeleteTextCharacter(void) { u8 index; u8 var2; - + index = GetPreviousTextCaretPosition(); namingScreenData.textBuffer[index] = 0; sub_80B7960(); @@ -1379,7 +1379,7 @@ static bool8 sub_80B7004(void) s16 y; u8 ch; bool8 r4; - + GetCursorPos(&x, &y); x = CursorColToKeyboardCol(x); ch = GetCharAtKeyboardPos(x, y); @@ -1404,7 +1404,7 @@ static void sub_80B7090(void) // DoInput? { u8 r5; u8 r4; - + r5 = GetPreviousTextCaretPosition(); r4 = namingScreenData.textBuffer[r5]; if (sub_80B7198(r4)) @@ -1429,7 +1429,7 @@ static bool8 sub_80B7104(void) { u8 r5; u8 r4; - + r5 = GetPreviousTextCaretPosition(); r4 = namingScreenData.textBuffer[r5]; if (sub_80B720C(r4)) @@ -1444,7 +1444,7 @@ static bool8 sub_80B713C(void) { u8 r5; u8 r4; - + r5 = GetPreviousTextCaretPosition(); r4 = namingScreenData.textBuffer[r5]; if (sub_80B7264(r4)) @@ -1458,7 +1458,7 @@ static bool8 sub_80B713C(void) static void AddTextCharacter(u8 ch) { u8 index = GetTextCaretPosition(); - + namingScreenData.textBuffer[index] = ch; } @@ -1510,7 +1510,7 @@ static bool8 sub_80B7264(u8 a) static void sub_80B72A4(u8 a, u8 b) { u8 chr = a; - + if (a >= 6 && a <= 10) chr = a + 0x31; else if (a >= 11 && a <= 15) @@ -1537,7 +1537,7 @@ static void sub_80B72A4(u8 a, u8 b) static void sub_80B7370(u8 a, u8 b) { u8 chr = a; - + if (a >= 26 && a <= 30) chr = a + 0x31; else if (a >= 70 && a <= 74) @@ -1552,7 +1552,7 @@ static void sub_80B7370(u8 a, u8 b) static void sub_80B73CC(u8 a, u8 b) { u8 chr = a; - + if (a >= 55 && a <= 59) chr = a + 0xCF; else if (a >= 60 && a <= 64) @@ -1575,7 +1575,7 @@ static void sub_80B73CC(u8 a, u8 b) static void sub_80B7474(u8 a, u8 b) { u8 chr = a; - + if (a >= 75 && a <= 79) chr = a + 0xCF; else if (a >= 155 && a <= 159) @@ -1586,7 +1586,7 @@ static void sub_80B7474(u8 a, u8 b) static void sub_80B74B0(void) { u8 i; - + for (i = 0; i < namingScreenData.template->maxChars; i++) { if (namingScreenData.textBuffer[i] != 0 && namingScreenData.textBuffer[i] != 0xFF) @@ -1622,11 +1622,11 @@ static void sub_80B7568(void) { const void *src; void *dst; - + src = gNamingScreenMenu_Gfx; dst = (void *)(VRAM + gMenuMessageBoxContentTileOffset * 32); DmaCopy16(3, src, dst, 0x800); - + src = gNamingScreenMenu_Gfx; dst = (void *)(VRAM + 0x8000 + gMenuMessageBoxContentTileOffset * 32); DmaCopy16(3, src, dst, 0x800); @@ -1655,7 +1655,7 @@ static void sub_80B75C4(void) (u16 *)(VRAM + 0xE000), (u16 *)(VRAM + 0xE800), }; - + gUnknown_083CE2F0[namingScreenData.currentPage][0](arr[namingScreenData.unkC]); gUnknown_083CE2F0[namingScreenData.currentPage][1](arr[namingScreenData.unkD]); } @@ -1667,7 +1667,7 @@ static void sub_80B7614(void) (u16 *)(VRAM + 0xE000), (u16 *)(VRAM + 0xE800), }; - + gUnknown_083CE2F0[namingScreenData.currentPage][1](arr[namingScreenData.unkD]); } @@ -1695,7 +1695,7 @@ static void sub_80B7698(u16 *vramBuffer, const u16 *src) { s16 i; s16 j; - + for (i = 0; i < 20; i++) { for (j = 0; j < 30; j++, src++) @@ -1709,7 +1709,7 @@ static void sub_80B76E0(u16 *vramBuffer, const u16 *src) { s16 i; s16 j; - + for (i = 0; i < 20; i++) { for (j = 0; j < 30; j++, src++) @@ -1827,7 +1827,7 @@ static void PrintKeyboardCharacters(u8 page) //print letters on page { s16 i; s16 r5; - + for (i = 0, r5 = 9; i < 4; i++, r5 += 2) MenuPrint(sKeyboardCharacters[page][i], 3, r5); } @@ -1856,7 +1856,7 @@ static void nullsub_62(void) static void sub_80B7924(void) { u8 genderSymbol[2] = _("♂"); - + if ((s16)namingScreenData.unk40 != MON_GENDERLESS) { if ((s16)namingScreenData.unk40 == MON_FEMALE) @@ -1868,7 +1868,7 @@ static void sub_80B7924(void) static void sub_80B7960(void) { u8 *string = gStringVar1; - + string[0] = 0xFC; string[1] = 0x14; string[2] = 8; diff --git a/src/new_game.c b/src/new_game.c index fc8272f18..e058280af 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -24,7 +24,7 @@ extern u8 gUnknown_0819FA81[]; const struct SB1_2EFC_Struct gUnknown_08216604 = { 0x0000, - { + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/src/player_pc.c b/src/player_pc.c index 1096adc5c..02a2dc1a2 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -701,10 +701,10 @@ void sub_813AA30(u8 taskId, u8 arg) sub_813AD58(gSaveBlock1.pcItems[var].itemId); } - /* + /* THEORY: This check produces essentially dead code, but it might have been working in an earlier build in which case it allows a programmer to easily duplicate items without the use of a debug menu. - With the removal of a lot of the debug menus close to release, a programmer may have added this to + With the removal of a lot of the debug menus close to release, a programmer may have added this to help test things with a low key (such as planting a lot of duplicated berries, which requires this lazy "cheat") without bringing the relevent debug menus back. The commented out line is intentionally left in below to show what it may have looked like. diff --git a/src/rom3.c b/src/rom3.c index 2d00b647f..351d5d44b 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -90,7 +90,7 @@ void sub_800B858(void) void setup_poochyena_battle(void) { s32 i; - + gUnknown_030042D4 = nullsub_41; for (i = 0; i < 4; i++) { @@ -118,7 +118,7 @@ void setup_poochyena_battle(void) void sub_800B950(void) { s32 i; - + if (gBattleTypeFlags & BATTLE_TYPE_LINK) sub_800BA78(); else @@ -166,7 +166,7 @@ void sub_800BA78(void) { u8 multiplayerId; int i; - + if (!(gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) { if (gBattleTypeFlags & BATTLE_TYPE_WILD) @@ -214,7 +214,7 @@ void sub_800BA78(void) gUnknown_03004330[2] = sub_8037510; gUnknown_02024A72[2] = 3; gUnknown_02024A68 = 4; - + } return; } @@ -234,7 +234,7 @@ void sub_800BA78(void) sub_8094978(gLinkPlayers[i].lp_field_18, 1); break; } - + if (i == multiplayerId) { gUnknown_03004330[gLinkPlayers[i].lp_field_18] = sub_802BF74; @@ -298,7 +298,7 @@ void sub_800BD54(void) { int i; int j; - + if (!(gBattleTypeFlags & BATTLE_TYPE_40)) { for (i = 0; i < gUnknown_02024A68; i++) @@ -365,7 +365,7 @@ void sub_800BD54(void) void dp01_prepare_buffer(u8 a, u8 *b, u16 c) { int i; - + if (gBattleTypeFlags & BATTLE_TYPE_LINK) { dp01_prepare_buffer_wireless_probably(a, c, b); @@ -413,7 +413,7 @@ void dp01_prepare_buffer_wireless_probably(u8 a, u16 b, u8 *c) { s32 r9; int i; - + r9 = b - b % 4 + 4; if (gTasks[gUnknown_020238C4].data[14] + r9 + 9 > 0x1000) { @@ -436,7 +436,7 @@ void dp01_prepare_buffer_wireless_probably(u8 a, u16 b, u8 *c) void sub_800C1A8(u8 taskId) { u16 var; - + switch (gTasks[taskId].data[11]) { case 0: @@ -509,7 +509,7 @@ void sub_800C35C(void) u8 *recvBuffer; //r3 u8 *dest; //r5 u8 *src; //r4 - + if (gReceivedRemoteLinkPlayers != 0 && (gBattleTypeFlags & 0x20) && gLinkPlayers[0].linkType == 0x2211) { for (i = 0; i < GetLinkPlayerCount(); i++) @@ -545,7 +545,7 @@ void sub_800C47C(u8 taskId) u16 r7; u8 r4; u8 r2; - + if (gTasks[taskId].data[15] != gTasks[taskId].data[14]) { if (gTasks[taskId].data[15] > gTasks[taskId].data[14] @@ -604,7 +604,7 @@ void dp01_build_cmdbuf_x01_a_b_0(u8 a, int b, int c) void dp01_build_cmdbuf_x02_a_b_varargs(u8 a, int b, int c, u8 d, u8 *e) { int i; - + gUnknown_03004040[0] = 2; gUnknown_03004040[1] = b; gUnknown_03004040[2] = c; @@ -616,7 +616,7 @@ void dp01_build_cmdbuf_x02_a_b_varargs(u8 a, int b, int c, u8 d, u8 *e) void unref_sub_800C6A4(u8 a, int b, u8 c, u8 *d) { int i; - + gUnknown_03004040[0] = 3; gUnknown_03004040[1] = b; gUnknown_03004040[2] = c; @@ -714,7 +714,7 @@ void dp01_build_cmdbuf_x0D_a(u8 a, int b) void unref_sub_800C828(u8 a, u8 b, u8 *c) { int i; - + gUnknown_03004040[0] = 14; gUnknown_03004040[1] = b; for (i = 0; i < b * 3; i++) @@ -757,16 +757,16 @@ void dp01_build_cmdbuf_x10_TODO(u8 a, u16 b) { int i; //u16 *r12; - + gUnknown_03004040[0] = 16; gUnknown_03004040[1] = gUnknown_02024D26; gUnknown_03004040[2] = b; gUnknown_03004040[3] = (b & 0xFF00) >> 8; - + *((u16 *)&gUnknown_03004040[4]) = gUnknown_02024BE6; *((u16 *)&gUnknown_03004040[6]) = gUnknown_02024BE8; *((u16 *)&gUnknown_03004040[8]) = gUnknown_02024C04; - + gUnknown_03004040[10] = byte_2024C06; gUnknown_03004040[11] = unk_2000000[0x16000 + 3]; gUnknown_03004040[12] = unk_2000000[0x16000 + 0x5E]; @@ -1059,7 +1059,7 @@ void unref_sub_800CB84(u8 a, int b) void sub_800CBA4(u8 a, int b, int c, u8 *d) { u32 i; - + gUnknown_03004040[0] = 20; gUnknown_03004040[1] = b; gUnknown_03004040[2] = c; @@ -1072,7 +1072,7 @@ void sub_800CBA4(u8 a, int b, int c, u8 *d) void sub_800CBE0(u8 a, u8 *b) { int i; - + gUnknown_03004040[0] = 21; for (i = 0; i < 3; i++) gUnknown_03004040[1 + i] = b[i]; @@ -1082,7 +1082,7 @@ void sub_800CBE0(u8 a, u8 *b) void dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f(u8 a, int b, int c, int d, u8 *e) { int i; - + gUnknown_03004040[0] = 22; gUnknown_03004040[1] = b; gUnknown_03004040[2] = c; @@ -1154,7 +1154,7 @@ void dp01_build_cmdbuf_x1C_a(u8 a, int b) void dp01_build_cmdbuf_x1D_1D_numargs_varargs(u8 a, u16 b, u8 *c) { int i; - + gUnknown_03004040[0] = 29; gUnknown_03004040[1] = 29; gUnknown_03004040[2] = b; @@ -1167,7 +1167,7 @@ void dp01_build_cmdbuf_x1D_1D_numargs_varargs(u8 a, u16 b, u8 *c) void unref_sub_800CDD4(u8 a, u32 b, u16 c, u8 *d) { int i; - + gUnknown_03004040[0] = 30; gUnknown_03004040[1] = b; gUnknown_03004040[2] = (b & 0x0000FF00) >> 8; @@ -1183,7 +1183,7 @@ void unref_sub_800CDD4(u8 a, u32 b, u16 c, u8 *d) void unref_sub_800CE3C(u8 a, u16 b, u8 *c) { int i; - + gUnknown_03004040[0] = 31; gUnknown_03004040[1] = b; gUnknown_03004040[2] = (b & 0xFF00) >> 8; @@ -1195,7 +1195,7 @@ void unref_sub_800CE3C(u8 a, u16 b, u8 *c) void unref_sub_800CE84(u8 a, u16 b, u8 *c) { int i; - + gUnknown_03004040[0] = 32; gUnknown_03004040[1] = b; gUnknown_03004040[2] = (b & 0xFF00) >> 8; @@ -1216,7 +1216,7 @@ void dp01_build_cmdbuf_x21_a_bb(u8 a, int b, u16 c) void dp01_build_cmdbuf_x22_a_three_bytes(u8 a, int b, u8 *c) { int i; - + gUnknown_03004040[0] = 34; gUnknown_03004040[1] = b; for (i = 0; i < 3; i++) @@ -1340,7 +1340,7 @@ void dp01_build_cmdbuf_x2F_2F_2F_2F(u8 a) void dp01_build_cmdbuf_x30_TODO(u8 a, u8 *b, u8 c) { int i; - + gUnknown_03004040[0] = 48; gUnknown_03004040[1] = c & 0x7F; gUnknown_03004040[2] = (c & 0x80) >> 7; diff --git a/src/rom4.c b/src/rom4.c index 3d388fd6d..39c182731 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -469,9 +469,9 @@ struct MapConnection *sub_8053818(u8 dir) if (connection == NULL) return NULL; - - for(i = 0; i < count; i++, connection++) - if (connection->direction == dir) + + for(i = 0; i < count; i++, connection++) + if (connection->direction == dir) return connection; return NULL; diff --git a/src/rom6.c b/src/rom6.c index 0cc510914..a2b52c9aa 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -35,7 +35,7 @@ static void sub_810B634(void); bool8 npc_before_player_of_type(u8 a) { u8 mapObjId; - + GetXYCoordsOneStepInFrontOfPlayer(&gUnknown_0203923C.x, &gUnknown_0203923C.y); gUnknown_0203923C.height = PlayerGetZCoord(); mapObjId = GetFieldObjectIdByXYZ(gUnknown_0203923C.x, gUnknown_0203923C.y, gUnknown_0203923C.height); @@ -59,7 +59,7 @@ u8 oei_task_add(void) static void task08_080C9820(u8 taskId) { u8 mapObjId; - + ScriptContext2_Enable(); gPlayerAvatar.unk6 = 1; mapObjId = gPlayerAvatar.mapObjectId; @@ -112,7 +112,7 @@ static void sub_810B428(u8 taskId) static void sub_810B4CC(u8 taskId) { void (*func)(void) = (void (*)(void))(((u16)gTasks[taskId].data[8] << 16) | (u16)gTasks[taskId].data[9]); - + func(); gPlayerAvatar.unk6 = 0; DestroyTask(taskId); @@ -141,7 +141,7 @@ static void sub_810B53C(void) int FldEff_RockSmash(void) { u8 taskId = oei_task_add(); - + gTasks[taskId].data[8] = (u32)sub_810B58C >> 16; gTasks[taskId].data[9] = (u32)sub_810B58C; IncrementGameStat(0x13); @@ -179,7 +179,7 @@ static void sub_810B5D8(void) int FldEff_UseDig(void) { u8 taskId = oei_task_add(); - + gTasks[taskId].data[8] = (u32)sub_810B634 >> 16; gTasks[taskId].data[9] = (u32)sub_810B634; if (!ShouldDoBrailleDigEffect()) @@ -190,7 +190,7 @@ int FldEff_UseDig(void) static void sub_810B634(void) { u8 taskId; - + FieldEffectActiveListRemove(0x26); if (ShouldDoBrailleDigEffect()) { diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 7dcc28b3a..2d7691033 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -9,10 +9,10 @@ #include "trig.h" #define GET_UNOWN_LETTER(personality) ((\ - (((personality & 0x03000000) >> 24) << 6) \ - | (((personality & 0x00030000) >> 16) << 4) \ - | (((personality & 0x00000300) >> 8) << 2) \ - | (((personality & 0x00000003) >> 0) << 0) \ + (((personality & 0x03000000) >> 24) << 6) \ + | (((personality & 0x00030000) >> 16) << 4) \ + | (((personality & 0x00000300) >> 8) << 2) \ + | (((personality & 0x00000003) >> 0) << 0) \ ) % 28) #define IS_DOUBLE_BATTLE() ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) ? TRUE : FALSE) @@ -29,65 +29,65 @@ struct Struct_unk_2019348 { - u16 field_0; - u16 field_2; - u8 field_4; - u32 field_8; - u32 field_c; - u32 field_10; + u16 field_0; + u16 field_2; + u8 field_4; + u32 field_8; + u32 field_c; + u32 field_10; }; struct TransformStatus { - u16 unknown; - u16 species; + u16 unknown; + u16 species; }; struct MonCoords { - // This would use a bitfield, but sub_8079F44 - // uses it as a u8 and casting won't match. - u8 coords; // u8 x:4, y:4; - u8 y_offset; + // This would use a bitfield, but sub_8079F44 + // uses it as a u8 and casting won't match. + u8 coords; // u8 x:4, y:4; + u8 y_offset; }; struct Struct_gUnknown_0837F578 { - u8 field_0; - u8 field_1; + u8 field_0; + u8 field_1; }; struct OamMatrix { - s16 a; - s16 b; - s16 c; - s16 d; + s16 a; + s16 b; + s16 c; + s16 d; }; struct Struct_2017810 { - u8 filler_0[6]; - u8 field_6; - u8 filler_7[5]; + u8 filler_0[6]; + u8 field_6; + u8 filler_7[5]; }; struct Color { - u16 r:5; - u16 g:5; - u16 b:5; + u16 r:5; + u16 g:5; + u16 b:5; }; struct Struct_sub_8078914 { - u8 *field_0; - u8 *field_4; - u8 field_8; + u8 *field_0; + u8 *field_4; + u8 field_8; }; struct BGCnt { - u16 priority:2; - u16 charBase:2; - u16 unused:2; - u16 mosaic:1; - u16 colorMode:1; - u16 screenBase:5; - u16 overflow:1; - u16 size:2; + u16 priority:2; + u16 charBase:2; + u16 unused:2; + u16 mosaic:1; + u16 colorMode:1; + u16 screenBase:5; + u16 overflow:1; + u16 size:2; }; #define BG1CNT (*(volatile struct BGCnt*)REG_ADDR_BG1CNT) @@ -165,1941 +165,1941 @@ EWRAM_DATA union AffineAnimCmd *gUnknown_0202F7D4 = NULL; EWRAM_DATA u32 filler_0202F7D8[3] = {0}; const struct Struct_gUnknown_0837F578 gUnknown_0837F578[][4] = { - { - { 72, 80 }, - { 176, 40 }, - { 48, 40 }, - { 112, 80 }, - }, - { - { 32, 80 }, - { 200, 40 }, - { 90, 88 }, - { 152, 32 }, - }, + { + { 72, 80 }, + { 176, 40 }, + { 48, 40 }, + { 112, 80 }, + }, + { + { 32, 80 }, + { 200, 40 }, + { 90, 88 }, + { 152, 32 }, + }, }; // One entry for each of the four Castform forms. // Coords are probably front pic coords or back pic coords, but this data does not seem to be // used during battle, party summary, or pokedex screens. const struct MonCoords gCastformFrontSpriteCoords[] = { - { 0x44, 17 }, // NORMAL - { 0x66, 9 }, // SUN - { 0x46, 9 }, // RAIN - { 0x86, 8 }, // HAIL + { 0x44, 17 }, // NORMAL + { 0x66, 9 }, // SUN + { 0x46, 9 }, // RAIN + { 0x86, 8 }, // HAIL }; const u8 gCastformElevations[] = { - 13, // NORMAL - 14, // SUN - 13, // RAIN - 13, // HAIL + 13, // NORMAL + 14, // SUN + 13, // RAIN + 13, // HAIL }; // Y position of the backsprite for each of the four Castform forms. const u8 gCastformBackSpriteYCoords[] = { - 0, // NORMAL - 0, // SUN - 0, // RAIN - 0, // HAIL + 0, // NORMAL + 0, // SUN + 0, // RAIN + 0, // HAIL }; const struct SpriteTemplate gSpriteTemplate_837F5B0[] = { - { - .tileTag = 55125, - .paletteTag = 55125, - .oam = gOamData_837DF9C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy, - }, { - .tileTag = 55126, - .paletteTag = 55126, - .oam = gOamData_837DF9C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy, - } + { + .tileTag = 55125, + .paletteTag = 55125, + .oam = gOamData_837DF9C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, { + .tileTag = 55126, + .paletteTag = 55126, + .oam = gOamData_837DF9C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + } }; const struct SpriteSheet gUnknown_0837F5E0[] = { - { gMiscBlank_Gfx, 0x800, 55125, }, - { gMiscBlank_Gfx, 0x800, 55126, }, + { gMiscBlank_Gfx, 0x800, 55125, }, + { gMiscBlank_Gfx, 0x800, 55126, }, }; u8 sub_8077ABC(u8 slot, u8 a2) { - u8 var; - u16 species; - struct TransformStatus *transform; - - if (IsContest()) { - if (a2 == 3 && slot == 3) { - a2 = 1; - } - } - switch (a2) { - case 0: - case 2: - var = gUnknown_0837F578[IS_DOUBLE_BATTLE()][battle_get_per_side_status(slot)].field_0; - break; - case 1: - var = gUnknown_0837F578[IS_DOUBLE_BATTLE()][battle_get_per_side_status(slot)].field_1; - break; - case 3: - case 4: - default: - if (IsContest()) { - if (unk_2019348.field_4 & 1) { - species = unk_2019348.field_2; - } else { - species = unk_2019348.field_0; - } - } else { - if (battle_side_get_owner(slot)) { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); - } else { - species = transform->species; - } - } else { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); - } else { - species = transform->species; - } - } - } - if (a2 == 3) { - var = sub_8077E44(slot, species, 1); - } else { - var = sub_8077E44(slot, species, 0); - } - break; - } - return var; + u8 var; + u16 species; + struct TransformStatus *transform; + + if (IsContest()) { + if (a2 == 3 && slot == 3) { + a2 = 1; + } + } + switch (a2) { + case 0: + case 2: + var = gUnknown_0837F578[IS_DOUBLE_BATTLE()][battle_get_per_side_status(slot)].field_0; + break; + case 1: + var = gUnknown_0837F578[IS_DOUBLE_BATTLE()][battle_get_per_side_status(slot)].field_1; + break; + case 3: + case 4: + default: + if (IsContest()) { + if (unk_2019348.field_4 & 1) { + species = unk_2019348.field_2; + } else { + species = unk_2019348.field_0; + } + } else { + if (battle_side_get_owner(slot)) { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); + } else { + species = transform->species; + } + } else { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); + } else { + species = transform->species; + } + } + } + if (a2 == 3) { + var = sub_8077E44(slot, species, 1); + } else { + var = sub_8077E44(slot, species, 0); + } + break; + } + return var; } u8 sub_8077BFC(u8 slot, u16 species) { - u16 letter; - u32 personality; - struct TransformStatus *transform; - u8 ret; - u16 var; - - if (!battle_side_get_owner(slot) || IsContest()) { - if (species == SPECIES_UNOWN) { - if (IsContest()) { - if (unk_2019348.field_4 & 1) { - personality = unk_2019348.field_10; - } else { - personality = unk_2019348.field_8; - } - } else { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - personality = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); - } else { - personality = gTransformPersonalities[slot]; - } - } - letter = GET_UNOWN_LETTER(personality); - if (!letter) { - var = species; - } else { - var = letter + SPECIES_UNOWN_B - 1; - } - ret = gMonBackPicCoords[var].y_offset; - } else if (species == SPECIES_CASTFORM) { - ret = gCastformBackSpriteYCoords[gBattleMonForms[slot]]; - } else if (species > NUM_SPECIES) { - ret = gMonBackPicCoords[0].y_offset; - } else { - ret = gMonBackPicCoords[species].y_offset; - } - } else { - if (species == SPECIES_UNOWN) { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - personality = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); - } else { - personality = gTransformPersonalities[slot]; - } - letter = GET_UNOWN_LETTER(personality); - if (!letter) { - var = species; - } else { - var = letter + SPECIES_UNOWN_B - 1; - } - ret = gMonFrontPicCoords[var].y_offset; - } else if (species == SPECIES_CASTFORM) { - ret = gCastformFrontSpriteCoords[gBattleMonForms[slot]].y_offset; - } else if (species > NUM_SPECIES) { - ret = gMonFrontPicCoords[0].y_offset; - } else { - ret = gMonFrontPicCoords[species].y_offset; - } - } - return ret; + u16 letter; + u32 personality; + struct TransformStatus *transform; + u8 ret; + u16 var; + + if (!battle_side_get_owner(slot) || IsContest()) { + if (species == SPECIES_UNOWN) { + if (IsContest()) { + if (unk_2019348.field_4 & 1) { + personality = unk_2019348.field_10; + } else { + personality = unk_2019348.field_8; + } + } else { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + personality = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); + } else { + personality = gTransformPersonalities[slot]; + } + } + letter = GET_UNOWN_LETTER(personality); + if (!letter) { + var = species; + } else { + var = letter + SPECIES_UNOWN_B - 1; + } + ret = gMonBackPicCoords[var].y_offset; + } else if (species == SPECIES_CASTFORM) { + ret = gCastformBackSpriteYCoords[gBattleMonForms[slot]]; + } else if (species > NUM_SPECIES) { + ret = gMonBackPicCoords[0].y_offset; + } else { + ret = gMonBackPicCoords[species].y_offset; + } + } else { + if (species == SPECIES_UNOWN) { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + personality = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); + } else { + personality = gTransformPersonalities[slot]; + } + letter = GET_UNOWN_LETTER(personality); + if (!letter) { + var = species; + } else { + var = letter + SPECIES_UNOWN_B - 1; + } + ret = gMonFrontPicCoords[var].y_offset; + } else if (species == SPECIES_CASTFORM) { + ret = gCastformFrontSpriteCoords[gBattleMonForms[slot]].y_offset; + } else if (species > NUM_SPECIES) { + ret = gMonFrontPicCoords[0].y_offset; + } else { + ret = gMonFrontPicCoords[species].y_offset; + } + } + return ret; } u8 sub_8077DD8(u8 slot, u16 species) { - u8 ret = 0; - if (battle_side_get_owner(slot) == 1) { - if (!IsContest()) { - if (species == SPECIES_CASTFORM) { - ret = gCastformElevations[gBattleMonForms[slot]]; - } else if (species > NUM_SPECIES) { - ret = gEnemyMonElevation[0]; - } else { - ret = gEnemyMonElevation[species]; - } - } - } - return ret; + u8 ret = 0; + if (battle_side_get_owner(slot) == 1) { + if (!IsContest()) { + if (species == SPECIES_CASTFORM) { + ret = gCastformElevations[gBattleMonForms[slot]]; + } else if (species > NUM_SPECIES) { + ret = gEnemyMonElevation[0]; + } else { + ret = gEnemyMonElevation[species]; + } + } + } + return ret; } u8 sub_8077E44(u8 slot, u16 species, u8 a3) { - u16 offset; - u8 y; - if (battle_side_get_owner(slot) == 0 || IsContest()) { - offset = sub_8077BFC(slot, species); - } else { - offset = sub_8077BFC(slot, species); - offset -= sub_8077DD8(slot, species); - } - y = offset + gUnknown_0837F578[IS_DOUBLE_BATTLE()][battle_get_per_side_status(slot)].field_1; - if (a3) { - if (battle_side_get_owner(slot) == 0) { - y += 8; - } - if (y > 104) y = 104; - } - return y; + u16 offset; + u8 y; + if (battle_side_get_owner(slot) == 0 || IsContest()) { + offset = sub_8077BFC(slot, species); + } else { + offset = sub_8077BFC(slot, species); + offset -= sub_8077DD8(slot, species); + } + y = offset + gUnknown_0837F578[IS_DOUBLE_BATTLE()][battle_get_per_side_status(slot)].field_1; + if (a3) { + if (battle_side_get_owner(slot) == 0) { + y += 8; + } + if (y > 104) y = 104; + } + return y; } u8 sub_8077EE4(u8 slot, u8 a2) { - u16 species; - struct TransformStatus *transform; - if (a2 == 3 || a2 == 4) { - if (IsContest()) { - if (unk_2019348.field_4 & 1) { - species = unk_2019348.field_2; - } else { - species = unk_2019348.field_0; - } - } else { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - species = gUnknown_0202F7CA[slot]; - } else { - species = transform->species; - } - } - if (a2 == 3) { - return sub_8077E44(slot, species, 1); - } else { - return sub_8077E44(slot, species, 0); - } - } else { - return sub_8077ABC(slot, a2); - } + u16 species; + struct TransformStatus *transform; + if (a2 == 3 || a2 == 4) { + if (IsContest()) { + if (unk_2019348.field_4 & 1) { + species = unk_2019348.field_2; + } else { + species = unk_2019348.field_0; + } + } else { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + species = gUnknown_0202F7CA[slot]; + } else { + species = transform->species; + } + } + if (a2 == 3) { + return sub_8077E44(slot, species, 1); + } else { + return sub_8077E44(slot, species, 0); + } + } else { + return sub_8077ABC(slot, a2); + } } u8 sub_8077F68(u8 slot) { - return sub_8077ABC(slot, 4); + return sub_8077ABC(slot, 4); } u8 sub_8077F7C(u8 slot) { - u16 var; - if (battle_side_get_owner(slot)) { - var = sub_8077ABC(slot, 1) + 16; - } else { - var = sub_8077ABC(slot, 1) + 17; - } - return var; + u16 var; + if (battle_side_get_owner(slot)) { + var = sub_8077ABC(slot, 1) + 16; + } else { + var = sub_8077ABC(slot, 1) + 17; + } + return var; } u8 sub_8077FC0(u8 slot) { - u16 var; - u8 r6; - struct TransformStatus *transform; - r6 = sub_8077ABC(slot, 1); - if (!IsContest()) { - if (battle_side_get_owner(slot)) { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - var = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); - } else { - var = transform->species; - } - } else { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - var = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); - } else { - var = transform->species; - } - } - if (battle_side_get_owner(slot)) { - r6 -= sub_8077DD8(slot, var); - } - } - return r6; + u16 var; + u8 r6; + struct TransformStatus *transform; + r6 = sub_8077ABC(slot, 1); + if (!IsContest()) { + if (battle_side_get_owner(slot)) { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + var = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); + } else { + var = transform->species; + } + } else { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + var = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); + } else { + var = transform->species; + } + } + if (battle_side_get_owner(slot)) { + r6 -= sub_8077DD8(slot, var); + } + } + return r6; } u8 obj_id_for_side_relative_to_move(u8 a1) { - u8 *sprites; - if (a1 == 0) { - if (sub_8078874(gBattleAnimPlayerMonIndex)) { - sprites = gBattleMonSprites; - return sprites[gBattleAnimPlayerMonIndex]; - } else { - return 0xff; - } - } else if (a1 == 1) { - if (sub_8078874(gBattleAnimEnemyMonIndex)) { - sprites = gBattleMonSprites; - return sprites[gBattleAnimEnemyMonIndex]; - } else { - return 0xff; - } - } else if (a1 == 2) { - if (!b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2)) { - return 0xff; - } else { - return gBattleMonSprites[gBattleAnimPlayerMonIndex ^ 2]; - } - } else { - if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) { - return gBattleMonSprites[gBattleAnimEnemyMonIndex ^ 2]; - } else { - return 0xff; - } - } + u8 *sprites; + if (a1 == 0) { + if (sub_8078874(gBattleAnimPlayerMonIndex)) { + sprites = gBattleMonSprites; + return sprites[gBattleAnimPlayerMonIndex]; + } else { + return 0xff; + } + } else if (a1 == 1) { + if (sub_8078874(gBattleAnimEnemyMonIndex)) { + sprites = gBattleMonSprites; + return sprites[gBattleAnimEnemyMonIndex]; + } else { + return 0xff; + } + } else if (a1 == 2) { + if (!b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2)) { + return 0xff; + } else { + return gBattleMonSprites[gBattleAnimPlayerMonIndex ^ 2]; + } + } else { + if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) { + return gBattleMonSprites[gBattleAnimEnemyMonIndex ^ 2]; + } else { + return 0xff; + } + } } void oamt_set_x3A_32(struct Sprite *sprite, void (*callback)(struct Sprite*)) { - sprite->data6 = (u32)(callback) & 0xffff; - sprite->data7 = (u32)(callback) >> 16; + sprite->data6 = (u32)(callback) & 0xffff; + sprite->data7 = (u32)(callback) >> 16; } void sub_8078104(struct Sprite *sprite) { - u32 callback = (u16)sprite->data6 | (sprite->data7 << 16); - sprite->callback = (void (*)(struct Sprite *))callback; + u32 callback = (u16)sprite->data6 | (sprite->data7 << 16); + sprite->callback = (void (*)(struct Sprite *))callback; } void sub_8078114(struct Sprite *sprite) { - if (sprite->data3) { - sprite->pos2.x = Sin(sprite->data0, sprite->data1); - sprite->pos2.y = Cos(sprite->data0, sprite->data1); - sprite->data0 += sprite->data2; - if (sprite->data0 >= 0x100) { - sprite->data0 -= 0x100; - } else if (sprite->data0 < 0) { - sprite->data0 += 0x100; - } - sprite->data3--; - } else { - sub_8078104(sprite); - } + if (sprite->data3) { + sprite->pos2.x = Sin(sprite->data0, sprite->data1); + sprite->pos2.y = Cos(sprite->data0, sprite->data1); + sprite->data0 += sprite->data2; + if (sprite->data0 >= 0x100) { + sprite->data0 -= 0x100; + } else if (sprite->data0 < 0) { + sprite->data0 += 0x100; + } + sprite->data3--; + } else { + sub_8078104(sprite); + } } void sub_8078174(struct Sprite *sprite) { - if (sprite->data3) { - sprite->pos2.x = Sin(sprite->data0, (sprite->data5 >> 8) + sprite->data1); - sprite->pos2.y = Cos(sprite->data0, (sprite->data5 >> 8) + sprite->data1); - sprite->data0 += sprite->data2; - sprite->data5 += sprite->data4; - if (sprite->data0 >= 0x100) { - sprite->data0 -= 0x100; - } else if (sprite->data0 < 0) { - sprite->data0 += 0x100; - } - sprite->data3--; - } else { - sub_8078104(sprite); - } + if (sprite->data3) { + sprite->pos2.x = Sin(sprite->data0, (sprite->data5 >> 8) + sprite->data1); + sprite->pos2.y = Cos(sprite->data0, (sprite->data5 >> 8) + sprite->data1); + sprite->data0 += sprite->data2; + sprite->data5 += sprite->data4; + if (sprite->data0 >= 0x100) { + sprite->data0 -= 0x100; + } else if (sprite->data0 < 0) { + sprite->data0 += 0x100; + } + sprite->data3--; + } else { + sub_8078104(sprite); + } } void unref_sub_80781F0(struct Sprite *sprite) { - if (sprite->data3) { - sprite->pos2.x = Sin(sprite->data0, sprite->data1); - sprite->pos2.y = Cos(sprite->data4, sprite->data1); - sprite->data0 += sprite->data2; - sprite->data4 += sprite->data5; - if (sprite->data0 >= 0x100) { - sprite->data0 -= 0x100; - } else if (sprite->data0 < 0) { - sprite->data0 += 0x100; - } - if (sprite->data4 >= 0x100) { - sprite->data4 -= 0x100; - } else if (sprite->data4 < 0) { - sprite->data4 += 0x100; - } - sprite->data3--; - } else { - sub_8078104(sprite); - } + if (sprite->data3) { + sprite->pos2.x = Sin(sprite->data0, sprite->data1); + sprite->pos2.y = Cos(sprite->data4, sprite->data1); + sprite->data0 += sprite->data2; + sprite->data4 += sprite->data5; + if (sprite->data0 >= 0x100) { + sprite->data0 -= 0x100; + } else if (sprite->data0 < 0) { + sprite->data0 += 0x100; + } + if (sprite->data4 >= 0x100) { + sprite->data4 -= 0x100; + } else if (sprite->data4 < 0) { + sprite->data4 += 0x100; + } + sprite->data3--; + } else { + sub_8078104(sprite); + } } void sub_8078278(struct Sprite *sprite) { - if (sprite->data3) { - sprite->pos2.x = Sin(sprite->data0, sprite->data1); - sprite->pos2.y = Cos(sprite->data0, sprite->data4); - sprite->data0 += sprite->data2; - if (sprite->data0 >= 0x100) { - sprite->data0 -= 0x100; - } else if (sprite->data0 < 0) { - sprite->data0 += 0x100; - } - sprite->data3--; - } else { - sub_8078104(sprite); - } + if (sprite->data3) { + sprite->pos2.x = Sin(sprite->data0, sprite->data1); + sprite->pos2.y = Cos(sprite->data0, sprite->data4); + sprite->data0 += sprite->data2; + if (sprite->data0 >= 0x100) { + sprite->data0 -= 0x100; + } else if (sprite->data0 < 0) { + sprite->data0 += 0x100; + } + sprite->data3--; + } else { + sub_8078104(sprite); + } } void sub_80782D8(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - } else { - sub_8078104(sprite); - } + if (sprite->data0 > 0) { + sprite->data0--; + } else { + sub_8078104(sprite); + } } void sub_80782F8(struct Sprite *sprite) { - sub_8078314(sprite); - sprite->callback = sub_8078364; - sprite->callback(sprite); + sub_8078314(sprite); + sprite->callback = sub_8078364; + sprite->callback(sprite); } void sub_8078314(struct Sprite *sprite) { - s16 old; - int v1; - if (sprite->data1 > sprite->data2) { - sprite->data0 = -sprite->data0; - } - v1 = sprite->data2 - sprite->data1; - old = sprite->data0; - sprite->data0 = abs(v1 / sprite->data0); - sprite->data2 = (sprite->data4 - sprite->data3) / sprite->data0; - sprite->data1 = old; + s16 old; + int v1; + if (sprite->data1 > sprite->data2) { + sprite->data0 = -sprite->data0; + } + v1 = sprite->data2 - sprite->data1; + old = sprite->data0; + sprite->data0 = abs(v1 / sprite->data0); + sprite->data2 = (sprite->data4 - sprite->data3) / sprite->data0; + sprite->data1 = old; } void sub_8078364(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - sprite->pos2.x += sprite->data1; - sprite->pos2.y += sprite->data2; - } else { - sub_8078104(sprite); - } + if (sprite->data0 > 0) { + sprite->data0--; + sprite->pos2.x += sprite->data1; + sprite->pos2.y += sprite->data2; + } else { + sub_8078104(sprite); + } } void sub_8078394(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - sprite->data3 += sprite->data1; - sprite->data4 += sprite->data2; - sprite->pos2.x = sprite->data3 >> 8; - sprite->pos2.y = sprite->data4 >> 8; - } else { - sub_8078104(sprite); - } + if (sprite->data0 > 0) { + sprite->data0--; + sprite->data3 += sprite->data1; + sprite->data4 += sprite->data2; + sprite->pos2.x = sprite->data3 >> 8; + sprite->pos2.y = sprite->data4 >> 8; + } else { + sub_8078104(sprite); + } } void sub_80783D0(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - sprite->data3 += sprite->data1; - sprite->data4 += sprite->data2; - sprite->pos2.x = sprite->data3 >> 8; - sprite->pos2.y = sprite->data4 >> 8; - } else { - sub_8078104(sprite); - } - UpdateMonIconFrame(sprite); + if (sprite->data0 > 0) { + sprite->data0--; + sprite->data3 += sprite->data1; + sprite->data4 += sprite->data2; + sprite->pos2.x = sprite->data3 >> 8; + sprite->pos2.y = sprite->data4 >> 8; + } else { + sub_8078104(sprite); + } + UpdateMonIconFrame(sprite); } void unref_sub_8078414(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x + sprite->pos2.x; - sprite->data3 = sprite->pos1.y + sprite->pos2.y; - sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2); - sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3); - sprite->callback = sub_80782F8; + sprite->data1 = sprite->pos1.x + sprite->pos2.x; + sprite->data3 = sprite->pos1.y + sprite->pos2.y; + sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2); + sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3); + sprite->callback = sub_80782F8; } void sub_8078458(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - gSprites[sprite->data3].pos2.x += sprite->data1; - gSprites[sprite->data3].pos2.y += sprite->data2; - } else { - sub_8078104(sprite); - } + if (sprite->data0 > 0) { + sprite->data0--; + gSprites[sprite->data3].pos2.x += sprite->data1; + gSprites[sprite->data3].pos2.y += sprite->data2; + } else { + sub_8078104(sprite); + } } void sub_80784A8(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - sprite->data3 += sprite->data1; - sprite->data4 += sprite->data2; - gSprites[sprite->data5].pos2.x = sprite->data3 >> 8; - gSprites[sprite->data5].pos2.y = sprite->data4 >> 8; - } else { - sub_8078104(sprite); - } + if (sprite->data0 > 0) { + sprite->data0--; + sprite->data3 += sprite->data1; + sprite->data4 += sprite->data2; + gSprites[sprite->data5].pos2.x = sprite->data3 >> 8; + gSprites[sprite->data5].pos2.y = sprite->data4 >> 8; + } else { + sub_8078104(sprite); + } } void sub_8078504(struct Sprite *sprite) { - if (sprite->data0 > 0) { - sprite->data0--; - sprite->pos2.x = sprite->data2 >> 8; - sprite->data2 += sprite->data1; - sprite->pos2.y = sprite->data4 >> 8; - sprite->data4 += sprite->data3; - if (sprite->data0 % sprite->data5 == 0) { - if (sprite->data5) { - sprite->invisible ^= 1; - } - } - } else { - sub_8078104(sprite); - } + if (sprite->data0 > 0) { + sprite->data0--; + sprite->pos2.x = sprite->data2 >> 8; + sprite->data2 += sprite->data1; + sprite->pos2.y = sprite->data4 >> 8; + sprite->data4 += sprite->data3; + if (sprite->data0 % sprite->data5 == 0) { + if (sprite->data5) { + sprite->invisible ^= 1; + } + } + } else { + sub_8078104(sprite); + } } void move_anim_8074EE0(struct Sprite *sprite) { - FreeSpriteOamMatrix(sprite); - move_anim_8072740(sprite); + FreeSpriteOamMatrix(sprite); + move_anim_8072740(sprite); } void unref_sub_8078588(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x + sprite->pos2.x; - sprite->data3 = sprite->pos1.y + sprite->pos2.y; - sprite->data2 = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); - sprite->data4 = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); - sprite->callback = sub_80782F8; + sprite->data1 = sprite->pos1.x + sprite->pos2.x; + sprite->data3 = sprite->pos1.y + sprite->pos2.y; + sprite->data2 = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); + sprite->data4 = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); + sprite->callback = sub_80782F8; } void unref_sub_80785CC(struct Sprite *sprite) { - ResetPaletteStructByUid(sprite->data5); - move_anim_8074EE0(sprite); + ResetPaletteStructByUid(sprite->data5); + move_anim_8074EE0(sprite); } void sub_80785E4(struct Sprite *sprite) { - if (sprite->affineAnimEnded) { - sub_8078104(sprite); - } + if (sprite->affineAnimEnded) { + sub_8078104(sprite); + } } void sub_8078600(struct Sprite *sprite) { - if (sprite->animEnded) { - sub_8078104(sprite); - } + if (sprite->animEnded) { + sub_8078104(sprite); + } } void sub_807861C(struct Sprite *sprite) { - REG_BLDCNT = 0; - REG_BLDALPHA = 0; - move_anim_8072740(sprite); + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + move_anim_8072740(sprite); } void sub_8078634(u8 task) { - REG_BLDCNT = 0; - REG_BLDALPHA = 0; - DestroyAnimVisualTask(task); + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + DestroyAnimVisualTask(task); } void sub_8078650(struct Sprite *sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); + sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); + sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); } void sub_807867C(struct Sprite *sprite, s16 a2) { - u16 v1 = sub_8077ABC(gBattleAnimPlayerMonIndex, 0); - u16 v2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 0); - if (v1 > v2) { - sprite->pos1.x -= a2; - } else if (v1 < v2) { - sprite->pos1.x += a2; - } else { - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { - sprite->pos1.x -= a2; - } else { - sprite->pos1.x += a2; - } - } + u16 v1 = sub_8077ABC(gBattleAnimPlayerMonIndex, 0); + u16 v2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 0); + if (v1 > v2) { + sprite->pos1.x -= a2; + } else if (v1 < v2) { + sprite->pos1.x += a2; + } else { + if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + sprite->pos1.x -= a2; + } else { + sprite->pos1.x += a2; + } + } } void sub_80786EC(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; - obj_translate_based_on_private_1_2_3_4(sprite); - sprite->data6 = 0x8000 / sprite->data0; - sprite->data7 = 0; + sprite->data1 = sprite->pos1.x; + sprite->data3 = sprite->pos1.y; + obj_translate_based_on_private_1_2_3_4(sprite); + sprite->data6 = 0x8000 / sprite->data0; + sprite->data7 = 0; } bool8 sub_8078718(struct Sprite *sprite) { - if (sub_8078B5C(sprite)) { - return TRUE; - } - sprite->data7 += sprite->data6; - sprite->pos2.y += Sin((u8)(sprite->data7 >> 8), sprite->data5); - return FALSE; + if (sub_8078B5C(sprite)) { + return TRUE; + } + sprite->data7 += sprite->data6; + sprite->pos2.y += Sin((u8)(sprite->data7 >> 8), sprite->data5); + return FALSE; } void oamt_add_pos2_onto_pos1(struct Sprite *sprite) { - sprite->pos1.x += sprite->pos2.x; - sprite->pos1.y += sprite->pos2.y; - sprite->pos2.x = 0; - sprite->pos2.y = 0; + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; } void sub_8078764(struct Sprite *sprite, u8 a2) { - if (!a2) { - sprite->pos1.x = sub_8077EE4(gBattleAnimEnemyMonIndex, 0); - sprite->pos1.y = sub_8077EE4(gBattleAnimEnemyMonIndex, 1); - } - sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + if (!a2) { + sprite->pos1.x = sub_8077EE4(gBattleAnimEnemyMonIndex, 0); + sprite->pos1.y = sub_8077EE4(gBattleAnimEnemyMonIndex, 1); + } + sub_807867C(sprite, gBattleAnimArgs[0]); + sprite->pos1.y += gBattleAnimArgs[1]; } void sub_80787B0(struct Sprite *sprite, u8 a2) { - if (!a2) { - sprite->pos1.x = sub_8077EE4(gBattleAnimPlayerMonIndex, 0); - sprite->pos1.y = sub_8077EE4(gBattleAnimPlayerMonIndex, 1); - } else { - sprite->pos1.x = sub_8077EE4(gBattleAnimPlayerMonIndex, 2); - sprite->pos1.y = sub_8077EE4(gBattleAnimPlayerMonIndex, 3); - } - sub_807867C(sprite, gBattleAnimArgs[0]); - sprite->pos1.y += gBattleAnimArgs[1]; + if (!a2) { + sprite->pos1.x = sub_8077EE4(gBattleAnimPlayerMonIndex, 0); + sprite->pos1.y = sub_8077EE4(gBattleAnimPlayerMonIndex, 1); + } else { + sprite->pos1.x = sub_8077EE4(gBattleAnimPlayerMonIndex, 2); + sprite->pos1.y = sub_8077EE4(gBattleAnimPlayerMonIndex, 3); + } + sub_807867C(sprite, gBattleAnimArgs[0]); + sprite->pos1.y += gBattleAnimArgs[1]; } u8 battle_side_get_owner(u8 slot) { - return gUnknown_02024A72[slot] & 1; + return gUnknown_02024A72[slot] & 1; } u8 battle_get_per_side_status(u8 slot) { - return gUnknown_02024A72[slot]; + return gUnknown_02024A72[slot]; } u8 battle_get_side_with_given_state(u8 slot) { - u8 i; - for (i = 0; i < gUnknown_02024A68; i++) { - if (gUnknown_02024A72[i] == slot) { - break; - } - } - return i; + u8 i; + for (i = 0; i < gUnknown_02024A68; i++) { + if (gUnknown_02024A72[i] == slot) { + break; + } + } + return i; } bool8 sub_8078874(u8 slot) { - if (IsContest()) { - if (gBattleAnimPlayerMonIndex == slot) { - return TRUE; - } - if (gBattleAnimEnemyMonIndex == slot) { - return TRUE; - } - return FALSE; - } else { - if (gUnknown_02024A72[slot] == 0xff) { - return FALSE; - } - if (battle_side_get_owner(slot)) { - if (GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) { - return TRUE; - } - } else { - if (GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) { - return TRUE; - } - } - return FALSE; - } + if (IsContest()) { + if (gBattleAnimPlayerMonIndex == slot) { + return TRUE; + } + if (gBattleAnimEnemyMonIndex == slot) { + return TRUE; + } + return FALSE; + } else { + if (gUnknown_02024A72[slot] == 0xff) { + return FALSE; + } + if (battle_side_get_owner(slot)) { + if (GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) { + return TRUE; + } + } else { + if (GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_HP) != 0) { + return TRUE; + } + } + return FALSE; + } } bool8 IsDoubleBattle() { - return IS_DOUBLE_BATTLE(); + return IS_DOUBLE_BATTLE(); } void sub_8078914(struct Struct_sub_8078914 *unk) { - if (IsContest()) { - unk->field_0 = (u8 *)0x6008000; - unk->field_4 = (u8 *)0x600f000; - unk->field_8 = 0xe; - } else { - unk->field_0 = (u8 *)0x6004000; - unk->field_4 = (u8 *)0x600e000; - unk->field_8 = 0x8; - } + if (IsContest()) { + unk->field_0 = (u8 *)0x6008000; + unk->field_4 = (u8 *)0x600f000; + unk->field_8 = 0xe; + } else { + unk->field_0 = (u8 *)0x6004000; + unk->field_4 = (u8 *)0x600e000; + unk->field_8 = 0x8; + } } void sub_8078954(struct Struct_sub_8078914 *unk) { - if (IsContest()) { - unk->field_0 = (u8 *)0x6008000; - unk->field_4 = (u8 *)0x600f000; - unk->field_8 = 0xe; - } else if (battle_get_per_side_status_permutated(gBattleAnimPlayerMonIndex) == 1) { - unk->field_0 = (u8 *)0x6004000; - unk->field_4 = (u8 *)0x600e000; - unk->field_8 = 0x8; - } else { - unk->field_0 = (u8 *)0x6006000; - unk->field_4 = (u8 *)0x600f000; - unk->field_8 = 0x9; - } + if (IsContest()) { + unk->field_0 = (u8 *)0x6008000; + unk->field_4 = (u8 *)0x600f000; + unk->field_8 = 0xe; + } else if (battle_get_per_side_status_permutated(gBattleAnimPlayerMonIndex) == 1) { + unk->field_0 = (u8 *)0x6004000; + unk->field_4 = (u8 *)0x600e000; + unk->field_8 = 0x8; + } else { + unk->field_0 = (u8 *)0x6006000; + unk->field_4 = (u8 *)0x600f000; + unk->field_8 = 0x9; + } } u8 sub_80789BC() { - if (IsContest()) { - return 1; - } - return 2; + if (IsContest()) { + return 1; + } + return 2; } void sub_80789D4(bool8 a1) { - if (!a1) { - BG3CNT.size = 0; - BG3CNT.overflow = 1; - } else if (IsContest()) { - BG3CNT.size = 0; - BG3CNT.overflow = 1; - } else { - BG3CNT.size = 1; - BG3CNT.overflow = 0; - } + if (!a1) { + BG3CNT.size = 0; + BG3CNT.overflow = 1; + } else if (IsContest()) { + BG3CNT.size = 0; + BG3CNT.overflow = 1; + } else { + BG3CNT.size = 1; + BG3CNT.overflow = 0; + } } void sub_8078A34(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; - sub_8078A5C(sprite); - sprite->callback = sub_80783D0; - sprite->callback(sprite); + sprite->data1 = sprite->pos1.x; + sprite->data3 = sprite->pos1.y; + sub_8078A5C(sprite); + sprite->callback = sub_80783D0; + sprite->callback(sprite); } void sub_8078A5C(struct Sprite *sprite) { - s16 x = (sprite->data2 - sprite->data1) << 8; - s16 y = (sprite->data4 - sprite->data3) << 8; - sprite->data1 = x / sprite->data0; - sprite->data2 = y / sprite->data0; - sprite->data4 = 0; - sprite->data3 = 0; + s16 x = (sprite->data2 - sprite->data1) << 8; + s16 y = (sprite->data4 - sprite->data3) << 8; + sprite->data1 = x / sprite->data0; + sprite->data2 = y / sprite->data0; + sprite->data4 = 0; + sprite->data3 = 0; } void obj_translate_based_on_private_1_2_3_4(struct Sprite *sprite) { - int x = sprite->data2 - sprite->data1; - int y = sprite->data4 - sprite->data3; - bool8 r8 = x < 0; - bool8 r9 = y < 0; - u16 x2 = abs(x) << 8; - u16 y2 = abs(y) << 8; - x2 = x2 / sprite->data0; - y2 = y2 / sprite->data0; - if (r8) { - x2 |= 1; - } else { - x2 &= ~1; - } - if (r9) { - y2 |= 1; - } else { - y2 &= ~1; - } - sprite->data1 = x2; - sprite->data2 = y2; - sprite->data4 = 0; - sprite->data3 = 0; + int x = sprite->data2 - sprite->data1; + int y = sprite->data4 - sprite->data3; + bool8 r8 = x < 0; + bool8 r9 = y < 0; + u16 x2 = abs(x) << 8; + u16 y2 = abs(y) << 8; + x2 = x2 / sprite->data0; + y2 = y2 / sprite->data0; + if (r8) { + x2 |= 1; + } else { + x2 &= ~1; + } + if (r9) { + y2 |= 1; + } else { + y2 &= ~1; + } + sprite->data1 = x2; + sprite->data2 = y2; + sprite->data4 = 0; + sprite->data3 = 0; } void sub_8078B34(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; - obj_translate_based_on_private_1_2_3_4(sprite); - sprite->callback = sub_8078BB8; - sprite->callback(sprite); + sprite->data1 = sprite->pos1.x; + sprite->data3 = sprite->pos1.y; + obj_translate_based_on_private_1_2_3_4(sprite); + sprite->callback = sub_8078BB8; + sprite->callback(sprite); } bool8 sub_8078B5C(struct Sprite *sprite) { - u16 v1, v2, x, y; - if (!sprite->data0) { - return TRUE; - } - v1 = sprite->data1; - v2 = sprite->data2; - x = sprite->data3; - y = sprite->data4; - x += v1; - y += v2; - if (v1 & 1) { - sprite->pos2.x = -(x >> 8); - } else { - sprite->pos2.x = x >> 8; - } - if (v2 & 1) { - sprite->pos2.y = -(y >> 8); - } else { - sprite->pos2.y = y >> 8; - } - sprite->data3 = x; - sprite->data4 = y; - sprite->data0--; - return FALSE; + u16 v1, v2, x, y; + if (!sprite->data0) { + return TRUE; + } + v1 = sprite->data1; + v2 = sprite->data2; + x = sprite->data3; + y = sprite->data4; + x += v1; + y += v2; + if (v1 & 1) { + sprite->pos2.x = -(x >> 8); + } else { + sprite->pos2.x = x >> 8; + } + if (v2 & 1) { + sprite->pos2.y = -(y >> 8); + } else { + sprite->pos2.y = y >> 8; + } + sprite->data3 = x; + sprite->data4 = y; + sprite->data0--; + return FALSE; } void sub_8078BB8(struct Sprite *sprite) { - if (sub_8078B5C(sprite)) { - sub_8078104(sprite); - } + if (sub_8078B5C(sprite)) { + sub_8078104(sprite); + } } void sub_8078BD4(struct Sprite *sprite) { - int v1 = abs(sprite->data2 - sprite->data1) << 8; - sprite->data0 = v1 / sprite->data0; - obj_translate_based_on_private_1_2_3_4(sprite); + int v1 = abs(sprite->data2 - sprite->data1) << 8; + sprite->data0 = v1 / sprite->data0; + obj_translate_based_on_private_1_2_3_4(sprite); } void sub_8078C00(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; - sub_8078BD4(sprite); - sprite->callback = sub_8078BB8; - sprite->callback(sprite); + sprite->data1 = sprite->pos1.x; + sprite->data3 = sprite->pos1.y; + sub_8078BD4(sprite); + sprite->callback = sub_8078BB8; + sprite->callback(sprite); } void sub_8078C28(struct Sprite *sprite) { - int x = sprite->data2 - sprite->data1; - int y = sprite->data4 - sprite->data3; - bool8 x_sign = x < 0; - bool8 y_sign = y < 0; - u16 x2 = abs(x) << 4; - u16 y2 = abs(y) << 4; - x2 /= sprite->data0; - y2 /= sprite->data0; - if (x_sign) { - x2 |= 1; - } else { - x2 &= ~1; - } - if (y_sign) { - y2 |= 1; - } else { - y2 &= ~1; - } - sprite->data1 = x2; - sprite->data2 = y2; - sprite->data4 = 0; - sprite->data3 = 0; + int x = sprite->data2 - sprite->data1; + int y = sprite->data4 - sprite->data3; + bool8 x_sign = x < 0; + bool8 y_sign = y < 0; + u16 x2 = abs(x) << 4; + u16 y2 = abs(y) << 4; + x2 /= sprite->data0; + y2 /= sprite->data0; + if (x_sign) { + x2 |= 1; + } else { + x2 &= ~1; + } + if (y_sign) { + y2 |= 1; + } else { + y2 &= ~1; + } + sprite->data1 = x2; + sprite->data2 = y2; + sprite->data4 = 0; + sprite->data3 = 0; } void sub_8078CC0(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; - sub_8078C28(sprite); - sprite->callback = sub_8078D44; - sprite->callback(sprite); + sprite->data1 = sprite->pos1.x; + sprite->data3 = sprite->pos1.y; + sub_8078C28(sprite); + sprite->callback = sub_8078D44; + sprite->callback(sprite); } bool8 sub_8078CE8(struct Sprite *sprite) { - u16 v1, v2, x, y; - if (!sprite->data0) { - return TRUE; - } - v1 = sprite->data1; - v2 = sprite->data2; - x = sprite->data3; - y = sprite->data4; - x += v1; - y += v2; - if (v1 & 1) { - sprite->pos2.x = -(x >> 4); - } else { - sprite->pos2.x = x >> 4; - } - if (v2 & 1) { - sprite->pos2.y = -(y >> 4); - } else { - sprite->pos2.y = y >> 4; - } - sprite->data3 = x; - sprite->data4 = y; - sprite->data0--; - return FALSE; + u16 v1, v2, x, y; + if (!sprite->data0) { + return TRUE; + } + v1 = sprite->data1; + v2 = sprite->data2; + x = sprite->data3; + y = sprite->data4; + x += v1; + y += v2; + if (v1 & 1) { + sprite->pos2.x = -(x >> 4); + } else { + sprite->pos2.x = x >> 4; + } + if (v2 & 1) { + sprite->pos2.y = -(y >> 4); + } else { + sprite->pos2.y = y >> 4; + } + sprite->data3 = x; + sprite->data4 = y; + sprite->data0--; + return FALSE; } void sub_8078D44(struct Sprite *sprite) { - if (sub_8078CE8(sprite)) { - sub_8078104(sprite); - } + if (sub_8078CE8(sprite)) { + sub_8078104(sprite); + } } void sub_8078D60(struct Sprite *sprite) { - int v1 = abs(sprite->data2 - sprite->data1) << 4; - sprite->data0 = v1 / sprite->data0; - sub_8078C28(sprite); + int v1 = abs(sprite->data2 - sprite->data1) << 4; + sprite->data0 = v1 / sprite->data0; + sub_8078C28(sprite); } void sub_8078D8C(struct Sprite *sprite) { - sprite->data1 = sprite->pos1.x; - sprite->data3 = sprite->pos1.y; - sub_8078D60(sprite); - sprite->callback = sub_8078D44; - sprite->callback(sprite); + sprite->data1 = sprite->pos1.x; + sprite->data3 = sprite->pos1.y; + sub_8078D60(sprite); + sprite->callback = sub_8078D44; + sprite->callback(sprite); } void obj_id_set_rotscale(u8 sprite, s16 xScale, s16 yScale, u16 rotation) { - int i; - struct ObjAffineSrcData src; - struct OamMatrix matrix; - src.xScale = xScale; - src.yScale = yScale; - src.rotation = rotation; - if (sub_8078E38()) { - src.xScale = -src.xScale; - } - i = gSprites[sprite].oam.matrixNum; - ObjAffineSet(&src, &matrix, 1, 2); - gOamMatrices[i].a = matrix.a; - gOamMatrices[i].b = matrix.b; - gOamMatrices[i].c = matrix.c; - gOamMatrices[i].d = matrix.d; + int i; + struct ObjAffineSrcData src; + struct OamMatrix matrix; + src.xScale = xScale; + src.yScale = yScale; + src.rotation = rotation; + if (sub_8078E38()) { + src.xScale = -src.xScale; + } + i = gSprites[sprite].oam.matrixNum; + ObjAffineSet(&src, &matrix, 1, 2); + gOamMatrices[i].a = matrix.a; + gOamMatrices[i].b = matrix.b; + gOamMatrices[i].c = matrix.c; + gOamMatrices[i].d = matrix.d; } bool8 sub_8078E38() { - if (IsContest()) { - if (gSprites[obj_id_for_side_relative_to_move(0)].data2 == 0xc9 /* XXX SPECIES_UNOWN? */) { - return FALSE; - } - return TRUE; - } - return FALSE; + if (IsContest()) { + if (gSprites[obj_id_for_side_relative_to_move(0)].data2 == 0xc9 /* XXX SPECIES_UNOWN? */) { + return FALSE; + } + return TRUE; + } + return FALSE; } void sub_8078E70(u8 sprite, u8 a2) { - struct Struct_2017810 *unk; - u8 r7 = gSprites[sprite].data0; - if (IsContest() || b_side_obj__get_some_boolean(r7)) { - gSprites[sprite].invisible = FALSE; - } - gSprites[sprite].oam.objMode = a2; - gSprites[sprite].affineAnimPaused = TRUE; - if (!IsContest() && !gSprites[sprite].oam.affineMode) { - unk = &unk_2017810[r7]; - gSprites[sprite].oam.matrixNum = unk->field_6; - } - gSprites[sprite].oam.affineMode = 3; - CalcCenterToCornerVec(&gSprites[sprite], gSprites[sprite].oam.shape, gSprites[sprite].oam.size, gSprites[sprite].oam.affineMode); + struct Struct_2017810 *unk; + u8 r7 = gSprites[sprite].data0; + if (IsContest() || b_side_obj__get_some_boolean(r7)) { + gSprites[sprite].invisible = FALSE; + } + gSprites[sprite].oam.objMode = a2; + gSprites[sprite].affineAnimPaused = TRUE; + if (!IsContest() && !gSprites[sprite].oam.affineMode) { + unk = &unk_2017810[r7]; + gSprites[sprite].oam.matrixNum = unk->field_6; + } + gSprites[sprite].oam.affineMode = 3; + CalcCenterToCornerVec(&gSprites[sprite], gSprites[sprite].oam.shape, gSprites[sprite].oam.size, gSprites[sprite].oam.affineMode); } void sub_8078F40(u8 sprite) { - obj_id_set_rotscale(sprite, 0x100, 0x100, 0); - gSprites[sprite].oam.affineMode = 1; - gSprites[sprite].oam.objMode = 0; - gSprites[sprite].affineAnimPaused = FALSE; - CalcCenterToCornerVec(&gSprites[sprite], gSprites[sprite].oam.shape, gSprites[sprite].oam.size, gSprites[sprite].oam.affineMode); + obj_id_set_rotscale(sprite, 0x100, 0x100, 0); + gSprites[sprite].oam.affineMode = 1; + gSprites[sprite].oam.objMode = 0; + gSprites[sprite].affineAnimPaused = FALSE; + CalcCenterToCornerVec(&gSprites[sprite], gSprites[sprite].oam.shape, gSprites[sprite].oam.size, gSprites[sprite].oam.affineMode); } void sub_8078F9C(u8 sprite) { - u16 matrix = gSprites[sprite].oam.matrixNum; - s16 c = gOamMatrices[matrix].c; - if (c < 0) { - c = -c; - } - gSprites[sprite].pos2.y = c >> 3; + u16 matrix = gSprites[sprite].oam.matrixNum; + s16 c = gOamMatrices[matrix].c; + if (c < 0) { + c = -c; + } + gSprites[sprite].pos2.y = c >> 3; } // related to obj_id_set_rotscale void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation) { - int i; - struct ObjAffineSrcData src; - struct OamMatrix matrix; - if (sprite->oam.affineMode & 1) { - sprite->affineAnimPaused = TRUE; - if (a2) { - CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); - } - src.xScale = xScale; - src.yScale = yScale; - src.rotation = rotation; - if (sub_8078E38()) { - src.xScale = -src.xScale; - } - i = sprite->oam.matrixNum; - ObjAffineSet(&src, &matrix, 1, 2); - gOamMatrices[i].a = matrix.a; - gOamMatrices[i].b = matrix.b; - gOamMatrices[i].c = matrix.c; - gOamMatrices[i].d = matrix.d; - } + int i; + struct ObjAffineSrcData src; + struct OamMatrix matrix; + if (sprite->oam.affineMode & 1) { + sprite->affineAnimPaused = TRUE; + if (a2) { + CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); + } + src.xScale = xScale; + src.yScale = yScale; + src.rotation = rotation; + if (sub_8078E38()) { + src.xScale = -src.xScale; + } + i = sprite->oam.matrixNum; + ObjAffineSet(&src, &matrix, 1, 2); + gOamMatrices[i].a = matrix.a; + gOamMatrices[i].b = matrix.b; + gOamMatrices[i].c = matrix.c; + gOamMatrices[i].d = matrix.d; + } } void sub_8079098(struct Sprite *sprite) { - sub_8078FDC(sprite, TRUE, 0x100, 0x100, 0); - sprite->affineAnimPaused = FALSE; - CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); + sub_8078FDC(sprite, TRUE, 0x100, 0x100, 0); + sprite->affineAnimPaused = FALSE; + CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); } u16 sub_80790D8(s16 a, s16 b) { - return ArcTan2(a, b); + return ArcTan2(a, b); } u16 sub_80790F0(s16 a, s16 b) { - u16 var = sub_80790D8(a, b); - return -var; + u16 var = sub_80790D8(a, b); + return -var; } void sub_8079108(u16 a1, bool8 a2) { - int i; - struct Color *c; - struct Color *c2; - u16 average; + int i; + struct Color *c; + struct Color *c2; + u16 average; - a1 *= 0x10; + a1 *= 0x10; - if (!a2) { - for (i = 0; i < 0x10; i++) { - c = (struct Color *)&gPlttBufferUnfaded[a1 + i]; - average = c->r + c->g + c->b; - average /= 3; + if (!a2) { + for (i = 0; i < 0x10; i++) { + c = (struct Color *)&gPlttBufferUnfaded[a1 + i]; + average = c->r + c->g + c->b; + average /= 3; - c2 = (struct Color *)&gPlttBufferFaded[a1 + i]; - c2->r = average; - c2->g = average; - c2->b = average; - } - } else { - CpuCopy32(&gPlttBufferUnfaded[a1], &gPlttBufferFaded[a1], 0x20); - } + c2 = (struct Color *)&gPlttBufferFaded[a1 + i]; + c2->r = average; + c2->g = average; + c2->b = average; + } + } else { + CpuCopy32(&gPlttBufferUnfaded[a1], &gPlttBufferFaded[a1], 0x20); + } } u32 sub_80791A8(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7) { - u32 var = 0; - u32 shift; - if (a1) { - if (!IsContest()) { - var = 0xe; - } else { - var = 1 << sub_80789BC(); - } - } - if (a2) { - shift = gBattleAnimPlayerMonIndex + 16; - var |= 1 << shift; - } - if (a3) { - shift = gBattleAnimEnemyMonIndex + 16; - var |= 1 << shift; - } - if (a4) { - if (b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2)) { - shift = (gBattleAnimPlayerMonIndex ^ 2) + 16; - var |= 1 << shift; - } - } - if (a5) { - if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) { - shift = (gBattleAnimEnemyMonIndex ^ 2) + 16; - var |= 1 << shift; - } - } - if (a6) { - if (!IsContest()) { - var |= 0x100; - } else { - var |= 0x4000; - } - } - if (a7) { - if (!IsContest()) { - var |= 0x200; - } - } - return var; + u32 var = 0; + u32 shift; + if (a1) { + if (!IsContest()) { + var = 0xe; + } else { + var = 1 << sub_80789BC(); + } + } + if (a2) { + shift = gBattleAnimPlayerMonIndex + 16; + var |= 1 << shift; + } + if (a3) { + shift = gBattleAnimEnemyMonIndex + 16; + var |= 1 << shift; + } + if (a4) { + if (b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2)) { + shift = (gBattleAnimPlayerMonIndex ^ 2) + 16; + var |= 1 << shift; + } + } + if (a5) { + if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) { + shift = (gBattleAnimEnemyMonIndex ^ 2) + 16; + var |= 1 << shift; + } + } + if (a6) { + if (!IsContest()) { + var |= 0x100; + } else { + var |= 0x4000; + } + } + if (a7) { + if (!IsContest()) { + var |= 0x200; + } + } + return var; } u32 sub_80792C0(u8 a1, u8 a2, u8 a3, u8 a4) { - u32 var = 0; - u32 shift; - if (IsContest()) { - if (a1) { - var |= 1 << 18; - return var; - } - } else { - if (a1) { - if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(0))) { - var |= 1 << (battle_get_side_with_given_state(0) + 16); - } - } - if (a2) { - if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(2))) { - shift = battle_get_side_with_given_state(2) + 16; - var |= 1 << shift; - } - } - if (a3) { - if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(1))) { - shift = battle_get_side_with_given_state(1) + 16; - var |= 1 << shift; - } - } - if (a4) { - if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(3))) { - shift = battle_get_side_with_given_state(3) + 16; - var |= 1 << shift; - } - } - } - return var; + u32 var = 0; + u32 shift; + if (IsContest()) { + if (a1) { + var |= 1 << 18; + return var; + } + } else { + if (a1) { + if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(0))) { + var |= 1 << (battle_get_side_with_given_state(0) + 16); + } + } + if (a2) { + if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(2))) { + shift = battle_get_side_with_given_state(2) + 16; + var |= 1 << shift; + } + } + if (a3) { + if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(1))) { + shift = battle_get_side_with_given_state(1) + 16; + var |= 1 << shift; + } + } + if (a4) { + if (b_side_obj__get_some_boolean(battle_get_side_with_given_state(3))) { + shift = battle_get_side_with_given_state(3) + 16; + var |= 1 << shift; + } + } + } + return var; } u8 sub_80793A8(u8 a1) { - return a1; + return a1; } u8 unref_sub_80793B0(u8 a1) { - return battle_get_side_with_given_state(a1); + return battle_get_side_with_given_state(a1); } void sub_80793C4(struct Sprite *sprite) { - bool8 var; - if (!sprite->data0) { - if (!gBattleAnimArgs[3]) { - var = TRUE; - } else { - var = FALSE; - } - if (!gBattleAnimArgs[2]) { - sub_80787B0(sprite, var); - } else { - sub_8078764(sprite, var); - } - sprite->data0++; - - } else if (sprite->animEnded || sprite->affineAnimEnded) { - move_anim_8074EE0(sprite); - } + bool8 var; + if (!sprite->data0) { + if (!gBattleAnimArgs[3]) { + var = TRUE; + } else { + var = FALSE; + } + if (!gBattleAnimArgs[2]) { + sub_80787B0(sprite, var); + } else { + sub_8078764(sprite, var); + } + sprite->data0++; + + } else if (sprite->animEnded || sprite->affineAnimEnded) { + move_anim_8074EE0(sprite); + } } void sub_807941C(struct Sprite *sprite) { - bool8 v1; - u8 v2; - if (!(gBattleAnimArgs[5] & 0xff00)) { - v1 = TRUE; - } else { - v1 = FALSE; - } - if (!(gBattleAnimArgs[5] & 0xff)) { - v2 = 3; - } else { - v2 = 1; - } - sub_80787B0(sprite, v1); - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { - gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - } - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, v2) + gBattleAnimArgs[3]; - sprite->callback = sub_8078B34; - oamt_set_x3A_32(sprite, move_anim_8072740); + bool8 v1; + u8 v2; + if (!(gBattleAnimArgs[5] & 0xff00)) { + v1 = TRUE; + } else { + v1 = FALSE; + } + if (!(gBattleAnimArgs[5] & 0xff)) { + v2 = 3; + } else { + v2 = 1; + } + sub_80787B0(sprite, v1); + if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + } + sprite->data0 = gBattleAnimArgs[4]; + sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2) + gBattleAnimArgs[2]; + sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, v2) + gBattleAnimArgs[3]; + sprite->callback = sub_8078B34; + oamt_set_x3A_32(sprite, move_anim_8072740); } void sub_80794A8(struct Sprite *sprite) { - sub_80787B0(sprite, 1); - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { - gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - } - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3) + gBattleAnimArgs[3]; - sprite->data5 = gBattleAnimArgs[5]; - sub_80786EC(sprite); - sprite->callback = sub_8079518; + sub_80787B0(sprite, 1); + if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + } + sprite->data0 = gBattleAnimArgs[4]; + sprite->data2 = sub_8077ABC(gBattleAnimEnemyMonIndex, 2) + gBattleAnimArgs[2]; + sprite->data4 = sub_8077ABC(gBattleAnimEnemyMonIndex, 3) + gBattleAnimArgs[3]; + sprite->data5 = gBattleAnimArgs[5]; + sub_80786EC(sprite); + sprite->callback = sub_8079518; } void sub_8079518(struct Sprite *sprite) { - if (sub_8078718(sprite)) { - move_anim_8072740(sprite); - } + if (sub_8078718(sprite)) { + move_anim_8072740(sprite); + } } void sub_8079534(struct Sprite *sprite) { - u8 r4, slot, r7; - if (!gBattleAnimArgs[6]) { - r4 = 1; - r7 = 3; - } else { - r4 = 0; - r7 = 1; - } - if (!gBattleAnimArgs[5]) { - sub_80787B0(sprite, r4); - slot = gBattleAnimPlayerMonIndex; - } else { - sub_8078764(sprite, r4); - slot = gBattleAnimEnemyMonIndex; - } - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { - gBattleAnimArgs[2] = -gBattleAnimArgs[2]; - } - sub_8078764(sprite, r4); - sprite->data0 = gBattleAnimArgs[4]; - sprite->data2 = sub_8077ABC(slot, 2) + gBattleAnimArgs[2]; - sprite->data4 = sub_8077ABC(slot, r7) + gBattleAnimArgs[3]; - sprite->callback = sub_8078B34; - oamt_set_x3A_32(sprite, move_anim_8072740); + u8 r4, slot, r7; + if (!gBattleAnimArgs[6]) { + r4 = 1; + r7 = 3; + } else { + r4 = 0; + r7 = 1; + } + if (!gBattleAnimArgs[5]) { + sub_80787B0(sprite, r4); + slot = gBattleAnimPlayerMonIndex; + } else { + sub_8078764(sprite, r4); + slot = gBattleAnimEnemyMonIndex; + } + if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + gBattleAnimArgs[2] = -gBattleAnimArgs[2]; + } + sub_8078764(sprite, r4); + sprite->data0 = gBattleAnimArgs[4]; + sprite->data2 = sub_8077ABC(slot, 2) + gBattleAnimArgs[2]; + sprite->data4 = sub_8077ABC(slot, r7) + gBattleAnimArgs[3]; + sprite->callback = sub_8078B34; + oamt_set_x3A_32(sprite, move_anim_8072740); } s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8 a1) { - u16 i; - u8 sprite = obj_id_for_side_relative_to_move(a1); - if (sprite != 0xff) { - for (i = 0; i < 0x40; i++) { - if (gSprites[i].inUse) { - continue; - } - gSprites[i] = gSprites[sprite]; - gSprites[i].oam.objMode = 1; - gSprites[i].invisible = FALSE; - return i; - } - } - return -1; + u16 i; + u8 sprite = obj_id_for_side_relative_to_move(a1); + if (sprite != 0xff) { + for (i = 0; i < 0x40; i++) { + if (gSprites[i].inUse) { + continue; + } + gSprites[i] = gSprites[sprite]; + gSprites[i].oam.objMode = 1; + gSprites[i].invisible = FALSE; + return i; + } + } + return -1; } void obj_delete_but_dont_free_vram(struct Sprite *sprite) { - sprite->usingSheet = TRUE; - DestroySprite(sprite); + sprite->usingSheet = TRUE; + DestroySprite(sprite); } void sub_8079670(u8 task) { - s16 v1 = 0; - s16 v2 = 0; - if (gBattleAnimArgs[2] > gBattleAnimArgs[0]) { - v2 = 1; - } - if (gBattleAnimArgs[2] < gBattleAnimArgs[0]) { - v2 = -1; - } - if (gBattleAnimArgs[3] > gBattleAnimArgs[1]) { - v1 = 1; - } - if (gBattleAnimArgs[3] < gBattleAnimArgs[1]) { - v1 = -1; - } - gTasks[task].data[0] = 0; - gTasks[task].data[1] = gBattleAnimArgs[4]; - gTasks[task].data[2] = 0; - gTasks[task].data[3] = gBattleAnimArgs[0]; - gTasks[task].data[4] = gBattleAnimArgs[1]; - gTasks[task].data[5] = v2; - gTasks[task].data[6] = v1; - gTasks[task].data[7] = gBattleAnimArgs[2]; - gTasks[task].data[8] = gBattleAnimArgs[3]; - REG_BLDALPHA = (gBattleAnimArgs[1] << 8) | gBattleAnimArgs[0]; - gTasks[task].func = sub_80796F8; + s16 v1 = 0; + s16 v2 = 0; + if (gBattleAnimArgs[2] > gBattleAnimArgs[0]) { + v2 = 1; + } + if (gBattleAnimArgs[2] < gBattleAnimArgs[0]) { + v2 = -1; + } + if (gBattleAnimArgs[3] > gBattleAnimArgs[1]) { + v1 = 1; + } + if (gBattleAnimArgs[3] < gBattleAnimArgs[1]) { + v1 = -1; + } + gTasks[task].data[0] = 0; + gTasks[task].data[1] = gBattleAnimArgs[4]; + gTasks[task].data[2] = 0; + gTasks[task].data[3] = gBattleAnimArgs[0]; + gTasks[task].data[4] = gBattleAnimArgs[1]; + gTasks[task].data[5] = v2; + gTasks[task].data[6] = v1; + gTasks[task].data[7] = gBattleAnimArgs[2]; + gTasks[task].data[8] = gBattleAnimArgs[3]; + REG_BLDALPHA = (gBattleAnimArgs[1] << 8) | gBattleAnimArgs[0]; + gTasks[task].func = sub_80796F8; } void sub_80796F8(u8 taskId) { - struct Task *task = &gTasks[taskId]; - if (++task->data[0] > task->data[1]) { - task->data[0] = 0; - if (++task->data[2] & 1) { - if (task->data[3] != task->data[7]) { - task->data[3] += task->data[5]; - } - } else { - if (task->data[4] != task->data[8]) { - task->data[4] += task->data[6]; - } - } - REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; - if (task->data[3] == task->data[7] && task->data[4] == task->data[8]) { - DestroyAnimVisualTask(taskId); - return; - } - } + struct Task *task = &gTasks[taskId]; + if (++task->data[0] > task->data[1]) { + task->data[0] = 0; + if (++task->data[2] & 1) { + if (task->data[3] != task->data[7]) { + task->data[3] += task->data[5]; + } + } else { + if (task->data[4] != task->data[8]) { + task->data[4] += task->data[6]; + } + } + REG_BLDALPHA = (task->data[4] << 8) | task->data[3]; + if (task->data[3] == task->data[7] && task->data[4] == task->data[8]) { + DestroyAnimVisualTask(taskId); + return; + } + } } void sub_8079790(u8 task) { - u8 sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); - if (sprite == 0xff) { - DestroyAnimVisualTask(task); - return; - } - gTasks[task].data[0] = (gSprites[sprite].oam.paletteNum * 0x10) + 0x101; - sub_80797EC(&gTasks[task]); + u8 sprite = obj_id_for_side_relative_to_move(gBattleAnimArgs[0]); + if (sprite == 0xff) { + DestroyAnimVisualTask(task); + return; + } + gTasks[task].data[0] = (gSprites[sprite].oam.paletteNum * 0x10) + 0x101; + sub_80797EC(&gTasks[task]); } void sub_80797EC(struct Task *task) { - task->data[1] = gBattleAnimArgs[1]; - task->data[2] = 0; - task->data[3] = gBattleAnimArgs[2]; - task->data[4] = 0; - task->data[5] = gBattleAnimArgs[3]; - task->data[6] = 0; - task->data[7] = gBattleAnimArgs[4]; - task->func = sub_8079814; + task->data[1] = gBattleAnimArgs[1]; + task->data[2] = 0; + task->data[3] = gBattleAnimArgs[2]; + task->data[4] = 0; + task->data[5] = gBattleAnimArgs[3]; + task->data[6] = 0; + task->data[7] = gBattleAnimArgs[4]; + task->func = sub_8079814; } void sub_8079814(u8 taskId) { - struct Task *task = &gTasks[taskId]; - if (++task->data[4] >= task->data[5]) { - task->data[4] = 0; - if (!task->data[6]) { - task->data[2]++; - BlendPalette(task->data[0], 0xf, task->data[2], task->data[1]); - if (task->data[2] == task->data[3]) { - task->data[6] = 1; - } - } else { - task->data[2]--; - BlendPalette(task->data[0], 0xf, task->data[2], task->data[1]); - if (!task->data[2]) { - if (--task->data[7]) { - task->data[4] = 0; - task->data[6] = 0; - } else { - DestroyAnimVisualTask(taskId); - return; - } - } - } - } + struct Task *task = &gTasks[taskId]; + if (++task->data[4] >= task->data[5]) { + task->data[4] = 0; + if (!task->data[6]) { + task->data[2]++; + BlendPalette(task->data[0], 0xf, task->data[2], task->data[1]); + if (task->data[2] == task->data[3]) { + task->data[6] = 1; + } + } else { + task->data[2]--; + BlendPalette(task->data[0], 0xf, task->data[2], task->data[1]); + if (!task->data[2]) { + if (--task->data[7]) { + task->data[4] = 0; + task->data[6] = 0; + } else { + DestroyAnimVisualTask(taskId); + return; + } + } + } + } } void sub_80798AC(u8 task) { - u8 palette = IndexOfSpritePaletteTag(gBattleAnimArgs[0]); - if (palette == 0xff) { - DestroyAnimVisualTask(task); - return; - } - gTasks[task].data[0] = (palette * 0x10) + 0x101; - sub_80797EC(&gTasks[task]); + u8 palette = IndexOfSpritePaletteTag(gBattleAnimArgs[0]); + if (palette == 0xff) { + DestroyAnimVisualTask(task); + return; + } + gTasks[task].data[0] = (palette * 0x10) + 0x101; + sub_80797EC(&gTasks[task]); } void sub_80798F4(struct Task *task, u8 a2, void *a3) { - task->data[7] = 0; - task->data[8] = 0; - task->data[9] = 0; - task->data[15] = a2; - task->data[10] = 0x100; - task->data[11] = 0x100; - task->data[12] = 0; - sub_8079BF4(&task->data[13], &task->data[14], a3); - sub_8078E70(a2, 0); + task->data[7] = 0; + task->data[8] = 0; + task->data[9] = 0; + task->data[15] = a2; + task->data[10] = 0x100; + task->data[11] = 0x100; + task->data[12] = 0; + sub_8079BF4(&task->data[13], &task->data[14], a3); + sub_8078E70(a2, 0); } bool8 sub_807992C(struct Task *task) { - gUnknown_0202F7D4 = sub_8079BFC(task->data[13], task->data[14]) + (task->data[7] << 3); - switch (gUnknown_0202F7D4->type) { - default: - if (!gUnknown_0202F7D4->frame.duration) { - task->data[10] = gUnknown_0202F7D4->frame.xScale; - task->data[11] = gUnknown_0202F7D4->frame.yScale; - task->data[12] = gUnknown_0202F7D4->frame.rotation; - task->data[7]++; - gUnknown_0202F7D4++; - } - task->data[10] += gUnknown_0202F7D4->frame.xScale; - task->data[11] += gUnknown_0202F7D4->frame.yScale; - task->data[12] += gUnknown_0202F7D4->frame.rotation; - obj_id_set_rotscale(task->data[15], task->data[10], task->data[11], task->data[12]); - sub_8079A64(task->data[15]); - if (++task->data[8] >= gUnknown_0202F7D4->frame.duration) { - task->data[8] = 0; - task->data[7]++; - } - break; - - case AFFINEANIMCMDTYPE_JUMP: - task->data[7] = gUnknown_0202F7D4->jump.target; - break; - - case AFFINEANIMCMDTYPE_LOOP: - if (gUnknown_0202F7D4->loop.count) { - if (task->data[9]) { - if (!--task->data[9]) { - task->data[7]++; - break; - } - } else { - task->data[9] = gUnknown_0202F7D4->loop.count; - } - if (!task->data[7]) { - break; - } - for (;;) { - task->data[7]--; - gUnknown_0202F7D4--; - if (gUnknown_0202F7D4->type == AFFINEANIMCMDTYPE_LOOP) { - task->data[7]++; - return TRUE; - } - if (!task->data[7]) { - return TRUE; - } - } - } - task->data[7]++; - break; - - case 0x7fff: - gSprites[task->data[15]].pos2.y = 0; - sub_8078F40(task->data[15]); - return FALSE; - } - - return TRUE; + gUnknown_0202F7D4 = sub_8079BFC(task->data[13], task->data[14]) + (task->data[7] << 3); + switch (gUnknown_0202F7D4->type) { + default: + if (!gUnknown_0202F7D4->frame.duration) { + task->data[10] = gUnknown_0202F7D4->frame.xScale; + task->data[11] = gUnknown_0202F7D4->frame.yScale; + task->data[12] = gUnknown_0202F7D4->frame.rotation; + task->data[7]++; + gUnknown_0202F7D4++; + } + task->data[10] += gUnknown_0202F7D4->frame.xScale; + task->data[11] += gUnknown_0202F7D4->frame.yScale; + task->data[12] += gUnknown_0202F7D4->frame.rotation; + obj_id_set_rotscale(task->data[15], task->data[10], task->data[11], task->data[12]); + sub_8079A64(task->data[15]); + if (++task->data[8] >= gUnknown_0202F7D4->frame.duration) { + task->data[8] = 0; + task->data[7]++; + } + break; + + case AFFINEANIMCMDTYPE_JUMP: + task->data[7] = gUnknown_0202F7D4->jump.target; + break; + + case AFFINEANIMCMDTYPE_LOOP: + if (gUnknown_0202F7D4->loop.count) { + if (task->data[9]) { + if (!--task->data[9]) { + task->data[7]++; + break; + } + } else { + task->data[9] = gUnknown_0202F7D4->loop.count; + } + if (!task->data[7]) { + break; + } + for (;;) { + task->data[7]--; + gUnknown_0202F7D4--; + if (gUnknown_0202F7D4->type == AFFINEANIMCMDTYPE_LOOP) { + task->data[7]++; + return TRUE; + } + if (!task->data[7]) { + return TRUE; + } + } + } + task->data[7]++; + break; + + case 0x7fff: + gSprites[task->data[15]].pos2.y = 0; + sub_8078F40(task->data[15]); + return FALSE; + } + + return TRUE; } void sub_8079A64(u8 sprite) { - int var = 0x40 - sub_8079B10(sprite) * 2; - u16 matrix = gSprites[sprite].oam.matrixNum; - int var2 = (var << 8) / gOamMatrices[matrix].d; - if (var2 > 0x80) { - var2 = 0x80; - } - gSprites[sprite].pos2.y = (var - var2) / 2; + int var = 0x40 - sub_8079B10(sprite) * 2; + u16 matrix = gSprites[sprite].oam.matrixNum; + int var2 = (var << 8) / gOamMatrices[matrix].d; + if (var2 > 0x80) { + var2 = 0x80; + } + gSprites[sprite].pos2.y = (var - var2) / 2; } void sub_8079AB8(u8 sprite, u8 sprite2) { - int var = 0x40 - sub_8079B10(sprite2) * 2; - u16 matrix = gSprites[sprite].oam.matrixNum; - int var2 = (var << 8) / gOamMatrices[matrix].d; - if (var2 > 0x80) { - var2 = 0x80; - } - gSprites[sprite].pos2.y = (var - var2) / 2; + int var = 0x40 - sub_8079B10(sprite2) * 2; + u16 matrix = gSprites[sprite].oam.matrixNum; + int var2 = (var << 8) / gOamMatrices[matrix].d; + if (var2 > 0x80) { + var2 = 0x80; + } + gSprites[sprite].pos2.y = (var - var2) / 2; } u16 sub_8079B10(u8 sprite) { - struct TransformStatus *transform; - u8 slot = gSprites[sprite].data0; - u16 species; - u16 i; - for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) { - if (gBattleMonSprites[i] == sprite) { - if (IsContest()) { - species = unk_2019348.field_0; - return gMonBackPicCoords[species].y_offset; - } else { - if (!battle_side_get_owner(i)) { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES); - } else { - species = transform->species; - } - return gMonBackPicCoords[species].y_offset; - } else { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES); - } else { - species = transform->species; - } - return gMonFrontPicCoords[species].y_offset; - } - } - } - } - return 0x40; + struct TransformStatus *transform; + u8 slot = gSprites[sprite].data0; + u16 species; + u16 i; + for (i = 0; i < (sizeof(gBattleMonSprites) / sizeof(u8)); i++) { + if (gBattleMonSprites[i] == sprite) { + if (IsContest()) { + species = unk_2019348.field_0; + return gMonBackPicCoords[species].y_offset; + } else { + if (!battle_side_get_owner(i)) { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES); + } else { + species = transform->species; + } + return gMonBackPicCoords[species].y_offset; + } else { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES); + } else { + species = transform->species; + } + return gMonFrontPicCoords[species].y_offset; + } + } + } + } + return 0x40; } void sub_8079BF4(s16 *bottom, s16 *top, void *ptr) { - *bottom = ((intptr_t) ptr) & 0xffff; - *top = (((intptr_t) ptr) >> 16) & 0xffff; + *bottom = ((intptr_t) ptr) & 0xffff; + *top = (((intptr_t) ptr) >> 16) & 0xffff; } void *sub_8079BFC(s16 bottom, s16 top) { - return (void *)((u16)bottom | ((u16)top << 16)); + return (void *)((u16)bottom | ((u16)top << 16)); } // possible new file void sub_8079C08(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7) { - task->data[8] = a7; - task->data[15] = a2; - task->data[9] = a3; - task->data[10] = a4; - task->data[13] = a5; - task->data[14] = a6; - task->data[11] = (a5 - a3) / a7; - task->data[12] = (a6 - a4) / a7; + task->data[8] = a7; + task->data[15] = a2; + task->data[9] = a3; + task->data[10] = a4; + task->data[13] = a5; + task->data[14] = a6; + task->data[11] = (a5 - a3) / a7; + task->data[12] = (a6 - a4) / a7; } u8 sub_8079C74(struct Task *task) { - if (!task->data[8]) { - return 0; - } - if (--task->data[8]) { - task->data[9] += task->data[11]; - task->data[10] += task->data[12]; - } else { - task->data[9] = task->data[13]; - task->data[10] = task->data[14]; - } - obj_id_set_rotscale(task->data[15], task->data[9], task->data[10], 0); - if (task->data[8]) { - sub_8079A64(task->data[15]); - } else { - gSprites[task->data[15]].pos2.y = 0; - } - return task->data[8]; + if (!task->data[8]) { + return 0; + } + if (--task->data[8]) { + task->data[9] += task->data[11]; + task->data[10] += task->data[12]; + } else { + task->data[9] = task->data[13]; + task->data[10] = task->data[14]; + } + obj_id_set_rotscale(task->data[15], task->data[9], task->data[10], 0); + if (task->data[8]) { + sub_8079A64(task->data[15]); + } else { + gSprites[task->data[15]].pos2.y = 0; + } + return task->data[8]; } void sub_8079CEC(u8 task) { - u16 v1; - if (gUnknown_0202F7BE <= 30) { - v1 = 0; - } else if (gUnknown_0202F7BE <= 100) { - v1 = 1; - } else if (gUnknown_0202F7BE <= 200) { - v1 = 2; - } else { - v1 = 3; - } - gBattleAnimArgs[7] = v1; - DestroyAnimVisualTask(task); + u16 v1; + if (gUnknown_0202F7BE <= 30) { + v1 = 0; + } else if (gUnknown_0202F7BE <= 100) { + v1 = 1; + } else if (gUnknown_0202F7BE <= 200) { + v1 = 2; + } else { + v1 = 3; + } + gBattleAnimArgs[7] = v1; + DestroyAnimVisualTask(task); } void unref_sub_8079D20(u8 priority) { - if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex)) { - gSprites[gBattleMonSprites[gBattleAnimEnemyMonIndex]].oam.priority = priority; - } - if (b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex)) { - gSprites[gBattleMonSprites[gBattleAnimPlayerMonIndex]].oam.priority = priority; - } - if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) { - gSprites[gBattleMonSprites[gBattleAnimEnemyMonIndex ^ 2]].oam.priority = priority; - } - if (b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2)) { - gSprites[gBattleMonSprites[gBattleAnimPlayerMonIndex ^ 2]].oam.priority = priority; - } + if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex)) { + gSprites[gBattleMonSprites[gBattleAnimEnemyMonIndex]].oam.priority = priority; + } + if (b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex)) { + gSprites[gBattleMonSprites[gBattleAnimPlayerMonIndex]].oam.priority = priority; + } + if (b_side_obj__get_some_boolean(gBattleAnimEnemyMonIndex ^ 2)) { + gSprites[gBattleMonSprites[gBattleAnimEnemyMonIndex ^ 2]].oam.priority = priority; + } + if (b_side_obj__get_some_boolean(gBattleAnimPlayerMonIndex ^ 2)) { + gSprites[gBattleMonSprites[gBattleAnimPlayerMonIndex ^ 2]].oam.priority = priority; + } } void sub_8079E24() { - int i; - for (i = 0; i < gUnknown_02024A68; i++) { - if (b_side_obj__get_some_boolean(i)) { - gSprites[gBattleMonSprites[i]].subpriority = sub_8079E90(i); - gSprites[gBattleMonSprites[i]].oam.priority = 2; - } - } + int i; + for (i = 0; i < gUnknown_02024A68; i++) { + if (b_side_obj__get_some_boolean(i)) { + gSprites[gBattleMonSprites[i]].subpriority = sub_8079E90(i); + gSprites[gBattleMonSprites[i]].oam.priority = 2; + } + } } u8 sub_8079E90(u8 slot) { - u8 status; - u8 ret; - if (IsContest()) { - if (slot == 2) { - return 30; - } else { - return 40; - } - } else { - status = battle_get_per_side_status(slot); - if (status == 0) { - ret = 30; - } else if (status == 2) { - ret = 20; - } else if (status == 1) { - ret = 40; - } else { - ret = 50; - } - } - return ret; + u8 status; + u8 ret; + if (IsContest()) { + if (slot == 2) { + return 30; + } else { + return 40; + } + } else { + status = battle_get_per_side_status(slot); + if (status == 0) { + ret = 30; + } else if (status == 2) { + ret = 20; + } else if (status == 1) { + ret = 40; + } else { + ret = 50; + } + } + return ret; } u8 sub_8079ED4(u8 slot) { - u8 status = battle_get_per_side_status(slot); - if (IsContest()) { - return 2; - } - if (status == 0 || status == 3) { - return BG2CNT.priority; - } else { - return BG1CNT.priority; - } + u8 status = battle_get_per_side_status(slot); + if (IsContest()) { + return 2; + } + if (status == 0 || status == 3) { + return BG2CNT.priority; + } else { + return BG1CNT.priority; + } } u8 battle_get_per_side_status_permutated(u8 slot) { - u8 status; - if (!IsContest()) { - status = battle_get_per_side_status(slot); - if (status == 0 || status == 3) { - return 2; - } else { - return 1; - } - } - return 1; + u8 status; + if (!IsContest()) { + status = battle_get_per_side_status(slot); + if (status == 0 || status == 3) { + return 2; + } else { + return 1; + } + } + return 1; } u8 sub_8079F44(u16 species, u8 isBackpic, u8 a3, s16 a4, s16 a5, u8 a6, u32 a7, u32 a8) { - void *src; - void *dest; - int size; - - u8 sprite; - u16 sheet = LoadSpriteSheet(&gUnknown_0837F5E0[a3]); - u16 palette = AllocSpritePalette(gSpriteTemplate_837F5B0[a3].paletteTag); - if (!isBackpic) { - LoadCompressedPalette(species_and_otid_get_pal(species, a8, a7), (palette * 0x10) + 0x100, 0x20); - LoadSpecialPokePic( - &gMonFrontPicTable[species], - gMonFrontPicCoords[species].coords, - gMonFrontPicCoords[species].y_offset, - 0x2000000, - (void *)0x2000000, - species, - a7, - 1 - ); - } else { - LoadCompressedPalette( - species_and_otid_get_pal(species, a8, a7), (palette * 0x10) + 0x100, 0x20); - LoadSpecialPokePic( - &gMonBackPicTable[species], - gMonBackPicCoords[species].coords, - gMonBackPicCoords[species].y_offset, - 0x2000000, - (void *)0x2000000, - species, - a7, - 0 - ); - } - - src = (void *)0x2000000; - dest = (void *)(0x6010000 + (sheet * 0x20)); - size = 0x800; - DmaCopy32(3, src, dest, size); - - if (!isBackpic) { - sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonFrontPicCoords[species].y_offset, a6); - } else { - sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonBackPicCoords[species].y_offset, a6); - } - if (IsContest()) { - gSprites[sprite].affineAnims = &gSpriteAffineAnimTable_81E7C18; - StartSpriteAffineAnim(&gSprites[sprite], 0); - } - return sprite; + void *src; + void *dest; + int size; + + u8 sprite; + u16 sheet = LoadSpriteSheet(&gUnknown_0837F5E0[a3]); + u16 palette = AllocSpritePalette(gSpriteTemplate_837F5B0[a3].paletteTag); + if (!isBackpic) { + LoadCompressedPalette(species_and_otid_get_pal(species, a8, a7), (palette * 0x10) + 0x100, 0x20); + LoadSpecialPokePic( + &gMonFrontPicTable[species], + gMonFrontPicCoords[species].coords, + gMonFrontPicCoords[species].y_offset, + 0x2000000, + (void *)0x2000000, + species, + a7, + 1 + ); + } else { + LoadCompressedPalette( + species_and_otid_get_pal(species, a8, a7), (palette * 0x10) + 0x100, 0x20); + LoadSpecialPokePic( + &gMonBackPicTable[species], + gMonBackPicCoords[species].coords, + gMonBackPicCoords[species].y_offset, + 0x2000000, + (void *)0x2000000, + species, + a7, + 0 + ); + } + + src = (void *)0x2000000; + dest = (void *)(0x6010000 + (sheet * 0x20)); + size = 0x800; + DmaCopy32(3, src, dest, size); + + if (!isBackpic) { + sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonFrontPicCoords[species].y_offset, a6); + } else { + sprite = CreateSprite(&gSpriteTemplate_837F5B0[a3], a4, a5 + gMonBackPicCoords[species].y_offset, a6); + } + if (IsContest()) { + gSprites[sprite].affineAnims = &gSpriteAffineAnimTable_81E7C18; + StartSpriteAffineAnim(&gSprites[sprite], 0); + } + return sprite; } void sub_807A0F4(struct Sprite *sprite) { - DestroySpriteAndFreeResources(sprite); + DestroySpriteAndFreeResources(sprite); } int sub_807A100(u8 slot, u8 a2) { - u16 species; - u32 personality; - u16 letter; - u16 var; - int ret; - const struct MonCoords *coords; - struct TransformStatus *transform; - if (IsContest()) { - if (unk_2019348.field_4 & 1) { - species = unk_2019348.field_2; - personality = unk_2019348.field_10; - } else { - species = unk_2019348.field_0; - personality = unk_2019348.field_8; - } - if (species == SPECIES_UNOWN) { - letter = GET_UNOWN_LETTER(personality); - if (!letter) { - var = SPECIES_UNOWN; - } else { - var = letter + SPECIES_UNOWN_B - 1; - } - coords = &gMonBackPicCoords[var]; - } else if (species == SPECIES_CASTFORM) { - coords = &gCastformFrontSpriteCoords[gBattleMonForms[slot]]; - } else if (species <= SPECIES_EGG) { - coords = &gMonBackPicCoords[species]; - } else { - coords = &gMonBackPicCoords[0]; - } - } else { - if (!battle_side_get_owner(slot)) { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); - personality = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); - } else { - species = transform->species; - personality = gTransformPersonalities[slot]; - } - if (species == SPECIES_UNOWN) { - letter = GET_UNOWN_LETTER(personality); - if (!letter) { - var = SPECIES_UNOWN; - } else { - var = letter + SPECIES_UNOWN_B - 1; - } - coords = &gMonBackPicCoords[var]; - } else if (species > SPECIES_EGG) { - coords = &gMonBackPicCoords[0]; - } else { - coords = &gMonBackPicCoords[species]; - } - } else { - transform = &gTransformStatuses[slot]; - if (!transform->species) { - species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); - personality = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); - } else { - species = transform->species; - personality = gTransformPersonalities[slot]; - } - if (species == SPECIES_UNOWN) { - letter = GET_UNOWN_LETTER(personality); - if (!letter) { - var = SPECIES_UNOWN; - } else { - var = letter + SPECIES_UNOWN_B - 1; - } - coords = &gMonFrontPicCoords[var]; - } else if (species == SPECIES_CASTFORM) { - coords = &gCastformFrontSpriteCoords[gBattleMonForms[slot]]; - } else if (species > SPECIES_EGG) { - coords = &gMonFrontPicCoords[0]; - } else { - coords = &gMonFrontPicCoords[species]; - } - } - } - - switch (a2) { - case 0: - return (coords->coords & 0xf) * 8; - case 1: - return (coords->coords >> 4) * 8; - case 4: - return sub_8077ABC(slot, 2) - ((coords->coords >> 4) * 4); - case 5: - return sub_8077ABC(slot, 2) + ((coords->coords >> 4) * 4); - case 2: - return sub_8077ABC(slot, 3) - ((coords->coords & 0xf) * 4); - case 3: - return sub_8077ABC(slot, 3) + ((coords->coords & 0xf) * 4); - case 6: - ret = sub_8077ABC(slot, 1) + 0x1f; - return ret - coords->y_offset; - default: - return 0; - } + u16 species; + u32 personality; + u16 letter; + u16 var; + int ret; + const struct MonCoords *coords; + struct TransformStatus *transform; + if (IsContest()) { + if (unk_2019348.field_4 & 1) { + species = unk_2019348.field_2; + personality = unk_2019348.field_10; + } else { + species = unk_2019348.field_0; + personality = unk_2019348.field_8; + } + if (species == SPECIES_UNOWN) { + letter = GET_UNOWN_LETTER(personality); + if (!letter) { + var = SPECIES_UNOWN; + } else { + var = letter + SPECIES_UNOWN_B - 1; + } + coords = &gMonBackPicCoords[var]; + } else if (species == SPECIES_CASTFORM) { + coords = &gCastformFrontSpriteCoords[gBattleMonForms[slot]]; + } else if (species <= SPECIES_EGG) { + coords = &gMonBackPicCoords[species]; + } else { + coords = &gMonBackPicCoords[0]; + } + } else { + if (!battle_side_get_owner(slot)) { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); + personality = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); + } else { + species = transform->species; + personality = gTransformPersonalities[slot]; + } + if (species == SPECIES_UNOWN) { + letter = GET_UNOWN_LETTER(personality); + if (!letter) { + var = SPECIES_UNOWN; + } else { + var = letter + SPECIES_UNOWN_B - 1; + } + coords = &gMonBackPicCoords[var]; + } else if (species > SPECIES_EGG) { + coords = &gMonBackPicCoords[0]; + } else { + coords = &gMonBackPicCoords[species]; + } + } else { + transform = &gTransformStatuses[slot]; + if (!transform->species) { + species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES); + personality = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY); + } else { + species = transform->species; + personality = gTransformPersonalities[slot]; + } + if (species == SPECIES_UNOWN) { + letter = GET_UNOWN_LETTER(personality); + if (!letter) { + var = SPECIES_UNOWN; + } else { + var = letter + SPECIES_UNOWN_B - 1; + } + coords = &gMonFrontPicCoords[var]; + } else if (species == SPECIES_CASTFORM) { + coords = &gCastformFrontSpriteCoords[gBattleMonForms[slot]]; + } else if (species > SPECIES_EGG) { + coords = &gMonFrontPicCoords[0]; + } else { + coords = &gMonFrontPicCoords[species]; + } + } + } + + switch (a2) { + case 0: + return (coords->coords & 0xf) * 8; + case 1: + return (coords->coords >> 4) * 8; + case 4: + return sub_8077ABC(slot, 2) - ((coords->coords >> 4) * 4); + case 5: + return sub_8077ABC(slot, 2) + ((coords->coords >> 4) * 4); + case 2: + return sub_8077ABC(slot, 3) - ((coords->coords & 0xf) * 4); + case 3: + return sub_8077ABC(slot, 3) + ((coords->coords & 0xf) * 4); + case 6: + ret = sub_8077ABC(slot, 1) + 0x1f; + return ret - coords->y_offset; + default: + return 0; + } } void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) { - u8 v1, v2; - s16 v3, v4; - s16 v5, v6; - if (!a2) { - v1 = 0; - v2 = 1; - } else { - v1 = 2; - v2 = 3; - } - v3 = sub_8077ABC(slot, v1); - v4 = sub_8077ABC(slot, v2); - if (IsDoubleBattle() && !IsContest()) { - v5 = sub_8077ABC(slot ^ 2, v1); - v6 = sub_8077ABC(slot ^ 2, v2); - } else { - v5 = v3; - v6 = v4; - } - *a3 = (v3 + v5) / 2; - *a4 = (v4 + v6) / 2; + u8 v1, v2; + s16 v3, v4; + s16 v5, v6; + if (!a2) { + v1 = 0; + v2 = 1; + } else { + v1 = 2; + v2 = 3; + } + v3 = sub_8077ABC(slot, v1); + v4 = sub_8077ABC(slot, v2); + if (IsDoubleBattle() && !IsContest()) { + v5 = sub_8077ABC(slot ^ 2, v1); + v6 = sub_8077ABC(slot ^ 2, v2); + } else { + v5 = v3; + v6 = v4; + } + *a3 = (v3 + v5) / 2; + *a4 = (v4 + v6) / 2; } u8 sub_807A4A0(int a1, u8 sprite, int a3) { - u8 new_sprite = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); - gSprites[new_sprite] = gSprites[sprite]; - gSprites[new_sprite].usingSheet = TRUE; - gSprites[new_sprite].oam.priority = 0; - gSprites[new_sprite].oam.objMode = 2; - gSprites[new_sprite].oam.tileNum = gSprites[sprite].oam.tileNum; - gSprites[new_sprite].callback = SpriteCallbackDummy; - return new_sprite; + u8 new_sprite = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); + gSprites[new_sprite] = gSprites[sprite]; + gSprites[new_sprite].usingSheet = TRUE; + gSprites[new_sprite].oam.priority = 0; + gSprites[new_sprite].oam.objMode = 2; + gSprites[new_sprite].oam.tileNum = gSprites[sprite].oam.tileNum; + gSprites[new_sprite].callback = SpriteCallbackDummy; + return new_sprite; } void sub_807A544(struct Sprite *sprite) { - sub_8078650(sprite); - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { - sprite->pos1.x -= gBattleAnimArgs[0]; - gBattleAnimArgs[3] = -gBattleAnimArgs[3]; - sprite->hFlip = TRUE; - } else { - sprite->pos1.x += gBattleAnimArgs[0]; - } - sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[3]; - sprite->data3 = gBattleAnimArgs[4]; - sprite->data5 = gBattleAnimArgs[5]; - oamt_set_x3A_32(sprite, move_anim_8074EE0); - sprite->callback = sub_8078504; + sub_8078650(sprite); + if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + sprite->pos1.x -= gBattleAnimArgs[0]; + gBattleAnimArgs[3] = -gBattleAnimArgs[3]; + sprite->hFlip = TRUE; + } else { + sprite->pos1.x += gBattleAnimArgs[0]; + } + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data0 = gBattleAnimArgs[2]; + sprite->data1 = gBattleAnimArgs[3]; + sprite->data3 = gBattleAnimArgs[4]; + sprite->data5 = gBattleAnimArgs[5]; + oamt_set_x3A_32(sprite, move_anim_8074EE0); + sprite->callback = sub_8078504; } void sub_807A5C4(struct Sprite *sprite) { - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { - sprite->pos1.x -= gBattleAnimArgs[0]; - gBattleAnimArgs[3] *= -1; - } else { - sprite->pos1.x += gBattleAnimArgs[0]; - } - sprite->pos1.y += gBattleAnimArgs[1]; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data1 = gBattleAnimArgs[3]; - sprite->data3 = gBattleAnimArgs[4]; - sprite->data5 = gBattleAnimArgs[5]; - StartSpriteAnim(sprite, gBattleAnimArgs[6]); - oamt_set_x3A_32(sprite, move_anim_8074EE0); - sprite->callback = sub_8078504; + if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + sprite->pos1.x -= gBattleAnimArgs[0]; + gBattleAnimArgs[3] *= -1; + } else { + sprite->pos1.x += gBattleAnimArgs[0]; + } + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->data0 = gBattleAnimArgs[2]; + sprite->data1 = gBattleAnimArgs[3]; + sprite->data3 = gBattleAnimArgs[4]; + sprite->data5 = gBattleAnimArgs[5]; + StartSpriteAnim(sprite, gBattleAnimArgs[6]); + oamt_set_x3A_32(sprite, move_anim_8074EE0); + sprite->callback = sub_8078504; } void sub_807A63C(struct Sprite *sprite) { - sub_8078650(sprite); - if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { - sprite->pos1.x -= gBattleAnimArgs[0]; - } else { - sprite->pos1.x += gBattleAnimArgs[0]; - } - sprite->pos1.y += gBattleAnimArgs[1]; - sprite->callback = sub_8078600; - oamt_set_x3A_32(sprite, move_anim_8072740); + sub_8078650(sprite); + if (battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + sprite->pos1.x -= gBattleAnimArgs[0]; + } else { + sprite->pos1.x += gBattleAnimArgs[0]; + } + sprite->pos1.y += gBattleAnimArgs[1]; + sprite->callback = sub_8078600; + oamt_set_x3A_32(sprite, move_anim_8072740); } void sub_807A69C(u8 taskId) { - u16 src; - u16 dest; - struct Task *task = &gTasks[taskId]; - task->data[0] = obj_id_for_side_relative_to_move(0); - task->data[1] = (battle_side_get_owner(gBattleAnimPlayerMonIndex)) ? -8 : 8; - task->data[2] = 0; - task->data[3] = 0; - gSprites[task->data[0]].pos2.x -= task->data[0]; - task->data[4] = AllocSpritePalette(10097); - task->data[5] = 0; - - dest = (task->data[4] + 0x10) * 0x10; - src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10; - task->data[6] = sub_8079E90(gBattleAnimPlayerMonIndex); - if (task->data[6] == 20 || task->data[6] == 40) { - task->data[6] = 2; - } else { - task->data[6] = 3; - } - CpuCopy32(&gPlttBufferUnfaded[src], &gPlttBufferFaded[dest], 0x20); - BlendPalette(dest, 0x10, gBattleAnimArgs[1], gBattleAnimArgs[0]); - task->func = sub_807A784; + u16 src; + u16 dest; + struct Task *task = &gTasks[taskId]; + task->data[0] = obj_id_for_side_relative_to_move(0); + task->data[1] = (battle_side_get_owner(gBattleAnimPlayerMonIndex)) ? -8 : 8; + task->data[2] = 0; + task->data[3] = 0; + gSprites[task->data[0]].pos2.x -= task->data[0]; + task->data[4] = AllocSpritePalette(10097); + task->data[5] = 0; + + dest = (task->data[4] + 0x10) * 0x10; + src = (gSprites[task->data[0]].oam.paletteNum + 0x10) * 0x10; + task->data[6] = sub_8079E90(gBattleAnimPlayerMonIndex); + if (task->data[6] == 20 || task->data[6] == 40) { + task->data[6] = 2; + } else { + task->data[6] = 3; + } + CpuCopy32(&gPlttBufferUnfaded[src], &gPlttBufferFaded[dest], 0x20); + BlendPalette(dest, 0x10, gBattleAnimArgs[1], gBattleAnimArgs[0]); + task->func = sub_807A784; } void sub_807A784(u8 taskId) { - struct Task *task = &gTasks[taskId]; - switch (task->data[2]) { - case 0: - sub_807A850(task, taskId); - gSprites[task->data[0]].pos2.x += task->data[1]; - if (++task->data[3] == 5) { - task->data[3]--; - task->data[2]++; - } - break; - case 1: - sub_807A850(task, taskId); - gSprites[task->data[0]].pos2.x -= task->data[1]; - if (--task->data[3] == 0) { - gSprites[task->data[0]].pos2.x = 0; - task->data[2]++; - } - break; - case 2: - if (!task->data[5]) { - FreeSpritePaletteByTag(10097); - DestroyAnimVisualTask(taskId); - } - break; - } + struct Task *task = &gTasks[taskId]; + switch (task->data[2]) { + case 0: + sub_807A850(task, taskId); + gSprites[task->data[0]].pos2.x += task->data[1]; + if (++task->data[3] == 5) { + task->data[3]--; + task->data[2]++; + } + break; + case 1: + sub_807A850(task, taskId); + gSprites[task->data[0]].pos2.x -= task->data[1]; + if (--task->data[3] == 0) { + gSprites[task->data[0]].pos2.x = 0; + task->data[2]++; + } + break; + case 2: + if (!task->data[5]) { + FreeSpritePaletteByTag(10097); + DestroyAnimVisualTask(taskId); + } + break; + } } void sub_807A850(struct Task *task, u8 taskId) { - s16 sprite = duplicate_obj_of_side_rel2move_in_transparent_mode(0); - if (sprite >= 0) { - gSprites[sprite].oam.priority = task->data[6]; - gSprites[sprite].oam.paletteNum = task->data[4]; - gSprites[sprite].data0 = 8; - gSprites[sprite].data1 = taskId; - gSprites[sprite].data2 = sprite; - gSprites[sprite].pos2.x = gSprites[task->data[0]].pos2.x; - gSprites[sprite].callback = sub_807A8D4; - task->data[5]++; - } + s16 sprite = duplicate_obj_of_side_rel2move_in_transparent_mode(0); + if (sprite >= 0) { + gSprites[sprite].oam.priority = task->data[6]; + gSprites[sprite].oam.paletteNum = task->data[4]; + gSprites[sprite].data0 = 8; + gSprites[sprite].data1 = taskId; + gSprites[sprite].data2 = sprite; + gSprites[sprite].pos2.x = gSprites[task->data[0]].pos2.x; + gSprites[sprite].callback = sub_807A8D4; + task->data[5]++; + } } void sub_807A8D4(struct Sprite *sprite) { - if (--sprite->data0 == 0) { - gTasks[sprite->data1].data[5]--; - obj_delete_but_dont_free_vram(sprite); - } + if (--sprite->data0 == 0) { + gTasks[sprite->data1].data[5]--; + obj_delete_but_dont_free_vram(sprite); + } } void sub_807A908(struct Sprite *sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); - if (!battle_side_get_owner(gBattleAnimPlayerMonIndex)) { - sprite->data0 = 5; - } else { - sprite->data0 = -10; - } - sprite->data1 = -40; - sprite->callback = sub_807A960; + sprite->pos1.x = sub_8077ABC(gBattleAnimPlayerMonIndex, 2); + sprite->pos1.y = sub_8077ABC(gBattleAnimPlayerMonIndex, 3); + if (!battle_side_get_owner(gBattleAnimPlayerMonIndex)) { + sprite->data0 = 5; + } else { + sprite->data0 = -10; + } + sprite->data1 = -40; + sprite->callback = sub_807A960; } void sub_807A960(struct Sprite *sprite) { - sprite->data2 += sprite->data0; - sprite->data3 += sprite->data1; - sprite->pos2.x = sprite->data2 / 10; - sprite->pos2.y = sprite->data3 / 10; - if (sprite->data1 < -20) { - sprite->data1++; - } - if ((sprite->pos1.y + sprite->pos2.y) < -32) { - move_anim_8072740(sprite); - } + sprite->data2 += sprite->data0; + sprite->data3 += sprite->data1; + sprite->pos2.x = sprite->data2 / 10; + sprite->pos2.y = sprite->data3 / 10; + if (sprite->data1 < -20) { + sprite->data1++; + } + if ((sprite->pos1.y + sprite->pos2.y) < -32) { + move_anim_8072740(sprite); + } } void sub_807A9BC(struct Sprite *sprite) { - int x; - sprite->data0 = gBattleAnimArgs[2]; - sprite->data2 = sprite->pos1.x + gBattleAnimArgs[4]; - sprite->data4 = sprite->pos1.y + gBattleAnimArgs[5]; - if (!battle_side_get_owner(gBattleAnimEnemyMonIndex)) { - x = (u16)gBattleAnimArgs[4] + 30; - sprite->pos1.x += x; - sprite->pos1.y = gBattleAnimArgs[5] - 20; - } else { - x = (u16)gBattleAnimArgs[4] - 30; - sprite->pos1.x += x; - sprite->pos1.y = gBattleAnimArgs[5] - 80; - } - sprite->callback = sub_8078B34; - oamt_set_x3A_32(sprite, move_anim_8072740); + int x; + sprite->data0 = gBattleAnimArgs[2]; + sprite->data2 = sprite->pos1.x + gBattleAnimArgs[4]; + sprite->data4 = sprite->pos1.y + gBattleAnimArgs[5]; + if (!battle_side_get_owner(gBattleAnimEnemyMonIndex)) { + x = (u16)gBattleAnimArgs[4] + 30; + sprite->pos1.x += x; + sprite->pos1.y = gBattleAnimArgs[5] - 20; + } else { + x = (u16)gBattleAnimArgs[4] - 30; + sprite->pos1.x += x; + sprite->pos1.y = gBattleAnimArgs[5] - 80; + } + sprite->callback = sub_8078B34; + oamt_set_x3A_32(sprite, move_anim_8072740); } diff --git a/src/rom_8094928.c b/src/rom_8094928.c index 74daec64d..794fc78f6 100644 --- a/src/rom_8094928.c +++ b/src/rom_8094928.c @@ -19,12 +19,12 @@ extern u16 gUnknown_02024A6A[]; void unref_sub_8094928(struct PokemonStorage *ptr) { - *ptr = gPokemonStorage; + *ptr = gPokemonStorage; } void unref_sub_8094940(struct PokemonStorage *ptr) { - gPokemonStorage = *ptr; + gPokemonStorage = *ptr; } void sub_8094958(void) diff --git a/src/save.c b/src/save.c index ce1ee3089..9ab6e83f6 100644 --- a/src/save.c +++ b/src/save.c @@ -29,26 +29,26 @@ extern struct HallOfFame gHallOfFame; const struct SaveSectionLocation gSaveSectionLocations[] = { - {((u8 *) &gSaveBlock2) + GETBLOCKOFFSET(1), GETCHUNKSIZE(gSaveBlock2, 1)}, - {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(1), GETCHUNKSIZE(gSaveBlock1, 1)}, - {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(2), GETCHUNKSIZE(gSaveBlock1, 2)}, - {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(3), GETCHUNKSIZE(gSaveBlock1, 3)}, - {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(4), GETCHUNKSIZE(gSaveBlock1, 4)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(1), GETCHUNKSIZE(gPokemonStorage, 1)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(2), GETCHUNKSIZE(gPokemonStorage, 2)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(3), GETCHUNKSIZE(gPokemonStorage, 3)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(4), GETCHUNKSIZE(gPokemonStorage, 4)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(5), GETCHUNKSIZE(gPokemonStorage, 5)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(6), GETCHUNKSIZE(gPokemonStorage, 6)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(7), GETCHUNKSIZE(gPokemonStorage, 7)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(8), GETCHUNKSIZE(gPokemonStorage, 8)}, - {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(9), GETCHUNKSIZE(gPokemonStorage, 9)} + {((u8 *) &gSaveBlock2) + GETBLOCKOFFSET(1), GETCHUNKSIZE(gSaveBlock2, 1)}, + {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(1), GETCHUNKSIZE(gSaveBlock1, 1)}, + {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(2), GETCHUNKSIZE(gSaveBlock1, 2)}, + {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(3), GETCHUNKSIZE(gSaveBlock1, 3)}, + {((u8 *) &gSaveBlock1) + GETBLOCKOFFSET(4), GETCHUNKSIZE(gSaveBlock1, 4)}, + {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(1), GETCHUNKSIZE(gPokemonStorage, 1)}, + {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(2), GETCHUNKSIZE(gPokemonStorage, 2)}, + {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(3), GETCHUNKSIZE(gPokemonStorage, 3)}, + {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(4), GETCHUNKSIZE(gPokemonStorage, 4)}, + {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(5), GETCHUNKSIZE(gPokemonStorage, 5)}, + {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(6), GETCHUNKSIZE(gPokemonStorage, 6)}, + {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(7), GETCHUNKSIZE(gPokemonStorage, 7)}, + {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(8), GETCHUNKSIZE(gPokemonStorage, 8)}, + {((u8 *) &gPokemonStorage) + GETBLOCKOFFSET(9), GETCHUNKSIZE(gPokemonStorage, 9)} }; const struct SaveSectionLocation gHallOfFameSaveSectionLocations[] = { - {((u8 *) &gHallOfFame) + GETBLOCKOFFSET(1), GETCHUNKSIZE(struct HallOfFame, 1)}, // gHallOfFame is not a proper sym, so the struct must be used. - {((u8 *) &gHallOfFame) + GETBLOCKOFFSET(2), GETCHUNKSIZE(struct HallOfFame, 2)} + {((u8 *) &gHallOfFame) + GETBLOCKOFFSET(1), GETCHUNKSIZE(struct HallOfFame, 1)}, // gHallOfFame is not a proper sym, so the struct must be used. + {((u8 *) &gHallOfFame) + GETBLOCKOFFSET(2), GETCHUNKSIZE(struct HallOfFame, 2)} }; const u8 gFlashSectors[] = { 0x1E, 0x1F }; @@ -352,7 +352,7 @@ u8 sub_81257F0(u16 a1, const struct SaveSectionLocation *location) if (ProgramFlashByte(sector, sizeof(struct UnkSaveSection), 0x25)) { - // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. + // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. SetDamagedSectorBits(ENABLE, sector); gLastWrittenSector = gLastKnownGoodSector; gSaveCounter = gLastSaveCounter; diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index c2f77d27d..102909779 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -77,7 +77,7 @@ static const u8 sClockFrames[8][3] = }; static const u8 gSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal"); -static const u8 gSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz"); +static const u8 gSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz"); static void VBlankCB(void); static void CB2_SaveFailedScreen(void); diff --git a/src/script_menu.c b/src/script_menu.c index 22afadbce..eba438397 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -12,561 +12,561 @@ // multichoice lists const struct MenuAction MultichoiceList_00[] = { - {(u8 *)OtherText_Petalburg, 0}, - {(u8 *)OtherText_Slateport, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Petalburg, 0}, + {(u8 *)OtherText_Slateport, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_02[] = { - {(u8 *)OtherText_Enter, 0}, - {(u8 *)OtherText_Info3, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Enter, 0}, + {(u8 *)OtherText_Info3, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_03[] = { - {(u8 *)OtherText_WhatsAContest, 0}, - {(u8 *)OtherText_TypesOfContest, 0}, - {(u8 *)OtherText_Ranks, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_WhatsAContest, 0}, + {(u8 *)OtherText_TypesOfContest, 0}, + {(u8 *)OtherText_Ranks, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_04[] = { - {(u8 *)OtherText_CoolContest, 0}, - {(u8 *)OtherText_BeautyContest, 0}, - {(u8 *)OtherText_CuteContest, 0}, - {(u8 *)OtherText_SmartContest, 0}, - {(u8 *)OtherText_ToughContest, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_CoolContest, 0}, + {(u8 *)OtherText_BeautyContest, 0}, + {(u8 *)OtherText_CuteContest, 0}, + {(u8 *)OtherText_SmartContest, 0}, + {(u8 *)OtherText_ToughContest, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_06[] = { - {(u8 *)OtherText_Decoration, 0}, - {(u8 *)OtherText_PackUp, 0}, - {(u8 *)OtherText_Registry, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Decoration, 0}, + {(u8 *)OtherText_PackUp, 0}, + {(u8 *)OtherText_Registry, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_05[] = { - {(u8 *)OtherText_Decoration, 0}, - {(u8 *)OtherText_PackUp, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Decoration, 0}, + {(u8 *)OtherText_PackUp, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_07[] = { - {(u8 *)OtherText_Register, 0}, - {(u8 *)OtherText_Registry, 0}, - {(u8 *)OtherText_Information, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Register, 0}, + {(u8 *)OtherText_Registry, 0}, + {(u8 *)OtherText_Information, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_12[] = { - {(u8 *)OtherText_Mach, 0}, - {(u8 *)OtherText_Acro, 0}, + {(u8 *)OtherText_Mach, 0}, + {(u8 *)OtherText_Acro, 0}, }; const struct MenuAction MultichoiceList_13[] = { - {(u8 *)OtherText_Poison, 0}, - {(u8 *)OtherText_Paralysis, 0}, - {(u8 *)OtherText_Sleep, 0}, - {(u8 *)OtherText_Burn, 0}, - {(u8 *)OtherText_Frozen, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Poison, 0}, + {(u8 *)OtherText_Paralysis, 0}, + {(u8 *)OtherText_Sleep, 0}, + {(u8 *)OtherText_Burn, 0}, + {(u8 *)OtherText_Frozen, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_14[] = { - {(u8 *)OtherText_Dewford, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Dewford, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_16[] = { - {(u8 *)OtherText_SawIt, 0}, - {(u8 *)OtherText_NotYet, 0}, + {(u8 *)OtherText_SawIt, 0}, + {(u8 *)OtherText_NotYet, 0}, }; const struct MenuAction MultichoiceList_17[] = { - {(u8 *)OtherText_Yes, 0}, - {(u8 *)OtherText_No, 0}, - {(u8 *)OtherText_Info3, 0}, + {(u8 *)OtherText_Yes, 0}, + {(u8 *)OtherText_No, 0}, + {(u8 *)OtherText_Info3, 0}, }; const struct MenuAction MultichoiceList_18[] = { - {(u8 *)OtherText_SingleBattle, 0}, - {(u8 *)OtherText_DoubleBattle, 0}, - {(u8 *)OtherText_MultiBattle, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_SingleBattle, 0}, + {(u8 *)OtherText_DoubleBattle, 0}, + {(u8 *)OtherText_MultiBattle, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_19[] = { - {(u8 *)OtherText_Littleroot, 0}, - {(u8 *)OtherText_Slateport, 0}, - {(u8 *)OtherText_Lilycove, 0}, + {(u8 *)OtherText_Littleroot, 0}, + {(u8 *)OtherText_Slateport, 0}, + {(u8 *)OtherText_Lilycove, 0}, }; const struct MenuAction MultichoiceList_20[] = { - {(u8 *)OtherText_Yes, 0}, - {(u8 *)OtherText_No, 0}, - {(u8 *)OtherText_Info3, 0}, + {(u8 *)OtherText_Yes, 0}, + {(u8 *)OtherText_No, 0}, + {(u8 *)OtherText_Info3, 0}, }; const struct MenuAction MultichoiceList_23[] = { - {(u8 *)OtherText_MakeAChallenge, 0}, - {(u8 *)OtherText_ObtainInformation, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_MakeAChallenge, 0}, + {(u8 *)OtherText_ObtainInformation, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_24[] = { - {(u8 *)OtherText_Lv50_2, 0}, - {(u8 *)OtherText_Lv100_2, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Lv50_2, 0}, + {(u8 *)OtherText_Lv100_2, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_25[] = { - {(u8 *)OtherText_Zigzagoon, 0}, - {(u8 *)OtherText_Nincada, 0}, - {(u8 *)OtherText_Poochyena, 0}, + {(u8 *)OtherText_Zigzagoon, 0}, + {(u8 *)OtherText_Nincada, 0}, + {(u8 *)OtherText_Poochyena, 0}, }; const struct MenuAction MultichoiceList_26[] = { - {(u8 *)OtherText_Nincada2, 0}, - {(u8 *)OtherText_Lotad, 0}, - {(u8 *)OtherText_Roselia, 0}, + {(u8 *)OtherText_Nincada2, 0}, + {(u8 *)OtherText_Lotad, 0}, + {(u8 *)OtherText_Roselia, 0}, }; const struct MenuAction MultichoiceList_27[] = { - {(u8 *)OtherText_Shroomish, 0}, - {(u8 *)OtherText_Nincada3, 0}, - {(u8 *)OtherText_Surskit, 0}, + {(u8 *)OtherText_Shroomish, 0}, + {(u8 *)OtherText_Nincada3, 0}, + {(u8 *)OtherText_Surskit, 0}, }; const struct MenuAction MultichoiceList_28[] = { - {(u8 *)OtherText_Treecko, 0}, - {(u8 *)OtherText_Torchic, 0}, - {(u8 *)OtherText_Mudkip, 0}, + {(u8 *)OtherText_Treecko, 0}, + {(u8 *)OtherText_Torchic, 0}, + {(u8 *)OtherText_Mudkip, 0}, }; const struct MenuAction MultichoiceList_29[] = { - {(u8 *)OtherText_Seedot, 0}, - {(u8 *)OtherText_Shroomish2, 0}, - {(u8 *)OtherText_Spinda, 0}, + {(u8 *)OtherText_Seedot, 0}, + {(u8 *)OtherText_Shroomish2, 0}, + {(u8 *)OtherText_Spinda, 0}, }; const struct MenuAction MultichoiceList_30[] = { - {(u8 *)OtherText_Shroomish3, 0}, - {(u8 *)OtherText_Zigzagoon2, 0}, - {(u8 *)OtherText_Wurmple, 0}, + {(u8 *)OtherText_Shroomish3, 0}, + {(u8 *)OtherText_Zigzagoon2, 0}, + {(u8 *)OtherText_Wurmple, 0}, }; const struct MenuAction MultichoiceList_31[] = { - {(u8 *)OtherText_PokeBall, 0}, - {(u8 *)OtherText_SuperPotion, 0}, - {(u8 *)OtherText_SamePrice, 0}, + {(u8 *)OtherText_PokeBall, 0}, + {(u8 *)OtherText_SuperPotion, 0}, + {(u8 *)OtherText_SamePrice, 0}, }; const struct MenuAction MultichoiceList_32[] = { - {(u8 *)OtherText_Yen135, 0}, - {(u8 *)OtherText_Yen155, 0}, - {(u8 *)OtherText_Yen175, 0}, + {(u8 *)OtherText_Yen135, 0}, + {(u8 *)OtherText_Yen155, 0}, + {(u8 *)OtherText_Yen175, 0}, }; const struct MenuAction MultichoiceList_33[] = { - {(u8 *)OtherText_CostMore, 0}, - {(u8 *)OtherText_CostLess, 0}, - {(u8 *)OtherText_SamePrice2, 0}, + {(u8 *)OtherText_CostMore, 0}, + {(u8 *)OtherText_CostLess, 0}, + {(u8 *)OtherText_SamePrice2, 0}, }; const struct MenuAction MultichoiceList_34[] = { - {(u8 *)OtherText_MaleSymbol, 0}, - {(u8 *)OtherText_FemaleSymbol, 0}, - {(u8 *)OtherText_Neither, 0}, + {(u8 *)OtherText_MaleSymbol, 0}, + {(u8 *)OtherText_FemaleSymbol, 0}, + {(u8 *)OtherText_Neither, 0}, }; const struct MenuAction MultichoiceList_35[] = { - {(u8 *)OtherText_Males, 0}, - {(u8 *)OtherText_Females, 0}, - {(u8 *)OtherText_SameNumber, 0}, + {(u8 *)OtherText_Males, 0}, + {(u8 *)OtherText_Females, 0}, + {(u8 *)OtherText_SameNumber, 0}, }; const struct MenuAction MultichoiceList_36[] = { - {(u8 *)OtherText_Male, 0}, - {(u8 *)OtherText_Female, 0}, - {(u8 *)OtherText_ItDepends, 0}, + {(u8 *)OtherText_Male, 0}, + {(u8 *)OtherText_Female, 0}, + {(u8 *)OtherText_ItDepends, 0}, }; const struct MenuAction MultichoiceList_37[] = { - {(u8 *)OtherText_Six2, 0}, - {(u8 *)OtherText_Eight2, 0}, - {(u8 *)OtherText_Ten, 0}, + {(u8 *)OtherText_Six2, 0}, + {(u8 *)OtherText_Eight2, 0}, + {(u8 *)OtherText_Ten, 0}, }; const struct MenuAction MultichoiceList_38[] = { - {(u8 *)OtherText_One, 0}, - {(u8 *)OtherText_Two, 0}, - {(u8 *)OtherText_Three, 0}, + {(u8 *)OtherText_One, 0}, + {(u8 *)OtherText_Two, 0}, + {(u8 *)OtherText_Three, 0}, }; const struct MenuAction MultichoiceList_39[] = { - {(u8 *)OtherText_Six, 0}, - {(u8 *)OtherText_Seven, 0}, - {(u8 *)OtherText_Eight, 0}, + {(u8 *)OtherText_Six, 0}, + {(u8 *)OtherText_Seven, 0}, + {(u8 *)OtherText_Eight, 0}, }; const struct MenuAction MultichoiceList_42[] = { - {(u8 *)OtherText_FreshWater, 0}, - {(u8 *)OtherText_SodaPop, 0}, - {(u8 *)OtherText_Lemonade, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_FreshWater, 0}, + {(u8 *)OtherText_SodaPop, 0}, + {(u8 *)OtherText_Lemonade, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_43[] = { - {(u8 *)OtherText_HowToRide, 0}, - {(u8 *)OtherText_HowToTurn, 0}, - {(u8 *)OtherText_SandySlopes, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_HowToRide, 0}, + {(u8 *)OtherText_HowToTurn, 0}, + {(u8 *)OtherText_SandySlopes, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_44[] = { - {(u8 *)OtherText_Wheelies, 0}, - {(u8 *)OtherText_BunnyHops, 0}, - {(u8 *)OtherText_Jumping, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Wheelies, 0}, + {(u8 *)OtherText_BunnyHops, 0}, + {(u8 *)OtherText_Jumping, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_45[] = { - {(u8 *)OtherText_Satisfied, 0}, - {(u8 *)OtherText_Dissatisfied, 0}, + {(u8 *)OtherText_Satisfied, 0}, + {(u8 *)OtherText_Dissatisfied, 0}, }; const struct MenuAction MultichoiceList_46[] = { - {(u8 *)OtherText_Deepseatooth, 0}, - {(u8 *)OtherText_Deepseascale, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Deepseatooth, 0}, + {(u8 *)OtherText_Deepseascale, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_47[] = { - {(u8 *)OtherText_BlueFlute2, 0}, - {(u8 *)OtherText_YellowFlute2, 0}, - {(u8 *)OtherText_RedFlute2, 0}, - {(u8 *)OtherText_WhiteFlute2, 0}, - {(u8 *)OtherText_BlackFlute2, 0}, - {(u8 *)OtherText_GlassChair, 0}, - {(u8 *)OtherText_GlassDesk, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_BlueFlute2, 0}, + {(u8 *)OtherText_YellowFlute2, 0}, + {(u8 *)OtherText_RedFlute2, 0}, + {(u8 *)OtherText_WhiteFlute2, 0}, + {(u8 *)OtherText_BlackFlute2, 0}, + {(u8 *)OtherText_GlassChair, 0}, + {(u8 *)OtherText_GlassDesk, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_48[] = { - {(u8 *)OtherText_TreeckoDoll, 0}, - {(u8 *)OtherText_TorchicDoll, 0}, - {(u8 *)OtherText_MudkipDoll, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_TreeckoDoll, 0}, + {(u8 *)OtherText_TorchicDoll, 0}, + {(u8 *)OtherText_MudkipDoll, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_55[] = { - {(u8 *)OtherText_TM32, 0}, - {(u8 *)OtherText_TM29, 0}, - {(u8 *)OtherText_TM35, 0}, - {(u8 *)OtherText_TM24, 0}, - {(u8 *)OtherText_TM13, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_TM32, 0}, + {(u8 *)OtherText_TM29, 0}, + {(u8 *)OtherText_TM35, 0}, + {(u8 *)OtherText_TM24, 0}, + {(u8 *)OtherText_TM13, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_49[] = { - {(u8 *)OtherText_50Coins, 0}, - {(u8 *)OtherText_500Coins, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_50Coins, 0}, + {(u8 *)OtherText_500Coins, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_50[] = { - {(u8 *)OtherText_Excellent, 0}, - {(u8 *)OtherText_NotSoHot, 0}, + {(u8 *)OtherText_Excellent, 0}, + {(u8 *)OtherText_NotSoHot, 0}, }; const struct MenuAction MultichoiceList_52[] = { - {(u8 *)OtherText_Lilycove, 0}, - {(u8 *)OtherText_BattleTower, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Lilycove, 0}, + {(u8 *)OtherText_BattleTower, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_53[] = { - {(u8 *)OtherText_Slateport, 0}, - {(u8 *)OtherText_Lilycove, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Slateport, 0}, + {(u8 *)OtherText_Lilycove, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_54[] = { - {(u8 *)OtherText_Right, 0}, - {(u8 *)OtherText_Left, 0}, + {(u8 *)OtherText_Right, 0}, + {(u8 *)OtherText_Left, 0}, }; const struct MenuAction MultichoiceList_56[] = { - {(u8 *)OtherText_Slateport, 0}, - {(u8 *)OtherText_BattleTower, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_Slateport, 0}, + {(u8 *)OtherText_BattleTower, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_57[] = { - {(u8 *)OtherText_1F_2, 0}, - {(u8 *)OtherText_2F_2, 0}, - {(u8 *)OtherText_3F_2, 0}, - {(u8 *)OtherText_4F_2, 0}, - {(u8 *)OtherText_5F_2, 0}, + {(u8 *)OtherText_1F_2, 0}, + {(u8 *)OtherText_2F_2, 0}, + {(u8 *)OtherText_3F_2, 0}, + {(u8 *)OtherText_4F_2, 0}, + {(u8 *)OtherText_5F_2, 0}, }; const struct MenuAction MultichoiceList_58[] = { - {(u8 *)OtherText_RedShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_RedShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_59[] = { - {(u8 *)OtherText_YellowShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_YellowShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_60[] = { - {(u8 *)OtherText_RedShard, 0}, - {(u8 *)OtherText_YellowShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_RedShard, 0}, + {(u8 *)OtherText_YellowShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_61[] = { - {(u8 *)OtherText_BlueShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_BlueShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_62[] = { - {(u8 *)OtherText_RedShard, 0}, - {(u8 *)OtherText_BlueShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_RedShard, 0}, + {(u8 *)OtherText_BlueShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_63[] = { - {(u8 *)OtherText_YellowShard, 0}, - {(u8 *)OtherText_BlueShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_YellowShard, 0}, + {(u8 *)OtherText_BlueShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_64[] = { - {(u8 *)OtherText_RedShard, 0}, - {(u8 *)OtherText_YellowShard, 0}, - {(u8 *)OtherText_BlueShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_RedShard, 0}, + {(u8 *)OtherText_YellowShard, 0}, + {(u8 *)OtherText_BlueShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_65[] = { - {(u8 *)OtherText_GreenShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_GreenShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_66[] = { - {(u8 *)OtherText_RedShard, 0}, - {(u8 *)OtherText_GreenShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_RedShard, 0}, + {(u8 *)OtherText_GreenShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_67[] = { - {(u8 *)OtherText_YellowShard, 0}, - {(u8 *)OtherText_GreenShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_YellowShard, 0}, + {(u8 *)OtherText_GreenShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_68[] = { - {(u8 *)OtherText_RedShard, 0}, - {(u8 *)OtherText_YellowShard, 0}, - {(u8 *)OtherText_GreenShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_RedShard, 0}, + {(u8 *)OtherText_YellowShard, 0}, + {(u8 *)OtherText_GreenShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_69[] = { - {(u8 *)OtherText_BlueShard, 0}, - {(u8 *)OtherText_GreenShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_BlueShard, 0}, + {(u8 *)OtherText_GreenShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_70[] = { - {(u8 *)OtherText_RedShard, 0}, - {(u8 *)OtherText_BlueShard, 0}, - {(u8 *)OtherText_GreenShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_RedShard, 0}, + {(u8 *)OtherText_BlueShard, 0}, + {(u8 *)OtherText_GreenShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_71[] = { - {(u8 *)OtherText_YellowShard, 0}, - {(u8 *)OtherText_BlueShard, 0}, - {(u8 *)OtherText_GreenShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_YellowShard, 0}, + {(u8 *)OtherText_BlueShard, 0}, + {(u8 *)OtherText_GreenShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_72[] = { - {(u8 *)OtherText_RedShard, 0}, - {(u8 *)OtherText_YellowShard, 0}, - {(u8 *)OtherText_BlueShard, 0}, - {(u8 *)OtherText_GreenShard, 0}, - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)OtherText_RedShard, 0}, + {(u8 *)OtherText_YellowShard, 0}, + {(u8 *)OtherText_BlueShard, 0}, + {(u8 *)OtherText_GreenShard, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MenuAction MultichoiceList_01[] = { - {(u8 *)gOtherText_CancelNoTerminator, 0}, + {(u8 *)gOtherText_CancelNoTerminator, 0}, }; const struct MultichoiceListStruct gMultichoiceLists[] = { - {(struct MenuAction *)MultichoiceList_00, 3}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_02, 3}, - {(struct MenuAction *)MultichoiceList_03, 4}, - {(struct MenuAction *)MultichoiceList_04, 6}, - {(struct MenuAction *)MultichoiceList_05, 3}, - {(struct MenuAction *)MultichoiceList_06, 4}, - {(struct MenuAction *)MultichoiceList_07, 4}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_12, 2}, - {(struct MenuAction *)MultichoiceList_13, 6}, - {(struct MenuAction *)MultichoiceList_14, 2}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_16, 2}, - {(struct MenuAction *)MultichoiceList_17, 3}, - {(struct MenuAction *)MultichoiceList_18, 4}, - {(struct MenuAction *)MultichoiceList_19, 3}, - {(struct MenuAction *)MultichoiceList_20, 3}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_23, 3}, - {(struct MenuAction *)MultichoiceList_24, 3}, - {(struct MenuAction *)MultichoiceList_25, 3}, - {(struct MenuAction *)MultichoiceList_26, 3}, - {(struct MenuAction *)MultichoiceList_27, 3}, - {(struct MenuAction *)MultichoiceList_28, 3}, - {(struct MenuAction *)MultichoiceList_29, 3}, - {(struct MenuAction *)MultichoiceList_30, 3}, - {(struct MenuAction *)MultichoiceList_31, 3}, - {(struct MenuAction *)MultichoiceList_32, 3}, - {(struct MenuAction *)MultichoiceList_33, 3}, - {(struct MenuAction *)MultichoiceList_34, 3}, - {(struct MenuAction *)MultichoiceList_35, 3}, - {(struct MenuAction *)MultichoiceList_36, 3}, - {(struct MenuAction *)MultichoiceList_37, 3}, - {(struct MenuAction *)MultichoiceList_38, 3}, - {(struct MenuAction *)MultichoiceList_39, 3}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_42, 4}, - {(struct MenuAction *)MultichoiceList_43, 4}, - {(struct MenuAction *)MultichoiceList_44, 4}, - {(struct MenuAction *)MultichoiceList_45, 2}, - {(struct MenuAction *)MultichoiceList_46, 3}, - {(struct MenuAction *)MultichoiceList_47, 8}, - {(struct MenuAction *)MultichoiceList_48, 4}, - {(struct MenuAction *)MultichoiceList_49, 3}, - {(struct MenuAction *)MultichoiceList_50, 2}, - {(struct MenuAction *)MultichoiceList_01, 1}, - {(struct MenuAction *)MultichoiceList_52, 3}, - {(struct MenuAction *)MultichoiceList_53, 3}, - {(struct MenuAction *)MultichoiceList_54, 2}, - {(struct MenuAction *)MultichoiceList_55, 6}, - {(struct MenuAction *)MultichoiceList_56, 3}, - {(struct MenuAction *)MultichoiceList_57, 5}, - {(struct MenuAction *)MultichoiceList_58, 2}, - {(struct MenuAction *)MultichoiceList_59, 2}, - {(struct MenuAction *)MultichoiceList_60, 3}, - {(struct MenuAction *)MultichoiceList_61, 2}, - {(struct MenuAction *)MultichoiceList_62, 3}, - {(struct MenuAction *)MultichoiceList_63, 3}, - {(struct MenuAction *)MultichoiceList_64, 4}, - {(struct MenuAction *)MultichoiceList_65, 2}, - {(struct MenuAction *)MultichoiceList_66, 3}, - {(struct MenuAction *)MultichoiceList_67, 3}, - {(struct MenuAction *)MultichoiceList_68, 4}, - {(struct MenuAction *)MultichoiceList_69, 3}, - {(struct MenuAction *)MultichoiceList_70, 4}, - {(struct MenuAction *)MultichoiceList_71, 4}, - {(struct MenuAction *)MultichoiceList_72, 5} + {(struct MenuAction *)MultichoiceList_00, 3}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_02, 3}, + {(struct MenuAction *)MultichoiceList_03, 4}, + {(struct MenuAction *)MultichoiceList_04, 6}, + {(struct MenuAction *)MultichoiceList_05, 3}, + {(struct MenuAction *)MultichoiceList_06, 4}, + {(struct MenuAction *)MultichoiceList_07, 4}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_12, 2}, + {(struct MenuAction *)MultichoiceList_13, 6}, + {(struct MenuAction *)MultichoiceList_14, 2}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_16, 2}, + {(struct MenuAction *)MultichoiceList_17, 3}, + {(struct MenuAction *)MultichoiceList_18, 4}, + {(struct MenuAction *)MultichoiceList_19, 3}, + {(struct MenuAction *)MultichoiceList_20, 3}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_23, 3}, + {(struct MenuAction *)MultichoiceList_24, 3}, + {(struct MenuAction *)MultichoiceList_25, 3}, + {(struct MenuAction *)MultichoiceList_26, 3}, + {(struct MenuAction *)MultichoiceList_27, 3}, + {(struct MenuAction *)MultichoiceList_28, 3}, + {(struct MenuAction *)MultichoiceList_29, 3}, + {(struct MenuAction *)MultichoiceList_30, 3}, + {(struct MenuAction *)MultichoiceList_31, 3}, + {(struct MenuAction *)MultichoiceList_32, 3}, + {(struct MenuAction *)MultichoiceList_33, 3}, + {(struct MenuAction *)MultichoiceList_34, 3}, + {(struct MenuAction *)MultichoiceList_35, 3}, + {(struct MenuAction *)MultichoiceList_36, 3}, + {(struct MenuAction *)MultichoiceList_37, 3}, + {(struct MenuAction *)MultichoiceList_38, 3}, + {(struct MenuAction *)MultichoiceList_39, 3}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_42, 4}, + {(struct MenuAction *)MultichoiceList_43, 4}, + {(struct MenuAction *)MultichoiceList_44, 4}, + {(struct MenuAction *)MultichoiceList_45, 2}, + {(struct MenuAction *)MultichoiceList_46, 3}, + {(struct MenuAction *)MultichoiceList_47, 8}, + {(struct MenuAction *)MultichoiceList_48, 4}, + {(struct MenuAction *)MultichoiceList_49, 3}, + {(struct MenuAction *)MultichoiceList_50, 2}, + {(struct MenuAction *)MultichoiceList_01, 1}, + {(struct MenuAction *)MultichoiceList_52, 3}, + {(struct MenuAction *)MultichoiceList_53, 3}, + {(struct MenuAction *)MultichoiceList_54, 2}, + {(struct MenuAction *)MultichoiceList_55, 6}, + {(struct MenuAction *)MultichoiceList_56, 3}, + {(struct MenuAction *)MultichoiceList_57, 5}, + {(struct MenuAction *)MultichoiceList_58, 2}, + {(struct MenuAction *)MultichoiceList_59, 2}, + {(struct MenuAction *)MultichoiceList_60, 3}, + {(struct MenuAction *)MultichoiceList_61, 2}, + {(struct MenuAction *)MultichoiceList_62, 3}, + {(struct MenuAction *)MultichoiceList_63, 3}, + {(struct MenuAction *)MultichoiceList_64, 4}, + {(struct MenuAction *)MultichoiceList_65, 2}, + {(struct MenuAction *)MultichoiceList_66, 3}, + {(struct MenuAction *)MultichoiceList_67, 3}, + {(struct MenuAction *)MultichoiceList_68, 4}, + {(struct MenuAction *)MultichoiceList_69, 3}, + {(struct MenuAction *)MultichoiceList_70, 4}, + {(struct MenuAction *)MultichoiceList_71, 4}, + {(struct MenuAction *)MultichoiceList_72, 5} }; const struct TextStruct gUnknown_083CE048[] = { - OtherText_Cool2, - OtherText_Beauty3, - OtherText_Cute2, - OtherText_Smart2, - OtherText_Tough2, - OtherText_Normal, - OtherText_Super, - OtherText_Hyper, - OtherText_Master, - OtherText_Cool3, - OtherText_Beauty4, - OtherText_Cute3, - OtherText_Smart3, - OtherText_Tough3, - OtherText_Items, - OtherText_KeyItems, - OtherText_Balls, - OtherText_TMsHMs, - OtherText_Berries, + OtherText_Cool2, + OtherText_Beauty3, + OtherText_Cute2, + OtherText_Smart2, + OtherText_Tough2, + OtherText_Normal, + OtherText_Super, + OtherText_Hyper, + OtherText_Master, + OtherText_Cool3, + OtherText_Beauty4, + OtherText_Cute3, + OtherText_Smart3, + OtherText_Tough3, + OtherText_Items, + OtherText_KeyItems, + OtherText_Balls, + OtherText_TMsHMs, + OtherText_Berries, }; extern u8 gPCText_WhichPCShouldBeAccessed[]; diff --git a/src/script_movement.c b/src/script_movement.c index 13d0ff7ac..2dc816532 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -22,7 +22,7 @@ static void sub_80A2490(u8, u8, u8, u8 *); bool8 exec_movement(u8 a, u8 b, u8 c, u8 *d) { u8 mapObjId; - + if (TryGetFieldObjectIdByLocalIdAndMap(a, b, c, &mapObjId)) return TRUE; if (!FuncIsActiveTask(Task_80A244C)) @@ -35,7 +35,7 @@ bool8 sub_80A212C(u8 a, u8 b, u8 c) u8 mapObjId; u8 r4; u8 r1; - + if (TryGetFieldObjectIdByLocalIdAndMap(a, b, c, &mapObjId)) return 1; r4 = sub_80A21E0(); @@ -48,7 +48,7 @@ bool8 sub_80A212C(u8 a, u8 b, u8 c) void sub_80A2178(void) { u8 taskId; - + taskId = sub_80A21E0(); if (taskId != 0xFF) { @@ -61,7 +61,7 @@ static void sub_80A2198(u8 priority) { u8 taskId; u8 i; - + taskId = CreateTask(Task_80A244C, priority); for (i = 1; i < 16; i++) gTasks[taskId].data[i] = 0xFFFF; @@ -75,7 +75,7 @@ static u8 sub_80A21E0(void) static bool8 sub_80A21F4(u8 taskId, u8 b, u8 *c) { u8 r4; - + r4 = sub_80A2260(taskId, b); if (r4 != 16) { @@ -101,7 +101,7 @@ static u8 sub_80A2260(u8 taskId, u8 b) { u8 *ptr; u8 i; - + ptr = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < 16; i++, ptr++) { @@ -114,7 +114,7 @@ static u8 sub_80A2260(u8 taskId, u8 b) static void sub_80A229C(u8 taskId, u8 b, u8 **c) { u8 i; - + *c = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < b; i++, (*c)++) ; @@ -123,7 +123,7 @@ static void sub_80A229C(u8 taskId, u8 b, u8 **c) static void sub_80A22D0(u8 taskId, u8 b, u8 c) { u8 *ptr; - + sub_80A229C(taskId, b, &ptr); *ptr = c; //what is this supposed to do? } @@ -131,7 +131,7 @@ static void sub_80A22D0(u8 taskId, u8 b, u8 c) static void sub_80A22F4(u8 taskId, u8 b, u8 *c) { u8 *ptr; - + sub_80A229C(taskId, b, &ptr); *c = *ptr; } @@ -139,7 +139,7 @@ static void sub_80A22F4(u8 taskId, u8 b, u8 *c) static void sub_80A2318(u8 a, u8 b) { u16 var = ~gBitTable[b]; - + gTasks[a].data[0] &= var; } @@ -179,7 +179,7 @@ static void sub_80A2408(u8 a) { u8 *ptr; u8 i; - + ptr = (u8 *)&gTasks[a].data[1]; for (i = 0; i < 16; i++, ptr++) { @@ -192,7 +192,7 @@ static void Task_80A244C(u8 taskId) { u8 i; u8 var; - + for (i = 0; i < 16; i++) { sub_80A22F4(taskId, i, &var); @@ -204,11 +204,11 @@ static void Task_80A244C(u8 taskId) static void sub_80A2490(u8 taskId, u8 b, u8 c, u8 *d) { u8 var; - + if (FieldObjectIsSpecialAnimActive(&gMapObjects[c]) && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[c])) return; - + var = *d; if (var == 0xFE) { diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index a65a6ae9e..912458655 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -120,7 +120,7 @@ void sub_80C4C78(void) var = 12; break; } - + returnVar = gSaveBlock1.sbStruct.unkSB2.sb1_2EFC_struct2[var].var; if(returnVar == 0) @@ -436,8 +436,8 @@ void ShowContestEntryMonPic(void) taskId = CreateTask(sub_80C5190, 0x50); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = species; - HandleLoadSpecialPokePic((struct SpriteSheet *)&gMonFrontPicTable[species].data, - gMonFrontPicCoords[species].x, gMonFrontPicCoords[species].y, + HandleLoadSpecialPokePic((struct SpriteSheet *)&gMonFrontPicTable[species].data, + gMonFrontPicCoords[species].x, gMonFrontPicCoords[species].y, (u32)gUnknown_081FAF4C[0], gUnknown_081FAF4C[1], species, var1); paletteData = sub_80409C8(species, var2, var1); LoadCompressedObjectPalette(paletteData); @@ -455,7 +455,7 @@ void ShowContestEntryMonPic(void) void sub_80C5164(void) { u8 taskId = FindTaskIdByFunc(sub_80C5190); - + if(taskId != 0xFF) gTasks[taskId].data[0]++; } @@ -464,7 +464,7 @@ void sub_80C5190(u8 taskId) { struct Task *task = &gTasks[taskId]; struct Sprite *sprite; - + switch(task->data[0]) { case 2: @@ -531,7 +531,7 @@ void HealPlayerParty(void) arg[1] = maxHP >> 8; SetMonData(&gPlayerParty[i], MON_DATA_HP, arg); ppBonuses = GetMonData(&gPlayerParty[i], MON_DATA_PP_BONUSES); - + // restore PP. for(j = 0; j < 4; j++) { @@ -583,7 +583,7 @@ u8 ScriptGiveEgg(u16 value) sub_8042044(&mon, value, 1); data = 1; SetMonData(&mon, MON_DATA_IS_EGG, &data); - + return GiveMonToPlayer(&mon); } @@ -608,7 +608,7 @@ void CheckForAlivePartyMons(void) bool8 CheckPartyMonHasHeldItem(u16 item) { int i; - + for(i = 0; i < 6; i++) { u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); @@ -621,7 +621,7 @@ bool8 CheckPartyMonHasHeldItem(u16 item) bool8 GetNameOfEnigmaBerryInPlayerParty(void) { bool8 hasItem = CheckPartyMonHasHeldItem(ITEM_ENIGMA_BERRY); - + if(hasItem == TRUE) GetBerryNameByBerryType(ItemIdToBerryType(ITEM_ENIGMA_BERRY), gStringVar1); @@ -634,7 +634,7 @@ void ScriptWildBattle(u16 species, u8 level, u16 item) ZeroEnemyPartyMons(); CreateMon(&gEnemyParty[0], species, level, 0x20, 0, 0, 0, 0); - + if(item) { data[0] = item; @@ -647,7 +647,7 @@ void ScriptSetMonMoveSlot(u8 monIndex, u16 move, u8 slot) { if(monIndex > 6) monIndex = gPlayerPartyCount - 1; - + SetMonMoveSlot(&gPlayerParty[monIndex], move, slot); } @@ -660,7 +660,7 @@ void sub_80C5568(void) void sub_80C5580(void) { u8 var = gSelectedOrderFromParty[0]; - + switch(var) { case 0: @@ -670,7 +670,7 @@ void sub_80C5580(void) gScriptResult = 1; break; } - + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); } @@ -683,7 +683,7 @@ void ChooseBattleTowerPlayerParty(void) void SetBattleTowerPlayerParty(void) { u8 var = gSelectedOrderFromParty[0]; - + switch(var) { case 0: // player quit battle tower? @@ -695,7 +695,7 @@ void SetBattleTowerPlayerParty(void) gScriptResult = 1; break; } - + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); } diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index 1f12c4943..ce62f2abb 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -144,7 +144,7 @@ bool8 sub_80F9ACC(void) void sub_80F9C00(void) { u8 i; - + for(i = 0; i < gPlayerPartyCount; i++) { switch(sub_80AE47C(&gPlayerParty[i])) @@ -251,7 +251,7 @@ bool8 sub_80F9CE8(void) // this is the same function as sub_80F9ACC except case void sub_80F9E1C(void) { u8 i; - + for(i = 0; i < gPlayerPartyCount; i++) { if(!sub_8040574(&gPlayerParty[i])) @@ -293,7 +293,7 @@ void sub_80F9F3C(void) // count pokemon moves u8 i; gScriptResult = 0; - + for(i = 0; i < 4; i++) // checks MOVE1-MOVE4 if(GetMonData(&gPlayerParty[gSpecialVar_0x8004], i + 13)) gScriptResult++; @@ -440,7 +440,7 @@ void sub_80FA0DC(void) SetMonMoveSlot(&gPlayerParty[gSpecialVar_0x8004], 0, gSpecialVar_0x8005); RemoveMonPPBonus(&gPlayerParty[gSpecialVar_0x8004], gSpecialVar_0x8005); - + for(i = gSpecialVar_0x8005; i < 3; i++) sub_80F9FDC(&gPlayerParty[gSpecialVar_0x8004], i, i + 1); } @@ -449,7 +449,7 @@ void sub_80FA148(void) { struct Pokemon *party = &gPlayerParty[gSpecialVar_0x8004]; gScriptResult = 0; - + if(GetMonData(party, MON_DATA_IS_EGG)) gScriptResult = 1; } diff --git a/src/shop.c b/src/shop.c index a533936c5..c78771be7 100644 --- a/src/shop.c +++ b/src/shop.c @@ -75,7 +75,7 @@ u8 CreateShopMenu(bool8 var) PrintMenuItemsReordered(1, 1, 2, gUnknown_083CC6D0, (u8 *)gUnknown_083CC6EB); } InitMenu(0, 1, 1, gUnknown_03000708.unkA + 1, 0, 9); - + return CreateTask(sub_80B2E38, 8); } @@ -160,7 +160,7 @@ void HandleShopMenuQuit(u8 taskId) sub_80BE3BC(); // in tv.s? ScriptContext2_Disable(); DestroyTask(taskId); - + if(gUnknown_03000708.callback) gUnknown_03000708.callback(); // run the callback if it exists. } @@ -289,7 +289,7 @@ void BuyMenuDrawGraphics(void) void sub_80B3240(void) { u16 tempArr[2]; - + memcpy(tempArr, gUnknown_083CC710, sizeof(tempArr)); LoadPalette(&tempArr[1], 0xD1, 2); LoadPalette(&tempArr[0], 0xD8, 2); @@ -298,7 +298,7 @@ void sub_80B3240(void) void sub_80B3270(void) { sub_80F944C(); - + if(gUnknown_03000708.itemCount > 7) { CreateVerticalScrollIndicators(0, 172, 12); @@ -313,7 +313,7 @@ void sub_80B32A4(void) sub_80F979C(0, 1); else sub_80F979C(0, 0); - + if(gUnknown_03000708.unkB + 7 >= gUnknown_03000708.itemCount) sub_80F979C(1, 1); else diff --git a/src/smokescreen.c b/src/smokescreen.c index d7ca7167c..1d3a14a5b 100644 --- a/src/smokescreen.c +++ b/src/smokescreen.c @@ -61,7 +61,7 @@ static void sub_8046388(struct Sprite *sprite) if (!sprite->data1) DestroySprite(sprite); else - sprite->callback = SpriteCallbackDummy; + sprite->callback = SpriteCallbackDummy; } } diff --git a/src/strings.c b/src/strings.c index fed0c86e2..54c9bdc6a 100644 --- a/src/strings.c +++ b/src/strings.c @@ -195,15 +195,15 @@ const u8 OtherText_TheField[] = _("the field."); const u8 OtherText_TheField2[] = _("the field."); const u8 OtherText_ThePC[] = _("the PC."); -const struct TextStruct gUnknown_0840E740[7] = +const struct TextStruct gUnknown_0840E740[7] = { - OtherText_TheField3, - OtherText_TheBattle, - OtherText_ThePokeList, - OtherText_TheShop, - OtherText_TheField, - OtherText_TheField2, - OtherText_ThePC, + OtherText_TheField3, + OtherText_TheBattle, + OtherText_ThePokeList, + OtherText_TheShop, + OtherText_TheField, + OtherText_TheField2, + OtherText_ThePC, }; const u8 gOtherText_ReturnTo[] = _("Return to"); |