diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-10 18:12:18 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-10 18:12:18 -0600 |
| commit | 2e40384fa22725de06a5293454b8962ab4de8f4d (patch) | |
| tree | b44de7b89c3c19dd3f6ee985c92707462a446c89 /src/battle_controller_safari.c | |
| parent | a6c30ba9513ccbd202fec8e628c9336c5c3a4aa4 (diff) | |
Extract baseroms from event_scripts
Diffstat (limited to 'src/battle_controller_safari.c')
| -rw-r--r-- | src/battle_controller_safari.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 0c5b698cf..49c98915e 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -33,7 +33,7 @@ extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200]; extern u8 gBattleBufferB[BATTLE_BANKS_COUNT][0x200]; extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT]; extern struct SpriteTemplate gUnknown_0202499C; -extern u16 gScriptItemId; +extern u16 gSpecialVar_ItemId; extern u8 gHealthBoxesIds[BATTLE_BANKS_COUNT]; extern u8 gBattleOutcome; extern u16 gBattle_BG0_X; @@ -305,7 +305,7 @@ static void CompleteWhenChosePokeblock(void) { if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) { - EmitOneReturnValue(1, gScriptItemId); + EmitOneReturnValue(1, gSpecialVar_ItemId); SafariBufferExecCompleted(); } } |