summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-08-23 15:00:07 -0400
committeryenatch <yenatch@gmail.com>2013-08-23 15:00:07 -0400
commitbc7b63b44a2d57d4cd67e4470fa88fbe6e303218 (patch)
tree3e7d39c9845b6e4777f1d101951d4d6f13eec7ab
parent849e5a7d0fe432944a2ad3722f72144b5f89cefa (diff)
EventFlags label (bittable1)
-rw-r--r--main.asm2
-rw-r--r--wram.asm15
2 files changed, 7 insertions, 10 deletions
diff --git a/main.asm b/main.asm
index e89385b28..34e001ffe 100644
--- a/main.asm
+++ b/main.asm
@@ -7267,7 +7267,7 @@ Function2e5d: ; 2e5d
BitTable1Func: ; 0x2e6f
- ld hl, $da72
+ ld hl, EventFlags
call BitTableFunc
ret
diff --git a/wram.asm b/wram.asm
index 93eb636b0..15e5dbfd6 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1753,23 +1753,20 @@ UndergroundSwitchPositions: ; d963
FarfetchdPosition: ; d964
ds 1 ; which position the ilex farfetch'd is in
-SECTION "Events",WRAMX[$dad4],BANK[1]
+SECTION "Events",WRAMX[$da72],BANK[1]
+EventFlags: ; da72
;RoomDecorations: ; dac6
-; db 7
-
-HoOhEvent: ; dad4
- ds 1
-LugiaEvent: ; dad5
- ds 1
-
-; TODO
+;HoOhEvent: ; dad4
+;LugiaEvent: ; dad5
;SuicuneEvent: ; dad8 (tin tower)
;TeamRocketAzaleaTownAttackEvent: ; db51
;SudowoodoEvent: ; db51
;PoliceAtElmsLabEvent: ; db52
;SalesmanMahoganyTownEvent: ; db5c
;RedGyaradosEvent: ; db5c
+ ds 250
+; db6c
SECTION "BoxNames",WRAMX[$db75],BANK[1]
; 8 chars + $50