dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into weather

Browse Source
This commit is contained in:
DizzyEggg
2018-12-09 11:56:50 +01:00
parent 606fb71392 0b91d2948a
commit 4683cdc30c
125 changed files with 29614 additions and 25811 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sym_ewram.txt
+63 -63
View File
@@ -1,8 +1,8 @@
.include "src/decompress.o"
.include "src/decompress.o"
.include "src/main.o"
.include "src/window.o"
.include "src/text.o"
.include "src/sprite.o"
.include "src/window.o"
.include "src/text.o"
.include "src/sprite.o"
.include "src/string_util.o"
.include "src/link.o"
.include "src/link_rfu.o"
@@ -110,7 +110,7 @@ gUnknown_02022D00: @ 2022D00
.include "src/pokemon.o"
.include "src/random.o"
.include "src/daycare.o"
.include "src/load_save.o"
.include "src/load_save.o"
gUnknown_02032184: @ 2032184
.space 0x4
@@ -129,40 +129,40 @@ gUnknown_0203229C: @ 203229C
gUnknown_020322A0: @ 20322A0
.space 0x4
.include "src/berry_blender.o"
.include "src/new_game.o"
.include "src/berry_blender.o"
.include "src/new_game.o"
.include "src/overworld.o"
.include "src/fieldmap.o"
.include "src/field_camera.o"
.include "src/field_player_avatar.o"
.include "src/event_object_movement.o"
.include "src/field_message_box.o"
.include "src/event_object_movement.o"
.include "src/field_message_box.o"
.align 2
.align 2
gUnknown_020375C0: @ 20375C0
.space 0x4
.include "src/scrcmd.o"
.include "src/field_control_avatar.o"
.include "src/event_data.o"
.include "src/start_menu.o"
.include "src/scrcmd.o"
.include "src/field_control_avatar.o"
.include "src/event_data.o"
.include "src/start_menu.o"
.include "src/tileset_anims.o"
.include "src/palette.o"
.include "src/sound.o"
.include "src/battle_anim.o"
.include "src/battle_anim_80A5C6C.o"
.include "src/sound.o"
.include "src/battle_anim.o"
.include "src/battle_anim_80A5C6C.o"
.space 0xC
.include "src/field_weather.o"
.include "src/field_weather_effect.o"
.include "src/battle_setup.o"
.include "src/trainer_see.o"
.include "src/wild_encounter.o"
.include "src/field_effect.o"
.include "src/scanline_effect.o"
.include "src/option_menu.o"
.include "src/pokedex.o"
.include "src/wild_encounter.o"
.include "src/field_effect.o"
.include "src/scanline_effect.o"
.include "src/option_menu.o"
.include "src/pokedex.o"
gTrainerCards: @ 2039B58
.space 0x14
@@ -267,20 +267,20 @@ gUnknown_02039F5C: @ 2039F5C
gUnknown_02039F5D: @ 2039F5D
.space 0x3
.include "src/shop.o"
.include "src/fldeff_escalator.o"
.include "src/script_menu.o"
.include "src/naming_screen.o"
.include "src/money.o"
.include "src/record_mixing.o"
.include "src/secret_base.o"
.include "src/tv.o"
.include "src/shop.o"
.include "src/fldeff_escalator.o"
.include "src/script_menu.o"
.include "src/naming_screen.o"
.include "src/money.o"
.include "src/record_mixing.o"
.include "src/secret_base.o"
.include "src/tv.o"
gUnknown_0203A034: @ 203A034
.space 0x4
.include "src/rotating_gate.o"
.include "src/safari_zone.o"
.include "src/rotating_gate.o"
.include "src/safari_zone.o"
gUnknown_0203A0F4: @ 203A0F4
.space 0x4
@@ -307,13 +307,13 @@ gUnknown_0203A120: @ 203A120
.include "src/mon_markings.o"
.include "src/mauville_old_man.o"
.include "src/mail.o"
.include "src/menu_helpers.o"
.include "src/mail.o"
.include "src/menu_helpers.o"
.include "src/region_map.o"
.include "src/decoration.o"
.include "src/slot_machine.o"
.include "src/battle_ai_script_commands.o"
.include "src/decoration.o"
.include "src/slot_machine.o"
.include "src/battle_ai_script_commands.o"
.align 2
gPlayerFacingPosition: @ 203AB40
.space 0x8
@@ -331,9 +331,9 @@ gUnknown_0203AB8C: @ 203AB8C
.space 0x4
.include "src/pokedex_cry_screen.o"
.include "src/coins.o"
.include "src/battle_transition.o"
.include "src/battle_message.o"
.include "src/coins.o"
.include "src/battle_transition.o"
.include "src/battle_message.o"
gUnknown_0203ABAC: @ 203ABAC
.space 0x4
@@ -356,8 +356,8 @@ gUnknown_0203ABB4: @ 203ABB4
gUnknown_0203ABB5: @ 203ABB5
.space 0x3
.include "src/rom_81520A8.o"
.include "src/save.o"
.include "src/rom_81520A8.o"
.include "src/save.o"
.include "src/mystery_event_script.o"
.include "src/learn_move.o"
.include "src/decoration_inventory.o"
@@ -367,20 +367,20 @@ gUnknown_0203ABB5: @ 203ABB5
.include "src/player_pc.o"
.include "src/intro.o"
.include "src/field_region_map.o"
.include "src/hall_of_fame.o"
.include "src/credits.o"
.include "src/lottery_corner.o"
.include "src/diploma.o"
.include "src/berry_tag_screen.o"
.include "src/mystery_event_menu.o"
.include "src/save_failed_screen.o"
.include "src/braille_puzzles.o"
.include "src/hall_of_fame.o"
.include "src/credits.o"
.include "src/lottery_corner.o"
.include "src/diploma.o"
.include "src/berry_tag_screen.o"
.include "src/mystery_event_menu.o"
.include "src/save_failed_screen.o"
.include "src/braille_puzzles.o"
.include "src/pokeblock_feed.o"
.include "src/intro_credits_graphics.o"
.include "src/recorded_battle.o"
.include "src/trainer_pokemon_sprites.o"
.include "src/lilycove_lady.o"
.include "src/battle_dome.o"
.include "src/recorded_battle.o"
.include "src/trainer_pokemon_sprites.o"
.include "src/lilycove_lady.o"
.include "src/battle_dome.o"
gUnknown_0203CD80: @ 203CD80
.space 0x8
@@ -388,13 +388,13 @@ gUnknown_0203CD80: @ 203CD80
gUnknown_0203CD88: @ 203CD88
.space 0x4
.include "src/menu.o"
.include "src/battle_factory_screen.o"
.include "src/mossdeep_gym.o"
.include "src/item_menu.o"
.include "src/list_menu.o"
.include "src/dynamic_placeholder_text_util.o"
.include "src/item_icon.o"
.include "src/menu.o"
.include "src/battle_factory_screen.o"
.include "src/mossdeep_gym.o"
.include "src/item_menu.o"
.include "src/list_menu.o"
.include "src/dynamic_placeholder_text_util.o"
.include "src/item_icon.o"
gUnknown_0203CEC4: @ 203CEC4
.space 0x4