diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-26 12:23:08 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-26 12:23:08 -0500 |
| commit | 9c934c966400813e8ed6c8a5c0f93fb8cdc12546 (patch) | |
| tree | 8e131411fca696d59f68a0116e59751e53d2b55b | |
| parent | 4c12ad00d21b43d0946b2a0ba3ee471af9262673 (diff) | |
| parent | 9a6c2c25d08ef157cc4800014651bd0c679f6fc5 (diff) | |
Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers
228 files changed, 437 insertions, 714 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 633c3b38e..18eaf8040 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -743,7 +743,7 @@ AI_CheckViability: if_effect EFFECT_MIRROR_COAT, AI_CV_MirrorCoat if_effect EFFECT_SKULL_BASH, AI_CV_ChargeUpMove if_effect EFFECT_SOLARBEAM, AI_CV_ChargeUpMove - if_effect EFFECT_SEMI_INVULNERABLE, AI_CV_Fly + if_effect EFFECT_SEMI_INVULNERABLE, AI_CV_SemiInvulnerable if_effect EFFECT_SOFTBOILED, AI_CV_Heal if_effect EFFECT_FAKE_OUT, AI_CV_FakeOut if_effect EFFECT_SPIT_UP, AI_CV_SpitUp @@ -2317,48 +2317,51 @@ AI_CV_ChargeUpMove_ScoreDown2: AI_CV_ChargeUpMove_End: end -AI_CV_Fly: - if_doesnt_have_move_with_effect AI_TARGET, EFFECT_PROTECT, AI_CV_Fly2 +AI_CV_SemiInvulnerable: + if_doesnt_have_move_with_effect AI_TARGET, EFFECT_PROTECT, AI_CV_SemiInvulnerable2 score -1 - goto AI_CV_Fly_End - -AI_CV_Fly2: - if_status AI_TARGET, STATUS1_TOXIC_POISON, AI_CV_Fly6 - if_status2 AI_TARGET, STATUS2_CURSED, AI_CV_Fly6 - if_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_Fly6 + goto AI_CV_SemiInvulnerable_End + +@ BUG: The scripts for checking type-resistance to weather for semi-invulnerable moves are swapped +@ The result is that the AI is encouraged to stall while taking damage from weather +@ To fix, swap _CheckSandstormTypes/_CheckIceType in the below script +AI_CV_SemiInvulnerable2: + if_status AI_TARGET, STATUS1_TOXIC_POISON, AI_CV_SemiInvulnerable_TryEncourage + if_status2 AI_TARGET, STATUS2_CURSED, AI_CV_SemiInvulnerable_TryEncourage + if_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_SemiInvulnerable_TryEncourage get_weather - if_equal AI_WEATHER_HAIL, AI_CV_Fly3 - if_equal AI_WEATHER_SANDSTORM, AI_CV_Fly4 - goto AI_CV_Fly5 + if_equal AI_WEATHER_HAIL, AI_CV_SemiInvulnerable_CheckSandstormTypes + if_equal AI_WEATHER_SANDSTORM, AI_CV_SemiInvulnerable_CheckIceType + goto AI_CV_SemiInvulnerable5 -AI_CV_Fly3: +AI_CV_SemiInvulnerable_CheckSandstormTypes: get_user_type1 - if_in_bytes AI_CV_Fly_TypesToEncourage, AI_CV_Fly6 + if_in_bytes AI_CV_SandstormResistantTypes, AI_CV_SemiInvulnerable_TryEncourage get_user_type2 - if_in_bytes AI_CV_Fly_TypesToEncourage, AI_CV_Fly6 - goto AI_CV_Fly5 + if_in_bytes AI_CV_SandstormResistantTypes, AI_CV_SemiInvulnerable_TryEncourage + goto AI_CV_SemiInvulnerable5 -AI_CV_Fly4: +AI_CV_SemiInvulnerable_CheckIceType: get_user_type1 - if_equal TYPE_ICE, AI_CV_Fly6 + if_equal TYPE_ICE, AI_CV_SemiInvulnerable_TryEncourage get_user_type2 - if_equal TYPE_ICE, AI_CV_Fly6 + if_equal TYPE_ICE, AI_CV_SemiInvulnerable_TryEncourage -AI_CV_Fly5: - if_target_faster AI_CV_Fly_End +AI_CV_SemiInvulnerable5: + if_target_faster AI_CV_SemiInvulnerable_End get_last_used_bank_move AI_TARGET get_move_effect_from_result - if_not_equal EFFECT_LOCK_ON, AI_CV_Fly6 - goto AI_CV_Fly_End + if_not_equal EFFECT_LOCK_ON, AI_CV_SemiInvulnerable_TryEncourage + goto AI_CV_SemiInvulnerable_End -AI_CV_Fly6: - if_random_less_than 80, AI_CV_Fly_End +AI_CV_SemiInvulnerable_TryEncourage: + if_random_less_than 80, AI_CV_SemiInvulnerable_End score +1 -AI_CV_Fly_End: +AI_CV_SemiInvulnerable_End: end -AI_CV_Fly_TypesToEncourage: +AI_CV_SandstormResistantTypes: .byte TYPE_GROUND .byte TYPE_ROCK .byte TYPE_STEEL diff --git a/graphics/door_anims/00/0.png b/graphics/door_anims/00/0.png Binary files differdeleted file mode 100644 index ac2c4b438..000000000 --- a/graphics/door_anims/00/0.png +++ /dev/null diff --git a/graphics/door_anims/00/1.png b/graphics/door_anims/00/1.png Binary files differdeleted file mode 100644 index cfe812f75..000000000 --- a/graphics/door_anims/00/1.png +++ /dev/null diff --git a/graphics/door_anims/00/2.png b/graphics/door_anims/00/2.png Binary files differdeleted file mode 100644 index 88e5d480c..000000000 --- a/graphics/door_anims/00/2.png +++ /dev/null diff --git a/graphics/door_anims/01/0.png b/graphics/door_anims/01/0.png Binary files differdeleted file mode 100644 index cb8c6fc4c..000000000 --- a/graphics/door_anims/01/0.png +++ /dev/null diff --git a/graphics/door_anims/01/1.png b/graphics/door_anims/01/1.png Binary files differdeleted file mode 100644 index 102db4cef..000000000 --- a/graphics/door_anims/01/1.png +++ /dev/null diff --git a/graphics/door_anims/01/2.png b/graphics/door_anims/01/2.png Binary files differdeleted file mode 100644 index 0a97da6ce..000000000 --- a/graphics/door_anims/01/2.png +++ /dev/null diff --git a/graphics/door_anims/02/0.png b/graphics/door_anims/02/0.png Binary files differdeleted file mode 100644 index 744949971..000000000 --- a/graphics/door_anims/02/0.png +++ /dev/null diff --git a/graphics/door_anims/02/1.png b/graphics/door_anims/02/1.png Binary files differdeleted file mode 100644 index 6c328b9ff..000000000 --- a/graphics/door_anims/02/1.png +++ /dev/null diff --git a/graphics/door_anims/02/2.png b/graphics/door_anims/02/2.png Binary files differdeleted file mode 100644 index 0ee9ba8f0..000000000 --- a/graphics/door_anims/02/2.png +++ /dev/null diff --git a/graphics/door_anims/03/0.png b/graphics/door_anims/03/0.png Binary files differdeleted file mode 100644 index cb8c6fc4c..000000000 --- a/graphics/door_anims/03/0.png +++ /dev/null diff --git a/graphics/door_anims/03/1.png b/graphics/door_anims/03/1.png Binary files differdeleted file mode 100644 index 102db4cef..000000000 --- a/graphics/door_anims/03/1.png +++ /dev/null diff --git a/graphics/door_anims/03/2.png b/graphics/door_anims/03/2.png Binary files differdeleted file mode 100644 index 0a97da6ce..000000000 --- a/graphics/door_anims/03/2.png +++ /dev/null diff --git a/graphics/door_anims/04/0.png b/graphics/door_anims/04/0.png Binary files differdeleted file mode 100644 index 1c2cd1db1..000000000 --- a/graphics/door_anims/04/0.png +++ /dev/null diff --git a/graphics/door_anims/04/1.png b/graphics/door_anims/04/1.png Binary files differdeleted file mode 100644 index 65b58bc82..000000000 --- a/graphics/door_anims/04/1.png +++ /dev/null diff --git a/graphics/door_anims/04/2.png b/graphics/door_anims/04/2.png Binary files differdeleted file mode 100644 index 8c8e37b7d..000000000 --- a/graphics/door_anims/04/2.png +++ /dev/null diff --git a/graphics/door_anims/05/0.png b/graphics/door_anims/05/0.png Binary files differdeleted file mode 100644 index 8f4fe425f..000000000 --- a/graphics/door_anims/05/0.png +++ /dev/null diff --git a/graphics/door_anims/05/1.png b/graphics/door_anims/05/1.png Binary files differdeleted file mode 100644 index 52002fb32..000000000 --- a/graphics/door_anims/05/1.png +++ /dev/null diff --git a/graphics/door_anims/05/2.png b/graphics/door_anims/05/2.png Binary files differdeleted file mode 100644 index 2b4f36508..000000000 --- a/graphics/door_anims/05/2.png +++ /dev/null diff --git a/graphics/door_anims/06/0.png b/graphics/door_anims/06/0.png Binary files differdeleted file mode 100644 index 2b3cade89..000000000 --- a/graphics/door_anims/06/0.png +++ /dev/null diff --git a/graphics/door_anims/06/1.png b/graphics/door_anims/06/1.png Binary files differdeleted file mode 100644 index c397bd4da..000000000 --- a/graphics/door_anims/06/1.png +++ /dev/null diff --git a/graphics/door_anims/06/2.png b/graphics/door_anims/06/2.png Binary files differdeleted file mode 100644 index 8883dad1c..000000000 --- a/graphics/door_anims/06/2.png +++ /dev/null diff --git a/graphics/door_anims/07/0.png b/graphics/door_anims/07/0.png Binary files differdeleted file mode 100644 index 2b3cade89..000000000 --- a/graphics/door_anims/07/0.png +++ /dev/null diff --git a/graphics/door_anims/07/1.png b/graphics/door_anims/07/1.png Binary files differdeleted file mode 100644 index c397bd4da..000000000 --- a/graphics/door_anims/07/1.png +++ /dev/null diff --git a/graphics/door_anims/07/2.png b/graphics/door_anims/07/2.png Binary files differdeleted file mode 100644 index 8883dad1c..000000000 --- a/graphics/door_anims/07/2.png +++ /dev/null diff --git a/graphics/door_anims/08/0.png b/graphics/door_anims/08/0.png Binary files differdeleted file mode 100644 index 832abe1c4..000000000 --- a/graphics/door_anims/08/0.png +++ /dev/null diff --git a/graphics/door_anims/08/1.png b/graphics/door_anims/08/1.png Binary files differdeleted file mode 100644 index f6a402eec..000000000 --- a/graphics/door_anims/08/1.png +++ /dev/null diff --git a/graphics/door_anims/08/2.png b/graphics/door_anims/08/2.png Binary files differdeleted file mode 100644 index 082f1a212..000000000 --- a/graphics/door_anims/08/2.png +++ /dev/null diff --git a/graphics/door_anims/09/0.png b/graphics/door_anims/09/0.png Binary files differdeleted file mode 100644 index 6205d426d..000000000 --- a/graphics/door_anims/09/0.png +++ /dev/null diff --git a/graphics/door_anims/09/1.png b/graphics/door_anims/09/1.png Binary files differdeleted file mode 100644 index 333f28fac..000000000 --- a/graphics/door_anims/09/1.png +++ /dev/null diff --git a/graphics/door_anims/09/2.png b/graphics/door_anims/09/2.png Binary files differdeleted file mode 100644 index 5288fc4ea..000000000 --- a/graphics/door_anims/09/2.png +++ /dev/null diff --git a/graphics/door_anims/10/0.png b/graphics/door_anims/10/0.png Binary files differdeleted file mode 100644 index c1fc3d631..000000000 --- a/graphics/door_anims/10/0.png +++ /dev/null diff --git a/graphics/door_anims/10/1.png b/graphics/door_anims/10/1.png Binary files differdeleted file mode 100644 index 3daffe355..000000000 --- a/graphics/door_anims/10/1.png +++ /dev/null diff --git a/graphics/door_anims/10/2.png b/graphics/door_anims/10/2.png Binary files differdeleted file mode 100644 index 48e2d3a8c..000000000 --- a/graphics/door_anims/10/2.png +++ /dev/null diff --git a/graphics/door_anims/11/0.png b/graphics/door_anims/11/0.png Binary files differdeleted file mode 100644 index d5b78a46f..000000000 --- a/graphics/door_anims/11/0.png +++ /dev/null diff --git a/graphics/door_anims/11/1.png b/graphics/door_anims/11/1.png Binary files differdeleted file mode 100644 index 72ed6d148..000000000 --- a/graphics/door_anims/11/1.png +++ /dev/null diff --git a/graphics/door_anims/11/2.png b/graphics/door_anims/11/2.png Binary files differdeleted file mode 100644 index 8b20c59c4..000000000 --- a/graphics/door_anims/11/2.png +++ /dev/null diff --git a/graphics/door_anims/12/0.png b/graphics/door_anims/12/0.png Binary files differdeleted file mode 100644 index ac2c4b438..000000000 --- a/graphics/door_anims/12/0.png +++ /dev/null diff --git a/graphics/door_anims/12/1.png b/graphics/door_anims/12/1.png Binary files differdeleted file mode 100644 index cfe812f75..000000000 --- a/graphics/door_anims/12/1.png +++ /dev/null diff --git a/graphics/door_anims/12/2.png b/graphics/door_anims/12/2.png Binary files differdeleted file mode 100644 index 88e5d480c..000000000 --- a/graphics/door_anims/12/2.png +++ /dev/null diff --git a/graphics/door_anims/13/0.png b/graphics/door_anims/13/0.png Binary files differdeleted file mode 100644 index 8c3b85068..000000000 --- a/graphics/door_anims/13/0.png +++ /dev/null diff --git a/graphics/door_anims/13/1.png b/graphics/door_anims/13/1.png Binary files differdeleted file mode 100644 index 1b92f4bca..000000000 --- a/graphics/door_anims/13/1.png +++ /dev/null diff --git a/graphics/door_anims/13/2.png b/graphics/door_anims/13/2.png Binary files differdeleted file mode 100644 index e4be80873..000000000 --- a/graphics/door_anims/13/2.png +++ /dev/null diff --git a/graphics/door_anims/14/0.png b/graphics/door_anims/14/0.png Binary files differdeleted file mode 100644 index af845aef4..000000000 --- a/graphics/door_anims/14/0.png +++ /dev/null diff --git a/graphics/door_anims/14/1.png b/graphics/door_anims/14/1.png Binary files differdeleted file mode 100644 index 53725c901..000000000 --- a/graphics/door_anims/14/1.png +++ /dev/null diff --git a/graphics/door_anims/14/2.png b/graphics/door_anims/14/2.png Binary files differdeleted file mode 100644 index 1b3a8e178..000000000 --- a/graphics/door_anims/14/2.png +++ /dev/null diff --git a/graphics/door_anims/15/0.png b/graphics/door_anims/15/0.png Binary files differdeleted file mode 100644 index d9f37092b..000000000 --- a/graphics/door_anims/15/0.png +++ /dev/null diff --git a/graphics/door_anims/15/1.png b/graphics/door_anims/15/1.png Binary files differdeleted file mode 100644 index b9dbb58c4..000000000 --- a/graphics/door_anims/15/1.png +++ /dev/null diff --git a/graphics/door_anims/15/2.png b/graphics/door_anims/15/2.png Binary files differdeleted file mode 100644 index ce6a1fe2b..000000000 --- a/graphics/door_anims/15/2.png +++ /dev/null diff --git a/graphics/door_anims/16/0.png b/graphics/door_anims/16/0.png Binary files differdeleted file mode 100644 index a385f7ad0..000000000 --- a/graphics/door_anims/16/0.png +++ /dev/null diff --git a/graphics/door_anims/16/1.png b/graphics/door_anims/16/1.png Binary files differdeleted file mode 100644 index 67b16f45d..000000000 --- a/graphics/door_anims/16/1.png +++ /dev/null diff --git a/graphics/door_anims/16/2.png b/graphics/door_anims/16/2.png Binary files differdeleted file mode 100644 index e796302f0..000000000 --- a/graphics/door_anims/16/2.png +++ /dev/null diff --git a/graphics/door_anims/17/0.png b/graphics/door_anims/17/0.png Binary files differdeleted file mode 100644 index 90774f8f7..000000000 --- a/graphics/door_anims/17/0.png +++ /dev/null diff --git a/graphics/door_anims/17/1.png b/graphics/door_anims/17/1.png Binary files differdeleted file mode 100644 index 06a278c0c..000000000 --- a/graphics/door_anims/17/1.png +++ /dev/null diff --git a/graphics/door_anims/17/2.png b/graphics/door_anims/17/2.png Binary files differdeleted file mode 100644 index e0e60042c..000000000 --- a/graphics/door_anims/17/2.png +++ /dev/null diff --git a/graphics/door_anims/18/0.png b/graphics/door_anims/18/0.png Binary files differdeleted file mode 100644 index 2605a89a2..000000000 --- a/graphics/door_anims/18/0.png +++ /dev/null diff --git a/graphics/door_anims/18/1.png b/graphics/door_anims/18/1.png Binary files differdeleted file mode 100644 index d76dd3157..000000000 --- a/graphics/door_anims/18/1.png +++ /dev/null diff --git a/graphics/door_anims/18/2.png b/graphics/door_anims/18/2.png Binary files differdeleted file mode 100644 index 2280e92fc..000000000 --- a/graphics/door_anims/18/2.png +++ /dev/null diff --git a/graphics/door_anims/19/0.png b/graphics/door_anims/19/0.png Binary files differdeleted file mode 100644 index 80309914b..000000000 --- a/graphics/door_anims/19/0.png +++ /dev/null diff --git a/graphics/door_anims/19/1.png b/graphics/door_anims/19/1.png Binary files differdeleted file mode 100644 index 5097cd859..000000000 --- a/graphics/door_anims/19/1.png +++ /dev/null diff --git a/graphics/door_anims/19/2.png b/graphics/door_anims/19/2.png Binary files differdeleted file mode 100644 index 52487c3c3..000000000 --- a/graphics/door_anims/19/2.png +++ /dev/null diff --git a/graphics/door_anims/20/0.png b/graphics/door_anims/20/0.png Binary files differdeleted file mode 100644 index 5e93af90b..000000000 --- a/graphics/door_anims/20/0.png +++ /dev/null diff --git a/graphics/door_anims/20/1.png b/graphics/door_anims/20/1.png Binary files differdeleted file mode 100644 index 438d0f16a..000000000 --- a/graphics/door_anims/20/1.png +++ /dev/null diff --git a/graphics/door_anims/20/2.png b/graphics/door_anims/20/2.png Binary files differdeleted file mode 100644 index 4483dacd0..000000000 --- a/graphics/door_anims/20/2.png +++ /dev/null diff --git a/graphics/door_anims/21/0.png b/graphics/door_anims/21/0.png Binary files differdeleted file mode 100644 index 839dc109d..000000000 --- a/graphics/door_anims/21/0.png +++ /dev/null diff --git a/graphics/door_anims/21/1.png b/graphics/door_anims/21/1.png Binary files differdeleted file mode 100644 index 5cabacdc9..000000000 --- a/graphics/door_anims/21/1.png +++ /dev/null diff --git a/graphics/door_anims/21/2.png b/graphics/door_anims/21/2.png Binary files differdeleted file mode 100644 index 73353c9bb..000000000 --- a/graphics/door_anims/21/2.png +++ /dev/null diff --git a/graphics/door_anims/22/0.png b/graphics/door_anims/22/0.png Binary files differdeleted file mode 100644 index 96dd8ea11..000000000 --- a/graphics/door_anims/22/0.png +++ /dev/null diff --git a/graphics/door_anims/22/1.png b/graphics/door_anims/22/1.png Binary files differdeleted file mode 100644 index 446d5bec3..000000000 --- a/graphics/door_anims/22/1.png +++ /dev/null diff --git a/graphics/door_anims/22/2.png b/graphics/door_anims/22/2.png Binary files differdeleted file mode 100644 index 59438d105..000000000 --- a/graphics/door_anims/22/2.png +++ /dev/null diff --git a/graphics/door_anims/23/0.png b/graphics/door_anims/23/0.png Binary files differdeleted file mode 100644 index a331665a8..000000000 --- a/graphics/door_anims/23/0.png +++ /dev/null diff --git a/graphics/door_anims/23/1.png b/graphics/door_anims/23/1.png Binary files differdeleted file mode 100644 index 7ea47bba0..000000000 --- a/graphics/door_anims/23/1.png +++ /dev/null diff --git a/graphics/door_anims/23/2.png b/graphics/door_anims/23/2.png Binary files differdeleted file mode 100644 index 9d2b940cc..000000000 --- a/graphics/door_anims/23/2.png +++ /dev/null diff --git a/graphics/door_anims/24/0.png b/graphics/door_anims/24/0.png Binary files differdeleted file mode 100644 index 49dd2b432..000000000 --- a/graphics/door_anims/24/0.png +++ /dev/null diff --git a/graphics/door_anims/24/1.png b/graphics/door_anims/24/1.png Binary files differdeleted file mode 100644 index 10bb6c2f4..000000000 --- a/graphics/door_anims/24/1.png +++ /dev/null diff --git a/graphics/door_anims/24/2.png b/graphics/door_anims/24/2.png Binary files differdeleted file mode 100644 index 328b692ea..000000000 --- a/graphics/door_anims/24/2.png +++ /dev/null diff --git a/graphics/door_anims/25/0.png b/graphics/door_anims/25/0.png Binary files differdeleted file mode 100644 index 291e71e90..000000000 --- a/graphics/door_anims/25/0.png +++ /dev/null diff --git a/graphics/door_anims/25/1.png b/graphics/door_anims/25/1.png Binary files differdeleted file mode 100644 index 4c0b5a105..000000000 --- a/graphics/door_anims/25/1.png +++ /dev/null diff --git a/graphics/door_anims/25/2.png b/graphics/door_anims/25/2.png Binary files differdeleted file mode 100644 index a19c6c27b..000000000 --- a/graphics/door_anims/25/2.png +++ /dev/null diff --git a/graphics/door_anims/26/0.png b/graphics/door_anims/26/0.png Binary files differdeleted file mode 100644 index a4e6ef57c..000000000 --- a/graphics/door_anims/26/0.png +++ /dev/null diff --git a/graphics/door_anims/26/1.png b/graphics/door_anims/26/1.png Binary files differdeleted file mode 100644 index 495b7d743..000000000 --- a/graphics/door_anims/26/1.png +++ /dev/null diff --git a/graphics/door_anims/26/2.png b/graphics/door_anims/26/2.png Binary files differdeleted file mode 100644 index dece153ab..000000000 --- a/graphics/door_anims/26/2.png +++ /dev/null diff --git a/graphics/door_anims/27/0.png b/graphics/door_anims/27/0.png Binary files differdeleted file mode 100644 index 45056f579..000000000 --- a/graphics/door_anims/27/0.png +++ /dev/null diff --git a/graphics/door_anims/27/1.png b/graphics/door_anims/27/1.png Binary files differdeleted file mode 100644 index 287f7e55a..000000000 --- a/graphics/door_anims/27/1.png +++ /dev/null diff --git a/graphics/door_anims/27/2.png b/graphics/door_anims/27/2.png Binary files differdeleted file mode 100644 index 02c810637..000000000 --- a/graphics/door_anims/27/2.png +++ /dev/null diff --git a/graphics/door_anims/28/0.png b/graphics/door_anims/28/0.png Binary files differdeleted file mode 100644 index 3da426d0f..000000000 --- a/graphics/door_anims/28/0.png +++ /dev/null diff --git a/graphics/door_anims/28/1.png b/graphics/door_anims/28/1.png Binary files differdeleted file mode 100644 index 77f8a5991..000000000 --- a/graphics/door_anims/28/1.png +++ /dev/null diff --git a/graphics/door_anims/28/2.png b/graphics/door_anims/28/2.png Binary files differdeleted file mode 100644 index f90e0d148..000000000 --- a/graphics/door_anims/28/2.png +++ /dev/null diff --git a/graphics/door_anims/29/0.png b/graphics/door_anims/29/0.png Binary files differdeleted file mode 100644 index 832abe1c4..000000000 --- a/graphics/door_anims/29/0.png +++ /dev/null diff --git a/graphics/door_anims/29/1.png b/graphics/door_anims/29/1.png Binary files differdeleted file mode 100644 index f6a402eec..000000000 --- a/graphics/door_anims/29/1.png +++ /dev/null diff --git a/graphics/door_anims/29/2.png b/graphics/door_anims/29/2.png Binary files differdeleted file mode 100644 index 082f1a212..000000000 --- a/graphics/door_anims/29/2.png +++ /dev/null diff --git a/graphics/door_anims/30/0.png b/graphics/door_anims/30/0.png Binary files differdeleted file mode 100644 index f199a34b9..000000000 --- a/graphics/door_anims/30/0.png +++ /dev/null diff --git a/graphics/door_anims/30/1.png b/graphics/door_anims/30/1.png Binary files differdeleted file mode 100644 index 15beb5a36..000000000 --- a/graphics/door_anims/30/1.png +++ /dev/null diff --git a/graphics/door_anims/30/2.png b/graphics/door_anims/30/2.png Binary files differdeleted file mode 100644 index 2306a6b53..000000000 --- a/graphics/door_anims/30/2.png +++ /dev/null diff --git a/graphics/door_anims/31/0.png b/graphics/door_anims/31/0.png Binary files differdeleted file mode 100644 index 94c738d3f..000000000 --- a/graphics/door_anims/31/0.png +++ /dev/null diff --git a/graphics/door_anims/31/1.png b/graphics/door_anims/31/1.png Binary files differdeleted file mode 100644 index 817eff6e7..000000000 --- a/graphics/door_anims/31/1.png +++ /dev/null diff --git a/graphics/door_anims/31/2.png b/graphics/door_anims/31/2.png Binary files differdeleted file mode 100644 index cf05cc488..000000000 --- a/graphics/door_anims/31/2.png +++ /dev/null diff --git a/graphics/door_anims/32/0.png b/graphics/door_anims/32/0.png Binary files differdeleted file mode 100644 index a18d49d80..000000000 --- a/graphics/door_anims/32/0.png +++ /dev/null diff --git a/graphics/door_anims/32/1.png b/graphics/door_anims/32/1.png Binary files differdeleted file mode 100644 index 2fc91d012..000000000 --- a/graphics/door_anims/32/1.png +++ /dev/null diff --git a/graphics/door_anims/32/2.png b/graphics/door_anims/32/2.png Binary files differdeleted file mode 100644 index 6d05fcc11..000000000 --- a/graphics/door_anims/32/2.png +++ /dev/null diff --git a/graphics/door_anims/33/0.png b/graphics/door_anims/33/0.png Binary files differdeleted file mode 100644 index 3597efaa6..000000000 --- a/graphics/door_anims/33/0.png +++ /dev/null diff --git a/graphics/door_anims/33/1.png b/graphics/door_anims/33/1.png Binary files differdeleted file mode 100644 index 6c9c4db27..000000000 --- a/graphics/door_anims/33/1.png +++ /dev/null diff --git a/graphics/door_anims/33/2.png b/graphics/door_anims/33/2.png Binary files differdeleted file mode 100644 index d52c8243f..000000000 --- a/graphics/door_anims/33/2.png +++ /dev/null diff --git a/graphics/door_anims/34/0.png b/graphics/door_anims/34/0.png Binary files differdeleted file mode 100644 index 26e0a0654..000000000 --- a/graphics/door_anims/34/0.png +++ /dev/null diff --git a/graphics/door_anims/34/1.png b/graphics/door_anims/34/1.png Binary files differdeleted file mode 100644 index 89baa478c..000000000 --- a/graphics/door_anims/34/1.png +++ /dev/null diff --git a/graphics/door_anims/34/2.png b/graphics/door_anims/34/2.png Binary files differdeleted file mode 100644 index 35cf42295..000000000 --- a/graphics/door_anims/34/2.png +++ /dev/null diff --git a/graphics/door_anims/35/0.png b/graphics/door_anims/35/0.png Binary files differdeleted file mode 100644 index d9703db87..000000000 --- a/graphics/door_anims/35/0.png +++ /dev/null diff --git a/graphics/door_anims/35/1.png b/graphics/door_anims/35/1.png Binary files differdeleted file mode 100644 index da3ecb839..000000000 --- a/graphics/door_anims/35/1.png +++ /dev/null diff --git a/graphics/door_anims/35/2.png b/graphics/door_anims/35/2.png Binary files differdeleted file mode 100644 index 32acbcaa2..000000000 --- a/graphics/door_anims/35/2.png +++ /dev/null diff --git a/graphics/door_anims/36/0.png b/graphics/door_anims/36/0.png Binary files differdeleted file mode 100644 index 0bb35c0c5..000000000 --- a/graphics/door_anims/36/0.png +++ /dev/null diff --git a/graphics/door_anims/36/1.png b/graphics/door_anims/36/1.png Binary files differdeleted file mode 100644 index c3a2aa3e2..000000000 --- a/graphics/door_anims/36/1.png +++ /dev/null diff --git a/graphics/door_anims/36/2.png b/graphics/door_anims/36/2.png Binary files differdeleted file mode 100644 index 33b2a1e02..000000000 --- a/graphics/door_anims/36/2.png +++ /dev/null diff --git a/graphics/door_anims/37/0.png b/graphics/door_anims/37/0.png Binary files differdeleted file mode 100644 index cf0bcd397..000000000 --- a/graphics/door_anims/37/0.png +++ /dev/null diff --git a/graphics/door_anims/37/1.png b/graphics/door_anims/37/1.png Binary files differdeleted file mode 100644 index a5fcb7e27..000000000 --- a/graphics/door_anims/37/1.png +++ /dev/null diff --git a/graphics/door_anims/37/2.png b/graphics/door_anims/37/2.png Binary files differdeleted file mode 100644 index 70774fcf7..000000000 --- a/graphics/door_anims/37/2.png +++ /dev/null diff --git a/graphics/door_anims/38/0.png b/graphics/door_anims/38/0.png Binary files differdeleted file mode 100644 index b952321b7..000000000 --- a/graphics/door_anims/38/0.png +++ /dev/null diff --git a/graphics/door_anims/38/1.png b/graphics/door_anims/38/1.png Binary files differdeleted file mode 100644 index a7dd729d3..000000000 --- a/graphics/door_anims/38/1.png +++ /dev/null diff --git a/graphics/door_anims/38/2.png b/graphics/door_anims/38/2.png Binary files differdeleted file mode 100644 index cad72bd9d..000000000 --- a/graphics/door_anims/38/2.png +++ /dev/null diff --git a/graphics/door_anims/39/0.png b/graphics/door_anims/39/0.png Binary files differdeleted file mode 100644 index 60e983141..000000000 --- a/graphics/door_anims/39/0.png +++ /dev/null diff --git a/graphics/door_anims/39/1.png b/graphics/door_anims/39/1.png Binary files differdeleted file mode 100644 index 3173d57c8..000000000 --- a/graphics/door_anims/39/1.png +++ /dev/null diff --git a/graphics/door_anims/39/2.png b/graphics/door_anims/39/2.png Binary files differdeleted file mode 100644 index 04f77999d..000000000 --- a/graphics/door_anims/39/2.png +++ /dev/null diff --git a/graphics/door_anims/40/0.png b/graphics/door_anims/40/0.png Binary files differdeleted file mode 100644 index 5e1504117..000000000 --- a/graphics/door_anims/40/0.png +++ /dev/null diff --git a/graphics/door_anims/40/1.png b/graphics/door_anims/40/1.png Binary files differdeleted file mode 100644 index cf185c5ab..000000000 --- a/graphics/door_anims/40/1.png +++ /dev/null diff --git a/graphics/door_anims/40/2.png b/graphics/door_anims/40/2.png Binary files differdeleted file mode 100644 index 7b34bef94..000000000 --- a/graphics/door_anims/40/2.png +++ /dev/null diff --git a/graphics/door_anims/41/0.png b/graphics/door_anims/41/0.png Binary files differdeleted file mode 100644 index 61d365737..000000000 --- a/graphics/door_anims/41/0.png +++ /dev/null diff --git a/graphics/door_anims/41/1.png b/graphics/door_anims/41/1.png Binary files differdeleted file mode 100644 index f9480e4d9..000000000 --- a/graphics/door_anims/41/1.png +++ /dev/null diff --git a/graphics/door_anims/41/2.png b/graphics/door_anims/41/2.png Binary files differdeleted file mode 100644 index 5b8c3fa44..000000000 --- a/graphics/door_anims/41/2.png +++ /dev/null diff --git a/graphics/door_anims/42/0.png b/graphics/door_anims/42/0.png Binary files differdeleted file mode 100644 index a88a24cd6..000000000 --- a/graphics/door_anims/42/0.png +++ /dev/null diff --git a/graphics/door_anims/42/1.png b/graphics/door_anims/42/1.png Binary files differdeleted file mode 100644 index ca8cd3853..000000000 --- a/graphics/door_anims/42/1.png +++ /dev/null diff --git a/graphics/door_anims/42/2.png b/graphics/door_anims/42/2.png Binary files differdeleted file mode 100644 index e9e5122b4..000000000 --- a/graphics/door_anims/42/2.png +++ /dev/null diff --git a/graphics/door_anims/42/3.png b/graphics/door_anims/42/3.png Binary files differdeleted file mode 100644 index d077bca49..000000000 --- a/graphics/door_anims/42/3.png +++ /dev/null diff --git a/graphics/door_anims/43/0.png b/graphics/door_anims/43/0.png Binary files differdeleted file mode 100644 index eec2d2c65..000000000 --- a/graphics/door_anims/43/0.png +++ /dev/null diff --git a/graphics/door_anims/43/1.png b/graphics/door_anims/43/1.png Binary files differdeleted file mode 100644 index a013b2990..000000000 --- a/graphics/door_anims/43/1.png +++ /dev/null diff --git a/graphics/door_anims/43/2.png b/graphics/door_anims/43/2.png Binary files differdeleted file mode 100644 index 8f3dc2a18..000000000 --- a/graphics/door_anims/43/2.png +++ /dev/null diff --git a/graphics/door_anims/44/0_left.png b/graphics/door_anims/44/0_left.png Binary files differdeleted file mode 100644 index 37a2530e7..000000000 --- a/graphics/door_anims/44/0_left.png +++ /dev/null diff --git a/graphics/door_anims/44/0_right.png b/graphics/door_anims/44/0_right.png Binary files differdeleted file mode 100644 index f7a5d4dc7..000000000 --- a/graphics/door_anims/44/0_right.png +++ /dev/null diff --git a/graphics/door_anims/44/1_left.png b/graphics/door_anims/44/1_left.png Binary files differdeleted file mode 100644 index cb3474672..000000000 --- a/graphics/door_anims/44/1_left.png +++ /dev/null diff --git a/graphics/door_anims/44/1_right.png b/graphics/door_anims/44/1_right.png Binary files differdeleted file mode 100644 index ed367c276..000000000 --- a/graphics/door_anims/44/1_right.png +++ /dev/null diff --git a/graphics/door_anims/44/2_left.png b/graphics/door_anims/44/2_left.png Binary files differdeleted file mode 100644 index d66ecc90d..000000000 --- a/graphics/door_anims/44/2_left.png +++ /dev/null diff --git a/graphics/door_anims/44/2_right.png b/graphics/door_anims/44/2_right.png Binary files differdeleted file mode 100644 index de82f04cf..000000000 --- a/graphics/door_anims/44/2_right.png +++ /dev/null diff --git a/graphics/door_anims/45/0.png b/graphics/door_anims/45/0.png Binary files differdeleted file mode 100644 index 867a8b0e9..000000000 --- a/graphics/door_anims/45/0.png +++ /dev/null diff --git a/graphics/door_anims/45/1.png b/graphics/door_anims/45/1.png Binary files differdeleted file mode 100644 index 263a31f87..000000000 --- a/graphics/door_anims/45/1.png +++ /dev/null diff --git a/graphics/door_anims/45/2.png b/graphics/door_anims/45/2.png Binary files differdeleted file mode 100644 index f3039a7c1..000000000 --- a/graphics/door_anims/45/2.png +++ /dev/null diff --git a/graphics/door_anims/46/0.png b/graphics/door_anims/46/0.png Binary files differdeleted file mode 100644 index 5d2fd8b8d..000000000 --- a/graphics/door_anims/46/0.png +++ /dev/null diff --git a/graphics/door_anims/46/1.png b/graphics/door_anims/46/1.png Binary files differdeleted file mode 100644 index f79cc787d..000000000 --- a/graphics/door_anims/46/1.png +++ /dev/null diff --git a/graphics/door_anims/46/2.png b/graphics/door_anims/46/2.png Binary files differdeleted file mode 100644 index 1a1afcaa1..000000000 --- a/graphics/door_anims/46/2.png +++ /dev/null diff --git a/graphics/door_anims/47/0.png b/graphics/door_anims/47/0.png Binary files differdeleted file mode 100644 index 0dbf2ece9..000000000 --- a/graphics/door_anims/47/0.png +++ /dev/null diff --git a/graphics/door_anims/47/1.png b/graphics/door_anims/47/1.png Binary files differdeleted file mode 100644 index 7e16467fa..000000000 --- a/graphics/door_anims/47/1.png +++ /dev/null diff --git a/graphics/door_anims/47/2.png b/graphics/door_anims/47/2.png Binary files differdeleted file mode 100644 index 592268d98..000000000 --- a/graphics/door_anims/47/2.png +++ /dev/null diff --git a/graphics/door_anims/48/0.png b/graphics/door_anims/48/0.png Binary files differdeleted file mode 100644 index a7d64821e..000000000 --- a/graphics/door_anims/48/0.png +++ /dev/null diff --git a/graphics/door_anims/48/1.png b/graphics/door_anims/48/1.png Binary files differdeleted file mode 100644 index 97b09977f..000000000 --- a/graphics/door_anims/48/1.png +++ /dev/null diff --git a/graphics/door_anims/48/2.png b/graphics/door_anims/48/2.png Binary files differdeleted file mode 100644 index 72eb0bc55..000000000 --- a/graphics/door_anims/48/2.png +++ /dev/null diff --git a/graphics/door_anims/48/3.png b/graphics/door_anims/48/3.png Binary files differdeleted file mode 100644 index ea5d9843c..000000000 --- a/graphics/door_anims/48/3.png +++ /dev/null diff --git a/graphics/door_anims/49/0.png b/graphics/door_anims/49/0.png Binary files differdeleted file mode 100644 index 3125df9b4..000000000 --- a/graphics/door_anims/49/0.png +++ /dev/null diff --git a/graphics/door_anims/49/1.png b/graphics/door_anims/49/1.png Binary files differdeleted file mode 100644 index b5b9acf88..000000000 --- a/graphics/door_anims/49/1.png +++ /dev/null diff --git a/graphics/door_anims/49/2.png b/graphics/door_anims/49/2.png Binary files differdeleted file mode 100644 index 6234d8928..000000000 --- a/graphics/door_anims/49/2.png +++ /dev/null diff --git a/graphics/door_anims/50/0.png b/graphics/door_anims/50/0.png Binary files differdeleted file mode 100644 index 47d33217a..000000000 --- a/graphics/door_anims/50/0.png +++ /dev/null diff --git a/graphics/door_anims/50/1.png b/graphics/door_anims/50/1.png Binary files differdeleted file mode 100644 index 1a5a8c05c..000000000 --- a/graphics/door_anims/50/1.png +++ /dev/null diff --git a/graphics/door_anims/50/2.png b/graphics/door_anims/50/2.png Binary files differdeleted file mode 100644 index 38242302c..000000000 --- a/graphics/door_anims/50/2.png +++ /dev/null diff --git a/graphics/door_anims/abandoned_ship.png b/graphics/door_anims/abandoned_ship.png Binary files differnew file mode 100644 index 000000000..e46aca9ba --- /dev/null +++ b/graphics/door_anims/abandoned_ship.png diff --git a/graphics/door_anims/abandoned_ship_room.png b/graphics/door_anims/abandoned_ship_room.png Binary files differnew file mode 100644 index 000000000..a5284af7e --- /dev/null +++ b/graphics/door_anims/abandoned_ship_room.png diff --git a/graphics/door_anims/battle_arena.png b/graphics/door_anims/battle_arena.png Binary files differnew file mode 100644 index 000000000..ef6652815 --- /dev/null +++ b/graphics/door_anims/battle_arena.png diff --git a/graphics/door_anims/battle_arena_lobby.png b/graphics/door_anims/battle_arena_lobby.png Binary files differnew file mode 100644 index 000000000..b9a2134e3 --- /dev/null +++ b/graphics/door_anims/battle_arena_lobby.png diff --git a/graphics/door_anims/battle_dome.png b/graphics/door_anims/battle_dome.png Binary files differnew file mode 100644 index 000000000..729385b3f --- /dev/null +++ b/graphics/door_anims/battle_dome.png diff --git a/graphics/door_anims/battle_dome_corridor.png b/graphics/door_anims/battle_dome_corridor.png Binary files differnew file mode 100644 index 000000000..198ad9acc --- /dev/null +++ b/graphics/door_anims/battle_dome_corridor.png diff --git a/graphics/door_anims/battle_dome_lobby.png b/graphics/door_anims/battle_dome_lobby.png Binary files differnew file mode 100644 index 000000000..bd4e4e895 --- /dev/null +++ b/graphics/door_anims/battle_dome_lobby.png diff --git a/graphics/door_anims/battle_dome_pre_battle_room.png b/graphics/door_anims/battle_dome_pre_battle_room.png Binary files differnew file mode 100644 index 000000000..6e4e7ee18 --- /dev/null +++ b/graphics/door_anims/battle_dome_pre_battle_room.png diff --git a/graphics/door_anims/battle_factory.png b/graphics/door_anims/battle_factory.png Binary files differnew file mode 100644 index 000000000..7ed6c876b --- /dev/null +++ b/graphics/door_anims/battle_factory.png diff --git a/graphics/door_anims/battle_frontier.png b/graphics/door_anims/battle_frontier.png Binary files differnew file mode 100644 index 000000000..bf758c03e --- /dev/null +++ b/graphics/door_anims/battle_frontier.png diff --git a/graphics/door_anims/battle_frontier_sliding.png b/graphics/door_anims/battle_frontier_sliding.png Binary files differnew file mode 100644 index 000000000..a43cf519d --- /dev/null +++ b/graphics/door_anims/battle_frontier_sliding.png diff --git a/graphics/door_anims/battle_palace_lobby.png b/graphics/door_anims/battle_palace_lobby.png Binary files differnew file mode 100644 index 000000000..f106ae960 --- /dev/null +++ b/graphics/door_anims/battle_palace_lobby.png diff --git a/graphics/door_anims/battle_tent.png b/graphics/door_anims/battle_tent.png Binary files differnew file mode 100644 index 000000000..a0a88e4c5 --- /dev/null +++ b/graphics/door_anims/battle_tent.png diff --git a/graphics/door_anims/battle_tent_interior.png b/graphics/door_anims/battle_tent_interior.png Binary files differnew file mode 100644 index 000000000..f8edb5a1a --- /dev/null +++ b/graphics/door_anims/battle_tent_interior.png diff --git a/graphics/door_anims/battle_tower.png b/graphics/door_anims/battle_tower.png Binary files differnew file mode 100644 index 000000000..3b9fe547c --- /dev/null +++ b/graphics/door_anims/battle_tower.png diff --git a/graphics/door_anims/battle_tower_corridor.png b/graphics/door_anims/battle_tower_corridor.png Binary files differnew file mode 100644 index 000000000..06ad24c9f --- /dev/null +++ b/graphics/door_anims/battle_tower_corridor.png diff --git a/graphics/door_anims/battle_tower_elevator.png b/graphics/door_anims/battle_tower_elevator.png Binary files differnew file mode 100644 index 000000000..1d95b5b6a --- /dev/null +++ b/graphics/door_anims/battle_tower_elevator.png diff --git a/graphics/door_anims/battle_tower_multi_corridor.png b/graphics/door_anims/battle_tower_multi_corridor.png Binary files differnew file mode 100644 index 000000000..145dea7a5 --- /dev/null +++ b/graphics/door_anims/battle_tower_multi_corridor.png diff --git a/graphics/door_anims/battle_tower_old.png b/graphics/door_anims/battle_tower_old.png Binary files differnew file mode 100644 index 000000000..645c00613 --- /dev/null +++ b/graphics/door_anims/battle_tower_old.png diff --git a/graphics/door_anims/birchs_lab.png b/graphics/door_anims/birchs_lab.png Binary files differnew file mode 100644 index 000000000..69bd93f89 --- /dev/null +++ b/graphics/door_anims/birchs_lab.png diff --git a/graphics/door_anims/cable_club.png b/graphics/door_anims/cable_club.png Binary files differnew file mode 100644 index 000000000..a1dfd7bc2 --- /dev/null +++ b/graphics/door_anims/cable_club.png diff --git a/graphics/door_anims/contest.png b/graphics/door_anims/contest.png Binary files differnew file mode 100644 index 000000000..dc466be11 --- /dev/null +++ b/graphics/door_anims/contest.png diff --git a/graphics/door_anims/cycling_road.png b/graphics/door_anims/cycling_road.png Binary files differnew file mode 100644 index 000000000..0c22c9182 --- /dev/null +++ b/graphics/door_anims/cycling_road.png diff --git a/graphics/door_anims/dewford.png b/graphics/door_anims/dewford.png Binary files differnew file mode 100644 index 000000000..86ac1fe4a --- /dev/null +++ b/graphics/door_anims/dewford.png diff --git a/graphics/door_anims/fallarbor_dark_roof.png b/graphics/door_anims/fallarbor_dark_roof.png Binary files differnew file mode 100644 index 000000000..ec43e37f9 --- /dev/null +++ b/graphics/door_anims/fallarbor_dark_roof.png diff --git a/graphics/door_anims/fallarbor_light_roof.png b/graphics/door_anims/fallarbor_light_roof.png Binary files differnew file mode 100644 index 000000000..4c81ba10e --- /dev/null +++ b/graphics/door_anims/fallarbor_light_roof.png diff --git a/graphics/door_anims/general.png b/graphics/door_anims/general.png Binary files differnew file mode 100644 index 000000000..fdab84132 --- /dev/null +++ b/graphics/door_anims/general.png diff --git a/graphics/door_anims/gym.png b/graphics/door_anims/gym.png Binary files differnew file mode 100644 index 000000000..fce000751 --- /dev/null +++ b/graphics/door_anims/gym.png diff --git a/graphics/door_anims/lilycove.png b/graphics/door_anims/lilycove.png Binary files differnew file mode 100644 index 000000000..ad5e43cc3 --- /dev/null +++ b/graphics/door_anims/lilycove.png diff --git a/graphics/door_anims/lilycove_dept_store.png b/graphics/door_anims/lilycove_dept_store.png Binary files differnew file mode 100644 index 000000000..4f036c51d --- /dev/null +++ b/graphics/door_anims/lilycove_dept_store.png diff --git a/graphics/door_anims/lilycove_dept_store_elevator.png b/graphics/door_anims/lilycove_dept_store_elevator.png Binary files differnew file mode 100644 index 000000000..8285e69c4 --- /dev/null +++ b/graphics/door_anims/lilycove_dept_store_elevator.png diff --git a/graphics/door_anims/lilycove_wooden.png b/graphics/door_anims/lilycove_wooden.png Binary files differnew file mode 100644 index 000000000..99b94e72d --- /dev/null +++ b/graphics/door_anims/lilycove_wooden.png diff --git a/graphics/door_anims/littleroot.png b/graphics/door_anims/littleroot.png Binary files differnew file mode 100644 index 000000000..8c1ca34a5 --- /dev/null +++ b/graphics/door_anims/littleroot.png diff --git a/graphics/door_anims/mauville.png b/graphics/door_anims/mauville.png Binary files differnew file mode 100644 index 000000000..63167408a --- /dev/null +++ b/graphics/door_anims/mauville.png diff --git a/graphics/door_anims/mossdeep.png b/graphics/door_anims/mossdeep.png Binary files differnew file mode 100644 index 000000000..163b2d6dd --- /dev/null +++ b/graphics/door_anims/mossdeep.png diff --git a/graphics/door_anims/mossdeep_space_center.png b/graphics/door_anims/mossdeep_space_center.png Binary files differnew file mode 100644 index 000000000..4f2ccb6ff --- /dev/null +++ b/graphics/door_anims/mossdeep_space_center.png diff --git a/graphics/door_anims/oldale.png b/graphics/door_anims/oldale.png Binary files differnew file mode 100644 index 000000000..cf637918a --- /dev/null +++ b/graphics/door_anims/oldale.png diff --git a/graphics/door_anims/pacifidlog.png b/graphics/door_anims/pacifidlog.png Binary files differnew file mode 100644 index 000000000..3e0528825 --- /dev/null +++ b/graphics/door_anims/pacifidlog.png diff --git a/graphics/door_anims/poke_center.png b/graphics/door_anims/poke_center.png Binary files differnew file mode 100644 index 000000000..865810714 --- /dev/null +++ b/graphics/door_anims/poke_center.png diff --git a/graphics/door_anims/poke_mart.png b/graphics/door_anims/poke_mart.png Binary files differnew file mode 100644 index 000000000..2d9b7d319 --- /dev/null +++ b/graphics/door_anims/poke_mart.png diff --git a/graphics/door_anims/pokemon_league.png b/graphics/door_anims/pokemon_league.png Binary files differnew file mode 100644 index 000000000..cac740f56 --- /dev/null +++ b/graphics/door_anims/pokemon_league.png diff --git a/graphics/door_anims/rustboro_gray.png b/graphics/door_anims/rustboro_gray.png Binary files differnew file mode 100644 index 000000000..2cf62b6da --- /dev/null +++ b/graphics/door_anims/rustboro_gray.png diff --git a/graphics/door_anims/rustboro_tan.png b/graphics/door_anims/rustboro_tan.png Binary files differnew file mode 100644 index 000000000..d8a1b185e --- /dev/null +++ b/graphics/door_anims/rustboro_tan.png diff --git a/graphics/door_anims/safari_zone.png b/graphics/door_anims/safari_zone.png Binary files differnew file mode 100644 index 000000000..89807f843 --- /dev/null +++ b/graphics/door_anims/safari_zone.png diff --git a/graphics/door_anims/slateport.png b/graphics/door_anims/slateport.png Binary files differnew file mode 100644 index 000000000..1283395ea --- /dev/null +++ b/graphics/door_anims/slateport.png diff --git a/graphics/door_anims/sootopolis.png b/graphics/door_anims/sootopolis.png Binary files differnew file mode 100644 index 000000000..faac1f59d --- /dev/null +++ b/graphics/door_anims/sootopolis.png diff --git a/graphics/door_anims/sootopolis_peaked_roof.png b/graphics/door_anims/sootopolis_peaked_roof.png Binary files differnew file mode 100644 index 000000000..b4ccfb5f9 --- /dev/null +++ b/graphics/door_anims/sootopolis_peaked_roof.png diff --git a/graphics/door_anims/trainer_hill_lobby_elevator.png b/graphics/door_anims/trainer_hill_lobby_elevator.png Binary files differnew file mode 100644 index 000000000..aeb7eaf26 --- /dev/null +++ b/graphics/door_anims/trainer_hill_lobby_elevator.png diff --git a/graphics/door_anims/trainer_hill_roof_elevator.png b/graphics/door_anims/trainer_hill_roof_elevator.png Binary files differnew file mode 100644 index 000000000..dc9c6bcee --- /dev/null +++ b/graphics/door_anims/trainer_hill_roof_elevator.png diff --git a/graphics/door_anims/unknown.png b/graphics/door_anims/unknown.png Binary files differnew file mode 100644 index 000000000..811c086a8 --- /dev/null +++ b/graphics/door_anims/unknown.png diff --git a/graphics/door_anims/unused_848EDEC/0_bottom.png b/graphics/door_anims/unused_848EDEC/0_bottom.png Binary files differdeleted file mode 100644 index 51c624396..000000000 --- a/graphics/door_anims/unused_848EDEC/0_bottom.png +++ /dev/null diff --git a/graphics/door_anims/unused_848EDEC/0_top.png b/graphics/door_anims/unused_848EDEC/0_top.png Binary files differdeleted file mode 100644 index 1a1971336..000000000 --- a/graphics/door_anims/unused_848EDEC/0_top.png +++ /dev/null diff --git a/graphics/door_anims/unused_848EDEC/1_bottom.png b/graphics/door_anims/unused_848EDEC/1_bottom.png Binary files differdeleted file mode 100644 index a3cc83feb..000000000 --- a/graphics/door_anims/unused_848EDEC/1_bottom.png +++ /dev/null diff --git a/graphics/door_anims/unused_848EDEC/1_top.png b/graphics/door_anims/unused_848EDEC/1_top.png Binary files differdeleted file mode 100644 index e6c96394c..000000000 --- a/graphics/door_anims/unused_848EDEC/1_top.png +++ /dev/null diff --git a/graphics/door_anims/unused_848EDEC/2_bottom.png b/graphics/door_anims/unused_848EDEC/2_bottom.png Binary files differdeleted file mode 100644 index f8466fa9c..000000000 --- a/graphics/door_anims/unused_848EDEC/2_bottom.png +++ /dev/null diff --git a/graphics/door_anims/unused_848EDEC/2_top.png b/graphics/door_anims/unused_848EDEC/2_top.png Binary files differdeleted file mode 100644 index 1864760e3..000000000 --- a/graphics/door_anims/unused_848EDEC/2_top.png +++ /dev/null diff --git a/graphics/door_anims/unused_bottom.png b/graphics/door_anims/unused_bottom.png Binary files differnew file mode 100644 index 000000000..3aa565940 --- /dev/null +++ b/graphics/door_anims/unused_bottom.png diff --git a/graphics/door_anims/unused_top.png b/graphics/door_anims/unused_top.png Binary files differnew file mode 100644 index 000000000..01c8a654e --- /dev/null +++ b/graphics/door_anims/unused_top.png diff --git a/graphics/door_anims/verdanturf.png b/graphics/door_anims/verdanturf.png Binary files differnew file mode 100644 index 000000000..204a47612 --- /dev/null +++ b/graphics/door_anims/verdanturf.png diff --git a/include/constants/items.h b/include/constants/items.h index db3474a72..c23816901 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -491,6 +491,10 @@ #define NUM_TECHNICAL_MACHINES 50 #define NUM_HIDDEN_MACHINES 8 +#define MAX_BAG_ITEM_CAPACITY 99 +#define MAX_PC_ITEM_CAPACITY 999 +#define MAX_BERRY_CAPACITY 999 + // Check if the item is one that can be used on a Pokemon. #define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2) diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index a0ea6855b..4bcf47ea8 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -16,6 +16,11 @@ #define METATILE_General_MuddySlope_Frame2 0x0EA #define METATILE_General_MuddySlope_Frame3 0x0EB #define METATILE_General_SandPit_Center 0x121 +#define METATILE_General_Door 0x021 +#define METATILE_General_Door_PokeMart 0x041 +#define METATILE_General_Door_PokeCenter 0x061 +#define METATILE_General_Door_Gym 0x1CD +#define METATILE_General_Door_Contest 0x1DB #define METATILE_General_CaveEntrance_Top 0x09F #define METATILE_General_CaveEntrance_Bottom 0x0A7 #define METATILE_General_RockWall_GrassBase 0x079 @@ -40,6 +45,21 @@ #define METATILE_Building_PC_Off 0x004 #define METATILE_Building_PC_On 0x005 +// gTileset_PokemonCenter +#define METATILE_PokemonCenter_Door_CableClub 0x264 + +// gTileset_Shop +#define METATILE_Shop_Door_Elevator 0x285 + +// gTileset_Petalburg +#define METATILE_Petalburg_Door_Littleroot 0x248 +#define METATILE_Petalburg_Door_BirchsLab 0x249 +#define METATILE_Petalburg_Door_Oldale 0x287 + +// gTileset_Rustboro +#define METATILE_Rustboro_Door_Gray 0x21F +#define METATILE_Rustboro_Door_Tan 0x22F + // gTileset_MauvilleGym #define METATILE_MauvilleGym_RaisedSwitch 0x205 #define METATILE_MauvilleGym_PressedSwitch 0x206 @@ -105,6 +125,9 @@ #define METATILE_Shop_Laptop2_Flash 0x260 // gTileset_BattleFrontier +#define METATILE_BattleFrontier_Door_Elevator 0x20E +#define METATILE_BattleFrontier_Door_Corridor 0x224 +#define METATILE_BattleFrontier_Door_MultiCorridor 0x2AD #define METATILE_BattleFrontier_CorridorOpenDoor_Top 0x207 #define METATILE_BattleFrontier_CorridorOpenDoor_Bottom 0x20F #define METATILE_BattleFrontier_Elevator_Top0 0x329 @@ -117,6 +140,29 @@ #define METATILE_BattleFrontier_Elevator_Bottom1 0x33A #define METATILE_BattleFrontier_Elevator_Bottom2 0x33B +// gTileset_BattleFrontierOutsideWest +#define METATILE_BattleFrontierOutsideWest_Door_BattleFactory 0x263 +#define METATILE_BattleFrontierOutsideWest_Door_BattleDome 0x28A +#define METATILE_BattleFrontierOutsideWest_Door_Sliding 0x396 +#define METATILE_BattleFrontierOutsideWest_Door 0x3FC + +// gTileset_BattleFrontierOutsideEast +#define METATILE_BattleFrontierOutsideEast_Door_BattleArena 0x291 +#define METATILE_BattleFrontierOutsideEast_Door_BattleTower 0x329 +#define METATILE_BattleFrontierOutsideEast_Door_Sliding 0x396 +#define METATILE_BattleFrontierOutsideEast_Door 0x3FC + +// gTileset_BattleDome +#define METATILE_BattleDome_Door_Lobby 0x209 +#define METATILE_BattleDome_Door_PreBattleRoom 0x20A +#define METATILE_BattleDome_Door_Corridor 0x25E + +// gTileset_BattleArena +#define METATILE_BattleArena_Door 0x21B + +// gTileset_BattlePalace +#define METATILE_BattlePalace_Door 0x219 + // gTileset_Cave #define METATILE_Cave_EntranceCover 0x229 #define METATILE_Cave_SealedChamberEntrance_TopLeft 0x22A @@ -132,6 +178,7 @@ #define METATILE_Cave_ShoalCave_BlueStone_Small 0x35B // gTileset_Pacifidlog +#define METATILE_Pacifidlog_Door 0x21A #define METATILE_Pacifidlog_FloatingLogs_Horizontal0 0x250 #define METATILE_Pacifidlog_FloatingLogs_Horizontal1 0x251 #define METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal0 0x252 @@ -165,14 +212,16 @@ #define METATILE_Fortree_WoodBridge1_Bottom 0x29F // gTileset_Sootopolis -#define METATILE_Sootopolis_Door_Closed 0x248 -#define METATILE_Sootopolis_GymDoor_Closed 0x250 -#define METATILE_Sootopolis_RoughWater 0x290 +#define METATILE_Sootopolis_Door 0x21E +#define METATILE_Sootopolis_Door_PeakedRoof 0x21C +#define METATILE_Sootopolis_Door_Closed 0x248 +#define METATILE_Sootopolis_GymDoor_Closed 0x250 +#define METATILE_Sootopolis_RoughWater 0x290 // gTileset_SootopolisGym -#define METATILE_SootopolisGym_Ice_Cracked 0x20E -#define METATILE_SootopolisGym_Ice_Broken 0x206 -#define METATILE_SootopolisGym_Stairs 0x207 +#define METATILE_SootopolisGym_Ice_Cracked 0x20E +#define METATILE_SootopolisGym_Ice_Broken 0x206 +#define METATILE_SootopolisGym_Stairs 0x207 // gTileset_Fallarbor #define METATILE_Fallarbor_AshGrass 0x20A @@ -186,6 +235,9 @@ #define METATILE_Fallarbor_RedCaveEntrance_Bottom 0x34F #define METATILE_Fallarbor_BrownRockWall 0x265 #define METATILE_Fallarbor_RedRockWall 0x269 +#define METATILE_Fallarbor_Door_LightRoof 0x2A5 +#define METATILE_Fallarbor_Door_DarkRoof 0x2F7 +#define METATILE_Fallarbor_Door_BattleTent 0x36C // gTileset_Lavaridge #define METATILE_Lavaridge_NormalGrass 0x206 @@ -196,6 +248,10 @@ #define METATILE_Lavaridge_CaveEntrance_Bottom 0x25E // gTileset_Mauville +#define METATILE_Mauville_Door 0x2AC +#define METATILE_Mauville_Door_CyclingRoad 0x289 +#define METATILE_Mauville_Door_Verdanturf 0x3A1 +#define METATILE_Mauville_Door_BattleTent 0x3D4 #define METATILE_Mauville_DeepSand_Center 0x251 #define METATILE_Mauville_DeepSand_BottomMid 0x259 #define METATILE_Mauville_MirageTower_Tile0 0x3D8 @@ -217,6 +273,21 @@ #define METATILE_Mauville_MirageTower_Tile10 0x3E4 #define METATILE_Mauville_MirageTower_Tile11 0x3E5 +// gTileset_Dewford +#define METATILE_Dewford_Door 0x225 +#define METATILE_Dewford_Door_BattleTower 0x25D + +// gTileset_Slateport +#define METATILE_Slateport_Door 0x2DC +#define METATILE_Slateport_Door_BattleTent 0x393 + +// gTileset_Mossdeep +#define METATILE_Mossdeep_Door 0x2A1 +#define METATILE_Mossdeep_Door_SpaceCenter 0x2ED + +// gTileset_EverGrande +#define METATILE_EverGrande_Door_PokemonLeague 0x21D + // gTileset_PokemonCenter #define METATILE_PokemonCenter_Elevator1F_Tile0_Frame0 0x280 #define METATILE_PokemonCenter_Elevator1F_Tile0_Frame1 0x282 @@ -273,6 +344,7 @@ #define METATILE_InsideShip_IntactDoor_Bottom_Locked 0x233 #define METATILE_InsideShip_DoorIndent_Unlocked 0x21A #define METATILE_InsideShip_DoorIndent_Locked 0x234 +#define METATILE_InsideShip_IntactDoor_Bottom_Interior 0x297 // gTileset_BattlePike #define METATILE_BattlePike_Curtain_Stage0_Tile0 0x24A @@ -305,12 +377,16 @@ #define METATILE_BattlePike_Curtain_Stage3_Tile6 0x2BC // gTileset_Lilycove -#define METATILE_Lilycove_Wailmer0 0x290 -#define METATILE_Lilycove_Wailmer1 0x291 -#define METATILE_Lilycove_Wailmer2 0x2A0 -#define METATILE_Lilycove_Wailmer3 0x2A1 -#define METATILE_Lilycove_Wailmer0_Alt 0x298 -#define METATILE_Lilycove_Wailmer1_Alt 0x299 +#define METATILE_Lilycove_Door 0x246 +#define METATILE_Lilycove_Door_Wooden 0x28E +#define METATILE_Lilycove_Door_DeptStore 0x30C +#define METATILE_Lilycove_Door_SafariZone 0x32D +#define METATILE_Lilycove_Wailmer0 0x290 +#define METATILE_Lilycove_Wailmer1 0x291 +#define METATILE_Lilycove_Wailmer2 0x2A0 +#define METATILE_Lilycove_Wailmer3 0x2A1 +#define METATILE_Lilycove_Wailmer0_Alt 0x298 +#define METATILE_Lilycove_Wailmer1_Alt 0x299 // gTileset_Contest #define METATILE_Contest_WallShadow 0x221 @@ -318,6 +394,9 @@ #define METATILE_Contest_CounterFlap_Top 0x2D1 #define METATILE_Contest_CounterFlap_Bottom 0x2D9 +// gTileset_BattleTent +#define METATILE_BattleTent_Door 0x26B + // gTileset_LilycoveMuseum #define METATILE_LilycoveMuseum_Painting0_Left 0x25A #define METATILE_LilycoveMuseum_Painting0_Right 0x25B @@ -421,8 +500,10 @@ #define METATILE_BikeShop_Generator_Off_Tile7 0x2F7 // gTileset_TrainerHill -#define METATILE_TrainerHill_GreenFloorTile 0x307 -#define METATILE_TrainerHill_CounterDoor 0x334 +#define METATILE_TrainerHill_GreenFloorTile 0x307 +#define METATILE_TrainerHill_CounterDoor 0x334 +#define METATILE_TrainerHill_Door_Elevator_Lobby 0x32C +#define METATILE_TrainerHill_Door_Elevator_Roof 0x383 // gTileset_Underwater #define METATILE_Underwater_RockWall 0x21E diff --git a/include/field_door.h b/include/field_door.h index 8b4955cac..2e32005c6 100644 --- a/include/field_door.h +++ b/include/field_door.h @@ -1,20 +1,5 @@ -#ifndef GUARD_FIELDDOOR_H -#define GUARD_FIELDDOOR_H - -struct DoorGraphics -{ - u16 metatileNum; - u8 sound; - u8 size; - const void *tiles; - const void *palette; -}; - -struct DoorAnimFrame -{ - u8 time; - u16 offset; -}; +#ifndef GUARD_FIELD_DOOR_H +#define GUARD_FIELD_DOOR_H void FieldSetDoorOpened(u32, u32); void FieldSetDoorClosed(u32, u32); @@ -23,4 +8,4 @@ s8 FieldAnimateDoorOpen(u32, u32); bool8 FieldIsDoorAnimationRunning(void); u32 GetDoorSoundEffect(u32 x, u32 y); -#endif +#endif //GUARD_FIELD_DOOR_H diff --git a/src/data/object_event/event_object_graphics.h b/src/data/object_event/event_object_graphics.h index 88ca30ff5..0629e8c46 100755 --- a/src/data/object_event/event_object_graphics.h +++ b/src/data/object_event/event_object_graphics.h @@ -4,21 +4,21 @@ const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/e const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp"); const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp"); const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_33.gbapal"); -const u16 NullPalette_8499A38[16] = {}; -const u16 NullPalette_8499A58[16] = {}; -const u16 NullPalette_8499A78[16] = {}; -const u16 NullPalette_8499A98[16] = {}; -const u16 NullPalette_8499AB8[16] = {}; -const u16 NullPalette_8499AD8[16] = {}; -const u16 NullPalette_8499AF8[16] = {}; -const u16 NullPalette_8499B18[16] = {}; -const u16 NullPalette_8499B38[16] = {}; -const u16 NullPalette_8499B58[16] = {}; -const u16 NullPalette_8499B78[16] = {}; -const u16 NullPalette_8499B98[16] = {}; -const u16 NullPalette_8499BB8[16] = {}; -const u16 NullPalette_8499BD8[16] = {}; -const u16 NullPalette_8499BF8[16] = {}; +const u16 gObjectEventPaletteNull1[16] = {}; +const u16 gObjectEventPaletteNull2[16] = {}; +const u16 gObjectEventPaletteNull3[16] = {}; +const u16 gObjectEventPaletteNull4[16] = {}; +const u16 gObjectEventPaletteNull5[16] = {}; +const u16 gObjectEventPaletteNull6[16] = {}; +const u16 gObjectEventPaletteNull7[16] = {}; +const u16 gObjectEventPaletteNull8[16] = {}; +const u16 gObjectEventPaletteNull9[16] = {}; +const u16 gObjectEventPaletteNull10[16] = {}; +const u16 gObjectEventPaletteNull11[16] = {}; +const u16 gObjectEventPaletteNull12[16] = {}; +const u16 gObjectEventPaletteNull13[16] = {}; +const u16 gObjectEventPaletteNull14[16] = {}; +const u16 gObjectEventPaletteNull15[16] = {}; const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_09.gbapal"); const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_10.gbapal"); const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/brendan/field_move.4bpp"); @@ -40,20 +40,20 @@ const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_ const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp"); const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_34.gbapal"); const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/object_events/palettes/unused_palette.gbapal"); -const u16 NullPalette_84A54F8[16] = {}; -const u16 NullPalette_84A5518[16] = {}; -const u16 NullPalette_84A5538[16] = {}; -const u16 NullPalette_84A5558[16] = {}; -const u16 NullPalette_84A5578[16] = {}; -const u16 NullPalette_84A5598[16] = {}; -const u16 NullPalette_84A55B8[16] = {}; -const u16 NullPalette_84A55D8[16] = {}; -const u16 NullPalette_84A55F8[16] = {}; -const u16 NullPalette_84A5618[16] = {}; -const u16 NullPalette_84A5638[16] = {}; -const u16 NullPalette_84A5658[16] = {}; -const u16 NullPalette_84A5678[16] = {}; -const u16 NullPalette_84A5698[16] = {}; +const u16 gObjectEventPaletteNull16[16] = {}; +const u16 gObjectEventPaletteNull17[16] = {}; +const u16 gObjectEventPaletteNull18[16] = {}; +const u16 gObjectEventPaletteNull19[16] = {}; +const u16 gObjectEventPaletteNull20[16] = {}; +const u16 gObjectEventPaletteNull21[16] = {}; +const u16 gObjectEventPaletteNull22[16] = {}; +const u16 gObjectEventPaletteNull23[16] = {}; +const u16 gObjectEventPaletteNull24[16] = {}; +const u16 gObjectEventPaletteNull25[16] = {}; +const u16 gObjectEventPaletteNull26[16] = {}; +const u16 gObjectEventPaletteNull27[16] = {}; +const u16 gObjectEventPaletteNull28[16] = {}; +const u16 gObjectEventPaletteNull29[16] = {}; const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/object_events/pics/people/may/mach_bike.4bpp"); const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/may/acro_bike.4bpp"); const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/object_events/pics/people/may/surfing.4bpp"); diff --git a/src/data/object_event/event_object_graphics_info_pointers.h b/src/data/object_event/event_object_graphics_info_pointers.h index 01c8cbde7..c72b0279d 100755 --- a/src/data/object_event/event_object_graphics_info_pointers.h +++ b/src/data/object_event/event_object_graphics_info_pointers.h @@ -246,7 +246,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldM const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2; -const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[] = { +const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM_OBJ_EVENT_GFX] = { [OBJ_EVENT_GFX_BRENDAN_NORMAL] = &gObjectEventGraphicsInfo_BrendanNormal, [OBJ_EVENT_GFX_BRENDAN_MACH_BIKE] = &gObjectEventGraphicsInfo_BrendanMachBike, [OBJ_EVENT_GFX_BRENDAN_SURFING] = &gObjectEventGraphicsInfo_BrendanSurfing, diff --git a/src/field_door.c b/src/field_door.c index 8fb5cb948..b4794349c 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -8,485 +8,133 @@ #include "constants/flags.h" #include "constants/maps.h" #include "constants/songs.h" +#include "constants/metatile_labels.h" -static bool8 ShouldUseMultiCorridorDoor(void); - -const u8 DoorAnimTiles_04[][0x100] = -{ - INCBIN_U8("graphics/door_anims/04/0.4bpp"), - INCBIN_U8("graphics/door_anims/04/1.4bpp"), - INCBIN_U8("graphics/door_anims/04/2.4bpp"), -}; - -// TODO: Make these blank palette includes? -asm(".space 32"); - -const u8 DoorAnimTiles_05[][0x100] = -{ - INCBIN_U8("graphics/door_anims/05/0.4bpp"), - INCBIN_U8("graphics/door_anims/05/1.4bpp"), - INCBIN_U8("graphics/door_anims/05/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_08[][0x100] = -{ - INCBIN_U8("graphics/door_anims/08/0.4bpp"), - INCBIN_U8("graphics/door_anims/08/1.4bpp"), - INCBIN_U8("graphics/door_anims/08/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_15[][0x100] = -{ - INCBIN_U8("graphics/door_anims/15/0.4bpp"), - INCBIN_U8("graphics/door_anims/15/1.4bpp"), - INCBIN_U8("graphics/door_anims/15/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_16[][0x100] = -{ - INCBIN_U8("graphics/door_anims/16/0.4bpp"), - INCBIN_U8("graphics/door_anims/16/1.4bpp"), - INCBIN_U8("graphics/door_anims/16/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_00[][0x100] = -{ - INCBIN_U8("graphics/door_anims/00/0.4bpp"), - INCBIN_U8("graphics/door_anims/00/1.4bpp"), - INCBIN_U8("graphics/door_anims/00/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_01[][0x100] = -{ - INCBIN_U8("graphics/door_anims/01/0.4bpp"), - INCBIN_U8("graphics/door_anims/01/1.4bpp"), - INCBIN_U8("graphics/door_anims/01/2.4bpp"), -}; - -const u8 DoorAnimTiles_02[][0x100] = -{ - INCBIN_U8("graphics/door_anims/02/0.4bpp"), - INCBIN_U8("graphics/door_anims/02/1.4bpp"), - INCBIN_U8("graphics/door_anims/02/2.4bpp"), -}; - -const u8 DoorAnimTiles_03[][0x100] = -{ - INCBIN_U8("graphics/door_anims/03/0.4bpp"), - INCBIN_U8("graphics/door_anims/03/1.4bpp"), - INCBIN_U8("graphics/door_anims/03/2.4bpp"), -}; - -const u8 DoorAnimTiles_06[][0x100] = -{ - INCBIN_U8("graphics/door_anims/06/0.4bpp"), - INCBIN_U8("graphics/door_anims/06/1.4bpp"), - INCBIN_U8("graphics/door_anims/06/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_07[][0x100] = -{ - INCBIN_U8("graphics/door_anims/07/0.4bpp"), - INCBIN_U8("graphics/door_anims/07/1.4bpp"), - INCBIN_U8("graphics/door_anims/07/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_09[][0x100] = -{ - INCBIN_U8("graphics/door_anims/09/0.4bpp"), - INCBIN_U8("graphics/door_anims/09/1.4bpp"), - INCBIN_U8("graphics/door_anims/09/2.4bpp"), -}; - -asm(".space 0x5900"); - -const u8 DoorAnimTiles_UnusedTops[][0x40] = -{ - INCBIN_U8("graphics/door_anims/unused_848EDEC/0_top.4bpp"), - INCBIN_U8("graphics/door_anims/unused_848EDEC/1_top.4bpp"), - INCBIN_U8("graphics/door_anims/unused_848EDEC/2_top.4bpp"), -}; - -asm(".space 0x140"); - -const u8 DoorAnimTiles_UnusedBottoms[][0x40] = -{ - INCBIN_U8("graphics/door_anims/unused_848EDEC/0_bottom.4bpp"), - INCBIN_U8("graphics/door_anims/unused_848EDEC/1_bottom.4bpp"), - INCBIN_U8("graphics/door_anims/unused_848EDEC/2_bottom.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_10[][0x100] = -{ - INCBIN_U8("graphics/door_anims/10/0.4bpp"), - INCBIN_U8("graphics/door_anims/10/1.4bpp"), - INCBIN_U8("graphics/door_anims/10/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_11[][0x100] = -{ - INCBIN_U8("graphics/door_anims/11/0.4bpp"), - INCBIN_U8("graphics/door_anims/11/1.4bpp"), - INCBIN_U8("graphics/door_anims/11/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_12[][0x100] = -{ - INCBIN_U8("graphics/door_anims/12/0.4bpp"), - INCBIN_U8("graphics/door_anims/12/1.4bpp"), - INCBIN_U8("graphics/door_anims/12/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_13[][0x100] = -{ - INCBIN_U8("graphics/door_anims/13/0.4bpp"), - INCBIN_U8("graphics/door_anims/13/1.4bpp"), - INCBIN_U8("graphics/door_anims/13/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_14[][0x100] = -{ - INCBIN_U8("graphics/door_anims/14/0.4bpp"), - INCBIN_U8("graphics/door_anims/14/1.4bpp"), - INCBIN_U8("graphics/door_anims/14/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_17[][0x100] = -{ - INCBIN_U8("graphics/door_anims/17/0.4bpp"), - INCBIN_U8("graphics/door_anims/17/1.4bpp"), - INCBIN_U8("graphics/door_anims/17/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_18[][0x100] = -{ - INCBIN_U8("graphics/door_anims/18/0.4bpp"), - INCBIN_U8("graphics/door_anims/18/1.4bpp"), - INCBIN_U8("graphics/door_anims/18/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_19[][0x100] = -{ - INCBIN_U8("graphics/door_anims/19/0.4bpp"), - INCBIN_U8("graphics/door_anims/19/1.4bpp"), - INCBIN_U8("graphics/door_anims/19/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_20[][0x100] = -{ - INCBIN_U8("graphics/door_anims/20/0.4bpp"), - INCBIN_U8("graphics/door_anims/20/1.4bpp"), - INCBIN_U8("graphics/door_anims/20/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_21[][0x100] = -{ - INCBIN_U8("graphics/door_anims/21/0.4bpp"), - INCBIN_U8("graphics/door_anims/21/1.4bpp"), - INCBIN_U8("graphics/door_anims/21/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_22[][0x100] = -{ - INCBIN_U8("graphics/door_anims/22/0.4bpp"), - INCBIN_U8("graphics/door_anims/22/1.4bpp"), - INCBIN_U8("graphics/door_anims/22/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_23[][0x100] = -{ - INCBIN_U8("graphics/door_anims/23/0.4bpp"), - INCBIN_U8("graphics/door_anims/23/1.4bpp"), - INCBIN_U8("graphics/door_anims/23/2.4bpp"), -}; - -asm(".space 32"); +#define DOOR_SOUND_NORMAL 0 +#define DOOR_SOUND_SLIDING 1 +#define DOOR_SOUND_ARENA 2 -const u8 DoorAnimTiles_24[][0x100] = +struct DoorGraphics { - INCBIN_U8("graphics/door_anims/24/0.4bpp"), - INCBIN_U8("graphics/door_anims/24/1.4bpp"), - INCBIN_U8("graphics/door_anims/24/2.4bpp"), + u16 metatileNum; + u8 sound; + u8 size; + const void *tiles; + const void *palette; }; -asm(".space 32"); - -const u8 DoorAnimTiles_25[][0x100] = -{ - INCBIN_U8("graphics/door_anims/25/0.4bpp"), - INCBIN_U8("graphics/door_anims/25/1.4bpp"), - INCBIN_U8("graphics/door_anims/25/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_26[][0x100] = -{ - INCBIN_U8("graphics/door_anims/26/0.4bpp"), - INCBIN_U8("graphics/door_anims/26/1.4bpp"), - INCBIN_U8("graphics/door_anims/26/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_27[][0x100] = -{ - INCBIN_U8("graphics/door_anims/27/0.4bpp"), - INCBIN_U8("graphics/door_anims/27/1.4bpp"), - INCBIN_U8("graphics/door_anims/27/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_28[][0x100] = -{ - INCBIN_U8("graphics/door_anims/28/0.4bpp"), - INCBIN_U8("graphics/door_anims/28/1.4bpp"), - INCBIN_U8("graphics/door_anims/28/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_29[][0x100] = -{ - INCBIN_U8("graphics/door_anims/29/0.4bpp"), - INCBIN_U8("graphics/door_anims/29/1.4bpp"), - INCBIN_U8("graphics/door_anims/29/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_30[][0x100] = -{ - INCBIN_U8("graphics/door_anims/30/0.4bpp"), - INCBIN_U8("graphics/door_anims/30/1.4bpp"), - INCBIN_U8("graphics/door_anims/30/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_31[][0x100] = -{ - INCBIN_U8("graphics/door_anims/31/0.4bpp"), - INCBIN_U8("graphics/door_anims/31/1.4bpp"), - INCBIN_U8("graphics/door_anims/31/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_32[][0x100] = -{ - INCBIN_U8("graphics/door_anims/32/0.4bpp"), - INCBIN_U8("graphics/door_anims/32/1.4bpp"), - INCBIN_U8("graphics/door_anims/32/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_33[][0x100] = -{ - INCBIN_U8("graphics/door_anims/33/0.4bpp"), - INCBIN_U8("graphics/door_anims/33/1.4bpp"), - INCBIN_U8("graphics/door_anims/33/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_34[][0x100] = -{ - INCBIN_U8("graphics/door_anims/34/0.4bpp"), - INCBIN_U8("graphics/door_anims/34/1.4bpp"), - INCBIN_U8("graphics/door_anims/34/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_35[][0x100] = -{ - INCBIN_U8("graphics/door_anims/35/0.4bpp"), - INCBIN_U8("graphics/door_anims/35/1.4bpp"), - INCBIN_U8("graphics/door_anims/35/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_36[][0x100] = -{ - INCBIN_U8("graphics/door_anims/36/0.4bpp"), - INCBIN_U8("graphics/door_anims/36/1.4bpp"), - INCBIN_U8("graphics/door_anims/36/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_37[][0x100] = -{ - INCBIN_U8("graphics/door_anims/37/0.4bpp"), - INCBIN_U8("graphics/door_anims/37/1.4bpp"), - INCBIN_U8("graphics/door_anims/37/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_38[][0x100] = -{ - INCBIN_U8("graphics/door_anims/38/0.4bpp"), - INCBIN_U8("graphics/door_anims/38/1.4bpp"), - INCBIN_U8("graphics/door_anims/38/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_39[][0x100] = -{ - INCBIN_U8("graphics/door_anims/39/0.4bpp"), - INCBIN_U8("graphics/door_anims/39/1.4bpp"), - INCBIN_U8("graphics/door_anims/39/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_40[][0x100] = -{ - INCBIN_U8("graphics/door_anims/40/0.4bpp"), - INCBIN_U8("graphics/door_anims/40/1.4bpp"), - INCBIN_U8("graphics/door_anims/40/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_41[][0x100] = -{ - INCBIN_U8("graphics/door_anims/41/0.4bpp"), - INCBIN_U8("graphics/door_anims/41/1.4bpp"), - INCBIN_U8("graphics/door_anims/41/2.4bpp"), -}; - -const u8 DoorAnimTiles_42[][0x100] = +struct DoorAnimFrame { - INCBIN_U8("graphics/door_anims/42/0.4bpp"), - INCBIN_U8("graphics/door_anims/42/1.4bpp"), - INCBIN_U8("graphics/door_anims/42/2.4bpp"), - INCBIN_U8("graphics/door_anims/42/3.4bpp"), + u8 time; + u16 offset; }; -asm(".space 32"); - -const u8 DoorAnimTiles_43[][0x100] = -{ - INCBIN_U8("graphics/door_anims/43/0.4bpp"), - INCBIN_U8("graphics/door_anims/43/1.4bpp"), - INCBIN_U8("graphics/door_anims/43/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_44[][0x100] = -{ - INCBIN_U8("graphics/door_anims/44/0_left.4bpp"), - INCBIN_U8("graphics/door_anims/44/0_right.4bpp"), - INCBIN_U8("graphics/door_anims/44/1_left.4bpp"), - INCBIN_U8("graphics/door_anims/44/1_right.4bpp"), - INCBIN_U8("graphics/door_anims/44/2_left.4bpp"), - INCBIN_U8("graphics/door_anims/44/2_right.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_45[][0x100] = -{ - INCBIN_U8("graphics/door_anims/45/0.4bpp"), - INCBIN_U8("graphics/door_anims/45/1.4bpp"), - INCBIN_U8("graphics/door_anims/45/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_46[][0x100] = -{ - INCBIN_U8("graphics/door_anims/46/0.4bpp"), - INCBIN_U8("graphics/door_anims/46/1.4bpp"), - INCBIN_U8("graphics/door_anims/46/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_47[][0x100] = -{ - INCBIN_U8("graphics/door_anims/47/0.4bpp"), - INCBIN_U8("graphics/door_anims/47/1.4bpp"), - INCBIN_U8("graphics/door_anims/47/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_48[][0x100] = -{ - INCBIN_U8("graphics/door_anims/48/0.4bpp"), - INCBIN_U8("graphics/door_anims/48/1.4bpp"), - INCBIN_U8("graphics/door_anims/48/2.4bpp"), - INCBIN_U8("graphics/door_anims/48/3.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_49[][0x100] = -{ - INCBIN_U8("graphics/door_anims/49/0.4bpp"), - INCBIN_U8("graphics/door_anims/49/1.4bpp"), - INCBIN_U8("graphics/door_anims/49/2.4bpp"), -}; - -asm(".space 32"); - -const u8 DoorAnimTiles_50[][0x100] = -{ - INCBIN_U8("graphics/door_anims/50/0.4bpp"), - INCBIN_U8("graphics/door_anims/50/1.4bpp"), - INCBIN_U8("graphics/door_anims/50/2.4bpp"), -}; - -asm(".space 32"); +static bool8 ShouldUseMultiCorridorDoor(void); -static const struct DoorAnimFrame gDoorOpenAnimFrames[] = +static const u8 sDoorAnimTiles_Littleroot[] = INCBIN_U8("graphics/door_anims/littleroot.4bpp"); +static const u16 sDoorNullPalette1[16] = {}; +static const u8 sDoorAnimTiles_BirchsLab[] = INCBIN_U8("graphics/door_anims/birchs_lab.4bpp"); +static const u16 sDoorNullPalette2[16] = {}; +static const u8 sDoorAnimTiles_FallarborLightRoof[] = INCBIN_U8("graphics/door_anims/fallarbor_light_roof.4bpp"); +static const u16 sDoorNullPalette3[16] = {}; +static const u8 sDoorAnimTiles_Lilycove[] = INCBIN_U8("graphics/door_anims/lilycove.4bpp"); +static const u16 sDoorNullPalette4[16] = {}; +static const u8 sDoorAnimTiles_LilycoveWooden[] = INCBIN_U8("graphics/door_anims/lilycove_wooden.4bpp"); +static const u16 sDoorNullPalette5[16] = {}; +static const u8 sDoorAnimTiles_General[] = INCBIN_U8("graphics/door_anims/general.4bpp"); +static const u16 sDoorNullPalette6[16] = {}; +static const u8 sDoorAnimTiles_PokeCenter[] = INCBIN_U8("graphics/door_anims/poke_center.4bpp"); +static const u8 sDoorAnimTiles_Gym[] = INCBIN_U8("graphics/door_anims/gym.4bpp"); +static const u8 sDoorAnimTiles_PokeMart[] = INCBIN_U8("graphics/door_anims/poke_mart.4bpp"); +static const u8 sDoorAnimTiles_RustboroTan[] = INCBIN_U8("graphics/door_anims/rustboro_tan.4bpp"); +static const u16 sDoorNullPalette7[16] = {}; +static const u8 sDoorAnimTiles_RustboroGray[] = INCBIN_U8("graphics/door_anims/rustboro_gray.4bpp"); +static const u16 sDoorNullPalette8[16] = {}; +static const u8 sDoorAnimTiles_Oldale[] = INCBIN_U8("graphics/door_anims/oldale.4bpp"); +static const u8 sFiller1[0x5900] = {}; +static const u8 sDoorAnimTiles_UnusedTops[] = INCBIN_U8("graphics/door_anims/unused_top.4bpp"); +static const u8 sFiller2[0x140] = {}; +static const u8 sDoorAnimTiles_UnusedBottoms[] = INCBIN_U8("graphics/door_anims/unused_bottom.4bpp"); +static const u16 sDoorNullPalette11[16] = {}; +static const u8 sDoorAnimTiles_Mauville[] = INCBIN_U8("graphics/door_anims/mauville.4bpp"); +static const u16 sDoorNullPalette12[16] = {}; +static const u8 sDoorAnimTiles_Verdanturf[] = INCBIN_U8("graphics/door_anims/verdanturf.4bpp"); +static const u16 sDoorNullPalette13[16] = {}; +static const u8 sDoorAnimTiles_Slateport[] = INCBIN_U8("graphics/door_anims/slateport.4bpp"); +static const u16 sDoorNullPalette14[16] = {}; +static const u8 sDoorAnimTiles_Dewford[] = INCBIN_U8("graphics/door_anims/dewford.4bpp"); +static const u16 sDoorNullPalette15[16] = {}; +static const u8 sDoorAnimTiles_Contest[] = INCBIN_U8("graphics/door_anims/contest.4bpp"); +static const u16 sDoorNullPalette16[16] = {}; +static const u8 sDoorAnimTiles_Mossdeep[] = INCBIN_U8("graphics/door_anims/mossdeep.4bpp"); +static const u16 sDoorNullPalette17[16] = {}; +static const u8 sDoorAnimTiles_SootopolisPeakedRoof[] = INCBIN_U8("graphics/door_anims/sootopolis_peaked_roof.4bpp"); +static const u16 sDoorNullPalette18[16] = {}; +static const u8 sDoorAnimTiles_Sootopolis[] = INCBIN_U8("graphics/door_anims/sootopolis.4bpp"); +static const u16 sDoorNullPalette19[16] = {}; +static const u8 sDoorAnimTiles_PokemonLeague[] = INCBIN_U8("graphics/door_anims/pokemon_league.4bpp"); +static const u16 sDoorNullPalette20[16] = {}; +static const u8 sDoorAnimTiles_Pacifidlog[] = INCBIN_U8("graphics/door_anims/pacifidlog.4bpp"); +static const u16 sDoorNullPalette21[16] = {}; +static const u8 sDoorAnimTiles_BattleTowerCorridor[] = INCBIN_U8("graphics/door_anims/battle_tower_corridor.4bpp"); +static const u16 sDoorNullPalette22[16] = {}; +static const u8 sDoorAnimTiles_CyclingRoad[] = INCBIN_U8("graphics/door_anims/cycling_road.4bpp"); +static const u16 sDoorNullPalette23[16] = {}; +static const u8 sDoorAnimTiles_LilycoveDeptStore[] = INCBIN_U8("graphics/door_anims/lilycove_dept_store.4bpp"); +static const u16 sDoorNullPalette24[16] = {}; +static const u8 sDoorAnimTiles_SafariZone[] = INCBIN_U8("graphics/door_anims/safari_zone.4bpp"); +static const u16 sDoorNullPalette25[16] = {}; +static const u8 sDoorAnimTiles_MossdeepSpaceCenter[] = INCBIN_U8("graphics/door_anims/mossdeep_space_center.4bpp"); +static const u16 sDoorNullPalette26[16] = {}; +static const u8 sDoorAnimTiles_CableClub[] = INCBIN_U8("graphics/door_anims/cable_club.4bpp"); +static const u16 sDoorNullPalette27[16] = {}; +static const u8 sDoorAnimTiles_AbandonedShip[] = INCBIN_U8("graphics/door_anims/abandoned_ship.4bpp"); +static const u16 sDoorNullPalette28[16] = {}; +static const u8 sDoorAnimTiles_FallarborDarkRoof[] = INCBIN_U8("graphics/door_anims/fallarbor_dark_roof.4bpp"); +static const u16 sDoorNullPalette29[16] = {}; +static const u8 sDoorAnimTiles_AbandonedShipRoom[] = INCBIN_U8("graphics/door_anims/abandoned_ship_room.4bpp"); +static const u16 sDoorNullPalette30[16] = {}; +static const u8 sDoorAnimTiles_LilycoveDeptStoreElevator[] = INCBIN_U8("graphics/door_anims/lilycove_dept_store_elevator.4bpp"); +static const u16 sDoorNullPalette31[16] = {}; +static const u8 sDoorAnimTiles_BattleTowerOld[] = INCBIN_U8("graphics/door_anims/battle_tower_old.4bpp"); +static const u16 sDoorNullPalette32[16] = {}; +static const u8 sDoorAnimTiles_BattleTowerElevator[] = INCBIN_U8("graphics/door_anims/battle_tower_elevator.4bpp"); +static const u16 sDoorNullPalette33[16] = {}; +static const u8 sDoorAnimTiles_34[] = INCBIN_U8("graphics/door_anims/unknown.4bpp"); +static const u16 sDoorNullPalette34[16] = {}; +static const u8 sDoorAnimTiles_BattleDome[] = INCBIN_U8("graphics/door_anims/battle_dome.4bpp"); +static const u16 sDoorNullPalette35[16] = {}; +static const u8 sDoorAnimTiles_BattleFactory[] = INCBIN_U8("graphics/door_anims/battle_factory.4bpp"); +static const u16 sDoorNullPalette36[16] = {}; +static const u8 sDoorAnimTiles_BattleTower[] = INCBIN_U8("graphics/door_anims/battle_tower.4bpp"); +static const u16 sDoorNullPalette37[16] = {}; +static const u8 sDoorAnimTiles_BattleArena[] = INCBIN_U8("graphics/door_anims/battle_arena.4bpp"); +static const u16 sDoorNullPalette38[16] = {}; +static const u8 sDoorAnimTiles_BattleArenaLobby[] = INCBIN_U8("graphics/door_anims/battle_arena_lobby.4bpp"); +static const u16 sDoorNullPalette39[16] = {}; +static const u8 sDoorAnimTiles_BattleDomeLobby[] = INCBIN_U8("graphics/door_anims/battle_dome_lobby.4bpp"); +static const u16 sDoorNullPalette40[16] = {}; +static const u8 sDoorAnimTiles_BattlePalaceLobby[] = INCBIN_U8("graphics/door_anims/battle_palace_lobby.4bpp"); +static const u8 sDoorAnimTiles_BattleTent[] = INCBIN_U8("graphics/door_anims/battle_tent.4bpp"); +static const u16 sDoorNullPalette41[16] = {}; +static const u8 sDoorAnimTiles_BattleDomeCorridor[] = INCBIN_U8("graphics/door_anims/battle_dome_corridor.4bpp"); +static const u16 sDoorNullPalette42[16] = {}; +static const u8 sDoorAnimTiles_BattleTowerMultiCorridor[] = INCBIN_U8("graphics/door_anims/battle_tower_multi_corridor.4bpp"); +static const u16 sDoorNullPalette43[16] = {}; +static const u8 sDoorAnimTiles_BattleFrontier[] = INCBIN_U8("graphics/door_anims/battle_frontier.4bpp"); +static const u16 sDoorNullPalette44[16] = {}; +static const u8 sDoorAnimTiles_BattleFrontierSliding[] = INCBIN_U8("graphics/door_anims/battle_frontier_sliding.4bpp"); +static const u16 sDoorNullPalette45[16] = {}; +static const u8 sDoorAnimTiles_BattleDomePreBattleRoom[] = INCBIN_U8("graphics/door_anims/battle_dome_pre_battle_room.4bpp"); +static const u16 sDoorNullPalette46[16] = {}; +static const u8 sDoorAnimTiles_BattleTentInterior[] = INCBIN_U8("graphics/door_anims/battle_tent_interior.4bpp"); +static const u16 sDoorNullPalette47[16] = {}; +static const u8 sDoorAnimTiles_TrainerHillLobbyElevator[] = INCBIN_U8("graphics/door_anims/trainer_hill_lobby_elevator.4bpp"); +static const u16 sDoorNullPalette48[16] = {}; +static const u8 sDoorAnimTiles_TrainerHillRoofElevator[] = INCBIN_U8("graphics/door_anims/trainer_hill_roof_elevator.4bpp"); +static const u16 sDoorNullPalette49[16] = {}; + +static const struct DoorAnimFrame sDoorOpenAnimFrames[] = { {4, -1}, {4, 0}, @@ -495,7 +143,7 @@ static const struct DoorAnimFrame gDoorOpenAnimFrames[] = {0, 0}, }; -static const struct DoorAnimFrame gDoorCloseAnimFrames[] = +static const struct DoorAnimFrame sDoorCloseAnimFrames[] = { {4, 0x200}, {4, 0x100}, @@ -504,7 +152,7 @@ static const struct DoorAnimFrame gDoorCloseAnimFrames[] = {0, 0}, }; -static const struct DoorAnimFrame gBigDoorOpenAnimFrames[] = +static const struct DoorAnimFrame sBigDoorOpenAnimFrames[] = { {4, -1}, {4, 0}, @@ -513,7 +161,7 @@ static const struct DoorAnimFrame gBigDoorOpenAnimFrames[] = {0, 0}, }; -static const struct DoorAnimFrame gBigDoorCloseAnimFrames[] = +static const struct DoorAnimFrame sBigDoorCloseAnimFrames[] = { {4, 0x400}, {4, 0x200}, @@ -522,114 +170,114 @@ static const struct DoorAnimFrame gBigDoorCloseAnimFrames[] = {0, 0}, }; -const u8 DoorAnimPalettes_8496FDC[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 00 -const u8 DoorAnimPalettes_8496FE4[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 01 -const u8 DoorAnimPalettes_8496FEC[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 02 -const u8 DoorAnimPalettes_8496FF4[] = {0, 0, 1, 1, 1, 1, 1, 1}; // door 03 -const u8 DoorAnimPalettes_8496FFC[] = {10, 10, 6, 6, 6, 6, 6, 6}; // door 04 -const u8 DoorAnimPalettes_8497004[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 05 -const u8 DoorAnimPalettes_849700C[] = {11, 11, 11, 11, 11, 11, 11, 11}; // door 06 -const u8 DoorAnimPalettes_8497014[] = {10, 10, 10, 10, 10, 10, 10, 10}; // door 07 -const u8 DoorAnimPalettes_849701C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 08 -const u8 DoorAnimPalettes_8497024[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 09 -const u8 DoorAnimPalettes_849702C[] = {10, 10, 9, 9, 9, 9, 9, 9}; // door 10 -const u8 DoorAnimPalettes_8497034[] = {9, 9, 1, 1, 1, 1, 1, 1}; // door 11 -const u8 DoorAnimPalettes_849703C[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 12 -const u8 DoorAnimPalettes_8497044[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 13 -const u8 DoorAnimPalettes_849704C[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 14 -const u8 DoorAnimPalettes_8497054[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 15 -const u8 DoorAnimPalettes_849705C[] = {0, 0, 5, 5, 5, 5, 5, 5}; // door 16 -const u8 DoorAnimPalettes_8497064[] = {6, 6, 1, 1, 1, 1, 1, 1}; // door 17 -const u8 DoorAnimPalettes_849706C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 18 -const u8 DoorAnimPalettes_8497074[] = {6, 6, 5, 5, 5, 5, 5, 5}; // door 19 -const u8 DoorAnimPalettes_849707C[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 20 -const u8 DoorAnimPalettes_8497084[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 21 -const u8 DoorAnimPalettes_849708C[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 22 -const u8 DoorAnimPalettes_8497094[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 23 -const u8 DoorAnimPalettes_849709C[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 24 -const u8 DoorAnimPalettes_84970A4[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 25 -const u8 DoorAnimPalettes_84970AC[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 26 -const u8 DoorAnimPalettes_84970B4[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 27 -const u8 DoorAnimPalettes_84970BC[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 28 -const u8 DoorAnimPalettes_84970C4[] = {11, 11, 7, 7, 7, 7, 7, 7}; // door 29 -const u8 DoorAnimPalettes_84970CC[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 30 -const u8 DoorAnimPalettes_84970D4[] = {6, 6, 7, 7, 7, 7, 7, 7}; // door 31 -const u8 DoorAnimPalettes_84970DC[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 32 -const u8 DoorAnimPalettes_84970E4[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 33 -const u8 DoorAnimPalettes_84970EC[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 34 -const u8 DoorAnimPalettes_84970F4[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 35 -const u8 DoorAnimPalettes_84970FC[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 36 -const u8 DoorAnimPalettes_8497104[] = {0, 0, 0, 0, 0, 0, 0, 0}; // door 37 -const u8 DoorAnimPalettes_849710C[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 38 -const u8 DoorAnimPalettes_8497114[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 39 -const u8 DoorAnimPalettes_849711C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 40 -const u8 DoorAnimPalettes_8497124[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 41 -const u8 DoorAnimPalettes_849712C[] = {1, 1, 1, 1, 1, 1, 1, 1}; // doors 42, 43, and 44 -const u8 DoorAnimPalettes_8497134[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 45 -const u8 DoorAnimPalettes_849713C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 46 -const u8 DoorAnimPalettes_8497144[] = {1, 1, 1, 1, 1, 1, 1, 1}; // unused -const u8 DoorAnimPalettes_849714C[] = {1, 1, 1, 1, 1, 1, 1, 1}; // doors 47 and 48 -const u8 DoorAnimPalettes_8497154[] = {9, 9, 7, 7, 7, 7, 7, 7}; // door 49 -const u8 DoorAnimPalettes_849715C[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 50 -const u8 DoorAnimPalettes_8497164[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 51 -const u8 DoorAnimPalettes_849716C[] = {9, 9, 7, 7, 7, 7, 7, 7}; // door 52 - -static const struct DoorGraphics gDoorAnimGraphicsTable[] = -{ - {0x021, 0, 1, DoorAnimTiles_00, DoorAnimPalettes_8496FDC}, // door 00 - {0x061, 1, 1, DoorAnimTiles_01, DoorAnimPalettes_8496FE4}, // door 01 - {0x1CD, 1, 1, DoorAnimTiles_02, DoorAnimPalettes_8496FEC}, // door 02 - {0x041, 1, 1, DoorAnimTiles_03, DoorAnimPalettes_8496FF4}, // door 03 - {0x248, 0, 1, DoorAnimTiles_04, DoorAnimPalettes_8496FFC}, // door 04 - {0x249, 0, 1, DoorAnimTiles_05, DoorAnimPalettes_8497004}, // door 05 - {0x22F, 0, 1, DoorAnimTiles_06, DoorAnimPalettes_849700C}, // door 06 - {0x21F, 0, 1, DoorAnimTiles_07, DoorAnimPalettes_8497014}, // door 07 - {0x2A5, 0, 1, DoorAnimTiles_08, DoorAnimPalettes_849701C}, // door 08 - {0x287, 0, 1, DoorAnimTiles_09, DoorAnimPalettes_849702C}, // door 09 - {0x2AC, 0, 1, DoorAnimTiles_10, DoorAnimPalettes_849706C}, // door 10 - {0x3A1, 0, 1, DoorAnimTiles_11, DoorAnimPalettes_8497074}, // door 11 - {0x2DC, 0, 1, DoorAnimTiles_12, DoorAnimPalettes_8497064}, // door 12 - {0x225, 0, 1, DoorAnimTiles_13, DoorAnimPalettes_849705C}, // door 13 - {0x1DB, 1, 1, DoorAnimTiles_14, DoorAnimPalettes_8497084}, // door 14 - {0x246, 0, 1, DoorAnimTiles_15, DoorAnimPalettes_8497024}, // door 15 - {0x28E, 0, 1, DoorAnimTiles_16, DoorAnimPalettes_849707C}, // door 16 - {0x2A1, 0, 1, DoorAnimTiles_17, DoorAnimPalettes_8497034}, // door 17 - {0x21C, 0, 1, DoorAnimTiles_18, DoorAnimPalettes_849704C}, // door 18 - {0x21E, 0, 1, DoorAnimTiles_19, DoorAnimPalettes_8497054}, // door 19 - {0x21D, 1, 1, DoorAnimTiles_20, DoorAnimPalettes_849703C}, // door 20 - {0x21A, 0, 1, DoorAnimTiles_21, DoorAnimPalettes_8497044}, // door 21 - {0x224, 0, 1, DoorAnimTiles_22, DoorAnimPalettes_849708C}, // door 22 - {0x289, 0, 1, DoorAnimTiles_23, DoorAnimPalettes_8497094}, // door 23 - {0x30C, 1, 1, DoorAnimTiles_24, DoorAnimPalettes_849709C}, // door 24 - {0x32D, 1, 1, DoorAnimTiles_25, DoorAnimPalettes_84970A4}, // door 25 - {0x2ED, 1, 1, DoorAnimTiles_26, DoorAnimPalettes_84970AC}, // door 26 - {0x264, 1, 1, DoorAnimTiles_27, DoorAnimPalettes_84970B4}, // door 27 - {0x22B, 0, 1, DoorAnimTiles_28, DoorAnimPalettes_84970BC}, // door 28 - {0x2F7, 0, 1, DoorAnimTiles_29, DoorAnimPalettes_84970C4}, // door 29 - {0x297, 0, 1, DoorAnimTiles_30, DoorAnimPalettes_84970CC}, // door 30 - {0x285, 1, 1, DoorAnimTiles_31, DoorAnimPalettes_84970D4}, // door 31 - {0x25D, 1, 1, DoorAnimTiles_32, DoorAnimPalettes_84970DC}, // door 32 - {0x20E, 1, 1, DoorAnimTiles_33, DoorAnimPalettes_84970E4}, // door 33 - {0x3B0, 1, 1, DoorAnimTiles_34, DoorAnimPalettes_84970EC}, // door 34 - {0x28A, 1, 1, DoorAnimTiles_35, DoorAnimPalettes_84970F4}, // door 35 - {0x263, 1, 1, DoorAnimTiles_36, DoorAnimPalettes_84970FC}, // door 36 - {0x329, 1, 1, DoorAnimTiles_37, DoorAnimPalettes_8497104}, // door 37 - {0x291, 0, 1, DoorAnimTiles_38, DoorAnimPalettes_849710C}, // door 38 - {0x21B, 2, 1, DoorAnimTiles_39, DoorAnimPalettes_8497114}, // door 39 - {0x209, 1, 1, DoorAnimTiles_40, DoorAnimPalettes_849711C}, // door 40 - {0x219, 0, 1, DoorAnimTiles_41, DoorAnimPalettes_8497124}, // door 41 - {0x393, 1, 1, DoorAnimTiles_42, DoorAnimPalettes_849712C}, // door 42 - {0x3D4, 1, 1, DoorAnimTiles_42, DoorAnimPalettes_849712C}, // door 43 - {0x36C, 1, 1, DoorAnimTiles_42, DoorAnimPalettes_849712C}, // door 44 - {0x25E, 1, 1, DoorAnimTiles_43, DoorAnimPalettes_8497134}, // door 45 - {0x2AD, 1, 2, DoorAnimTiles_44, DoorAnimPalettes_849713C}, // door 46 - {0x3FC, 0, 1, DoorAnimTiles_45, DoorAnimPalettes_849714C}, // door 47 - {0x396, 1, 1, DoorAnimTiles_46, DoorAnimPalettes_849714C}, // door 48 - {0x20A, 1, 1, DoorAnimTiles_47, DoorAnimPalettes_8497154}, // door 49 - {0x26B, 1, 1, DoorAnimTiles_48, DoorAnimPalettes_849715C}, // door 50 - {0x32C, 1, 1, DoorAnimTiles_49, DoorAnimPalettes_8497164}, // door 51 - {0x383, 1, 1, DoorAnimTiles_50, DoorAnimPalettes_849716C}, // door 52 - {0, 0, 0, NULL, NULL}, +static const u8 sDoorAnimPalettes_General[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_PokeCenter[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_Gym[] = {5, 5, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_PokeMart[] = {0, 0, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_Littleroot[] = {10, 10, 6, 6, 6, 6, 6, 6}; +static const u8 sDoorAnimPalettes_BirchsLab[] = {8, 8, 8, 8, 8, 8, 8, 8}; +static const u8 sDoorAnimPalettes_RustboroTan[] = {11, 11, 11, 11, 11, 11, 11, 11}; +static const u8 sDoorAnimPalettes_RustboroGray[] = {10, 10, 10, 10, 10, 10, 10, 10}; +static const u8 sDoorAnimPalettes_FallarborLightRoof[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_Lilycove[] = {8, 8, 8, 8, 8, 8, 8, 8}; +static const u8 sDoorAnimPalettes_Oldale[] = {10, 10, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_Mossdeep[] = {9, 9, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_PokemonLeague[] = {8, 8, 8, 8, 8, 8, 8, 8}; +static const u8 sDoorAnimPalettes_Pacifidlog[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_SootopolisPeakedRoof[] = {6, 6, 6, 6, 6, 6, 6, 6}; +static const u8 sDoorAnimPalettes_Sootopolis[] = {6, 6, 6, 6, 6, 6, 6, 6}; +static const u8 sDoorAnimPalettes_Dewford[] = {0, 0, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_Slateport[] = {6, 6, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_Mauville[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_Verdanturf[] = {6, 6, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_LilycoveWooden[] = {5, 5, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_Contest[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_BattleTowerCorridor[] = {6, 6, 6, 6, 6, 6, 6, 6}; +static const u8 sDoorAnimPalettes_CyclingRoad[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_LilycoveDeptStore[] = {5, 5, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_SafariZone[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_MossdeepSpaceCenter[] = {8, 8, 8, 8, 8, 8, 8, 8}; +static const u8 sDoorAnimPalettes_CableClub[] = {6, 6, 6, 6, 6, 6, 6, 6}; +static const u8 sDoorAnimPalettes_AbandonedShip[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_FallarborDarkRoof[] = {11, 11, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_AbandonedShipRoom[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_LilycoveDeptStoreElevator[] = {6, 6, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattleTowerOld[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_BattleTowerElevator[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_34[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_BattleDome[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_BattleFactory[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_BattleTower[] = {0, 0, 0, 0, 0, 0, 0, 0}; +static const u8 sDoorAnimPalettes_BattleArena[] = {5, 5, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_BattleArenaLobby[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattleDomeLobby[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattlePalaceLobby[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattleTent[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_BattleDomeCorridor[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattleTowerMultiCorridor[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_Unused[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_BattleFrontier[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_BattleDomePreBattleRoom[] = {9, 9, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattleTentInterior[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_TrainerHillLobbyElevator[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_TrainerHillRoofElevator[] = {9, 9, 7, 7, 7, 7, 7, 7}; + +static const struct DoorGraphics sDoorAnimGraphicsTable[] = +{ + {METATILE_General_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_General, sDoorAnimPalettes_General}, + {METATILE_General_Door_PokeCenter, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_PokeCenter, sDoorAnimPalettes_PokeCenter}, + {METATILE_General_Door_Gym, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_Gym, sDoorAnimPalettes_Gym}, + {METATILE_General_Door_PokeMart, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_PokeMart, sDoorAnimPalettes_PokeMart}, + {METATILE_Petalburg_Door_Littleroot, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Littleroot, sDoorAnimPalettes_Littleroot}, + {METATILE_Petalburg_Door_BirchsLab, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_BirchsLab, sDoorAnimPalettes_BirchsLab}, + {METATILE_Rustboro_Door_Tan, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_RustboroTan, sDoorAnimPalettes_RustboroTan}, + {METATILE_Rustboro_Door_Gray, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_RustboroGray, sDoorAnimPalettes_RustboroGray}, + {METATILE_Fallarbor_Door_LightRoof, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_FallarborLightRoof, sDoorAnimPalettes_FallarborLightRoof}, + {METATILE_Petalburg_Door_Oldale, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Oldale, sDoorAnimPalettes_Oldale}, + {METATILE_Mauville_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Mauville, sDoorAnimPalettes_Mauville}, + {METATILE_Mauville_Door_Verdanturf, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Verdanturf, sDoorAnimPalettes_Verdanturf}, + {METATILE_Slateport_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Slateport, sDoorAnimPalettes_Slateport}, + {METATILE_Dewford_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Dewford, sDoorAnimPalettes_Dewford}, + {METATILE_General_Door_Contest, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_Contest, sDoorAnimPalettes_Contest}, + {METATILE_Lilycove_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Lilycove, sDoorAnimPalettes_Lilycove}, + {METATILE_Lilycove_Door_Wooden, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_LilycoveWooden, sDoorAnimPalettes_LilycoveWooden}, + {METATILE_Mossdeep_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Mossdeep, sDoorAnimPalettes_Mossdeep}, + {METATILE_Sootopolis_Door_PeakedRoof, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_SootopolisPeakedRoof, sDoorAnimPalettes_SootopolisPeakedRoof}, + {METATILE_Sootopolis_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Sootopolis, sDoorAnimPalettes_Sootopolis}, + {METATILE_EverGrande_Door_PokemonLeague, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_PokemonLeague, sDoorAnimPalettes_PokemonLeague}, + {METATILE_Pacifidlog_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Pacifidlog, sDoorAnimPalettes_Pacifidlog}, + {METATILE_BattleFrontier_Door_Corridor, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_BattleTowerCorridor, sDoorAnimPalettes_BattleTowerCorridor}, + {METATILE_Mauville_Door_CyclingRoad, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_CyclingRoad, sDoorAnimPalettes_CyclingRoad}, + {METATILE_Lilycove_Door_DeptStore, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_LilycoveDeptStore, sDoorAnimPalettes_LilycoveDeptStore}, + {METATILE_Lilycove_Door_SafariZone, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_SafariZone, sDoorAnimPalettes_SafariZone}, + {METATILE_Mossdeep_Door_SpaceCenter, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_MossdeepSpaceCenter, sDoorAnimPalettes_MossdeepSpaceCenter}, + {METATILE_PokemonCenter_Door_CableClub, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_CableClub, sDoorAnimPalettes_CableClub}, + {METATILE_InsideShip_IntactDoor_Bottom_Unlocked, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_AbandonedShip, sDoorAnimPalettes_AbandonedShip}, + {METATILE_Fallarbor_Door_DarkRoof, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_FallarborDarkRoof, sDoorAnimPalettes_FallarborDarkRoof}, + {METATILE_InsideShip_IntactDoor_Bottom_Interior, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_AbandonedShipRoom, sDoorAnimPalettes_AbandonedShipRoom}, + {METATILE_Shop_Door_Elevator, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_LilycoveDeptStoreElevator, sDoorAnimPalettes_LilycoveDeptStoreElevator}, + {METATILE_Dewford_Door_BattleTower, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTowerOld, sDoorAnimPalettes_BattleTowerOld}, + {METATILE_BattleFrontier_Door_Elevator, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTowerElevator, sDoorAnimPalettes_BattleTowerElevator}, + {0x3B0, /* TODO: Missing metatile ID */ DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_34, sDoorAnimPalettes_34}, + {METATILE_BattleFrontierOutsideWest_Door_BattleDome, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleDome, sDoorAnimPalettes_BattleDome}, + {METATILE_BattleFrontierOutsideWest_Door_BattleFactory, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleFactory, sDoorAnimPalettes_BattleFactory}, + {METATILE_BattleFrontierOutsideEast_Door_BattleTower, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTower, sDoorAnimPalettes_BattleTower}, + {METATILE_BattleFrontierOutsideEast_Door_BattleArena, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_BattleArena, sDoorAnimPalettes_BattleArena}, + {METATILE_BattleArena_Door, DOOR_SOUND_ARENA, 1, sDoorAnimTiles_BattleArenaLobby, sDoorAnimPalettes_BattleArenaLobby}, + {METATILE_BattleDome_Door_Lobby, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleDomeLobby, sDoorAnimPalettes_BattleDomeLobby}, + {METATILE_BattlePalace_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_BattlePalaceLobby, sDoorAnimPalettes_BattlePalaceLobby}, + {METATILE_Slateport_Door_BattleTent, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTent, sDoorAnimPalettes_BattleTent}, + {METATILE_Mauville_Door_BattleTent, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTent, sDoorAnimPalettes_BattleTent}, + {METATILE_Fallarbor_Door_BattleTent, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTent, sDoorAnimPalettes_BattleTent}, + {METATILE_BattleDome_Door_Corridor, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleDomeCorridor, sDoorAnimPalettes_BattleDomeCorridor}, + {METATILE_BattleFrontier_Door_MultiCorridor, DOOR_SOUND_SLIDING, 2, sDoorAnimTiles_BattleTowerMultiCorridor, sDoorAnimPalettes_BattleTowerMultiCorridor}, + {METATILE_BattleFrontierOutsideWest_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_BattleFrontier, sDoorAnimPalettes_BattleFrontier}, + {METATILE_BattleFrontierOutsideWest_Door_Sliding, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleFrontierSliding, sDoorAnimPalettes_BattleFrontier}, + {METATILE_BattleDome_Door_PreBattleRoom, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleDomePreBattleRoom, sDoorAnimPalettes_BattleDomePreBattleRoom}, + {METATILE_BattleTent_Door, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTentInterior, sDoorAnimPalettes_BattleTentInterior}, + {METATILE_TrainerHill_Door_Elevator_Lobby, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_TrainerHillLobbyElevator, sDoorAnimPalettes_TrainerHillLobbyElevator}, + {METATILE_TrainerHill_Door_Elevator_Roof, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_TrainerHillRoofElevator, sDoorAnimPalettes_TrainerHillRoofElevator}, + {}, }; static void CopyDoorTilesToVram(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frame) @@ -796,7 +444,7 @@ static void DrawOpenedDoor(const struct DoorGraphics *gfx, u32 x, u32 y) { gfx = GetDoorGraphics(gfx, MapGridGetMetatileIdAt(x, y)); if (gfx != NULL) - DrawDoor(gfx, GetLastDoorFrame(gDoorOpenAnimFrames, gDoorOpenAnimFrames), x, y); + DrawDoor(gfx, GetLastDoorFrame(sDoorOpenAnimFrames, sDoorOpenAnimFrames), x, y); } static s8 StartDoorOpenAnimation(const struct DoorGraphics *gfx, u32 x, u32 y) @@ -809,9 +457,9 @@ static s8 StartDoorOpenAnimation(const struct DoorGraphics *gfx, u32 x, u32 y) else { if (gfx->size == 2) - return StartDoorAnimationTask(gfx, gBigDoorOpenAnimFrames, x, y); + return StartDoorAnimationTask(gfx, sBigDoorOpenAnimFrames, x, y); else - return StartDoorAnimationTask(gfx, gDoorOpenAnimFrames, x, y); + return StartDoorAnimationTask(gfx, sDoorOpenAnimFrames, x, y); } } @@ -821,10 +469,10 @@ static s8 StartDoorCloseAnimation(const struct DoorGraphics *gfx, u32 x, u32 y) if (gfx == NULL) return -1; else - return StartDoorAnimationTask(gfx, gDoorCloseAnimFrames, x, y); + return StartDoorAnimationTask(gfx, sDoorCloseAnimFrames, x, y); } -static s8 cur_mapdata_get_door_x2_at(const struct DoorGraphics *gfx, u32 x, u32 y) +static s8 GetDoorSoundType(const struct DoorGraphics *gfx, u32 x, u32 y) { gfx = GetDoorGraphics(gfx, MapGridGetMetatileIdAt(x, y)); if (gfx == NULL) @@ -833,21 +481,22 @@ static s8 cur_mapdata_get_door_x2_at(const struct DoorGraphics *gfx, u32 x, u32 return gfx->sound; } -void unref_sub_808A83C(u32 x, u32 y) +// Unused. Debug? Same as FieldAnimateDoorOpen but doesnt return or check if metatile is actually a door +static void Debug_FieldAnimateDoorOpen(u32 x, u32 y) { - StartDoorOpenAnimation(gDoorAnimGraphicsTable, x, y); + StartDoorOpenAnimation(sDoorAnimGraphicsTable, x, y); } void FieldSetDoorOpened(u32 x, u32 y) { if (MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y))) - DrawOpenedDoor(gDoorAnimGraphicsTable, x, y); + DrawOpenedDoor(sDoorAnimGraphicsTable, x, y); } void FieldSetDoorClosed(u32 x, u32 y) { if (MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y))) - DrawClosedDoor(gDoorAnimGraphicsTable, x, y); + DrawClosedDoor(sDoorAnimGraphicsTable, x, y); } s8 FieldAnimateDoorClose(u32 x, u32 y) @@ -855,7 +504,7 @@ s8 FieldAnimateDoorClose(u32 x, u32 y) if (!MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y))) return -1; else - return StartDoorCloseAnimation(gDoorAnimGraphicsTable, x, y); + return StartDoorCloseAnimation(sDoorAnimGraphicsTable, x, y); } s8 FieldAnimateDoorOpen(u32 x, u32 y) @@ -863,7 +512,7 @@ s8 FieldAnimateDoorOpen(u32 x, u32 y) if (!MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y))) return -1; else - return StartDoorOpenAnimation(gDoorAnimGraphicsTable, x, y); + return StartDoorOpenAnimation(sDoorAnimGraphicsTable, x, y); } bool8 FieldIsDoorAnimationRunning(void) @@ -873,13 +522,13 @@ bool8 FieldIsDoorAnimationRunning(void) u32 GetDoorSoundEffect(u32 x, u32 y) { - int sound = cur_mapdata_get_door_x2_at(gDoorAnimGraphicsTable, x, y); + int sound = GetDoorSoundType(sDoorAnimGraphicsTable, x, y); - if (sound == 0) + if (sound == DOOR_SOUND_NORMAL) return SE_DOOR; - else if (sound == 1) + else if (sound == DOOR_SOUND_SLIDING) return SE_JIDO_DOA; - else if (sound == 2) + else if (sound == DOOR_SOUND_ARENA) return SE_TU_SAA; else return SE_DOOR; diff --git a/src/item.c b/src/item.c index 61069ca73..44b73802b 100644 --- a/src/item.c +++ b/src/item.c @@ -202,9 +202,9 @@ bool8 CheckBagHasSpace(u16 itemId, u16 count) pocket = ItemId_GetPocket(itemId) - 1; if (pocket != BERRIES_POCKET) - slotCapacity = 99; + slotCapacity = MAX_BAG_ITEM_CAPACITY; else - slotCapacity = 999; + slotCapacity = MAX_BERRY_CAPACITY; // Check space in any existing item slots that already contain this item for (i = 0; i < gBagPockets[pocket].capacity; i++) @@ -422,9 +422,9 @@ bool8 AddBagItem(u16 itemId, u16 count) memcpy(newItems, itemPocket->itemSlots, itemPocket->capacity * sizeof(struct ItemSlot)); if (pocket != BERRIES_POCKET) - slotCapacity = 99; + slotCapacity = MAX_BAG_ITEM_CAPACITY; else - slotCapacity = 999; + slotCapacity = MAX_BERRY_CAPACITY; for (i = 0; i < itemPocket->capacity; i++) { @@ -667,15 +667,15 @@ bool8 AddPCItem(u16 itemId, u16 count) if (newItems[i].itemId == itemId) { ownedCount = GetPCItemQuantity(&newItems[i].quantity); - if (ownedCount + count <= 999) + if (ownedCount + count <= MAX_PC_ITEM_CAPACITY) { SetPCItemQuantity(&newItems[i].quantity, ownedCount + count); memcpy(gSaveBlock1Ptr->pcItems, newItems, sizeof(gSaveBlock1Ptr->pcItems)); Free(newItems); return TRUE; } - count += ownedCount - 999; - SetPCItemQuantity(&newItems[i].quantity, 999); + count += ownedCount - MAX_PC_ITEM_CAPACITY; + SetPCItemQuantity(&newItems[i].quantity, MAX_PC_ITEM_CAPACITY); if (count == 0) { memcpy(gSaveBlock1Ptr->pcItems, newItems, sizeof(gSaveBlock1Ptr->pcItems)); @@ -883,10 +883,10 @@ static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count) { if (items[i] == itemId || items[i] == ITEM_NONE) { - if (quantities[i] + count <= 99) + if (quantities[i] + count <= MAX_BAG_ITEM_CAPACITY) return TRUE; - count = (quantities[i] + count) - 99; + count = (quantities[i] + count) - MAX_BAG_ITEM_CAPACITY; if (count == 0) return TRUE; } @@ -910,13 +910,13 @@ bool8 AddPyramidBagItem(u16 itemId, u16 count) for (i = 0; i < PYRAMID_BAG_ITEMS_COUNT; i++) { - if (newItems[i] == itemId && newQuantities[i] < 99) + if (newItems[i] == itemId && newQuantities[i] < MAX_BAG_ITEM_CAPACITY) { newQuantities[i] += count; - if (newQuantities[i] > 99) + if (newQuantities[i] > MAX_BAG_ITEM_CAPACITY) { - count = newQuantities[i] - 99; - newQuantities[i] = 99; + count = newQuantities[i] - MAX_BAG_ITEM_CAPACITY; + newQuantities[i] = MAX_BAG_ITEM_CAPACITY; } else { @@ -936,10 +936,10 @@ bool8 AddPyramidBagItem(u16 itemId, u16 count) { newItems[i] = itemId; newQuantities[i] = count; - if (newQuantities[i] > 99) + if (newQuantities[i] > MAX_BAG_ITEM_CAPACITY) { - count = newQuantities[i] - 99; - newQuantities[i] = 99; + count = newQuantities[i] - MAX_BAG_ITEM_CAPACITY; + newQuantities[i] = MAX_BAG_ITEM_CAPACITY; } else { diff --git a/src/pokemon.c b/src/pokemon.c index 5a4e6df08..6dd09902d 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5079,7 +5079,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov friendship += var_34; if (var_34 > 0) { - if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) friendship++; if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; @@ -5105,7 +5105,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov friendship += var_34; if (var_34 > 0) { - if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) friendship++; if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; @@ -5130,7 +5130,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov friendship += var_34; if (var_34 > 0) { - if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) friendship++; if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; diff --git a/src/shop.c b/src/shop.c index 0bb527f81..a4d1939cb 100755 --- a/src/shop.c +++ b/src/shop.c @@ -994,9 +994,9 @@ static void Task_BuyHowManyDialogueInit(u8 taskId) maxQuantity = GetMoney(&gSaveBlock1Ptr->money) / gShopDataPtr->totalCost; - if (maxQuantity > 99) + if (maxQuantity > MAX_BAG_ITEM_CAPACITY) { - gShopDataPtr->maxQuantity = 99; + gShopDataPtr->maxQuantity = MAX_BAG_ITEM_CAPACITY; } else { diff --git a/src/slot_machine.c b/src/slot_machine.c index a7dcd1613..db1291ceb 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -24,6 +24,7 @@ #include "main_menu.h" #include "bg.h" #include "window.h" +#include "constants/coins.h" // Text extern const u8 gText_YouDontHaveThreeCoins[]; @@ -974,7 +975,7 @@ static bool8 SlotAction4(struct Task *task) { sub_8104CAC(0); sSlotMachine->state = 5; - if (sSlotMachine->coins >= 9999) + if (sSlotMachine->coins >= MAX_COINS) sSlotMachine->state = 23; return TRUE; } @@ -1186,8 +1187,8 @@ static bool8 SlotAction_CheckMatches(struct Task *task) { sub_8104CAC(3); sSlotMachine->state = 20; - if ((sSlotMachine->netCoinLoss += sSlotMachine->bet) > 9999) - sSlotMachine->netCoinLoss = 9999; + if ((sSlotMachine->netCoinLoss += sSlotMachine->bet) > MAX_COINS) + sSlotMachine->netCoinLoss = MAX_COINS; } return FALSE; } @@ -1693,7 +1694,7 @@ static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task) if (IsFanfareTaskInactive()) PlaySE(SE_PIN); sSlotMachine->payout--; - if (sSlotMachine->coins < 9999) + if (sSlotMachine->coins < MAX_COINS) sSlotMachine->coins++; task->data[1] = 8; if (gMain.heldKeys & A_BUTTON) @@ -1703,8 +1704,8 @@ static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task) { PlaySE(SE_PIN); sSlotMachine->coins += sSlotMachine->payout; - if (sSlotMachine->coins > 9999) - sSlotMachine->coins = 9999; + if (sSlotMachine->coins > MAX_COINS) + sSlotMachine->coins = MAX_COINS; sSlotMachine->payout = 0; } if (sSlotMachine->payout == 0) @@ -3291,9 +3292,9 @@ static void sub_8104F8C(void) s16 i; s16 x; - for (x = 203, i = 1; i < 10000; i *= 10, x -= 7) + for (x = 203, i = 1; i <= MAX_COINS; i *= 10, x -= 7) sub_8104FF4(x, 23, 0, i); - for (x = 235, i = 1; i < 10000; i *= 10, x -= 7) + for (x = 235, i = 1; i <= MAX_COINS; i *= 10, x -= 7) sub_8104FF4(x, 23, 1, i); } |
