mirrors
/
Mother2GbaTranslation
mirror of https://github.com/jeffman/Mother2GbaTranslation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #122 from Lorenzooone/fix_solidified_target 

Fix solidified/cannot move issue
This commit is contained in:
jeffman 2020-08-26 19:13:39 -04:00 committed by GitHub
parent 06da3b3237 35b253594a
commit b7c9928050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/c/battle.c
View File

@ -25,7 +25,7 @@ void printTargetOfAttack(short a, short target)
pointer2 += 0x26; pointer2 += 0x26;
byte val = *(pointer2 + target); byte val = *(pointer2 + target);
unsigned short ailmentTile = ailmentTileSetup((byte*)(0x2020CCF + (val * 0x94)), 0); unsigned short ailmentTile = ailmentTileSetup((byte*)(0x2020CCF + (val * 0x94)), 0);
if(ailmentTile >= 1) if(ailmentTile > 1)
{ {
map_tile(ailmentTile, window->window_x + 0x13, window->window_y); map_tile(ailmentTile, window->window_x + 0x13, window->window_y);
map_tile(ailmentTile + 0x20, window->window_x + 0x13, window->window_y + 1); map_tile(ailmentTile + 0x20, window->window_x + 0x13, window->window_y + 1);

4
src/c/pc.h
View File

@ -24,7 +24,9 @@ typedef enum AILMENT2
typedef enum AILMENT3 typedef enum AILMENT3
{ {
SLEEP = 1, SLEEP = 1,
CRYING = 2 CRYING = 2,
CANNOT_MOVE = 3,
SOLIDIFIED = 4
} AILMENT3; } AILMENT3;
typedef enum CHARACTER typedef enum CHARACTER