 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 |
|
|
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 |
|