Commit Graph

5218 Commits

Author SHA1 Message Date
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 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
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
Revo
0f86137485
Merge pull request #853 from AreaZeroArven/do-some-work
event_object_movement: un-assembler InitObjectEventStateFromTemplate
2023-01-07 13:04:07 -05:00
Revo
df0a97c212
Merge pull request #854 from AreaZeroArven/Work-2
pokedex: Un-assembler nonmatchings
2023-01-07 13:03:33 -05:00
Revo
79ac263c2a
Merge pull request #856 from AreaZeroArven/work5
wally: un-assembler sub_81390D0
2023-01-07 13:03:24 -05:00
Revo
eeca8ff494
Merge pull request #857 from AreaZeroArven/work6
contest: un-assembler Contest_InitAllPokemon
2023-01-07 13:03:14 -05:00
Arven
1586f69e84 contest: un-assembler Contest_InitAllPokemon 2023-01-07 12:24:36 -05:00
Arven
7d03f8939d wally: un-assembler sub_81390D0
Signed-off-by:Arven
2023-01-07 12:19:10 -05:00
Arven
dbd5aa7d1d pokedex: Un-assembler nonmatchings
Remove useless statements

Signed-off-by:Arven
2023-01-06 11:23:35 -05:00
Arven
1ef5efc481 event_object_movement: un-assembler InitObjectEventStateFromTemplate
Here lies another change from pokeemerald.

I hope to get the symbol names from
pokeemerald in future patches.

Signed-off-by:Arven
2023-01-06 10:36:00 -05:00
Revo
211e109b90
Merge pull request #852 from AreaZeroArven/do-some-work
dewford: un-assembler dewford trend
2023-01-05 19:47:10 -05:00
Rose
ca68698977 dewford: Un-assembler Dewford Trend
I am a new contributor. As my first commit,
I would like to do a simple code transplant.

By migrating the code from pokeemerald,
asm is no longer needed in this file.

sub_80FA828 was also renamed.

Signed-off-by: Arven
2023-01-05 17:08:56 -05:00
GriffinR
034790d0b5 Sync calcrom fixes 2022-11-27 17:30:09 -05:00
GriffinR
d99cb43736
Merge pull request #851 from pret/porymap-5
Update for Porymap 5.0.0
2022-10-30 11:01:21 -04:00
GriffinR
765deac254
Merge pull request #849 from GriffinRichards/dynamic-warps
Rename special map constants, treat warp ids as strings
2022-10-18 22:46:08 -04:00
GriffinR
fe9defe8a4
Merge pull request #846 from GriffinRichards/sync-webhook
Reformat object event graphics info
2022-09-25 22:08:43 -04:00
GriffinR
b2fbf9d765
Merge pull request #842 from garakmon/rme-updates
use json for region map sections
2022-09-25 22:08:19 -04:00
GriffinR
9cdc8b16c6 Ignore new Porymap config 2022-09-25 18:35:59 -04:00
GriffinR
5307344381 Ignore Porymap's prefabs file 2022-09-24 18:29:34 -04:00
GriffinR
4e814090a2 Treat warp ids as strings to allow constants 2022-08-26 14:38:46 -04:00
GriffinR
4084e7832b MAP_NONE -> MAP_DYNAMIC 2022-08-26 14:34:50 -04:00
GriffinR
b81c1ef348 Fix berry tree entry 2022-08-17 10:20:06 -04:00
GriffinR
3f0626bb44 Remove include guards in object_event_graphics_info.h 2022-07-02 17:27:44 -04:00
GriffinR
e3223dca5a Reformat object event graphics info 2022-07-02 16:42:08 -04:00
GriffinR
676745e7c6
Merge pull request #844 from Kurausukun/bpm
Use Floats and Round Correctly in Tempo Calculation
2022-06-28 00:31:53 -04:00
Kurausukun
b109ccd943 use floats for tempo calculation 2022-06-28 00:16:01 -04:00
garakmon
ead35b86a2 use json for region map sections 2022-04-28 19:32:55 -04:00