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

Merge remote-tracking branch 'upstream/master' into union_room_chat

Browse Source 
# Conflicts:
#	ld_script.txt
This commit is contained in:
Marcus Huderle
2019-03-29 21:27:08 -05:00
parent a978a6a624 7211f996a5
commit accc5ae8dd
9 changed files with 1016 additions and 3223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/vars.h
View File

@@ -60,7 +60,7 @@
#define VAR_POISON_STEP_COUNTER 0x402B
#define VAR_RESET_RTC_ENABLE 0x402C
#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D
#define VAR_UNUSED_0x402E 0x402E // Unused Var
#define VAR_0x402E 0x402E
#define VAR_FRONTIER_MANIAC_FACILITY 0x402F
#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030

9
include/union_room.h Normal file
View File

@@ -0,0 +1,9 @@
#ifndef GUARD_UNION_ROOM_H
#define GUARD_UNION_ROOM_H
extern bool8 gUnknown_02022C60;
void sub_8018798(u8);
void sub_80186EC(bool8, bool32);
#endif //GUARD_UNION_ROOM_H