5245 Commits

Author SHA1 Message Date
GriffinR
6ec9cc0149
Merge pull request #875 from xyifer12/TownAndCityNameParityUpdate
All 16 towns and cities updated for data name parity with pokeemerald.
2025-02-26 17:56:07 -05:00
Robin Xyifer
625c86d4c9 Corrected Littleroot script mislabeling, from HideMapNamePopup to MoveRivalFromOldale. 2025-02-26 16:30:36 -06:00
Robin Xyifer
43116d96c3 Condensed duplicate Fallarbor Town Sign text scripts, from 3 to 1. Modified MeteorFalls maps to use condensed script. Compare OK. 2025-02-26 16:29:38 -06:00
Robin Xyifer
7638fb93ce Reverted change, AbnormalWeather is now LegendaryWeather. 2025-02-26 16:28:07 -06:00
Robin Xyifer
9a20e433b0 Fixed DE SootopolisCity text.inc not using updated NoOrdinaryTourist names. 2025-02-26 15:08:21 -06:00
Robin Xyifer
29cbcca988 Pokemon contest hall name fix. 2025-02-26 14:24:13 -06:00
Robin Xyifer
0899135d30 Ancillary changes for Town and City name parity update with Emerald. 2025-02-26 13:44:06 -06:00
Robin Xyifer
5f9f029001 LavaridgeTown name parity with Emerald. 2025-02-26 11:22:10 -06:00
Robin Xyifer
2d7d5368dc LilycoveCity name parity with Emerald. 2025-02-26 09:43:56 -06:00
Robin Xyifer
539ac7096a LittlerootTown name parity with Emerald. 2025-02-26 08:37:00 -06:00
Robin Xyifer
03421eed2b MauvilleCity name parity with Emerald. 2025-02-26 07:36:37 -06:00
Robin Xyifer
23d22f87fc MossdeepCity name parity with Emerald. 2025-02-26 07:12:57 -06:00
Robin Xyifer
1f0f4ecaa3 OldaleTown name parity with Emerald. 2025-02-26 07:01:20 -06:00
Robin Xyifer
ca2e8b34b8 PacifidlogTown name parity with Emerald. 2025-02-26 06:47:08 -06:00
Robin Xyifer
ad99ec95c3 PetalburgCity name parity with Emerald. 2025-02-26 06:42:45 -06:00
Robin Xyifer
0a474b79bf RustboroCity name parity with Emerald. 2025-02-25 16:55:59 -06:00
Robin Xyifer
06ed70caec SlateportCity name parity with Emerald. 2025-02-25 16:09:39 -06:00
Robin Xyifer
db68ae1dd2 SootopolisCity name parity with Emerald. 2025-02-25 14:32:59 -06:00
Robin Xyifer
9697dc14f0 VerdanturfTown name parity with Emerald. 2025-02-25 13:02:05 -06:00
Robin Xyifer
cdd1377bc5 FortreeCity name parity with Emerald. 2025-02-25 12:52:15 -06:00
Robin Xyifer
8cb4d0435c EverGrandecity name parity with Emerald. 2025-02-25 12:51:56 -06:00
Robin Xyifer
d38f1ade2b FallarborTown name parity with Emerald. 2025-02-25 12:51:34 -06:00
Robin Xyifer
1df990f1d8 DewfordTown name parity with Emerald. 2025-02-25 12:51:08 -06:00
Xyifer
6eec908ad1
AbandonedShip name parity update with PokeEmerald. (#874)
Some checks failed
CI / build (push) Has been cancelled
2025-02-25 09:18:15 -05:00
Xyifer
c3530bdf81
Route110_TrickHouse name parity with PokeEmerald. (#873)
Some checks are pending
CI / build (push) Waiting to run
2025-02-24 18:07:07 -05:00
GriffinR
63388a8dcc Fix libpng installation for workflow on Ubuntu 24.04
Some checks failed
CI / build (push) Has been cancelled
2024-10-11 13:37:18 -04:00
luckytyphlosion
9b75364dfb
Merge pull request #859 from AreaZeroArven/work9
Some checks failed
CI / build (push) Has been cancelled
Synchronize function names with pokeemerald
2024-09-30 19:11:39 -04:00
luckytyphlosion
e1eeb8862b
Merge branch 'master' into work9 2024-09-30 19:10:37 -04:00
luckytyphlosion
e898671d0d
Merge pull request #858 from AreaZeroArven/work8
Unassembler and rename sub_8044804
2024-09-30 19:10:22 -04:00
GriffinR
5d2b9c7277
Merge pull request #868 from GriffinRichards/sync-tools
Sync tools with pokeemerald
2024-09-24 15:59:26 -04:00
GriffinR
7fd6db7505 Fix commented repo name 2024-09-18 11:52:08 -04:00
GriffinR
7505574a7d Sync tools 2024-09-18 11:39:43 -04:00
GriffinR
00369ab8ef Sync fix for libpng on macOS
Some checks failed
CI / build (push) Failing after 0s
2024-09-11 15:38:46 -04:00
GriffinR
714bd0ac0e
Merge pull request #867 from GriffinRichards/metatile-labels
Remove non-existent tilesets from label comments and alphabetize
2024-01-19 10:49:18 -05:00
GriffinR
8a18664468 Move unown ? and ! icons to the correct file 2024-01-18 17:43:42 -05:00
GriffinR
4cfc9ee51c Sync labels in AbandonedShip corridor scripts 2024-01-18 15:56:42 -05:00
GriffinR
4a3310af67 Remove non-existent tilesets from label comments and alphabetize 2024-01-18 14:51:07 -05:00
GriffinR
108d7bb317
Merge pull request #866 from SnorlaxMonster/master
Rename HITMARKER_IGNORE_SAFEGUARD
2023-11-18 08:50:47 -05:00
SnorlaxMonster
a5503c0950 Rename HITMARKER_IGNORE_SAFEGUARD
Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT.
This flag is used exclusively by status-inflicting Abilities,
and has 3 main functions:
- Whether the effect bypasses Shield Dust
- Whether the effect bypasses Safeguard
- Which text string to display when the status condition is inflicted
   (i.e. whether it was inflicted by a move or Ability)

I believe this new name better represents what the flag actually does.
This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.
2023-11-18 13:56:27 +11:00
GriffinR
12feab59dc
Merge pull request #863 from AnonymousRandomPerson/master
Replaced decomp list with pret.github.io link
2023-10-17 02:45:34 -04:00
GriffinR
9e017b2e37
Merge pull request #864 from citrusbolt/blockboxrs
[LEAK-INFORMED] Add `blockBoxRS` field to `struct BoxPokemon`
2023-09-12 18:49:25 -04:00
citrusbolt
c6d75c0c60 Add blockBoxRS field to struct BoxPokemon 2023-09-09 22:05:43 -06:00
AnonymousRandomPerson
7d216d4368 Replaced decomp list with pret.github.io link 2023-08-30 18:39:12 -04:00
GriffinR
4e92005266
Merge pull request #862 from WhenGryphonsFly/master
Correct KEY_INTR_ENABLE
2023-08-27 17:41:40 -04:00
WhenGryphonsFly
31b9edb97d
Correct KEY_INTR_ENABLE 2023-08-27 16:29:10 -05:00
GriffinR
2b91330825
Merge pull request #861 from AnonymousRandomPerson/master
Added newer decomp projects to readme
2023-08-18 23:46:48 -04:00
AnonymousRandomPerson
1851495569 Added newer decomp projects to readme 2023-08-18 23:35:04 -04:00
GriffinR
28b53dc44b Sync fieldmap 2023-05-09 16:09:33 -04:00
GriffinR
af019d660f Sync mapjson/map.inc with pokeemerald 2023-05-09 16:09:26 -04:00
GriffinR
566e7167bf Let scaninc/preproc ignore empty asm files 2023-02-27 13:13:21 -05:00