From 95e4ae06ceacc583ecd7678adda2f19675be507d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 8 Oct 2017 14:54:51 +0200 Subject: battle message decompiled and dumped --- include/battle_controllers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/battle_controllers.h') diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 2281fdaff..eea544b55 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -39,8 +39,8 @@ struct MovePpInfo struct ChooseMoveStruct { u16 moves[4]; - u8 ppNumbers[4]; - u8 ppWithBonusNumbers[4]; + u8 currentPp[4]; + u8 maxPp[4]; u16 species; u8 monType1; u8 monType2; -- cgit v1.2.3 From ab03b03c4bb872af131a9c52ef285c488b8e4865 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 9 Oct 2017 18:18:40 +0200 Subject: decompile reshow battle screen --- include/battle_controllers.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/battle_controllers.h') diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 2281fdaff..ea614a6b2 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_CONTROLLERS_H #define GUARD_BATTLE_CONTROLLERS_H +#include "battle_controller_player.h" + #define REQUEST_ALL_BATTLE 0x0 #define REQUEST_SPECIES_BATTLE 0x1 #define REQUEST_HELDITEM_BATTLE 0x2 -- cgit v1.2.3 From 57e5624e0619b8d96fb43ff68d9eeefe734b1a4f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 10 Oct 2017 18:01:45 +0200 Subject: battle9 is being worked on --- include/battle_controllers.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/battle_controllers.h') diff --git a/include/battle_controllers.h b/include/battle_controllers.h index eea544b55..e36c95fbe 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -84,5 +84,6 @@ void Emit_x32(u8 bufferId); void EmitPrintString(u8 bufferId, u16 stringId); void EmitResetActionMoveSelection(u8 bufferId, u8 caseId); void EmitBallThrow(u8 bufferId, u8 caseId); +void EmitCmd_x21(u8 bufferId, u8 arg1, u16 arg2); #endif // GUARD_BATTLE_CONTROLLERS_H -- cgit v1.2.3