ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 19:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mistakes and use EVENT_OBJ_GFX_* macros

Browse Source
This commit is contained in:
Phlosioneer 2019-03-31 20:07:24 -04:00
parent 13c2f91b11
commit 207a54393c
4 changed files with 257 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/AbandonedShip_CaptainsOffice/map.json
View File

@ -25,7 +25,7 @@
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_CaptainsOffice_EventScript_2387E2", "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2",
"flag": "0" "flag": "0"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
@ -59,4 +59,4 @@
], ],
"coord_events": [], "coord_events": [],
"bg_events": [] "bg_events": []
} }

2
include/contest.h
View File

@ -216,7 +216,6 @@ struct ContestPokemon
/*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; /*0x02*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
/*0x0D*/ u8 trainerName[PLAYER_NAME_LENGTH + 1]; /*0x0D*/ u8 trainerName[PLAYER_NAME_LENGTH + 1];
/*0x15*/ u8 trainerGfxId; /*0x15*/ u8 trainerGfxId;
// Temp note: 2 bytes of padding
/*0x18*/ u32 flags; /*0x18*/ u32 flags;
/*0x1C*/ u8 whichRank:2; // 0x1 0x2 /*0x1C*/ u8 whichRank:2; // 0x1 0x2
u8 aiPool_Cool:1; // 0x4 u8 aiPool_Cool:1; // 0x4
@ -224,7 +223,6 @@ struct ContestPokemon
u8 aiPool_Cute:1; // 0x10 u8 aiPool_Cute:1; // 0x10
u8 aiPool_Smart:1; // 0x20 u8 aiPool_Smart:1; // 0x20
u8 aiPool_Tough:1; // 0x40 u8 aiPool_Tough:1; // 0x40
// Temp note: 1 byte of padding
/*0x1E*/ u16 moves[4]; // moves /*0x1E*/ u16 moves[4]; // moves
/*0x26*/ u8 cool; // cool /*0x26*/ u8 cool; // cool
/*0x27*/ u8 beauty; // beauty /*0x27*/ u8 beauty; // beauty

392
src/data/contest_opponents.h
View File

File diff suppressed because it is too large Load Diff

118
src/data/contest_text_tables.h
View File

@ -196,53 +196,53 @@ extern const u8 gText_0827E8CA[];
const u8 *const gContestEffectDescriptionPointers[] = const u8 *const gContestEffectDescriptionPointers[] =
{ {
gContestEffect00hDescription, gContestEffect00hDescription,
gContestEffect01hDescription, gContestEffect01hDescription,
gContestEffect02hDescription, gContestEffect02hDescription,
gContestEffect03hDescription, gContestEffect03hDescription,
gContestEffect04hDescription, gContestEffect04hDescription,
gContestEffect05hDescription, gContestEffect05hDescription,
gContestEffect06hDescription, gContestEffect06hDescription,
gContestEffect07hDescription, gContestEffect07hDescription,
gContestEffect08hDescription, gContestEffect08hDescription,
gContestEffect09hDescription, gContestEffect09hDescription,
gContestEffect0AhDescription, gContestEffect0AhDescription,
gContestEffect0BhDescription, gContestEffect0BhDescription,
gContestEffect0ChDescription, gContestEffect0ChDescription,
gContestEffect0DhDescription, gContestEffect0DhDescription,
gContestEffect0EhDescription, gContestEffect0EhDescription,
gContestEffect0FhDescription, gContestEffect0FhDescription,
gContestEffect10hDescription, gContestEffect10hDescription,
gContestEffect11hDescription, gContestEffect11hDescription,
gContestEffect12hDescription, gContestEffect12hDescription,
gContestEffect13hDescription, gContestEffect13hDescription,
gContestEffect14hDescription, gContestEffect14hDescription,
gContestEffect15hDescription, gContestEffect15hDescription,
gContestEffect16hDescription, gContestEffect16hDescription,
gContestEffect17hDescription, gContestEffect17hDescription,
gContestEffect18hDescription, gContestEffect18hDescription,
gContestEffect19hDescription, gContestEffect19hDescription,
gContestEffect1AhDescription, gContestEffect1AhDescription,
gContestEffect1BhDescription, gContestEffect1BhDescription,
gContestEffect1ChDescription, gContestEffect1ChDescription,
gContestEffect1DhDescription, gContestEffect1DhDescription,
gContestEffect1EhDescription, gContestEffect1EhDescription,
gContestEffect1FhDescription, gContestEffect1FhDescription,
gContestEffect20hDescription, gContestEffect20hDescription,
gContestEffect21hDescription, gContestEffect21hDescription,
gContestEffect22hDescription, gContestEffect22hDescription,
gContestEffect23hDescription, gContestEffect23hDescription,
gContestEffect24hDescription, gContestEffect24hDescription,
gContestEffect25hDescription, gContestEffect25hDescription,
gContestEffect26hDescription, gContestEffect26hDescription,
gContestEffect27hDescription, gContestEffect27hDescription,
gContestEffect28hDescription, gContestEffect28hDescription,
gContestEffect29hDescription, gContestEffect29hDescription,
gContestEffect2AhDescription, gContestEffect2AhDescription,
gContestEffect2BhDescription, gContestEffect2BhDescription,
gContestEffect2ChDescription, gContestEffect2ChDescription,
gContestEffect2DhDescription, gContestEffect2DhDescription,
gContestEffect2EhDescription, gContestEffect2EhDescription,
gContestEffect2FhDescription gContestEffect2FhDescription
}; };
// Unreferenced array of pointers to move names. // Unreferenced array of pointers to move names.
@ -278,18 +278,18 @@ const u8 *const gContestMoveTypeTextPointers[] =
const u8 *const gUnknown_08587D5C[] = const u8 *const gUnknown_08587D5C[] =
{ {
gText_0827D5C1, gText_0827D5C1,
gText_0827D5DC, gText_0827D5DC,
gText_0827D600, gText_0827D600,
gText_0827D612, gText_0827D612,
gText_0827D612, gText_0827D612,
gText_0827D62D, gText_0827D62D,
gText_0827D654, gText_0827D654,
gText_0827D67E, gText_0827D67E,
gText_0827D69C, gText_0827D69C,
gText_0827D6BA, gText_0827D6BA,
gText_0827D6E5, gText_0827D6E5,
gText_0827D706, gText_0827D706,
gText_0827D71D gText_0827D71D
}; };
const u8 *const gUnknown_08587D90[] = const u8 *const gUnknown_08587D90[] =
@ -411,4 +411,4 @@ const u8 *const gUnknown_08587F1C[] =
gText_0827E8B4, gText_0827E8B4,
gText_0827E8BF, gText_0827E8BF,
gText_0827E8CA gText_0827E8CA
}; };