Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,646 Commits 1 Branch 0 Tags
main
Commit Graph
72 Commits
Author SHA1 Message Date
W1serV1ser d076aa96d4 Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-29 21:31:06 -07:00
W1serV1ser 76ba156a5c Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-11 16:31:44 -08:00
GriffinR dbf757be88 Treat map data as const 2023-03-08 12:00:30 -05:00
GriffinR de56e400ff Sync clone object macro 2023-02-08 13:11:10 -05:00
Eduardo Quezada 66d1c9bc65 Documenting padding in structs used by Saveblocks 2022-12-17 22:55:43 -03:00
GriffinR 65d3944a93 Give tileset palettes proper type, name compressed secret base tiles 2022-10-08 02:02:12 -04:00
GriffinR 4f407a1066 Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
GriffinR 03a98c72bc Sync fieldmap 2022-09-02 19:29:35 -04:00
W1serV1ser 21ec0f0223 Revert "Merge branch 'master' into FollowingPokemon_Gen1-3" 
This reverts commit 63b2bd9a44, reversing
changes made to a716f522f3.
 2022-07-06 09:02:50 -07:00
W1serV1ser c6b9e7994f Revert "Merge branch 'FollowingPokemon' into master" 
This reverts commit 435a4f84e2, reversing
changes made to bee11f31cd.
 2022-07-06 00:37:51 -07:00
W1serV1ser 005059dfed Squashed commit of the following: 
commit fabad02201
Merge: 087244104 eb07617a2
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Thu Feb 10 16:03:45 2022 -0800

    Merge branch 'pret:master' into master

commit eb07617a20
Merge: 7d2344c07 a86a27918
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Feb 9 08:34:10 2022 -0500

    Merge pull request #1623 from kiliwily/master

    Update money.c

commit a86a279184
Author: kiliwily <69381603+kiliwily@users.noreply.github.com>
Date:   Sun Feb 6 16:25:56 2022 +0100

    Update money.c

commit 7d2344c07b
Merge: f494238a9 dc7d86f02
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Feb 2 22:09:36 2022 -0500

    Merge pull request #1616 from GriffinRichards/missing-req

    Add missing :req, remove old macros

commit f494238a9d
Merge: e30b16f0f 1ff0b0efa
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 30 23:00:05 2022 -0500

    Merge pull request #1621 from GriffinRichards/constants-collision

    Add missing collision constant usage

commit 1ff0b0efa9
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 29 21:13:46 2022 -0500

    Add missing collision constant usage

commit e30b16f0fd
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 21:50:15 2022 -0500

    Fix Swap_HandleQuitSwappingResposne typo

commit 2efbd5f549
Merge: 4188dd405 3d0326106
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 17:51:56 2022 -0500

    Merge pull request #1608 from GriffinRichards/fix-fieldmap

    Fix some incorrect fieldmap names

commit 4188dd405c
Merge: 9f2b6ab2f 6470b0d00
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 26 17:44:26 2022 -0500

    Merge pull request #1620 from LOuroboros/gBallSpriteTemplates

    Used ball constants in gBallSpriteTemplates

commit 6470b0d004
Author: LOuroboros <lunosouroboros@gmail.com>
Date:   Wed Jan 26 18:36:21 2022 -0300

    Used ball constants in gBallSpriteTemplates

commit dc7d86f026
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 23 19:26:22 2022 -0500

    Add new macro comments

commit 2495d18132
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 23 18:51:56 2022 -0500

    Add missing :req, remove old macros

commit 9f2b6ab2f2
Merge: 79dfac92c 2cc301603
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 22 21:41:37 2022 -0500

    Merge pull request #1613 from Kurausukun/m4asymbols

    Move M4A Track Definitions

commit 2cc301603e
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 21:30:39 2022 -0500

    lmao whitespace

commit 0872441048
Merge: 3c46f3194 79dfac92c
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sat Jan 22 18:28:09 2022 -0800

    Merge branch 'pret:master' into master

commit 3b756bfb3d
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 20:38:41 2022 -0500

    fix compilation on modern

commit 317e302147
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:43:11 2022 -0500

    fix inconsistent indentation

commit 04013fbdf2
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:41:31 2022 -0500

    forgot we could do this

commit a83e41b2cc
Author: Kurausukun <lord.uber1@gmail.com>
Date:   Sat Jan 22 19:37:46 2022 -0500

    move m4a track definitions

commit 3d0326106e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 21 12:48:19 2022 -0500

    Z coord / height -> elevation

commit 79dfac92c9
Merge: 874317268 30d970441
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 21 09:55:43 2022 -0500

    Merge pull request #1604 from GriffinRichards/clean-spinda

    Document Spinda spot algorithm

commit fb81d9ad4a
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 23:26:39 2022 -0500

    Correct map data comment

commit 8743172686
Merge: 062cdbe01 7d75e1631
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 12:11:27 2022 -0500

    Merge pull request #1612 from AsparagusEduardo/pret_misc

    Small documentation and cleanup

commit 7d75e16312
Author: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Date:   Thu Jan 20 12:25:48 2022 -0300

    Small documentation and cleanup

commit 062cdbe01c
Merge: a7e6045d7 bd43b905b
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 20 08:53:44 2022 -0500

    Merge pull request #1599 from GriffinRichards/fix-tilemaps

    Break up graphics/interface and graphics/misc

commit a7e6045d71
Merge: 69759b2d1 f899a02ac
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 22:17:37 2022 -0500

    Merge pull request #1597 from GriffinRichards/misc-cleanup

    Miscellaneous fixes

commit c4f33f2b2b
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 12:54:55 2022 -0500

    TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE

commit e682c12519
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 12:39:11 2022 -0500

    sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE

commit e3b49604d4
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:59:37 2022 -0500

    Use metatile layer constants in shop

commit 8200fda14e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:56:54 2022 -0500

    Fix decorations metatile attribute names

commit a8b466dc80
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 10:15:32 2022 -0500

    Disambiguate fieldmap names

commit f127e64a3c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 19 09:37:12 2022 -0500

    Name overworld tilemaps for their bg, add layer type constants

commit 30d9704418
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 17:27:17 2022 -0500

    Specify unsigned in spot comment

commit 313f14ed63
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 17:00:18 2022 -0500

    Add Spinda spot color constants

commit 177863da47
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 16:04:02 2022 -0500

    Fix typo

commit 225147a94f
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 17 13:19:52 2022 -0500

    Document Spinda spot algorithm

commit 69759b2d12
Merge: 14a11899c 8b920691e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 17:44:58 2022 -0500

    Merge pull request #1601 from GriffinRichards/fix-decor-flag

    Fix FLAG_DECORATION_0 name

commit 14a11899cf
Merge: dad413276 a4d31da92
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 17:37:26 2022 -0500

    Merge pull request #1603 from LOuroboros/patch-2

    Updated the value of MAX_MAP_DATA_SIZE

commit a4d31da923
Author: LOuroboros <lunosouroboros@gmail.com>
Date:   Sun Jan 16 19:22:28 2022 -0300

    Updated the value of MAX_MAP_DATA_SIZE

commit dad4132762
Merge: 60162a98b 429d53b95
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 14:03:20 2022 -0500

    Merge pull request #1596 from GriffinRichards/player-avatar-arr-const

    Add missing array constants in field_player_avatar

commit 60162a98b9
Merge: 755d9143a 6d6ff9126
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 13:55:16 2022 -0500

    Merge pull request #1602 from GriffinRichards/charmap-quote

    Allow right single quotation mark in charmap

commit 6d6ff91268
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 16 10:29:15 2022 -0500

    Allow right single quotation mark in charmap

commit 755d9143a6
Merge: 9ded1eb14 fd7457b05
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 15 12:20:22 2022 -0500

    Merge pull request #1600 from GriffinRichards/remove-berry-fix

    Remove berry fix

commit bd43b905b7
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 12:39:00 2022 -0500

    Apply palettes to some field effect pngs

commit 4dec9b83a3
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 12:29:30 2022 -0500

    Move more graphics out of misc

commit 9ded1eb14e
Merge: fa2d25d36 1a33187ba
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 14 09:12:05 2022 -0500

    Merge pull request #1598 from atasro2/master

    Give sensical names to Unused_AdjustBgMosaic

commit 1a33187bad
Author: MCboy <16516292+atasro2@users.noreply.github.com>
Date:   Fri Jan 14 13:48:46 2022 +0330

    Move enum to bg.h

commit 998900bd1b
Author: MCboy <16516292+atasro2@users.noreply.github.com>
Date:   Fri Jan 14 13:37:27 2022 +0330

    Give sensical names to Unused_AdjustBgMosaic

commit fd7457b05a
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Thu Jan 13 15:26:20 2022 -0500

    Remove berry fix

commit f899a02ac6
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 12 18:34:21 2022 -0500

    Use MON_GIVEN_TO_ constants for givemon

commit 01af8e877f
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 14:18:22 2022 -0500

    Move starter choose out of interface/misc

commit 694aa3c65d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:59:24 2022 -0500

    Move balls, shop, link, map popups, and bag out of interface

commit fa2d25d366
Merge: 4024b3f1b ca9bc34be
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 12:26:02 2022 -0500

    Merge pull request #1594 from GriffinRichards/pokestorage-clean

    Misc pokemon_storage_system cleanup

commit d782d3544d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:46:58 2022 -0500

    Move pokeblock graphics out of interface

commit 565dd24309
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:37:13 2022 -0500

    Move party menu graphics out of interface

commit 7103839a61
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 11:14:59 2022 -0500

    Move summary screen graphics out of interface, fix some names

commit fde18b4774
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 10:42:00 2022 -0500

    Fix berry crusher graphics name

commit 0a78cb5c9e
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 10:04:47 2022 -0500

    Fix some battle dome graphics names

commit 49418f8c01
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:19:20 2022 -0500

    Add missing commas

commit 3a6c633905
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:16:25 2022 -0500

    Add seteventmon

commit 110fbc559c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 11 02:08:14 2022 -0500

    Make item optional for givemon and setwildbattle

commit 4024b3f1b3
Merge: ded202136 d4111d552
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Mon Jan 10 14:56:26 2022 -0500

    Merge pull request #1590 from GriffinRichards/dex-enum

    Convert pokedex defines to enums

commit 3c46f3194e
Merge: 4375a8014 ded202136
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sun Jan 9 13:54:52 2022 -0800

    Merge branch 'pret:master' into master

commit 429d53b95c
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 9 11:12:35 2022 -0500

    Use runningState directly in CheckMovementInputNotOnBike

commit 8b920691e6
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sun Jan 9 01:31:42 2022 -0500

    Fix FLAG_DECORATION_0 name

commit 4375a80142
Merge: a499e8dc7 30dbf3f85
Author: WiserVisor <63819738+WiserVisor@users.noreply.github.com>
Date:   Sat Jan 8 21:47:19 2022 -0800

    Merge branch 'pret:master' into master

commit 8f1a760937
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Sat Jan 8 23:53:55 2022 -0500

    Add missing array constants in field_player_avatar

commit ca9bc34bea
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 7 17:26:23 2022 -0500

    Clean up pokemon_storage_system graphics

commit 5cbe572607
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Fri Jan 7 17:02:12 2022 -0500

    Add window constants in pokemon_storage_system

commit d4111d5520
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 5 14:50:19 2022 -0500

    Add comment about pokedex reordering

commit 5d033c2e4d
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Wed Jan 5 12:18:49 2022 -0500

    Convert pokedex defines to enums

commit ce55e58ad8
Author: GriffinR <griffin.g.richards@gmail.com>
Date:   Tue Jan 4 10:09:42 2022 -0500

    Misc cleanup
 2022-02-11 10:51:47 -08:00
GriffinR 7d2344c07b Merge pull request #1616 from GriffinRichards/missing-req 
Add missing :req, remove old macros
 2022-02-02 22:09:36 -05:00
GriffinR 2495d18132 Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
GriffinR fb81d9ad4a Correct map data comment 2022-01-20 23:26:39 -05:00
GriffinR a8b466dc80 Disambiguate fieldmap names 2022-01-19 10:15:32 -05:00
GriffinR f127e64a3c Name overworld tilemaps for their bg, add layer type constants 2022-01-19 09:37:12 -05:00
W1serV1ser 5ea3d064c6 Added Following Pokemon mechanics and sprites/palettes for all Gen 1 Pokemon 2022-01-08 13:32:43 -08:00
GriffinR afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
cbt6 b3d779fd0d Document field player functions 2021-10-27 01:39:00 +08:00
sphericalice 7b5267c799 Rename TILESET_WIDTH to METATILE_ROW_WIDTH 2021-10-25 20:51:04 +01:00
sphericalice 5bce17cbce Fix typo in the TILESET_WIDTH comment 2021-10-25 18:11:06 +01:00
sphericalice 120e75d275 Document the CloseBattlePikeCurtain special 2021-10-25 18:03:14 +01:00
LOuroboros 554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
ExpoSeed b6b0062bd6 Change map header flags to use a bitfield 2021-06-13 17:02:06 -05:00
GriffinR 86a9d94ce1 Document fieldmap 2021-04-06 16:05:43 -04:00
Kurausukun 58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
GriffinR bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
Kaz 1404cf3330 field_player_avatar.c: Fix TryInterruptObjectEventSpecialAnim fakematch. 2020-09-17 18:24:11 -04:00
GriffinR 18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
GriffinR 5bb688df3e Label in_connection's field in ObjectEventTemplate 2020-05-14 17:11:18 -04:00
GriffinR b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
GriffinR 487080b425 Minor player avatar doc 2020-04-01 02:54:26 -04:00
GriffinR ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR 8da7a94423 Merge branch 'master' into fix-eventobj 2019-12-10 17:41:08 -05:00
jiangzhengwenjz f34b8f564a InitEventObjectStateFromTemplate 2019-12-11 05:35:40 +08:00
GriffinR 82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
Marcus Huderle 4494b5d4cb Document collision types 2019-10-06 15:48:26 -05:00
Marcus Huderle 799edaf3e6 Document hide/show reflection movement actions 2019-10-06 14:17:34 -05:00
GriffinR a46f7952f9 Use DIR constants for createvobject 
Also uses event object ids in LinkContestRoom1
 2019-08-21 17:11:06 -05:00
garak f1f420954b add METATILE_ID macro 2019-06-16 10:08:07 -05:00
PikalaxALT 1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
Phlosioneer da0687987d Pick better names for constants 2019-02-28 22:21:16 -06:00
Phlosioneer 189d387f01 Add macros for metatile manipulation 2019-02-28 22:21:16 -06:00
Deokishisu 447fec26dc Consolidate unused escapeRope MapHeader field into filler_18 field 2018-12-30 19:59:57 -05:00
nullableVoidPtr f24584cd31 Tabs -> spaces & align in include/ 2018-12-07 21:01:59 +08:00
nullableVoidPtr 556bdd52e1 Clean up aligned variables in src/ 2018-11-27 19:37:29 +08:00
Slawter666 3d8874d919 Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-10-21 00:20:09 +01:00
Diegoisawesome dd3689fdbf Finish porting/decompiling field_player_avatar 2018-10-19 00:05:54 -05:00
Slawter666 b7b1d609d0 More synchronisation 2018-10-17 13:52:26 +01:00