From 9b961c030b28170731844916dd03caf8d0bfce1b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Apr 2018 15:30:34 -0400 Subject: through debug_sub_808F648 --- include/field_specials.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/field_specials.h b/include/field_specials.h index a8e8d3da7..245e20407 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -27,5 +27,6 @@ u8 GetLeadMonIndex(void); void ResetFanClub(void); u8 sub_810FB10(u8 a0); void sub_810FEFC(void); +u16 GetSlotMachineId(void); #endif // GUARD_FIELD_SPECIALS_H -- cgit v1.2.3 From 5bf8472d4f8902203fc07609e30edaed3818370b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Apr 2018 18:13:16 -0400 Subject: debug_sub_808FA88 --- include/global.h | 2 +- include/tv.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index b61488545..3270b6c25 100644 --- a/include/global.h +++ b/include/global.h @@ -337,7 +337,7 @@ struct TVShowBravoTrainerBattleTowerSpotlight /*0x01*/ bool8 active; /*0x02*/ u8 trainerName[8]; /*0x0A*/ u16 species; - /*0x0C*/ u8 pokemonName[8]; + /*0x0C*/ u8 pokemonName[8]; // TODO: rename this /*0x14*/ u16 defeatedSpecies; /*0x16*/ u16 var16; /*0x18*/ u16 var18[1]; diff --git a/include/tv.h b/include/tv.h index 2edccb365..f0d7f9116 100644 --- a/include/tv.h +++ b/include/tv.h @@ -108,5 +108,6 @@ void sub_80C045C(); void sub_80BF088(u8, s32); void sub_80BFD20(void); void PutPokemonTodayCaughtOnAir(void); +u8 GetTVChannelByShowType(u8); #endif // GUARD_TV_H -- cgit v1.2.3 From 4987b746365ec09af10bc2a1ce11dbffaa284b50 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Apr 2018 20:04:51 -0400 Subject: Remainder of nohara --- include/field_specials.h | 6 ++++++ include/tv.h | 1 + 2 files changed, 7 insertions(+) (limited to 'include') diff --git a/include/field_specials.h b/include/field_specials.h index 245e20407..6802fdafd 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -17,6 +17,9 @@ extern u8 gUnknown_0203925A; extern u8 gUnknown_0203925B; extern u8 gUnknown_0203925C; +extern const u8 gUnknown_083F8408[]; +extern const u8 gUnknown_083F8410[]; + void ResetCyclingRoadChallengeData(void); bool32 CountSSTidalStep(u16); u8 GetSSTidalLocation(s8 *, s8 *, s16 *, s16 *); @@ -28,5 +31,8 @@ void ResetFanClub(void); u8 sub_810FB10(u8 a0); void sub_810FEFC(void); u16 GetSlotMachineId(void); +void sub_810FAA0(void); +int sub_810FB9C(void); +int sub_810FC18(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/tv.h b/include/tv.h index f0d7f9116..787f0e9c4 100644 --- a/include/tv.h +++ b/include/tv.h @@ -109,5 +109,6 @@ void sub_80BF088(u8, s32); void sub_80BFD20(void); void PutPokemonTodayCaughtOnAir(void); u8 GetTVChannelByShowType(u8); +void sub_80BEC40(void); #endif // GUARD_TV_H -- cgit v1.2.3 From e472aa274cb772edbf3b797727c6918a0c493a01 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Apr 2018 20:31:06 -0400 Subject: fix name of TVShow.bravoTrainerTower.pokemonName --- include/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 3270b6c25..38ba50a2c 100644 --- a/include/global.h +++ b/include/global.h @@ -337,7 +337,7 @@ struct TVShowBravoTrainerBattleTowerSpotlight /*0x01*/ bool8 active; /*0x02*/ u8 trainerName[8]; /*0x0A*/ u16 species; - /*0x0C*/ u8 pokemonName[8]; // TODO: rename this + /*0x0C*/ u8 enemyTrainerName[8]; /*0x14*/ u16 defeatedSpecies; /*0x16*/ u16 var16; /*0x18*/ u16 var18[1]; -- cgit v1.2.3