summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/constants/printer_constants.asm9
-rw-r--r--src/data/maps/permissions/challenge_machine_map_event.bin (renamed from src/data/maps/permissions/unknown1.bin)0
-rw-r--r--src/data/maps/permissions/challenge_machine_map_event_cgb.bin (renamed from src/data/maps/permissions/unknown1_cgb.bin)0
-rw-r--r--src/data/maps/permissions/deck_machine_map_event.bin (renamed from src/data/maps/permissions/unknown_2.bin)0
-rw-r--r--src/data/maps/permissions/deck_machine_map_event_cgb.bin (renamed from src/data/maps/permissions/unknown_2_cgb.bin)0
-rw-r--r--src/data/maps/permissions/hall_of_honor_door_map_event.bin (renamed from src/data/maps/permissions/unknown_3.bin)bin3 -> 3 bytes
-rw-r--r--src/data/maps/permissions/hall_of_honor_door_map_event_cgb.bin (renamed from src/data/maps/permissions/unknown_3_cgb.bin)bin3 -> 3 bytes
-rw-r--r--src/data/maps/permissions/pokemon_dome_door_map_event.bin (renamed from src/data/maps/permissions/unknown_4.bin)bin3 -> 3 bytes
-rw-r--r--src/data/maps/permissions/pokemon_dome_door_map_event_cgb.bin (renamed from src/data/maps/permissions/unknown_4_cgb.bin)bin3 -> 3 bytes
-rw-r--r--src/data/maps/tiles/challenge_machine_map_event.bin (renamed from src/data/maps/tiles/unknown1.bin)0
-rw-r--r--src/data/maps/tiles/challenge_machine_map_event_cgb.bin (renamed from src/data/maps/tiles/unknown1_cgb.bin)0
-rw-r--r--src/data/maps/tiles/deck_machine_map_event.bin (renamed from src/data/maps/tiles/unknown_2.bin)0
-rw-r--r--src/data/maps/tiles/deck_machine_map_event_cgb.bin (renamed from src/data/maps/tiles/unknown_2_cgb.bin)0
-rw-r--r--src/data/maps/tiles/hall_of_honor_door_map_event.bin (renamed from src/data/maps/tiles/unknown_4.bin)0
-rw-r--r--src/data/maps/tiles/hall_of_honor_door_map_event_cgb.bin (renamed from src/data/maps/tiles/unknown_4_cgb.bin)0
-rw-r--r--src/data/maps/tiles/pokemon_dome_door_map_event.bin (renamed from src/data/maps/tiles/unknown_3.bin)bin10 -> 10 bytes
-rw-r--r--src/data/maps/tiles/pokemon_dome_door_map_event_cgb.bin (renamed from src/data/maps/tiles/unknown_3_cgb.bin)bin15 -> 15 bytes
-rw-r--r--src/engine/bank20.asm32
18 files changed, 25 insertions, 16 deletions
diff --git a/src/constants/printer_constants.asm b/src/constants/printer_constants.asm
new file mode 100644
index 0000000..ed6b663
--- /dev/null
+++ b/src/constants/printer_constants.asm
@@ -0,0 +1,9 @@
+; wPrinterStatus
+ const_def 1
+ const PRINTER_STATUS_CHECKING
+ const PRINTER_STATUS_TRANSMITTING
+ const PRINTER_STATUS_PRINTING
+ const PRINTER_ERROR_1
+ const PRINTER_ERROR_PAPER_JAMMED
+ const PRINTER_ERROR_CABLE_PRINTER_SWITCH
+ const PRINTER_ERROR_BATTERIES_LOST_CHARGE
diff --git a/src/data/maps/permissions/unknown1.bin b/src/data/maps/permissions/challenge_machine_map_event.bin
index 26b782d..26b782d 100644
--- a/src/data/maps/permissions/unknown1.bin
+++ b/src/data/maps/permissions/challenge_machine_map_event.bin
diff --git a/src/data/maps/permissions/unknown1_cgb.bin b/src/data/maps/permissions/challenge_machine_map_event_cgb.bin
index 26b782d..26b782d 100644
--- a/src/data/maps/permissions/unknown1_cgb.bin
+++ b/src/data/maps/permissions/challenge_machine_map_event_cgb.bin
diff --git a/src/data/maps/permissions/unknown_2.bin b/src/data/maps/permissions/deck_machine_map_event.bin
index 7f65eeb..7f65eeb 100644
--- a/src/data/maps/permissions/unknown_2.bin
+++ b/src/data/maps/permissions/deck_machine_map_event.bin
diff --git a/src/data/maps/permissions/unknown_2_cgb.bin b/src/data/maps/permissions/deck_machine_map_event_cgb.bin
index 7f65eeb..7f65eeb 100644
--- a/src/data/maps/permissions/unknown_2_cgb.bin
+++ b/src/data/maps/permissions/deck_machine_map_event_cgb.bin
diff --git a/src/data/maps/permissions/unknown_3.bin b/src/data/maps/permissions/hall_of_honor_door_map_event.bin
index 10bc8da..10bc8da 100644
--- a/src/data/maps/permissions/unknown_3.bin
+++ b/src/data/maps/permissions/hall_of_honor_door_map_event.bin
Binary files differ
diff --git a/src/data/maps/permissions/unknown_3_cgb.bin b/src/data/maps/permissions/hall_of_honor_door_map_event_cgb.bin
index 10bc8da..10bc8da 100644
--- a/src/data/maps/permissions/unknown_3_cgb.bin
+++ b/src/data/maps/permissions/hall_of_honor_door_map_event_cgb.bin
Binary files differ
diff --git a/src/data/maps/permissions/unknown_4.bin b/src/data/maps/permissions/pokemon_dome_door_map_event.bin
index 10bc8da..10bc8da 100644
--- a/src/data/maps/permissions/unknown_4.bin
+++ b/src/data/maps/permissions/pokemon_dome_door_map_event.bin
Binary files differ
diff --git a/src/data/maps/permissions/unknown_4_cgb.bin b/src/data/maps/permissions/pokemon_dome_door_map_event_cgb.bin
index 10bc8da..10bc8da 100644
--- a/src/data/maps/permissions/unknown_4_cgb.bin
+++ b/src/data/maps/permissions/pokemon_dome_door_map_event_cgb.bin
Binary files differ
diff --git a/src/data/maps/tiles/unknown1.bin b/src/data/maps/tiles/challenge_machine_map_event.bin
index 1793914..1793914 100644
--- a/src/data/maps/tiles/unknown1.bin
+++ b/src/data/maps/tiles/challenge_machine_map_event.bin
diff --git a/src/data/maps/tiles/unknown1_cgb.bin b/src/data/maps/tiles/challenge_machine_map_event_cgb.bin
index 2a021bb..2a021bb 100644
--- a/src/data/maps/tiles/unknown1_cgb.bin
+++ b/src/data/maps/tiles/challenge_machine_map_event_cgb.bin
diff --git a/src/data/maps/tiles/unknown_2.bin b/src/data/maps/tiles/deck_machine_map_event.bin
index 7fb778f..7fb778f 100644
--- a/src/data/maps/tiles/unknown_2.bin
+++ b/src/data/maps/tiles/deck_machine_map_event.bin
diff --git a/src/data/maps/tiles/unknown_2_cgb.bin b/src/data/maps/tiles/deck_machine_map_event_cgb.bin
index ccd413f..ccd413f 100644
--- a/src/data/maps/tiles/unknown_2_cgb.bin
+++ b/src/data/maps/tiles/deck_machine_map_event_cgb.bin
diff --git a/src/data/maps/tiles/unknown_4.bin b/src/data/maps/tiles/hall_of_honor_door_map_event.bin
index e5fa7a6..e5fa7a6 100644
--- a/src/data/maps/tiles/unknown_4.bin
+++ b/src/data/maps/tiles/hall_of_honor_door_map_event.bin
diff --git a/src/data/maps/tiles/unknown_4_cgb.bin b/src/data/maps/tiles/hall_of_honor_door_map_event_cgb.bin
index 89b40ac..89b40ac 100644
--- a/src/data/maps/tiles/unknown_4_cgb.bin
+++ b/src/data/maps/tiles/hall_of_honor_door_map_event_cgb.bin
diff --git a/src/data/maps/tiles/unknown_3.bin b/src/data/maps/tiles/pokemon_dome_door_map_event.bin
index b861de6..b861de6 100644
--- a/src/data/maps/tiles/unknown_3.bin
+++ b/src/data/maps/tiles/pokemon_dome_door_map_event.bin
Binary files differ
diff --git a/src/data/maps/tiles/unknown_3_cgb.bin b/src/data/maps/tiles/pokemon_dome_door_map_event_cgb.bin
index f621932..f621932 100644
--- a/src/data/maps/tiles/unknown_3_cgb.bin
+++ b/src/data/maps/tiles/pokemon_dome_door_map_event_cgb.bin
Binary files differ
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm
index 960c7d1..951a699 100644
--- a/src/engine/bank20.asm
+++ b/src/engine/bank20.asm
@@ -2364,18 +2364,18 @@ ChallengeMachineMapEventTilemap:: ; 81ed1 (20:5ed1)
db $06 ; height
dw ChallengeMachineMapEventPermissions
db FALSE ; cgb mode
- INCBIN "data/maps/tiles/unknown1.bin"
+ INCBIN "data/maps/tiles/challenge_machine_map_event.bin"
ChallengeMachineMapEventPermissions:
- INCBIN "data/maps/permissions/unknown1.bin"
+ INCBIN "data/maps/permissions/challenge_machine_map_event.bin"
ChallengeMachineMapEventCGBTilemap:: ; 81ef5 (20:5ef5)
db $04 ; width
db $06 ; height
dw ChallengeMachineMapEventCGBPermissions
db TRUE ; cgb mode
- INCBIN "data/maps/tiles/unknown1_cgb.bin"
+ INCBIN "data/maps/tiles/challenge_machine_map_event_cgb.bin"
ChallengeMachineMapEventCGBPermissions:
- INCBIN "data/maps/permissions/unknown1_cgb.bin"
+ INCBIN "data/maps/permissions/challenge_machine_map_event_cgb.bin"
DeckMachineRoomTilemap:: ; 81f26 (20:5f26)
db $18 ; width
@@ -2400,18 +2400,18 @@ DeckMachineMapEventTilemap:: ; 82143 (20:6143)
db $01 ; height
dw DeckMachineMapEventPermissions
db FALSE ; cgb mode
- INCBIN "data/maps/tiles/unknown_2.bin"
+ INCBIN "data/maps/tiles/deck_machine_map_event.bin"
DeckMachineMapEventPermissions:
- INCBIN "data/maps/permissions/unknown_2.bin"
+ INCBIN "data/maps/permissions/deck_machine_map_event.bin"
DeckMachineMapEventCGBTilemap:: ; 82150 (20:6150)
db $04 ; width
db $01 ; height
dw DeckMachineMapEventCGBPermissions
db TRUE ; cgb mode
- INCBIN "data/maps/tiles/unknown_2_cgb.bin"
+ INCBIN "data/maps/tiles/deck_machine_map_event_cgb.bin"
DeckMachineMapEventCGBPermissions:
- INCBIN "data/maps/permissions/unknown_2_cgb.bin"
+ INCBIN "data/maps/permissions/deck_machine_map_event_cgb.bin"
IshiharaTilemap:: ; 82160 (20:6160)
db $14 ; width
@@ -2652,36 +2652,36 @@ PokemonDomeDoorMapEventTilemap:: ; 83bf1 (20:7bf1)
db $03 ; height
dw PokemonDomeDoorMapEventPermissions
db FALSE ; cgb mode
- INCBIN "data/maps/tiles/unknown_3.bin"
+ INCBIN "data/maps/tiles/pokemon_dome_door_map_event.bin"
PokemonDomeDoorMapEventPermissions:
- INCBIN "data/maps/permissions/unknown_3.bin"
+ INCBIN "data/maps/permissions/pokemon_dome_door_map_event.bin"
PokemonDomeDoorMapEventCGBTilemap:: ; 83c03 (20:7c03)
db $04 ; width
db $03 ; height
dw PokemonDomeDoorMapEventCGBPermissions
db TRUE ; cgb mode
- INCBIN "data/maps/tiles/unknown_3_cgb.bin"
+ INCBIN "data/maps/tiles/pokemon_dome_door_map_event_cgb.bin"
PokemonDomeDoorMapEventCGBPermissions:
- INCBIN "data/maps/permissions/unknown_3_cgb.bin"
+ INCBIN "data/maps/permissions/pokemon_dome_door_map_event_cgb.bin"
HallOfHonorDoorMapEventTilemap:: ; 83c1a (20:7c1a)
db $04 ; width
db $03 ; height
dw HallOfHonorDoorMapEventPermissions
db FALSE ; cgb mode
- INCBIN "data/maps/tiles/unknown_4.bin"
+ INCBIN "data/maps/tiles/hall_of_honor_door_map_event.bin"
HallOfHonorDoorMapEventPermissions:
- INCBIN "data/maps/permissions/unknown_4.bin"
+ INCBIN "data/maps/permissions/hall_of_honor_door_map_event.bin"
HallOfHonorDoorMapEventCGBTilemap:: ; 83c26 (20:7c26)
db $04 ; width
db $03 ; height
dw HallOfHonorDoorMapEventCGBPermissions
db TRUE ; cgb mode
- INCBIN "data/maps/tiles/unknown_4_cgb.bin"
+ INCBIN "data/maps/tiles/hall_of_honor_door_map_event_cgb.bin"
HallOfHonorDoorMapEventCGBPermissions:
- INCBIN "data/maps/permissions/unknown_4_cgb.bin"
+ INCBIN "data/maps/permissions/hall_of_honor_door_map_event_cgb.bin"
GrassMedalTilemap:: ; 83c36 (20:7c36)
db $03 ; width