full out map export

charmap.txt

@@ -74,13 +74,13 @@ RIGHT_ARROW = 7C
 '.'         = AD
 '-'         = AE
 DOTS        = B0
-'“'         = B1
-'”'         = B2
+QUOTE        = B1
+'\q'        = B2
 '‘'         = B3
-'’'         = B4
+'\''         = B4
 '♂'         = B5
 '♀'         = B6
-'¥'         = B7
+'\$'         = B7
 ','         = B8
 '×'         = B9
 '/'         = BA
@@ -325,9 +325,9 @@ STRING = FD
 
 @ string placeholders
 PLAYER         = FD 01
-STR_VAR_1      = FD 02
-STR_VAR_2      = FD 03
-STR_VAR_3      = FD 04
+BUFFER_1       = FD 02
+BUFFER_2       = FD 03
+BUFFER_3       = FD 04
 KUN            = FD 05
 RIVAL          = FD 06
 @ version-dependent strings
@@ -362,12 +362,16 @@ NAME_END = FC 00
 
 @ more text functions
 
+TEXT_DELAY = FC 08 23
+TEXT_DELAY_LONG = FC 08 32
+
 COLOR = FC 01 @ use a color listed below right after
 HIGHLIGHT = FC 02 @ same as fc 01
 SHADOW = FC 03 @ same as fc 01
 COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes
 PALETTE = FC 05 @ used in credits
 SIZE = FC 06 @ note that anything other than "SMALL" is invalid
+SMALL = FC 06 00
 UNKNOWN_7 = FC 07
 PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them
 PAUSE_UNTIL_PRESS = FC 09

makefile

@@ -30,6 +30,9 @@ BLDPATH   := object
 OUTPATH	  := build
 SOURCEDIR := src
 STRINGDIR := string
+MAPROOT	  := sots-private/map
+MAPMAPS	  := $(MAPROOT)/maps
+MAPTS	  := $(MAPROOT)/tilesets
 
 MAIN_OBJ  := $(BLDPATH)/linked.o
 B_ENGINE  := battle_engine/build/linked.o
@@ -37,6 +40,8 @@ SPRITES   := $(BLDPATH)/pkmn_sprites.o
 ICONS_AR  := $(BLDPATH)/pkmn_icons.a
 DYN_OVER  := built/dynamic_overworld.o
 
+TMP_LD	  := tmp.ld
+
 SND_ROOT := sots-private/sound
 MUSIC_AR := $(SND_ROOT)/Music/music.a
 SMPL_AR  := $(SND_ROOT)/Samples/sample.a
@@ -54,13 +59,16 @@ C_SRC       := $(call rwildcard,src/,*.c)
 DATA_SRC    := $(call rwildcard,data/,*.s)
 STRING		:= $(call rwildcard,string/$(LAN)/,*.txt)
 STRING_SRC	:= $(STRING:%.txt=%.s)
+SCRIPT_SRC	:= $(call rwildcard,$(MAPMAPS)/,*.s)
+
 
 GEN_OBJ		:= $(GEN_SRC:%.c=$(BLDPATH)/%.o)
 STRING_OBJ	:= $(STRING_SRC:%.s=$(BLDPATH)/%.o)
 ASM_OBJ     := $(ASM_SRC:%.s=$(BLDPATH)/%.o)
 C_OBJ       := $(C_SRC:%.c=$(BLDPATH)/%.o)
 DATA_OBJ    := $(DATA_SRC:%.s=$(BLDPATH)/%.o)
-ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ)
+SCRIPT_OBJ	:= $(SCRIPT_SRC:%.s=$(BLDPATH)/%.o)
+ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ) $(SCRIPT_OBJ)
 
 $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
 	@echo -e "\e[93mGenerating strings $<\e[0m"
@@ -100,7 +108,9 @@ rom: main.asm $(MAIN_OBJ)
 $(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $()#$(B_ENGINE)
 	$(MAKE) -f assets.makefile
 	@echo -e "\e[1;32mLinking ELF binary $@\e[0m"
-	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
+	@echo "INPUT($^)" > $(TMP_LD)
+	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group -T $(TMP_LD) --end-group
+	@rm -f $(TMP_LD)
 
 .PHONY: $(B_ENGINE)
 $(B_ENGINE):

sots-private

@@ -1 +1 @@
-Subproject commit 7fd26679a5fbf886c57440f7090ca16f02d0361e
+Subproject commit 04d6d99a48f025594551fe535770abbc3b9d8075

src/include/pymap_constants.s → src/include/pymap_constants.h

@@ -1378,6 +1378,23 @@
 .equ PKMNMENU, 0x828
 .equ POKEDEX, 0x829
 .equ RUNNING_SHOES, 0x830
+.equ BATTLE_LOSABLE, 0x90f
+.equ TRANS_PALETTE_FETCH, 0x910
+.equ TRANS_DISABLE, 0x911
+.equ WONDERTRADE, 0x915
+.equ MAP_BGN_AUTO_ALIGN_OFF, 0x916
+.equ POKERADAR_POKEMON_SPAWNED, 0x917
+.equ ABILITY_SPARSAM_TRIGGER, 0x918
+.equ WONDERTRADE_MEW_RECEIVED, 0x91f
+.equ MEGA_EVOLUTION_PERFORMED, 0x920
+.equ PLAYER_ABLE_TO_MEGA_EVOLVE, 0x921
+.equ MAP_LOAD_DYNAMIC, 0x922
+.equ DUNGEON_BUFFERED, 0x923
+.equ PLAYER_CAN_ENTER_DUNGEONS, 0x924
+.equ POKEDEX_FEATURE_HABITAT, 0x927
+.equ POKEDEX_FEATURE_0, 0x928
+.equ POKEDEX_FEATURE_1, 0x929
+.equ POKEDEX_FEATURE_2, 0x92a
 
 
 
@@ -1431,12 +1448,12 @@
 @ARM Assembly macro definitions for ord
 
 
-.equ B_LT, 0x0
-.equ B_EQ, 0x1
-.equ B_GT, 0x2
-.equ B_LE, 0x3
-.equ B_GE, 0x4
-.equ B_NE, 0x5
+.equ LESS, 0x0
+.equ EQUAL, 0x1
+.equ HIGHER, 0x2
+.equ LESS_OR_EQUAL, 0x3
+.equ HIGHER_OR_EQUAL, 0x4
+.equ NOT_EQUAL, 0x5
 
 
 
@@ -1449,115 +1466,101 @@
 .equ MSG_SIGN, 0x3
 .equ MSG_KEEPOPEN, 0x4
 .equ MSG_YES_NO, 0x5
-.equ MSG_STD, 0x6
+.equ MSG, 0x6
 
 
 
 @ARM Assembly macro definitions for moves
 
 
-.equ APPLYMOVE_LOOK_DOWN, 0x0
-.equ APPLYMOVE_LOOK_UP, 0x1
-.equ APPLYMOVE_LOOK_LEFT, 0x2
-.equ APPLYMOVE_LOOK_RIGHT, 0x3
-.equ APPLYMOVE_GO_DOWN_VERY_SLOW, 0x8
-.equ APPLYMOVE_GO_UP_VERY_SLOW, 0x9
-.equ APPLYMOVE_GO_LEFT_VERY_SLOW, 0xa
-.equ APPLYMOVE_GO_RIGHT_VERY_SLOW, 0xb
-.equ APPLYMOVE_GO_DOWN_SLOW, 0xc
-.equ APPLYMOVE_GO_UP_SLOW, 0xd
-.equ APPLYMOVE_GO_LEFT_SLOW, 0xe
-.equ APPLYMOVE_GO_RIGHT_SLOW, 0xf
-.equ APPLYMOVE_GO_DOWN, 0x10
-.equ APPLYMOVE_GO_UP, 0x11
-.equ APPLYMOVE_GO_LEFT, 0x12
-.equ APPLYMOVE_GO_RIGHT, 0x13
-.equ APPLYMOVE_JUMP_TWO_DOWN, 0x14
-.equ APPLYMOVE_JUMP_TWO_UP, 0x15
-.equ APPLYMOVE_JUMP_TWO_LEFT, 0x16
-.equ APPLYMOVE_JUMP_TWO_RIGHT, 0x17
-.equ APPLYMOVE_DELAY1, 0x18
-.equ APPLYMOVE_DELAY2, 0x19
-.equ APPLYMOVE_DELAY3, 0x1a
-.equ APPLYMOVE_DELAY4, 0x1b
-.equ APPLYMOVE_DELAY5, 0x1c
-.equ APPLYMOVE_GO_DOWN_FAST, 0x1d
-.equ APPLYMOVE_GO_UP_FAST, 0x1e
-.equ APPLYMOVE_GO_LEFT_FAST, 0x1f
-.equ APPLYMOVE_GO_RIGHT_FAST, 0x20
-.equ APPLYMOVE_GO_DOWN_ON_POINT, 0x21
-.equ APPLYMOVE_GO_UP_ON_POINT, 0x22
-.equ APPLYMOVE_GO_LEFT_ON_POINT, 0x23
-.equ APPLYMOVE_GO_RIGHT_ON_POINT, 0x24
-.equ APPLYMOVE_GO_DOWN_ON_POINT_FAST, 0x25
-.equ APPLYMOVE_GO_UP_ON_POINT_FAST, 0x26
-.equ APPLYMOVE_GO_LEFT_ON_POINT_FAST, 0x27
-.equ APPLYMOVE_GO_RIGHT_ON_POINT_FAST, 0x28
-.equ APPLYMOVE_GO_DOWN_ON_POINT_VERY_FAST, 0x29
-.equ APPLYMOVE_GO_UP_ON_POINT_VERY_FAST, 0x2a
-.equ APPLYMOVE_GO_LEFT_ON_POINT_VERY_FAST, 0x2b
-.equ APPLYMOVE_GO_RIGHT_ON_POINT_VERY_FAST, 0x2c
-.equ APPLYMOVE_LOOK_DOWN_DELAY, 0x2d
-.equ APPLYMOVE_LOOK_UP_DELAY, 0x2e
-.equ APPLYMOVE_LOOK_LEFT_DELAY, 0x2f
-.equ APPLYMOVE_LOOK_RIGHT_DELAY, 0x30
-.equ APPLYMOVE_GO_DOWN_VERY_FAST, 0x35
-.equ APPLYMOVE_GO_UP_VERY_FAST, 0x36
-.equ APPLYMOVE_GO_LEFT_VERY_FAST, 0x37
-.equ APPLYMOVE_GO_RIGHT_VERY_FAST, 0x38
-.equ APPLYMOVE_SLIDE_DOWN_FAST, 0x39
-.equ APPLYMOVE_SLIDE_UP_FAST, 0x3a
-.equ APPLYMOVE_SLIDE_LEFT_FAST, 0x3b
-.equ APPLYMOVE_SLIDE_RIGHT_FAST, 0x3c
-.equ APPLYMOVE_GO_LOOP, 0x45
-.equ APPLYMOVE_RUN_LOOP, 0x46
-.equ APPLYMOVE_LOOK_PLAYER, 0x4a
-.equ APPLYMOVE_LOOK_NOT_PLAYER, 0x4b
-.equ APPLYMOVE_FREEZE_LOOK, 0x4c
-.equ APPLYMOVE_FREE_LOOK, 0x4d
-.equ APPLYMOVE_JUMP_ONE_DOWN, 0x4e
-.equ APPLYMOVE_JUMP_ONE_UP, 0x4f
-.equ APPLYMOVE_JUMP_ONE_LEFT, 0x50
-.equ APPLYMOVE_JUMP_ONE_RIGHT, 0x51
-.equ APPLYMOVE_JUMP_ON_POINT_DOWN, 0x52
-.equ APPLYMOVE_JUMP_ON_POINT_UP, 0x53
-.equ APPLYMOVE_JUMP_ON_POINT_LEFT, 0x54
-.equ APPLYMOVE_JUMP_ON_POINT_RIGHT, 0x55
-.equ APPLYMOVE_JUMP_ON_POINT_UP_DOWN, 0x56
-.equ APPLYMOVE_JUMP_ON_POINT_DOWN_UP, 0x57
-.equ APPLYMOVE_JUMP_ON_POINT_RIGHT_LEFT, 0x58
-.equ APPLYMOVE_JUMP_ON_POINT_LEFT_RIGHT, 0x59
-.equ APPLYMOVE_HIDESPRITE, 0x60
-.equ APPLYMOVE_SHOWSPRITE, 0x61
-.equ APPLYMOVE_EXCL, 0x62
-.equ APPLYMOVE_QUEST, 0x63
-.equ APPLYMOVE_IDEA, 0x64
-.equ APPLYMOVE_ANGRY, 0x65
-.equ APPLYMOVE_CONCERNED, 0x66
-.equ APPLYMOVE_TREESMASH, 0x69
-.equ APPLYMOVE_RUN_DOWN, 0x74
-.equ APPLYMOVE_RUN_UP, 0x75
-.equ APPLYMOVE_RUN_LEFT, 0x76
-.equ APPLYMOVE_RUN_RIGHT, 0x77
-.equ APPLYMOVE_JUMP_TWO_DOWN, 0x84
-.equ APPLYMOVE_JUMP_TWO_UP, 0x85
-.equ APPLYMOVE_JUMP_TWO_LEFT, 0x86
-.equ APPLYMOVE_JUMP_TWO_RIGHT, 0x87
-.equ APPLYMOVE_GO_CLOCKWISE_DOWN, 0x94
-.equ APPLYMOVE_GO_CLOCKWISE_UP, 0x95
-.equ APPLYMOVE_GO_CLOCKWISE_LEFT, 0x96
-.equ APPLYMOVE_GO_CLOCKWISE_RIGHT, 0x97
-.equ APPLYMOVE_GO_PIXELWISE_DOWN, 0x9b
-.equ APPLYMOVE_GO_PIXELWISE_UP, 0x9c
-.equ APPLYMOVE_GO_PIXELWISE_LEFT, 0x9d
-.equ APPLYMOVE_GO_PIXELWISE_RIGHT, 0x9e
-.equ APPLYMOVE_SLIDE_NO_MOVEMENT_DOWN, 0xa0
-.equ APPLYMOVE_SLIDE_NO_MOVEMENT_UP, 0xa1
-.equ APPLYMOVE_SLIDE_NO_MOVEMENT_LEFT, 0xa2
-.equ APPLYMOVE_SLIDE_NO_MOVEMENT_RIGHT, 0xa3
-.equ APPLYMOVE_TELEPORT_MOVE, 0xa4
-.equ APPLYMOVE_FALLING_DOWN_MOVE, 0xa5
-.equ APPLYMOVE_END, 0xfe
+.equ LOOK_UP, 0x1
+.equ LOOK_LEFT, 0x2
+.equ LOOK_RIGHT, 0x3
+.equ LOOK_DOWN, 0x4
+.equ STEP_DOWN_VERY_SLOW, 0x8
+.equ STEP_UP_VERY_SLOW, 0x9
+.equ STEP_LEFT_VERY_SLOW, 0xa
+.equ STEP_RIGHT_VERY_SLOW, 0xb
+.equ STEP_DOWN_SLOW, 0xc
+.equ STEP_UP_SLOW, 0xd
+.equ STEP_LEFT_SLOW, 0xe
+.equ STEP_RIGHT_SLOW, 0xf
+.equ STEP_DOWN, 0x10
+.equ STEP_UP, 0x11
+.equ STEP_LEFT, 0x12
+.equ STEP_RIGHT, 0x13
+.equ JUMP_DOWN2, 0x14
+.equ JUMP_UP2, 0x15
+.equ JUMP_LEFT2, 0x16
+.equ JUMP_RIGHT2, 0x17
+.equ STEP_DOWN_FAST, 0x1d
+.equ STEP_UP_FAST, 0x1e
+.equ STEP_LEFT_FAST, 0x1f
+.equ STEP_RIGHT_FAST, 0x20
+.equ STEP_IN_PLACE_DOWN, 0x21
+.equ STEP_IN_PLACE_UP, 0x22
+.equ STEP_IN_PLACE_LEFT, 0x23
+.equ STEP_IN_PLACE_RIGHT, 0x24
+.equ STEP_IN_PLACE_DOWN_FAST, 0x25
+.equ STEP_IN_PLACE_UP_FAST, 0x26
+.equ STEP_IN_PLACE_LEFT_FAST, 0x27
+.equ STEP_IN_PLACE_RIGHT_FAST, 0x28
+.equ STEP_IN_PLACE_DOWN_VERY_FAST, 0x29
+.equ STEP_IN_PLACE_UP_VERY_FAST, 0x2a
+.equ STEP_IN_PLACE_LEFT_VERY_FAST, 0x2b
+.equ STEP_IN_PLACE_RIGHT_VERY_FAST, 0x2c
+.equ LOOK_DOWN_DELAYED, 0x2d
+.equ LOOK_UP_DELAYED, 0x2e
+.equ LOOK_LEFT_DELAYED, 0x2f
+.equ LOOK_RIGHT_DELAYED, 0x30
+.equ SLIDE_DOWN, 0x31
+.equ SLIDE_UP, 0x32
+.equ SLIDE_LEFT, 0x33
+.equ SLIDE_RIGHT, 0x34
+.equ SLIDE_DOWN_ON_RIGHT_FOOT, 0x3d
+.equ SLIDE_UP_ON_RIGHT_FOOT, 0x3e
+.equ SLIDE_LEFT_ON_RIGHT_FOOT, 0x3f
+.equ SLIDE_RIGHT_ON_RIGHT_FOOT, 0x40
+.equ SLIDE_DOWN_ON_LEFT_FOOT, 0x41
+.equ SLIDE_UP_ON_LEFT_FOOT, 0x42
+.equ SLIDE_LEFT_ON_LEFT_FOOT, 0x43
+.equ SLIDE_RIGHT_ON_LEFT_FOOT, 0x44
+.equ RUN_INFINITLY, 0x45
+.equ JUMP_DOWN_RUNNING, 0x46
+.equ JUMP_UP_RUNNING, 0x47
+.equ JUMP_LEFT_RUNNING, 0x48
+.equ JUMP_RIGHT_RUNNING, 0x49
+.equ FACE_PLAYER, 0x4a
+.equ FACE_AWAY_FROM_PLAYER, 0x4b
+.equ JUMP_DOWN, 0x4e
+.equ JUMP_UP, 0x4f
+.equ JUMP_LEFT, 0x50
+.equ JUMP_RIGHT, 0x51
+.equ JUMP_IN_PLACE_FACE_DOWN, 0x52
+.equ JUMP_IN_PLACE_FACE_UP, 0x53
+.equ JUMP_IN_PLACE_FACE_LEFT, 0x54
+.equ JUMP_IN_PLACE_FACE_RIGHT, 0x55
+.equ JUMP_IN_PLACE_FACE_DOWN_TO_UP, 0x56
+.equ JUMP_IN_PLACE_FACE_UP_TO_DOWN, 0x57
+.equ JUMP_IN_PLACE_FACE_LEFT_TO_RIGHT, 0x58
+.equ JUMP_IN_PLACE_FACE_RIGHT_TO_LEFT, 0x59
+.equ HIDE_SPRITE, 0x60
+.equ SHOW_SPRITE, 0x61
+.equ SAY_EXCLAM, 0x62
+.equ SAY_QUESTION, 0x63
+.equ SAY_X, 0x64
+.equ SAY_DOUBLE_EXCLAM, 0x65
+.equ SAY_SMILE, 0x66
+.equ MOVEX_DOWN, 0x6e
+.equ MOVEY_DOWN, 0x6f
+.equ LOOK_RIGHT_LEFT_DOWNFACING, 0x78
+.equ LIFT_DOWN, 0xa0
+.equ LIFT_UP, 0xa1
+.equ LIFT_LEFT, 0xa2
+.equ LIFT_RIGHT, 0xa3
+.equ FLY_OUT_OF_SCREEN, 0xa5
+.equ FLY_FROM_SCREEN, 0xa6
+.equ STOP, 0xfe
 
 
 

src/include/script_language.h

@@ -167,13 +167,13 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .macro callif if1_value:req if1_pointer:req
 .byte 0x6
 .byte \if1_value
-.word \if1_address
+.word \if1_pointer
 .endm
 
 .macro gotoif if2_value:req if2_pointer:req
 .byte 0x7
 .byte \if2_value
-.word \if2_address
+.word \if2_pointer
 .endm
 
 .macro callstd callstd_call:req
@@ -217,14 +217,14 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 
 .macro copyvar copyvar_variableADestin:req copyvar_variableBSource:req
 .byte 0x19
-.hword copyvar_variableADestin
-.hword copyvar_variableBSource
+.hword \copyvar_variableADestin
+.hword \copyvar_variableBSource
 .endm
 
-.macro setvarifnotzero setvarifnotzero_variableADestin:req setvarifnotzero_variableBSource:req
+.macro copyvarifnotzero copyvarifnotzero_variableADestin:req copyvarifnotzero_variableBSource:req
 .byte 0x1A
-.hword setvarifnotzero_variableADestin
-.hword setvarifnotzero_variableBSource
+.hword \copyvarifnotzero_variableADestin
+.hword \copyvarifnotzero_variableBSource
 .endm
 
 .macro compare compare_variable:req compare_value:req
@@ -312,7 +312,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .hword \playsong2_song
 .endm
 
-.macro fadedefault
+.macro songfadedefault
 .byte 0x35
 .endm
 
@@ -490,7 +490,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .hword \movesprite_y
 .endm
 
-.macro spritevisible spritevisible_people:req spritevisible_bank:req movesprite_map:req
+.macro spritevisible spritevisible_people:req spritevisible_bank:req spritevisible_map:req
 .byte 0x58
 .hword \spritevisible_people
 .byte \spritevisible_bank
@@ -514,7 +514,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .byte \spriteface_facing
 .endm
 
-.macro trainerbattle trainerbattle_kind:req trainerbattle_id:req trainerbattle_value:req trainerbattle_before:req trainerbattle_after:req trainerbattle_later:req
+.macro trainerbattle trainerbattle_kind:req trainerbattle_id:req trainerbattle_value:req trainerbattle_before:req trainerbattle_after:req trainerbattle_later
 .byte 0x5C
 .byte \trainerbattle_kind
 .hword \trainerbattle_id
@@ -566,7 +566,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .macro spritebehave spritebehave_people:req spritebehave_facing:req
 .byte 0x65
 .hword \spritebehave_people
-.byte \spritebehave_behaviour
+.byte \spritebehave_facing
 .endm
 
 .macro waitmsg
@@ -650,7 +650,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .word \braile_data
 .endm
 
-.macro givepokemon givepokemon_spezies:req givepokemon_level:req givepokemon_item:req
+.macro givepokemon givepokemon_spezies:req givepokemon_level:req givepokemon_item:req givepokemon_one givepokemon_two givepokemon_three
 .byte 0x79
 .hword \givepokemon_spezies
 .byte \givepokemon_level
@@ -721,7 +721,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .macro bufferstring bufferstring_buffernumber:req bufferstring_string:req
 .byte 0x85
 .byte \bufferstring_buffernumber
-.hword \bufferstring_string
+.word \bufferstring_string
 .endm
 
 .macro pokemart pokemart_list:req
@@ -729,6 +729,11 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .word \pokemart_list
 .endm
 
+.macro pokemart3 pokemart_list_three:req
+.byte 0x86
+.word \pokemart_list_three
+.endm
+
 .macro random random_possiblities:req
 .byte 0x8F
 .hword \random_possiblities
@@ -746,7 +751,7 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .byte \paymoney_command
 .endm
 
-.macro checkmoney checkmoney_quantity:req paymoney_command:req
+.macro checkmoney checkmoney_quantity:req checkmoney_command:req
 .byte 0x92
 .word \checkmoney_quantity
 .byte \checkmoney_command
@@ -920,6 +925,11 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
 .byte 0xB7
 .endm
 
+.macro savincrementkey attr:req
+.byte 0xC3
+.byte \attr
+.endm
+
 .macro waitcry
 .byte 0xC5
 .endm