Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-04-25 07:27:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

match atk49_moveend

Browse Source
This commit is contained in:
camthesaxman 2019-07-28 18:28:15 -05:00
parent 5b12c6f1e7
commit 92dd1f106b
14 changed files with 246 additions and 1398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asmdiff.sh
View File

@ -4,4 +4,4 @@ OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb
OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
$OBJDUMP $OPTIONS baserom.gba > baserom.dump
$OBJDUMP $OPTIONS pokeruby.gba > pokeruby.dump
diff -u baserom.dump pokeruby.dump | less
colordiff -u baserom.dump pokeruby.dump

4
include/battle.h
View File

@ -2,7 +2,7 @@
#define GUARD_BATTLE_H
#include "sprite.h"
#include "constants/battle_constants.h"
#include "constants/battle.h"
#include "battle_setup.h"
#define GET_BATTLER_POSITION(bank)((gBattlerPositions[bank]))
@ -762,6 +762,8 @@ extern u16 gBattle_WIN0V;
extern u16 gBattle_WIN1H;
extern u16 gBattle_WIN1V;
extern u8 gLastHitBy[MAX_BATTLERS_COUNT];
extern u8 gDisplayedStringBattle[];
extern u16 gBattleTypeFlags;

0
include/constants/battle_constants.h → include/constants/battle.h
View File

2
src/battle/anim/battle_intro.c
View File

@ -1,5 +1,5 @@
#include "global.h"
#include "constants/battle_constants.h"
#include "constants/battle.h"
#include "battle.h"
#include "battle_anim.h"
#include "battle_anim_80CA710.h"

2
src/battle/anim/current.c
View File

@ -4,7 +4,7 @@
#include "rom_8077ABC.h"
#include "sound.h"
#include "trig.h"
#include "constants/battle_constants.h"
#include "constants/battle.h"
#include "constants/songs.h"
extern s16 gBattleAnimArgs[];

2
src/battle/anim/dark.c
View File

@ -9,7 +9,7 @@
#include "sound.h"
#include "sprite.h"
#include "trig.h"
#include "constants/battle_constants.h"
#include "constants/battle.h"
extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimAttacker;

2
src/battle/anim/fight.c
View File

@ -5,7 +5,7 @@
#include "sprite.h"
#include "task.h"
#include "trig.h"
#include "constants/battle_constants.h"
#include "constants/battle.h"
extern s16 gBattleAnimArgs[];
extern u8 gBankAttacker;

2
src/battle/anim/ghost.c
View File

@ -7,7 +7,7 @@
#include "scanline_effect.h"
#include "sound.h"
#include "trig.h"
#include "constants/battle_constants.h"
#include "constants/battle.h"
#include "constants/songs.h"
extern s16 gBattleAnimArgs[];

2
src/battle/anim/ice.c
View File

@ -4,7 +4,7 @@
#include "rom_8077ABC.h"
#include "battle.h"
#include "battle_anim.h"
#include "constants/battle_constants.h"
#include "constants/battle.h"
#include "task.h"
#include "decompress.h"
#include "palette.h"

2
src/battle/anim/normal.c
View File

@ -10,7 +10,7 @@
#include "sound.h"
#include "task.h"
#include "trig.h"
#include "constants/battle_constants.h"
#include "constants/battle.h"
#include "constants/songs.h"
extern s16 gBattleAnimArgs[];

1
src/battle/battle_2.c
View File

@ -97,7 +97,6 @@ extern u16 gLastLandedMoves[];
extern u16 gLastHitByType[];
extern u16 gUnknown_02024C4C[];
extern u16 gLockedMoves[];
extern u8 gLastHitBy[];
extern u16 gChosenMovesByBanks[];
extern u32 gHitMarker;
extern u8 gUnknown_02024C70[];

1620
src/battle/battle_4.c
View File

File diff suppressed because it is too large Load Diff

1
src/battle/battle_ai_switch_items.c
View File

@ -16,7 +16,6 @@
extern u8 gUnknown_02023A14_50;
extern u8 gLastHitBy[];
extern u8 gActiveBattler;
extern u16 gBattleTypeFlags;
extern u8 gAbsentBattlerFlags;

2
src/pokemon_item_effect.c
View File

@ -1,5 +1,5 @@
#include "global.h"
#include "constants/battle_constants.h"
#include "constants/battle.h"
#include "constants/hold_effects.h"
#include "constants/items.h"
#include "constants/species.h"