dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,151 Commits 1 Branch 0 Tags
ee0f35b8663acc5c1e1eb28074ad5917783afd17
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PikalaxALT 8116790c08 Merge pull request #443 from LOuroboros/patch-1 
Informative note about PewterCity_Gym_Text_BrockDefeat
 2021-06-26 08:49:26 -04:00
PikalaxALT 4c26116d1a Merge pull request #440 from PikalaxALT/push_symbols 
Symplifi symfiles
 2021-06-18 13:03:42 -04:00
PikalaxALT b15cc8eead Merge pull request #439 from PikalaxALT/push_symbols 
Create symfiles on build
 2021-06-16 10:49:41 -04:00
PikalaxALT 5acfde358a Merge pull request #421 from PikalaxALT/modern_ld 
Full support for modern ARM toolchains
 2021-06-06 21:17:01 -04:00
PikalaxALT 3dce3407d5 Merge pull request #427 from GriffinRichards/name-mapgroups 
Name map groups
 2021-05-13 14:24:11 -04:00
PikalaxALT bfce7b67ed Merge pull request #430 from Kurausukun/fakematching 
[LEAK-INFORMED] Fix battle_interface Fakematch
 2021-05-06 12:46:07 -04:00
PikalaxALT 35cf80b7ea Merge pull request #418 from Kurausukun/helpsys 
Fix 2 Fakematchings
 2021-04-19 06:01:35 -04:00
PikalaxALT 52c25bac8e Merge pull request #411 from Kurausukun/temp2 
Fix Trade Nonmatchings (Thanks to Shoomer/RadicalDweamer)
 2021-04-09 12:33:31 -04:00
PikalaxALT ee96375931 Merge pull request #412 from Kurausukun/iheartpikalax 
Fix Color Text Codes, Correct Arguments in CopyRectToBgTilemapBufferRect
 2021-04-09 08:29:58 -04:00
PikalaxALT aabd803fb4 Merge pull request #409 from Kurausukun/temp1 
Fix Some Fakematchings
 2021-04-09 08:25:52 -04:00
PikalaxALT 5075067ecd Merge pull request #402 from GriffinRichards/nonmatch-fix 
Use global symbols for assembly on modern
 2021-03-14 20:52:30 -04:00
PikalaxALT 03f516bce3 Merge pull request #361 from PikalaxALT/match_naked 
Match sub_8159AB8
 2020-09-08 16:07:59 -04:00
PikalaxALT c040ec2475 Merge pull request #359 from PikalaxALT/agb_flash_fix 
Fix agb_flash in modern frlg
 2020-09-03 16:07:52 -04:00
PikalaxALT 2455913e39 Merge pull request #350 from PokeCodec/matchingtransition 
Match sub_80D1F64
 2020-08-17 16:34:43 -04:00
PikalaxALT ea10b25fb1 Merge pull request #347 from pret/map-preview-bugfix 
Bugfix for access violation in MapPreview_CreateMapNameWindow
 2020-07-10 19:55:18 -04:00
PikalaxALT 7b2d1082cc Bugfix for access violation in MapPreview_CreateMapNameWindow 2020-07-10 19:41:44 -04:00
PikalaxALT 0816046a73 Merge pull request #346 from luckytyphlosion/master 
Match (almost) all of pokemon_summary_screen.c
 2020-07-08 16:01:56 -04:00
PikalaxALT f75c048434 Merge pull request #343 from Kurausukun/patch-2 
Fix compilation on gcc 10
 2020-05-27 07:57:02 -04:00
PikalaxALT 6a55484130 Merge pull request #344 from Missingmew/master 
Decompile unused decompress function, as seen in ruby
 2020-05-27 07:54:48 -04:00
PikalaxALT 85dbd6c93e Merge pull request #342 from GriffinRichards/sync-mapdatasize 
Add MAX_MAP_DATA_SIZE alias
 2020-05-27 07:54:29 -04:00
PikalaxALT 6f05711b27 Merge pull request #341 from jiangzhengwenjz/gbagfx 
mute old clang diagnostic
 2020-05-27 07:53:42 -04:00
PikalaxALT e3769a2ee9 Merge pull request #340 from GriffinRichards/doc-inconnect 
Label in_connection's field in ObjectEventTemplate
 2020-05-27 07:53:11 -04:00
PikalaxALT 1648d6c66b Merge pull request #339 from ghoulslash/fixes 
fix PLAYER_AVATAR_FLAG_WATERING
 2020-05-27 07:51:44 -04:00
PikalaxALT 94b68c54e8 Merge pull request #337 from GriffinRichards/fix-scriptlabel 
Fix mislabeled starter script
 2020-05-27 07:51:13 -04:00
PikalaxALT b7318eaa15 Merge pull request #336 from ghoulslash/master 
document battle_message.c
 2020-05-27 07:49:44 -04:00
PikalaxALT ece62fa4ba Merge pull request #333 from jiangzhengwenjz/librfu 
fix librfu issues
 2020-04-27 19:11:59 -04:00
PikalaxALT 9f8f350da3 Merge pull request #334 from jiangzhengwenjz/nonmatching 
fix remainSize field in librfu
 2020-04-27 19:11:39 -04:00
PikalaxALT b9a5646210 Merge pull request #335 from jiangzhengwenjz/bg 
real match CopyTileMapEntry
 2020-04-27 19:08:44 -04:00
PikalaxALT dcc93061e1 Merge pull request #332 from ghoulslash/master 
battle anim documentation
 2020-04-25 14:00:09 -04:00
PikalaxALT 834b0dd8c6 Merge pull request #330 from Sierraffinity/master 
gbagfx: Various fixes and improvements
 2020-04-25 13:56:34 -04:00
PikalaxALT 1c7c4c021d Merge pull request #331 from fieldy101/decomp-water-2 
Decompile water.s
 2020-04-23 08:31:32 -04:00
PikalaxALT 543434ea2d Merge pull request #329 from GriffinRichards/doc-gcn 
Label GCN link flags field
 2020-04-14 15:54:46 -04:00
PikalaxALT 7accc78498 Merge pull request #328 from petuuuhhh/pret 
move_relearner_state_machine_defines
 2020-04-14 15:12:08 -04:00
PikalaxALT 6001e10799 Merge pull request #321 from PikalaxALT/modern_gcc 
Get pokefirered_modern to build
 2020-04-12 10:12:37 -04:00
PikalaxALT 2880cf2a51 Merge pull request #323 from PikalaxALT/various_documentation 
Document various parts of the source tree
 2020-04-10 12:48:58 -04:00
PikalaxALT a81edaba1d Merge pull request #327 from ultima-soul/documentation 
Document Roamer Roar bug
 2020-04-09 10:21:28 -04:00
PikalaxALT 7f9e0ae6bf Merge pull request #326 from PikalaxALT/match_atk7C 
Match atk7C_trymirrormove
 2020-04-07 13:25:09 -04:00
PikalaxALT 7693c90e67 Merge pull request #324 from GriffinRichards/move-gfx 
Move gfx out of data
 2020-04-06 20:51:18 -04:00
PikalaxALT de9ae24766 Merge pull request #325 from GriffinRichards/fix-encounter 
Fix tile encounter name
 2020-04-06 20:50:52 -04:00
PikalaxALT 6ecd9dd943 Merge pull request #318 from GriffinRichards/doc-rm 
Document region map
 2020-04-06 06:26:27 -04:00
PikalaxALT 35a578c620 Merge pull request #322 from PikalaxALT/travis_bump 
Bump devkitARM to r52
 2020-04-04 16:08:46 -04:00
PikalaxALT feede54edd Merge pull request #319 from garakmon/encounterinjafix 
Fix encounter groups with neither a FireRed nor LeafGreen label
 2020-04-04 12:54:16 -04:00
PikalaxALT c47eca8a18 Merge pull request #316 from PikalaxALT/various_documentation 
Various documentation
 2020-04-03 19:25:01 -04:00
PikalaxALT 200c82e01a Merge pull request #317 from GriffinRichards/fix-spritelayout 
Reorient object event sprites to horizontal
 2020-03-29 12:30:47 -04:00
PikalaxALT 75ae00beff Merge pull request #315 from PikalaxALT/overworld 
Overworld
 2020-03-29 09:27:45 -04:00
PikalaxALT d8c9214e0a Merge pull request #314 from jiangzhengwenjz/bike 
bike
 2020-03-28 16:32:09 -04:00
PikalaxALT 24b294236b Merge pull request #313 from GriffinRichards/doc-trainertypes 
Use trainer type constants
 2020-03-28 12:25:48 -04:00
PikalaxALT a473ca70a2 Merge pull request #312 from GriffinRichards/doc-oamtables 
Label oam tables
 2020-03-27 09:51:56 -04:00
PikalaxALT b9c604b8d2 Merge pull request #311 from PikalaxALT/field_player_avatar 
Field player avatar
 2020-03-26 17:53:18 -04:00
PikalaxALT 7a6d4525c4 Merge pull request #310 from GriffinRichards/move-evobjmv 
Move event_object_movement data to src
 2020-03-26 14:20:33 -04:00
PikalaxALT 4f65d54095 Merge pull request #309 from PikalaxALT/pokemon_special_anim 
Pokemon special anim
 2020-03-22 14:50:33 -04:00
PikalaxALT ec93f0bb08 Merge pull request #308 from GriffinRichards/fix-healloc 
Move heal location data
 2020-03-20 11:11:07 -04:00
PikalaxALT 33b65b5470 Merge pull request #307 from PikalaxALT/field_control_avatar 
Field control avatar
 2020-03-19 11:00:32 -04:00
PikalaxALT 715c2ff3ad Merge pull request #304 from GriffinRichards/fix-tilesetname 
Standardize tileset folder names
 2020-03-17 08:54:38 -04:00
PikalaxALT 0b1ddd5842 Merge pull request #303 from GriffinRichards/doc-metatr 
Label used metatile attributes
 2020-03-17 08:53:50 -04:00
PikalaxALT d52f2aa571 Merge pull request #305 from PikalaxALT/field_weather 
Field weather
 2020-03-17 08:53:24 -04:00
PikalaxALT e7a288189d Add missing bubble.png 2020-03-16 22:06:03 -04:00
PikalaxALT f8915246a7 Merge pull request #302 from PikalaxALT/pokemon_storage_system 
Pokemon storage system
 2020-03-16 12:33:46 -04:00
PikalaxALT 2c7387951b Merge pull request #301 from GriffinRichards/doc-borderdim 
Label border dimension fields
 2020-03-16 07:59:31 -04:00
PikalaxALT 77c133e6a1 Merge pull request #299 from GriffinRichards/fix-porymapttype 
Sync trainer_type/trainer_sight/var_value data type. Please reference this PR when fixing the issues raised above.
 2020-03-16 07:52:45 -04:00
PikalaxALT f44f89a463 Merge pull request #300 from ultima-soul/event_object_movement 
Decompile/port event_object_movement
 2020-03-16 07:51:08 -04:00
PikalaxALT 4a7c1d888a Fix issues with cexplore 2020-03-15 09:39:08 -04:00
PikalaxALT 4facdc6747 Merge pull request #298 from LOuroboros/patch-1 
Removed unused defines in include/battle_script_commands.h
 2020-03-11 09:06:13 -04:00
PikalaxALT dbe688f952 Merge pull request #297 from GriffinRichards/fix-mapsec 
Sync region_map_sections.h name
 2020-03-11 09:05:36 -04:00
PikalaxALT bbd5b2dfed Merge pull request #296 from PikalaxALT/field_camera 
Port field_camera from Emerald
 2020-03-10 15:41:38 -04:00
PikalaxALT a9bc506b32 Merge pull request #295 from PikalaxALT/naming_screen 
Naming screen
 2020-03-10 14:31:53 -04:00
PikalaxALT c40d7241ff Merge pull request #294 from PikalaxALT/fldeff_flash 
fldeff_flash.c
 2020-03-09 10:13:55 -04:00
PikalaxALT ac38e81454 Merge pull request #293 from PikalaxALT/easy_chat_2 
Port easy_chat_2
 2020-03-08 14:37:34 -04:00
PikalaxALT 85ca62e823 Merge pull request #292 from PikalaxALT/clear_save_data_screen 
Decomp and doc clear_save_data_screen
 2020-03-06 13:10:23 -05:00
PikalaxALT f483a93bea Merge pull request #290 from PikalaxALT/field_message_box 
Decompile field_message_box
 2020-03-06 09:59:23 -05:00
PikalaxALT ed64732229 Merge pull request #291 from GriffinRichards/doc-fielddoor 
Sync field_door.c
 2020-03-06 09:13:20 -05:00
PikalaxALT c493213db3 Merge pull request #289 from jiangzhengwenjz/nonmatching 
real match sub_815A61C
 2020-03-05 16:39:02 -05:00
PikalaxALT 44f47ab524 Merge pull request #288 from PikalaxALT/dodrio_berry_picking 
Dodrio Berry Picking
 2020-03-05 16:21:48 -05:00
PikalaxALT 3d5d298c63 Merge pull request #287 from GriffinRichards/move-strings 
Move strings.s to src
 2020-03-05 14:35:42 -05:00
PikalaxALT 362cddc0f5 Merge pull request #285 from GriffinRichards/doc-scriptclean 
Clean up script documentation
 2020-03-05 06:06:51 -05:00
PikalaxALT 437fe6631a Merge pull request #286 from jiangzhengwenjz/nonmatching 
real match sub_814DFA4
 2020-03-03 16:55:56 -05:00
PikalaxALT 0e468b49bb Merge pull request #284 from PikalaxALT/berry_crush 
Berry crush
 2020-03-03 15:55:58 -05:00
PikalaxALT dd22d97814 Merge pull request #283 from GriffinRichards/fix-eventticket 
Sync event ticket flag names
 2020-03-03 13:47:29 -05:00
PikalaxALT f5011a27d6 Merge pull request #282 from PikalaxALT/field_effect_helpers 
port field_effect_helpers from emerald
 2020-03-02 14:11:32 -05:00
PikalaxALT 40af0d1302 Merge pull request #281 from GriffinRichards/fix-specialvars 
Fix special var names
 2020-03-02 13:15:48 -05:00
PikalaxALT 9803cb612e Merge pull request #280 from GriffinRichards/fix-signs 
Label sign bg events
 2020-03-02 12:31:02 -05:00
PikalaxALT 0169a98c68 Merge pull request #278 from GriffinRichards/doc-miscscript 
Split/label some common event scripts
 2020-03-02 12:19:18 -05:00
PikalaxALT e8504c7a3f Merge pull request #276 from GriffinRichards/doc-sixisland 
Document Six and Seven Island scripts
 2020-03-02 12:17:52 -05:00
PikalaxALT ae08a40290 Merge pull request #279 from PikalaxALT/field_effect 
Field effect
 2020-03-02 12:11:22 -05:00
PikalaxALT 5198a05272 Merge pull request #275 from GriffinRichards/doc-fiveisland 
Document Five Island scripts
 2020-03-02 10:48:13 -05:00
PikalaxALT 55e00e0c13 Merge pull request #274 from GriffinRichards/doc-fourisland 
Document Four Island scripts, trainer_card.inc, sync trainer_card.c
 2020-03-02 10:43:01 -05:00
PikalaxALT ff0034d597 Merge pull request #273 from GriffinRichards/doc-threeisland 
Document Three Island scripts
 2020-03-02 10:28:59 -05:00
PikalaxALT fc51c579d4 Merge pull request #277 from PikalaxALT/cable_club 
Cable club
 2020-03-02 10:13:06 -05:00
PikalaxALT 43f66fce55 Merge pull request #271 from GriffinRichards/doc-twoisland 
Document Two Island scripts
 2020-02-26 14:08:45 -05:00
PikalaxALT 435fe59621 Merge pull request #270 from GriffinRichards/doc-oneisland 
Document One Island scripts
 2020-02-26 14:08:19 -05:00
PikalaxALT e3447d2366 Merge pull request #269 from GriffinRichards/doc-pallet 
Document Pallet Town scripts
 2020-02-26 14:07:48 -05:00
PikalaxALT 13f14218e1 Merge pull request #268 from GriffinRichards/doc-routes4 
Document Routes 20-25, teleporter/escalator anim
 2020-02-26 13:57:36 -05:00
PikalaxALT 84d7206b5b Merge pull request #266 from GriffinRichards/doc-routes3 
Document Routes 15-19 scripts
 2020-02-26 13:56:35 -05:00
PikalaxALT 9f4e2abfc6 Merge pull request #272 from PikalaxALT/fldeff_cut 
fldeff_cut
 2020-02-26 13:50:04 -05:00
PikalaxALT 3b558edc79 Merge pull request #267 from PikalaxALT/script_movement 
Port script_movement
 2020-02-24 16:02:31 -05:00
PikalaxALT a0fa06a066 Merge pull request #265 from GriffinRichards/sync-objgfx 
Sync object event gfx constants
 2020-02-24 09:02:25 -05:00
PikalaxALT 942ea77a0d Merge pull request #264 from PikalaxALT/battle_bg 
battle_bg
 2020-02-23 21:45:25 -05:00
PikalaxALT 9aaafa8487 Merge pull request #263 from GriffinRichards/move-graphics 
Move graphics.s to src
 2020-02-22 19:20:53 -05:00
PikalaxALT e194cf83d2 Merge pull request #262 from PikalaxALT/trainer_see 
Trainer see
 2020-02-21 20:50:44 -05:00
PikalaxALT 4280723f0e Merge pull request #260 from GriffinRichards/doc-connection 
Split connection field from graphics id in object events
 2020-02-19 14:49:14 -05:00