Commit Graph

1842 Commits

Author SHA1 Message Date
Robin Xyifer
18784d3a27 Revision and cleanup before build testing. 2025-03-13 18:59:56 -05:00
Robin Xyifer
ecd31b9fa2 LilycoveCity internal maps name parity update. 2025-03-13 15:45:50 -05:00
Robin Xyifer
9374e6261a LavaridgeTown internal maps name parity update. 2025-03-11 21:21:07 -05:00
Robin Xyifer
9a26d88699 FallarborTown internal maps name parity update. 2025-03-11 18:55:05 -05:00
Robin Xyifer
6a3a6eaba4 DewfordTown 2025-03-07 14:16:57 -06:00
Robin Xyifer
0899135d30 Ancillary changes for Town and City name parity update with Emerald. 2025-02-26 13:44:06 -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
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
7505574a7d Sync tools 2024-09-18 11:39:43 -04: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
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
citrusbolt
c6d75c0c60 Add blockBoxRS field to struct BoxPokemon 2023-09-09 22:05:43 -06:00
WhenGryphonsFly
31b9edb97d
Correct KEY_INTR_ENABLE 2023-08-27 16:29:10 -05: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
Arven
9ad4c9c774 Synchronize function names with pokeemerald 2023-01-07 13:54:20 -05:00
Arven
eb2d041143 Unassembler and rename sub_8044804
This function is known as CreatePartyStatusSummarySprites in pokeemerald
2023-01-07 13:51:35 -05:00
GriffinR
4084e7832b MAP_NONE -> MAP_DYNAMIC 2022-08-26 14:34:50 -04:00
Jademalo
9ed24500ac IDE support formatting and consistency 2021-10-23 10:10:08 +01:00
Jademalo
4fbae0d4c9 Improve IDE Support 2021-10-22 04:44:46 +01:00
SatoMew
f931f40b1b Replace incorrect instances of Mystery Gift with Mystery Event 2021-09-12 23:08:09 +01:00
Kurausukun
cc0720f061 port cgb documentation and fakematch fixes 2021-08-08 20:48:28 -04:00
PikalaxALT
20ddd44176 Remove braces around one-line expressions; add constants/rgb.h 2021-07-12 17:00:40 -04:00
PikalaxALT
5fe1a85bd8 Match sub_80EF624 2021-07-10 16:03:33 -04:00
PikalaxALT
b86d6d05d9 Fix style issues 2021-07-08 08:38:51 -04:00
PikalaxALT
e4f0217a6a Document eBattleBars array 2021-07-06 14:42:21 -04:00
PikalaxALT
12395bc115 Merge two battle interface related structs 2021-07-06 13:31:18 -04:00
PikalaxALT
83e700e3ea Port atk48_playstatchangeanimation from Emerald 2021-07-05 18:29:30 -04:00
PikalaxALT
cb702f7ae6 Decompile SetMoveEffect 2021-07-05 18:14:03 -04:00
PikalaxALT
2a52f21d6f Match GetStringLanguage. Also: nice 2021-07-02 10:54:40 -04:00
PikalaxALT
dc8ffd4655 Match sub_80D3B60 2021-07-02 08:42:08 -04:00
PikalaxALT
23872d44fc Decompile debug version of OpponentHandlecmd20 2021-07-01 21:35:25 -04:00
PikalaxALT
050cce5c3e Document pokemon_item_effect, struct BattleResult 2021-07-01 18:21:09 -04:00
PikalaxALT
4c2dce093c Unify ChooseMoveStruct; name BattleStruct fields 2021-07-01 17:54:51 -04:00
PikalaxALT
d7018c1149 Tidy up ewram.h; yeet some more redundant definitions 2021-06-30 16:49:31 -04:00
PikalaxALT
f6abfb424c Expand battle struct macros inline, 2 2021-06-30 13:07:10 -04:00
PikalaxALT
6444d16985 Expand battle struct access macros inline 2021-06-30 10:32:08 -04:00
PikalaxALT
fe2897c8a4 Define BSTRUCT_OFF for gBattleStruct macro hacks 2021-06-29 21:31:19 -04:00
PikalaxALT
7929bdf80b Merge several EWRAM definitions into gBattleStruct 2021-06-29 21:13:37 -04:00
PikalaxALT
a3a160964d This array is part of a contest buffer 2021-06-29 20:40:25 -04:00
PikalaxALT
ce62efbcec Split out multi buffers from battle struct 2021-06-29 20:17:19 -04:00
PikalaxALT
0882b45693 Clean up some ewram refs inside gBattleStruct 2021-06-29 15:54:20 -04:00
PikalaxALT
2c1048f683 Merge roulette ewram pointers 2021-06-29 15:29:45 -04:00
PikalaxALT
d172b9ed71 Merge structs at 02019348 2021-06-29 15:22:33 -04:00
PikalaxALT
0117d43fa7 Merge UNK_STRUCT_2018000 into pssData 2021-06-29 14:43:07 -04:00
PikalaxALT
849725d85e Merge battle structs at 17810 2021-06-29 14:38:54 -04:00
PikalaxALT
4b9835fbdf Merge transform status struct into gBattleSpriteInfo 2021-06-29 14:31:37 -04:00