dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix labels, label more scripts

Browse Source
This commit is contained in:
Fontbane
2019-04-04 19:28:37 -04:00
committed by huderlem
parent 8b88ef3e01
commit 9e74409bb2
36 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/bard_music/pokemon.h
View File

@@ -2,7 +2,7 @@
#define GUARD_DATA_BARD_MUSIC_POKEMON_H
#include "constants/species.h"
const u16 gUnknown_085F5490 = NUM_SPECIES;
const u16 gNumSpeciesNames = NUM_SPECIES;
const struct BardSound gBardSounds_Pokemon[][6] = {
{

2
src/easy_chat.c
View File

@@ -4882,7 +4882,7 @@ bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord)
{
case EC_GROUP_POKEMON:
case EC_GROUP_POKEMON_2:
numWordsInGroup = gUnknown_085F5490;
numWordsInGroup = gNumSpeciesNames;
break;
case EC_GROUP_MOVE_1:
case EC_GROUP_MOVE_2:

8
src/item_use.c
View File

@@ -42,8 +42,8 @@
#include "constants/vars.h"
#include "event_obj_lock.h"
extern u8 Route102_EventScript_274482[];
extern u8 Route102_EventScript_2744C0[];
extern u8 BerryTree_EventScript_274482[];
extern u8 BerryTree_EventScript_2744C0[];
extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[];
void SetUpItemUseCallback(u8 taskId);
@@ -669,7 +669,7 @@ void sub_80FDD74(u8 taskId)
{
RemoveBagItem(gSpecialVar_ItemId, 1);
ScriptContext2_Enable();
ScriptContext1_SetupScript(Route102_EventScript_274482);
ScriptContext1_SetupScript(BerryTree_EventScript_274482);
DestroyTask(taskId);
}
@@ -694,7 +694,7 @@ void ItemUseOutOfBattle_WailmerPail(u8 taskId)
void sub_80FDE08(u8 taskId)
{
ScriptContext2_Enable();
ScriptContext1_SetupScript(Route102_EventScript_2744C0);
ScriptContext1_SetupScript(BerryTree_EventScript_2744C0);
DestroyTask(taskId);
}