Commit Graph

455 Commits

Author SHA1 Message Date
PikalaxALT
a252140f3b Merge branch 'master' into mail 2017-10-14 09:52:56 -04:00
DizzyEggg
455202eca0 Merge branch 'master' into decompile_rom3 2017-10-14 11:36:28 +02:00
DizzyEggg
14e41d6c50 rom3 is decompiled 2017-10-14 11:34:26 +02:00
Diegoisawesome
924c0c6b5a Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd 2017-10-13 20:29:11 -05:00
Diegoisawesome
2852f4f1b8 Continue attempt to decomp braillemessage 2017-10-13 19:48:09 -05:00
DizzyEggg
72ed861715 fix rom3 conflicts 2017-10-13 19:58:45 +02:00
DizzyEggg
20d158cf4a start decompiling emitters 2017-10-13 19:46:27 +02:00
Diegoisawesome
3040c1e1aa Merge pull request #75 from DizzyEggg/decompile_reshow_battle_screen
Decompile reshow battle screen
2017-10-13 12:42:42 -05:00
PikalaxALT
32168adbc8 Remaining functions 2017-10-13 12:03:15 -04:00
PikalaxALT
cc84713249 sub_8121B1C 2017-10-13 11:47:17 -04:00
DizzyEggg
c78679ae66 rom3 decomp start 2017-10-13 17:22:50 +02:00
PikalaxALT
e24f3808f4 Merge branch 'master' into mail 2017-10-13 11:16:34 -04:00
PikalaxALT
52db3ad5aa Decompile TV (#80)
* ClearTVShowData

* special_0x44

* DoTVShow (nonmatching because align)

* DoTVShowBravoTrainerPokemonProfile

* Update field names

* DoTVShowBravoTrainerBattleTower

* Renaming of struct fields

* sub_80EBFF4 and UpdateTVScreensOnMap

* SetTVMetatilesOnMap

* Power buttons for the TV screens on the map

* special_0x45

* sub_80EC18C

* special_0x4a

* ResetGabbyAndTy

* GabbyAndTyBeforeInterview

* GabbyAndTyAfterInterview

* Through IsTVShowInSearchOfTrainersAiring

* GabbyAndTyGetLastQuote

* GabbyAndTyGetLastBattleTrivia

* GabbyAndTySetScriptVarsToFieldObjectLocalIds

* InterviewAfter; use TVShow as a precursor for making the individual show structs anonymous

* Make TV structs anonymous within the union

* Move the TV union to its own subheader

* Move TV show enums to the global.tv.h subheader

* Funcion renaming

* Apply static attributes where able

* PutPokemonTodayCaughtOnAir

* sub_80EC8A4

* PutPokemonTodayFailedOnTheAir

* sub_80EC9E8, sub_80ECA10

* sub_80ECA38

* sub_80ECB00

* Put3CheersForPokeblocksOnTheAir

* PutFanClubSpecialOnTheAir

* ContestLiveUpdates_BeforeInterview

* Other before-interview Contest Live Updates functions

* ContestLiveUpdates_BeforeInterview_5

* InterviewAfter_BravoTrainerPokemonProfile

* BravoTrainerPokemonProfile_BeforeInterview1

* BravoTrainerPokemonProfile_BeforeInterview2

* Disassemble TV data

* Decompile TV data

* InterviewAfter_BravoTrainerBattleTowerProfile

* SaveRecordedItemPurchasesForTVShow

* PutNameRaterShowOnTheAir

* StartMassOutbreak

* PutLilycoveContestLadyShowOnTheAir

* InterviewAfter_FanClubLetter

* Rip TV strings

* InterviewAfter_RecentHappenings

* InterviewAfter_PkmnFanClubOpinions

* sub_80ED718

* EndMassOutbreak

* sub_80ED888

* sub_80ED8B4

* UpdateMassOutbreakTimeLeft

* sub_80ED950

* PutFishingAdviceShowOnTheAir

* through sub_80EDA80

* ewram and common syms are now fetched from the object files

* BSS symbols are taken from the tv.o file

* through sub_80EDC60

* sub_80EDCE8

* sub_80EDD78

* through sub_80EDE84

* nomatching sub_80EDE98

* sub_80EDFB4

* sub_80EE104

* sub_80EE104

* sub_80EE184

* sub_80EE2CC

* sub_80EE35C

* sub_80EE44C

* sub_80EE4DC

* sub_80EE5A4

* sub_80EE69C

* sub_80EE72C

* sub_80EE7C0

* sub_80EE818

* sub_80EE8C8

* sub_80EEA70

* sub_80EEB98

* sub_80EEBF4

* through sub_80EED60

* Functions relating to Pokemon News

* sub_80EEF6C

* GetPriceReduction

* IsPriceDiscounted

* sub_80EF120

* through sub_80EF370

* sub_80EF40C

* HasMixableShowAlreadyBeenSpawnedWithPlayerID

* TV_SortPurchasesByQuantity

* FindActiveBroadcastByShowType_SetScriptResult

* InterviewBefore

* through sub_80EF88C

* through sub_80EF93C

* through sub_80EFA24

* through TV_BernoulliTrial

* sub_80EFB58

* sub_80EFBA4

* sub_80EFBDC

* through sub_80EFD98

* ChangePokemonNickname

* ChangeBoxPokemonNickname

* sub_80EFF9C

* through player_id_to_dword

* CheckForBigMovieOrEmergencyNewsOnTV

* GetMomOrDadStringForTVMessage

* sub_80F01E8

* sub_80F0358

* sub_80F049C

* TV record mixing functions

* sub_80F06D0

* sub_80F0708 nonmatching

* through sub_80F0B24

* sub_80F0B64

* through sub_80F0C04

* sub_80F0C7C

* sub_80F0D60

* sub_80F0E58

* sub_80F0E84

* through sub_80F0F24

* sub_80F0F64

* sub_80F1208

* sub_80F1254

* sub_80F1290

* sub_80F12A4

* sub_80F14F8

* DoTVShowTodaysSmartShopper

* DoTVShowTheNameRaterShow

* DoTVShowPokemonTodaySuccessfulCapture

* DoTVShowPokemonTodayFailedCapture

* DoTVShowPokemonFanClubLetter

* DoTVShowRecentHappenings

* DoTVShowPokemonFanClubOpinions

* DoTVShowPokemonNewsMassOutbreak

* DoTVShowPokemonContestLiveUpdates

* DoTVShowPokemonBattleUpdate

* DoTVShow3CheersForPokeblocks

* DoTVShowInSearchOfTrainers

* Label GabbyAndTyData fields; remove ddump comments from data/text/tv.inc

* DoTVShowPokemonAngler

* DoTVShowTheWorldOfMasters; update RAM symbols and field names

* Decorate static functions

* DoTVShowTodaysRivalTrainer; region map enums

* TVDewfordTrendWatcherNetworkTextGroup

* DoTVShowHoennTreasureInvestigators

* DoTVShowFindThatGamer

* DoTVShowBreakingNewsTV

* DoTVShowSecretBaseVisit

* DoTVShowPokemonLotterWinnerFlashReport

* DoTVShowThePokemonBattleSeminar

* DoTVShowTrainerFanClubSpecial, DoTVShowTrainerFanClub

* DoTVShowSpotTheCuties

* DoTVShowPokemonNewsBattleFrontier

* DoTVShowWhatsNo1InHoennToday

* Helpers for DoTVShowSecretBaseSecrets

* DoTVShowSecretBaseSecrets

* DoTVShowSafariFanClub

* Finish decompilation of tv.s

* Some renaming

* Rename text group pointers

* revoke statis; pokenews enums

* Labels are number one

* Label all TV struct fields

* Make data/text/tv.inc more readable

* Split data/text/tv.inc

* Rename pokenews text pointers

* Frontier Symbol constants; indicate static rodata objects with 's' prefix

* Fix leading spaces/tabs

F*** CLion sometimes

* Fix inconsequential warning
2017-10-13 10:09:36 -05:00
PikalaxALT
74c59af856 sub_8121A1C 2017-10-13 08:47:26 -04:00
DizzyEggg
0f44747788 review changes 2017-10-13 12:25:32 +02:00
DizzyEggg
b229a1c295 Merge branch 'master' into decompile_reshow_battle_screen 2017-10-13 12:18:32 +02:00
PikalaxALT
3c4478b370 Decompile data 2017-10-13 00:11:55 -04:00
Diegoisawesome
24bd8c73e1 Name some new script commands 2017-10-12 22:34:58 -05:00
PikalaxALT
aa3af7a3a7 sub_81219F0 2017-10-12 23:05:36 -04:00
PikalaxALT
52af334b89 sub_81215EC 2017-10-12 22:59:01 -04:00
Diegoisawesome
df04aca8d2 Merge branch 'decompile_battle_9' of https://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_battle_9 2017-10-12 19:46:39 -05:00
Diegoisawesome
3131014b1b Merge branch 'qwerty2' of https://github.com/DizzyEggg/pokeemerald into DizzyEggg-qwerty2 2017-10-12 17:55:10 -05:00
PikalaxALT
8d31a46c6f sub_8121478 2017-10-12 15:59:43 -04:00
Diegoisawesome
f300f853c8 Add const qualifiers to scrcmd 2017-10-12 14:39:18 -05:00
Diegoisawesome
f1b6358047 Port/decomp scrcmd 2017-10-12 02:06:19 -05:00
DizzyEggg
a3b62f43ee battle 9 is decompiled 2017-10-11 12:49:42 +02:00
DizzyEggg
6dfe8ced2c ai switching basically done 2017-10-10 21:45:07 +02:00
DizzyEggg
57e5624e06 battle9 is being worked on 2017-10-10 18:01:45 +02:00
DizzyEggg
e382a73e9d merge branch master 2017-10-10 11:48:16 +02:00
Diegoisawesome
8914645231 Merge pull request #72 from DizzyEggg/fix_static_names
Add Save Location header and fix static names
2017-10-09 18:17:04 -05:00
U-User-PC\User
42f633cbf4 (un)fix battle.h 2017-10-09 16:00:18 -04:00
U-User-PC\User
f438734192 fixing merge conflicts 2017-10-09 13:32:57 -04:00
DizzyEggg
ab03b03c4b decompile reshow battle screen 2017-10-09 18:18:40 +02:00
DizzyEggg
9d4acb9635 some work on international string util 2017-10-09 15:40:08 +02:00
DizzyEggg
fdfbbb4951 add diploma header and static names fix 2017-10-09 13:55:31 +02:00
DizzyEggg
7b690dbe3a add save location header, change static names 2017-10-09 13:48:41 +02:00
DizzyEggg
95e4ae06ce battle message decompiled and dumped 2017-10-08 14:54:51 +02:00
DizzyEggg
7552caaadc placeholders for battle strings are done 2017-10-07 19:59:41 +02:00
DizzyEggg
db63fc1a09 battle message huge take off 2017-10-07 15:15:47 +02:00
ProjectRevoTPP
e38fd8347d use rodata for save_failed_screen 2017-10-06 21:59:47 -04:00
ProjectRevoTPP
4b4d9907a8 merge 2017-10-06 18:35:51 -04:00
ProjectRevoTPP
d0dfc758fc decompile save_failed_screen.c 2017-10-06 18:33:35 -04:00
DizzyEggg
7b88c7f2f0 move const data to battle files 2017-10-06 19:09:37 +02:00
DizzyEggg
3cc20c7c3f battle 2 is done 2017-10-06 17:06:45 +02:00
DizzyEggg
342e616d4b battle2 more and more and more 2017-10-06 00:12:01 +02:00
DizzyEggg
d87d19cfe5 more battle2 done 2017-10-04 19:25:14 +02:00
DizzyEggg
aaa191f0d8 Merge branch 'master' into decomp_battle2 2017-10-04 11:18:50 +02:00
U-User-PC\User
750937c58c fix battle.h 2017-10-03 16:10:18 -04:00
U-User-PC\User
1ae3d9b57b I hope this fixes merge conflicts 2017-10-03 15:54:19 -04:00
DizzyEggg
46fe1f441f giant battle handler is done wohohohhohoho 2017-10-03 21:35:27 +02:00
DizzyEggg
c8114eb3a5 create battle_transition.h 2017-10-03 12:11:13 +02:00
Diegoisawesome
d32ec8bf72 Merge pull request #59 from PikalaxALT/sym_bss
BSS; decompile tileset_anims
2017-10-03 01:26:01 -05:00
PikalaxALT
2701191a76 Merge branch 'master' into unk_text_util_2 2017-10-02 22:09:29 -04:00
PikalaxALT
10c5a7a2dd Merge branch 'master' into sym_bss 2017-10-02 22:04:43 -04:00
DizzyEggg
db58d5e24a battle2 3500 C lines 2017-10-02 23:32:39 +02:00
PikalaxALT
993d5e2a6a clean up declarations in src/palette.c 2017-10-01 21:50:58 -04:00
DizzyEggg
d4e1c417d3 Merge branch 'master' into decomp_battle2 2017-10-01 18:55:21 +02:00
DizzyEggg
1fcafaf35a more of battle2 done 2017-10-01 18:54:01 +02:00
DizzyEggg
729f4e10ed start decompiling battle2 2017-10-01 01:12:42 +02:00
Diegoisawesome
a96cadf4ee Merge pull request #56 from PikalaxALT/map_constants
Add Avara's map_constants.h
2017-09-30 11:58:24 -05:00
PikalaxALT
ef0b022707 BSS: src/main.o, src/dma3_manager.o 2017-09-30 09:32:46 -04:00
PikalaxALT
87b16995eb Add Avara's map_constants.h 2017-09-30 08:40:21 -04:00
Diegoisawesome
13017a3b19 Merge pull request #55 from DizzyEggg/decompile_metatile_behavior
decompile metatile behavior
2017-09-30 03:11:36 -05:00
Diegoisawesome
741c99cded Merge pull request #45 from DizzyEggg/decomp_battle4
Decompile Battle 4
2017-09-30 03:00:10 -05:00
Diegoisawesome
f09a6a653c Merge pull request #52 from DizzyEggg/patch-2
Update songs.h
2017-09-30 02:49:15 -05:00
Diegoisawesome
52a66f0d4c Merge pull request #50 from DizzyEggg/decomp_roamer
decompile roamer
2017-09-30 02:31:43 -05:00
DizzyEggg
f5387cf6b1 decompile metatile behav 2017-09-29 19:03:50 +02:00
DizzyEggg
eb4f195c19 Update songs.h
Thanks to Jughead Jones, Wobb, Lunos, Bela and anyone else who helped.
2017-09-29 08:37:15 +02:00
DizzyEggg
e41b9cbbb3 decompile money 2017-09-29 00:11:42 +02:00
DizzyEggg
f1fe0c217d decompile roamer 2017-09-28 20:52:36 +02:00
DizzyEggg
6d4d58a8a7 rename battle4 and battleai 2017-09-28 17:38:07 +02:00
DizzyEggg
7273b8f262 battle 4 is all done 2017-09-28 16:51:24 +02:00
DizzyEggg
14fcc9ec20 merge with master and move to C 2017-09-28 16:32:23 +02:00
DizzyEggg
bc3b4b4d9a battle 4 commands are decompiled 2017-09-28 15:34:21 +02:00
DizzyEggg
69928d3904 battle 4 up to 0xE5 2017-09-27 23:43:45 +02:00
yenatch
3c8091393c Merge pull request #47 from PikalaxALT/split_data3
Split data3
2017-09-26 18:16:52 -04:00
DizzyEggg
d769ec1374 battle 4 up to a8 2017-09-26 22:39:59 +02:00
Diegoisawesome
d1efbcd282 Extract scattered baseroms and cleanup 2017-09-25 16:27:02 -05:00
scnorton
bf9e2b7210 split data3_a1 2017-09-25 15:03:52 -04:00
DizzyEggg
52a951276f battle 4, up to x69 2017-09-25 00:09:13 +02:00
DizzyEggg
898d0b20ad up to x50 2017-09-24 00:29:52 +02:00
DizzyEggg
7bb0fcf182 merge with master and fix conflicts 2017-09-23 20:36:00 +02:00
DizzyEggg
601fc9e85b atk49 is matching baby WOHOHOHOHO 2017-09-23 20:13:45 +02:00
PikalaxALT
4cf1150002 clion pls 2017-09-22 21:26:37 -04:00
DizzyEggg
fc57c6c817 atk 48 is really troublesome 2017-09-23 00:06:52 +02:00
DizzyEggg
d5afb0c6e9 up to x48 and troubles 2017-09-22 21:33:49 +02:00
PikalaxALT
15212c4f8d Font6Func 2017-09-21 23:43:13 -04:00
DizzyEggg
9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
PikalaxALT
27903a102b Merge branch 'master' into berry_fix_program 2017-09-20 23:18:20 -04:00
PikalaxALT
8d5250fdaa Merge branch 'master' into lilycove_lady 2017-09-20 23:02:17 -04:00
yenatch
e7f91c65d9 Merge pull request #38 from PikalaxALT/battle_dome_cards
Battle dome cards
2017-09-20 22:41:18 -04:00
PikalaxALT
942fbe87d4 Populate header, label as static whatever won't break things 2017-09-20 21:03:57 -04:00
PikalaxALT
d263750f19 remaining lilycove lady functions 2017-09-20 20:48:32 -04:00
PikalaxALT
45d53d9242 Merge branch 'master' into lilycove_lady 2017-09-20 20:17:31 -04:00
DizzyEggg
0c7555e237 SetMoveEffect functionally equivalent and close 2017-09-20 22:54:26 +02:00
PikalaxALT
7c8cbc6b88 SetLilycoveContestLady 2017-09-20 16:49:22 -04:00
PikalaxALT
d22a9acc63 through sub_818E490 2017-09-20 16:12:18 -04:00
U-User-PC\User
c2f1e2fe53 decompiled up to sub_81C0510 2017-09-20 15:07:24 -04:00
scnorton
fdea92edff through sub_818E3E0 2017-09-20 11:48:11 -04:00
scnorton
213fef6042 through sub_818E308 2017-09-20 11:44:20 -04:00
scnorton
8a31e58689 sub_818E298 2017-09-20 11:30:09 -04:00
scnorton
0b81c2920a sub_818E1F4 2017-09-20 10:45:00 -04:00
DizzyEggg
3919b7130b Fix merge conflicts 2017-09-20 13:12:43 +02:00
DizzyEggg
28da80e19a battle 4 up to SetMoveEffect 2017-09-20 12:56:45 +02:00
PikalaxALT
28d0fa33fe SetLilicoveQuizLady 2017-09-19 22:35:40 -04:00
PikalaxALT
73ee165ef6 sub_818DF00 2017-09-19 22:25:31 -04:00
PikalaxALT
534dd2c4b0 sub_818DD84 2017-09-19 21:47:15 -04:00
PikalaxALT
316f9f4d83 through sub_818DD14 2017-09-19 21:28:01 -04:00
PikalaxALT
f43de6e582 Merge branch 'master' into lilycove_lady 2017-09-19 21:18:34 -04:00
PikalaxALT
5fc2c964fb Merge branch 'master' into sub_81700F8 2017-09-19 21:00:24 -04:00
PikalaxALT
2c07b94e94 Merge branch 'master' into berry_fix_program 2017-09-19 20:55:05 -04:00
PikalaxALT
d4d8f876e5 Merge branch 'master' into battle_dome_cards 2017-09-19 20:54:49 -04:00
DizzyEggg
b4875d82d5 more battle 4 2017-09-20 00:28:00 +02:00
scnorton
3b3423d1a7 sub_818DC60 2017-09-19 17:07:36 -04:00
scnorton
4e8a2c6934 SetLilycoveFavourLady 2017-09-19 16:55:53 -04:00
scnorton
b26eb6713b sub_818DB20 2017-09-19 16:32:33 -04:00
scnorton
e7e1938094 Start decompilation of lilycove_lady 2017-09-19 16:17:23 -04:00
DizzyEggg
b3c788f2ca begin work on battle4, organize battle headers 2017-09-19 21:01:12 +02:00
scnorton
bff89725ec Add battle_dome_cards header to expose symbols as needed 2017-09-19 09:46:17 -04:00
DizzyEggg
148b995189 finish egg hatch, clean up headers 2017-09-19 14:27:46 +02:00
PikalaxALT
60f8369a89 Merge branch 'master' into berry_fix_program 2017-09-18 19:24:09 -04:00
PikalaxALT
ee73040717 Merge branch 'master' into field_map_obj 2017-09-18 19:21:34 -04:00
DizzyEggg
f255cbd7dc Merge branch 'master' into decomp_egg_hatch 2017-09-18 23:50:08 +02:00
DizzyEggg
2e7127284f egg hatch almost decompiled 2017-09-18 23:48:47 +02:00
scnorton
39e6bdf094 sub_81BF7E8 2017-09-18 14:04:00 -04:00
DizzyEggg
c253bf5e75 add important headers, const ptrs and egg hatch start 2017-09-18 18:36:05 +02:00
scnorton
c5dddf41f5 sub_81BF5A4 2017-09-18 11:26:45 -04:00
PikalaxALT
8604291b0f Start decomp 2017-09-18 09:23:06 -04:00
PikalaxALT
16f2e40576 Fix naming conflicts 2017-09-17 23:42:44 -04:00
PikalaxALT
380858293e Merge branch 'master' into sub_81700F8 2017-09-17 22:58:57 -04:00
scnorton
130ba76533 remove data3.h 2017-09-17 17:50:07 -04:00
scnorton
70b1ad4857 Remaining functions 2017-09-17 15:33:26 -04:00
scnorton
b54689b9a3 Another four functions 2017-09-17 14:12:32 -04:00
scnorton
71b40f50c0 Merge branch 'master' into field_map_obj 2017-09-17 13:38:33 -04:00
scnorton
4b04e92e8b Ten more functions (remaining function count is 99) 2017-09-17 13:26:17 -04:00
PikalaxALT
3356a4fb92 Failed attempt to fix InitFieldObjectStateFromTemplate, but at least we fixed the weirdness with the double MapObject structs 2017-09-17 11:39:49 -04:00
DizzyEggg
75595f9b3d decompile battle 3 2017-09-17 17:14:32 +02:00
PikalaxALT
9b4c61658a npc_set_direction_and_anim__an_proceed 2017-09-17 10:58:24 -04:00
PikalaxALT
9dc7839dd8 callers of sub_80940C4 2017-09-17 09:49:50 -04:00
DizzyEggg
c7592bc87c finish porting cam's port 2017-09-17 15:19:15 +02:00
PikalaxALT
8ee004b9b1 sub_80940C4 which may or may not be a meme 2017-09-17 08:45:24 -04:00
PikalaxALT
bf9a00250b maybe_shadow_1 which may or may not be a shadow 2017-09-17 08:38:00 -04:00
PikalaxALT
6439551e1a Another chunk of functions, including some expanded from macros 2017-09-17 08:20:42 -04:00
DizzyEggg
a9a66b06ef start porting cam's port of battle3 2017-09-17 14:10:32 +02:00
PikalaxALT
0582b5cb90 npc_obj_ministep_stop_on_arrival 2017-09-17 08:05:33 -04:00
PikalaxALT
529ccf9a96 do_go_anim 2017-09-16 23:49:31 -04:00
PikalaxALT
432924e56d npc_apply_direction 2017-09-16 23:31:43 -04:00
PikalaxALT
4e22f1e55f MapObjectExec***Anim 2017-09-16 23:11:09 -04:00
PikalaxALT
5f189fa53b state_to_direction memes 2017-09-16 23:05:53 -04:00
PikalaxALT
eb7e52d2a8 Deswiss the cheese 2017-09-16 22:44:47 -04:00
PikalaxALT
812ad017e8 sub_80930E0 2017-09-16 22:19:23 -04:00
PikalaxALT
44e590add0 sub_8093038 2017-09-16 22:15:54 -04:00
PikalaxALT
3f2c6556cb sub_8092FF0 2017-09-16 21:59:14 -04:00
PikalaxALT
f03c0dc3b4 MoveCoords 2017-09-16 21:39:29 -04:00
PikalaxALT
951acc8c31 CheckForCollisionBetweenFieldObjects 2017-09-16 21:29:04 -04:00
PikalaxALT
c982993860 IsMetatileDirectionallyImpassable 2017-09-16 21:08:44 -04:00
PikalaxALT
fedbcd7bb7 npc_block_way 2017-09-16 18:42:35 -04:00
PikalaxALT
5812bc4ebe npc_block_way__next_tile 2017-09-16 18:33:38 -04:00
PikalaxALT
ca88036ebe npc_set_running_behaviour_etc 2017-09-16 18:29:14 -04:00
PikalaxALT
34950dbd13 remaining field object step callbacks 2017-09-16 17:34:41 -04:00
Diegoisawesome
5e12833b13 Finish merge 2017-09-16 15:50:08 -05:00
PikalaxALT
12885ca371 CopyPlayer2 2017-09-16 16:40:00 -04:00
PikalaxALT
559833ccf6 Merge branch 'master' into field_map_obj 2017-09-16 15:41:54 -04:00
Cameron Hall
19d2d73c70 Merge pull request #28 from DizzyEggg/decomp_pokemon
decompile pokemon1/2/3
2017-09-16 14:14:50 -05:00
PikalaxALT
052c9f0234 Fix header guards 2017-09-16 15:13:26 -04:00
PikalaxALT
18e06b480b Fix header guards 2017-09-16 15:13:06 -04:00
PikalaxALT
66fbc9753f sub_8091F94 2017-09-16 13:54:33 -04:00
PikalaxALT
ee3dc1edda Some more functions, including some swiss-cheesing that got out of hand 2017-09-16 09:43:49 -04:00
PikalaxALT
86df6d1073 Field object path movement 2017-09-16 08:44:43 -04:00
PikalaxALT
54c8580d34 rom_81700F8 2017-09-15 22:12:45 -04:00
PikalaxALT
79e8235701 AlternatelyGoInOppositeDirections 2017-09-15 21:26:56 -04:00
scnorton
1c6177f678 Rotatoes 2017-09-15 16:34:03 -04:00
scnorton
2e1ecdb877 Tridirectional spinners 2017-09-15 16:08:01 -04:00
scnorton
f6840ba7e7 RandomlyLookSouthOrEast 2017-09-15 16:00:39 -04:00
scnorton
b269048369 RandomlyLookSouthOrWest 2017-09-15 15:57:38 -04:00
scnorton
8c6367f997 RandomlyLookNorthOrEast 2017-09-15 15:53:07 -04:00
scnorton
0571056955 RandomlyLookNorthOrWest 2017-09-15 15:26:51 -04:00
scnorton
9f6a4be9f0 BerryTree 2017-09-15 14:26:01 -04:00
PikalaxALT
68c62595f5 RandomlyGoEastOrWest 2017-09-14 21:25:30 -04:00
PikalaxALT
4a1383d77b RandomlyGoNorthOrSouth 2017-09-14 21:22:14 -04:00
PikalaxALT
0ae3347e47 Rename some functions 2017-09-14 08:38:21 -04:00
PikalaxALT
64ffa8f963 Merge branch 'master' into field_map_obj 2017-09-13 19:29:19 -04:00
PikalaxALT
d72231379b FieldObjectIsTrainerAndCloseToPlayer 2017-09-13 19:13:44 -04:00
DizzyEggg
b1e90c1d50 review berry cleanings 2017-09-13 19:30:05 +02:00
DizzyEggg
c80b76e85a Merge branch 'master' into decomp_berry 2017-09-13 18:24:59 +02:00
DizzyEggg
117f8a6abd Merge branch 'master' into decomp_pokemon 2017-09-13 18:24:01 +02:00
PikalaxALT
e26501f130 Support functions for GoRandomDirections 2017-09-13 10:59:25 -04:00
scnorton
28b272bf52 NoMovement1, GoRandomDirections 2017-09-13 09:41:11 -04:00
DizzyEggg
4c16bb5ee6 decompile util.s 2017-09-13 12:58:57 +02:00
DizzyEggg
a08cd8e5a7 define number of map objects 2017-09-13 12:17:48 +02:00
DizzyEggg
5f4c5e280c berry.s decompiled 2017-09-13 11:16:26 +02:00
DizzyEggg
c9603c40d8 Merge branch 'master' into decomp_pokemon 2017-09-12 23:02:08 +02:00
PikalaxALT
9286c93c8a npc_paltag_set_load 2017-09-12 16:49:04 -04:00
PikalaxALT
c6ef344262 sub_808F254 2017-09-12 16:17:52 -04:00
DizzyEggg
8731a8caa5 one more function in pokemon1 2017-09-12 15:36:04 +02:00
DizzyEggg
0fe7030230 pokemon 3 is almost decompiled 2017-09-12 15:05:40 +02:00
DizzyEggg
6539188fa6 label and decomp some pokemon animation stuff 2017-09-12 13:05:54 +02:00
DizzyEggg
4242ede445 almost there, troubles 2017-09-12 00:01:12 +02:00
DizzyEggg
738e776630 more pokemon2 decomp 2017-09-11 22:28:36 +02:00
DizzyEggg
e69606b5cb praise cam the CHAMP man 2017-09-11 19:42:37 +02:00