Document safari reactions, move b string ids to constants

This commit is contained in:
GriffinR
2022-08-23 11:11:50 -04:00
parent a5853a71bd
commit da955aaf64
15 changed files with 41 additions and 44 deletions
+4 -3
View File
@@ -1,5 +1,6 @@
#include "constants/battle.h"
#include "constants/battle_anim.h"
#include "constants/battle_string_ids.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/sound.h"
@@ -10970,9 +10971,9 @@ General_SafariRockThrow:
General_SafariReaction:
createvisualtask AnimTask_SafariGetReaction, 2
waitforvisualfinish
jumpreteq 0, SafariReaction_WatchingCarefully
jumpreteq 1, SafariReaction_Angry
jumpreteq 2, SafariReaction_Eating
jumpreteq B_MSG_MON_WATCHING, SafariReaction_WatchingCarefully
jumpreteq B_MSG_MON_ANGRY, SafariReaction_Angry
jumpreteq B_MSG_MON_EATING, SafariReaction_Eating
end
SafariReaction_WatchingCarefully:
+1 -1
View File
@@ -11,7 +11,7 @@
#include "constants/songs.h"
#include "constants/trainers.h"
#include "constants/game_stat.h"
#include "battle_string_ids.h"
#include "constants/battle_string_ids.h"
.include "asm/macros/battle_script.inc"
@ Define these here since misc_constants.inc conflicts with the C headers
.set NULL, 0
+2 -2
View File
@@ -9,7 +9,7 @@
#include "constants/pokemon.h"
#include "constants/songs.h"
#include "constants/game_stat.h"
#include "battle_string_ids.h"
#include "constants/battle_string_ids.h"
.include "asm/macros/battle_script.inc"
@ Define these here since misc_constants.inc conflicts with the C headers
.set NULL, 0
@@ -209,7 +209,7 @@ BattleScript_PokeFluteEnd::
finishaction
BattleScript_WatchesCarefully::
printfromtable gSafariPokeblockResultStringIds
printfromtable gSafariReactionStringIds
waitmessage B_WAIT_TIME_LONG
playanimation BS_OPPONENT1, B_ANIM_SAFARI_REACTION
end2