dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,505 Commits 1 Branch 0 Tags
1a8023c46582c2742658ec5c75619d74f33fc3d1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PikalaxALT 57cf3a4bfb Merge pull request #259 from PikalaxALT/pokemon_jump 
Pokemon jump
 2020-02-19 14:46:52 -05:00
PikalaxALT c51c7a5ea4 Merge pull request #261 from Diegoisawesome/aif2pcm 
Fix aif2pcm Pascal string bug and follow AIFF loop point standard
 2020-02-19 12:49:00 -05:00
PikalaxALT 71fec599bb Merge pull request #252 from GriffinRichards/doc-routes2 
Document Routes 10-14 scripts
 2020-02-19 08:47:39 -05:00
PikalaxALT ea7d665938 Merge pull request #251 from GriffinRichards/doc-routes1 
Document Routes 3-9 scripts
 2020-02-19 08:47:26 -05:00
PikalaxALT f9c1b61014 Merge pull request #258 from GriffinRichards/doc-headers 
Document some header properties
 2020-02-18 16:42:47 -05:00
PikalaxALT 13357596b7 Merge pull request #256 from GriffinRichards/fix-species 
Fix DEX constant order
 2020-02-16 12:25:06 -05:00
PikalaxALT 1d2c452a6a Merge pull request #249 from GriffinRichards/doc-tilesets 
Label tilesets and remaining layouts
 2020-02-16 12:20:58 -05:00
PikalaxALT 9addd6a6b6 Merge pull request #248 from GriffinRichards/doc-caves 
Document remaining cave scripts
 2020-02-16 12:14:55 -05:00
PikalaxALT 3b40ec23c7 Merge pull request #246 from GriffinRichards/doc-pokemonleague 
Document Pokemon League scripts
 2020-02-16 12:07:20 -05:00
PikalaxALT 6c52359bcb Merge pull request #257 from jiangzhengwenjz/librfu 
match RFU SDK v1.0.26
 2020-02-16 12:06:26 -05:00
PikalaxALT b6899a0de1 Merge pull request #245 from GriffinRichards/doc-rockets 
Document Team Rocket scripts
 2020-02-16 12:05:13 -05:00
PikalaxALT 4e07002d13 Merge pull request #244 from GriffinRichards/doc-saffron 
Document Saffron City scripts
 2020-02-16 11:23:34 -05:00
PikalaxALT 51b7b11a55 Merge pull request #243 from GriffinRichards/doc-celadon 
Document Celadon City scripts
 2020-02-16 11:16:02 -05:00
PikalaxALT 04130a97d9 Merge pull request #239 from GriffinRichards/doc-ttower 
Document Trainer Tower scripts
 2020-02-16 11:07:47 -05:00
PikalaxALT fee980decd Merge pull request #253 from PikalaxALT/add_arm_agbcc 
librfu_intr
 2020-02-15 20:16:17 -05:00
PikalaxALT 98a79fd72f Merge pull request #255 from PikalaxALT/event_object_80688E4 
event_object_80688E4
 2020-02-03 10:06:06 -05:00
PikalaxALT fc3d571ab9 Merge pull request #254 from PikalaxALT/combined_moves 
sCombinedMoves
 2020-02-01 13:10:07 -05:00
PikalaxALT 65690ca7dc Merge pull request #247 from PikalaxALT/smokescreen 
Port smokescreen.c from emerald
 2020-01-27 12:50:52 -05:00
PikalaxALT 2e934469b8 Merge pull request #242 from jiangzhengwenjz/field 
field_screen_effect
 2020-01-26 15:33:56 -05:00
PikalaxALT a2c6174ee9 Merge pull request #241 from GriffinRichards/doc-viridian 
Document Viridian City scripts and adjacent routes
 2020-01-26 15:32:39 -05:00
PikalaxALT 78864c88bb Merge pull request #240 from PikalaxALT/union_room_chat 
Union room chat
 2020-01-25 21:07:18 -05:00
PikalaxALT a09e66b53f Merge pull request #238 from GriffinRichards/doc-vermilion 
Document Vermilion City and SS Anne scripts
 2020-01-24 17:04:11 -05:00
PikalaxALT 85e5c57e8c Merge pull request #237 from GriffinRichards/sync-ai 
Sync AI scripts
 2020-01-23 15:33:01 -05:00
PikalaxALT 5435bc4325 Merge pull request #232 from GriffinRichards/doc-cinnabar 
Document Cinnabar Island scripts
 2020-01-23 15:31:48 -05:00
PikalaxALT 91099dbd0c Merge pull request #236 from PikalaxALT/union_room 
Union room
 2020-01-23 10:20:32 -05:00
PikalaxALT e97d3532d4 Merge pull request #231 from GriffinRichards/doc-staticmon 
Document static mon scripts
 2020-01-22 11:41:14 -05:00
PikalaxALT 6eec1c1cc9 Merge pull request #234 from GriffinRichards/doc-fuchsia 
Document Fuchsia City and Safari Zone scripts
 2020-01-22 11:40:46 -05:00
PikalaxALT c75296640d Merge pull request #235 from GriffinRichards/doc-miscscript 
Document some misc small scripts
 2020-01-22 11:37:37 -05:00
PikalaxALT 407c49820e Merge pull request #233 from PikalaxALT/item_menu 
item_menu
 2020-01-19 16:58:51 -05:00
PikalaxALT 055e5d2bbf Merge pull request #230 from PikalaxALT/save_failed_screen 
Save failed screen
 2020-01-17 11:14:25 -05:00
PikalaxALT 8bdd942c9e Merge pull request #229 from PikalaxALT/box_party_pokemon_dropdown 
box_party_pokemon_dropdown
 2020-01-16 16:44:36 -05:00
PikalaxALT 2af6124863 Merge pull request #226 from GriffinRichards/doc-lavender 
Document Lavender Town scripts
 2020-01-16 15:51:18 -05:00
PikalaxALT 7cddc40bbf Merge pull request #227 from GriffinRichards/fix-calcrom 
Remove false positives from partial doc calcrom
 2020-01-16 15:47:51 -05:00
PikalaxALT 398a052b5a Merge pull request #228 from GriffinRichards/fix-gbafix 
Remove extraneous parens in gbafix
 2020-01-16 15:46:43 -05:00
PikalaxALT fad3674028 Merge pull request #225 from GriffinRichards/doc-questlog 
Document some quest log
 2020-01-16 09:53:08 -05:00
PikalaxALT 0bc479db34 Merge pull request #224 from PikalaxALT/doc_link_rfu 
Document link_rfu_*.c
 2020-01-16 09:19:09 -05:00
PikalaxALT 3170b75344 Merge pull request #223 from PikalaxALT/pret_agbcc 
Revert agbcc dependency to pret master
 2020-01-15 13:00:24 -05:00
PikalaxALT 411f4852c6 Merge pull request #216 from PikalaxALT/link_rfu 
Port link_rfu from Emerald
 2020-01-15 11:07:17 -05:00
PikalaxALT 2f81b4a204 Merge pull request #222 from GriffinRichards/doc-mansion 
Document Pokemon Mansion scripts
 2020-01-14 20:30:32 -05:00
PikalaxALT cdc04dfe9f Merge pull request #221 from GriffinRichards/doc-cerulean 
Document Cerulean City scripts
 2020-01-14 20:29:03 -05:00
PikalaxALT 58935b17f7 Merge pull request #220 from GriffinRichards/doc-pewter 
Document Pewter City scripts
 2020-01-14 20:10:11 -05:00
PikalaxALT 3911cfa4d7 Merge pull request #219 from GriffinRichards/sync-macros 
Sync macros to have Give/Take Add/Remove unity
 2020-01-14 20:03:15 -05:00
PikalaxALT 172e1aafa8 Merge pull request #215 from GriffinRichards/doc-movement 
Use movement type constants in json
 2020-01-13 11:35:36 -05:00
PikalaxALT 78b4487008 Merge pull request #214 from jiangzhengwenjz/nonmatching 
fake match CreatePartyStatusSummarySprites
 2020-01-12 18:26:07 -05:00
PikalaxALT 92d99d4fd2 Merge pull request #207 from GriffinRichards/sync-script 
Sync scripts with pokeemerald
 2020-01-12 17:04:23 -05:00
PikalaxALT 15ff7eb2f8 Merge pull request #213 from PikalaxALT/script_pokemon_util 
script_pokemon_util_80A0058, battle_interface
 2020-01-12 14:54:43 -05:00
PikalaxALT 483613e128 Fix header guard 2020-01-12 14:45:53 -05:00
PikalaxALT 74fa8075ee Merge pull request #210 from jiangzhengwenjz/party_menu 
script_pokemon_util_80BF8FC
 2020-01-12 14:18:22 -05:00
PikalaxALT 519558ddd3 Merge pull request #209 from jiangzhengwenjz/pc_screen_effect 
pc_screen_effect
 2020-01-12 14:17:40 -05:00
PikalaxALT 4e96e3d98e Merge pull request #211 from jiangzhengwenjz/nonmatching 
fake match sub_810C4EC
 2020-01-12 14:16:48 -05:00
PikalaxALT bb06e0e455 Merge pull request #212 from jiangzhengwenjz/nonmatching2 
fake match GetVsSeekerResponseInArea
 2020-01-12 14:16:08 -05:00
PikalaxALT 06b113c80f Merge pull request #208 from jiangzhengwenjz/librfu 
s32 to sio32
 2020-01-12 14:14:36 -05:00
PikalaxALT 5e3f6495c4 Merge pull request #205 from jiangzhengwenjz/librfu 
librfu
 2020-01-09 15:20:58 -05:00
PikalaxALT 7e2330e7fd Merge pull request #206 from PikalaxALT/region_map 
Region map
 2020-01-08 19:35:48 -05:00
PikalaxALT 26f7ba4823 Merge pull request #204 from mrgriffin/field-screen-effect 
Decompile field_screen_effect
 2020-01-06 13:35:48 -05:00
PikalaxALT ab4fa0e76e Merge pull request #203 from mrgriffin/field-tasks 
Decompile field_tasks
 2020-01-06 13:34:09 -05:00
PikalaxALT 4d7a5b165f Merge pull request #192 from mrgriffin/flash-scanline-effect 
Describe flash scanline effect
 2019-12-23 16:53:33 -05:00
PikalaxALT f1d821ecc2 Merge pull request #202 from PikalaxALT/pokedex_screen 
Pokedex screen take 2
 2019-12-22 17:54:34 -05:00
PikalaxALT dac32d3366 Merge pull request #201 from Kurausukun/patch-1 
oops, extra align
 2019-12-22 13:45:19 -05:00
PikalaxALT ba553271d7 Merge pull request #200 from PikalaxALT/post_battle_event_funcs 
Decompile post_battle_event_funcs
 2019-12-21 20:49:32 -05:00
PikalaxALT 213b4124bd Merge pull request #199 from Kurausukun/master 
align directsound samples
 2019-12-21 20:05:25 -05:00
PikalaxALT e1fa1869b5 Merge pull request #197 from PikalaxALT/pokedex_screen 
Some documentation in pokedex_screen
 2019-12-21 14:45:09 -05:00
PikalaxALT c75f0883a9 Merge pull request #198 from jiangzhengwenjz/clean_up 
misc. clean up
 2019-12-21 14:44:42 -05:00
PikalaxALT 2f7fec015c Merge pull request #195 from PikalaxALT/all_builds 
Update .PHONY and tidy
 2019-12-21 10:43:52 -05:00
PikalaxALT e6c571df95 Merge pull request #194 from PikalaxALT/split_librfu 
Split librfu by function type (thumb/arm)
 2019-12-21 09:42:44 -05:00
PikalaxALT b39bbb5e9d Grammar fix in README.md 2019-12-20 15:43:56 -05:00
PikalaxALT 510a5b8d35 Merge pull request #193 from PikalaxALT/leafgreen 
Match Pokemon LeafGreen 1.0
 2019-12-20 15:43:10 -05:00