ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Document and cleanup pokemon_summary_screen

Browse Source
This commit is contained in:
Diegoisawesome 2018-08-15 01:44:20 -07:00
parent 332a8bcb1d
commit 0bc975bf57
7 changed files with 554 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/battle_frontier_2.s
View File

@ -1244,7 +1244,7 @@ _0819AF1A:
movs r0, 0x1 movs r0, 0x1
adds r2, r6, 0 adds r2, r6, 0
movs r3, 0x5 movs r3, 0x5
bl sub_81BF8EC bl ShowPokemonSummaryScreen
_0819AF50: _0819AF50:
add sp, 0x4 add sp, 0x4
pop {r4-r6} pop {r4-r6}
@ -4373,7 +4373,7 @@ _0819C9C4:
str r0, [sp] str r0, [sp]
movs r0, 0 movs r0, 0
movs r3, 0x2 movs r3, 0x2
bl sub_81BF8EC bl ShowPokemonSummaryScreen
_0819C9F0: _0819C9F0:
add sp, 0x4 add sp, 0x4
pop {r4-r6} pop {r4-r6}

6
asm/party_menu.s
View File

@ -6796,7 +6796,7 @@ sub_81B3828: @ 81B3828
ldr r0, =sub_81B3894 ldr r0, =sub_81B3894
str r0, [sp] str r0, [sp]
movs r0, 0x1 movs r0, 0x1
bl sub_81BF8EC bl ShowPokemonSummaryScreen
b _081B3880 b _081B3880
.pool .pool
_081B3868: _081B3868:
@ -6810,7 +6810,7 @@ _081B3868:
ldr r0, =sub_81B3894 ldr r0, =sub_81B3894
str r0, [sp] str r0, [sp]
movs r0, 0 movs r0, 0
bl sub_81BF8EC bl ShowPokemonSummaryScreen
_081B3880: _081B3880:
add sp, 0x4 add sp, 0x4
pop {r4} pop {r4}
@ -17663,7 +17663,7 @@ sub_81B968C: @ 81B968C
ldr r0, =CB2_ReturnToField ldr r0, =CB2_ReturnToField
str r0, [sp] str r0, [sp]
movs r0, 0x3 movs r0, 0x3
bl sub_81BF8EC bl ShowPokemonSummaryScreen
ldr r1, =gFieldCallback ldr r1, =gFieldCallback
ldr r0, =sub_80AF168 ldr r0, =sub_80AF168
str r0, [r1] str r0, [r1]

4
asm/pokemon_storage_system.s
View File

@ -3685,7 +3685,7 @@ _080C9EB4:
adds r1, r4, 0 adds r1, r4, 0
adds r2, r7, 0 adds r2, r7, 0
adds r3, r6, 0 adds r3, r6, 0
bl sub_81BFA80 bl ShowPokemonSummaryScreenSet40EF
b _080C9F56 b _080C9F56
.pool .pool
_080C9F04: _080C9F04:
@ -3695,7 +3695,7 @@ _080C9F04:
adds r1, r4, 0 adds r1, r4, 0
adds r2, r7, 0 adds r2, r7, 0
adds r3, r6, 0 adds r3, r6, 0
bl sub_81BF8EC bl ShowPokemonSummaryScreen
b _080C9F56 b _080C9F56
.pool .pool
_080C9F1C: _080C9F1C:

4
asm/trade.s
View File

@ -3499,7 +3499,7 @@ sub_807905C: @ 807905C
ldr r0, =sub_8077B74 ldr r0, =sub_8077B74
str r0, [sp] str r0, [sp]
movs r0, 0x1 movs r0, 0x1
bl sub_81BF8EC bl ShowPokemonSummaryScreen
b _080790C0 b _080790C0
.pool .pool
_080790A4: _080790A4:
@ -3515,7 +3515,7 @@ _080790A4:
ldr r0, =sub_8077B74 ldr r0, =sub_8077B74
str r0, [sp] str r0, [sp]
movs r0, 0x1 movs r0, 0x1
bl sub_81BF8EC bl ShowPokemonSummaryScreen
_080790C0: _080790C0:
bl FreeAllWindowBuffers bl FreeAllWindowBuffers
_080790C4: _080790C4:

4
include/constants/region_map_sections.h
View File

@ -216,4 +216,8 @@
#define MAPSEC_TRAINER_HILL 0xD4 #define MAPSEC_TRAINER_HILL 0xD4
#define MAPSEC_NONE 0xD5 #define MAPSEC_NONE 0xD5
#define MAPSEC_SPECIAL_EGG 0xFD
#define MAPSEC_IN_GAME_TRADE 0xFE
#define MAPSEC_FATEFUL_ENCOUNTER 0xFF
#endif //GUARD_REGIONMAPSEC_H #endif //GUARD_REGIONMAPSEC_H

10
include/pokemon_summary_screen.h
View File

@ -4,4 +4,14 @@
void sub_81C4F98(u8, void(*)(void)); void sub_81C4F98(u8, void(*)(void));
void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16); void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
// The Pokemon Summary Screen can operate in different modes. Certain features,
// such as move re-ordering, are available in the different modes.
enum PokemonSummaryScreenMode
{
PSS_MODE_NORMAL,
PSS_MODE_UNK1,
PSS_MODE_UNK2,
PSS_MODE_SELECT_MOVE,
};
#endif // GUARD_POKEMON_SUMMARY_SCREEN_H #endif // GUARD_POKEMON_SUMMARY_SCREEN_H

984
src/pokemon_summary_screen.c
View File

File diff suppressed because it is too large Load Diff